From: Dmitry Antipov Date: Mon, 6 Aug 2012 15:45:27 +0000 (+0400) Subject: Fix Windows build errors introduced after converting to WGET and WSET. X-Git-Tag: emacs-24.2.90~820 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=dd86bd8258e894a4f2b3a34bf273201bd8a7037d;p=emacs.git 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 . --- diff --git a/src/ChangeLog b/src/ChangeLog index 146eed20e37..5ca15556b14 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2012-08-06 Dmitry Antipov + + 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 . + 2012-08-06 Jan Djärv * nsterm.m (ns_frame_rehighlight): Use FSET. diff --git a/src/w32term.c b/src/w32term.c index fc4522d56fd..262bbd49e68 100644 --- 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); }