about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSven Wischnowsky <wischnow@users.sourceforge.net>2000-04-18 07:07:30 +0000
committerSven Wischnowsky <wischnow@users.sourceforge.net>2000-04-18 07:07:30 +0000
commit145e7ee76f210f2f9580c31554b944c94b8896d1 (patch)
tree8de426f4e0620b75345f19e1c820c04421e84cf6
parent4f1424edb22d8521756f2f59c3b87b5d70a8d2cf (diff)
downloadzsh-145e7ee76f210f2f9580c31554b944c94b8896d1.tar.gz
zsh-145e7ee76f210f2f9580c31554b944c94b8896d1.tar.xz
zsh-145e7ee76f210f2f9580c31554b944c94b8896d1.zip
join_clines() tested the wrong variable (10798)
-rw-r--r--ChangeLog5
-rw-r--r--Src/Zle/compmatch.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 042003f63..049777adb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-04-18  Sven Wischnowsky <wischnow@informatik.hu-berlin.de>
+
+	* 10798: Src/Zle/compmatch.c: join_clines() tested the wrong
+ 	variable
+	
 2000-04-17  Peter Stephenson  <pws@cambridgesiliconradio.com>
 
 	* 10789: Doc/Zsh/expn.yo: better documentation for <(...) and
diff --git a/Src/Zle/compmatch.c b/Src/Zle/compmatch.c
index f0e5a7c47..778f67dff 100644
--- a/Src/Zle/compmatch.c
+++ b/Src/Zle/compmatch.c
@@ -1893,10 +1893,10 @@ join_clines(Cline o, Cline n)
 			    for (tt = o;
 				 (to = tt->next) &&
 				     !cmp_anchors(tn, to, 1); tt = to);
-			    if (tt)
+			    if (to)
 				break;
 			}
-			if (tt) {
+			if (to) {
 			    diff = sub_join(n, o, to, 1);
 
 			    if (po)