summaryrefslogtreecommitdiff
path: root/doc/emacs/xresources.texi
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2018-10-27 11:24:53 +0300
committerEli Zaretskii <eliz@gnu.org>2018-10-27 11:24:53 +0300
commitfc2e65ae82d70bb343a7f8b3165f238c13c4e587 (patch)
tree81ba6d77dfa0f0fccba46696a87d4ea20a432e0e /doc/emacs/xresources.texi
parent13132b39932af0139451b9cd77a313c7a023b18e (diff)
downloademacs-fc2e65ae82d70bb343a7f8b3165f238c13c4e587.tar.gz
Improve documentation of X resource loading
* doc/emacs/cmdargs.texi (Initial Options): * doc/emacs/frames.texi (Frame Parameters): * doc/emacs/xresources.texi (Resources): Document the '--no-x-resources' command-line option and the fact that X resources override .emacs settings of frame parameters. (Bug#32975)
Diffstat (limited to 'doc/emacs/xresources.texi')
-rw-r--r--doc/emacs/xresources.texi5
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/emacs/xresources.texi b/doc/emacs/xresources.texi
index db2c6ffafd2..903090f51a9 100644
--- a/doc/emacs/xresources.texi
+++ b/doc/emacs/xresources.texi
@@ -46,6 +46,11 @@ this file do not take effect immediately, because the X server stores
its own list of resources; to update it, use the command
@command{xrdb}---for instance, @samp{xrdb ~/.Xdefaults}.
+ Settings specified via X resources in general override the
+equivalent settings in Emacs init files (@pxref{Init File}), in
+particular for parameters of the initial frame (@pxref{Frame
+Parameters}).
+
@cindex registry, setting resources (MS-Windows)
(MS-Windows systems do not support X resource files; on such systems,
Emacs looks for X resources in the Windows Registry, first under the