[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/vc.el
From: |
André Spiegel |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/vc.el |
Date: |
Sun, 09 Jan 2005 16:52:45 -0500 |
Index: emacs/lisp/vc.el
diff -c emacs/lisp/vc.el:1.387 emacs/lisp/vc.el:1.388
*** emacs/lisp/vc.el:1.387 Fri Dec 17 10:48:53 2004
--- emacs/lisp/vc.el Sun Jan 9 21:27:28 2005
***************
*** 152,158 ****
;; have such a brief-comparison feature, the default implementation of
;; this function can be used, which delegates to a full
;; vc-BACKEND-diff. (Note that vc-BACKEND-diff must not run
! ;; asynchronously in this case.)
;;
;; - mode-line-string (file)
;;
--- 152,158 ----
;; have such a brief-comparison feature, the default implementation of
;; this function can be used, which delegates to a full
;; vc-BACKEND-diff. (Note that vc-BACKEND-diff must not run
! ;; asynchronously in this case, see variable `vc-disable-async-diff'.)
;;
;; - mode-line-string (file)
;;
***************
*** 566,571 ****
--- 566,580 ----
:group 'vc
:version "21.1")
+ (defcustom vc-allow-async-revert nil
+ "*Specifies whether the diff during \\[vc-revert-buffer] may be
asynchronous.
+ Enabling this option means that you can confirm a revert operation even
+ if the local changes in the file have not been found and displayed yet."
+ :type '(choice (const :tag "No" nil)
+ (const :tag "Yes" t))
+ :group 'vc
+ :version "21.4")
+
;;;###autoload
(defcustom vc-checkout-hook nil
"*Normal hook (list of functions) run after checking out a file.
***************
*** 714,719 ****
--- 723,733 ----
(defvar vc-parent-buffer-name nil)
(put 'vc-parent-buffer-name 'permanent-local t)
+ (defvar vc-disable-async-diff nil
+ "VC sets this to t locally to disable some async diff operations.
+ Backends that offer asynchronous diffs should respect this variable
+ in their implementation of vc-BACKEND-diff.")
+
(defvar vc-log-file)
(defvar vc-log-version)
***************
*** 2435,2445 ****
(unless (yes-or-no-p "File seems up-to-date. Revert anyway? ")
(error "Revert canceled")))
(unless (vc-workfile-unchanged-p file)
;; vc-diff selects the new window, which is not what we want:
;; if the new window is on another frame, that'd require the user
;; moving her mouse to answer the yes-or-no-p question.
! (let ((win (save-selected-window
! (setq status (vc-diff nil t)) (selected-window))))
(vc-exec-after `(message nil))
(when status
(unwind-protect
--- 2449,2461 ----
(unless (yes-or-no-p "File seems up-to-date. Revert anyway? ")
(error "Revert canceled")))
(unless (vc-workfile-unchanged-p file)
+ (message "Finding changes...")
;; vc-diff selects the new window, which is not what we want:
;; if the new window is on another frame, that'd require the user
;; moving her mouse to answer the yes-or-no-p question.
! (let* ((vc-disable-async-diff (not vc-allow-async-revert))
! (win (save-selected-window
! (setq status (vc-diff nil t)) (selected-window))))
(vc-exec-after `(message nil))
(when status
(unwind-protect
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/vc.el,
André Spiegel <=