summary refs log tree commit diff
path: root/Completion
diff options
context:
space:
mode:
Diffstat (limited to 'Completion')
-rw-r--r--Completion/Commands/_bash_completions7
-rw-r--r--Completion/Commands/_history_complete_word3
2 files changed, 8 insertions, 2 deletions
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