From 7f49e03d18b14b09a359e27caae1e2d22cc8cd0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Gwo=C5=BAdzi=C5=84ski?= Date: Sun, 22 Oct 2023 15:57:24 +0200 Subject: [PATCH 1/2] Highlight only first error line by default --- emacs/merlin.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/emacs/merlin.el b/emacs/merlin.el index c13fac943a..b82cc8ed33 100644 --- a/emacs/merlin.el +++ b/emacs/merlin.el @@ -153,7 +153,7 @@ If a string list, check only if the extension of the buffer-file-name "If non-nil, display errors in fringe" :group 'merlin :type 'boolean) -(defcustom merlin-error-on-single-line nil +(defcustom merlin-error-on-single-line t "Only highlight first line of multi-line error messages" :group 'merlin :type 'boolean) From 5e24cb9178a77140d48f633f802b5e44bca5ad53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Gwo=C5=BAdzi=C5=84ski?= Date: Sun, 22 Oct 2023 16:02:26 +0200 Subject: [PATCH 2/2] Add #1693 changelog --- CHANGES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.md b/CHANGES.md index 54548eba5b..f8f27f3439 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -5,6 +5,7 @@ merlin NEXT_VERSION - Fix a follow-up issue to the preference of non-ghost nodes introduced in #1660 (#1690, fixes #1689) + editor modes - vim: load merlin when Vim is compiled with +python3/dyn (e.g. MacVim) + - emacs: highlight only first error line by default (#1693, fixes #1663) merlin 4.12 ===========