Subject: bug#65920: 30.0.50; Missing choice for 2 options in replace.el

From: Mauro Aranda <[email-masked]>
Date: Wed, 13 Sep 2023 12:51:19 -0300

tags 65920 patch
quit

Here's a patch.

From 159f36c36c5d9e8fa6943e9a72eaf8dc9953283e Mon Sep 17 00:00:00 2001
From: Mauro Aranda <[email-masked]>
Date: Wed, 13 Sep 2023 12:49:40 -0300
Subject: [PATCH] Fix defcustom in replace.el (Bug#65920)

* lisp/replace.el (list-matching-lines-face)
(list-matching-lines-buffer-name-face): Allow a nil value.
---
 lisp/replace.el | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lisp/replace.el b/lisp/replace.el
index eeac734f3bd..6b06e48c384 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -1667,13 +1667,15 @@ 'list-matching-lines
 (defcustom list-matching-lines-face 'match
   "Face used by \\[list-matching-lines] to show the text that matches.
 If the value is nil, don't highlight the matching portions specially."
-  :type 'face
+  :type '(choice (const :tag "Don't highlight matching portions" nil)
+                 face)
   :group 'matching)
 
 (defcustom list-matching-lines-buffer-name-face 'underline
   "Face used by \\[list-matching-lines] to show the names of buffers.
 If the value is nil, don't highlight the buffer names specially."
-  :type 'face
+  :type '(choice (const :tag "Don't highlight buffer names" nil)
+                 face)
   :group 'matching)
 
 (defcustom list-matching-lines-current-line-face 'lazy-highlight
-- 
2.34.1