From 3ec2c779458752c03f158ebcb858e119eee93d7d Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Mon, 10 Mar 2025 20:33:47 +0100 Subject: [PATCH] ; Add comment to explain recent change * lisp/vc/log-edit.el (log-edit-font-lock-keywords): Add comment to explain recent change. Proposed by Eli Zaretskii . Ref: https://lists.gnu.org/r/emacs-devel/2025-03/msg00587.html (cherry picked from commit bab17c7fb5161d3ed4820bf51d0cec6ee1cbb525) --- lisp/vc/log-edit.el | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lisp/vc/log-edit.el b/lisp/vc/log-edit.el index 3eb614f6030..19994508ca7 100644 --- a/lisp/vc/log-edit.el +++ b/lisp/vc/log-edit.el @@ -458,8 +458,13 @@ The first subexpression is the actual text of the field.") 'log-edit-header) nil lax)) ("^\n" - (and (not (bound-and-true-p git-commit-mode)) - (progn (goto-char (match-end 0)) (1+ (match-end 0)))) nil + (and + ;; This fixes a bug with `git-commit-mode', a NonGNU ELPA package + ;; used by Magit. Without this check, we get a wrong display + ;; when `git-commit-major-mode' is set to `log-edit-mode'. + (not (bound-and-true-p git-commit-mode)) + (progn (goto-char (match-end 0)) (1+ (match-end 0)))) + nil (0 '( face log-edit-headers-separator display-line-numbers-disable t rear-nonsticky t)))) (log-edit--match-first-line (0 'log-edit-summary)))) -- 2.39.5