about summary refs log tree commit diff
diff options
context:
space:
mode:
authorDaniel Shahaf <d.s@daniel.shahaf.name>2015-08-27 22:01:37 +0000
committerDaniel Shahaf <d.s@daniel.shahaf.name>2015-08-27 23:15:03 +0000
commitd6ca3bc4b97f756dee2cbb738a0e835b97876a8c (patch)
tree413906d098bd0f196cbaa4c2c9b1be0bf00fb767
parent63b1dcd284df2a5dbb37bb0af3cdd13553576a85 (diff)
downloadzsh-d6ca3bc4b97f756dee2cbb738a0e835b97876a8c.tar.gz
zsh-d6ca3bc4b97f756dee2cbb738a0e835b97876a8c.tar.xz
zsh-d6ca3bc4b97f756dee2cbb738a0e835b97876a8c.zip
unposted: _subversion: Avoid SHORT_LOOPS
-rw-r--r--ChangeLog3
-rw-r--r--Completion/Unix/Command/_subversion2
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 0d858b0b5..553e5a23f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2015-08-27  Daniel Shahaf  <d.s@daniel.shahaf.name>
 
+	* unposted: Completion/Unix/Command/_subversion: _subversion:
+	Avoid SHORT_LOOPS
+
 	* 36304: Completion/Unix/Command/_git: _git-cat-file: Fix
 	regression in 36237
 
diff --git a/Completion/Unix/Command/_subversion b/Completion/Unix/Command/_subversion
index 1cffc3c04..bbcaf3ac9 100644
--- a/Completion/Unix/Command/_subversion
+++ b/Completion/Unix/Command/_subversion
@@ -51,7 +51,7 @@ _svn () {
 	    ${=${${${(M)${(f)"$(_comp_locale; _call_program options svn help $cmd)"#(*Valid options:|(#e))}:#* :*}%% #:*}/ (arg|ARG)/:arg:}/(#b)(-##)([[:alpha:]]##) \[--([a-z-]##)\](:arg:)#/(--$match[3])$match[1]$match[2]$match[4] ($match[1]$match[2])--$match[3]$match[4]}
 	  )
           while (( idx=$args[(I)*--accept:arg:] )); do
-            args[(I)*--accept:arg:]=( --accept':automatic conflict resolution action:((working\:working base\:base '"`for i j in p postpone mc mine-conflict tc theirs-conflict mf mine-full tf theirs-full e edit l launch; print -rn $i\\\\:$j $j\\\\:$j "" `"'))' )
+            args[(I)*--accept:arg:]=( --accept':automatic conflict resolution action:((working\:working base\:base '"`for i j in p postpone mc mine-conflict tc theirs-conflict mf mine-full tf theirs-full e edit l launch; do print -rn $i\\\\:$j $j\\\\:$j ""; done `"'))' )
           done
           while (( idx=$args[(I)*--c(l|hangelist):arg:] )); do
             args[(I)*--c(l|hangelist):arg:]=( \*{--cl,--changelist}':change list:_svn_changelists' )