summary refs log tree commit diff
diff options
context:
space:
mode:
authorBart Schaefer <barts@users.sourceforge.net>2000-04-30 17:09:08 +0000
committerBart Schaefer <barts@users.sourceforge.net>2000-04-30 17:09:08 +0000
commit3e43e5099282927fad9844f106b1cd8a361be03c (patch)
tree9bef1be21f30b5a8bdc5d36b216c6238af1b7224
parent04c1d78c5ade0eb7ee0bfbf5f0cc43f303049b79 (diff)
downloadzsh-3e43e5099282927fad9844f106b1cd8a361be03c.tar.gz
zsh-3e43e5099282927fad9844f106b1cd8a361be03c.tar.xz
zsh-3e43e5099282927fad9844f106b1cd8a361be03c.zip
11029: Some missing bits of merging 11015 with 11026.
-rw-r--r--ChangeLog5
-rw-r--r--Src/hashtable.c4
-rw-r--r--Src/signals.c3
3 files changed, 7 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index d2c67adfc..31f5f3af7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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:
diff --git a/Src/hashtable.c b/Src/hashtable.c
index 19f23086b..917bbc9e6 100644
--- a/Src/hashtable.c
+++ b/Src/hashtable.c
@@ -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);
 
diff --git a/Src/signals.c b/Src/signals.c
index e93030002..b8e06d444 100644
--- a/Src/signals.c
+++ b/Src/signals.c
@@ -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);
 }