upstream

1 files changed, 97 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 04e58e4742f..e1854d7ffcd 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,97 @@
+2011-11-17  Juanma Barranquero  <lekktu@gmail.com>
+
+        * window.c (syms_of_window) <window-combination-resize>: Fix typo.
+
+2011-11-17  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.c (Vwindow_splits): Rename to
+        Vwindow_combination_resize.  Suggested by Juri Linkov.
+        (Fsplit_window_internal): Use Vwindow_combination_resize instead
+        of Vwindow_splits.
+
+2011-11-16  Juanma Barranquero  <lekktu@gmail.com>
+
+        * nsfns.m (Fns_font_name):
+        * window.c (syms_of_window) <window-combination-limit>: Fix typos.
+
+2011-11-16  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.h (window): Rename slot "nest" to "combination_limit".
+        * window.c (Fwindow_nest): Rename to Fwindow_combination_limit.
+        (Fset_window_nest): Rename to Fset_window_combination_limit.
+        (Vwindow_nest): Rename to Vwindow_combination_limit.
+        (recombine_windows, make_parent_window, make_window)
+        (Fsplit_window_internal, saved_window)
+        (Fset_window_configuration, save_window_save): Rename all
+        occurrences of window_nest to window_combination_limit.
+
+2011-11-15  Juanma Barranquero  <lekktu@gmail.com>
+
+        * image.c (imagemagick_load_image): Fix typo.
+
+2011-11-14  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (display_line): Move the call to
+        highlight_trailing_whitespace before the call to
+        compute_line_metrics, since the latter needs to see the final
+        faces of all the glyphs to compute ROW's hash value.  Fixes
+        assertion violations in row_equal_p.  (Bug#10035)
+
+2011-11-14  Juanma Barranquero  <lekktu@gmail.com>
+
+        * w32proc.c (reader_thread): Don't check pending input if cp->fd < 0,
+        just return (bug#10044).
+
+2011-11-12  Eli Zaretskii  <eliz@gnu.org>
+
+        * makefile.w32-in (HEAPSIZE): New variable, allows to build temacs
+        with user-defined heap size.  Bump the default size of the temacs
+        heap to 27MB, to avoid memory warning when running temacs.
+        ($(TEMACS)): Use HEAPSIZE instead of a hardcoded value.
+
+        * dispnew.c (scrolling_window): Fix incorrect indices in accessing
+        current_matrix and desired_matrix.  (Bug#9990)
+        (verify_row_hash) [XASSERTS]: New function.
+        (adjust_glyph_matrix, row_equal_p): Use it in xassert to verify
+        that the hash value of glyph rows is correct.
+
+2011-11-12  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.h (window): Remove splits slot.
+        * window.c (Fwindow_splits, Fset_window_splits): Remove.
+        (Fdelete_other_windows_internal, make_parent_window)
+        (make_window, Fsplit_window_internal, Fdelete_window_internal)
+        (Fset_window_configuration, save_window_save): Don't deal with
+        split status of windows.
+        (saved_window): Remove splits slot.
+        (Vwindow_splits): Rewrite doc-string.
+
+2011-11-11  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * xfns.c (unwind_create_frame):
+        * nsfns.m (unwind_create_frame):
+        * w32fns.c (unwind_create_frame): Use Fmemq to check if frame is in
+        Vframe_list (Bug#9999).
+
+2011-11-11  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * xdisp.c (syms_of_xdisp): Remove duplicated definition of Qtext.
+
+2011-11-11  Kenichi Handa  <handa@m17n.org>
+
+        * callproc.c (Fcall_process): Set the member dst_multibyte of
+        process_coding.
+
+2011-11-11  Johan Bockgård  <bojohan@gnu.org>
+
+        * xdisp.c (fill_composite_glyph_string): Always set s->face, to
+        avoid a crash (bug#9496).
+
+2011-11-09  Chong Yidong  <cyd@gnu.org>
+
+        * window.c (Fwindow_inside_edges, Fwindow_inside_pixel_edges)
+        (Fwindow_inside_absolute_pixel_edges): Only allow live windows.
+
 2011-11-08  Paul Eggert  <eggert@cs.ucla.edu>
 
         * s/gnu.h (GC_MARK_STACK): Define to GC_MAKE_GCPROS_NOOPS (Bug#9926).
@@ -181,7 +275,7 @@
 
         * w32fns.c [_MSC_VER]: DECLARE_HANDLE for any MSVC version.
 
-2011-11-05  Fabrice Popineau  <fabrice.popineau@supelec.fr> (tiny change)
+2011-11-05  Fabrice Popineau  <fabrice.popineau@supelec.fr>  (tiny change)
 
         Support MSVC build with newer versions of Visual Studio.
         * w32.c: Don't include w32api.h for MSVC.
@@ -243,7 +337,7 @@
         * xdisp.c (try_cursor_movement): Make sure ROW isn't decremented
         past the beginning of the current glyph matrix.
 
-2011-10-30  Adam Sjøgren <asjo@koldfront.dk> (tiny change)
+2011-10-30  Adam Sjøgren  <asjo@koldfront.dk>  (tiny change)
 
         * xterm.c: Include X11/Xproto.h if HAVE_GTK3.
         (x_error_handler): Ignore BadMatch for X_SetInputFocus for
@@ -2971,7 +3065,7 @@
         * nsselect.m (ns_string_from_pasteboard): Don't use deprecated methods
         cString and lossyCString on OSX >= 10.4
 
-        * nsmenu.m (fillWithWidgetValue): Don't use depercated method
+        * nsmenu.m (fillWithWidgetValue): Don't use deprecated method
         sizeToFit on OSX >= 10.2.
 
         * nsimage.m (allocInitFromFile): Don't use deprecated method