diff options
| author | Eli Zaretskii | 2020-11-05 19:46:50 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2020-11-05 19:46:50 +0200 |
| commit | e90ffcf7598c6bb529f67d4d8afe451f60d32eb8 (patch) | |
| tree | d016f0f96034a1ce27c0a31e7b2e7ae6dbabc47c /src | |
| parent | 89740e9cb59ec05f3eef5a53dc39845d7d9fb638 (diff) | |
| download | emacs-e90ffcf7598c6bb529f67d4d8afe451f60d32eb8.tar.gz emacs-e90ffcf7598c6bb529f67d4d8afe451f60d32eb8.zip | |
* src/w32fns.c (Fw32_register_hot_key): Doc fix. (Bug#44456)
Diffstat (limited to 'src')
| -rw-r--r-- | src/w32fns.c | 27 |
1 files 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, | |||
| 8626 | doc: /* Register KEY as a hot-key combination. | 8626 | doc: /* Register KEY as a hot-key combination. |
| 8627 | Certain key combinations like Alt-Tab and Win-R are reserved for | 8627 | Certain key combinations like Alt-Tab and Win-R are reserved for |
| 8628 | system use on Windows, and therefore are normally intercepted by the | 8628 | system use on Windows, and therefore are normally intercepted by the |
| 8629 | system. These key combinations can be received by registering them | 8629 | system. These key combinations can be used in Emacs by registering |
| 8630 | as hot-keys, except for Win-L which always locks the computer. | 8630 | them as hot-keys, except for Win-L which always locks the computer. |
| 8631 | 8631 | ||
| 8632 | On Windows 98 and ME, KEY must be a one element key definition in | 8632 | On Windows 98 and ME, KEY must be a one element key definition in |
| 8633 | vector form that would be acceptable to `define-key' (e.g. [A-tab] for | 8633 | 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 | |||
| 8636 | modifier keys. The return value is the hotkey-id if registered, | 8636 | modifier keys. The return value is the hotkey-id if registered, |
| 8637 | otherwise nil. | 8637 | otherwise nil. |
| 8638 | 8638 | ||
| 8639 | On Windows versions since NT, KEY can also be specified as [M-], [s-] or | 8639 | On Windows versions since NT, KEY can also be specified as just a |
| 8640 | [h-] to indicate that all combinations of that key should be processed | 8640 | modifier key, [M-], [s-] or [H-], to indicate that all combinations |
| 8641 | by Emacs instead of the operating system. The super and hyper | 8641 | of the respective modifier key should be processed by Emacs instead |
| 8642 | modifiers are interpreted according to the current values of | 8642 | of the operating system. The super and hyper modifiers are |
| 8643 | `w32-lwindow-modifier' and `w32-rwindow-modifier'. For instance, | 8643 | interpreted according to the current values of `w32-lwindow-modifier' |
| 8644 | setting `w32-lwindow-modifier' to `super' and then calling | 8644 | and `w32-rwindow-modifier'. For instance, setting `w32-lwindow-modifier' |
| 8645 | `(w32-register-hot-key [s-])' grabs all combinations of the left Windows | 8645 | to `super' and then calling `(w32-register-hot-key [s-])' grabs all |
| 8646 | key to Emacs, but leaves the right Windows key free for the operating | 8646 | combinations of the left Windows key to Emacs as keys with the Super |
| 8647 | system keyboard shortcuts. The return value is t if the call affected | 8647 | modifier, but leaves the right Windows key free for the operating |
| 8648 | any key combinations, otherwise nil. */) | 8648 | system keyboard shortcuts. |
| 8649 | |||
| 8650 | The return value is t if the call affected any key combinations, | ||
| 8651 | otherwise nil. */) | ||
| 8649 | (Lisp_Object key) | 8652 | (Lisp_Object key) |
| 8650 | { | 8653 | { |
| 8651 | key = w32_parse_and_hook_hot_key (key, 1); | 8654 | key = w32_parse_and_hook_hot_key (key, 1); |