merge from trunk

1 files changed, 18 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 0c8de046034..dd6a2cc6283 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,21 @@
+2013-08-13  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * nsterm.h: Fix CGFloat for OSX 10.4 (Bug#15086).
+
+2013-08-13  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * window.h (WINDOW_FRINGE_EXTENDED_P): New macro.
+        * nsterm.m (ns_set_vertical_scroll_bar): Use it.  Use convenient
+        bool instead of BOOL.
+        * w32term.h (struct scroll_bar): Convert fringe_extended_p
+        from Lisp_Object to bitfield.  Adjust comment.
+        * w32term.c (x_scroll_bar_create): Adjust user.
+        Use WINDOW_FRINGE_EXTENDED_P and bool for boolean.
+        * xterm.c (XTset_vertical_scroll_bar): Likewise.
+        Use bool for boolean.
+        * xterm.h (struct scroll_bar): Prefer commonly used `unsigned'
+        to `unsigned int' when defining a bitfield.
+
 2013-08-13  Paul Eggert  <eggert@cs.ucla.edu>
 
         * decompress.c (Fzlib_decompress_region): Try to clarify 'avail_out'.