about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSven Wischnowsky <wischnow@users.sourceforge.net>2001-06-25 09:32:21 +0000
committerSven Wischnowsky <wischnow@users.sourceforge.net>2001-06-25 09:32:21 +0000
commitbbd2a98f4171a474cec10f58ff80df197fae6491 (patch)
tree469779004993c123c1612fbd8176a2fbfcca8b98
parent50f88338e67084fa31be6843d47bd4d675458e7a (diff)
downloadzsh-bbd2a98f4171a474cec10f58ff80df197fae6491.tar.gz
zsh-bbd2a98f4171a474cec10f58ff80df197fae6491.tar.xz
zsh-bbd2a98f4171a474cec10f58ff80df197fae6491.zip
make expand-word not always restore the command line (3940)
-rw-r--r--ChangeLog5
-rw-r--r--Src/Zle/zle_tricky.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 346f2fd5d..3e6e2efeb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-06-25  Sven Wischnowsky  <wischnow@zsh.org>
+
+	* user/3940: Src/Zle/zle_tricky.c: make expand-word not always
+	restore the command line
+
 2001-06-24  Bart Schaefer  <schaefer@zsh.org>
 
 	* 15060: Test/A02alias.ztst: Change expected return value to
diff --git a/Src/Zle/zle_tricky.c b/Src/Zle/zle_tricky.c
index 542b50381..515fb9e97 100644
--- a/Src/Zle/zle_tricky.c
+++ b/Src/Zle/zle_tricky.c
@@ -752,7 +752,8 @@ docomplete(int lst)
 	    inststr(x);
 	} else if (COMP_ISEXPAND(lst)) {
 	    /* Do expansion. */
-	    char *ol = (olst == COMP_EXPAND_COMPLETE) ?
+	    char *ol = (olst == COMP_EXPAND ||
+                        olst == COMP_EXPAND_COMPLETE) ?
 		dupstring((char *)line) : (char *)line;
 	    int ocs = cs, ne = noerrs;