zsh-workers
 help / color / mirror / code / Atom feed
From: Bart Schaefer <schaefer@brasslantern.com>
To: zsh-workers@zsh.org
Subject: Vi command mode and end-of-line; ZWC('\n') ?
Date: Sat, 22 Aug 2015 18:19:11 -0700	[thread overview]
Message-ID: <150822181911.ZM31586@torch.brasslantern.com> (raw)

That thread about end-of-line not working as a "bindkey -a" widget annoys
me for some reason.  I started looking through zle_move.c and discovered
that in a few places we compare

	zleline[zlecs] == ZWC('\n')

but in more places we simply do

	zleline[pos] == '\n'
	zleline[zlecs - 1] != '\n'

There's even one comment about the latter

	/* works OK with combining chars since '\n' must be on its own */

So which is it?  Should we be using ZWC() or not?

Meanwhile, any objection to this?

diff --git a/Src/Zle/zle_move.c b/Src/Zle/zle_move.c
index f49df86..155fda8 100644
--- a/Src/Zle/zle_move.c
+++ b/Src/Zle/zle_move.c
@@ -344,6 +344,8 @@ endofline(char **args)
 	    zlecs = zlell;
 	    return 0;
 	}
+	if ((zlecs += invicmdmode()) == zlell)
+	    break;
 	if (zleline[zlecs] == '\n')
 	    if (++zlecs == zlell)
 		return 0;
@@ -414,6 +416,8 @@ endoflinehist(char **args)
 	    zlecs = zlell;
 	    break;
 	}
+	if ((zlecs += invicmdmode()) == zlell)
+	    break;
 	if (zleline[zlecs] == '\n')
 	    if (++zlecs == zlell)
 		break;


             reply	other threads:[~2015-08-23  1:19 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-08-23  1:19 Bart Schaefer [this message]
2015-08-24  8:33 ` Peter Stephenson

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=150822181911.ZM31586@torch.brasslantern.com \
    --to=schaefer@brasslantern.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).