merge from trunk

2 files changed, 6 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index dd6a2cc6283..70a1fa28db5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
 2013-08-13  Jan Djärv  <jan.h.d@swipnet.se>
 
+        * nsterm.m (ns_set_vertical_scroll_bar): Fix breakage intruduced by
+        2013-08-13 checkin below.  Change bool to BOOL, rule is:
+        All Obj-C code uses BOOL, except for interfaces callable from C.
+
         * nsterm.h: Fix CGFloat for OSX 10.4 (Bug#15086).
 
 2013-08-13  Dmitry Antipov  <dmantipov@yandex.ru>
diff --git a/src/nsterm.m b/src/nsterm.m
index e1a60028ffc..f374bfd90c6 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -3703,7 +3703,7 @@ ns_set_vertical_scroll_bar (struct window *window,
   int window_y, window_height;
   int top, left, height, width, sb_width, sb_left;
   EmacsScroller *bar;
-  bool fringe_extended_p;
+  BOOL fringe_extended_p;
 
   /* optimization; display engine sends WAY too many of these.. */
   if (!NILP (window->vertical_scroll_bar))
@@ -3740,7 +3740,7 @@ ns_set_vertical_scroll_bar (struct window *window,
   v = [view frame];
   r.origin.y = (v.size.height - r.size.height - r.origin.y);
 
-  fringe_extended_p = WINDOW_FRINGE_EXTENDED_P (w);
+  fringe_extended_p = WINDOW_FRINGE_EXTENDED_P (window);
 
   XSETWINDOW (win, window);
   block_input ();