xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/front' into front

Browse source
This commit is contained in:
xfnw 2022-07-15 09:57:33 -04:00
commit 939d1fd742
3 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sys/man/1/sam
View file

@ -835,8 +835,10 @@ used.
The snarf buffer is unaffected. The snarf buffer is unaffected.
.TP .TP
.B <rio> .B <rio>
Exchange snarf buffers with Exchange dot with snarf buffer of
.IR rio . .IR rio .
If dot is the null string, the text in the snarf buffer is
used.
.TP .TP
.BI / regexp .BI / regexp
Search forward for the next match of the last regular expression Search forward for the next match of the last regular expression

2
sys/src/9/imx8/gic.c
View file

@ -265,7 +265,7 @@ intrenable(int irq, void (*f)(Ureg*, void*), void *a, int tbdf, char *)
prio = 0x80; prio = 0x80;
intid = irq; intid = irq;
if((v = xalloc(sizeof(Vctl))) == nil) if((v = xalloc(sizeof(Vctl))) == nil)
panic("irqenable: no mem"); panic("intrenable: no mem");
v->irq = irq; v->irq = irq;
v->intid = intid; v->intid = intid;
v->f = f; v->f = f;

2
sys/src/cmd/upas/Mail/mbox.c
View file

@ -802,6 +802,8 @@ changemesg(Plumbmsg *pm)
digest = plumblookup(pm->attr, "digest"); digest = plumblookup(pm->attr, "digest");
action = plumblookup(pm->attr, "mailtype"); action = plumblookup(pm->attr, "mailtype");
if(digest == nil || action == nil)
return;
if(strcmp(action, "new") == 0){ if(strcmp(action, "new") == 0){
if((m = load(pm->data, digest, 1)) == nil) if((m = load(pm->data, digest, 1)) == nil)
return; return;