merge trunk

3 files changed, 18 insertions, 34 deletions

diff --git a/lisp/eshell/esh-ext.el b/lisp/eshell/esh-ext.el
index 603da6f2e30..52df1587d5f 100644
--- a/lisp/eshell/esh-ext.el
+++ b/lisp/eshell/esh-ext.el
@@ -226,20 +226,15 @@ causing the user to wonder if anything's really going on..."
 Adds the given PATH to $PATH.")
    (if args
        (progn
-         (if prepend
-             (setq args (nreverse args)))
-         (while args
-           (setenv "PATH"
-                   (if prepend
-                       (concat (car args) path-separator
-                               (getenv "PATH"))
-                     (concat (getenv "PATH") path-separator
-                             (car args))))
-           (setq args (cdr args))))
-     (let ((paths (parse-colon-path (getenv "PATH"))))
-       (while paths
-         (eshell-printn (car paths))
-         (setq paths (cdr paths)))))))
+         (setq eshell-path-env (getenv "PATH")
+               args (mapconcat 'identity args path-separator)
+               eshell-path-env
+               (if prepend
+                   (concat args path-separator eshell-path-env)
+                 (concat eshell-path-env path-separator args)))
+         (setenv "PATH" eshell-path-env))
+     (dolist (dir (parse-colon-path (getenv "PATH")))
+       (eshell-printn dir)))))
 
 (put 'eshell/addpath 'eshell-no-numeric-conversions t)
 
diff --git a/lisp/eshell/esh-mode.el b/lisp/eshell/esh-mode.el
index 9da3f8e2e79..8a9107e5470 100644
--- a/lisp/eshell/esh-mode.el
+++ b/lisp/eshell/esh-mode.el
@@ -199,7 +199,7 @@ This is used by `eshell-watch-for-password-prompt'."
   :group 'eshell-mode)
 
 (define-obsolete-variable-alias 'eshell-status-in-modeline
-  'eshell-status-in-mode-line "24.2")
+  'eshell-status-in-mode-line "24.3")
 
 (defvar eshell-first-time-p t
   "A variable which is non-nil the first time Eshell is loaded.")
diff --git a/lisp/eshell/eshell.el b/lisp/eshell/eshell.el
index a1717756696..c663de3f40d 100644
--- a/lisp/eshell/eshell.el
+++ b/lisp/eshell/eshell.el
@@ -241,37 +241,31 @@ shells such as bash, zsh, rc, 4dos."
 ;; The following user options modify the behavior of Eshell overall.
 (defvar eshell-buffer-name)
 
-(defsubst eshell-add-to-window-buffer-names ()
+(defun eshell-add-to-window-buffer-names ()
   "Add `eshell-buffer-name' to `same-window-buffer-names'."
   (add-to-list 'same-window-buffer-names eshell-buffer-name))
+(make-obsolete 'eshell-add-to-window-buffer-names
+               "no longer needed." "24.3")
 
-(defsubst eshell-remove-from-window-buffer-names ()
+(defun eshell-remove-from-window-buffer-names ()
   "Remove `eshell-buffer-name' from `same-window-buffer-names'."
   (setq same-window-buffer-names
         (delete eshell-buffer-name same-window-buffer-names)))
+(make-obsolete 'eshell-remove-from-window-buffer-names
+               "no longer needed." "24.3")
 
 (defcustom eshell-load-hook nil
   "A hook run once Eshell has been loaded."
   :type 'hook
   :group 'eshell)
 
-(defcustom eshell-unload-hook
-  '(eshell-remove-from-window-buffer-names
-    eshell-unload-all-modules)
+(defcustom eshell-unload-hook '(eshell-unload-all-modules)
   "A hook run when Eshell is unloaded from memory."
   :type 'hook
   :group 'eshell)
 
 (defcustom eshell-buffer-name "*eshell*"
   "The basename used for Eshell buffers."
-  :set (lambda (symbol value)
-         ;; remove the old value of `eshell-buffer-name', if present
-         (if (boundp 'eshell-buffer-name)
-             (eshell-remove-from-window-buffer-names))
-         (set symbol value)
-         ;; add the new value
-         (eshell-add-to-window-buffer-names)
-         value)
   :type 'string
   :group 'eshell)
 
@@ -307,13 +301,8 @@ buffer selected (or created)."
                     (generate-new-buffer eshell-buffer-name))
                    (t
                     (get-buffer-create eshell-buffer-name)))))
-    ;; Simply calling `pop-to-buffer' will not mimic the way that
-    ;; shell-mode buffers appear, since they always reuse the same
-    ;; window that that command was invoked from.  To achieve this,
-    ;; it's necessary to add `eshell-buffer-name' to the variable
-    ;; `same-window-buffer-names', which is done when Eshell is loaded
     (cl-assert (and buf (buffer-live-p buf)))
-    (pop-to-buffer buf)
+    (pop-to-buffer-same-window buf)
     (unless (eq major-mode 'eshell-mode)
       (eshell-mode))
     buf))