about summary refs log tree commit diff
diff options
context:
space:
mode:
authorClint Adams <clint@users.sourceforge.net>2001-03-26 19:01:58 +0000
committerClint Adams <clint@users.sourceforge.net>2001-03-26 19:01:58 +0000
commitb0176cb54f2a7fdde6e4226e0691c88c1674af34 (patch)
tree0823981a57221ffc228dce094b583454fbcdd214
parente7a25bf84109e391bf823a12076ad13c76003927 (diff)
downloadzsh-b0176cb54f2a7fdde6e4226e0691c88c1674af34.tar.gz
zsh-b0176cb54f2a7fdde6e4226e0691c88c1674af34.tar.xz
zsh-b0176cb54f2a7fdde6e4226e0691c88c1674af34.zip
13779/13783: fixes from Michal Politowski
-rw-r--r--ChangeLog6
-rw-r--r--Completion/Builtins/_pids2
-rw-r--r--Completion/Commands/_complete_tag5
3 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 7b0e5d2cd..57dd6ac1a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2001-03-26  Clint Adams  <schizo@debian.org>
 
+	* 13783 from Michal Politowski: Completion/Builtins/_pids:
+	handle pids that don't have a preceding space in ps output.
+
+	* 13779 from Michal Politowski: Completion/Commands/_complete_tag:
+	typo fixes?
+
 	* 13777: Src/Builtins/rlimits.awk: add maxfilelocks
 	for glibc 2.2.
 
diff --git a/Completion/Builtins/_pids b/Completion/Builtins/_pids
index ad15031b6..b298322e2 100644
--- a/Completion/Builtins/_pids
+++ b/Completion/Builtins/_pids
@@ -13,7 +13,7 @@ if [[ "$1" = -m ]]; then
   shift 2
 elif [[ "$PREFIX$SUFFIX" = ([%-]*|[0-9]#) ]]; then
   all=()
-  match="*[[:blank:]]${PREFIX}[0-9]#${SUFFIX}[[:blank:]]*"
+  match="(*[[:blank:]]|)${PREFIX}[0-9]#${SUFFIX}[[:blank:]]*"
 else
   all=(-U)
   match="*[[:blank:]]*[[/[:blank:]]$PREFIX*$SUFFIX*"
diff --git a/Completion/Commands/_complete_tag b/Completion/Commands/_complete_tag
index 4470a2ad4..61641271f 100644
--- a/Completion/Commands/_complete_tag
+++ b/Completion/Commands/_complete_tag
@@ -46,11 +46,12 @@ if [[ -f $c_path$c_Tagsfile ]]; then
 #  c_tags_array=($(perl -ne '/([a-zA-Z_0-9]+)[ \t:;,\(]*\x7f/ &&
 #                  print "$1\n"' $c_path$c_Tagsfile))
   _main_complete - '' _wanted etags expl 'emacs tags' \
+
       compadd -a c_tags_array
-elif [[ -f $c_tagspath ]]; then
+elif [[ -f $c_path$c_tagsfile ]]; then
   # tags doesn't have as much in, but the tag is easy to find.
   # we can use awk here.
-  c_tags_array=($(awk '{ print $1 }' $c_path$c_Tagsfile))
+  c_tags_array=($(awk '{ print $1 }' $c_path$c_tagsfile))
   _main_complete - '' _wanted vtags expl 'vi tags' compadd -a c_tags_array
 else
   return 1