mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-07 11:41:16 +02:00
Code Releases Activity

11029: Some missing bits of merging 11015 with 11026.

Browse source
This commit is contained in:
Bart Schaefer 2000-04-30 17:09:08 +00:00
parent 04c1d78c5a
commit 3e43e50992
3 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2000-04-30 Bart Schaefer <schaefer@zsh.org>
* 11029: Src/hashtable.c, Src/signals.c: Back out more bits of
11015 made obsolete by 11026.
2000-04-30 Clint Adams <schizo@debian.org>
* 11027: Josip Rodin: Completion/User/_joe:

4
Src/hashtable.c
View file

@ -789,8 +789,8 @@ removeshfuncnode(HashTable ht, char *nam)
HashNode hn;
int signum;
if (!strncmp(nam, "TRAP", 4) && (signum = getsignum(nam +4)) != -1)
hn = removetrap(getsignum(nam + 4));
if (!strncmp(nam, "TRAP", 4) && (signum = getsignum(nam + 4)) != -1)
hn = removetrap(signum);
else
hn = removehashnode(shfunctab, nam);

3
Src/signals.c
View file

@ -674,7 +674,6 @@ dosavetrap(int sig, int level)
} else {
st->list = sigfuncs[sig] ? dupeprog(sigfuncs[sig], 0) : NULL;
}
noerrs = !!st->list;
if (!savetraps)
savetraps = znewlinklist();
/*
@ -731,9 +730,7 @@ settrap(int sig, Eprog l)
void
unsettrap(int sig)
{
int ne = noerrs;
HashNode hn = removetrap(sig);
noerrs = ne;
if (hn)
shfunctab->freenode(hn);
}