diff options
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/shell.el | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4a2d3ceba1..f9280d5f0c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2010-11-05 Christian Millour <[email protected]> (tiny change) + + * shell.el (shell-process-popd): Made aware of comint-file-name-prefix. + 2010-11-05 Jan Djärv <[email protected]> * mouse.el (mouse-yank-primary): Update comment (Bug#6802). diff --git a/lisp/shell.el b/lisp/shell.el index 6cb9a51110..b7f62efdb8 100644 --- a/lisp/shell.el +++ b/lisp/shell.el @@ -700,7 +700,7 @@ Environment variables are expanded, see function `substitute-in-file-name'." (defun shell-process-popd (arg) (let ((num (or (shell-extract-num arg) 0))) (cond ((and num (= num 0) shell-dirstack) - (shell-cd (car shell-dirstack)) + (shell-cd (shell-prefixed-directory-name (car shell-dirstack))) (setq shell-dirstack (cdr shell-dirstack)) (shell-dirstack-message)) ((and num (> num 0) (<= num (length shell-dirstack))) |