From 0dcc4449812658ab289c26e2b11c0d5bbf69a2cc Mon Sep 17 00:00:00 2001
From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Thu, 22 Jul 2021 14:14:33 +0200
Subject: [PATCH] Remove the (value) bits from cus-start Customize strings

* lisp/cus-start.el (standard): Don't mention the Lisp values in
the choice strings, because that's just confusing in the Customize
interface (bug#49687).
---
 lisp/cus-start.el | 42 ++++++++++++++++++++++--------------------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 50a6bd2f752..7df70d704ef 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -306,8 +306,8 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
 	     (use-short-answers menu boolean "28.1")
 	     (focus-follows-mouse
               frames (choice
-                      (const :tag "Off (nil)" :value nil)
-                      (const :tag "On (t)" :value t)
+                      (const :tag "Off" :value nil)
+                      (const :tag "On" :value t)
                       (const :tag "Auto-raise" :value auto-raise)) "26.1")
 	     ;; fontset.c
 	     ;; FIXME nil is the initial value, fontset.el setqs it.
@@ -603,27 +603,29 @@ since it could result in memory overflow and make Emacs crash."
 	     (next-screen-context-lines windows integer)
  	     (scroll-preserve-screen-position
  	      windows (choice
- 		       (const :tag "Off (nil)" :value nil)
- 		       (const :tag "Full screen (t)" :value t)
- 		       (other :tag "Always" 1)) "22.1")
+                       (const :tag "Off" :value nil)
+                       (const :tag "Full screen" :value t)
+                       (other :tag "Always" 1))
+              "22.1")
 	     (recenter-redisplay
 	      windows (choice
-		       (const :tag "Never (nil)" :value nil)
+		       (const :tag "Never" :value nil)
 		       (const :tag "Only on ttys" :value tty)
-		       (other :tag "Always" t)) "23.1")
+		       (other :tag "Always" t))
+              "23.1")
 	     (window-combination-resize windows boolean "24.1")
 	     (window-combination-limit
 	      windows (choice
-		       (const :tag "Never (nil)" :value nil)
-		       (const :tag "If requested via buffer display alist (window-size)"
+		       (const :tag "Never" :value nil)
+		       (const :tag "If requested via buffer display alist"
                               :value window-size)
-		       (const :tag "With Temp Buffer Resize mode (temp-buffer-resize)"
+		       (const :tag "With Temp Buffer Resize mode"
 			      :value temp-buffer-resize)
-		       (const :tag "For temporary buffers (temp-buffer)"
+		       (const :tag "For temporary buffers"
 			      :value temp-buffer)
-		       (const :tag "For buffer display (display-buffer)"
+		       (const :tag "For buffer display"
 			      :value display-buffer)
-		       (other :tag "Always (t)" :value t))
+		       (other :tag "Always" :value t))
 	      "26.1")
 	     (fast-but-imprecise-scrolling scrolling boolean "25.1")
 	     (window-resize-pixelwise windows boolean "24.4")
@@ -633,9 +635,9 @@ since it could result in memory overflow and make Emacs crash."
 				       :safe booleanp)
              (mode-line-compact
               mode-line
-              (choice (const :tag "Never (nil)" :value nil)
-                      (const :tag "Only if wider than window (long)" :value long)
-                      (const :tag "Always (t)" :value t))
+              (choice (const :tag "Never" :value nil)
+                      (const :tag "Only if wider than window" :value long)
+                      (const :tag "Always" :value t))
               "28.1")
 	     (scroll-step windows integer)
 	     (scroll-conservatively windows integer)
@@ -674,7 +676,7 @@ since it could result in memory overflow and make Emacs crash."
 	     (underline-minimum-offset display integer "23.1")
              (mouse-autoselect-window
 	      display (choice
-		       (const :tag "Off (nil)" :value nil)
+		       (const :tag "Off" :value nil)
 		       (const :tag "Immediate" :value t)
 		       (number :tag "Delay by secs" :value 0.5)) "22.1")
              (tool-bar-style
@@ -719,15 +721,15 @@ since it could result in memory overflow and make Emacs crash."
 	     (hourglass-delay cursor number)
 	     (resize-mini-windows
 	      windows (choice
-		       (const :tag "Off (nil)" :value nil)
-		       (const :tag "Fit (t)" :value t)
+		       (const :tag "Off" :value nil)
+		       (const :tag "Fit" :value t)
 		       (const :tag "Grow only" :value grow-only))
 	      "25.1")
 	     (display-raw-bytes-as-hex display boolean "26.1")
              (display-line-numbers
               display-line-numbers
               (choice
-               (const :tag "Off (nil)" :value nil)
+               (const :tag "Off" :value nil)
                (const :tag "Absolute line numbers"
                       :value t)
                (const :tag "Relative line numbers"
-- 
2.39.2