mirrors
/
zsh
mirror of git://git.code.sf.net/p/zsh/code
1
0
Fork 0
Code Releases Activity

38810: fix cursor positioning and repeated invocations when widgets used from emacs mode

This commit is contained in:
Oliver Kiddle 2016-07-08 23:00:44 +02:00
parent e87aa8941f
commit 13f4bb2936
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2016-07-08 Oliver Kiddle <opk@zsh.org>
* 38810: Src/Zle/textobjects.c: fix cursor positioning
and repeated invocations when widgets used from emacs mode
* 38809: Src/zsh.h, Src/prompt.c, Src/Zle/zle_refresh.c:
fix tracking of colour attributes and restore them when
turning bold off

18
Src/Zle/textobjects.c
View File

@ -1,5 +1,5 @@
/*
* textobjects.c - ZLE module implementing Vim style text objects
* textobjects.c - ZLE widgets implementing Vim style text objects
*
* This file is part of zsh, the Z shell.
*
@ -54,11 +54,7 @@ selectword(UNUSED(char **args))
int sclass = viclass(zleline[zlecs]);
int doblanks = all && sclass;
if (!invicmdmode()) {
region_active = 1;
mark = zlecs;
}
if (!region_active || zlecs == mark) {
if (!region_active || zlecs == mark || mark == -1) {
/* search back to first character of same class as the start position
* also stop at the beginning of the line */
mark = zlecs;
@ -207,8 +203,12 @@ selectword(UNUSED(char **args))
/* Adjustment: vi operators don't include the cursor position, in insert
* or emacs mode the region also doesn't but for vi visual mode it is
* included. */
if (zlecs && zlecs > mark && !virangeflag)
DECCS();
if (!virangeflag) {
if (!invicmdmode())
region_active = 1;
else if (zlecs && zlecs > mark)
DECCS();
}
return 0;
}
@ -315,7 +315,7 @@ selectargument(UNUSED(char **args))
}
/* Adjustment: vi operators don't include the cursor position */
if (!virangeflag)
if (!virangeflag && invicmdmode())
DECCS();
return 0;