Merge commit 'de238b39e335c6814283faa171b35145f124edf2'

1 files changed, 5 insertions, 5 deletions

diff --git a/lisp/eshell/em-script.el b/lisp/eshell/em-script.el
index bab26222baf..4a3b84e10e3 100644
--- a/lisp/eshell/em-script.el
+++ b/lisp/eshell/em-script.el
@@ -23,8 +23,7 @@
 
 ;;; Code:
 
-(require 'eshell)
-(require 'esh-opt)
+(require 'esh-mode)
 
 ;;;###autoload
 (progn
@@ -57,7 +56,7 @@ This includes when running `eshell-command'."
 
 ;;; Functions:
 
-(defun eshell-script-initialize ()
+(defun eshell-script-initialize ()  ;Called from `eshell-mode' via intern-soft!
   "Initialize the script parsing code."
   (make-local-variable 'eshell-interpreter-alist)
   (setq eshell-interpreter-alist
@@ -73,13 +72,14 @@ This includes when running `eshell-command'."
   ;; to ruin it for other modules
   (let (eshell-inside-quote-regexp
         eshell-outside-quote-regexp)
-    (and (not eshell-non-interactive-p)
+    (and (not (bound-and-true-p eshell-non-interactive-p))
          eshell-login-script
          (file-readable-p eshell-login-script)
          (eshell-do-eval
           (list 'eshell-commands
                 (catch 'eshell-replace-command
-                  (eshell-source-file eshell-login-script))) t))
+                  (eshell-source-file eshell-login-script)))
+          t))
     (and eshell-rc-script
          (file-readable-p eshell-rc-script)
          (eshell-do-eval