diff options
| -rw-r--r-- | lisp/eshell/eshell.el | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lisp/eshell/eshell.el b/lisp/eshell/eshell.el index 8c13b485cc2..ce9641026c7 100644 --- a/lisp/eshell/eshell.el +++ b/lisp/eshell/eshell.el | |||
| @@ -374,11 +374,10 @@ buffer selected (or created)." | |||
| 374 | ;; `same-window-buffer-names', which is done when Eshell is loaded | 374 | ;; `same-window-buffer-names', which is done when Eshell is loaded |
| 375 | (assert (and buf (buffer-live-p buf))) | 375 | (assert (and buf (buffer-live-p buf))) |
| 376 | (pop-to-buffer buf) | 376 | (pop-to-buffer buf) |
| 377 | (unless (fboundp 'eshell-mode) | 377 | (if (fboundp 'eshell-mode) |
| 378 | (unless (eq major-mode 'eshell-mode) | ||
| 379 | (eshell-mode)) | ||
| 378 | (error "`eshell-auto' must be loaded before Eshell can be used")) | 380 | (error "`eshell-auto' must be loaded before Eshell can be used")) |
| 379 | (unless (eq major-mode 'eshell-mode) | ||
| 380 | (eshell-mode)) | ||
| 381 | (assert (eq major-mode 'eshell-mode)) | ||
| 382 | buf)) | 381 | buf)) |
| 383 | 382 | ||
| 384 | (defun eshell-return-exits-minibuffer () | 383 | (defun eshell-return-exits-minibuffer () |