bug#57241: Commit b87400c broke master

[Jim Porter <jporterbugs@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 202 bytes --]

On 8/30/2022 7:55 AM, Mattias Engdegård wrote:
> reopen 57241
> stop
> 
> For the test-custom-opts failure.

The attached patch fixes this for me. Does this seem like a reasonable 
way to go about it?

[-- Attachment #2: 0001-Under-no-X-builds-allow-any-value-for-fringe-bitmap-.patch --]
[-- Type: text/plain, Size: 1148 bytes --]

From 86152743c478c7aca95ce9de9edfd78d29718faa Mon Sep 17 00:00:00 2001
From: Jim Porter <jporterbugs@gmail.com>
Date: Wed, 31 Aug 2022 22:52:34 -0700
Subject: [PATCH] Under no-X builds, allow any value for 'fringe-bitmap'
 options

* lisp/cus-edit (fringe-bitmap): Always match under no-X.
---
 lisp/cus-edit.el | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index d3768766be..2229b6bdb7 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -4298,7 +4298,12 @@ 'fringe-bitmap
   "A Lisp fringe bitmap name."
   :format "%v"
   :tag "Fringe bitmap"
-  :match (lambda (_widget value) (fringe-bitmap-p value))
+  :match (lambda (_widget value)
+           ;; In no-X builds, allow anything.  This ensures that
+           ;; customizations set on a with-X build aren't considered
+           ;; invalid under no-X.
+           (or (not (boundp 'fringe-bitmaps))
+               (fringe-bitmap-p value)))
   :completions (apply-partially #'completion-table-with-predicate
                                 obarray #'fringe-bitmap-p 'strict)
   :prompt-match 'fringe-bitmap-p
-- 
2.25.1