; Merge branch 'fix/no-undo-boundary-on-secondary-buffer-change'

[gnu-emacs] / lisp / vc / vc-hg.el

diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el
index 8d9493ec210eca0c493038d45ae4c589d349b92c..92b0c3169c1cca097687fa53c5ec626413c4cd1d 100644 (file)
--- a/lisp/vc/vc-hg.el
+++ b/lisp/vc/vc-hg.el
@@ -264,7 +264,7 @@ highlighting the Log View buffer."
                                  "{if(parents, 'parents:     {parents}\n')}"
                                  "user:        {author}\n"
                                  "Date:        {date|date}\n"
-                                 "summary:     {desc}\n\n")
+                                 "summary:     {desc|tabindent}\n\n")
   "Mercurial log template for `vc-hg-print-log' long format.")
 
 (defun vc-hg-print-log (files buffer &optional shortlog start-revision limit)
@@ -305,6 +305,7 @@ If LIMIT is non-nil, show no more than this many entries."
        (if (eq vc-log-view-type 'short)
           (cadr vc-hg-root-log-format)
          "^changeset:[ \t]*\\([0-9]+\\):\\(.+\\)"))
+  (set (make-local-variable 'tab-width) 2)
   ;; Allow expanding short log entries
   (when (eq vc-log-view-type 'short)
     (setq truncate-lines t)
@@ -534,7 +535,7 @@ REV is the revision to check out into WORKFILE."
     (vc-file-setprop buffer-file-name 'vc-state 'conflict)
     (smerge-start-session)
     (add-hook 'after-save-hook 'vc-hg-resolve-when-done nil t)
-    (message "There are unresolved conflicts in this file")))
+    (vc-message-unresolved-conflicts buffer-file-name)))
 
 
 ;; Modeled after the similar function in vc-bzr.el
@@ -630,6 +631,8 @@ REV is the revision to check out into WORKFILE."
 
 ;; Follows vc-hg-command (or vc-do-async-command), which uses vc-do-command
 ;; from vc-dispatcher.
+(declare-function vc-exec-after "vc-dispatcher" (code))
+;; Follows vc-exec-after.
 (declare-function vc-set-async-update "vc-dispatcher" (process-buffer))
 
 (defun vc-hg-dir-status-files (dir files update-function)