Mercurial > emacs

changeset 64830:e5c6f54442d2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(eshell): Avoid warnings about eshell-mode.
author Richard M. Stallman <rms@gnu.org>
date Tue, 09 Aug 2005 11:37:32 +0000
parents 9c1dcec0d1fb
children 40c02e6cdccd
files lisp/eshell/eshell.el
diffstat 1 files changed, 3 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/eshell/eshell.el	Tue Aug 09 11:36:58 2005 +0000
+++ b/lisp/eshell/eshell.el	Tue Aug 09 11:37:32 2005 +0000
@@ -374,11 +374,10 @@
     ;; `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)
+    (if (fboundp 'eshell-mode)
+	(unless (eq major-mode 'eshell-mode)
+	  (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 ()