[Emacs-diffs] Changes to emacs/lisp/eshell/eshell.el

[Richard M . Stallman]

Index: emacs/lisp/eshell/eshell.el
diff -c emacs/lisp/eshell/eshell.el:1.19 emacs/lisp/eshell/eshell.el:1.20
*** emacs/lisp/eshell/eshell.el:1.19    Mon Aug  1 15:04:33 2005
--- emacs/lisp/eshell/eshell.el Tue Aug  9 11:37:32 2005
***************
*** 374,384 ****
      ;; `same-window-buffer-names', which is done when Eshell is loaded
      (assert (and buf (buffer-live-p buf)))
      (pop-to-buffer buf)
!     (unless (fboundp 'eshell-mode)
        (error "`eshell-auto' must be loaded before Eshell can be used"))
-     (unless (eq major-mode 'eshell-mode)
-       (eshell-mode))
-     (assert (eq major-mode 'eshell-mode))
      buf))
  
  (defun eshell-return-exits-minibuffer ()
--- 374,383 ----
      ;; `same-window-buffer-names', which is done when Eshell is loaded
      (assert (and buf (buffer-live-p buf)))
      (pop-to-buffer buf)
!     (if (fboundp 'eshell-mode)
!       (unless (eq major-mode 'eshell-mode)
!         (eshell-mode))
        (error "`eshell-auto' must be loaded before Eshell can be used"))
      buf))
  
  (defun eshell-return-exits-minibuffer ()