From e90ffcf7598c6bb529f67d4d8afe451f60d32eb8 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Thu, 5 Nov 2020 19:46:50 +0200 Subject: [PATCH] * src/w32fns.c (Fw32_register_hot_key): Doc fix. (Bug#44456) --- src/w32fns.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/src/w32fns.c b/src/w32fns.c index 2f01fb52e92..bbf43717bd1 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -8626,8 +8626,8 @@ DEFUN ("w32-register-hot-key", Fw32_register_hot_key, doc: /* Register KEY as a hot-key combination. Certain key combinations like Alt-Tab and Win-R are reserved for system use on Windows, and therefore are normally intercepted by the -system. These key combinations can be received by registering them -as hot-keys, except for Win-L which always locks the computer. +system. These key combinations can be used in Emacs by registering +them as hot-keys, except for Win-L which always locks the computer. On Windows 98 and ME, KEY must be a one element key definition in vector form that would be acceptable to `define-key' (e.g. [A-tab] for @@ -8636,16 +8636,19 @@ Alt-Tab). The meta modifier is interpreted as Alt if modifier keys. The return value is the hotkey-id if registered, otherwise nil. -On Windows versions since NT, KEY can also be specified as [M-], [s-] or -[h-] to indicate that all combinations of that key should be processed -by Emacs instead of the operating system. The super and hyper -modifiers are interpreted according to the current values of -`w32-lwindow-modifier' and `w32-rwindow-modifier'. For instance, -setting `w32-lwindow-modifier' to `super' and then calling -`(w32-register-hot-key [s-])' grabs all combinations of the left Windows -key to Emacs, but leaves the right Windows key free for the operating -system keyboard shortcuts. The return value is t if the call affected -any key combinations, otherwise nil. */) +On Windows versions since NT, KEY can also be specified as just a +modifier key, [M-], [s-] or [H-], to indicate that all combinations +of the respective modifier key should be processed by Emacs instead +of the operating system. The super and hyper modifiers are +interpreted according to the current values of `w32-lwindow-modifier' +and `w32-rwindow-modifier'. For instance, setting `w32-lwindow-modifier' +to `super' and then calling `(w32-register-hot-key [s-])' grabs all +combinations of the left Windows key to Emacs as keys with the Super +modifier, but leaves the right Windows key free for the operating +system keyboard shortcuts. + +The return value is t if the call affected any key combinations, +otherwise nil. */) (Lisp_Object key) { key = w32_parse_and_hook_hot_key (key, 1); -- 2.39.2