From e01739d2b73153823cb5689ec787202f4d321e2c Mon Sep 17 00:00:00 2001
From: "Barton E. Schaefer" <schaefer@zsh.org>
Date: Sat, 30 Aug 2014 14:09:23 -0700
Subject: 33069: remove internal quoting before lookup when expanding aliases
 in an unquoted word

---
 ChangeLog                               | 6 ++++++
 Completion/Base/Completer/_expand_alias | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 3a2016e66..cae6399ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-08-30  Barton E. Schaefer  <schaefer@zsh.org>
+
+	* 33069: Completion/Base/Completer/_expand_alias: remove internal
+	quoting	before looking up aliases when expanding aliases in an
+	unquoted word
+
 2014-08-29  Peter Stephenson  <p.stephenson@samsung.com>
 
 	* 33057: Doc/Zsh/prompt.yo, Src/prompt.c: %e in prompts shows
diff --git a/Completion/Base/Completer/_expand_alias b/Completion/Base/Completer/_expand_alias
index 8240e4162..9064ce830 100644
--- a/Completion/Base/Completer/_expand_alias
+++ b/Completion/Base/Completer/_expand_alias
@@ -25,6 +25,8 @@ else
   pre=(_main_complete - aliases)
 fi
 
+[[ "$compstate[quoting]" = (single|double) ]] || word="${(Q)word}"
+
 zstyle -s ":completion:${curcontext}:" regular tmp || tmp=yes
 case $tmp in
 always) sel=r;;
-- 
cgit 1.4.1