upstream

3 files changed, 36 insertions, 9 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 2b5b6fd0602..85a55b2b7c9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,14 @@
+2011-08-19  Eli Zaretskii  <eliz@gnu.org>
+
+        * xfaces.c (face_at_buffer_position): Avoid repeated evaluation of
+        face ID by FACE_FROM_ID, and avoid a crash when mouse is moved
+        from an Org mode buffer to a Speedbar frame.
+
+        * xdisp.c (RECORD_MAX_MIN_POS): If the display element comes from
+        a composition, take its buffer position from IT->cmp_it.charpos.
+        Fixes cursor positioning at the beginning of a line that begins
+        with a composed character.
+
 2011-08-18  Eli Zaretskii  <eliz@gnu.org>
 
         * bidi.c (bidi_get_type): If bidi_type_table reports zero as the
diff --git a/src/xdisp.c b/src/xdisp.c
index b26d844cdf2..2cd1bb9bfdb 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -18491,15 +18491,22 @@ display_line (struct it *it)
 #define RECORD_MAX_MIN_POS(IT)                                  \
   do                                                            \
     {                                                           \
-      if (IT_CHARPOS (*(IT)) < min_pos)                         \
+      int composition_p = (IT)->what == IT_COMPOSITION;         \
+      EMACS_INT current_pos =                                   \
+        composition_p ? (IT)->cmp_it.charpos                    \
+                      : IT_CHARPOS (*(IT));                     \
+      EMACS_INT current_bpos =                                  \
+        composition_p ? CHAR_TO_BYTE (current_pos)              \
+                      : IT_BYTEPOS (*(IT));                     \
+      if (current_pos < min_pos)                                \
         {                                                       \
-          min_pos = IT_CHARPOS (*(IT));                         \
-          min_bpos = IT_BYTEPOS (*(IT));                        \
+          min_pos = current_pos;                                \
+          min_bpos = current_bpos;                              \
         }                                                       \
-      if (IT_CHARPOS (*(IT)) > max_pos)                         \
+      if (current_pos > max_pos)                                \
         {                                                       \
-          max_pos = IT_CHARPOS (*(IT));                         \
-          max_bpos = IT_BYTEPOS (*(IT));                        \
+          max_pos = current_pos;                                \
+          max_bpos = current_bpos;                              \
         }                                                       \
     }                                                           \
   while (0)
diff --git a/src/xfaces.c b/src/xfaces.c
index 83c92cdbc52..52b86638a50 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -6008,9 +6008,18 @@ face_at_buffer_position (struct window *w, EMACS_INT pos,
 
   *endptr = endpos;
 
-  default_face = FACE_FROM_ID (f, base_face_id >= 0 ? base_face_id
-                               : NILP (Vface_remapping_alist) ? DEFAULT_FACE_ID
-                               : lookup_basic_face (f, DEFAULT_FACE_ID));
+  {
+    int face_id;
+
+    if (base_face_id >= 0)
+      face_id = base_face_id;
+    else if (NILP (Vface_remapping_alist))
+      face_id = DEFAULT_FACE_ID;
+    else
+      face_id = lookup_basic_face (f, DEFAULT_FACE_ID);
+
+    default_face = FACE_FROM_ID (f, face_id);
+  }
 
   /* Optimize common cases where we can use the default face.  */
   if (noverlays == 0