[Emacs-diffs] Changes to emacs/doc/emacs/msdog.texi,v

[Eli Zaretskii]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Eli Zaretskii <eliz>    08/05/31 10:53:03

Index: msdog.texi
===================================================================
RCS file: /cvsroot/emacs/emacs/doc/emacs/msdog.texi,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- msdog.texi  29 May 2008 08:15:04 -0000      1.7
+++ msdog.texi  31 May 2008 10:53:03 -0000      1.8
@@ -405,30 +405,36 @@
 
 @findex w32-register-hot-key
 @findex w32-unregister-hot-key
-  Although the @key{ALT} key is mapped by default to the Emacs
address@hidden key, MS Windows preempts its use by Emacs for certain key
-combinations, such as @address@hidden  You can use function
address@hidden to allow a key sequence to be seen by Emacs
-instead of being grabbed by Windows.  This registers the key sequence as
-a Windows hot key.
-
-  The argument to @code{w32-register-hot-key} must be a one element key
-definition in vector form that would be acceptable to `define-key'.  The
address@hidden modifier is interpreted as @key{ALT} if `w32-alt-is-meta' is
address@hidden, and @code{hyper} is always interpreted as the Windows modifier
-keys.  The return value is the hotkey-id if registered, otherwise
address@hidden
+  MS-Windows reserves certain key combinations, such as
address@hidden@key{TAB}}, for its own use.  These key combinations are
+intercepted by the system before Emacs can see them.  You can use the
address@hidden function to allow a key sequence to be
+seen by Emacs instead of being grabbed by Windows.  This functions
+registers a key sequence as a @dfn{hot key}, overriding the special
+meaning of that key sequence for Windows.  (MS-Windows is told that
+the key sequence is a hot key only when one of the Emacs windows has
+focus, so that the special keys still have their usual meaning for
+other Windows applications.)
+
+  The argument to @code{w32-register-hot-key} must be a single key,
+with or without modifiers, in vector form that would be acceptable to
address@hidden  The meta modifier is interpreted as the @key{ALT}
+key if @code{w32-alt-is-meta} is @code{t} (the default), and the hyper
+modifier is always interpreted as the Windows key (usually labeled
+with @key{start} and the Windows logo).  If the function succeeds in
+registering the key sequence, it returns the hotkey ID, a number;
+otherwise it returns @code{nil}.
 
address@hidden M-TAB @r{(MS-Windows)}
address@hidden address@hidden, (MS-Windows)}
 @cindex @address@hidden vs @address@hidden (MS-Windows)
 @cindex @address@hidden vs @address@hidden (MS-Windows)
   For example, @code{(w32-register-hot-key [M-tab])} lets you use
address@hidden normally in Emacs.  This is effective at all levels, so, for
-instance, you can use @kbd{M-TAB} at top level to complete the word or
-symbol at point, and you can use it during incremental search to
-complete the current search string against previously sought strings.
-The function @code{w32-unregister-hot-key} reverses the effect of
address@hidden
address@hidden normally in Emacs, for instance, to complete the word or
+symbol at point at top level, or to complete the current search string
+against previously sought strings during incremental search.
+
+  The function @code{w32-unregister-hot-key} reverses the effect of
address@hidden for its argument key sequence.
 
 @vindex w32-capslock-is-shiftlock
   By default, the @key{CapsLock} key only affects normal character