merge trunk

1 files changed, 9 insertions, 1 deletions

diff --git a/lisp/vc/log-edit.el b/lisp/vc/log-edit.el
index e6bd897f4ac..1d75411ec1f 100644
--- a/lisp/vc/log-edit.el
+++ b/lisp/vc/log-edit.el
@@ -132,6 +132,8 @@ This applies when its SETUP argument is non-nil."
 			   log-edit-insert-changelog
 			   log-edit-show-files)
   "Hook run at the end of `log-edit'."
+  ;; Added log-edit-insert-message-template, moved log-edit-show-files.
+  :version "24.4"
   :group 'log-edit
   :type '(hook :options (log-edit-insert-message-template
 			 log-edit-insert-cvs-rcstemplate
@@ -355,9 +357,15 @@ The first subexpression is the actual text of the field.")
       (set-match-data (list start (point)))
       (point))))
 
+(defun log-edit-goto-eoh ()             ;FIXME: Almost rfc822-goto-eoh!
+  (goto-char (point-min))
+  (when (re-search-forward
+	 "^\\([^[:alpha:]]\\|[[:alnum:]-]+[^[:alnum:]-:]\\)" nil 'move)
+    (goto-char (match-beginning 0))))
+
 (defun log-edit--match-first-line (limit)
   (let ((start (point)))
-    (rfc822-goto-eoh)
+    (log-edit-goto-eoh)
     (skip-chars-forward "\n")
     (and (< start (line-end-position))
          (< (point) limit)