summaryrefslogtreecommitdiff
path: root/lisp/vc.el
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1994-07-19 22:30:06 +0000
committerRichard M. Stallman <rms@gnu.org>1994-07-19 22:30:06 +0000
commit430b21aebf661aae95ece154da9da5fc6aff75ab (patch)
tree73d7fd3f5704618334187854b9845fe621af5df4 /lisp/vc.el
parent4f4ad34f75f66470d4b0dfb4eb78636c123254d2 (diff)
downloademacs-430b21aebf661aae95ece154da9da5fc6aff75ab.tar.gz
At compile time, require dired.
(vc-finish-logentry): Use the proper files buffer for vc-buffer-sync.
Diffstat (limited to 'lisp/vc.el')
-rw-r--r--lisp/vc.el8
1 files changed, 6 insertions, 2 deletions
diff --git a/lisp/vc.el b/lisp/vc.el
index 07f37334c65..ca2eda59cf2 100644
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -61,6 +61,7 @@
(require 'vc-hooks)
(require 'ring)
+(eval-when-compile (require 'dired)) ; for dired-map-over-marks macro
(if (not (assoc 'vc-parent-buffer minor-mode-alist))
(setq minor-mode-alist
@@ -676,8 +677,11 @@ If nil, uses `change-log-default-name'."
))
;; Sync parent buffer in case the user modified it while editing the comment.
(save-excursion
- (set-buffer vc-parent-buffer)
- (vc-buffer-sync))
+ (let ((buffer (get-file-buffer vc-log-file)))
+ (if buffer
+ (progn
+ (set-buffer buffer)
+ (vc-buffer-sync)))))
;; OK, do it to it
(if vc-log-operation
(save-excursion