Commit ac3db2e4 authored by Richard M. Stallman's avatar Richard M. Stallman
Browse files

(vc-backend-diff): Use `diff-switches-list' throughout.

parent 0f5c40c7
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
;; Author: Eric S. Raymond <esr@snark.thyrsus.com> ;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
;; Maintainer: Andre Spiegel <spiegel@inf.fu-berlin.de> ;; Maintainer: Andre Spiegel <spiegel@inf.fu-berlin.de>
;; $Id: vc.el,v 1.240 1998/12/02 13:34:59 spiegel Exp rost $ ;; $Id: vc.el,v 1.241 1998/12/08 16:04:52 rost Exp rms $
;; This file is part of GNU Emacs. ;; This file is part of GNU Emacs.
...@@ -2939,17 +2939,13 @@ THRESHOLD, nil otherwise" ...@@ -2939,17 +2939,13 @@ THRESHOLD, nil otherwise"
;; diff it against /dev/null. ;; diff it against /dev/null.
(apply 'vc-do-command (apply 'vc-do-command
"*vc-diff*" 1 "diff" file 'WORKFILE "*vc-diff*" 1 "diff" file 'WORKFILE
(append (if (listp diff-switches) (append diff-switches-list '("/dev/null")))))
diff-switches
(list diff-switches)) '("/dev/null")))))
;; cmp is not yet implemented -- we always do a full diff. ;; cmp is not yet implemented -- we always do a full diff.
(apply 'vc-do-command (apply 'vc-do-command
"*vc-diff*" 1 "cvs" file 'WORKFILE "diff" "*vc-diff*" 1 "cvs" file 'WORKFILE "diff"
(and oldvers (concat "-r" oldvers)) (and oldvers (concat "-r" oldvers))
(and newvers (concat "-r" newvers)) (and newvers (concat "-r" newvers))
(if (listp diff-switches) diff-switches-list))))))
diff-switches
(list diff-switches))))))))
(defun vc-backend-merge-news (file) (defun vc-backend-merge-news (file)
;; Merge in any new changes made to FILE. ;; Merge in any new changes made to FILE.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment