Merge from trunk.

1 files changed, 64 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 100a7b0f000..f54d40db392 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -48,12 +48,74 @@
         All uses of STRING_BYTES_MAX replaced by STRING_BYTES_BOUND.
         * lisp.h (STRING_BYTES_BOUND): Renamed from STRING_BYTES_MAX.
 
-2011-06-07  Paul Eggert  <eggert@cs.ucla.edu>
-
         * character.c (string_escape_byte8): Fix nbytes/nchars typo.
 
         * alloc.c (Fmake_string): Check for out-of-range init.
 
+2011-06-08  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.h (window): Add some new members to window structure -
+        normal_lines, normal_cols, new_total, new_normal, clone_number,
+        splits, nest, prev_buffers, next_buffers.
+        (WINDOW_TOTAL_SIZE): Move here from window.c.
+        (MIN_SAFE_WINDOW_WIDTH, MIN_SAFE_WINDOW_HEIGHT): Define here.
+
+        * window.c (Fwindow_height, Fwindow_width, Fwindow_full_width_p):
+        Remove.
+        (make_dummy_parent): Set new members of windows structure.
+        (make_window): Move down in code.  Handle new members of window
+        structure.
+        (Fwindow_clone_number, Fwindow_splits, Fset_window_splits)
+        (Fwindow_nest, Fset_window_nest, Fwindow_new_total)
+        (Fwindow_normal_size, Fwindow_new_normal, Fwindow_prev_buffers)
+        (Fset_window_prev_buffers, Fwindow_next_buffers)
+        (Fset_window_next_buffers, Fset_window_clone_number): New
+        functions.
+        (Fwindow_hscroll, Fwindow_at, Fwindow_point, Fwindow_start)
+        (Fwindow_end, Fwindow_line_height, Fset_window_dedicated_p):
+        Doc-string fixes.
+        (Fwindow_parameters, Fwindow_parameter, Fset_window_parameter):
+        Argument WINDOW can be now internal window too.
+        (Fwindow_use_time): Move up in code.
+        (Fget_buffer_window): Rename argument FRAME to ALL-FRAMES.
+        Rewrite doc-string.
+        (Fset_window_configuration, saved_window)
+        (Fcurrent_window_configuration, save_window_save): Handle new
+        members of window structure.
+        (WINDOW_TOTAL_SIZE, MIN_SAFE_WINDOW_WIDTH)
+        (MIN_SAFE_WINDOW_HEIGHT): Move to window.h.
+        (syms_of_window): New Lisp objects Qrecord_window_buffer,
+        Qwindow_deletable_p, Qdelete_window, Qreplace_buffer_in_windows,
+        Qget_mru_window, Qresize_root_window,
+        Qresize_root_window_vertically, Qsafe, Qabove, Qbelow,
+        Qauto_buffer_name; staticpro them.
+
+2011-06-07  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.c (Fwindow_total_size, Fwindow_left_column)
+        (Fwindow_top_line, window_body_lines, Fwindow_body_size)
+        (Fwindow_list_1): New functions.
+        (window_box_text_cols): Replace with window_body_cols.
+        (Fwindow_width, Fscroll_left, Fscroll_right): Use
+        window_body_cols instead of window_box_text_cols.
+        (delete_window, Fset_window_configuration): Call
+        delete_all_subwindows with window as argument.
+        (delete_all_subwindows): Take a window as argument and not a
+        structure.  Rewrite.
+        (window_loop): Remove handling of GET_LRU_WINDOW and
+        GET_LARGEST_WINDOW.
+        (Fget_lru_window, Fget_largest_window): Move to window.el.
+
+        * window.h: Extern window_body_cols instead of
+        window_box_text_cols.  delete_all_subwindows now takes a
+        Lisp_Object as argument.
+
+        * indent.c (compute_motion, Fcompute_motion): Use
+        window_body_cols instead of window_box_text_cols.
+
+        * frame.c (delete_frame): Call delete_all_subwindows with root
+        window as argument.
+
 2011-06-07  Daniel Colascione  <dan.colascione@gmail.com>
 
         * fns.c (Fputhash): Document return value.