# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1076479310 0
# Node ID 04ab10f25d5c04631bc1f0738e186f82fdba4037
# Parent  060c23cbd940cb550a6849f439c9060b742ed13b
(diff): Simplify code handling `switch'.

diff -r 060c23cbd940 -r 04ab10f25d5c lisp/diff.el
--- a/lisp/diff.el	Tue Feb 10 21:59:19 2004 +0000
+++ b/lisp/diff.el	Wed Feb 11 06:01:50 2004 +0000
@@ -220,7 +220,8 @@
      (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 @@
 	       (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))