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(+) 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 1.4.1