aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/diff.el
diff options
context:
space:
mode:
authorRichard M. Stallman1994-10-28 18:45:45 +0000
committerRichard M. Stallman1994-10-28 18:45:45 +0000
commitd009603cbf5f88499b182c1e9f3e18b3a2a46ab4 (patch)
tree49cd7028df17c6b767ad86cb8739e978e877fc69 /lisp/diff.el
parentcaaaf02a1ae606658b03d5c6c177674658855245 (diff)
downloademacs-d009603cbf5f88499b182c1e9f3e18b3a2a46ab4.tar.gz
emacs-d009603cbf5f88499b182c1e9f3e18b3a2a46ab4.zip
(diff-command): New variable.
(diff): Use it.
Diffstat (limited to 'lisp/diff.el')
-rw-r--r--lisp/diff.el5
1 files changed, 4 insertions, 1 deletions
diff --git a/lisp/diff.el b/lisp/diff.el
index ff7906a80c4..eb2e4152896 100644
--- a/lisp/diff.el
+++ b/lisp/diff.el
@@ -34,6 +34,9 @@
34(defvar diff-switches "-c" 34(defvar diff-switches "-c"
35 "*A string or list of strings specifying switches to be be passed to diff.") 35 "*A string or list of strings specifying switches to be be passed to diff.")
36 36
37(defvar diff-command "diff"
38 "*The command to use to run diff.")
39
37(defvar diff-regexp-alist 40(defvar diff-regexp-alist
38 '( 41 '(
39 ;; -u format: @@ -OLDSTART,OLDEND +NEWSTART,NEWEND @@ 42 ;; -u format: @@ -OLDSTART,OLDEND +NEWSTART,NEWEND @@
@@ -196,7 +199,7 @@ With prefix arg, prompt for diff switches."
196 (unwind-protect 199 (unwind-protect
197 (let ((command 200 (let ((command
198 (mapconcat 'identity 201 (mapconcat 'identity
199 (append '("diff") 202 (append (list diff-command)
200 ;; Use explicitly specified switches 203 ;; Use explicitly specified switches
201 (if switches 204 (if switches
202 (if (consp switches) 205 (if (consp switches)