Commit 8034735f authored by Eli Zaretskii's avatar Eli Zaretskii
Browse files

Fix bug #10422 with Registry-related index entries.

 doc/emacs/cmdargs.texi (MS-Windows Registry): Shorten the index entry.
 Move the stuff about resources to xresources.texi.
 doc/emacs/xresources.texi (Resources): Move information about setting X
 resources in the Registry from cmdargs.texi.  Make the index entry
 be similar to the one in cmdargs.texi.
parent 4afee9d5
2012-01-06 Eli Zaretskii <eliz@gnu.org>
* cmdargs.texi (MS-Windows Registry): Shorten the index entry.
(Bug#10422)
Move the stuff about resources to xresources.texi.
* xresources.texi (Resources): Move information about setting X
resources in the Registry from cmdargs.texi. Make the index entry
be similar to the one in cmdargs.texi.
2012-01-05 Chong Yidong <cyd@gnu.org>
* custom.texi (Customization Groups): Update example.
......
......@@ -675,9 +675,9 @@ changing any environment or registry settings.
@node MS-Windows Registry
@appendixsubsec The MS-Windows System Registry
@pindex addpm, MS-Windows installation program
@cindex registry, setting environment variables and resources on MS-Windows
@cindex registry, setting environment variables (MS-Windows)
Under MS-Windows, the installation program @command{addpm.exe} adds
On MS-Windows, the installation program @command{addpm.exe} adds
values for @env{emacs_dir}, @env{EMACSLOADPATH}, @env{EMACSDATA},
@env{EMACSPATH}, @env{EMACSDOC}, @env{SHELL} and @env{TERM} to the
@file{HKEY_LOCAL_MACHINE} section of the system registry, under
......@@ -704,10 +704,6 @@ still cannot determine the values, compiled-in defaults are used.
In addition to the environment variables above, you can also add many
of the settings which on X belong in the @file{.Xdefaults} file
(@pxref{X Resources}) to the @file{/Software/GNU/Emacs} registry key.
Settings you add to the @file{HKEY_LOCAL_MACHINE} section will affect
all users of the machine. Settings you add to the
@file{HKEY_CURRENT_USER} section will only affect you, and will
override machine wide settings.
@node Display X
@appendixsec Specifying the Display Name
......
......@@ -51,15 +51,16 @@ 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}.
@cindex Registry (MS-Windows)
@cindex registry, setting resources (MS-Windows)
(MS-Windows systems do not support X resource files; on Windows,
Emacs looks for X resources in the Windows Registry, first under the
key @samp{HKEY_CURRENT_USER\SOFTWARE\GNU\Emacs} and then under the key
@samp{HKEY_LOCAL_MACHINE\SOFTWARE\GNU\Emacs}. The menu and scroll
bars are native widgets on MS-Windows, so they are only customizable
via the system-wide settings in the Display Control Panel. You can
also set resources using the @samp{-xrm} command line option, as
explained below.)
key @samp{HKEY_CURRENT_USER\SOFTWARE\GNU\Emacs}, which affects only
the current user and override the system-wide settings, and then under
the key @samp{HKEY_LOCAL_MACHINE\SOFTWARE\GNU\Emacs}, which affects
all users of the system. The menu and scroll bars are native widgets
on MS-Windows, so they are only customizable via the system-wide
settings in the Display Control Panel. You can also set resources
using the @samp{-xrm} command line option, as explained below.)
Each line in the X resource file specifies a value for one option or
for a collection of related options. Each resource specification
......
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