CVS update by scop packages/unsupported/scop/vc, vc-arch.el,
vc-mcvs.el ...
xemacs-cvs at xemacs.org
xemacs-cvs at xemacs.org
Sun Jan 28 15:20:58 EST 2007
User: scop
Date: 07/01/28 21:20:58
Modified: packages/unsupported/scop/vc ChangeLog smerge-mode.el
vc-arch.el vc-cvs.el vc-git.el vc-hooks.el
vc-mcvs.el vc-rcs.el vc-sccs.el vc.el
Log:
Sync generic-modes and vc with upstreams.
Revision Changes Path
1.79 +2 -2 XEmacs/packages/unsupported/scop/STATUS
Index: STATUS
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/STATUS,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- STATUS 2007/01/18 22:10:02 1.78
+++ STATUS 2007/01/28 20:20:48 1.79
@@ -13,11 +13,11 @@ ede: Emacs Development Environment, <htt
- 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 2006-11-11.
+- Up to date with GNU Emacs CVS HEAD as of 2007-01-28.
- Compiles, seems to work, auto-mode-alist and autoloads may need spanking.
vc: vc*.el and a few other related files from GNU Emacs, vc-git.el from git
-- Up to date with GNU Emacs CVS HEAD, git upstream as of 2007-01-18.
+- Up to date with GNU Emacs CVS HEAD, git upstream as of 2007-01-28.
- Approaching usable state.
- smerge-mode.el needs work.
- Causes autoload related crashing with 21.4.x, more info:
1.13 +4 -0 XEmacs/packages/unsupported/scop/generic-modes/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/generic-modes/ChangeLog,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- ChangeLog 2006/06/28 12:03:02 1.12
+++ ChangeLog 2007/01/28 20:20:52 1.13
@@ -1,3 +1,7 @@
+2007-01-28 Ville Skyttä <scop at xemacs.org>
+
+ * *.el: Sync with upstream.
+
2006-06-28 Ville Skyttä <scop at xemacs.org>
* generic-x.el: Sync with upstream.
1.11 +2 -2 XEmacs/packages/unsupported/scop/generic-modes/generic-x.el
Index: generic-x.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/generic-modes/generic-x.el,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- generic-x.el 2006/06/28 12:03:02 1.10
+++ generic-x.el 2007/01/28 20:20:52 1.11
@@ -1,7 +1,7 @@
;;; generic-x.el --- A collection of generic modes
-;; Copyright (C) 1997, 1998, 2002, 2003, 2004,
-;; 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004,
+;; 2005, 2006, 2007 Free Software Foundation, Inc.
;; Author: Peter Breton <pbreton at cs.umb.edu>
;; Created: Tue Oct 08 1996
1.10 +2 -2 XEmacs/packages/unsupported/scop/generic-modes/generic.el
Index: generic.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/generic-modes/generic.el,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- generic.el 2006/02/10 23:28:53 1.9
+++ generic.el 2007/01/28 20:20:52 1.10
@@ -1,7 +1,7 @@
;;; generic.el --- defining simple major modes with comment and font-lock
;;
-;; Copyright (C) 1997, 1999, 2002, 2003, 2004,
-;; 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1999, 2001, 2002, 2003, 2004,
+;; 2005, 2006, 2007 Free Software Foundation, Inc.
;;
;; Author: Peter Breton <pbreton at cs.umb.edu>
;; Created: Fri Sep 27 1996
1.67 +4 -0 XEmacs/packages/unsupported/scop/vc/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/vc/ChangeLog,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- ChangeLog 2007/01/18 22:10:07 1.66
+++ ChangeLog 2007/01/28 20:20:54 1.67
@@ -1,3 +1,7 @@
+2007-01-28 Ville Skyttä <scop at xemacs.org>
+
+ * *.el: Sync with upstream.
+
2007-01-18 Ville Skyttä <scop at xemacs.org>
* log-edit.el: Sync with upstream.
1.3 +1 -1 XEmacs/packages/unsupported/scop/vc/smerge-mode.el
Index: smerge-mode.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/vc/smerge-mode.el,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- smerge-mode.el 2006/08/28 21:45:05 1.2
+++ smerge-mode.el 2007/01/28 20:20:54 1.3
@@ -1,7 +1,7 @@
;;; smerge-mode.el --- Minor mode to resolve diff3 conflicts
;; Copyright (C) 1999, 2000, 2001, 2002, 2003,
-;; 2004, 2005, 2006 Free Software Foundation, Inc.
+;; 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
;; Author: Stefan Monnier <monnier at iro.umontreal.ca>
;; Keywords: tools revision-control merge diff3 cvs conflict
1.17 +3 -3 XEmacs/packages/unsupported/scop/vc/vc-arch.el
Index: vc-arch.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/vc/vc-arch.el,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- vc-arch.el 2007/01/18 22:10:07 1.16
+++ vc-arch.el 2007/01/28 20:20:54 1.17
@@ -1,6 +1,6 @@
;;; vc-arch.el --- VC backend for the Arch version-control system
-;; Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
;; Author: FSF (see vc.el for full credits)
;; Maintainer: Stefan Monnier <monnier at gnu.org>
@@ -154,7 +154,7 @@ Only the value `maybe' can be trusted :-
(with-temp-buffer
(insert-file-contents idfile)
(looking-at ".*[^ \n\t]")
- (match-string 0)))
+ (match-string 0))
(with-current-buffer (find-file-noselect file)
(save-excursion
(goto-char (point-max))
@@ -163,7 +163,7 @@ Only the value `maybe' can be trusted :-
(goto-char (point-min))
(re-search-forward vc-arch-tagline-re (+ (point) 1000) t)))
(match-string 1)
- (concat "./" (file-relative-name file (vc-arch-root file))))))))
+ (concat "./" (file-relative-name file (vc-arch-root file)))))))))
(defun vc-arch-tagging-method (file)
(with-current-buffer
1.16 +1 -1 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.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- vc-cvs.el 2006/04/22 18:28:59 1.15
+++ vc-cvs.el 2007/01/28 20:20:54 1.16
@@ -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 Free Software Foundation, Inc.
+;; 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
;; Author: FSF (see vc.el for full credits)
;; Maintainer: Andre Spiegel <spiegel at gnu.org>
1.7 +10 -1 XEmacs/packages/unsupported/scop/vc/vc-git.el
Index: vc-git.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/vc/vc-git.el,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- vc-git.el 2007/01/18 22:10:07 1.6
+++ vc-git.el 2007/01/28 20:20:54 1.7
@@ -120,7 +120,16 @@
(vc-git--run-command file "commit" "-m" comment "--only" "--")))
(defun vc-git-checkout (file &optional editable rev destfile)
- (vc-git--run-command file "checkout" (or rev "HEAD")))
+ (if destfile
+ (let ((fullname (substring
+ (vc-git--run-command-string file "ls-files" "-z" "--full-name" "--")
+ 0 -1))
+ (coding-system-for-read 'no-conversion)
+ (coding-system-for-write 'no-conversion))
+ (with-temp-file destfile
+ (eq 0 (call-process "git" nil t nil "cat-file" "blob"
+ (concat (or rev "HEAD") ":" fullname)))))
+ (vc-git--run-command file "checkout" (or rev "HEAD"))))
(defun vc-git-annotate-command (file buf &optional rev)
; FIXME: rev is ignored
1.15 +1 -1 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.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- vc-hooks.el 2007/01/18 22:10:07 1.14
+++ vc-hooks.el 2007/01/28 20:20:54 1.15
@@ -1,7 +1,7 @@
;;; vc-hooks.el --- resident support for version-control
;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-;; 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;; 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
;; Author: FSF (see vc.el for full credits)
;; Maintainer: Andre Spiegel <spiegel at gnu.org>
1.12 +1 -1 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.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- vc-mcvs.el 2006/02/10 23:25:42 1.11
+++ vc-mcvs.el 2007/01/28 20:20:54 1.12
@@ -1,6 +1,6 @@
;;; vc-mcvs.el --- VC backend for the Meta-CVS version-control system
-;; Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
;; Author: FSF (see vc.el for full credits)
;; Maintainer: Stefan Monnier <monnier at gnu.org>
1.10 +1 -1 XEmacs/packages/unsupported/scop/vc/vc-rcs.el
Index: vc-rcs.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/vc/vc-rcs.el,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- vc-rcs.el 2006/02/10 23:25:42 1.9
+++ vc-rcs.el 2007/01/28 20:20:55 1.10
@@ -1,7 +1,7 @@
;;; vc-rcs.el --- support for RCS version-control
;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-;; 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;; 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
;; Author: FSF (see vc.el for full credits)
;; Maintainer: Andre Spiegel <spiegel at gnu.org>
1.7 +1 -1 XEmacs/packages/unsupported/scop/vc/vc-sccs.el
Index: vc-sccs.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/vc/vc-sccs.el,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- vc-sccs.el 2006/02/10 23:25:42 1.6
+++ vc-sccs.el 2007/01/28 20:20:55 1.7
@@ -1,7 +1,7 @@
;;; vc-sccs.el --- support for SCCS version-control
;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-;; 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;; 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
;; Author: FSF (see vc.el for full credits)
;; Maintainer: Andre Spiegel <spiegel at gnu.org>
1.37 +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.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- vc.el 2006/10/25 12:09:02 1.36
+++ vc.el 2007/01/28 20:20:55 1.37
@@ -1,7 +1,7 @@
;;; vc.el --- drive a version-control system from within Emacs
;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2000,
-;; 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;; 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
;; Author: FSF (see below for full credits)
;; Maintainer: Andre Spiegel <spiegel at gnu.org>
More information about the XEmacs-CVS
mailing list