Mercurial > emacs
changeset 111416:7a88e72dff57
* shell.el (shell-process-popd): Made aware of comint-file-name-prefix.
| author | Michael Albinus <michael.albinus@gmx.de> |
|---|---|
| date | Sat, 06 Nov 2010 13:08:58 +0100 |
| parents | c16170026954 |
| children | 6316c70b291e |
| files | lisp/ChangeLog lisp/shell.el |
| diffstat | 2 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sat Nov 06 11:31:56 2010 +0100 +++ b/lisp/ChangeLog Sat Nov 06 13:08:58 2010 +0100 @@ -1,3 +1,7 @@ +2010-11-05 Christian Millour <cm@abtela.com> (tiny change) + + * shell.el (shell-process-popd): Made aware of comint-file-name-prefix. + 2010-11-05 Jan Djärv <jan.h.d@swipnet.se> * mouse.el (mouse-yank-primary): Update comment (Bug#6802).
--- a/lisp/shell.el Sat Nov 06 11:31:56 2010 +0100 +++ b/lisp/shell.el Sat Nov 06 13:08:58 2010 +0100 @@ -700,7 +700,7 @@ (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)))