From: Jared Finder <jared@finder.org>
Date: Thu, 6 Feb 2025 22:32:00 +0000 (-0800)
Subject: Cleanup tool-bar-mode documentation
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=71a592eba42dcf7e80e5cc5eb1bff6b95da5a0a5;p=emacs.git

Cleanup tool-bar-mode documentation

* doc/emacs/frames.texi (Tool Bars): Downcase concept index
text.
* lisp/cus-start.el (standard): Copy custom :tag strings
from window-tool-bar-style's, which are more descriptive.
(Bug#75844)

(cherry picked from commit b023d43ee7908d805a6776f18d1a94b213a021e3)
---

diff --git a/doc/emacs/frames.texi b/doc/emacs/frames.texi
index e0d8a607072..9992c39dcc9 100644
--- a/doc/emacs/frames.texi
+++ b/doc/emacs/frames.texi
@@ -1296,7 +1296,7 @@ menus' visual appearance.
 @section Tool Bars
 @cindex tool bar mode
 @cindex tool bar, attached to frame
-@cindex mode, Tool Bar
+@cindex mode, tool bar
 @cindex icons, toolbar
 
   On graphical displays, Emacs puts a @dfn{tool bar} at the top of each
@@ -1320,14 +1320,14 @@ control the use of tool bars at startup, customize the variable
 @code{tool-bar-mode}.
 
 @vindex tool-bar-style
-@cindex Tool Bar style
+@cindex tool bar style
   When Emacs is compiled with GTK+ support, each tool bar item can
 consist of an image, or a text label, or both.  By default, Emacs
 follows the Gnome desktop's tool bar style setting; if none is
 defined, it displays tool bar items as just images.  To impose a
 specific tool bar style, customize the variable @code{tool-bar-style}.
 
-@cindex Tool Bar position
+@cindex tool bar position
   You can also control the placement of the tool bar for the GTK+ tool
 bar with the frame parameter @code{tool-bar-position}.  @xref{Frame
 Parameters,,, elisp, The Emacs Lisp Reference Manual}.
diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 033f538da7f..0ed7fbd7b9c 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -691,9 +691,9 @@ since it could result in memory overflow and make Emacs crash."
 	      frames (choice
 		      (const :tag "Images" :value image)
 		      (const :tag "Text" :value text)
-		      (const :tag "Both" :value both)
-		      (const :tag "Both-horiz" :value both-horiz)
-		      (const :tag "Text-image-horiz" :value text-image-horiz)
+		      (const :tag "Both, text below image" :value both)
+		      (const :tag "Both, text to right of image" :value both-horiz)
+		      (const :tag "Both, text to left of image" :value text-image-horiz)
 		      (const :tag "System default" :value nil)) "24.1")
              (tool-bar-max-label-size frames integer "24.1")
              (tab-bar-position