aboutsummaryrefslogtreecommitdiffstats
path: root/doc/lispref
diff options
context:
space:
mode:
authorMichael Albinus2018-03-01 09:25:55 +0100
committerMichael Albinus2018-03-01 09:25:55 +0100
commit304278c040bf0d98ae614da83e08fb2b4df55218 (patch)
tree97b23aa95fa9ec21c24a590920d3fa9002b4dd8e /doc/lispref
parentca8afa7672b830d6ed570c21599f3eadb0958d79 (diff)
downloademacs-304278c040bf0d98ae614da83e08fb2b4df55218.tar.gz
emacs-304278c040bf0d98ae614da83e08fb2b4df55218.zip
Further improvements on manuals
* doc/emacs/xresources.texi: * doc/lispref/display.texi: * doc/lispref/keymaps.texi: * doc/misc/dbus.texi: * doc/misc/efaq-w32.texi: Use "GTK+" where applicable. * doc/emacs/xresources.texi (Resources): Mention several use of "-xrm". (Table of Resources) [verticalScrollBars]: Add reference to Scroll Bars.
Diffstat (limited to 'doc/lispref')
-rw-r--r--doc/lispref/display.texi6
-rw-r--r--doc/lispref/keymaps.texi2
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index 64b8c0a22fa..dcd2fcffb49 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -3292,7 +3292,7 @@ nominal heights and widths would suggest.
3292@defun x-list-fonts name &optional reference-face frame maximum width 3292@defun x-list-fonts name &optional reference-face frame maximum width
3293This function returns a list of available font names that match 3293This function returns a list of available font names that match
3294@var{name}. @var{name} should be a string containing a font name in 3294@var{name}. @var{name} should be a string containing a font name in
3295either the Fontconfig, GTK, or XLFD format (@pxref{Fonts,,, emacs, The 3295either the Fontconfig, GTK+, or XLFD format (@pxref{Fonts,,, emacs, The
3296GNU Emacs Manual}). Within an XLFD string, wildcard characters may be 3296GNU Emacs Manual}). Within an XLFD string, wildcard characters may be
3297used: the @samp{*} character matches any substring, and the @samp{?} 3297used: the @samp{*} character matches any substring, and the @samp{?}
3298character matches any single character. Case is ignored when matching 3298character matches any single character. Case is ignored when matching
@@ -3550,7 +3550,7 @@ specifications are as follows:
3550 3550
3551@table @code 3551@table @code
3552@item :name 3552@item :name
3553The font name (a string), in either XLFD, Fontconfig, or GTK format. 3553The font name (a string), in either XLFD, Fontconfig, or GTK+ format.
3554@xref{Fonts,,, emacs, The GNU Emacs Manual}. 3554@xref{Fonts,,, emacs, The GNU Emacs Manual}.
3555 3555
3556@item :family 3556@item :family
@@ -5993,7 +5993,7 @@ debugging.
5993@cindex embedded widgets 5993@cindex embedded widgets
5994@cindex webkit browser widget 5994@cindex webkit browser widget
5995 5995
5996 Emacs is able to display native widgets, such as GTK WebKit widgets, 5996 Emacs is able to display native widgets, such as GTK+ WebKit widgets,
5997in Emacs buffers when it was built with the necessary support 5997in Emacs buffers when it was built with the necessary support
5998libraries and is running on a graphical terminal. To test whether 5998libraries and is running on a graphical terminal. To test whether
5999Emacs supports display of embedded widgets, check that the 5999Emacs supports display of embedded widgets, check that the
diff --git a/doc/lispref/keymaps.texi b/doc/lispref/keymaps.texi
index e39db7f6d09..cc2e11e0b6d 100644
--- a/doc/lispref/keymaps.texi
+++ b/doc/lispref/keymaps.texi
@@ -2750,7 +2750,7 @@ If the value is @code{grow-only}, the tool bar expands automatically,
2750but does not contract automatically. To contract the tool bar, the 2750but does not contract automatically. To contract the tool bar, the
2751user has to redraw the frame by entering @kbd{C-l}. 2751user has to redraw the frame by entering @kbd{C-l}.
2752 2752
2753If Emacs is built with GTK or Nextstep, the tool bar can only show one 2753If Emacs is built with GTK+ or Nextstep, the tool bar can only show one
2754line, so this variable has no effect. 2754line, so this variable has no effect.
2755@end defvar 2755@end defvar
2756 2756