about summary refs log tree commit diff
diff options
context:
space:
mode:
authorClint Adams <clint@users.sourceforge.net>2008-10-30 01:47:32 +0000
committerClint Adams <clint@users.sourceforge.net>2008-10-30 01:47:32 +0000
commit787c86f68d36fa487daeb7f14adfdbf6e6a01238 (patch)
treefe51eda08193a3bc5d41830433dafe3052853d24
parentc109f9f9447920effdfc70f448704d5ab4b8d4c7 (diff)
downloadzsh-787c86f68d36fa487daeb7f14adfdbf6e6a01238.tar.gz
zsh-787c86f68d36fa487daeb7f14adfdbf6e6a01238.tar.xz
zsh-787c86f68d36fa487daeb7f14adfdbf6e6a01238.zip
25949: remove dead code in getvisrchstr.
-rw-r--r--ChangeLog4
-rw-r--r--Src/Zle/zle_hist.c8
2 files changed, 6 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 9836db6b0..90e3565b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-10-30  Clint Adams  <clint@zsh.org>
+
+	* 25949: Src/Zle/zle_hist.c: remove dead code in getvisrchstr.
+
 2008-10-29  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
 	* 25945: Completion/Unix/Type/_path_files: need some extra
diff --git a/Src/Zle/zle_hist.c b/Src/Zle/zle_hist.c
index 97b82fdcd..c4dad7617 100644
--- a/Src/Zle/zle_hist.c
+++ b/Src/Zle/zle_hist.c
@@ -1748,12 +1748,8 @@ getvisrchstr(void)
 	    clearscreen(zlenoargs);
 	} else if(cmd == Th(z_acceptline) ||
 	    	cmd == Th(z_vicmdmode)) {
-	    if (sptr) {
-		sbuf[sptr] = ZWC('\0');
-		visrchstr = ztrdup(sbuf+1);
-	    } else {
-		visrchstr = ztrdup(vipenultsrchstr);
-	    }
+	    sbuf[sptr] = ZWC('\0');
+	    visrchstr = ztrdup(sbuf+1);
 	    ret = 1;
 	    sptr = 0;
 	} else if(cmd == Th(z_backwarddeletechar) ||