Changes implied by users/9744.

2 files changed, 12 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index c8a3c2a5a..94cddbe27 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-12-04  Bart Schaefer  <schaefer@zsh.org>
+
+	* unposted (cf. users/9744): Functions/Zle/keeper: call
+	_expand_word from _expand_word_and_keep so that completion context
+	is not changed; add most-specific zstyle necessary to identify the
+	all-expansions group within _expand_word_and_keep.
+
 2005-12-03  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
 	* 22049: Src/init.c: "exit" within sourced file within shell
diff --git a/Functions/Zle/keeper b/Functions/Zle/keeper
index 2a721113d..c29b22d6f 100644
--- a/Functions/Zle/keeper
+++ b/Functions/Zle/keeper
@@ -79,7 +79,11 @@ _expand_word_and_keep() {
         fi
         builtin compadd "$@"
     }
-    { _main_complete _expand } always { unfunction compadd }
+    { _expand_word } always { unfunction compadd }
 }
 
 zle -C _expand_word complete-word _expand_word_and_keep
+
+# This style is required to segregate the all-expansions group for
+# purposes of _expand_word_and_keep.
+zstyle ':completion:expand-word:expand:::all-expansions' group-name ''