From 3214cf0a74976e8b8d2b5dc1013666d7b9b95a9a Mon Sep 17 00:00:00 2001
From: Mikael Magnusson <mikachu@gmail.com>
Date: Fri, 27 May 2011 14:36:33 +0000
Subject: 29384: Add _comp_caller_options

---
 Completion/Unix/Type/_have_glob_qual | 4 ++--
 Completion/Unix/Type/_path_files     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'Completion/Unix/Type')

diff --git a/Completion/Unix/Type/_have_glob_qual b/Completion/Unix/Type/_have_glob_qual
index d174406df..7b558bfd5 100644
--- a/Completion/Unix/Type/_have_glob_qual
+++ b/Completion/Unix/Type/_have_glob_qual
@@ -16,9 +16,9 @@ local complete
 [[ $2 = complete ]] && complete=")"
 
 [[ -z $compstate[quote] &&
-  ( -o bareglobqual &&
+  ( $_comp_caller_options[bareglobqual] == on &&
        $1 = (#b)(((*[^\\\$]|)(\\\\)#)\()([^\)\|\~]#)$complete &&
        ${#match[1]} -gt 1 ||
-     -o extendedglob &&
+     $_comp_caller_options[extendedglob] == on &&
        $1 = (#b)(((*[^\\\$]|)(\\\\)#)"(#q")([^\)]#)$complete
     ) ]]
diff --git a/Completion/Unix/Type/_path_files b/Completion/Unix/Type/_path_files
index 1c272baba..858fe3f74 100644
--- a/Completion/Unix/Type/_path_files
+++ b/Completion/Unix/Type/_path_files
@@ -16,7 +16,7 @@ local -a match mbegin mend
 # The later test looks for an outstanding quote.
 if _have_glob_qual $PREFIX; then
    compset -p ${#match[1]}
-   if [[ -o extendedglob ]] && compset -P '\#'; then
+   if [[ $_comp_caller_options[extendedglob] == on ]] && compset -P '\#'; then
      _globflags
    else
      _globquals
-- 
cgit 1.4.1