Recompute mode-lines when marking conflicts resolved

* lisp/vc/vc.el (vc-mark-resolved): Recompute the mode lines of the affected files.
2021-01-31 03:08:38 +02:00
parent 636ef445af
commit 0f2d87716a
1 changed files with 3 additions and 0 deletions
--- 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.  \