From: Aaron Schrab <aaron@schrab.com>
To: zsh-workers@zsh.org
Subject: [PATCH 2/2] Make vi-repeat-find more vim-like
Date: Sun, 12 Aug 2012 14:00:07 -0400 [thread overview]
Message-ID: <1344794407-28894-2-git-send-email-aaron@schrab.com> (raw)
In-Reply-To: <1344794407-28894-1-git-send-email-aaron@schrab.com>
Change vi-repeat-find (;) and vi-rev-repeat-find (,) to ignore a match
at the first character checked if repeating a vi-find-next-char-skip (t)
or vi-find-prev-char-skip (T), as vim does (when cpoptions doesn't
contain ;). The standard vi behaviour makes immediately repeating one
of these searches useless, since the first character checked will always
match resulting in no movement of the cursor.
---
Src/Zle/zle_move.c | 31 ++++++++++++++++++++++++-------
1 file changed, 24 insertions(+), 7 deletions(-)
diff --git a/Src/Zle/zle_move.c b/Src/Zle/zle_move.c
index 284a863..d5f464c 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)
@@ -760,19 +770,26 @@ virepeatfind(char **args)
/**/
int
+virepeatfind(char **args)
+{
+ return vifindchar(1, args);
+}
+
+/**/
+int
virevrepeatfind(char **args)
{
int ret;
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;
--
1.7.10.4
next prev parent reply other threads:[~2012-08-12 18:11 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-12 18:00 [PATCH 1/2] Fix vi-rev-repeat-find after vi-find-*-char-skip Aaron Schrab
2012-08-12 18:00 ` Aaron Schrab [this message]
2012-08-12 21:04 ` [PATCH 2/2] Make vi-repeat-find more vim-like Bart Schaefer
2012-08-12 21:32 ` Aaron Schrab
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1344794407-28894-2-git-send-email-aaron@schrab.com \
--to=aaron@schrab.com \
--cc=zsh-workers@zsh.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).