about summary refs log tree commit diff
diff options
context:
space:
mode:
authorBarton E. Schaefer <schaefer@zsh.org>2015-04-25 10:47:31 -0700
committerBarton E. Schaefer <schaefer@zsh.org>2015-04-25 10:47:31 -0700
commit33ff5d06f264421480ecf35575d12fb981080066 (patch)
tree8335df52294acebc75ec06af25c881d5dbaf40d3
parent76fcbc6edade87d45dd757783c3c8eda747d39fa (diff)
downloadzsh-33ff5d06f264421480ecf35575d12fb981080066.tar.gz
zsh-33ff5d06f264421480ecf35575d12fb981080066.tar.xz
zsh-33ff5d06f264421480ecf35575d12fb981080066.zip
34961: add backslash to alias expansion matching (related to workers/32186)
-rw-r--r--ChangeLog3
-rw-r--r--Completion/Base/Completer/_expand2
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index bd6050ea3..cd6637c86 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2015-04-25  Barton E. Schaefer  <schaefer@zsh.org>
 
+	* 34961: Completion/Base/Completer/_expand: add backslash to alias
+	expansion matching (related to workers/32186)
+
 	* 34961: Test/D02glob.ztst: test for breadth-first glob with (Y1)
 	qualifier (originally workers/32726)
 
diff --git a/Completion/Base/Completer/_expand b/Completion/Base/Completer/_expand
index e52144cb7..3c76e1328 100644
--- a/Completion/Base/Completer/_expand
+++ b/Completion/Base/Completer/_expand
@@ -87,7 +87,7 @@ if [[ "$force" = *s* ]] ||
 
   setopt aliases
   eval 'exp=( ${${(e)exp//\\[ 	
-]/ }//(#b)([ 	
+]/ }//(#b)([ 	\\
 ])/\\$match[1]} )' 2>/dev/null
   setopt NO_aliases
 else