about summary refs log tree commit diff
path: root/Src/builtin.c
diff options
context:
space:
mode:
authorPaul Ackersviller <packersv@users.sourceforge.net>2007-11-11 22:33:23 +0000
committerPaul Ackersviller <packersv@users.sourceforge.net>2007-11-11 22:33:23 +0000
commitd9fa8166889119d1b827c0326dbaf4e90e7b2b30 (patch)
treee02651dc83aed6cce39416d019e8bfa78f5487f0 /Src/builtin.c
parentfadd1021f8dc86883a8bcddd15dd848b7315c6c4 (diff)
downloadzsh-d9fa8166889119d1b827c0326dbaf4e90e7b2b30.tar.gz
zsh-d9fa8166889119d1b827c0326dbaf4e90e7b2b30.tar.xz
zsh-d9fa8166889119d1b827c0326dbaf4e90e7b2b30.zip
Merge of 23164: when PUSHD_SILENT is set, don't print anything from popd/pushd.
Diffstat (limited to 'Src/builtin.c')
-rw-r--r--Src/builtin.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/Src/builtin.c b/Src/builtin.c
index cda6f0198..24af7c6d3 100644
--- a/Src/builtin.c
+++ b/Src/builtin.c
@@ -1126,9 +1126,10 @@ cd_new_pwd(int func, LinkNode dir)
     set_pwd_env();
 
     if (isset(INTERACTIVE)) {
-	if (unset(PUSHDSILENT) && func != BIN_CD)
-	    printdirstack();
-	else if (doprintdir) {
+	if (func != BIN_CD) {
+            if (unset(PUSHDSILENT))
+	        printdirstack();
+        } else if (doprintdir) {
 	    fprintdir(pwd, stdout);
 	    putchar('\n');
 	}