[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/lisp ChangeLog vc.el
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] emacs/lisp ChangeLog vc.el |
Date: |
Wed, 03 Dec 2008 07:45:28 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Glenn Morris <gm> 08/12/03 07:45:27
Modified files:
lisp : ChangeLog vc.el
Log message:
(vc-diff-switches): Doc fix.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.14905&r2=1.14906
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/vc.el?cvsroot=emacs&r1=1.709&r2=1.710
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.14905
retrieving revision 1.14906
diff -u -b -r1.14905 -r1.14906
--- ChangeLog 3 Dec 2008 06:16:18 -0000 1.14905
+++ ChangeLog 3 Dec 2008 07:45:04 -0000 1.14906
@@ -1,3 +1,25 @@
+2008-12-03 Glenn Morris <address@hidden>
+
+ * vc.el (vc-diff-switches): Doc fix.
+ * vc-bzr.el (vc-bzr-diff-switches): Doc fix. Add t as option.
+ (vc-bzr-log-switches): Doc fix.
+ * vc-cvs.el (vc-cvs-diff-switches): Doc fix. Add t as option.
+ * vc-git.el (vc-git-diff-switches): Doc fix.
+ * vc-hg.el (vc-hg-diff-switches): Doc fix.
+ * vc-mcvs.el (vc-mcvs-diff-switches): Doc fix.
+ * vc-mtn.el (vc-mtn-diff-switches): Doc fix.
+ * vc-rcs.el (vc-rcs-diff-switches): Doc fix. Add t as option.
+ * vc-sccs.el (vc-sccs-diff-switches): Doc fix. Add t as option.
+
+ * vc-arch.el (vc-arch-diff-switches): New option, for consistency with
+ other backends.
+ (vc-arch-diff): Apply switches.
+
+ * vc-cvs.el (vc-cvs-diff): Use vc-diff-switches or diff-switches rather
+ than appending.
+
+ * vc-sccs.el (vc-sccs-register-switches): Remove leading * from doc.
+
2008-12-03 Daiki Ueno <address@hidden>
* epa.el (epa--show-key): Use past tense of "expire" if the key
Index: vc.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/vc.el,v
retrieving revision 1.709
retrieving revision 1.710
diff -u -b -r1.709 -r1.710
--- vc.el 3 Dec 2008 05:48:34 -0000 1.709
+++ vc.el 3 Dec 2008 07:45:24 -0000 1.710
@@ -697,16 +697,17 @@
(defcustom vc-diff-switches nil
"A string or list of strings specifying switches for diff under VC.
-When running diff under a given BACKEND, VC concatenates the values of
-`diff-switches', `vc-diff-switches', and `vc-BACKEND-diff-switches' to
-get the switches for that command. Thus, `vc-diff-switches' should
-contain switches that are specific to version control, but not
-specific to any particular backend."
- :type '(choice (const :tag "None" nil)
+When running diff under a given BACKEND, VC uses the first
+non-nil value of `vc-BACKEND-diff-switches', `vc-diff-switches',
+and `diff-switches', in that order. Since nil means to check the
+next variable in the sequence, either of the first two may use
+the value t to mean no switches at all. `vc-diff-switches'
+should contain switches that are specific to version control, but
+not specific to any particular backend."
+ :type '(choice (const :tag "Unspecified" nil)
+ (const :tag "None" t)
(string :tag "Argument String")
- (repeat :tag "Argument List"
- :value ("")
- string))
+ (repeat :tag "Argument List" :value ("") string))
:group 'vc
:version "21.1")
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs/lisp ChangeLog vc.el,
Glenn Morris <=