Merge from origin/emacs-25

4179238 Improve documentation of 'w32-scroll-lock-modifier'

2 files changed, 7 insertions, 2 deletions

diff --git a/doc/emacs/msdos.texi b/doc/emacs/msdos.texi
index 2793bb944bc..eb0fb17ddd1 100644
--- a/doc/emacs/msdos.texi
+++ b/doc/emacs/msdos.texi
@@ -612,7 +612,11 @@ variable @code{w32-rwindow-modifier} controls the effect of the right
 Windows key, and @code{w32-scroll-lock-modifier} does the same for the
 @key{ScrLock} key.  If these variables are set to @code{nil}, the
 right Windows key produces the symbol @code{rwindow} and @key{ScrLock}
-produces the symbol @code{scroll}.
+produces the symbol @code{scroll}.  If you want @key{ScrLock} to
+produce the same effect as in other applications, i.e.@: toggle the
+Scroll Lock @acronym{LED} indication on the keyboard, set
+@code{w32-scroll-lock-modifier} to @code{t} or any non-@code{nil}
+value other than the above modifier symbols.
 
 @vindex w32-pass-alt-to-system
 @cindex Windows system menu
diff --git a/src/w32fns.c b/src/w32fns.c
index 8c8272b16d4..79762ea36ab 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -9900,7 +9900,8 @@ Set to nil to handle Caps Lock as the `capslock' key.  */);
                doc: /* Modifier to use for the Scroll Lock ON state.
 The value can be hyper, super, meta, alt, control or shift for the
 respective modifier, or nil to handle Scroll Lock as the `scroll' key.
-Any other value will cause the Scroll Lock key to be ignored.  */);
+Any other value will cause the Scroll Lock key to be ignored by Emacs,
+and it will have the same effect as in other applications.  */);
   Vw32_scroll_lock_modifier = Qnil;
 
   DEFVAR_LISP ("w32-lwindow-modifier",