Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-11

Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 34-42)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 14-17)

   - Update from CVS
   - Merge from emacs--devo--0

3 files changed, 46 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index cce484a0e3a..dc6a1641ac5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,19 @@
+2006-02-03  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c: Cache last merged escape glyph face.
+        (last_escape_glyph_frame, last_escape_glyph_face_id)
+        (last_escape_glyph_merged_face_id): New variables.
+        (get_next_display_element): Use/update them.
+        (redisplay_internal): Reset them before redisplay.
+
+        * xdisp.c (set_iterator_to_next): Optimize 2004-12-13 fix.
+        Only recheck faces after displaying ellipsis.
+
+2006-02-02  Kenichi Handa  <handa@m17n.org>
+
+        * coding.c (decode_composition_emacs_mule): Fix handling of
+        incorrect format data.
+
 2006-01-31  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
         * gtkutil.c (update_frame_tool_bar): Use new tool bar functions
diff --git a/src/coding.c b/src/coding.c
index 6ec0804353f..f10a10e1e72 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -1039,7 +1039,7 @@ coding_alloc_by_making_gap (coding, bytes)
       make_gap (bytes);
       GAP_SIZE += add; ZV -= add; Z -= add; ZV_BYTE -= add; Z_BYTE -= add;
     }
-  else
+  else if (c >= 0x80)
     {
       Lisp_Object this_buffer;
 
@@ -1308,6 +1308,8 @@ decode_coding_utf_8 (coding)
       *charbuf++ = ASCII_BYTE_P (c) ? c : BYTE8_TO_CHAR (c);
       coding->errors++;
     }
+  else
+    return 0;
 
  no_more_source:
   coding->consumed_char += consumed_chars_base;
diff --git a/src/xdisp.c b/src/xdisp.c
index 8b1b6f59cf2..fb071542925 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -5425,6 +5425,10 @@ static int (* get_next_element[NUM_IT_METHODS]) P_ ((struct it *it)) =
    display element from the current position of IT.  Value is zero if
    end of buffer (or C string) is reached.  */
 
+static struct frame *last_escape_glyph_frame = NULL;
+static unsigned last_escape_glyph_face_id = (1 << FACE_ID_BITS);
+static int last_escape_glyph_merged_face_id = 0;
+
 int
 get_next_display_element (it)
      struct it *it;
@@ -5536,11 +5540,19 @@ get_next_display_element (it)
                        face_id = merge_faces (it->f, Qt, lface_id,
                                               it->face_id);
                     }
+                  else if (it->f == last_escape_glyph_frame
+                           && it->face_id == last_escape_glyph_face_id)
+                    {
+                      face_id = last_escape_glyph_merged_face_id;
+                    }
                   else
                     {
                       /* Merge the escape-glyph face into the current face.  */
                       face_id = merge_faces (it->f, Qescape_glyph, 0,
                                              it->face_id);
+                      last_escape_glyph_frame = it->f;
+                      last_escape_glyph_face_id = it->face_id;
+                      last_escape_glyph_merged_face_id = face_id;
                     }
 
                   XSETINT (it->ctl_chars[0], g);
@@ -5586,11 +5598,19 @@ get_next_display_element (it)
                   face_id = merge_faces (it->f, Qt, lface_id,
                                          it->face_id);
                 }
+              else if (it->f == last_escape_glyph_frame
+                       && it->face_id == last_escape_glyph_face_id)
+                {
+                  face_id = last_escape_glyph_merged_face_id;
+                }
               else
                 {
                   /* Merge the escape-glyph face into the current face.  */
                   face_id = merge_faces (it->f, Qescape_glyph, 0,
                                          it->face_id);
+                  last_escape_glyph_frame = it->f;
+                  last_escape_glyph_face_id = it->face_id;
+                  last_escape_glyph_merged_face_id = face_id;
                 }
 
               /* Handle soft hyphens in the mode where they only get
@@ -5788,6 +5808,8 @@ set_iterator_to_next (it, reseat_p)
 
       if (it->dpvec + it->current.dpvec_index == it->dpend)
         {
+          int recheck_faces = it->ellipsis_p;
+
           if (it->s)
             it->method = GET_FROM_C_STRING;
           else if (STRINGP (it->string))
@@ -5810,8 +5832,9 @@ set_iterator_to_next (it, reseat_p)
               set_iterator_to_next (it, reseat_p);
             }
 
-          /* Recheck faces after display vector */
-          it->stop_charpos = IT_CHARPOS (*it);
+          /* Maybe recheck faces after display vector */
+          if (recheck_faces)
+            it->stop_charpos = IT_CHARPOS (*it);
         }
       break;
 
@@ -10651,6 +10674,8 @@ redisplay_internal (preserve_echo_area)
  retry:
   pause = 0;
   reconsider_clip_changes (w, current_buffer);
+  last_escape_glyph_frame = NULL;
+  last_escape_glyph_face_id = (1 << FACE_ID_BITS);
 
   /* If new fonts have been loaded that make a glyph matrix adjustment
      necessary, do it.  */