diff options
| author | Eli Zaretskii | 2016-12-19 20:00:09 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2016-12-19 20:00:09 +0200 |
| commit | 4179238fa8047837c545227c6e538fb43afaa4ff (patch) | |
| tree | 913300710fcfaac1376d4b0afc4f6371dd024634 | |
| parent | dfc9f114c728c254c19173001c2a5b49207afb9c (diff) | |
| download | emacs-4179238fa8047837c545227c6e538fb43afaa4ff.tar.gz emacs-4179238fa8047837c545227c6e538fb43afaa4ff.zip | |
Improve documentation of 'w32-scroll-lock-modifier'
* doc/emacs/msdos.texi (Windows Keyboard): Document how to set up
w32-scroll-lock-modifier so that Scroll Lock toggles the LED.
* src/w32fns.c (syms_of_w32fns) <w32-scroll-lock-modifier>: Doc
fix. (Bug#25204)
| -rw-r--r-- | doc/emacs/msdos.texi | 6 | ||||
| -rw-r--r-- | src/w32fns.c | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/doc/emacs/msdos.texi b/doc/emacs/msdos.texi index 47ba23b95aa..d0e9ab45c25 100644 --- a/doc/emacs/msdos.texi +++ b/doc/emacs/msdos.texi | |||
| @@ -580,7 +580,11 @@ variable @code{w32-rwindow-modifier} controls the effect of the right | |||
| 580 | Windows key, and @code{w32-scroll-lock-modifier} does the same for the | 580 | Windows key, and @code{w32-scroll-lock-modifier} does the same for the |
| 581 | @key{ScrLock} key. If these variables are set to @code{nil}, the | 581 | @key{ScrLock} key. If these variables are set to @code{nil}, the |
| 582 | right Windows key produces the symbol @code{rwindow} and @key{ScrLock} | 582 | right Windows key produces the symbol @code{rwindow} and @key{ScrLock} |
| 583 | produces the symbol @code{scroll}. | 583 | produces the symbol @code{scroll}. If you want @key{ScrLock} to |
| 584 | produce the same effect as in other applications, i.e.@: toggle the | ||
| 585 | Scroll Lock @acronym{LED} indication on the keyboard, set | ||
| 586 | @code{w32-scroll-lock-modifier} to @code{t} or any non-@code{nil} | ||
| 587 | value other than the above modifier symbols. | ||
| 584 | 588 | ||
| 585 | @vindex w32-pass-alt-to-system | 589 | @vindex w32-pass-alt-to-system |
| 586 | @cindex Windows system menu | 590 | @cindex Windows system menu |
diff --git a/src/w32fns.c b/src/w32fns.c index 27c0d65fbd0..9f4232d5b92 100644 --- a/src/w32fns.c +++ b/src/w32fns.c | |||
| @@ -9425,7 +9425,8 @@ Set to nil to handle Caps Lock as the `capslock' key. */); | |||
| 9425 | doc: /* Modifier to use for the Scroll Lock ON state. | 9425 | doc: /* Modifier to use for the Scroll Lock ON state. |
| 9426 | The value can be hyper, super, meta, alt, control or shift for the | 9426 | The value can be hyper, super, meta, alt, control or shift for the |
| 9427 | respective modifier, or nil to handle Scroll Lock as the `scroll' key. | 9427 | respective modifier, or nil to handle Scroll Lock as the `scroll' key. |
| 9428 | Any other value will cause the Scroll Lock key to be ignored. */); | 9428 | Any other value will cause the Scroll Lock key to be ignored by Emacs, |
| 9429 | and it will have the same effect as in other applications. */); | ||
| 9429 | Vw32_scroll_lock_modifier = Qnil; | 9430 | Vw32_scroll_lock_modifier = Qnil; |
| 9430 | 9431 | ||
| 9431 | DEFVAR_LISP ("w32-lwindow-modifier", | 9432 | DEFVAR_LISP ("w32-lwindow-modifier", |