From 64d42c56285818c85e66b29c542b95721daf19ea Mon Sep 17 00:00:00 2001 From: Jaro Reinders Date: Tue, 27 Feb 2018 22:38:55 +0100 Subject: [PATCH 1/2] Don't uglify second line of git commit if it is a comment --- yi-misc-modes/src/Yi/Lexer/GitCommit.x | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/yi-misc-modes/src/Yi/Lexer/GitCommit.x b/yi-misc-modes/src/Yi/Lexer/GitCommit.x index 797681a55..09c4e2a57 100644 --- a/yi-misc-modes/src/Yi/Lexer/GitCommit.x +++ b/yi-misc-modes/src/Yi/Lexer/GitCommit.x @@ -24,9 +24,10 @@ $nl { m (const SecondLine) Style.defaultStyle } } -- There should never be anything on the second line of a git commit message --- so it is styled in a deliberately hideous color scheme. +-- so it is styled in a deliberately hideous color scheme, unless it's a comment. { -.+ { c (const $ Style.withFg Style.red `mappend` Style.withBg Style.brown) } +^\# { m (const $ LineComment) Style.commentStyle } +. { c (const $ Style.withFg Style.red `mappend` Style.withBg Style.brown) } $nl { m (const MessageLine) Style.defaultStyle } } From e3121080b39ae4626dca5ce012b76a1033246080 Mon Sep 17 00:00:00 2001 From: Jaro Reinders Date: Tue, 27 Feb 2018 22:40:20 +0100 Subject: [PATCH 2/2] Update CHANGELOG --- CHANGELOG | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 3f265d28d..61e57c34e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,8 +2,9 @@ ------------------------- * Make switching to a buffer by name more lenient * Add line numbers mechanics to core (Note: line numbers are not yet implemented in emacs and pango) - * [yi-keymap-vim] add line numbers commands - * [yi-frontend-vty] show line numbers when appropriate + * [yi-keymap-vim] Add line numbers commands + * [yi-frontend-vty] Show line numbers when appropriate + * [git commit mode] Don't uglify second line when it is a comment 0.17.1 (2017-11-03) -------------------