[Emacs-diffs] /srv/bzr/emacs/trunk r109469: Fix Windows build errors introduced after converting to WGET and WSET.

[Dmitry Antipov]

------------------------------------------------------------
revno: 109469
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Mon 2012-08-06 19:45:27 +0400
message:
  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 <address@hidden>.
modified:
  src/ChangeLog
  src/w32term.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-08-06 12:54:54 +0000
+++ b/src/ChangeLog     2012-08-06 15:45:27 +0000
@@ -1,3 +1,9 @@
+2012-08-06  Dmitry Antipov  <address@hidden>
+
+       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 <address@hidden>.
+
 2012-08-06  Jan Djärv  <address@hidden>
 
        * nsterm.m (ns_frame_rehighlight): Use FSET.

=== modified file 'src/w32term.c'
--- a/src/w32term.c     2012-08-06 10:24:26 +0000
+++ b/src/w32term.c     2012-08-06 15:45:27 +0000
@@ -3684,6 +3684,7 @@
                             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 @@
   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);
 }