Commit 304278c0 authored by Michael Albinus's avatar Michael Albinus
Browse files

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.
parent ca8afa76
......@@ -119,19 +119,19 @@ named @samp{Emacs}. If you write @samp{Emacs} instead of
regardless of frame titles and regardless of the name of the
executable file.
@item -xrm @var{resource-values}
@item -xrm @var{resource-value}
@opindex --xrm
@itemx --xrm=@var{resource-values}
@itemx --xrm=@var{resource-value}
@cindex resource values, command-line argument
This option specifies X resource values for the present Emacs job.
@var{resource-values} should have the same format that you would use
inside a file of X resources. To include multiple resource
specifications in @var{resource-values}, put a newline between them,
just as you would in a file. You can also use @samp{#include
"@var{filename}"} to include a file full of resource specifications.
Resource values specified with @samp{-xrm} take precedence over all
other resource specifications.
@var{resource-value} should have the same format that you would use
inside a file of X resources. Several @samp{-xrm} options are
possible to include multiple resource specifications. You can also
use @samp{#include "@var{filename}"} as @var{resource-value} to
include a file full of resource specifications. Resource values
specified with @samp{-xrm} take precedence over all other resource
specifications.
@end table
@end ifnottex
......@@ -323,7 +323,7 @@ might be useful to turn off XIM on slow X client/server links.
@item @code{verticalScrollBars} (class @code{ScrollBars})
Give frames scroll bars on the left if @samp{left}, on the right if
@samp{right}; don't have scroll bars if @samp{off}.
@samp{right}; don't have scroll bars if @samp{off} (@pxref{Scroll Bars}).
@ifnottex
@item @code{visualClass} (class @code{VisualClass})
......@@ -513,7 +513,7 @@ The color for the border shadow, on the top and the left.
@end ifnottex
@node GTK resources
@appendixsec GTK resources
@appendixsec GTK+ resources
@cindex GTK+ resources
@cindex resource files for GTK+
@cindex @file{~/.gtkrc-2.0} file
......@@ -558,7 +558,7 @@ system, see
@end menu
@node GTK Resource Basics
@appendixsubsec GTK Resource Basics
@appendixsubsec GTK+ Resource Basics
In a GTK+ 2 resource file (usually @file{~/.emacs.d/gtkrc}), the
simplest kind of a resource setting simply assigns a value to a
......@@ -616,7 +616,7 @@ widget "*verticalScrollBar*" style "scroll"
@end smallexample
@node GTK Widget Names
@appendixsubsec GTK widget names
@appendixsubsec GTK+ widget names
@cindex GTK+ widget names
A GTK+ widget is specified by a @dfn{widget name} and a @dfn{widget
......@@ -661,7 +661,7 @@ widget "*" style "my_style"
@end smallexample
@node GTK Names in Emacs
@appendixsubsec GTK Widget Names in Emacs
@appendixsubsec GTK+ Widget Names in Emacs
@cindex GTK+ widget names in Emacs
@cindex GTK+ widget classes
......@@ -725,7 +725,7 @@ widget_class "*Menu*" style "my_menu_style"
@end smallexample
@node GTK styles
@appendixsubsec GTK styles
@appendixsubsec GTK+ styles
@cindex GTK+ styles
Here is an example of two GTK+ style declarations:
......
......@@ -3292,7 +3292,7 @@ nominal heights and widths would suggest.
@defun x-list-fonts name &optional reference-face frame maximum width
This function returns a list of available font names that match
@var{name}. @var{name} should be a string containing a font name in
either the Fontconfig, GTK, or XLFD format (@pxref{Fonts,,, emacs, The
either the Fontconfig, GTK+, or XLFD format (@pxref{Fonts,,, emacs, The
GNU Emacs Manual}). Within an XLFD string, wildcard characters may be
used: the @samp{*} character matches any substring, and the @samp{?}
character matches any single character. Case is ignored when matching
......@@ -3550,7 +3550,7 @@ specifications are as follows:
@table @code
@item :name
The font name (a string), in either XLFD, Fontconfig, or GTK format.
The font name (a string), in either XLFD, Fontconfig, or GTK+ format.
@xref{Fonts,,, emacs, The GNU Emacs Manual}.
@item :family
......@@ -5993,7 +5993,7 @@ debugging.
@cindex embedded widgets
@cindex webkit browser widget
Emacs is able to display native widgets, such as GTK WebKit widgets,
Emacs is able to display native widgets, such as GTK+ WebKit widgets,
in Emacs buffers when it was built with the necessary support
libraries and is running on a graphical terminal. To test whether
Emacs supports display of embedded widgets, check that the
......
......@@ -2750,7 +2750,7 @@ If the value is @code{grow-only}, the tool bar expands automatically,
but does not contract automatically. To contract the tool bar, the
user has to redraw the frame by entering @kbd{C-l}.
If Emacs is built with GTK or Nextstep, the tool bar can only show one
If Emacs is built with GTK+ or Nextstep, the tool bar can only show one
line, so this variable has no effect.
@end defvar
......
......@@ -1815,7 +1815,7 @@ The function returns a number, which counts the connections this Emacs
session has established to the @var{bus} under the same unique name
(see @code{dbus-get-unique-name}). It depends on the libraries Emacs
is linked with, and on the environment Emacs is running. For example,
if Emacs is linked with the gtk toolkit, and it runs in a GTK-aware
if Emacs is linked with the GTK+ toolkit, and it runs in a GTK+-aware
environment like Gnome, another connection might already be
established.
......@@ -1837,9 +1837,9 @@ Example: You initialize a connection to the AT-SPI bus on your host:
@result{} "unix:abstract=/tmp/dbus-2yzWHOCdSD,guid=a490dd26625870ca1298b6e10000fd7f"
;; If Emacs is built with gtk support, and you run in a GTK enabled
;; If Emacs is built with GTK+ support, and you run in a GTK+-enabled
;; environment (like a GNOME session), the initialization reuses the
;; connection established by GTK's atk bindings.
;; connection established by GTK+'s atk bindings.
(dbus-init-bus my-bus)
@result{} 2
......
......@@ -316,7 +316,7 @@ file for build instructions.
You can run Emacs without any extra steps, but if you want icons in your
Start Menu, or for Emacs to detect the image libraries that are already
installed on your system as part of GTK, then you should run the program
installed on your system as part of GTK+, then you should run the program
@file{addpm.exe}, which is usually installed into the same @file{bin}
directory with @file{emacs.exe}.
......@@ -2206,10 +2206,10 @@ outdated. Tools available here that are useful for Emacs include:
@item GifLib - library to support GIF images.
@item Grep - for searching through files with @code{grep}.
@item Gzip - used by Emacs to automatically decompress .gz files.
@item Jpeg - library to support JPEG images (also in GTK).
@item Jpeg - library to support JPEG images (also in GTK+).
@item Lha - used by @code{archive-mode} to edit .lzh files.
@item LibPng - library to support PNG images (also in GTK).
@item LibTiff - library to support TIFF images (also in GTK).
@item LibPng - library to support PNG images (also in GTK+).
@item LibTiff - library to support TIFF images (also in GTK+).
@item Make - used by @code{compile} for building projects (also in MinGW)
@item OpenSSL - used by @code{gnus} to talk to servers over SSL.
@item Patch - used by @code{ediff-patch-file} and others to apply patches.
......@@ -2218,21 +2218,21 @@ outdated. Tools available here that are useful for Emacs include:
@item Unzip - used by @code{archive-mode} for extracting zip files.
@item Xpm - library to support XPM images (bundled with Emacs binaries)
@item Zip - used by @code{archive-mode} for editing zip files.
@item Zlib - required by LibPng (also in GTK).
@item Zlib - required by LibPng (also in GTK+).
@end itemize
@node GTK
@section GTK
@cindex GTK image libraries
@cindex image libraries, GTK
@cindex addpm, using GTK image libraries
@section GTK+
@cindex GTK+ image libraries
@cindex image libraries, GTK+
@cindex addpm, using GTK+ image libraries
GTK is a potential source for some of the image libraries that Emacs
requires. GTK is installed along with other ports of GUI software,
GTK+ is a potential source for some of the image libraries that Emacs
requires. GTK+ is installed along with other ports of GUI software,
such as the GIMP image editor, and Pidgin instant messenger client.
If GTK is installed when you run @command{addpm}, Emacs will use the
If GTK+ is installed when you run @command{addpm}, Emacs will use the
image libraries that it provides, even if they are not on the
@env{PATH}. GTK ships with JPEG, PNG and TIFF support.
@env{PATH}. GTK+ ships with JPEG, PNG and TIFF support.
@node Read man pages
@section How do I read man pages?
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment