about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSven Wischnowsky <wischnow@users.sourceforge.net>2001-02-26 09:43:08 +0000
committerSven Wischnowsky <wischnow@users.sourceforge.net>2001-02-26 09:43:08 +0000
commit85de1eae0bbd3e94fa73cb56cb847d3edff99f59 (patch)
treec1c434a4f55d12c090116d672b87ce418a44def1
parent40e13049874fcb801295849509fc4128fa1c91d9 (diff)
downloadzsh-85de1eae0bbd3e94fa73cb56cb847d3edff99f59.tar.gz
zsh-85de1eae0bbd3e94fa73cb56cb847d3edff99f59.tar.xz
zsh-85de1eae0bbd3e94fa73cb56cb847d3edff99f59.zip
properly restore noaliases in bufferwords() (13530)
-rw-r--r--ChangeLog4
-rw-r--r--Src/hist.c3
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 80bc1f79f..859c9e5cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-02-26  Sven Wischnowsky  <wischnow@zsh.org>
+
+	* 13530: Src/hist.c: properly restore noaliases in bufferwords()
+	
 2001-02-20  Sven Wischnowsky  <wischnow@zsh.org>
 
 	* 13509: Src/jobs.c: more (|un)queue_signals(), this time for the
diff --git a/Src/hist.c b/Src/hist.c
index 138cb1bf5..0f4fbb9d2 100644
--- a/Src/hist.c
+++ b/Src/hist.c
@@ -2151,6 +2151,7 @@ bufferwords(LinkList list, char *buf, int *index)
 {
     int num = 0, cur = -1, got = 0, ne = noerrs, ocs = cs, oll = ll;
     int owb = wb, owe = we, oadx = addedx, ozp = zleparse, onc = nocomments;
+    int ona = noaliases;
     char *p;
 
     if (!list)
@@ -2226,7 +2227,7 @@ bufferwords(LinkList list, char *buf, int *index)
     }
     if (cur < 0 && num)
 	cur = num - 1;
-    noaliases = 0;
+    noaliases = ona;
     strinend();
     inpop();
     errflag = 0;