aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2017-01-01 01:02:46 -0800
committerPaul Eggert2017-01-01 01:02:46 -0800
commit9bec2fb3c19968a673f761c55057c4dbc9d907be (patch)
tree2ce695d1512d61e55318d1d2ad775b3c0073b4f7 /src
parent37b01efe2041999963db839ddf5dc94698e1da61 (diff)
parent4179238fa8047837c545227c6e538fb43afaa4ff (diff)
downloademacs-9bec2fb3c19968a673f761c55057c4dbc9d907be.tar.gz
emacs-9bec2fb3c19968a673f761c55057c4dbc9d907be.zip
Merge from origin/emacs-25
4179238 Improve documentation of 'w32-scroll-lock-modifier'
Diffstat (limited to 'src')
-rw-r--r--src/w32fns.c3
1 files changed, 2 insertions, 1 deletions
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. */);
9900 doc: /* Modifier to use for the Scroll Lock ON state. 9900 doc: /* Modifier to use for the Scroll Lock ON state.
9901The value can be hyper, super, meta, alt, control or shift for the 9901The value can be hyper, super, meta, alt, control or shift for the
9902respective modifier, or nil to handle Scroll Lock as the `scroll' key. 9902respective modifier, or nil to handle Scroll Lock as the `scroll' key.
9903Any other value will cause the Scroll Lock key to be ignored. */); 9903Any other value will cause the Scroll Lock key to be ignored by Emacs,
9904and it will have the same effect as in other applications. */);
9904 Vw32_scroll_lock_modifier = Qnil; 9905 Vw32_scroll_lock_modifier = Qnil;
9905 9906
9906 DEFVAR_LISP ("w32-lwindow-modifier", 9907 DEFVAR_LISP ("w32-lwindow-modifier",