From 402c8a49571227f8a4e678d4a6cdd6ba7841aef9 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Sat, 27 Nov 2010 14:41:49 -0500 Subject: [PATCH] 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). --- lisp/ChangeLog | 6 ++++++ lisp/log-edit.el | 7 +++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e8dda581208..c6da166726b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2010-11-27 Chong Yidong + + * 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 * dired.el (dired-get-filename): Replace backslashes with slashes diff --git a/lisp/log-edit.el b/lisp/log-edit.el index 0d3061ad2df..ddc0f601701 100644 --- 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) -- 2.39.5