Tidy module initialisation functions

* eshell/em-term.el (eshell-visual-command-p): New function.
(eshell-term-initialize): Move long lambda to separate function eshell-visual-command-p.
* eshell/em-dirs.el (eshell-dirs-initialise): Add missing #' to lambda.
* eshell/em-script.el (eshell-script-initialize): Add missing #' to lambda.

1 files changed, 13 insertions, 9 deletions

diff --git a/lisp/eshell/em-term.el b/lisp/eshell/em-term.el
index f30aad305e4..1ed584df882 100644
--- a/lisp/eshell/em-term.el
+++ b/lisp/eshell/em-term.el
@@ -132,18 +132,22 @@ character to the invoked process."
   "Initialize the `term' interface code."
   (make-local-variable 'eshell-interpreter-alist)
   (setq eshell-interpreter-alist
-	(cons (cons (function
-		     (lambda (command args)
-		       (let ((command (file-name-nondirectory command)))
-			 (or (member command eshell-visual-commands)
-			     (member (car args)
-				     (cdr (assoc command eshell-visual-subcommands)))
-			     (cl-intersection args
-					      (cdr (assoc command eshell-visual-options))
-					      :test 'string=)))))
+	(cons (cons #'eshell-visual-command-p
 		    'eshell-exec-visual)
 	      eshell-interpreter-alist)))
 
+(defun eshell-visual-command-p (command args)
+  "Returns non-nil when given a visual command.
+If either COMMAND or a subcommand in ARGS (e.g. git log) is a
+visual command, returns non-nil."
+  (let ((command (file-name-nondirectory command)))
+    (or (member command eshell-visual-commands)
+        (member (car args)
+                (cdr (assoc command eshell-visual-subcommands)))
+        (cl-intersection args
+                         (cdr (assoc command eshell-visual-options))
+                         :test 'string=))))
+
 (defun eshell-exec-visual (&rest args)
   "Run the specified PROGRAM in a terminal emulation buffer.
 ARGS are passed to the program.  At the moment, no piping of input is