18058, 18060: merge from 4.1

2 files changed, 29 insertions, 0 deletions

diff --git a/Completion/Zsh/Command/.distfiles b/Completion/Zsh/Command/.distfiles
new file mode 100644
index 000000000..dae8c4016
--- /dev/null
+++ b/Completion/Zsh/Command/.distfiles
@@ -0,0 +1,11 @@
+DISTFILES_SRC='
+.distfiles
+_autoload    _disable     _kill        _sched       _typeset     _zed
+_bindkey     _echotc      _mere        _set         _unhash      _zftp
+_builtin     _emulate     _precommand  _setopt      _unsetopt    _zle
+_cd          _enable      _print       _source      _wait        _zmodload
+_command     _fc          _prompt      _stat        _which       _zpty
+_compdef     _hash        _read        _trap        _zcompile    _zstyle
+_echoti      _ttyctl      _ulimit      _vared       _alias       _jobs_builtin
+_zmv
+'
diff --git a/Completion/Zsh/Command/_zmv b/Completion/Zsh/Command/_zmv
new file mode 100644
index 000000000..bc639f3ec
--- /dev/null
+++ b/Completion/Zsh/Command/_zmv
@@ -0,0 +1,18 @@
+#compdef zmv zln zcp
+
+_arguments -s -S -A '-*' \
+  '(-C -L -s -p)-M[force mv]' \
+  '(-M -L -s -p)-C[force cp]' \
+  '(-M -C -p)-L[force ln]' \
+  '-f[force overwriting of destination files]' \
+  '-i[interactive: prompt for each operation]' \
+  '-n[no execution: just print what would happen]' \
+  '-Q[force bare glob qualifiers on]' \
+  '(-C -M)-s[symbolic, passed down to ln]' \
+  '-v[verbose: print line as it is executed]' \
+  '-o[specify options to pass to underlying command]: opt string' \
+  '(-M -C -L -s)-p+[specify program to run instead of cp, ln or mv]:program:_command_names -e' \
+  '(-W)-w[implicitly add parenthesis to wildcards in the pattern]' \
+  '(-w)-W[like -w, but turn wildcards in replacement patterns into references]' \
+  '1:source pattern:_files' \
+  '2:desination pattern:_files'