From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 9 May 2020 09:34:58 +0000 (+0300)
Subject: Fix customization of 'display-fill-column-indicator-character'
X-Git-Tag: emacs-27.1-rc1~136
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c5e583977629f55ad438ef0b0c210a9eeb94ae6d;p=emacs.git

Fix customization of 'display-fill-column-indicator-character'

* lisp/cus-start.el (display-fill-column-indicator-character): Fix
the customization form.  (Bug#41145)
---

diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index dff4d9a6060..bd32c7c61d3 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -771,9 +771,16 @@ since it could result in memory overflow and make Emacs crash."
               :safe (lambda (value) (or (booleanp value) (integerp value))))
              (display-fill-column-indicator-character
               display-fill-column-indicator
-              character
+              (choice
+               (character :tag "Use U+2502 to indicate fill column"
+                      :value ?│)
+               (character :tag "Use | to indicate fill column"
+                      :value ?|)
+               (const :tag "If possible, use U+2502 to indicate fill column, otherwise use |"
+                      :value nil)
+               character)
               "27.1"
-              :safe characterp)
+              :safe (lambda (value) (or (characterp value) (booleanp value))))
 	     ;; xfaces.c
 	     (scalable-fonts-allowed display boolean "22.1")
 	     ;; xfns.c