From 1c0ed3b49837ec6589f46656e3b2595ae93feab4 Mon Sep 17 00:00:00 2001
From: Peter Stephenson <pws@users.sourceforge.net>
Date: Mon, 13 Aug 2012 08:47:13 +0000
Subject: Aaron Scrab: 30604: make repeating vi skip character useful by
 ignoring character just matched

---
 Src/Zle/zle_move.c | 31 ++++++++++++++++++++++++-------
 1 file changed, 24 insertions(+), 7 deletions(-)

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

diff --git a/Src/Zle/zle_move.c b/Src/Zle/zle_move.c
index 284a86389..d5f464c2c 100644
--- a/Src/Zle/zle_move.c
+++ b/Src/Zle/zle_move.c
@@ -679,7 +679,7 @@ vifindnextchar(char **args)
     if ((vfindchar = vigetkey()) != ZLEEOF) {
 	vfinddir = 1;
 	tailadd = 0;
-	return virepeatfind(args);
+	return vifindchar(0, args);
     }
     return 1;
 }
@@ -691,7 +691,7 @@ vifindprevchar(char **args)
     if ((vfindchar = vigetkey()) != ZLEEOF) {
 	vfinddir = -1;
 	tailadd = 0;
-	return virepeatfind(args);
+	return vifindchar(0, args);
     }
     return 1;
 }
@@ -703,7 +703,7 @@ vifindnextcharskip(char **args)
     if ((vfindchar = vigetkey()) != ZLEEOF) {
 	vfinddir = 1;
 	tailadd = -1;
-	return virepeatfind(args);
+	return vifindchar(0, args);
     }
     return 1;
 }
@@ -715,14 +715,14 @@ vifindprevcharskip(char **args)
     if ((vfindchar = vigetkey()) != ZLEEOF) {
 	vfinddir = -1;
 	tailadd = 1;
-	return virepeatfind(args);
+	return vifindchar(0, args);
     }
     return 1;
 }
 
 /**/
 int
-virepeatfind(char **args)
+vifindchar(int repeat, char **args)
 {
     int ocs = zlecs, n = zmult;
 
@@ -735,6 +735,16 @@ virepeatfind(char **args)
 	zmult = n;
 	return ret;
     }
+    if (repeat && tailadd != 0) {
+	if (vfinddir > 0) {
+	    if(zlecs < zlell && (ZLE_INT_T)zleline[zlecs+1] == vfindchar)
+		INCCS();
+	}
+	else {
+	    if(zlecs > 0 && (ZLE_INT_T)zleline[zlecs-1] == vfindchar)
+		DECCS();
+	}
+    }
     while (n--) {
 	do {
 	    if (vfinddir > 0)
@@ -758,6 +768,13 @@ virepeatfind(char **args)
     return 0;
 }
 
+/**/
+int
+virepeatfind(char **args)
+{
+    return vifindchar(1, args);
+}
+
 /**/
 int
 virevrepeatfind(char **args)
@@ -766,13 +783,13 @@ virevrepeatfind(char **args)
 
     if (zmult < 0) {
 	zmult = -zmult;
-	ret = virepeatfind(args);
+	ret = vifindchar(1, args);
 	zmult = -zmult;
 	return ret;
     }
     tailadd = -tailadd;
     vfinddir = -vfinddir;
-    ret = virepeatfind(args);
+    ret = vifindchar(1, args);
     vfinddir = -vfinddir;
     tailadd = -tailadd;
     return ret;
-- 
cgit 1.4.1