Merged from emacs@sv.gnu.org

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-41
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-42
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-43
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-44
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-45
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-46
   Merge from erc--emacs--0

 * emacs@sv.gnu.org/emacs--devo--0--patch-47
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-48
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-14
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-15
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-16
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-17
   Merge from emacs--devo--0

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-507

5 files changed, 59 insertions, 4 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 056bb851f4a..166222ae33c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,24 @@
+2006-02-05  Ken Raeburn  <raeburn@raeburn.org>
+
+        * editfns.c (Fconstrain_to_field): Fix int/Lisp_Object mixup.
+
+        * lisp.h (XPNTR) [!NO_UNION_TYPE && !HAVE_SHM && !DATA_SEG_BITS]:
+        Cast bitfield value to EMACS_INT, to suppress gcc warning.
+
+        * xrdb.c (malloc, realloc, free) [emacs]: Undefine macros before
+        defining.
+
+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
diff --git a/src/editfns.c b/src/editfns.c
index 9be9232a9c7..5bf4eb738ae 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -719,7 +719,8 @@ Field boundaries are not noticed if `inhibit-field-text-motion' is non-nil.  */)
 {
   /* If non-zero, then the original point, before re-positioning.  */
   int orig_point = 0;
-  int fwd, prev_old, prev_new;
+  int fwd;
+  Lisp_Object prev_old, prev_new;
   
   if (NILP (new_pos))
     /* Use the current point, and afterwards, set it.  */
diff --git a/src/lisp.h b/src/lisp.h
index f04d29808d1..66dcdeb00da 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -484,7 +484,11 @@ extern size_t pure_size;
    in a Lisp object whose data type says it points to something.  */
 #define XPNTR(a) (XUINT (a) | DATA_SEG_BITS)
 #else
-#define XPNTR(a) XUINT (a)
+/* Some versions of gcc seem to consider the bitfield width when
+   issuing the "cast to pointer from integer of different size"
+   warning, so the cast is here to widen the value back to its natural
+   size.  */
+#define XPNTR(a) ((EMACS_INT) XUINT (a))
 #endif
 #endif /* not HAVE_SHM */
 #endif /* no XPNTR */
diff --git a/src/xdisp.c b/src/xdisp.c
index 70dc9bd4515..9efa1c60cbc 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -5319,6 +5319,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;
@@ -5435,11 +5439,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);
@@ -5486,11 +5498,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
@@ -5684,6 +5704,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))
@@ -5706,8 +5728,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;
 
@@ -10552,6 +10575,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.  */
diff --git a/src/xrdb.c b/src/xrdb.c
index 822fb6e2624..0a138687d7b 100644
--- a/src/xrdb.c
+++ b/src/xrdb.c
@@ -88,6 +88,10 @@ extern char *get_system_name ();
 /* Make sure not to #include anything after these definitions.  Let's
    not step on anyone's prototypes.  */
 #ifdef emacs
+/* darwin.h may have already defined these.  */
+#undef malloc
+#undef realloc
+#undef free
 #define malloc xmalloc
 #define realloc xrealloc
 #define free xfree