User: scop Date: 06/07/04 22:58:34 Modified: packages/unsupported/scop/vc ChangeLog vc.el Log: Q'n'd workaround for vc-revert-buffer diff window deletion problem. Revision Changes Path 1.54 +4 -0 XEmacs/packages/unsupported/scop/vc/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/vc/ChangeLog,v retrieving revision 1.53 retrieving revision 1.54 diff -u -p -r1.53 -r1.54 --- ChangeLog 2006/07/04 20:11:50 1.53 +++ ChangeLog 2006/07/04 20:58:33 1.54 ＠＠ -1,5 +1,9 ＠＠ 2006-07-04 Ville Skyttä <scop(a)xemacs.org&gt; + * vc.el (vc-revert-buffer): Don't try to delete the revert + confirmation diff window for now as it breaks for some + reason, and prevents the actual revert from happening. + * vc.el (vc-restore-buffer-context): Test for mark before using. * vc-xemacs.el: Comment update. 1.31 +10 -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.30 retrieving revision 1.31 diff -u -p -r1.30 -r1.31 --- vc.el 2006/07/04 20:11:50 1.30 +++ vc.el 2006/07/04 20:58:33 1.31 ＠＠ -2552,11 +2552,16 ＠＠ changes found in the master file; use \\ (unwind-protect (unless (yes-or-no-p "Discard changes? ") (error "Revert canceled")) - (select-window win) - (if (one-window-p t) - (if (window-dedicated-p (selected-window)) - (make-frame-invisible)) - (delete-window)))))) + ;; XEmacs change: (select-window win) below breaks for some + ;; reason, so disable for now to allow the actual revert a chance + ;; to succeed (leaves the opened *vc-diff* window hanging around): + ;; Wrong type argument: window-live-p, #<window 0x6ff7f4> + )))) +;; (select-window win) +;; (if (one-window-p t) +;; (if (window-dedicated-p (selected-window)) +;; (make-frame-invisible)) +;; (delete-window)))))) (set-buffer obuf) ;; Do the reverting (message "Reverting %s..." file)