merge from upstream

1 files changed, 65 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index e21412187c7..1e537f3872e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,67 @@
+2011-06-28  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * gnutls.c (Qgnutls_bootprop_verify_error): Remove unused var.
+
+2011-06-27  Juanma Barranquero  <lekktu@gmail.com>
+
+        * makefile.w32-in: Redesign dependencies so they reflect more
+        clearly which files are directly included by each source file,
+        and not through other includes.
+
+2011-06-27  Martin Rudalics  <rudalics@gmx.at>
+
+        * buffer.c (Qclone_number): Declare static and DEFSYM it.
+        (sort_overlays, overlay_strings): When an overlay's clone number
+        matches the window's clone number process the overlay even if
+        the overlay's window property doesn't match the current window.
+
+        * window.c (Fwindow_vchild): Rename to Fwindow_top_child.
+        (Fwindow_hchild): Rename to Fwindow_left_child.
+        (Fwindow_next): Rename to Fwindow_next_sibling.
+        (Fwindow_prev): Rename to Fwindow_prev_sibling.
+        (resize_window_check): Rename to window_resize_check.
+        (resize_window_apply): Rename to window_resize_apply.
+        (Fresize_window_apply): Rename to Fwindow_resize_apply.
+        (Fdelete_other_windows_internal, resize_frame_windows)
+        (Fsplit_window_internal, Fdelete_window_internal)
+        (grow_mini_window, shrink_mini_window)
+        (Fresize_mini_window_internal): Fix callers accordingly.
+
+2011-06-26  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * emacsgtkfixed.h: State that this is only used with Gtk+3.
+        (emacs_fixed_set_min_size): Remove.
+        (emacs_fixed_new): Take frame as argument.
+
+        * emacsgtkfixed.c: State that this is only used with Gtk+3.
+        (_EmacsFixedPrivate): Remove minwidth/height.
+        Add struct frame *f.
+        (emacs_fixed_init): Initialize priv->f.
+        (get_parent_class, emacs_fixed_set_min_size): Remove.
+        (emacs_fixed_new): Set priv->f to argument.
+        (emacs_fixed_get_preferred_width)
+        (emacs_fixed_get_preferred_height): Use min_width/height from
+        frames size_hint to set minimum and natural (Bug#8919).
+        (XSetWMSizeHints, XSetWMNormalHints): Override these functions
+        and use min_width/height from frames size_hint to set
+        min_width/height (Bug#8919).
+
+        * gtkutil.c (xg_create_frame_widgets): Pass f to emacs_fixed_new.
+        (x_wm_set_size_hint): Remove call to emacs_fixed_set_min_size. Fix
+        indentation.
+
+2011-06-26  Eli Zaretskii  <eliz@gnu.org>
+
+        * bidi.c (bidi_paragraph_init): Test for ZV_BYTE before calling
+        bidi_at_paragraph_end, since fast_looking_at doesn't like to be
+        called at ZV.
+
+2011-06-26  Chong Yidong  <cyd@stupidchicken.com>
+
+        * process.c (wait_reading_process_output): Bypass select if
+        waiting for a cell while ignoring keyboard input, and input is
+        pending.  Suggested by Jan Djärv (Bug#8869).
+
 2011-06-25  Paul Eggert  <eggert@cs.ucla.edu>
 
         Use gnulib's dup2 module instead of rolling our own.
@@ -351,7 +415,7 @@
 
 2011-06-22  Jim Meyering  <meyering@redhat.com>
 
-        don't leak an XBM-image-sized buffer
+        Don't leak an XBM-image-sized buffer
         * image.c (xbm_load): Free the image buffer after using it.
 
 2011-06-21  Paul Eggert  <eggert@cs.ucla.edu>