diff lisp/vc-hg.el @ 108439:c3622fa53abe

Merge from mainline.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Fri, 26 Mar 2010 15:03:20 +0000
parents 79c0352f271f
children 94a453a3e40a
line wrap: on
line diff
--- a/lisp/vc-hg.el	Mon Mar 22 10:47:09 2010 +0000
+++ b/lisp/vc-hg.el	Fri Mar 26 15:03:20 2010 +0000
@@ -279,6 +279,7 @@
           ("^date: \\(.+\\)" (1 'change-log-date))
             ("^summary:[ \t]+\\(.+\\)" (1 'log-view-message)))))))
 
+(declare-function log-edit-mode "log-edit" ())
 (defvar log-edit-extra-flags)
 (defvar log-edit-before-checkin-process)
 
@@ -286,7 +287,7 @@
   "Mode for editing Hg commit logs.
 If a line like:
 Author: NAME
-is present in the log, it is removed, and 
+is present in the log, it is removed, and
 --author NAME
 is passed to the hg commit command."
   (set (make-local-variable 'log-edit-extra-flags) nil)