PATCH: editor subword context tweak

[Peter Stephenson <p.stephenson@samsung.com>]

This introduces a minor tweak to a facility I introduced a while ago
that allows you to have different editing behaviour in different parts
of the command line based on styles (e.g. word characters are different
if it looks like a filename, etc.).  I've just discovered I need a way
of knowing if I'm between command-line words, which I thought I already
had but apparently I don't.

If you don't use this, and I doubt anyone else does, I suggest you avert
your eyes.

pws

diff --git a/Doc/Zsh/contrib.yo b/Doc/Zsh/contrib.yo
index cb68952..f74f7d7 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 7f11544..0bc7e81 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