From: Dmitry Gutov <dgutov@yandex.ru>
Date: Sun, 31 Jan 2021 01:08:38 +0000 (+0200)
Subject: Recompute mode-lines when marking conflicts resolved
X-Git-Tag: emacs-28.0.90~4018
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0f2d87716a2cb6fae5ea6719763441c448fe7a74;p=emacs.git

Recompute mode-lines when marking conflicts resolved

* lisp/vc/vc.el (vc-mark-resolved):
Recompute the mode lines of the affected files.
---

diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index bc9f11202b1..00976a07d42 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -1549,6 +1549,9 @@ After check-out, runs the normal hook `vc-checkout-hook'."
 	  (vc-call-backend backend 'mark-resolved files)
 	  ;; FIXME: Is this TRTD?  Might not be.
 	  `((vc-state . edited)))
+    ;; Recompute mode lines.
+    (dolist (file files)
+      (vc-mode-line file backend))
     (message
      (substitute-command-keys
       "Conflicts have been resolved in %s.  \