Commit afbb7930 authored by Glenn Morris's avatar Glenn Morris
Browse files

eshell fix for change in return value of `diff' command (bug#10420)

* lisp/eshell/em-unix.el (diff-no-select): Autoload it.
(eshell/diff): Use diff-no-select.
parent d660637a
2012-01-05 Glenn Morris <rgm@gnu.org>
* eshell/em-unix.el (diff-no-select): Autoload it.
(eshell/diff): Use diff-no-select. (Bug#10420)
2012-01-05 Chong Yidong <cyd@gnu.org>
* shell.el (shell-dynamic-complete-functions): Revert last change.
......
......@@ -965,6 +965,8 @@ Show wall-clock time elapsed during execution of COMMAND.")
((string-match "[^[:blank:]]" string) string)
(nil)))
(autoload 'diff-no-select "diff")
(defun eshell/diff (&rest args)
"Alias \"diff\" to call Emacs `diff' function."
(let ((orig-args (eshell-stringify-list (eshell-flatten-list args))))
......@@ -986,8 +988,9 @@ Show wall-clock time elapsed during execution of COMMAND.")
(setcdr (last args 3) nil))
(with-current-buffer
(condition-case err
(diff old new
(nil-blank-string (eshell-flatten-and-stringify args)))
(diff-no-select
old new
(nil-blank-string (eshell-flatten-and-stringify args)))
(error
(throw 'eshell-replace-command
(eshell-parse-command "*diff" orig-args))))
......
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