about summary refs log tree commit diff
diff options
context:
space:
mode:
authorBart Schaefer <barts@users.sourceforge.net>2005-11-19 15:47:47 +0000
committerBart Schaefer <barts@users.sourceforge.net>2005-11-19 15:47:47 +0000
commit5930b8fa6b706e390e21b24aaf57fc6976708349 (patch)
tree73941eacb94c0ece21d889dcbffa1bf45ea051f6
parent31e405fc14c641f2f3f9f8169cdead8cf078af67 (diff)
downloadzsh-5930b8fa6b706e390e21b24aaf57fc6976708349.tar.gz
zsh-5930b8fa6b706e390e21b24aaf57fc6976708349.tar.xz
zsh-5930b8fa6b706e390e21b24aaf57fc6976708349.zip
Belated commit of 21994: fix option-argument semantics in sed completion.
-rw-r--r--ChangeLog6
-rw-r--r--Completion/Unix/Command/_sed8
2 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index ecd7094a3..f3350b6fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -47,6 +47,12 @@
 	* 21998: Completion/Unix/Command/_gnutls:
 	completion for gnutls-cli and gnutls-cli-debug.
 
+2005-11-10  Bart Schaefer  <schaefer@zsh.org>
+
+	* 21994: Completion/Unix/Command/_sed: use correct semantics for
+	arguments of the -e -f -i and -l options.  May need further tweaks
+	for non-GNU seds.
+
 2005-11-07  Clint Adams  <clint@zsh.org>
 
 	* 21989: Completion/Debian/Command/_dpkg-cross:
diff --git a/Completion/Unix/Command/_sed b/Completion/Unix/Command/_sed
index 46c3eb475..0175364d9 100644
--- a/Completion/Unix/Command/_sed
+++ b/Completion/Unix/Command/_sed
@@ -4,16 +4,16 @@ local args
 
 args=(
   '(-n --quiet --silent)'{-n,--quiet,--silent}'[suppress automatic printing of pattern space]'
-  '(1)*'{-e,--expresssion=}'[add sed commands to run]:sed script'
-  '(1)*'{-f,--file=}'[add contents of file to commands to run]:file:_files'
+  '(1)*'{-e,--expression=-}'[add sed commands to run]:sed script'
+  '(1)*'{-f,--file=-}'[add contents of file to commands to run]:file:_files'
   '(-e)1: :_guard "^-*" sed script'
   ':input file:_files'
 )
 
 if _pick_variant gnu=GNU unix --version; then
   args+=(
-    '(-i --in-place)'{-i,--in-place=}'[edit files in place]::suffix for backup'
-    '(-l --line-length)'{-l,--line-length=}'[specify line-wrap length for the l command]'
+    '(-i --in-place)'{-i-,--in-place=-}'[edit files in place]::suffix for backup'
+    '(-l --line-length)'{-l,--line-length=-}'[specify line-wrap length for the l command]'
     '(-r --regexp-extended)'{-r,--regexp-extended}'[use extended regular expressions]'
     '(-s --separate)'{-s,--separate}'[consider files separately instead of as a combined stream]'
     '(-u --unbuffered)'{-u,--unbuffered}'[disable data buffering]'