diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2018-04-19 12:21:06 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2018-04-19 12:21:06 +0300 |
| commit | 8f6293ca789edf06ea8e7b4b80edf7558d590ca7 (patch) | |
| tree | 79c54fb27947bf8e59e004f23da91d55b746b67b /doc/emacs/msdos.texi | |
| parent | f4c989427b5fa0bb8507d14850fcbc35ff159e95 (diff) | |
| download | emacs-8f6293ca789edf06ea8e7b4b80edf7558d590ca7.tar.gz emacs-8f6293ca789edf06ea8e7b4b80edf7558d590ca7.tar.bz2 emacs-8f6293ca789edf06ea8e7b4b80edf7558d590ca7.zip | |
Fix use of @key in Texinfo manuals
* doc/misc/efaq-w32.texi (Location of init file):
* doc/misc/org.texi (Editing source code, Export settings)
(Closing items, Drawers, Structure editing):
* doc/misc/gnus.texi (Spam and Ham Processors, Terminology):
* doc/misc/calc.texi (Keypad Functions Menu, Keypad Binary Menu)
(Keypad Vectors Menu, Keypad Main Menu, Basic Arithmetic)
(Symbolic Mode):
* doc/misc/sc.texi (Electric References):
* doc/misc/info.texi (Help-^L):
* doc/misc/reftex.texi (Reference Styles):
* doc/misc/idlwave.texi (Troubleshooting, Examining Variables)
(Lesson III---User Catalog, Using the Shell):
* doc/misc/eshell.texi (Bugs and ideas):
* doc/misc/ada-mode.texi (Automatic Casing):
* doc/misc/ediff.texi (Selective Browsing):
* doc/misc/vip.texi (Customizing Constants):
* doc/misc/pcl-cvs.texi (Selected files):
* doc/misc/efaq.texi (Replying to the sender of a message)
(Basic keys, No Meta key, Matching parentheses)
(Origin of the term Emacs, Installing Texinfo documentation)
(Learning how to do something, Emacs manual, Extended commands):
* doc/misc/viper.texi (Rudimentary Changes):
* doc/misc/tramp.texi (Frequently Asked Questions):
* doc/emacs/kmacro.texi (Basic Keyboard Macro):
* doc/emacs/frames.texi (Frame Commands):
* doc/emacs/msdos.texi (Windows Keyboard):
* doc/emacs/search.texi (Query Replace):
* doc/lispintro/emacs-lisp-intro.texi (Keybindings)
(Note for Novices):
* doc/lispref/tips.texi (Key Binding Conventions): Fix use of
@key. For the details, see
http://lists.gnu.org/archive/html/emacs-devel/2018-04/msg00390.html.
Diffstat (limited to 'doc/emacs/msdos.texi')
| -rw-r--r-- | doc/emacs/msdos.texi | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/emacs/msdos.texi b/doc/emacs/msdos.texi index 9353f4b6e84..b1846919b67 100644 --- a/doc/emacs/msdos.texi +++ b/doc/emacs/msdos.texi @@ -597,7 +597,7 @@ search string against previously sought strings during incremental search. @code{(w32-register-hot-key [s-])} with @code{w32-lwindow-modifier} bound to @code{super} disables all the Windows' own Windows key based shortcuts.@footnote{There is one known -exception: The combination @kbd{@key{Windows}-@key{L}} that locks the +exception: The combination @kbd{@key{Windows}-L} that locks the workstation is handled by the system on a lower level. For this reason, @code{w32-register-hot-key} cannot override this key combination - it always locks the computer.} @@ -607,9 +607,9 @@ combination - it always locks the computer.} call. Thus, you can set @code{w32-lwindow-modifier} as @code{super}, then call @code{(w32-register-hot-key [s-r])}, and finally set @code{w32-rwindow-modifier} as @code{super} as well. The result is -that the left Windows key together with @key{R} invokes whichever +that the left Windows key together with @kbd{R} invokes whichever function you have bound for the combination in Emacs, and the right -Windows key and @key{R} opens the Windows @code{Run} dialog. +Windows key and @kbd{R} opens the Windows @code{Run} dialog. The hotkey registrations always also include all the shift and control modifier combinations for the given hotkey; that is, |