[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 2c84790 10/10: Merge from origin/emacs-27
From: |
Glenn Morris |
Subject: |
master 2c84790 10/10: Merge from origin/emacs-27 |
Date: |
Mon, 4 Jan 2021 10:55:26 -0500 (EST) |
branch: master
commit 2c847902522ae74c9b25b2a3fa60565e0187fd0a
Merge: b90f3c5 99cc004
Author: Glenn Morris <rgm@gnu.org>
Commit: Glenn Morris <rgm@gnu.org>
Merge from origin/emacs-27
99cc0045eb (origin/emacs-27) Update two user option names in the Widg...
---
doc/misc/widget.texi | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/doc/misc/widget.texi b/doc/misc/widget.texi
index b0254e0..7fd9212 100644
--- a/doc/misc/widget.texi
+++ b/doc/misc/widget.texi
@@ -692,14 +692,14 @@ arguments, which will be used when creating the
@code{radio-button} or
@end table
-@deffn {User Option} widget-glyph-directory
-Directory where glyphs are found.
+@deffn {User Option} widget-image-directory
+Directory where Widget should look for images.
Widget will look here for a file with the same name as specified for the
image, with either a @file{.xpm} (if supported) or @file{.xbm} extension.
@end deffn
-@deffn{User Option} widget-glyph-enable
-If non-@code{nil}, allow glyphs to appear on displays where they are supported.
+@deffn{User Option} widget-image-enable
+If non-@code{nil}, allow images to appear on displays where they are supported.
@end deffn
- master updated (f5a1315 -> 2c84790), Glenn Morris, 2021/01/04
- master 33108bc 05/10: ; Merge from origin/emacs-27, Glenn Morris, 2021/01/04
- master 1395fb8 08/10: Merge from origin/emacs-27, Glenn Morris, 2021/01/04
- master 49137d3 06/10: Merge from origin/emacs-27, Glenn Morris, 2021/01/04
- master dadffdd 01/10: ; Merge from origin/emacs-27, Glenn Morris, 2021/01/04
- master b90f3c5 09/10: ; Merge from origin/emacs-27, Glenn Morris, 2021/01/04
- master ba2f2f9 04/10: Merge from origin/emacs-27, Glenn Morris, 2021/01/04
- master e8bf725 07/10: ; Merge from origin/emacs-27, Glenn Morris, 2021/01/04
- master 82c6f43 03/10: ; Merge from origin/emacs-27, Glenn Morris, 2021/01/04
- master 6f0bb2f 02/10: Merge from origin/emacs-27, Glenn Morris, 2021/01/04
- master 2c84790 10/10: Merge from origin/emacs-27,
Glenn Morris <=