aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGlenn Morris2012-01-30 19:33:16 -0800
committerGlenn Morris2012-01-30 19:33:16 -0800
commitc78c6e0bbf8ef6d442f92b38083311e51a51beaf (patch)
tree7ea60b6509bf3982ff57a19d3e47daba76f19fd9 /src
parent9789766834854891756f4acef96c5e6680ae6218 (diff)
downloademacs-c78c6e0bbf8ef6d442f92b38083311e51a51beaf.tar.gz
emacs-c78c6e0bbf8ef6d442f92b38083311e51a51beaf.zip
* w32term.c: Copy previous xterm.c doc fix.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog1
-rw-r--r--src/w32term.c3
2 files changed, 3 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 8d32b6a32c8..d114f0897eb 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,6 +1,7 @@
12012-01-31 Glenn Morris <rgm@gnu.org> 12012-01-31 Glenn Morris <rgm@gnu.org>
2 2
3 * nsterm.m (syms_of_nsterm) <x-toolkit-scroll-bars>: 3 * nsterm.m (syms_of_nsterm) <x-toolkit-scroll-bars>:
4 * w32term.c (syms_of_w32term) <x-toolkit-scroll-bars>:
4 * xterm.c (syms_of_xterm) <x-toolkit-scroll-bars>: Sync docs. 5 * xterm.c (syms_of_xterm) <x-toolkit-scroll-bars>: Sync docs.
5 6
62012-01-29 Glenn Morris <rgm@gnu.org> 72012-01-29 Glenn Morris <rgm@gnu.org>
diff --git a/src/w32term.c b/src/w32term.c
index f764ad9d218..57fdf070850 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -6432,7 +6432,8 @@ baseline level. The default value is nil. */);
6432A value of nil means Emacs doesn't use toolkit scroll bars. 6432A value of nil means Emacs doesn't use toolkit scroll bars.
6433With the X Window system, the value is a symbol describing the 6433With the X Window system, the value is a symbol describing the
6434X toolkit. Possible values are: gtk, motif, xaw, or xaw3d. 6434X toolkit. Possible values are: gtk, motif, xaw, or xaw3d.
6435With MS Windows, the value is t. */); 6435With MS Windows, the value is t. With Nextstep, the value is
6436t or nil. */);
6436 Vx_toolkit_scroll_bars = Qt; 6437 Vx_toolkit_scroll_bars = Qt;
6437 6438
6438 staticpro (&last_mouse_motion_frame); 6439 staticpro (&last_mouse_motion_frame);