about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--Src/Zle/compcore.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 65d6bfc52..94ff508ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-07-30  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
+	* 22565: Src/compcore.c: Fix bug with menu completion after failed
+	accept-and-menu-complete, perhaps.
+
 	* 22562: Src/glob.c, Test/D07multibyte.ztst: make ${...#...} etc.
 	understand multibyte characters.	
 
diff --git a/Src/Zle/compcore.c b/Src/Zle/compcore.c
index 38b1934e2..8aa44d319 100644
--- a/Src/Zle/compcore.c
+++ b/Src/Zle/compcore.c
@@ -466,12 +466,12 @@ before_complete(UNUSED(Hookdef dummy), int *lst)
 
     /* If we are doing a menu-completion... */
 
-    if (menucmp && *lst != COMP_LIST_EXPAND && 
+    if (minfo.cur && menucmp && *lst != COMP_LIST_EXPAND && 
 	(menucmp != 1 || !compwidget || compwidget == lastcompwidget)) {
 	do_menucmp(*lst);
 	return 1;
     }
-    if (menucmp && validlist && *lst == COMP_LIST_COMPLETE) {
+    if (minfo.cur && menucmp && validlist && *lst == COMP_LIST_COMPLETE) {
 	showinglist = -2;
 	onlyexpl = listdat.valid = 0;
 	return 1;