aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/eshell
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/eshell')
-rw-r--r--lisp/eshell/em-unix.el7
1 files changed, 5 insertions, 2 deletions
diff --git a/lisp/eshell/em-unix.el b/lisp/eshell/em-unix.el
index 21deccb8093..f24180b5c7f 100644
--- a/lisp/eshell/em-unix.el
+++ b/lisp/eshell/em-unix.el
@@ -965,6 +965,8 @@ Show wall-clock time elapsed during execution of COMMAND.")
965 ((string-match "[^[:blank:]]" string) string) 965 ((string-match "[^[:blank:]]" string) string)
966 (nil))) 966 (nil)))
967 967
968(autoload 'diff-no-select "diff")
969
968(defun eshell/diff (&rest args) 970(defun eshell/diff (&rest args)
969 "Alias \"diff\" to call Emacs `diff' function." 971 "Alias \"diff\" to call Emacs `diff' function."
970 (let ((orig-args (eshell-stringify-list (eshell-flatten-list args)))) 972 (let ((orig-args (eshell-stringify-list (eshell-flatten-list args))))
@@ -986,8 +988,9 @@ Show wall-clock time elapsed during execution of COMMAND.")
986 (setcdr (last args 3) nil)) 988 (setcdr (last args 3) nil))
987 (with-current-buffer 989 (with-current-buffer
988 (condition-case err 990 (condition-case err
989 (diff old new 991 (diff-no-select
990 (nil-blank-string (eshell-flatten-and-stringify args))) 992 old new
993 (nil-blank-string (eshell-flatten-and-stringify args)))
991 (error 994 (error
992 (throw 'eshell-replace-command 995 (throw 'eshell-replace-command
993 (eshell-parse-command "*diff" orig-args)))) 996 (eshell-parse-command "*diff" orig-args))))