summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--Completion/Unix/Command/_init_d4
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 6dbde8354..ebea335e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-01-29  Clint Adams  <clint@zsh.org>
+
+	* 16514: Completion/Unix/Command/_init_d: do not attempt
+	to read file if it doesn't exist, match pipe-separated lists
+	and characters following the parenthesis, and don't wantonly
+	remove hyphens from completions.
+
 2002-01-28  Sven Wischnowsky  <wischnow@zsh.org>
 
 	* 16507: Completion/Zsh/Type/_command_names: slight improvement
diff --git a/Completion/Unix/Command/_init_d b/Completion/Unix/Command/_init_d
index 280b0a9af..b8bd0c61f 100644
--- a/Completion/Unix/Command/_init_d
+++ b/Completion/Unix/Command/_init_d
@@ -9,8 +9,8 @@ local magic cmds what
 
 what='(st(art|op|atus)|(force-|)re(start|load)|debug_(up|down)|dump(|_stats)|add|delete|clean|list)'
 
-read -u0k 2 magic < $words[1] && [[ $magic = '#!' ]] &&
-    cmds=( ${${(j:|:s:|:)${(M)${(f)"$(< $words[1])"}:#[[:blank:]]#(\'|)${~what}(|${~what})#(\'|)\)}}//[^a-z_]} )
+[[ -f $words[1] ]] && read -u0k 2 magic < $words[1] && [[ $magic = '#!' ]] &&
+    cmds=( ${${(j:|:s:|:)${(M)${(f)"$(< $words[1])"}:#[[:blank:]]#\'#${~what}(\|${~what})#\'#\)*}}//[^a-z_-]} )
 
 # This would be the pattern to use every line of the form <space>foo).
 # Some people say this might match too many lines...