merge from trunk

1 files changed, 22 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index d89f702a2aa..af088340e3b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,25 @@
+2013-08-14  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        Cleanup window fringes, margins and scroll bars adjustments.
+        * window.c (set_window_fringes, set_window_margins)
+        (set_window_scroll_bars, apply_window_adjustment): New functions.
+        (set_window_buffer, Fset_window_margins, Fset_window_fringes)
+        (Fset_window_scroll_bars): Use them.
+
+2013-08-14  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * window.h (struct window): Convert scroll_bar_width
+        from Lisp_Object to integer.  Adjust comment.
+        (WINDOW_CONFIG_SCROLL_BAR_WIDTH, WINDOW_CONFIG_SCROLL_BAR_COLS):
+        Adjust users.
+        * window.c (wset_scroll_bar_width): Remove.
+        (make_window): Initialize scroll_bar_width.
+        (Fsplit_window_internal): Use direct assignment.
+        (Fset_window_configuration, save_window_save):
+        Convert Lisp_Object to integer and back where appropriate.
+        (Fset_window_scroll_bars): Adjust user.  Return t if any scroll
+        bar was actually changed, and mention this in docstring.
+
 2013-08-13  Paul Eggert  <eggert@cs.ucla.edu>
 
         * decompress.c: Minor simplifications.