diff options
| author |  David Adam <zanchey@ucc.gu.uwa.edu.au> | 2014-11-15 23:48:40 +0800 |
|---|---|---|
| committer | David Adam <zanchey@ucc.gu.uwa.edu.au> | 2014-11-15 23:48:40 +0800 |
| commit | a7bab7b18bea6fe3e1718c10b359e270bada8878 (patch) | |
| tree | d4825ab9bbcbae6c683ab1d2e6e27fad1c4bd6ca /share | |
| parent | a6a41d159cd4e34d5db7db8c6e29629c7db91d15 (diff) | |
abbr/web_config: support space-delimited abbreviations
Support for space-delimited abbreviations was added to the expansion
parser in fbade198; this commit extends that support to the user-facing
tools, and documents the space-separated behaviour. Equals-delimited
abbreviations are expected to be removed before the next release.
Work on #731.
Diffstat (limited to 'share')
| -rw-r--r-- | share/functions/abbr.fish | 2 | ||||
| -rwxr-xr-x | share/tools/web_config/webconfig.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/share/functions/abbr.fish b/share/functions/abbr.fish index e109a558..2339ca44 100644 --- a/share/functions/abbr.fish +++ b/share/functions/abbr.fish @@ -151,7 +151,7 @@ function __fish_abbr_parse_entry -S -a __input __key __value end # use read -z to avoid splitting on newlines # I think we can safely assume there will be no NULs in the input - set -l IFS = + set -l IFS '= ' printf "%s" $__input | read -z $__key $__value return 0 end diff --git a/share/tools/web_config/webconfig.py b/share/tools/web_config/webconfig.py index 31fa79b7..60d3b30d 100755 --- a/share/tools/web_config/webconfig.py +++ b/share/tools/web_config/webconfig.py @@ -691,7 +691,7 @@ class FishConfigHTTPRequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler): lines = (x for x in out.rstrip().split('\n')) # Turn the output into something we can use abbrout = (line[len('abbr -a '):].strip('\'') for line in lines) - abbrs = [x.split('=') for x in abbrout] + abbrs = [re.split('[ =]', x, maxsplit=1) for x in abbrout] if abbrs[0][0]: result = [{'word': x, 'phrase': y} for x, y in abbrs] |