[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/lisp vc-cvs.el
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] emacs/lisp vc-cvs.el |
Date: |
Wed, 03 Dec 2008 07:43:33 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Glenn Morris <gm> 08/12/03 07:43:33
Modified files:
lisp : vc-cvs.el
Log message:
(vc-cvs-diff-switches): Doc fix. Add t as option.
(vc-cvs-diff): Use vc-diff-switches or diff-switches rather than
appending.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/vc-cvs.el?cvsroot=emacs&r1=1.159&r2=1.160
Patches:
Index: vc-cvs.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/vc-cvs.el,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -b -r1.159 -r1.160
--- vc-cvs.el 3 Dec 2008 05:48:34 -0000 1.159
+++ vc-cvs.el 3 Dec 2008 07:43:33 -0000 1.160
@@ -1,7 +1,7 @@
;;; vc-cvs.el --- non-resident support for CVS version-control
-;; Copyright (C) 1995, 1998, 1999, 2000, 2001, 2002, 2003,
-;; 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+;; 2006, 2007, 2008 Free Software Foundation, Inc.
;; Author: FSF (see vc.el for full credits)
;; Maintainer: Andre Spiegel <address@hidden>
@@ -82,12 +82,12 @@
:group 'vc)
(defcustom vc-cvs-diff-switches nil
- "A string or list of strings specifying extra switches for cvs diff under
VC."
- :type '(choice (const :tag "None" nil)
+ "String or list of strings specifying switches for CVS diff under VC.
+If nil, use the value of `vc-diff-switches'. If t, use no switches."
+ :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))
:version "21.1"
:group 'vc)
@@ -123,9 +123,12 @@
:type '(choice (const :tag "Always stay local" t)
(const :tag "Only for file operations" only-file)
(const :tag "Don't stay local" nil)
- (list :format "\nExamine hostname and %v" :tag "Examine
hostname ..."
- (set :format "%v" :inline t (const :format "%t" :tag
"don't" except))
- (regexp :format " stay local,\n%t: %v" :tag "if it
matches")
+ (list :format "\nExamine hostname and %v"
+ :tag "Examine hostname ..."
+ (set :format "%v" :inline t
+ (const :format "%t" :tag "don't" except))
+ (regexp :format " stay local,\n%t: %v"
+ :tag "if it matches")
(repeat :format "%v%i\n" :inline t (regexp :tag "or"))))
:version "23.1"
:group 'vc)
@@ -270,6 +273,7 @@
;;; State-changing functions
;;;
+;; FIXME doc is wrong re switches.
(defun vc-cvs-register (files &optional rev comment)
"Register FILES into the CVS version-control system.
COMMENT can be used to provide an initial description of FILES.
@@ -522,13 +526,12 @@
(coding-system-for-read (vc-coding-system-for-diff file)))
(if (and file-oldvers file-newvers)
(progn
+ ;; This used to append diff-switches and vc-diff-switches,
+ ;; which was consistent with the vc-diff-switches doc at that
+ ;; time, but not with the actual behavior of any other VC diff.
(apply 'vc-do-command (or buffer "*vc-diff*") 1 "diff" nil
- (append (if (listp diff-switches)
- diff-switches
- (list diff-switches))
- (if (listp vc-diff-switches)
- vc-diff-switches
- (list vc-diff-switches))
+ ;; Not a CVS diff, does not use vc-cvs-diff-switches.
+ (append (vc-switches nil 'diff)
(list (file-relative-name file-oldvers)
(file-relative-name file-newvers))))
(setq status 0))
- [Emacs-diffs] emacs/lisp vc-cvs.el,
Glenn Morris <=