summary refs log tree commit diff
diff options
context:
space:
mode:
authorSven Wischnowsky <wischnow@users.sourceforge.net>2000-04-26 13:13:52 +0000
committerSven Wischnowsky <wischnow@users.sourceforge.net>2000-04-26 13:13:52 +0000
commit07dd91662165b57acd489801c3603d0d147fa89d (patch)
tree4ba478c20cbef46595b2b7681a1d5b7c77b27dc2
parent3743621b21828b701648183bbf8566dbd6ac41a5 (diff)
downloadzsh-07dd91662165b57acd489801c3603d0d147fa89d.tar.gz
zsh-07dd91662165b57acd489801c3603d0d147fa89d.tar.xz
zsh-07dd91662165b57acd489801c3603d0d147fa89d.zip
ensure options are set as expected in _history_complete_word and _bash_completions (10933)
-rw-r--r--ChangeLog4
-rw-r--r--Completion/Commands/_bash_completions7
-rw-r--r--Completion/Commands/_history_complete_word3
3 files changed, 12 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 54f010e2a..835ea5c19 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2000-04-26  Sven Wischnowsky  <wischnow@informatik.hu-berlin.de>
 
+	* 10933: Completion/Commands/_bash_completions,
+ 	Completion/Commands/_history_complete_word: ensure options are set
+ 	as expected in _history_complete_word and _bash_completions
+	
 	* Adam Spiers: 10892: Completion/User/_perl_modules: ensure perl
 	is there and better pattern for searching modules
 
diff --git a/Completion/Commands/_bash_completions b/Completion/Commands/_bash_completions
index 5f3adc1e0..548888138 100644
--- a/Completion/Commands/_bash_completions
+++ b/Completion/Commands/_bash_completions
@@ -25,16 +25,19 @@
 # that will not have been overridden, so you should add '~' to the
 # list of keys at the top of the for-loop.
 
+setopt localoptions nullglob rcexpandparam extendedglob
+unsetopt markdirs globsubst shwordsplit nounset ksharrays
+
 local key=$KEYS[-1]
 
 case $key in
   '!') _main_complete _command_names
        ;;
-  '$') compgen -E
+  '$') compadd - "${(@k)parameters[(R)*export*]}"
        ;;
   '@') _main_complete _hosts
        ;;
-  '/') _files
+  '/') _main_complete _files
        ;;
   '~') _main_complete _users
        ;;
diff --git a/Completion/Commands/_history_complete_word b/Completion/Commands/_history_complete_word
index d904e01f1..bb7e44200 100644
--- a/Completion/Commands/_history_complete_word
+++ b/Completion/Commands/_history_complete_word
@@ -17,6 +17,9 @@
 #
 
 _history_complete_word () {
+  setopt localoptions nullglob rcexpandparam extendedglob
+  unsetopt markdirs globsubst shwordsplit nounset ksharrays
+
   local expl direction stop
 
   if [[ $WIDGET = *newer ]]; then