diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2004-02-11 06:01:50 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2004-02-11 06:01:50 +0000 |
| commit | 17c91d79003357f4fe180d39a0c328eff9862500 (patch) | |
| tree | 52e1940e752e46ff12f24e7ff1fe1a02a5ddcdd1 /lisp/diff.el | |
| parent | ef5c80252f3ebaf44e429e5aaa1ac08609eb7398 (diff) | |
| download | emacs-17c91d79003357f4fe180d39a0c328eff9862500.tar.gz emacs-17c91d79003357f4fe180d39a0c328eff9862500.tar.bz2 emacs-17c91d79003357f4fe180d39a0c328eff9862500.zip | |
(diff): Simplify code handling `switch'.
Diffstat (limited to 'lisp/diff.el')
| -rw-r--r-- | lisp/diff.el | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/lisp/diff.el b/lisp/diff.el index dab3c7ebff3..01b9e590a07 100644 --- a/lisp/diff.el +++ b/lisp/diff.el @@ -220,7 +220,8 @@ With prefix arg, prompt for diff switches." (list oldf newf (diff-switches)))) (setq new (expand-file-name new) old (expand-file-name old)) - (let ((old-alt (file-local-copy old)) + (or switches (setq switches diff-switches)) ; If not specified, use default. + (let* ((old-alt (file-local-copy old)) (new-alt (file-local-copy new)) buf) (save-excursion @@ -229,13 +230,7 @@ With prefix arg, prompt for diff switches." (mapconcat 'identity `(,diff-command ;; Use explicitly specified switches - ,@(if switches - (if (listp switches) - switches (list switches)) - ;; If not specified, use default. - (if (listp diff-switches) - diff-switches - (list diff-switches))) + ,@(if (listp switches) switches (list switches)) ,@(if (or old-alt new-alt) (list "-L" old "-L" new)) ,(shell-quote-argument (or old-alt old)) |