[Emacs-diffs] Changes to emacs/lisp/vc.el,v

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       08/09/28 17:54:39

Index: vc.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/vc.el,v
retrieving revision 1.704
retrieving revision 1.705
diff -u -b -r1.704 -r1.705
--- vc.el       25 Sep 2008 01:46:06 -0000      1.704
+++ vc.el       28 Sep 2008 17:54:38 -0000      1.705
@@ -1398,6 +1398,18 @@
       'undecided))
 
 (defun vc-switches (backend op)
+  "Return a list of vc-BACKEND switches for operation OP.
+BACKEND is a symbol such as `CVS', which will be downcased.
+OP is a symbol such as `diff'.
+
+In decreasing order of preference, returns the value of:
+vc-BACKEND-OP-switches (e.g. `vc-cvs-diff-switches');
+vc-OP-switches (e.g. `vc-diff-switches'); or, in the case of
+diff only, `vc-diff-switches'.
+
+If the chosen value is not a string or a list, returns nil.
+This is so that you may set, e.g. `vc-svn-diff-switches' to t in order
+to override the value of `vc-diff-switches' and `diff-switches'."
   (let ((switches
         (or (when backend
               (let ((sym (vc-make-backend-sym