(x_check_font) [GLYPH_DEBUG]: Add prototype.

diff --git a/src/ChangeLog b/src/ChangeLog
index 18f6431c93ea58cb4ae0584236153683d99fe1c0..95446d81b16edc425db850d9ac5ff1d9ef5ccfad 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,18 @@
+2000-06-13  Gerd Moellmann  <gerd@gnu.org>
+
+       * xterm.c (x_check_font) [GLYPH_DEBUG]: Add prototype.
+
+2000-06-13  Richard Stallman  <rms@caffeine.ai.mit.edu>
+
+       * frame.c (Fmodify_frame_parameters): Doc fix.
+       
+       * xfns.c (x_set_frame_parameters): Comment fix.
+
+       * frame.c (store_frame_param): Call swap_in_global_binding if the
+       variable's current binding was chosen based on this frame.
+
+       * data.c (swap_in_global_binding): New function.
+
 2000-06-13  Eli Zaretskii  <eliz@is.elta.co.il>
 
        * msdos.c (IT_write_glyphs): Don't use CODING_REQUIRE_ENCODING

diff --git a/src/xterm.c b/src/xterm.c
index 11e0e900f159a04ab7fc5ad4847cc71292bb8077..ce60fed07ff6925c83d8b06ae2f41be9b3e07da4 100644 (file)
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -2493,6 +2493,10 @@ static void x_draw_box_rect P_ ((struct glyph_string *, int, int, int, int,
 static void x_fix_overlapping_area P_ ((struct window *, struct glyph_row *,
                                        enum glyph_row_area));
 
+#if GLYPH_DEBUG
+static void x_check_font P_ ((struct frame *, XFontStruct *));
+#endif
+
 
 /* Append the list of glyph strings with head H and tail T to the list
    with head *HEAD and tail *TAIL.  Set *HEAD and *TAIL to the result.  */