[Emacs-diffs] emacs-26 fc2e65a: Improve documentation of X resource loading

[Eli Zaretskii]

branch: emacs-26
commit fc2e65ae82d70bb343a7f8b3165f238c13c4e587
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    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)
---
 doc/emacs/cmdargs.texi    | 14 ++++++++++----
 doc/emacs/frames.texi     |  4 ++++
 doc/emacs/xresources.texi |  5 +++++
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/doc/emacs/cmdargs.texi b/doc/emacs/cmdargs.texi
index 733919a..f0dd9ff 100644
--- a/doc/emacs/cmdargs.texi
+++ b/doc/emacs/cmdargs.texi
@@ -323,14 +323,20 @@ Do not display a startup screen.  You can also achieve 
this effect by
 setting the variable @code{inhibit-startup-screen} to address@hidden
 in your initialization file (@pxref{Entering Emacs}).
 
address@hidden --no-x-resources
address@hidden --no-x-resources
address@hidden X resources, not loading
+Do not load X resources.  You can also achieve this effect by setting
+the variable @code{inhibit-x-resources} to @code{t} in your
+initialization file (@pxref{Resources}).
+
 @item -Q
 @opindex -Q
 @itemx --quick
 @opindex --quick
-Start Emacs with minimum customizations.  This is similar to using @samp{-q},
address@hidden, @samp{--no-site-lisp}, and @samp{--no-splash}
-together.  This also stops Emacs from processing X resources by
-setting @code{inhibit-x-resources} to @code{t} (@pxref{Resources}).
+Start Emacs with minimum customizations.  This is similar to using
address@hidden, @samp{--no-site-file}, @samp{--no-site-lisp},
address@hidden, and @samp{--no-splash} together..
 
 @item -daemon
 @opindex -daemon
diff --git a/doc/emacs/frames.texi b/doc/emacs/frames.texi
index 9f4c782..6bbaae2 100644
--- a/doc/emacs/frames.texi
+++ b/doc/emacs/frames.texi
@@ -934,6 +934,10 @@ the initial frame, by customizing the variable
 specify colors and fonts don't affect menus and the menu bar, since
 those are drawn by the toolkit and not directly by Emacs.
 
+  Frame appearance and behavior can also be customized through X
+resources (@pxref{X Resources}); these override the parameters of the
+initial frame specified in your init file.
+
   Note that if you are using the desktop library to save and restore
 your sessions, the frames to be restored are recorded in the desktop
 file, together with their parameters.  When these frames are restored,
diff --git a/doc/emacs/xresources.texi b/doc/emacs/xresources.texi
index db2c6ff..903090f 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