Commit 88b00caa authored by Aidan Gauland's avatar Aidan Gauland
Browse files

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.
parent 5bf97bfc
2013-06-09 Aidan Gauland <aidalgol@amuri.net>
* 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.
2013-06-08 Leo Liu <sdl.web@gmail.com> 2013-06-08 Leo Liu <sdl.web@gmail.com>
   
* progmodes/octave.el (octave-add-log-current-defun): New function. * progmodes/octave.el (octave-add-log-current-defun): New function.
...@@ -207,8 +207,8 @@ Thus, this does not include the current directory.") ...@@ -207,8 +207,8 @@ Thus, this does not include the current directory.")
(when eshell-cd-on-directory (when eshell-cd-on-directory
(make-local-variable 'eshell-interpreter-alist) (make-local-variable 'eshell-interpreter-alist)
(setq eshell-interpreter-alist (setq eshell-interpreter-alist
(cons (cons (lambda (file args) (cons (cons #'(lambda (file args)
(eshell-lone-directory-p file)) (eshell-lone-directory-p file))
'eshell-dirs-substitute-cd) 'eshell-dirs-substitute-cd)
eshell-interpreter-alist))) eshell-interpreter-alist)))
......
...@@ -61,9 +61,10 @@ This includes when running `eshell-command'." ...@@ -61,9 +61,10 @@ This includes when running `eshell-command'."
"Initialize the script parsing code." "Initialize the script parsing code."
(make-local-variable 'eshell-interpreter-alist) (make-local-variable 'eshell-interpreter-alist)
(setq eshell-interpreter-alist (setq eshell-interpreter-alist
(cons '((lambda (file args) (cons (cons #'(lambda (file args)
(string= (file-name-nondirectory file) (string= (file-name-nondirectory file)
"eshell")) . eshell/source) "eshell"))
'eshell/source)
eshell-interpreter-alist)) eshell-interpreter-alist))
(make-local-variable 'eshell-complex-commands) (make-local-variable 'eshell-complex-commands)
(setq eshell-complex-commands (setq eshell-complex-commands
......
...@@ -132,18 +132,22 @@ character to the invoked process." ...@@ -132,18 +132,22 @@ character to the invoked process."
"Initialize the `term' interface code." "Initialize the `term' interface code."
(make-local-variable 'eshell-interpreter-alist) (make-local-variable 'eshell-interpreter-alist)
(setq eshell-interpreter-alist (setq eshell-interpreter-alist
(cons (cons (function (cons (cons #'eshell-visual-command-p
(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=)))))
'eshell-exec-visual) 'eshell-exec-visual)
eshell-interpreter-alist))) 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) (defun eshell-exec-visual (&rest args)
"Run the specified PROGRAM in a terminal emulation buffer. "Run the specified PROGRAM in a terminal emulation buffer.
ARGS are passed to the program. At the moment, no piping of input is ARGS are passed to the program. At the moment, no piping of input is
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment