fixed breakage after merge from trunk

2 files changed, 4 insertions, 5 deletions

diff --git a/src/xdisp.c b/src/xdisp.c
index 2333eb75229..efae826755f 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -267,7 +267,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "fontset.h"
 #include "blockinput.h"
 
-
 #ifdef HAVE_X_WINDOWS
 #include "xterm.h"
 #endif
@@ -1038,6 +1037,7 @@ static int next_element_from_c_string (struct it *);
 static int next_element_from_buffer (struct it *);
 static int next_element_from_composition (struct it *);
 static int next_element_from_image (struct it *);
+static int next_element_from_xwidget(struct it *);
 static int next_element_from_stretch (struct it *);
 static void load_overlay_strings (struct it *, int);
 static int init_from_display_pos (struct it *, struct window *,
@@ -4374,7 +4374,6 @@ handle_single_display_spec (struct it *it, Lisp_Object spec, Lisp_Object object,
          STRINGP (value));
   
   valid_p = (STRINGP (value)
-             
 #ifdef HAVE_WINDOW_SYSTEM
              || (FRAME_WINDOW_P (it->f) && valid_image_p (value))
 #endif /* not HAVE_WINDOW_SYSTEM */
@@ -11571,7 +11570,6 @@ do { if (polling_stopped_here) start_polling ();	\
 static void
 redisplay_internal (int preserve_echo_area)
 {
-
   struct window *w = XWINDOW (selected_window);
   struct frame *f;
   int pause;
@@ -21276,6 +21274,7 @@ compute_overhangs_and_x (struct glyph_string *s, int x, int backward_p)
               BUILD_STRETCH_GLYPH_STRING (START, END, HEAD, TAIL,       \
                                           HL, X, LAST_X);               \
               break;                                                    \
+                                                                        \
             case IMAGE_GLYPH:                                           \
               BUILD_IMAGE_GLYPH_STRING (START, END, HEAD, TAIL,         \
                                         HL, X, LAST_X);                 \
diff --git a/src/xwidget.h b/src/xwidget.h
index acceb720108..ac405fee12f 100644
--- a/src/xwidget.h
+++ b/src/xwidget.h
@@ -1,4 +1,4 @@
-void x_draw_xwidget_glyph_string P_ ((struct glyph_string *s));
+void x_draw_xwidget_glyph_string (struct glyph_string *s);
 void syms_of_xwidget ();
 
 extern Lisp_Object Qxwidget;
@@ -37,7 +37,7 @@ struct xwidget_type
 
   /* Check that SPEC is a valid image specification for the given
      image type.  Value is non-zero if SPEC is valid.  */
-  int (* valid_p) P_ ((Lisp_Object spec));
+  int (* valid_p) (Lisp_Object spec);
 
   /* Next in list of all supported image types.  */
   struct xwidget_type *next;