aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2007-07-07 20:46:39 +0000
committerStefan Monnier2007-07-07 20:46:39 +0000
commitcd42ec7d9b0d8538a4b7339e57d794f897a77b0a (patch)
tree8b4f179f0862f6f027fb8215c71b3bf573cb9126
parent7c33af856e7f8a8158cd29f1cfea0377dd91af42 (diff)
downloademacs-cd42ec7d9b0d8538a4b7339e57d794f897a77b0a.tar.gz
emacs-cd42ec7d9b0d8538a4b7339e57d794f897a77b0a.zip
(vc-annotate): Jump to line and output message only after the
process is really all done.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/vc.el10
2 files changed, 12 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bf45b3524f4..b77f7609620 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12007-07-07 Tom Tromey <tromey@redhat.com>
2
3 * vc.el (vc-annotate): Jump to line and output message only after the
4 process is really all done.
5
12007-07-07 Stefan Monnier <monnier@iro.umontreal.ca> 62007-07-07 Stefan Monnier <monnier@iro.umontreal.ca>
2 7
3 * vc.el (vc-exec-after): Don't move point from the sentinel. 8 * vc.el (vc-exec-after): Don't move point from the sentinel.
diff --git a/lisp/vc.el b/lisp/vc.el
index 8342a86a4f7..04efe7fc2f0 100644
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -3209,9 +3209,13 @@ colors. `vc-annotate-background' specifies the background color."
3209 (set (make-local-variable 'vc-annotate-parent-rev) rev) 3209 (set (make-local-variable 'vc-annotate-parent-rev) rev)
3210 (set (make-local-variable 'vc-annotate-parent-display-mode) 3210 (set (make-local-variable 'vc-annotate-parent-display-mode)
3211 display-mode))) 3211 display-mode)))
3212 (when current-line 3212
3213 (goto-line current-line temp-buffer-name)) 3213 (vc-exec-after
3214 (message "Annotating... done"))) 3214 `(progn
3215 (when ,current-line
3216 (goto-line ,current-line ,temp-buffer-name))
3217 (unless (active-minibuffer-window)
3218 (message "Annotating... done"))))))
3215 3219
3216(defun vc-annotate-prev-version (prefix) 3220(defun vc-annotate-prev-version (prefix)
3217 "Visit the annotation of the version previous to this one. 3221 "Visit the annotation of the version previous to this one.