User: scop
Date: 06/07/06 21:07:41
Modified: packages/unsupported/scop/vc ChangeLog vc.el
Log:
Sync vc.el with upstream.
Revision Changes Path
1.66 +1 -1 XEmacs/packages/unsupported/scop/STATUS
Index: STATUS
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/STATUS,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- STATUS 2006/07/04 21:54:23 1.65
+++ STATUS 2006/07/06 19:07:36 1.66
@@ -17,5 +17,5 @@ generic-modes: generic.el and generic-x.
- 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 2006-07-04.
+- Up to date with GNU Emacs CVS HEAD, git upstream as of 2006-07-06.
- Approaching usable state.
1.58 +4 -0 XEmacs/packages/unsupported/scop/vc/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/vc/ChangeLog,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- ChangeLog 2006/07/04 21:55:05 1.57
+++ ChangeLog 2006/07/06 19:07:40 1.58
@@ -1,3 +1,7 @@
+2006-07-06 Ville Skyttä <scop(a)xemacs.org>
+
+ * vc.el: Sync with upstream.
+
2006-07-04 Ville Skyttä <scop(a)xemacs.org>
* Makefile (VERSION): 0.05.
1.33 +2 -2 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.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- vc.el 2006/07/04 21:48:05 1.32
+++ vc.el 2006/07/06 19:07:41 1.33
@@ -1862,7 +1862,7 @@ actually call the backend, but performs
(if (and file-rev1 file-rev2)
(let ((status
(if (eq vc-diff-knows-L 'no)
- (apply 'vc-do-command "*vc-diff*" 1 "diff"
+ (apply 'vc-do-command "*vc-diff*" 1 "diff"
nil
(append (vc-switches nil 'diff)
(list (file-relative-name file-rev1)
(file-relative-name file-rev2))))
@@ -1880,7 +1880,7 @@ actually call the backend, but performs
(if (eq status 2)
(if (not vc-diff-knows-L)
(setq vc-diff-knows-L 'no
- status (apply 'vc-do-command "*vc-diff*" 1
"diff"
+ status (apply 'vc-do-command "*vc-diff*" 1
"diff" nil
(append
(vc-switches nil 'diff)
(list (file-relative-name file-rev1)
Show replies by date