summary refs log tree commit diff
diff options
context:
space:
mode:
authorFelix Rosencrantz <f_rosencrantz@users.sourceforge.net>2002-02-04 06:25:35 +0000
committerFelix Rosencrantz <f_rosencrantz@users.sourceforge.net>2002-02-04 06:25:35 +0000
commit2d35fd6ab0228ce2b698d7778c4ae134d7408a67 (patch)
tree99ac930db0f0f87c09ff17a12e540be0c9df6273
parent1dd643b01672c17fb96085dd5377f565530b9fb5 (diff)
downloadzsh-2d35fd6ab0228ce2b698d7778c4ae134d7408a67.tar.gz
zsh-2d35fd6ab0228ce2b698d7778c4ae134d7408a67.tar.xz
zsh-2d35fd6ab0228ce2b698d7778c4ae134d7408a67.zip
Fixed some problems with _cvs and flags. Fixed _perl to complete a script
args with _normal.
-rw-r--r--ChangeLog7
-rw-r--r--Completion/Unix/Command/_cvs8
-rw-r--r--Completion/Unix/Command/_perl3
3 files changed, 13 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 86899971c..6145549d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-02-03  Felix Rosencrantz  <f_rosencrantz@yahoo.com>
+
+	* 16546: Completion/Unix/Command/_cvs,
+	Completion/Unix/Command/_perl: Fixed problem with cvs/arguments -A
+	flag.  Fixed problem with "cvs log -R".  Also, _perl completes
+	the arguments to a perl script with _normal.
+
 2002-02-03  Clint Adams  <clint@zsh.org>
 
 	* 16540: Completion/Unix/Command/_rsync: include short options and
diff --git a/Completion/Unix/Command/_cvs b/Completion/Unix/Command/_cvs
index fb2d7092e..2e3288798 100644
--- a/Completion/Unix/Command/_cvs
+++ b/Completion/Unix/Command/_cvs
@@ -149,8 +149,8 @@ _cvs_rannotate () {
 _cvs_checkout () {
   # "+ANnk:d:flRpQqcsr:D:j:P"
   _arguments -s \
-    '-A[reset sticky tags, dates and -k]' \
     '-N[don'\''t shorten module paths]' \
+    '-A[reset sticky tags, dates and -k]' \
     '-n[disable checkout program]' \
     '-f[use most recent revision if -D/-r is not matched]' \
     '(-R)-l[don'\''t recursive]' \
@@ -398,8 +398,8 @@ _cvs_log () {
   _arguments -s \
     '-b[default branch]' \
     '(-t)-h[header]' \
-    '(-R)-l[don'\''t recursive]' \
-    '(-l)-R[recursive]' \
+    '-l[don'\''t recurse]' \
+    '-R[Print the name of RCS file in the repository]' \
     '-N[don'\''t list tags]' \
     '(-h)-t[header with descriptive text]' \
     '-d+[specify dates]:dates:' \
@@ -541,8 +541,8 @@ _cvs_unedit () {
 _cvs_update () {
   # "+ApCPflRQqduk:r:D:j:I:W:"
   _arguments -s \
-    '-A[reset sticky tags, dates and -k]' \
     '-C[overwrite local modification]' \
+    '-A[reset sticky tags, dates and -k]' \
     '-p[check out to standard output]' \
     '-P[prune empty directory]' \
     '-f[use head revision]' \
diff --git a/Completion/Unix/Command/_perl b/Completion/Unix/Command/_perl
index d9554e431..29016e333 100644
--- a/Completion/Unix/Command/_perl
+++ b/Completion/Unix/Command/_perl
@@ -31,7 +31,8 @@ _perl () {
     "-V-[print perl configuration information]:configuration keys:_perl_config_vars" \
     '-w[TURN WARNINGS ON FOR COMPILATION OF YOUR SCRIPT. Recommended.]' \
     '-x-[strip off text before #!perl line and perhaps cd to directory]:directory to cd to:_files -/' \
-    '*:Perl script:_files -/ -g \*.p\[ml\]'
+    '1:Perl script:_files -/ -g \*.p\[ml\]' \
+    '*::args: _normal' 
 }
 
 _perl_m_opt () {