diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2010-11-06 13:08:58 +0100 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2010-11-06 13:08:58 +0100 |
| commit | f8aefe82d2bbca46b162c75b1217d8b4bd9ebb09 (patch) | |
| tree | 182405d52bf4b204a0b219c933612cc9012fe651 /lisp | |
| parent | 4abfb7532c948b4c8305e7590b95f8a512fea6d3 (diff) | |
| download | emacs-f8aefe82d2bbca46b162c75b1217d8b4bd9ebb09.tar.gz emacs-f8aefe82d2bbca46b162c75b1217d8b4bd9ebb09.tar.bz2 emacs-f8aefe82d2bbca46b162c75b1217d8b4bd9ebb09.zip | |
* shell.el (shell-process-popd): Made aware of comint-file-name-prefix.
Diffstat (limited to 'lisp')
| -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 4a2d3ceba17..f9280d5f0c6 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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). diff --git a/lisp/shell.el b/lisp/shell.el index 6cb9a511101..b7f62efdb85 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))) |