28799: lexical analyser didn't stop early enough with completion words

2 files changed, 8 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index c4764453d..9635a2f97 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-02-24  Peter Stephenson  <pws@csr.com>
+
+	* 28799: Src/lex.c: fix bug introduced with lexflags
+	that lexical analyser didn't stop quickly enough when
+	retrieving completion words.
+
 2011-02-23  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
 	* 28795: Src/exec.c: tweak to 28791 for forked shells.
@@ -14253,5 +14259,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.5207 $
+* $Revision: 1.5208 $
 *****************************************************
diff --git a/Src/lex.c b/Src/lex.c
index 8636a6fb4..f4b22370b 100644
--- a/Src/lex.c
+++ b/Src/lex.c
@@ -1825,7 +1825,7 @@ exalias(void)
 	    int zp = lexflags;
 
 	    gotword();
-	    if (zp == 1 && !lexflags) {
+	    if ((zp & LEXFLAGS_ZLE) && !lexflags) {
 		if (zshlextext == copy)
 		    zshlextext = tokstr;
 		return 0;