mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-24 10:38:38 +00:00
Code Issues Releases Activity

Fix bug #10422 with Registry-related index entries.

Browse Source 
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.
This commit is contained in:
Eli Zaretskii 2012-01-06 12:17:23 +02:00
parent 4afee9d5fd
commit 8034735f6f
3 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
doc/emacs/ChangeLog
View File

@ -1,3 +1,13 @@
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> 2012-01-05 Chong Yidong <cyd@gnu.org>
* custom.texi (Customization Groups): Update example. * custom.texi (Customization Groups): Update example.

8
doc/emacs/cmdargs.texi
View File

@ -675,9 +675,9 @@ changing any environment or registry settings.
@node MS-Windows Registry @node MS-Windows Registry
@appendixsubsec The MS-Windows System Registry @appendixsubsec The MS-Windows System Registry
@pindex addpm, MS-Windows installation program @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}, values for @env{emacs_dir}, @env{EMACSLOADPATH}, @env{EMACSDATA},
@env{EMACSPATH}, @env{EMACSDOC}, @env{SHELL} and @env{TERM} to the @env{EMACSPATH}, @env{EMACSDOC}, @env{SHELL} and @env{TERM} to the
@file{HKEY_LOCAL_MACHINE} section of the system registry, under @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 In addition to the environment variables above, you can also add many
of the settings which on X belong in the @file{.Xdefaults} file of the settings which on X belong in the @file{.Xdefaults} file
(@pxref{X Resources}) to the @file{/Software/GNU/Emacs} registry key. (@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 @node Display X
@appendixsec Specifying the Display Name @appendixsec Specifying the Display Name

15
doc/emacs/xresources.texi
View File

@ -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 its own list of resources; to update it, use the command
@command{xrdb}---for instance, @samp{xrdb ~/.Xdefaults}. @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, (MS-Windows systems do not support X resource files; on Windows,
Emacs looks for X resources in the Windows Registry, first under the 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 key @samp{HKEY_CURRENT_USER\SOFTWARE\GNU\Emacs}, which affects only
@samp{HKEY_LOCAL_MACHINE\SOFTWARE\GNU\Emacs}. The menu and scroll the current user and override the system-wide settings, and then under
bars are native widgets on MS-Windows, so they are only customizable the key @samp{HKEY_LOCAL_MACHINE\SOFTWARE\GNU\Emacs}, which affects
via the system-wide settings in the Display Control Panel. You can all users of the system. The menu and scroll bars are native widgets
also set resources using the @samp{-xrm} command line option, as on MS-Windows, so they are only customizable via the system-wide
explained below.) 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 Each line in the X resource file specifies a value for one option or
for a collection of related options. Each resource specification for a collection of related options. Each resource specification