From 881474edcb223ac22a08d81a824809c33ca3a9c9 Mon Sep 17 00:00:00 2001 From: Peter Stephenson Date: Fri, 21 Aug 2015 21:33:37 +0100 Subject: unposted: fix up for 5.0.8-test-2 --- Src/Zle/zle_misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Src/Zle') diff --git a/Src/Zle/zle_misc.c b/Src/Zle/zle_misc.c index d25e4ebef..2d1862813 100644 --- a/Src/Zle/zle_misc.c +++ b/Src/Zle/zle_misc.c @@ -738,7 +738,7 @@ yankpop(UNUSED(char **args)) } /**/ -char * +mod_export char * bracketedstring(void) { static const char endesc[] = "\033[201~"; -- cgit v1.2.3 From 1cfe4ca1926bc2c8041290bb0d8c3dccf8662f52 Mon Sep 17 00:00:00 2001 From: "Barton E. Schaefer" Date: Sat, 22 Aug 2015 21:50:31 -0700 Subject: 36273: teach endofline() and endoflinehist() about invicmdmode() cursor placement. --- ChangeLog | 5 +++++ Src/Zle/zle_move.c | 4 ++++ 2 files changed, 9 insertions(+) (limited to 'Src/Zle') diff --git a/ChangeLog b/ChangeLog index 5f9ccf8e3..1cc9ff1ec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2015-08-22 Barton E. Schaefer + + * 36273: Src/Zle/zle_move.c: teach endofline() and endoflinehist() + about invicmdmode() cursor placement. + 2015-08-21 Peter Stephenson * unposted: Config/version.mk, Src/parse.c, Src/Zle/zle_misc.c: diff --git a/Src/Zle/zle_move.c b/Src/Zle/zle_move.c index f49df8647..155fda80d 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; -- cgit v1.2.3 From 43079e5d8ec4e3016c380a6043c90f94fe45d72a Mon Sep 17 00:00:00 2001 From: "Barton E. Schaefer" Date: Sat, 22 Aug 2015 21:54:31 -0700 Subject: 36274: clear virangeflag when getvirange() has an error (the next keystroke is not a motion/selection). --- ChangeLog | 3 +++ Src/Zle/zle_vi.c | 2 ++ 2 files changed, 5 insertions(+) (limited to 'Src/Zle') diff --git a/ChangeLog b/ChangeLog index 1cc9ff1ec..746caece8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2015-08-22 Barton E. Schaefer + * 36274: Src/Zle/zle_vi.c: clear virangeflag when getvirange() + has an error (the next keystroke is not a motion/selection). + * 36273: Src/Zle/zle_move.c: teach endofline() and endoflinehist() about invicmdmode() cursor placement. diff --git a/Src/Zle/zle_vi.c b/Src/Zle/zle_vi.c index 1a11ca7d5..42dc46e7e 100644 --- a/Src/Zle/zle_vi.c +++ b/Src/Zle/zle_vi.c @@ -224,6 +224,7 @@ getvirange(int wf) ZS_memcpy(zleline, lastline, zlell = lastll); zlecs = pos; mark = mpos; + virangeflag = 0; return -1; } @@ -232,6 +233,7 @@ getvirange(int wf) if (!zlell || (zlecs == pos && (mark == -1 || mark == zlecs) && virangeflag != 2) || ret == -1) { mark = mpos; + virangeflag = 0; return -1; } virangeflag = 0; -- cgit v1.2.3