about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2005-08-10 11:59:28 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2005-08-10 11:59:28 +0000
commit0c301a8af6a50e893c5679898d7753590f623788 (patch)
tree06595c36de9f2a9d0a8baa9a2bcfa745a6e411e5
parent2a888b3d5ae1f485649b811ea433f286238fd308 (diff)
downloadzsh-0c301a8af6a50e893c5679898d7753590f623788.tar.gz
zsh-0c301a8af6a50e893c5679898d7753590f623788.tar.xz
zsh-0c301a8af6a50e893c5679898d7753590f623788.zip
21592: browsing new directory from menu selection crashed
-rw-r--r--ChangeLog3
-rw-r--r--Src/Zle/complist.c3
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 8fe4b035e..6a6e5c712 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-08-10  Peter Stephenson  <pws@csr.com>
 
+	* 21592: Src/Zle/complist.c: attempt to browse a new directory
+	in menu selection caused crash.
+
 	* c.f. 21590: Src/hist.c, Src/lex.c, Src/utils.c,
 	Src/Zle/compcore.c, Src/Zle/compctl.c, Src/Zle/complist.c,
 	Src/Zle/compresult.c, Src/Zle/zle.h, Src/Zle/zle_hist.c,
diff --git a/Src/Zle/complist.c b/Src/Zle/complist.c
index 045e86837..005e5540a 100644
--- a/Src/Zle/complist.c
+++ b/Src/Zle/complist.c
@@ -2303,7 +2303,10 @@ domenuselect(Hookdef dummy, Chdata dat)
                 iforcemenu = -1;
             } else
                 mode = 0;
+	    /* Nested completion assumes line is unmetafied */
+	    unmetafy_line();
 	    menucomplete(zlenoargs);
+	    metafy_line();
 	    iforcemenu = 0;
 
             if (cmd != Th(z_acceptandinfernexthistory))