10:34 p.m.
User: scop
Date: 05/02/10 23:34:15
Modified: packages/unsupported/scop/vc ChangeLog vc-cvs.el vc-hooks.el
vc-mcvs.el vc-svn.el vc.el
Log:
Sync vc with upstream.
Revision Changes Path
1.37 +2 -2 XEmacs/packages/unsupported/scop/STATUS
Index: STATUS
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/STATUS,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- STATUS 2005/01/19 21:42:18 1.36
+++ STATUS 2005/02/10 22:34:10 1.37
＠＠ -13,9 +13,9 ＠＠
- Compiles, I have no idea whether it works or not.
generic-modes: generic.el and generic-x.el from GNU Emacs
-- Up to date with GNU Emacs CVS HEAD as of 2005-01-19.
+- Up to date with GNU Emacs CVS HEAD as of 2005-02-11.
- Compiles, seems to work, auto-mode-alist and autoloads need spanking.
vc: vc*.el from GNU Emacs
-- Up to date with GNU Emacs CVS HEAD as of 2005-01-19.
+- Up to date with GNU Emacs CVS HEAD as of 2005-02-11.
- Compiles, something even works.
1.22 +4 -0 XEmacs/packages/unsupported/scop/vc/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/vc/ChangeLog,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ChangeLog 2005/01/19 21:42:20 1.21
+++ ChangeLog 2005/02/10 22:34:13 1.22
＠＠ -1,3 +1,7 ＠＠
+2005-02-11 Ville Skyttä <scop(a)xemacs.org>
+
+ * vc*.el: Sync with upstream.
+
2005-01-19 Ville Skyttä <scop(a)xemacs.org>
* vc*.el: Sync with upstream.
1.8 +4 -4 XEmacs/packages/unsupported/scop/vc/vc-cvs.el
Index: vc-cvs.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/vc/vc-cvs.el,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- vc-cvs.el 2005/01/19 21:42:20 1.7
+++ vc-cvs.el 2005/02/10 22:34:13 1.8
＠＠ -49,7 +49,7 ＠＠
(repeat :tag "Argument List"
:value ("")
string))
- :version "21.4"
+ :version "22.1"
:group 'vc)
(defcustom vc-cvs-register-switches nil
＠＠ -113,7 +113,7 ＠＠
Format is according to `format-time-string'. Only used if
`vc-cvs-sticky-tag-display' is t."
:type '(string)
- :version "21.4"
+ :version "22.1"
:group 'vc)
(defcustom vc-cvs-sticky-tag-display t
＠＠ -152,7 +152,7 ＠＠
See also variable `vc-cvs-sticky-date-format-string'."
:type '(choice boolean function)
- :version "21.4"
+ :version "22.1"
:group 'vc)
;;;
＠＠ -555,7 +555,7 ＠＠
(append (vc-switches nil 'diff) '("/dev/null")))
;; Even if it's empty, it's locally modified.
1)
- (let* ((async (and (not vc-disable-async-diff)
+ (let* ((async (and (not vc-disable-async-diff)
(vc-stay-local-p file)
(fboundp 'start-process)))
(status (apply 'vc-cvs-command (or buffer "*vc-diff*")
1.6 +10 -3 XEmacs/packages/unsupported/scop/vc/vc-hooks.el
Index: vc-hooks.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/vc/vc-hooks.el,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- vc-hooks.el 2004/12/06 19:26:11 1.5
+++ vc-hooks.el 2005/02/10 22:34:13 1.6
＠＠ -156,7 +156,7 ＠＠
(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 "21.4"
+ :version "22.1"
:group 'vc)
(defun vc-stay-local-p (file)
＠＠ -643,8 +643,15 ＠＠
(unless (and (fboundp 'msdos-long-file-names)
(not (with-no-warnings (msdos-long-file-names))))
(vc-delete-automatic-version-backups file)
- (copy-file file (vc-version-backup-file-name file)
- nil 'keep-date)))
+ (condition-case nil
+ (copy-file file (vc-version-backup-file-name file)
+ nil 'keep-date)
+ ;; It's ok if it doesn't work (e.g. directory not writable),
+ ;; since this is just for efficiency.
+ (file-error
+ (message
+ (concat "Warning: Cannot make version backup; "
+ "diff/revert therefore not local"))))))
(defun vc-before-save ()
"Function to be called by `basic-save-buffer' (in files.el)."
1.6 +6 -6 XEmacs/packages/unsupported/scop/vc/vc-mcvs.el
Index: vc-mcvs.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/vc/vc-mcvs.el,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- vc-mcvs.el 2005/01/19 21:42:20 1.5
+++ vc-mcvs.el 2005/02/10 22:34:13 1.6
＠＠ -70,7 +70,7 ＠＠
(repeat :tag "Argument List"
:value ("")
string))
- :version "21.4"
+ :version "22.1"
:group 'vc)
(defcustom vc-mcvs-register-switches nil
＠＠ -82,7 +82,7 ＠＠
(repeat :tag "Argument List"
:value ("")
string))
- :version "21.4"
+ :version "22.1"
:group 'vc)
(defcustom vc-mcvs-diff-switches nil
＠＠ -92,13 +92,13 ＠＠
(repeat :tag "Argument List"
:value ("")
string))
- :version "21.4"
+ :version "22.1"
:group 'vc)
(defcustom vc-mcvs-header (or (cdr (assoc 'MCVS vc-header-alist))
vc-cvs-header)
"*Header keywords to be inserted by `vc-insert-headers'."
- :version "21.4"
+ :version "22.1"
:type '(repeat string)
:group 'vc)
＠＠ -107,7 +107,7 ＠＠
This is only meaningful if you don't use the implicit checkout model
\(i.e. if you have $CVSREAD set)."
:type 'boolean
- :version "21.4"
+ :version "22.1"
:group 'vc)
;;;
＠＠ -451,7 +451,7 ＠＠
;; Even if it's empty, it's locally modified.
1)
(let* ((async (and (not vc-disable-async-diff)
- (vc-stay-local-p file)
+ (vc-stay-local-p file)
(fboundp 'start-process)))
;; Run the command from the root dir so that `mcvs filt' returns
;; valid relative names.
1.9 +5 -5 XEmacs/packages/unsupported/scop/vc/vc-svn.el
Index: vc-svn.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/vc/vc-svn.el,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- vc-svn.el 2005/01/19 21:42:20 1.8
+++ vc-svn.el 2005/02/10 22:34:14 1.9
＠＠ -52,7 +52,7 ＠＠
(repeat :tag "Argument List"
:value ("")
string))
- :version "21.4"
+ :version "22.1"
:group 'vc)
(defcustom vc-svn-register-switches nil
＠＠ -64,7 +64,7 ＠＠
(repeat :tag "Argument List"
:value ("")
string))
- :version "21.4"
+ :version "22.1"
:group 'vc)
(defcustom vc-svn-diff-switches
＠＠ -78,12 +78,12 ＠＠
(repeat :tag "Argument List"
:value ("")
string))
- :version "21.4"
+ :version "22.1"
:group 'vc)
(defcustom vc-svn-header (or (cdr (assoc 'SVN vc-header-alist))
'("\$Id\$"))
"*Header keywords to be inserted by `vc-insert-headers'."
- :version "21.4"
+ :version "22.1"
:type '(repeat string)
:group 'vc)
＠＠ -93,7 +93,7 ＠＠
This is only meaningful if you don't use the implicit checkout model
\(i.e. if you have $SVNREAD set)."
;; :type 'boolean
- ;; :version "21.4"
+ ;; :version "22.1"
;; :group 'vc
)
1.10 +1 -1 XEmacs/packages/unsupported/scop/vc/vc.el
Index: vc.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/vc/vc.el,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- vc.el 2005/01/19 21:42:20 1.9
+++ vc.el 2005/02/10 22:34:14 1.10
＠＠ -577,7 +577,7 ＠＠
:type '(choice (const :tag "No" nil)
(const :tag "Yes" t))
:group 'vc
- :version "21.4")
+ :version "22.1")
;;;###autoload
(defcustom vc-checkout-hook nil