diff options
| author | Barton E. Schaefer <schaefer@zsh.org> | 2017-06-01 14:47:45 -0700 |
|---|---|---|
| committer | Barton E. Schaefer <schaefer@zsh.org> | 2017-06-01 14:47:45 -0700 |
| commit | 3ba5e6b909f3dbba6ae4bedb7f1a09ecfdead4eb (patch) | |
| tree | cb0094fa05699b57e45afc46239d5c93a5a820f2 /Src/Zle/textobjects.c | |
| parent | Special-case typeset -c / -C because of PM_* renumbering (diff) | |
| parent | 41191: Check for immortal thingies when checking for specific thingies (diff) | |
| download | zsh-schaefer/badarrays.tar zsh-schaefer/badarrays.tar.gz zsh-schaefer/badarrays.tar.bz2 zsh-schaefer/badarrays.tar.lz zsh-schaefer/badarrays.tar.xz zsh-schaefer/badarrays.tar.zst zsh-schaefer/badarrays.zip | |
Merge branch 'master' into schaefer/badarraysschaefer/badarrays
Diffstat (limited to 'Src/Zle/textobjects.c')
| -rw-r--r-- | Src/Zle/textobjects.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Src/Zle/textobjects.c b/Src/Zle/textobjects.c index 3db0781ff..bf83906f2 100644 --- a/Src/Zle/textobjects.c +++ b/Src/Zle/textobjects.c @@ -48,9 +48,10 @@ int selectword(UNUSED(char **args)) { int n = zmult; - int all = (bindk == t_selectaword || bindk == t_selectablankword); - int (*viclass)(ZLE_CHAR_T) = (bindk == t_selectaword || - bindk == t_selectinword) ? wordclass : blankwordclass; + int all = IS_THINGY(bindk, selectaword) || + IS_THINGY(bindk, selectablankword); + int (*viclass)(ZLE_CHAR_T) = (IS_THINGY(bindk, selectaword) || + IS_THINGY(bindk, selectinword)) ? wordclass : blankwordclass; int sclass = viclass(zleline[zlecs]); int doblanks = all && sclass; @@ -288,7 +289,7 @@ selectargument(UNUSED(char **args)) free(stringaszleline(linein, wstarts[wcur], &zlecs, &tmpsz, &mark)); free(linein); - if (bindk == t_selectinshellword) { + if (IS_THINGY(bindk, selectinshellword)) { ZLE_CHAR_T *match = ZWS("`\'\""); ZLE_CHAR_T *lmatch = ZWS("\'({"), *rmatch = ZWS("\')}"); ZLE_CHAR_T *ematch = match, *found; |