summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--Src/Zle/compcore.c2
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 51b1298c2..3b6d57d96 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-09 Barton E. Schaefer <schaefer@zsh.org>
+
+ * 30193: ChangeLog Src/Zle/compcore.c: remnulargs() after poking
+ into string in case length changes.
+
2012-02-08 Peter Stephenson <pws@csr.com>
* Timothy Redaelli: 30187: Src/hist.c: file name manipulations
@@ -15923,5 +15928,5 @@
*****************************************************
* This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.5576 $
+* $Revision: 1.5577 $
*****************************************************
diff --git a/Src/Zle/compcore.c b/Src/Zle/compcore.c
index b1de6c6cc..39d41bdb5 100644
--- a/Src/Zle/compcore.c
+++ b/Src/Zle/compcore.c
@@ -2303,10 +2303,10 @@ addmatches(Cadata dat, char **argv)
strcpy(tmp + llpl + gfl + is, lsuf);
tokenize(tmp);
- remnulargs(tmp);
if (haswilds(tmp)) {
if (is)
tmp[llpl + gfl] = Star;
+ remnulargs(tmp);
if ((cp = patcompile(tmp, 0, NULL)))
haspattern = 1;
}