merge trunk

1 files changed, 44 insertions, 9 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 5b4e0023ac6..a3c7c2f09d2 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -3,6 +3,41 @@
         * chartab.c (Fset_char_table_extra_slot): Do not inhibit setting a
         extra slot even if the purpose is char-code-property-table.
 
+2011-08-23  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (redisplay_window): When computing centering_position,
+        account for the height of the header line.  (Bug#8874)
+
+        * dispnew.c (buffer_posn_from_coords): Use buf_charpos_to_bytepos
+        instead of CHAR_TO_BYTE.  Fixes a crash when a completion
+        candidate is selected by the mouse, and that candidate has a
+        composed character under the mouse.
+
+        * xdisp.c (x_produce_glyphs): Set it->nglyphs to 1.  Fixes pixel
+        coordinates reported by pos-visible-in-window-p for a composed
+        character in column zero.
+
+2011-08-23  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * cmds.c (Fself_insert_command): Mention post-self-insert-hook.
+
+2011-08-22  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (BUFFER_POS_REACHED_P): If this is a composition,
+        consider it a hit if to_charpos is anywhere in the range of the
+        composed buffer positions.
+
+2011-08-22  Chong Yidong  <cyd@stupidchicken.com>
+
+        * image.c (gif_load): Don't assume that each subimage has the same
+        dimensions as the base image.  Handle disposal method that is
+        "undefined" by the gif spec (Bug#9335).
+
+2011-08-20  Chong Yidong  <cyd@stupidchicken.com>
+
+        * eval.c (Fsignal): Handle `debug' symbol in error handler (Bug#9329).
+        (Fcondition_case): Document `debug' symbol in error handler.
+
 2011-08-19  Eli Zaretskii  <eliz@gnu.org>
 
         * xfaces.c (face_at_buffer_position): Avoid repeated evaluation of
@@ -33,8 +68,8 @@
 2011-08-17  Chong Yidong  <cyd@stupidchicken.com>
 
         * eval.c (internal_condition_case, internal_condition_case_1)
-        (internal_condition_case_2, internal_condition_case_n): Remove
-        unnecessary aborts (Bug#9081).
+        (internal_condition_case_2, internal_condition_case_n):
+        Remove unnecessary aborts (Bug#9081).
 
 2011-08-17  Eli Zaretskii  <eliz@gnu.org>
 
@@ -57,8 +92,8 @@
         * unexcw.c ( __malloc_initialized): Declare external variable.
         (fixup_executable): Force the dumped emacs to reinitialize malloc.
 
-        * gmalloc.c [CYGWIN] (bss_sbrk_heapbase, bss_sbrk_heapinfo): New
-        variables.
+        * gmalloc.c [CYGWIN] (bss_sbrk_heapbase, bss_sbrk_heapinfo):
+        New variables.
         (malloc_initialize_1) [CYGWIN]: Prepare for reinitializing the
         dumped emacs.
         (_free_internal_nolock) [CYGWIN]: Ignore requests to free storage
@@ -160,8 +195,8 @@
         * xdisp.c (iterate_out_of_display_property): xassert that
         IT->position is set to within IT->object's boundaries.  Break from
         the loop as soon as EOB is reached; avoids infloops in redisplay
-        when IT->position is set up wrongly due to some bug.  Set
-        IT->current to match the bidi iterator unconditionally.
+        when IT->position is set up wrongly due to some bug.
+        Set IT->current to match the bidi iterator unconditionally.
         (push_display_prop): Allow GET_FROM_STRING as IT->method on
         entry.  Force push_it to save on the stack the current
         buffer/string position, to be restored by pop_it.  Fix flags in
@@ -184,8 +219,8 @@
 2011-08-08  Eli Zaretskii  <eliz@gnu.org>
 
         * xdisp.c (forward_to_next_line_start): Allow to use the
-        no-display-properties-and-no-overlays under bidi display.  Set
-        disp_pos in the bidi iterator to avoid searches for display
+        no-display-properties-and-no-overlays under bidi display.
+        Set disp_pos in the bidi iterator to avoid searches for display
         properties and overlays.
 
 2011-08-08  Chong Yidong  <cyd@stupidchicken.com>
@@ -223,7 +258,7 @@
         * bidi.c <bidi_cache_total_alloc>: Now static.
         (bidi_initialize): Initialize bidi_cache_total_alloc.
 
-        *xdisp.c (display_line): Release buffer allocated for shelved bidi
+        * xdisp.c (display_line): Release buffer allocated for shelved bidi
         cache.  (Bug#9221)
 
         * bidi.c (bidi_shelve_cache, bidi_unshelve_cache): Track total