# HG changeset patch # User Richard M. Stallman # Date 915314072 0 # Node ID 9caafbfd813024723ca141fabed89e0457f7012c # Parent fe8617dd8a50e328779407b41ed4cdb69a4cd6bd (vc-backend-diff): Use `diff-switches-list' throughout. diff -r fe8617dd8a50 -r 9caafbfd8130 lisp/vc.el --- a/lisp/vc.el Sat Jan 02 21:53:05 1999 +0000 +++ b/lisp/vc.el Sat Jan 02 21:54:32 1999 +0000 @@ -5,7 +5,7 @@ ;; Author: Eric S. Raymond ;; Maintainer: Andre Spiegel -;; $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. @@ -2939,17 +2939,13 @@ ;; diff it against /dev/null. (apply 'vc-do-command "*vc-diff*" 1 "diff" file 'WORKFILE - (append (if (listp diff-switches) - diff-switches - (list diff-switches)) '("/dev/null"))))) + (append diff-switches-list '("/dev/null"))))) ;; cmp is not yet implemented -- we always do a full diff. (apply 'vc-do-command "*vc-diff*" 1 "cvs" file 'WORKFILE "diff" (and oldvers (concat "-r" oldvers)) (and newvers (concat "-r" newvers)) - (if (listp diff-switches) - diff-switches - (list diff-switches)))))))) + diff-switches-list)))))) (defun vc-backend-merge-news (file) ;; Merge in any new changes made to FILE.