Mercurial > emacs
changeset 3429:5c0a40a8a55d
(diff): Really do use arg SWITCHES.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Wed, 02 Jun 1993 17:09:37 +0000 |
| parents | 4a9182ac9d17 |
| children | 400db0ca934f |
| files | lisp/diff.el |
| diffstat | 1 files changed, 8 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/diff.el Wed Jun 02 06:52:09 1993 +0000 +++ b/lisp/diff.el Wed Jun 02 17:09:37 1993 +0000 @@ -196,9 +196,14 @@ (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))