aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDmitry Antipov2012-08-06 19:45:27 +0400
committerDmitry Antipov2012-08-06 19:45:27 +0400
commitdd86bd8258e894a4f2b3a34bf273201bd8a7037d (patch)
treed2aafd0bfa83ce268c188fab552b435b963782ee /src
parent054e16686ce0dddadefd8dd9a02ac0950ab8d703 (diff)
downloademacs-dd86bd8258e894a4f2b3a34bf273201bd8a7037d.tar.gz
emacs-dd86bd8258e894a4f2b3a34bf273201bd8a7037d.zip
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>.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog6
-rw-r--r--src/w32term.c5
2 files changed, 9 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 146eed20e37..5ca15556b14 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
12012-08-06 Dmitry Antipov <dmantipov@yandex.ru>
2
3 Fix Windows build errors introduced after converting to WGET and WSET.
4 * w32term.c (w32_set_vertical_scroll_bar): Change to use WSET.
5 Reported by Andy Moreton <andrewjmoreton@gmail.com>.
6
12012-08-06 Jan Djärv <jan.h.d@swipnet.se> 72012-08-06 Jan Djärv <jan.h.d@swipnet.se>
2 8
3 * nsterm.m (ns_frame_rehighlight): Use FSET. 9 * 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,
3684 int portion, int whole, int position) 3684 int portion, int whole, int position)
3685{ 3685{
3686 struct frame *f = XFRAME (WGET (w, frame)); 3686 struct frame *f = XFRAME (WGET (w, frame));
3687 Lisp_Object barobj;
3687 struct scroll_bar *bar; 3688 struct scroll_bar *bar;
3688 int top, height, left, sb_left, width, sb_width; 3689 int top, height, left, sb_left, width, sb_width;
3689 int window_y, window_height; 3690 int window_y, window_height;
@@ -3806,8 +3807,8 @@ w32_set_vertical_scroll_bar (struct window *w,
3806 bar->fringe_extended_p = fringe_extended_p ? Qt : Qnil; 3807 bar->fringe_extended_p = fringe_extended_p ? Qt : Qnil;
3807 3808
3808 w32_set_scroll_bar_thumb (bar, portion, position, whole); 3809 w32_set_scroll_bar_thumb (bar, portion, position, whole);
3809 3810 XSETVECTOR (barobj, bar);
3810 XSETVECTOR (WGET (w, vertical_scroll_bar), bar); 3811 WSET (w, vertical_scroll_bar, barobj);
3811} 3812}
3812 3813
3813 3814