summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2009-02-20 21:49:56 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2009-02-20 21:49:56 +0000
commit84864d5780bf666e63e7d2f6a584a58f3555b933 (patch)
tree42494e18aa5eb90fed61f4b50ee25f41b7a246f5
parent1270a9d8ee0ea6ae533546b07a6714f351346600 (diff)
downloadzsh-84864d5780bf666e63e7d2f6a584a58f3555b933.tar.gz
zsh-84864d5780bf666e63e7d2f6a584a58f3555b933.zip
26588: don't expand aliases in run-help
-rw-r--r--ChangeLog7
-rw-r--r--Src/Zle/zle_tricky.c3
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 10062d56c..03a2881cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-02-20 Peter Stephenson <p.w.stephenson@ntlworld.com>
+
+ * 26588: Src/Zle/zle_tricky.c: don't expand aliases in run-help
+ since the run-help function can do that.
+
2009-02-20 Peter Stephenson <pws@csr.com>
* 26584: configure.ac, Src/Modules/tcp.h: use bind/netdb.h where
@@ -11215,5 +11220,5 @@
*****************************************************
* This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.4574 $
+* $Revision: 1.4575 $
*****************************************************
diff --git a/Src/Zle/zle_tricky.c b/Src/Zle/zle_tricky.c
index f9ae3aa1b..1fcb4dee6 100644
--- a/Src/Zle/zle_tricky.c
+++ b/Src/Zle/zle_tricky.c
@@ -2799,8 +2799,7 @@ processcmd(UNUSED(char **args))
char *s;
int m = zmult, na = noaliases;
- if (!strcmp(bindk->nam, "which-command"))
- noaliases = 1;
+ noaliases = 1;
s = getcurcmd();
noaliases = na;
if (!s)