Mercurial > emacs
changeset 100187:e518f14b0bda
(vc-diff-switches): Doc fix.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Wed, 03 Dec 2008 07:45:04 +0000 |
| parents | c9d564389052 |
| children | ff0dc1bbf0c1 |
| files | lisp/ChangeLog lisp/vc.el |
| diffstat | 2 files changed, 32 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Wed Dec 03 07:43:33 2008 +0000 +++ b/lisp/ChangeLog Wed Dec 03 07:45:04 2008 +0000 @@ -1,3 +1,25 @@ +2008-12-03 Glenn Morris <rgm@gnu.org> + + * 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 <ueno@unixuser.org> * epa.el (epa--show-key): Use past tense of "expire" if the key
--- a/lisp/vc.el Wed Dec 03 07:43:33 2008 +0000 +++ b/lisp/vc.el Wed Dec 03 07:45:04 2008 +0000 @@ -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")