about summary refs log tree commit diff
diff options
context:
space:
mode:
authorDaniel Shahaf <d.s@daniel.shahaf.name>2015-01-24 08:05:02 +0000
committerFrank Terbeck <ft@bewatermyfriend.org>2015-01-25 01:42:06 +0100
commit54bfcf5af18fbb841118e51b6c5325872770b52b (patch)
tree47ce564f4989bcaea4ec903939345b3f9921bf86
parent9d25fd72553caff0008d35670544c0ab909c0224 (diff)
downloadzsh-54bfcf5af18fbb841118e51b6c5325872770b52b.tar.gz
zsh-54bfcf5af18fbb841118e51b6c5325872770b52b.tar.xz
zsh-54bfcf5af18fbb841118e51b6c5325872770b52b.zip
_zstyle vcs_info: Unbreak branchformat completion
The failure mode was:

    % zstyle ':vcs_info:*' branchformat "foobar%<TAB>
    _values:compvalues:10: no multi-letter values with empty separator allowed
-rw-r--r--ChangeLog3
-rw-r--r--Completion/Zsh/Command/_zstyle2
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 2ca32cec1..b6c0b5834 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,9 @@
 	Functions/VCS_Info/Backends/VCS_INFO_get_data_hg: vcs_info hg:
 	Support inactive bookmarks
 
+	* Completion/Zsh/Command/_zstyle: _zstyle vcs_info: Unbreak
+	branchformat completion
+
 2015-01-23  Jun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp>
 
 	* 34335: _yum: fix bugs in _yum_all_pkgs
diff --git a/Completion/Zsh/Command/_zstyle b/Completion/Zsh/Command/_zstyle
index eb27117b2..c8e1c2be8 100644
--- a/Completion/Zsh/Command/_zstyle
+++ b/Completion/Zsh/Command/_zstyle
@@ -549,7 +549,7 @@ while (( $#state )); do
         compset -P '*%'
         _values -s '' 'format replacement' \
           'b[the current branch]' \
-          'r[current revision number]' \
+          'r[current revision number]'
       else
         _message -e formats 'vcs format'
       fi