about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Stephenson <pws@zsh.org>2017-02-06 13:47:40 +0000
committerPeter Stephenson <pws@zsh.org>2017-02-06 13:47:40 +0000
commite641d8e9c13729d716da75c3a4bb7b711c64fb70 (patch)
tree0ad0cb4620074bb019129712faa9cc152834e3ee
parentbb6c08b51a0798700b6fdd0b75581dca21dc4e5b (diff)
downloadzsh-e641d8e9c13729d716da75c3a4bb7b711c64fb70.tar.gz
zsh-e641d8e9c13729d716da75c3a4bb7b711c64fb70.tar.xz
zsh-e641d8e9c13729d716da75c3a4bb7b711c64fb70.zip
40434: Jan Matejek: patchutils completion update
-rw-r--r--ChangeLog5
-rw-r--r--Completion/Unix/Command/_patchutils4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 1b88bfd25..b11300e5b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2017-02-06  Peter Stephenson  <p.stephenson@samsung.com>
+
+	* Jan Matejek: 40434: Completion/Unix/Command/_patchutils:
+	update.
+
 2017-02-04  Daniel Shahaf  <d.s@daniel.shahaf.name>
 
 	* unposted: Doc/Zsh/contrib.yo,
diff --git a/Completion/Unix/Command/_patchutils b/Completion/Unix/Command/_patchutils
index 323c0a730..50ea3e4c4 100644
--- a/Completion/Unix/Command/_patchutils
+++ b/Completion/Unix/Command/_patchutils
@@ -43,6 +43,7 @@ case $service in
       '(-F --files)'{-F+,--files=}'[only list files within specified range]:range'
       '--strip=[remove specified number of pathname components before displaying]:components'
       '--addprefix=[insert specified path prefix before displaying path names]:prefix:_directories'
+      '*:diff file:_files'
     )
   ;|
   grepdiff|lsdiff)
@@ -58,7 +59,6 @@ case $service in
       \*{-v,--verbose}'[verbose operation]' 
       '(-H --with-filename -h --no-filename)'{-H,--with-filename}'[print the name of the patch file containing each patch]'
       '!--filter' '!--grep'
-      '*:diff file:_files'
     )
   ;;
   grepdiff|filterdiff)
@@ -71,7 +71,7 @@ case $service in
       '--as-numbered-lines=[display lines of selected hunks]:line numbers:(before after)'
       "--remove-timestamps[don't include timestamps in output]"
     )
-  ;;
+  ;|
   filterdiff)
     args+=(
       '(-X --exclude-from-file)'{-X+,--exclude-from-file=}'[exclude files matching any pattern listed in specified file]:file:_files'