summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Stephenson <p.stephenson@samsung.com>2018-12-04 17:19:45 +0000
committerPeter Stephenson <p.stephenson@samsung.com>2018-12-04 17:19:45 +0000
commit42020cdabbd2e09e2ae11b48fded6f50cd4fccff (patch)
tree8229462c89f7fe896b6b2e3447ce0c2a671d00fe
parent7f62255b493dfc75dc34a185f6f10a3cc846ba79 (diff)
downloadzsh-42020cdabbd2e09e2ae11b48fded6f50cd4fccff.tar.gz
zsh-42020cdabbd2e09e2ae11b48fded6f50cd4fccff.tar.xz
zsh-42020cdabbd2e09e2ae11b48fded6f50cd4fccff.zip
43861: make "(#" completion safer by checking for ")"
-rw-r--r--ChangeLog4
-rw-r--r--Completion/Unix/Type/_files2
2 files changed, 3 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index a65a6ea07..fbd4321c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 2018-12-04  Peter Stephenson  <p.stephenson@samsung.com>
 
-	* 43860: Completion/Unix/Type/_files: complete globbing flags at
-	start of word.
+	* 43860, 43861: Completion/Unix/Type/_files: complete globbing
+	flags at start of word.
 
 2018-11-29  Peter Stephenson  <p.stephenson@samsung.com>
 
diff --git a/Completion/Unix/Type/_files b/Completion/Unix/Type/_files
index d44ac31a1..e3212c952 100644
--- a/Completion/Unix/Type/_files
+++ b/Completion/Unix/Type/_files
@@ -17,7 +17,7 @@ if _have_glob_qual $PREFIX; then
     _globquals && ret=0
   fi
   return ret
-elif [[ $_comp_caller_options[extendedglob] == on ]] && compset -P '\(\#'; then
+elif [[ $_comp_caller_options[extendedglob] == on && $PREFIX = \(\#[^\)]# ]] && compset -P '\(\#'; then
   # Globbing flags can start at beginning of word, even though
   # glob qualifiers can't.
   _globflags && return