Commit cdaf7a1a authored by Richard M. Stallman's avatar Richard M. Stallman
Browse files

(vc-next-action): Even in 1-file case, get its name from FILES.

(vc-finish-logentry): Don't do vc-buffer-sync on the parent buffer
when that parent buffer is a dired buffer.
parent f9ae5324
...@@ -470,7 +470,7 @@ lock steals will raise an error. ...@@ -470,7 +470,7 @@ lock steals will raise an error.
(if vc-dired-mode (if vc-dired-mode
(let ((files (dired-get-marked-files))) (let ((files (dired-get-marked-files)))
(if (= (length files) 1) (if (= (length files) 1)
(find-file-other-window (dired-get-filename)) (find-file-other-window (car files))
(vc-start-entry nil nil nil (vc-start-entry nil nil nil
"Enter a change comment for the marked files." "Enter a change comment for the marked files."
'vc-next-action-dired) 'vc-next-action-dired)
...@@ -528,7 +528,7 @@ lock steals will raise an error. ...@@ -528,7 +528,7 @@ lock steals will raise an error.
;; Accept a comment for an operation on FILE revision REV. If COMMENT ;; Accept a comment for an operation on FILE revision REV. If COMMENT
;; is nil, pop up a VC-log buffer, emit MSG, and set the ;; is nil, pop up a VC-log buffer, emit MSG, and set the
;; action on close to ACTION; otherwise, do action immediately. ;; action on close to ACTION; otherwise, do action immediately.
;; Remember the file's buffer in parent-buffer (current one if no file). ;; Remember the file's buffer in vc-parent-buffer (current one if no file).
;; AFTER-HOOK specifies the local value for vc-log-operation-hook. ;; AFTER-HOOK specifies the local value for vc-log-operation-hook.
(let ((parent (if file (find-file-noselect file) (current-buffer)))) (let ((parent (if file (find-file-noselect file) (current-buffer))))
(if comment (if comment
...@@ -676,12 +676,11 @@ If nil, uses `change-log-default-name'." ...@@ -676,12 +676,11 @@ If nil, uses `change-log-default-name'."
(ring-insert vc-comment-ring (buffer-string)) (ring-insert vc-comment-ring (buffer-string))
)) ))
;; Sync parent buffer in case the user modified it while editing the comment. ;; Sync parent buffer in case the user modified it while editing the comment.
;; But not if it is a vc-dired buffer.
(save-excursion (save-excursion
(let ((buffer (get-file-buffer vc-log-file))) (set-buffer vc-parent-buffer)
(if buffer (or vc-dired-mode
(progn (vc-buffer-sync)))
(set-buffer buffer)
(vc-buffer-sync)))))
;; OK, do it to it ;; OK, do it to it
(if vc-log-operation (if vc-log-operation
(save-excursion (save-excursion
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment