diff options
| -rw-r--r-- | doc/emacs/display.texi | 6 | ||||
| -rw-r--r-- | doc/emacs/emacs.texi | 4 | ||||
| -rw-r--r-- | doc/emacs/files.texi | 2 | ||||
| -rw-r--r-- | doc/emacs/frames.texi | 4 | ||||
| -rw-r--r-- | doc/emacs/xresources.texi | 22 |
5 files changed, 19 insertions, 19 deletions
diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi index 5ddc3d63e72..312f70e13ba 100644 --- a/doc/emacs/display.texi +++ b/doc/emacs/display.texi | |||
| @@ -656,8 +656,8 @@ This face is used to highlight lazy matches for Isearch and Query | |||
| 656 | Replace (matches other than the current one). | 656 | Replace (matches other than the current one). |
| 657 | @item region | 657 | @item region |
| 658 | This face is used for displaying an active region (@pxref{Mark}). | 658 | This face is used for displaying an active region (@pxref{Mark}). |
| 659 | When Emacs is built with GTK support, its colors are taken from the | 659 | When Emacs is built with GTK+ support, its colors are taken from the |
| 660 | current GTK theme. | 660 | current GTK+ theme. |
| 661 | @item secondary-selection | 661 | @item secondary-selection |
| 662 | This face is used for displaying a secondary X selection (@pxref{Secondary | 662 | This face is used for displaying a secondary X selection (@pxref{Secondary |
| 663 | Selection}). | 663 | Selection}). |
| @@ -741,7 +741,7 @@ The @code{:background} attribute of this face specifies the color of | |||
| 741 | the text cursor. @xref{Cursor Display}. | 741 | the text cursor. @xref{Cursor Display}. |
| 742 | @item tooltip | 742 | @item tooltip |
| 743 | This face is used for tooltip text. By default, if Emacs is built | 743 | This face is used for tooltip text. By default, if Emacs is built |
| 744 | with GTK support, tooltips are drawn via GTK and this face has no | 744 | with GTK+ support, tooltips are drawn via GTK+ and this face has no |
| 745 | effect. @xref{Tooltips}. | 745 | effect. @xref{Tooltips}. |
| 746 | @item mouse | 746 | @item mouse |
| 747 | This face determines the color of the mouse pointer. | 747 | This face determines the color of the mouse pointer. |
diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi index 163b6f23d84..df644b9587a 100644 --- a/doc/emacs/emacs.texi +++ b/doc/emacs/emacs.texi | |||
| @@ -1222,8 +1222,8 @@ GTK resources | |||
| 1222 | 1222 | ||
| 1223 | * GTK Resource Basics:: Basic usage of GTK+ resources. | 1223 | * GTK Resource Basics:: Basic usage of GTK+ resources. |
| 1224 | * GTK Widget Names:: How GTK+ widgets are named. | 1224 | * GTK Widget Names:: How GTK+ widgets are named. |
| 1225 | * GTK Names in Emacs:: GTK widgets used by Emacs. | 1225 | * GTK Names in Emacs:: GTK+ widgets used by Emacs. |
| 1226 | * GTK styles:: What can be customized in a GTK widget. | 1226 | * GTK styles:: What can be customized in a GTK+ widget. |
| 1227 | 1227 | ||
| 1228 | Emacs and macOS / GNUstep | 1228 | Emacs and macOS / GNUstep |
| 1229 | 1229 | ||
diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi index d7ca1e91611..f1a7a65a800 100644 --- a/doc/emacs/files.texi +++ b/doc/emacs/files.texi | |||
| @@ -281,7 +281,7 @@ files. Firstly, when Emacs is built with a suitable GUI toolkit, | |||
| 281 | commands invoked with the mouse (by clicking on the menu bar or tool | 281 | commands invoked with the mouse (by clicking on the menu bar or tool |
| 282 | bar) use the toolkit's standard file selection dialog instead of | 282 | bar) use the toolkit's standard file selection dialog instead of |
| 283 | prompting for the file name in the minibuffer. On GNU/Linux and Unix | 283 | prompting for the file name in the minibuffer. On GNU/Linux and Unix |
| 284 | platforms, Emacs does this when built with GTK, LessTif, and Motif | 284 | platforms, Emacs does this when built with GTK+, LessTif, and Motif |
| 285 | toolkits; on MS-Windows and Mac, the GUI version does that by default. | 285 | toolkits; on MS-Windows and Mac, the GUI version does that by default. |
| 286 | For information on how to customize this, see @ref{Dialog Boxes}. | 286 | For information on how to customize this, see @ref{Dialog Boxes}. |
| 287 | 287 | ||
diff --git a/doc/emacs/frames.texi b/doc/emacs/frames.texi index 8cc4d649bbc..17f6f35a8a3 100644 --- a/doc/emacs/frames.texi +++ b/doc/emacs/frames.texi | |||
| @@ -1001,9 +1001,9 @@ when the entire buffer is visible. | |||
| 1001 | 1001 | ||
| 1002 | @cindex @code{scroll-bar} face | 1002 | @cindex @code{scroll-bar} face |
| 1003 | The visual appearance of the scroll bars is controlled by the | 1003 | The visual appearance of the scroll bars is controlled by the |
| 1004 | @code{scroll-bar} face. (Some toolkits, such as GTK and MS-Windows, | 1004 | @code{scroll-bar} face. (Some toolkits, such as GTK+ and MS-Windows, |
| 1005 | ignore this face; the scroll-bar appearance there can only be | 1005 | ignore this face; the scroll-bar appearance there can only be |
| 1006 | customized system-wide, for GTK @pxref{GTK resources}). | 1006 | customized system-wide, for GTK+ @pxref{GTK resources}). |
| 1007 | 1007 | ||
| 1008 | @cindex vertical border | 1008 | @cindex vertical border |
| 1009 | On graphical frames, vertical scroll bars implicitly serve to separate | 1009 | On graphical frames, vertical scroll bars implicitly serve to separate |
diff --git a/doc/emacs/xresources.texi b/doc/emacs/xresources.texi index 69832fdb60a..88bfb8261ce 100644 --- a/doc/emacs/xresources.texi +++ b/doc/emacs/xresources.texi | |||
| @@ -12,10 +12,10 @@ resources, as is usual for programs that use X. | |||
| 12 | graphical widgets, such as the menu-bar, scroll-bar, and dialog boxes, | 12 | graphical widgets, such as the menu-bar, scroll-bar, and dialog boxes, |
| 13 | is determined by | 13 | is determined by |
| 14 | @ifnottex | 14 | @ifnottex |
| 15 | GTK resources, which we will also describe. | 15 | GTK+ resources, which we will also describe. |
| 16 | @end ifnottex | 16 | @end ifnottex |
| 17 | @iftex | 17 | @iftex |
| 18 | GTK resources. | 18 | GTK+ resources. |
| 19 | @end iftex | 19 | @end iftex |
| 20 | When Emacs is built without GTK+ support, the appearance of these | 20 | When Emacs is built without GTK+ support, the appearance of these |
| 21 | widgets is determined by additional X resources. | 21 | widgets is determined by additional X resources. |
| @@ -28,7 +28,7 @@ system registry (@pxref{MS-Windows Registry}). | |||
| 28 | * Table of Resources:: Table of specific X resources that affect Emacs. | 28 | * Table of Resources:: Table of specific X resources that affect Emacs. |
| 29 | * Lucid Resources:: X resources for Lucid menus. | 29 | * Lucid Resources:: X resources for Lucid menus. |
| 30 | * Motif Resources:: X resources for Motif and LessTif menus. | 30 | * Motif Resources:: X resources for Motif and LessTif menus. |
| 31 | * GTK resources:: Resources for GTK widgets. | 31 | * GTK resources:: Resources for GTK+ widgets. |
| 32 | @end menu | 32 | @end menu |
| 33 | 33 | ||
| 34 | @node Resources | 34 | @node Resources |
| @@ -515,7 +515,7 @@ The color for the border shadow, on the top and the left. | |||
| 515 | @node GTK resources | 515 | @node GTK resources |
| 516 | @appendixsec GTK resources | 516 | @appendixsec GTK resources |
| 517 | @cindex GTK+ resources | 517 | @cindex GTK+ resources |
| 518 | @cindex resource files for GTK | 518 | @cindex resource files for GTK+ |
| 519 | @cindex @file{~/.gtkrc-2.0} file | 519 | @cindex @file{~/.gtkrc-2.0} file |
| 520 | @cindex @file{~/.emacs.d/gtkrc} file | 520 | @cindex @file{~/.emacs.d/gtkrc} file |
| 521 | 521 | ||
| @@ -530,7 +530,7 @@ resources are specified in either the file @file{~/.emacs.d/gtkrc} | |||
| 530 | (for Emacs-specific GTK+ resources), or @file{~/.gtkrc-2.0} (for | 530 | (for Emacs-specific GTK+ resources), or @file{~/.gtkrc-2.0} (for |
| 531 | general GTK+ resources). We recommend using @file{~/.emacs.d/gtkrc}, | 531 | general GTK+ resources). We recommend using @file{~/.emacs.d/gtkrc}, |
| 532 | since GTK+ seems to ignore @file{~/.gtkrc-2.0} when running GConf with | 532 | since GTK+ seems to ignore @file{~/.gtkrc-2.0} when running GConf with |
| 533 | GNOME@. Note, however, that some GTK themes may override | 533 | GNOME@. Note, however, that some GTK+ themes may override |
| 534 | customizations in @file{~/.emacs.d/gtkrc}; there is nothing we can do | 534 | customizations in @file{~/.emacs.d/gtkrc}; there is nothing we can do |
| 535 | about this. GTK+ resources do not affect aspects of Emacs unrelated | 535 | about this. GTK+ resources do not affect aspects of Emacs unrelated |
| 536 | to GTK+ widgets, such as fonts and colors in the main Emacs window; | 536 | to GTK+ widgets, such as fonts and colors in the main Emacs window; |
| @@ -553,8 +553,8 @@ system, see | |||
| 553 | @menu | 553 | @menu |
| 554 | * GTK Resource Basics:: Basic usage of GTK+ resources. | 554 | * GTK Resource Basics:: Basic usage of GTK+ resources. |
| 555 | * GTK Widget Names:: How GTK+ widgets are named. | 555 | * GTK Widget Names:: How GTK+ widgets are named. |
| 556 | * GTK Names in Emacs:: GTK widgets used by Emacs. | 556 | * GTK Names in Emacs:: GTK+ widgets used by Emacs. |
| 557 | * GTK styles:: What can be customized in a GTK widget. | 557 | * GTK styles:: What can be customized in a GTK+ widget. |
| 558 | @end menu | 558 | @end menu |
| 559 | 559 | ||
| 560 | @node GTK Resource Basics | 560 | @node GTK Resource Basics |
| @@ -617,7 +617,7 @@ widget "*verticalScrollBar*" style "scroll" | |||
| 617 | 617 | ||
| 618 | @node GTK Widget Names | 618 | @node GTK Widget Names |
| 619 | @appendixsubsec GTK widget names | 619 | @appendixsubsec GTK widget names |
| 620 | @cindex GTK widget names | 620 | @cindex GTK+ widget names |
| 621 | 621 | ||
| 622 | A GTK+ widget is specified by a @dfn{widget name} and a @dfn{widget | 622 | A GTK+ widget is specified by a @dfn{widget name} and a @dfn{widget |
| 623 | class}. The widget name refers to a specific widget | 623 | class}. The widget name refers to a specific widget |
| @@ -662,8 +662,8 @@ widget "*" style "my_style" | |||
| 662 | 662 | ||
| 663 | @node GTK Names in Emacs | 663 | @node GTK Names in Emacs |
| 664 | @appendixsubsec GTK Widget Names in Emacs | 664 | @appendixsubsec GTK Widget Names in Emacs |
| 665 | @cindex GTK widget names in Emacs | 665 | @cindex GTK+ widget names in Emacs |
| 666 | @cindex GTK widget classes | 666 | @cindex GTK+ widget classes |
| 667 | 667 | ||
| 668 | The GTK+ widgets used by an Emacs frame are listed below: | 668 | The GTK+ widgets used by an Emacs frame are listed below: |
| 669 | 669 | ||
| @@ -726,7 +726,7 @@ widget_class "*Menu*" style "my_menu_style" | |||
| 726 | 726 | ||
| 727 | @node GTK styles | 727 | @node GTK styles |
| 728 | @appendixsubsec GTK styles | 728 | @appendixsubsec GTK styles |
| 729 | @cindex GTK styles | 729 | @cindex GTK+ styles |
| 730 | 730 | ||
| 731 | Here is an example of two GTK+ style declarations: | 731 | Here is an example of two GTK+ style declarations: |
| 732 | 732 | ||