From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 31 May 2008 10:53:54 +0000 (+0000)
Subject: (Windows Keyboard): Fix text added on 2008-05-29.
X-Git-Tag: emacs-pretest-23.0.90~5188
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2be6bfe25e7320013105d442ed80ee2a18fc571f;p=emacs.git

(Windows Keyboard): Fix text added on 2008-05-29.
---

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 3fa435b8db8..1520c26f1e8 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
+2008-05-31  Eli Zaretskii  <eliz@gnu.org>
+
+	* msdog.texi (Windows Keyboard): Fix text added on 2008-05-29.
+
 2008-05-31  Glenn Morris  <rgm@gnu.org>
 
 	* cal-xtra.texi (Fancy Diary Display): Simplify.
diff --git a/doc/emacs/msdog.texi b/doc/emacs/msdog.texi
index 0f0a13e188e..add9f34352a 100644
--- a/doc/emacs/msdog.texi
+++ b/doc/emacs/msdog.texi
@@ -405,30 +405,36 @@ the variable @code{w32-alt-is-meta} to a @code{nil} value.
 
 @findex w32-register-hot-key
 @findex w32-unregister-hot-key
-  Although the @key{ALT} key is mapped by default to the Emacs
-@key{META} key, MS Windows preempts its use by Emacs for certain key
-combinations, such as @kbd{Alt-@key{TAB}}.  You can use function
-@code{w32-register-hot-key} 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
-@code{meta} modifier is interpreted as @key{ALT} if `w32-alt-is-meta' is
-@code{t}, and @code{hyper} is always interpreted as the Windows modifier
-keys.  The return value is the hotkey-id if registered, otherwise
-@code{nil}.
-
-@kindex M-TAB @r{(MS-Windows)}
+  MS-Windows reserves certain key combinations, such as
+@kbd{Alt-@key{TAB}}, for its own use.  These key combinations are
+intercepted by the system before Emacs can see them.  You can use the
+@code{w32-register-hot-key} 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
+@code{define-key}.  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}.
+
+@kindex M-TAB@r{, (MS-Windows)}
 @cindex @kbd{M-@key{TAB}} vs @kbd{Alt-@key{TAB}} (MS-Windows)
 @cindex @kbd{Alt-@key{TAB}} vs @kbd{M-@key{TAB}} (MS-Windows)
   For example, @code{(w32-register-hot-key [M-tab])} lets you use
-@kbd{M-TAB} 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
-@code{w32-register-hot-key}.
+@kbd{M-TAB} 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
+@code{w32-register-hot-key} for its argument key sequence.
 
 @vindex w32-capslock-is-shiftlock
   By default, the @key{CapsLock} key only affects normal character