2 files changed, 6 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 2f045d25828..b7dfa322779 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2009-10-29  Jason Rumney  <jasonr@wanchan.jasonrumney.net>
+
+        * w32fns.c (syms_of_w32fns): Change default value of
+        w32-scroll-lock-modifier to nil.  (Bug#2827)
+
 2009-10-26  Juanma Barranquero  <lekktu@gmail.com>
 
         * minibuf.c (Fall_completions): Fix typos in docstring.
diff --git a/src/w32fns.c b/src/w32fns.c
index c06fa4ea9d4..db7fdfbed9a 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -7055,7 +7055,7 @@ Set to nil to handle Caps Lock as the `capslock' key.  */);
 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.  */);
-  Vw32_scroll_lock_modifier = Qt;
+  Vw32_scroll_lock_modifier = Qnil;
 
   DEFVAR_LISP ("w32-lwindow-modifier",
                &Vw32_lwindow_modifier,