summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--Src/builtin.c7
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index b4304be4d..0bf106413 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-02-10 Felix Rosencrantz <f.rosencrantz@gmail.com>
+ * 23164: Src/builtin.c when PUSHD_SILENT is set, don't print anything
+ from popd/pushd.
+
2007-02-10 Peter Stephenson <p.w.stephenson@ntlworld.com>
* 23162: Src/subst.c, D07multibyte.ztst: ${(#)x} didn't
diff --git a/Src/builtin.c b/Src/builtin.c
index cec211e67..78e4d4b2a 100644
--- a/Src/builtin.c
+++ b/Src/builtin.c
@@ -1123,9 +1123,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');
}