From cb801a01033e4b00f3181f956194502a53dbcccd Mon Sep 17 00:00:00 2001
From: Tanaka Akira <akr@users.sourceforge.net>
Date: Tue, 27 Apr 1999 17:39:42 +0000
Subject: zsh-workers:6124

---
 Src/Zle/zle_tricky.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'Src/Zle/zle_tricky.c')

diff --git a/Src/Zle/zle_tricky.c b/Src/Zle/zle_tricky.c
index 88d811a06..591b0a75f 100644
--- a/Src/Zle/zle_tricky.c
+++ b/Src/Zle/zle_tricky.c
@@ -760,8 +760,8 @@ docomplete(int lst)
 
     /* If we are doing a menu-completion... */
 
-    if (menucmp && lst != COMP_LIST_EXPAND && compwidget &&
-	compwidget == lastcompwidget) {
+    if (menucmp && lst != COMP_LIST_EXPAND && 
+	(!compwidget || compwidget == lastcompwidget)) {
 	do_menucmp(lst);
 	return;
     }
@@ -4598,6 +4598,7 @@ makecomplist(char *s, int incmd, int lst)
 	insmnum = insgnum = 1;
 	insgroup = oldlist = oldins = 0;
 	begcmgroup("default", 0);
+	menucmp = 0;
 
 	ccused = newlinklist();
 	ccstack = newlinklist();
-- 
cgit 1.4.1