# HG changeset patch
# User Andrew Innes <andrewi@gnu.org>
# Date 966988419 0
# Node ID 37c389d61cee3995ce504196a12a5aedfc142b32
# Parent  f390b90e3495c59590281b78aa236d46710dd570
Include keyboard.h before frame.h.
Separate GLYPH_DEBUG and DEBUG_TRACE_MOVE.

diff -r f390b90e3495 -r 37c389d61cee src/xdisp.c
--- a/src/xdisp.c	Tue Aug 22 23:45:16 2000 +0000
+++ b/src/xdisp.c	Tue Aug 22 23:53:39 2000 +0000
@@ -170,6 +170,7 @@
 #include <config.h>
 #include <stdio.h>
 #include "lisp.h"
+#include "keyboard.h"
 #include "frame.h"
 #include "window.h"
 #include "termchar.h"
@@ -182,7 +183,6 @@
 #include "disptab.h"
 #include "termhooks.h"
 #include "intervals.h"
-#include "keyboard.h"
 #include "coding.h"
 #include "process.h"
 #include "region-cache.h"
@@ -523,22 +523,17 @@
 
 int trace_redisplay_p;
 
-/* Non-zero means trace with TRACE_MOVE to stderr.  */
-
-int trace_move;
+#endif /* GLYPH_DEBUG */
 
 #ifdef DEBUG_TRACE_MOVE
+/* Non-zero means trace with TRACE_MOVE to stderr.  */
+int trace_move;
+
 #define TRACE_MOVE(x)	if (trace_move) fprintf x; else (void) 0
 #else
 #define TRACE_MOVE(x)	(void) 0
 #endif
-
-#else /* not GLYPH_DEBUG */
-
-#define TRACE_MOVE(x)	(void) 0
-
-#endif /* not GLYPH_DEBUG */
-
+ 
 /* Non-zero means automatically scroll windows horizontally to make
    point visible.  */