(x_check_font) [GLYPH_DEBUG]: Add prototype.

2 files changed, 19 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 18f6431c93e..95446d81b16 100644
--- 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 11e0e900f15..ce60fed07ff 100644
--- 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.  */