2 files changed, 5 insertions, 1 deletions

diff --git a/lisp/bindings.el b/lisp/bindings.el
index 0be14587981..16da2bdf9a6 100644
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -1054,6 +1054,7 @@ if `inhibit-field-text-motion' is non-nil."
 ;(define-key global-map [delete] 'backward-delete-char)
 
 ;; natural bindings for terminal keycaps --- defined in X keysym order
+(define-key global-map [Scroll_Lock]    'scroll-lock-mode)
 (define-key global-map [C-S-backspace]  'kill-whole-line)
 (define-key global-map [home]           'move-beginning-of-line)
 (define-key global-map [C-home]         'beginning-of-buffer)
diff --git a/lisp/scroll-lock.el b/lisp/scroll-lock.el
index 3a74c11b7a1..36e2264fe4f 100644
--- a/lisp/scroll-lock.el
+++ b/lisp/scroll-lock.el
@@ -54,7 +54,10 @@
 When enabled, keys that normally move point by line or paragraph
 will scroll the buffer by the respective amount of lines instead
 and point will be kept vertically fixed relative to window
-boundaries during scrolling."
+boundaries during scrolling.
+
+Note that the default key binding to Scroll_Lock will not work on
+MS-Windows systems if `w32-scroll-lock-modifier' is non-nil."
   :lighter " ScrLck"
   :keymap scroll-lock-mode-map
   (if scroll-lock-mode