Merge from trunk.

1 files changed, 3 insertions, 5 deletions

diff --git a/src/dispextern.h b/src/dispextern.h
index ccb85e7422e..9d5feea6024 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -405,7 +405,7 @@ struct glyph
   {
     /* Metrics of a partial glyph of an image (type == IMAGE_GLYPH).  */
     struct glyph_slice img;
-    /* Start and end indices of glyphs of a graphme cluster of a
+    /* Start and end indices of glyphs of a grapheme cluster of a
        composition (type == COMPOSITE_GLYPH).  */
     struct { int from, to; } cmp;
     /* Pixel offsets for upper and lower part of the acronym.  */
@@ -2649,11 +2649,11 @@ struct redisplay_interface
   void (*flush_display) (struct frame *f);
 
   /* Flush the display of frame F if non-NULL.  This is called
-     during redisplay, and should be NULL on systems which flushes
+     during redisplay, and should be NULL on systems which flush
      automatically before reading input.  */
   void (*flush_display_optional) (struct frame *f);
 
-  /* Clear the mouse hightlight in window W, if there is any.  */
+  /* Clear the mouse highlight in window W, if there is any.  */
   void (*clear_window_mouse_face) (struct window *w);
 
   /* Set *LEFT and *RIGHT to the left and right overhang of GLYPH on
@@ -3127,9 +3127,7 @@ void w32_init_fringe (struct redisplay_interface *);
 void w32_reset_fringes (void);
 #endif
 
-#if XASSERTS
 extern unsigned row_hash (struct glyph_row *);
-#endif
 
 /* Defined in image.c */