From 557baa173c6be93e475d6e25d3fb0c80164d6e87 Mon Sep 17 00:00:00 2001 From: Bart Schaefer Date: Mon, 29 Aug 2011 16:08:28 +0000 Subject: [PATCH] users/16291: prompt_bart_preexec uses history text in the non-"fg" case to avoid alias expansion. --- ChangeLog | 7 ++++++- Functions/Prompts/prompt_bart_setup | 5 +++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0bd63d991..5c800d16b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2011-08-29 Barton E. Schaefer + + * users/16291: Functions/Prompts/prompt_bart_setup: revert to + using history text in non-"fg" case to avoid alias expansion. + 2011-08-29 Mikael Magnusson * 29722: Completion/X/Command/_mplayer: escape colon. @@ -15344,5 +15349,5 @@ ***************************************************** * This is used by the shell to define $ZSH_PATCHLEVEL -* $Revision: 1.5448 $ +* $Revision: 1.5449 $ ***************************************************** diff --git a/Functions/Prompts/prompt_bart_setup b/Functions/Prompts/prompt_bart_setup index a264cdce1..6cbbb71c7 100644 --- a/Functions/Prompts/prompt_bart_setup +++ b/Functions/Prompts/prompt_bart_setup @@ -70,7 +70,7 @@ integer PSCOL=1 typeset PSCMD= prompt_bart_preexec () { - setopt localoptions noxtrace noksharrays unset + setopt localoptions noxtrace noshwordsplit noksharrays unset local -a cmd; cmd=( ${(z)3} ) if [[ $cmd[1] = fg ]] then @@ -84,7 +84,8 @@ prompt_bart_preexec () { then PSCMD=$jobtexts[%?$2] else - PSCMD=$2 + # Use history text to avoid alias expansion + PSCMD=$history[$HISTCMD] fi return 0 }