User: scop
Date: 06/06/12 21:31:42
Modified: packages/unsupported/scop/vc ChangeLog Makefile log-edit.el
vc.el
Log:
Sync vc with upstream.
Revision Changes Path
1.62 +1 -1 XEmacs/packages/unsupported/scop/STATUS
Index: STATUS
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/STATUS,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- STATUS 2006/04/29 19:28:08 1.61
+++ STATUS 2006/06/12 19:31:39 1.62
＠＠ -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
-- Up to date with GNU Emacs CVS HEAD as of 2006-04-29.
+- Up to date with GNU Emacs CVS HEAD as of 2006-06-12.
- Compiles, something even works.
1.50 +6 -0 XEmacs/packages/unsupported/scop/vc/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/vc/ChangeLog,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- ChangeLog 2006/04/30 22:43:01 1.49
+++ ChangeLog 2006/06/12 19:31:41 1.50
＠＠ -1,3 +1,9 ＠＠
+2006-06-12 Ville Skyttä <scop(a)xemacs.org>
+
+ * Makefile (VERSION): 0.04.
+
+ * vc.el: Sync with upstream.
+
2006-05-01 Ville Skyttä <scop(a)xemacs.org>
* vc.el (vc-default-show-log-entry): Workaround for (at least so
1.8 +1 -1 XEmacs/packages/unsupported/scop/vc/Makefile
Index: Makefile
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/vc/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- Makefile 2006/04/22 18:29:45 1.7
+++ Makefile 2006/06/12 19:31:41 1.8
＠＠ -17,7 +17,7 ＠＠
# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA.
-VERSION = 0.03
+VERSION = 0.04
AUTHOR_VERSION =
MAINTAINER = Ville Skyttä <scop(a)xemacs.org>
PACKAGE = vc
1.11 +1 -1 XEmacs/packages/unsupported/scop/vc/log-edit.el
Index: log-edit.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/vc/log-edit.el,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- log-edit.el 2006/02/10 23:25:42 1.10
+++ log-edit.el 2006/06/12 19:31:42 1.11
＠＠ -3,7 +3,7 ＠＠
;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
;; 2005, 2006 Free Software Foundation, Inc.
-;; Author: Stefan Monnier <monnier(a)cs.yale.edu>
+;; Author: Stefan Monnier <monnier(a)iro.umontreal.ca>
;; Keywords: pcl-cvs cvs commit log
;; This file is part of GNU Emacs.
1.28 +9 -5 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.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- vc.el 2006/04/30 22:43:01 1.27
+++ vc.el 2006/06/12 19:31:42 1.28
＠＠ -900,10 +900,12 ＠＠ However, before executing BODY, find FIL
(defun vc-process-filter (p s)
"An alternative output filter for async process P.
-The only difference with the default filter is to insert S after markers."
+One difference with the default filter is that this inserts S after markers.
+Another is that undo information is not kept."
(with-current-buffer (process-buffer p)
(save-excursion
- (let ((inhibit-read-only t))
+ (let ((buffer-undo-list t)
+ (inhibit-read-only t))
(goto-char (process-mark p))
(insert s)
(set-marker (process-mark p) (point))))))
＠＠ -920,7 +922,8 ＠＠ BUF defaults to \"*vc*\", can be a strin
(set (make-local-variable 'vc-parent-buffer-name)
(concat " from " (buffer-name camefrom)))
(setq default-directory olddir)
- (let ((inhibit-read-only t))
+ (let ((buffer-undo-list t)
+ (inhibit-read-only t))
(erase-buffer))))
(defun vc-exec-after (code)
＠＠ -1009,8 +1012,9 ＠＠ that is inserted into the command line b
(vc-exec-after
`(unless (active-minibuffer-window)
(message "Running %s in the background... done" ',command))))
- ;; XEmacs: we don't have process-file, use call-process instead.
- (setq status (apply 'call-process command nil t nil squeezed))
+ (let ((buffer-undo-list t))
+ ;; XEmacs: we don't have process-file, use call-process instead.
+ (setq status (apply 'call-process command nil t nil squeezed)))
(when (and (not (eq t okstatus))
(or (not (integerp status))
(and okstatus (< okstatus status))))
