diff options
| author | Dmitry Gutov <dgutov@yandex.ru> | 2021-01-31 03:08:38 +0200 |
|---|---|---|
| committer | Dmitry Gutov <dgutov@yandex.ru> | 2021-01-31 03:09:19 +0200 |
| commit | 0f2d87716a2cb6fae5ea6719763441c448fe7a74 (patch) | |
| tree | 66a28b80358cf20d117df6c615934df0df1c2eed | |
| parent | 636ef445af03a564ad431648cda34d78d0cb807c (diff) | |
| download | emacs-0f2d87716a2cb6fae5ea6719763441c448fe7a74.tar.gz | |
Recompute mode-lines when marking conflicts resolved
* lisp/vc/vc.el (vc-mark-resolved):
Recompute the mode lines of the affected files.
| -rw-r--r-- | lisp/vc/vc.el | 3 |
1 files changed, 3 insertions, 0 deletions
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. \ |