[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100249: Fix log-edit-font-lock-keywords (Bug#6465).

[Chong Yidong]

------------------------------------------------------------
revno: 100249
committer: Chong Yidong <address@hidden>
branch nick: emacs-23
timestamp: Sat 2010-11-27 14:41:49 -0500
message:
  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).
modified:
  lisp/ChangeLog
  lisp/log-edit.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-11-27 09:56:49 +0000
+++ b/lisp/ChangeLog    2010-11-27 19:41:49 +0000
@@ -1,3 +1,9 @@
+2010-11-27  Chong Yidong  <address@hidden>
+
+       * 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  <address@hidden>
 
        * dired.el (dired-get-filename): Replace backslashes with slashes

=== modified file 'lisp/log-edit.el'
--- a/lisp/log-edit.el  2010-11-01 03:13:42 +0000
+++ b/lisp/log-edit.el  2010-11-27 19:41:49 +0000
@@ -350,17 +350,16 @@
 (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)