Fix Windows build errors introduced after converting to WGET and WSET.

* w32term.c (w32_set_vertical_scroll_bar): Change to use WSET.
Reported by Andy Moreton <andrewjmoreton@gmail.com>.

diff --git a/src/ChangeLog b/src/ChangeLog
index 146eed20e37635685ba770a12e2531d34ce47027..5ca15556b14227151ab0ac8f96280dd2e5b712f6 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2012-08-06  Dmitry Antipov  <dmantipov@yandex.ru>
+
+       Fix Windows build errors introduced after converting to WGET and WSET.
+       * w32term.c (w32_set_vertical_scroll_bar): Change to use WSET.
+       Reported by Andy Moreton <andrewjmoreton@gmail.com>.
+
 2012-08-06  Jan Djärv  <jan.h.d@swipnet.se>
 
        * nsterm.m (ns_frame_rehighlight): Use FSET.

diff --git a/src/w32term.c b/src/w32term.c
index fc4522d56fd18a6ad3d467c231acd661cdad43c1..262bbd49e68424004a2cdfce9b6d4c27379c9b8a 100644 (file)
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -3684,6 +3684,7 @@ w32_set_vertical_scroll_bar (struct window *w,
                             int portion, int whole, int position)
 {
   struct frame *f = XFRAME (WGET (w, frame));
+  Lisp_Object barobj;
   struct scroll_bar *bar;
   int top, height, left, sb_left, width, sb_width;
   int window_y, window_height;
@@ -3806,8 +3807,8 @@ w32_set_vertical_scroll_bar (struct window *w,
   bar->fringe_extended_p = fringe_extended_p ? Qt : Qnil;
 
   w32_set_scroll_bar_thumb (bar, portion, position, whole);
-
-  XSETVECTOR (WGET (w, vertical_scroll_bar), bar);
+  XSETVECTOR (barobj, bar);
+  WSET (w, vertical_scroll_bar, barobj);
 }