about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSven Wischnowsky <wischnow@users.sourceforge.net>2000-07-18 08:37:14 +0000
committerSven Wischnowsky <wischnow@users.sourceforge.net>2000-07-18 08:37:14 +0000
commit67f16de104da5af502bf47b63ed83f981fa28739 (patch)
tree0edf3712b539b5c124d537361b4c7896139d927c
parentc7578846f72b385b2db1024f97280961da03190e (diff)
downloadzsh-67f16de104da5af502bf47b63ed83f981fa28739.tar.gz
zsh-67f16de104da5af502bf47b63ed83f981fa28739.tar.xz
zsh-67f16de104da5af502bf47b63ed83f981fa28739.zip
don't let duplicate matches keep us from recognising exact matches if they produce the same string on the line (12297)
-rw-r--r--ChangeLog6
-rw-r--r--Src/Zle/compcore.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 9dc4d3bc6..8b0fd7ff4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-07-18  Sven Wischnowsky  <wischnow@zsh.org>
+
+	* 12297: Src/Zle/compcore.c: don't let duplicate matches keep us
+ 	from recognising exact matches if they produce the same string on
+ 	the line
+	
 2000-07-18  Wayne Davison  <wayned@users.sourceforge.net>
 
 	* 12295: Src/builtin.c, Src/hist.c, Src/input.c, Src/lex.c: Fixed
diff --git a/Src/Zle/compcore.c b/Src/Zle/compcore.c
index ed53fa25a..80f558b5e 100644
--- a/Src/Zle/compcore.c
+++ b/Src/Zle/compcore.c
@@ -2397,7 +2397,7 @@ add_match_data(int alt, char *str, Cline line,
 		comp_setunset(0, 0, CP_EXACTSTR, 0);
 	    }
 	    ai->exactm = cm;
-	} else if (useexact) {
+	} else if (useexact && !matcheq(cm, ai->exactm)) {
 	    ai->exact = 2;
 	    ai->exactm = NULL;
 	    if (incompfunc)