changeset 111778:154433017097

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).
author Chong Yidong <cyd@stupidchicken.com>
date Sat, 27 Nov 2010 14:41:49 -0500
parents 68ad8caf0020
children 141d3f14d8c3 8e856214e6e5
files lisp/ChangeLog lisp/log-edit.el
diffstat 2 files changed, 9 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Sat Nov 27 11:56:49 2010 +0200
+++ b/lisp/ChangeLog	Sat Nov 27 14:41:49 2010 -0500
@@ -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
--- a/lisp/log-edit.el	Sat Nov 27 11:56:49 2010 +0200
+++ b/lisp/log-edit.el	Sat Nov 27 14:41:49 2010 -0500
@@ -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)