# HG changeset patch
# User Kim F. Storm <storm@cua.dk>
# Date 1205015996 0
# Node ID b3b2c224528e4d1f5efbc5753e75553e867f1d92
# Parent  4b12e6633ee43cce00cc300055454f61aab7dc1f
(GET_NEXT_DISPLAY_ELEMENT): New macro.
(get_next_display_element, next_element_from_string)
(next_element_from_ellipsis, next_element_from_buffer): Use it.

diff -r 4b12e6633ee4 -r b3b2c224528e src/xdisp.c
--- a/src/xdisp.c	Sat Mar 08 22:39:09 2008 +0000
+++ b/src/xdisp.c	Sat Mar 08 22:39:56 2008 +0000
@@ -5713,6 +5713,7 @@
   next_element_from_stretch
 };
 
+#define GET_NEXT_DISPLAY_ELEMENT(it) (*get_next_element[(it)->method]) (it)
 
 /* Load IT's display element fields with information about the next
    display element from the current position of IT.  Value is zero if
@@ -5733,7 +5734,7 @@
   int success_p;
 
  get_next:
-  success_p = (*get_next_element[it->method]) (it);
+  success_p = GET_NEXT_DISPLAY_ELEMENT (it);
 
   if (it->what == IT_CHARACTER)
     {
@@ -6263,7 +6264,7 @@
 
       /* Since a handler may have changed IT->method, we must
 	 recurse here.  */
-      return get_next_display_element (it);
+      return GET_NEXT_DISPLAY_ELEMENT (it);
     }
 
   if (it->current.overlay_string_index >= 0)
@@ -6401,7 +6402,7 @@
       it->face_before_selective_p = 1;
     }
 
-  return get_next_display_element (it);
+  return GET_NEXT_DISPLAY_ELEMENT (it);
 }
 
 
@@ -6465,7 +6466,7 @@
 	    }
 
 	  if (overlay_strings_follow_p)
-	    success_p = get_next_display_element (it);
+	    success_p = GET_NEXT_DISPLAY_ELEMENT (it);
 	  else
 	    {
 	      it->what = IT_EOB;
@@ -6476,7 +6477,7 @@
       else
 	{
 	  handle_stop (it);
-	  return get_next_display_element (it);
+	  return GET_NEXT_DISPLAY_ELEMENT (it);
 	}
     }
   else