aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAidan Gauland2013-06-09 18:44:47 +1200
committerAidan Gauland2013-06-09 18:44:47 +1200
commit04fcf1b047a388b2fb995dbedf635238faca7a58 (patch)
tree071fc6b67931bbda5b994dea23b9266afdc67dfa
parent88b00caa0aa5dea65256a82008281566efa0622b (diff)
downloademacs-04fcf1b047a388b2fb995dbedf635238faca7a58.tar.gz
emacs-04fcf1b047a388b2fb995dbedf635238faca7a58.zip
Fix Eshell bug
* eshell/em-term.el (eshell-visual-command-p): Fix bug that causedoutput redirection to be ignored with visual commands.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/eshell/em-term.el13
2 files changed, 12 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 31746dd8de2..b7173c5cacf 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
12013-06-09 Aidan Gauland <aidalgol@amuri.net> 12013-06-09 Aidan Gauland <aidalgol@amuri.net>
2 2
3 * eshell/em-term.el (eshell-visual-command-p): Fix bug that caused
4 output redirection to be ignored with visual commands.
5
62013-06-09 Aidan Gauland <aidalgol@amuri.net>
7
3 * eshell/em-term.el (eshell-visual-command-p): New function. 8 * eshell/em-term.el (eshell-visual-command-p): New function.
4 (eshell-term-initialize): Move long lambda to separate function eshell-visual-command-p. 9 (eshell-term-initialize): Move long lambda to separate function eshell-visual-command-p.
5 * eshell/em-dirs.el (eshell-dirs-initialise): Add missing #' to lambda. 10 * eshell/em-dirs.el (eshell-dirs-initialise): Add missing #' to lambda.
diff --git a/lisp/eshell/em-term.el b/lisp/eshell/em-term.el
index 1ed584df882..1d4b2a59d4b 100644
--- a/lisp/eshell/em-term.el
+++ b/lisp/eshell/em-term.el
@@ -141,12 +141,13 @@ character to the invoked process."
141If either COMMAND or a subcommand in ARGS (e.g. git log) is a 141If either COMMAND or a subcommand in ARGS (e.g. git log) is a
142visual command, returns non-nil." 142visual command, returns non-nil."
143 (let ((command (file-name-nondirectory command))) 143 (let ((command (file-name-nondirectory command)))
144 (or (member command eshell-visual-commands) 144 (and (eshell-interactive-output-p)
145 (member (car args) 145 (or (member command eshell-visual-commands)
146 (cdr (assoc command eshell-visual-subcommands))) 146 (member (car args)
147 (cl-intersection args 147 (cdr (assoc command eshell-visual-subcommands)))
148 (cdr (assoc command eshell-visual-options)) 148 (cl-intersection args
149 :test 'string=)))) 149 (cdr (assoc command eshell-visual-options))
150 :test 'string=)))))
150 151
151(defun eshell-exec-visual (&rest args) 152(defun eshell-exec-visual (&rest args)
152 "Run the specified PROGRAM in a terminal emulation buffer. 153 "Run the specified PROGRAM in a terminal emulation buffer.