[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 4bef92e: Call vc-resynch-buffer in vc-git-resolve-w
From: |
Dmitry Gutov |
Subject: |
[Emacs-diffs] master 4bef92e: Call vc-resynch-buffer in vc-git-resolve-when-done |
Date: |
Tue, 12 Sep 2017 19:32:20 -0400 (EDT) |
branch: master
commit 4bef92e9e02d074de1d92e30dc5ef4dd62558c80
Author: Dmitry Gutov <address@hidden>
Commit: Dmitry Gutov <address@hidden>
Call vc-resynch-buffer in vc-git-resolve-when-done
* lisp/vc/vc-git.el (vc-git-resolve-when-done):
Call vc-resynch-buffer on the current file (bug#28121).
Move its autoload to before this function.
---
lisp/vc/vc-git.el | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index cc3e295..71cf57a 100644
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -951,6 +951,10 @@ This prompts for a branch to merge from."
"DU" "AA" "UU"))
(push (expand-file-name file directory) files)))))))
+;; Everywhere but here, follows vc-git-command, which uses vc-do-command
+;; from vc-dispatcher.
+(autoload 'vc-resynch-buffer "vc-dispatcher")
+
(defun vc-git-resolve-when-done ()
"Call \"git add\" if the conflict markers have been removed."
(save-excursion
@@ -964,6 +968,7 @@ This prompts for a branch to merge from."
(vc-git-root
buffer-file-name)))
(vc-git-conflicted-files (vc-git-root buffer-file-name)))
(vc-git-command nil 0 nil "reset"))
+ (vc-resynch-buffer buffer-file-name t t)
;; Remove the hook so that it is not called multiple times.
(remove-hook 'after-save-hook 'vc-git-resolve-when-done t))))
@@ -1450,10 +1455,6 @@ This command shares argument histories with \\[rgrep]
and \\[grep]."
(if (eq next-error-last-buffer (current-buffer))
(setq default-directory dir))))))
-;; Everywhere but here, follows vc-git-command, which uses vc-do-command
-;; from vc-dispatcher.
-(autoload 'vc-resynch-buffer "vc-dispatcher")
-
(defun vc-git-stash (name)
"Create a stash."
(interactive "sStash name: ")
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 4bef92e: Call vc-resynch-buffer in vc-git-resolve-when-done,
Dmitry Gutov <=