Fix log-edit-font-lock-keywords (Bug#6465).

* log-edit.el (log-edit-font-lock-keywords): Don't try matching
stand-alone lines, since that is handled by log-edit-match-to-eoh
(Bug#6465).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e8dda581208a8ade55c4b4d4a68563dd22f28939..c6da166726befe14280752206d32e27541f47ca0 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2010-11-27  Chong Yidong  <cyd@stupidchicken.com>
+
+       * log-edit.el (log-edit-font-lock-keywords): Don't try matching
+       stand-alone lines, since that is handled by log-edit-match-to-eoh
+       (Bug#6465).
+
 2010-11-27  Eduard Wiebe  <usenet@pusto.de>
 
        * dired.el (dired-get-filename): Replace backslashes with slashes

diff --git a/lisp/log-edit.el b/lisp/log-edit.el
index 0d3061ad2df5c06e6912b8817629962210f17960..ddc0f601701adb495363ec747487e3a4f969b6e0 100644 (file)
--- a/lisp/log-edit.el
+++ b/lisp/log-edit.el
@@ -350,17 +350,16 @@ automatically."
 (defvar log-edit-font-lock-keywords
   ;; Copied/inspired by message-font-lock-keywords.
   `((log-edit-match-to-eoh
-     (,(concat "^\\(\\([a-z]+\\):\\)" log-edit-header-contents-regexp
-               "\\|\\(.*\\)")
+     (,(concat "^\\(\\([a-z]+\\):\\)" log-edit-header-contents-regexp)
       (progn (goto-char (match-beginning 0)) (match-end 0)) nil
       (1 (if (assoc (match-string 2) log-edit-headers-alist)
              'log-edit-header
            'log-edit-unknown-header)
          nil lax)
+      ;; From `log-edit-header-contents-regexp':
       (3 (or (cdr (assoc (match-string 2) log-edit-headers-alist))
              'log-edit-header)
-         nil lax)
-      (4 font-lock-warning-face)))))
+         nil lax)))))
 
 ;;;###autoload
 (defun log-edit (callback &optional setup params buffer mode &rest ignore)