diff options
| author | Peter Stephenson <pws@zsh.org> | 2015-10-30 16:59:04 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@zsh.org> | 2015-10-30 16:59:41 +0000 |
| commit | 1eef57b3d15af235430ad2b5e2940ded375e69d2 (patch) | |
| tree | 09266b2ddafc28e8646cbb9fe3e1346dc6299943 | |
| parent | 26614ad0e05d99e974742276b710a4afff79e8b2 (diff) | |
| download | zsh-1eef57b3d15af235430ad2b5e2940ded375e69d2.tar.gz zsh-1eef57b3d15af235430ad2b5e2940ded375e69d2.tar.xz zsh-1eef57b3d15af235430ad2b5e2940ded375e69d2.zip | |
37027: allow subword context to discriminate between words
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | Doc/Zsh/contrib.yo | 7 | ||||
| -rw-r--r-- | Functions/Zle/match-word-context | 9 |
3 files changed, 14 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index d29e1e4c0..ed5cd5e6b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,9 @@ 2015-10-30 Peter Stephenson <p.stephenson@samsung.com> + * 37027: Doc/Zsh/contrib.yo, Functions/Zle/match-word-context: + add editing word context to allow detecting being between words. + * 37022: Doc/Zsh/expn.yo, Doc/Zsh/options.yo, Src/glob.c, Src/options.c, Src/zsh.h: add GLOB_STAR_SHORT option to allow shorthand ** for **/* and *** for ***/*. diff --git a/Doc/Zsh/contrib.yo b/Doc/Zsh/contrib.yo index cb68952a4..f74f7d709 100644 --- a/Doc/Zsh/contrib.yo +++ b/Doc/Zsh/contrib.yo @@ -2016,9 +2016,10 @@ matched against each var(pattern) in turn until one matches; if it does, the context is extended by a colon and the corresponding var(subcontext). Note that the test is made against the original word on the line, with no stripping of quotes. Special handling is done between words: the current -context is examined and if it contains the string tt(back), the word before -the cursor is considered, else the word after cursor is considered. Some -examples are given below. +context is examined and if it contains the string tt(between) the word +is set to a single space; else if it is contains the string tt(back), +the word before the cursor is considered, else the word after cursor is +considered. Some examples are given below. The style tt(skip-whitespace-first) is only used with the tt(forward-word) widget. If it is set to true, then tt(forward-word) diff --git a/Functions/Zle/match-word-context b/Functions/Zle/match-word-context index 7f1154498..8793483f4 100644 --- a/Functions/Zle/match-word-context +++ b/Functions/Zle/match-word-context @@ -7,7 +7,7 @@ setopt extendedglob local -a worcon bufwords local pat tag lastword word backword forword -integer iword +integer iword between zstyle -a $curcontext word-context worcon || return 0 @@ -25,13 +25,18 @@ if [[ $lastword = ${bufwords[iword]} ]]; then # If the word immediately left of the cursor is complete, # we're not on it for forward operations. forword=${bufwords[iword+1]} + # If, furthermore, we're on whitespace, then we're between words. + # It can't be significant whitespace because the previous word is complete. + [[ $RBUFFER[1] = [[:space:]] ]] && between=1 else # We're on a word. forword=${bufwords[iword]} fi backword=${bufwords[iword]} -if [[ $curcontext = *back* ]]; then +if [[ between -ne 0 && $curcontext = *between* ]]; then + word=' ' +elif [[ $curcontext = *back* ]]; then word=$backword else word=$forword |