4 files changed, 30 insertions, 11 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index e3cf7546962..d4f654a1028 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,18 @@
+2011-08-23  Eli Zaretskii  <eliz@gnu.org>
+
+        * 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,
@@ -45,8 +60,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>
 
@@ -69,8 +84,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
@@ -172,8 +187,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
@@ -196,8 +211,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>
@@ -235,7 +250,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
diff --git a/src/cmds.c b/src/cmds.c
index f49cfc221be..c079ad7168f 100644
--- a/src/cmds.c
+++ b/src/cmds.c
@@ -271,7 +271,8 @@ Whichever character you type to run this command is inserted.
 Before insertion, `expand-abbrev' is executed if the inserted character does
 not have word syntax and the previous character in the buffer does.
 After insertion, the value of `auto-fill-function' is called if the
-`auto-fill-chars' table has a non-nil value for the inserted character.  */)
+`auto-fill-chars' table has a non-nil value for the inserted character.
+At the end, it runs `post-self-insert-hook'.  */)
   (Lisp_Object n)
 {
   int remove_boundary = 1;
diff --git a/src/dispnew.c b/src/dispnew.c
index 4cffc32b0d7..a09421a9f15 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -5314,7 +5314,8 @@ buffer_posn_from_coords (struct window *w, int *x, int *y, struct display_pos *p
       if (STRINGP (it.string))
         BYTEPOS (pos->pos) = string_char_to_byte (string, CHARPOS (pos->pos));
       else
-        BYTEPOS (pos->pos) = CHAR_TO_BYTE (CHARPOS (pos->pos));
+        BYTEPOS (pos->pos) = buf_charpos_to_bytepos (XBUFFER (w->buffer),
+                                                     CHARPOS (pos->pos));
     }
 
 #ifdef HAVE_WINDOW_SYSTEM
diff --git a/src/xdisp.c b/src/xdisp.c
index 5ce8cbf8d9b..6fbbc69a7ca 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -24292,6 +24292,8 @@ x_produce_glyphs (struct it *it)
       Lisp_Object gstring;
       struct font_metrics metrics;
 
+      it->nglyphs = 1;
+
       gstring = composition_gstring_from_id (it->cmp_it.id);
       it->pixel_width
         = composition_gstring_width (gstring, it->cmp_it.from, it->cmp_it.to,