# HG changeset patch
# User Michael Albinus <michael.albinus@gmx.de>
# Date 1289045338 -3600
# Node ID 7a88e72dff578443714df998f0e59e44dcebdb3c
# Parent  c161700269542cdc9c7006a26866fb36efd8c9b9
* shell.el (shell-process-popd): Made aware of comint-file-name-prefix.

diff -r c16170026954 -r 7a88e72dff57 lisp/ChangeLog
--- 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).
diff -r c16170026954 -r 7a88e72dff57 lisp/shell.el
--- 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)))