about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSven Wischnowsky <wischnow@users.sourceforge.net>2002-07-30 07:47:03 +0000
committerSven Wischnowsky <wischnow@users.sourceforge.net>2002-07-30 07:47:03 +0000
commit273929e188132274c35f5a4867e8b6d6955dd928 (patch)
tree336c9bea7ae9c1feab436fc3a22e9962d7e452db
parent2ba552707baa12267ec7be945a71d3d11db7501c (diff)
downloadzsh-273929e188132274c35f5a4867e8b6d6955dd928.tar.gz
zsh-273929e188132274c35f5a4867e8b6d6955dd928.tar.xz
zsh-273929e188132274c35f5a4867e8b6d6955dd928.zip
make sure invalidatelist() isn't called hwen we are inside menu selection and there's only one match left (17489)
-rw-r--r--ChangeLog6
-rw-r--r--Src/Zle/compresult.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ccdc324e4..662ae49f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-07-30  Sven Wischnowsky  <wischnow@zsh.org>
+
+	* 17489: Src/Zle/compresult.c: make sure invalidatelist() isn't
+	called hwen we are inside menu selection and there's only one
+	match left
+
 2002-07-29  Peter Stephenson  <pws@csr.com>
 
 	* 17488: Src/builtin.c: TYPESET_SILENT part of 17334 used
diff --git a/Src/Zle/compresult.c b/Src/Zle/compresult.c
index 75d934a02..326417139 100644
--- a/Src/Zle/compresult.c
+++ b/Src/Zle/compresult.c
@@ -813,7 +813,7 @@ do_ambiguous(void)
 	 * want to enter an AUTO_MENU imediately.                          */
 	if ((uselist == 3 ||
 	     (!uselist && isset(BASHAUTOLIST) && isset(LISTAMBIGUOUS))) &&
-	    la) {
+	    la && iforcemenu != -1) {
 	    int fc = fromcomp;
 
 	    invalidatelist();