diff options
| author | Bart Schaefer <barts@users.sourceforge.net> | 2011-08-29 16:08:28 +0000 |
|---|---|---|
| committer | Bart Schaefer <barts@users.sourceforge.net> | 2011-08-29 16:08:28 +0000 |
| commit | 557baa173c6be93e475d6e25d3fb0c80164d6e87 (patch) | |
| tree | d85cc11e48bfa2c1f3d02708c245cb404581d6c3 | |
| parent | c0ec6c4238d72ad1b7bcdfd5f4955e7cd8ebc61c (diff) | |
| download | zsh-557baa173c6be93e475d6e25d3fb0c80164d6e87.tar.gz zsh-557baa173c6be93e475d6e25d3fb0c80164d6e87.tar.xz zsh-557baa173c6be93e475d6e25d3fb0c80164d6e87.zip | |
users/16291: prompt_bart_preexec uses history text in the non-"fg" case
to avoid alias expansion.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | 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 <schaefer@brasslantern.com> + + * 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 <mikachu@gmail.com> * 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 } |