diff options
| author | Richard M. Stallman <rms@gnu.org> | 1993-06-02 17:09:37 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 1993-06-02 17:09:37 +0000 |
| commit | 16776caac4217233cb1ba170064206bd7358fe81 (patch) | |
| tree | bacceb9fe1c8e7e8d58e25e259741166484f2db3 /lisp/diff.el | |
| parent | 4eda59a90d9fb181df7e1e2fb130a2ab588a737a (diff) | |
| download | emacs-16776caac4217233cb1ba170064206bd7358fe81.tar.gz | |
(diff): Really do use arg SWITCHES.
Diffstat (limited to 'lisp/diff.el')
| -rw-r--r-- | lisp/diff.el | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/lisp/diff.el b/lisp/diff.el index 0c474672b70..d4c5f5d3a2e 100644 --- a/lisp/diff.el +++ b/lisp/diff.el @@ -196,9 +196,14 @@ With prefix arg, prompt for diff switches." (let ((command (mapconcat 'identity (append '("diff") - (if (consp diff-switches) - diff-switches - (list diff-switches)) + ;; Use explicitly specified switches + (if switches + (if (consp switches) + switches (list switches)) + ;; If not specified, use default. + (if (consp diff-switches) + diff-switches + (list diff-switches))) (if (or old-alt new-alt) (list "-L" old "-L" new)) (list (or old-alt old)) |