[Emacs-diffs] Changes to emacs/lisp/shell.el,v [EMACS_22_BASE]

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Branch:         EMACS_22_BASE
Changes by:     Glenn Morris <gm>       07/09/13 07:26:32

Index: shell.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/shell.el,v
retrieving revision 1.149.2.1
retrieving revision 1.149.2.2
diff -u -b -r1.149.2.1 -r1.149.2.2
--- shell.el    25 Jul 2007 04:47:03 -0000      1.149.2.1
+++ shell.el    13 Sep 2007 07:26:32 -0000      1.149.2.2
@@ -802,7 +802,9 @@
 command again."
   (interactive)
   (let* ((proc (get-buffer-process (current-buffer)))
-        (pmark (process-mark proc)))
+        (pmark (process-mark proc))
+        (started-at-pmark (= (point) (marker-position pmark))))
+    (save-excursion
     (goto-char pmark)
     ;; If the process echoes commands, don't insert a fake command in
     ;; the buffer or it will appear twice.
@@ -846,7 +848,8 @@
                   (setq shell-dirstack (cdr ds)
                         shell-last-dir (car shell-dirstack))
                   (shell-dirstack-message))
-         (error (message "Couldn't cd")))))))
+           (error (message "Couldn't cd"))))))
+    (if started-at-pmark (goto-char (marker-position pmark)))))
 
 ;; For your typing convenience:
 (defalias 'dirs 'shell-resync-dirs)