User: scop Date: 06/08/05 11:16:34 Modified: packages/unsupported/scop/vc ChangeLog vc-git.el vc.el Log: Sync vc with upstream. Revision Changes Path 1.67 +2 -2 XEmacs/packages/unsupported/scop/STATUS Index: STATUS =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/STATUS,v retrieving revision 1.66 retrieving revision 1.67 diff -u -p -r1.66 -r1.67 --- STATUS 2006/07/06 19:07:36 1.66 +++ STATUS 2006/08/05 09:16:30 1.67 ＠＠ -13,9 +13,9 ＠＠ 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-06-28. +- Up to date with GNU Emacs CVS HEAD as of 2006-08-05. - 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-06. +- Up to date with GNU Emacs CVS HEAD, git upstream as of 2006-08-05. - Approaching usable state. 1.59 +6 -0 XEmacs/packages/unsupported/scop/vc/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/vc/ChangeLog,v retrieving revision 1.58 retrieving revision 1.59 diff -u -p -r1.58 -r1.59 --- ChangeLog 2006/07/06 19:07:40 1.58 +++ ChangeLog 2006/08/05 09:16:33 1.59 ＠＠ -1,3 +1,9 ＠＠ +2006-08-05 Ville Skyttä <scop(a)xemacs.org&gt; + + * vc.el: Sync with upstream. + + * vc-git.el: Changes applied upstream. + 2006-07-06 Ville Skyttä <scop(a)xemacs.org&gt; * vc.el: Sync with upstream. 1.2 +0 -2 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.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- vc-git.el 2006/07/04 21:52:23 1.1 +++ vc-git.el 2006/08/05 09:16:34 1.2 ＠＠ -95,13 +95,11 ＠＠ "Register FILE into the git version-control system." (vc-git--run-command file "update-index" "--add" "--")) -;; XEmacs change: add optional BUFFER arg, use it (defun vc-git-print-log (file &optional buffer) (let ((name (file-relative-name file)) (coding-system-for-read git-commits-coding-system)) (vc-do-command buffer 'async "git" name "rev-list" "--pretty" "HEAD" "--"))) -;; XEmacs change: add optional BUFFER arg, use it (defun vc-git-diff (file &optional rev1 rev2 buffer) (let ((name (file-relative-name file)) (buf (or buffer "*vc-diff*"))) 1.34 +9 -8 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.33 retrieving revision 1.34 diff -u -p -r1.33 -r1.34 --- vc.el 2006/07/06 19:07:41 1.33 +++ vc.el 2006/08/05 09:16:34 1.34 ＠＠ -940,11 +940,12 ＠＠ Else, add CODE to the process' sentinel. (let ((proc (get-buffer-process (current-buffer)))) (cond ;; If there's no background process, just execute the code. - ((null proc) (eval code)) - ;; If the background process has exited, reap it and try again - ((eq (process-status proc) 'exit) - (delete-process proc) - (vc-exec-after code)) + ;; We used to explicitly call delete-process on exited processes, + ;; but this led to timing problems causing process output to be + ;; lost. Terminated processes get deleted automatically + ;; anyway. -- cyd + ((or (null proc) (eq (process-status proc) 'exit)) + (eval code)) ;; If a process is running, add CODE to the sentinel ((eq (process-status proc) 'run) (let ((sentinel (process-sentinel proc))) ＠＠ -2465,10 +2466,10 ＠＠ If FOCUS-REV is non-nil, leave the point (vc-call print-log file) (set-buffer "*vc*")))) (pop-to-buffer (current-buffer)) - ;; XEmacs: we don't have log-view-mode (yet?), so use ignore-errors here - (ignore-errors (log-view-mode)) (vc-exec-after `(let ((inhibit-read-only t)) + ;; XEmacs: we don't have log-view-mode (yet?), so ignore-errors for now + (ignore-errors (log-view-mode)) (goto-char (point-max)) (forward-line -1) (while (looking-at "=*\n") (delete-char (- (match-end 0) (match-beginning 0))) ＠＠ -2476,7 +2477,7 ＠＠ If FOCUS-REV is non-nil, leave the point (goto-char (point-min)) (if (looking-at "[\b\t\n\v\f\r ]+") (delete-char (- (match-end 0) (match-beginning 0)))) - (shrink-window-if-larger-than-buffer) + ;; (shrink-window-if-larger-than-buffer) ;; move point to the log entry for the current version (vc-call-backend ',(vc-backend file) 'show-log-entry