(FRAME_FLAGS_AREA_COLS, FRAME_FLAGS_AREA_WIDTH)

(FRAME_LEFT_FLAGS_AREA_WIDTH): Return 0 unless frame is
a graphical frame.

2 files changed, 16 insertions, 5 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 483054ebb8f..ea28e7145f9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2000-08-24  Gerd Moellmann  <gerd@gnu.org>
+
+        * frame.h (FRAME_FLAGS_AREA_COLS, FRAME_FLAGS_AREA_WIDTH) 
+        (FRAME_LEFT_FLAGS_AREA_WIDTH): Return 0 unless frame is 
+        a graphical frame.
+
 2000-08-24  Kenichi Handa  <handa@etl.go.jp>
 
         * minibuf.c (do_completion): Always use compare-string, not
diff --git a/src/frame.h b/src/frame.h
index 729cbf9e577..54f75f666d0 100644
--- a/src/frame.h
+++ b/src/frame.h
@@ -707,16 +707,21 @@ extern Lisp_Object selected_frame;
    marks, overlay arrows.  This is 0 for terminal frames.  */
 
 #ifdef HAVE_WINDOW_SYSTEM
+
 #define FRAME_FLAGS_AREA_COLS(F) \
-     (FRAME_WINDOW_P ((F)) ? FRAME_X_FLAGS_AREA_COLS ((F)) : 0)
-#define FRAME_FLAGS_AREA_WIDTH(F) FRAME_X_FLAGS_AREA_WIDTH (F)
-#define FRAME_LEFT_FLAGS_AREA_WIDTH(F) FRAME_X_LEFT_FLAGS_AREA_WIDTH (F)
+     (FRAME_WINDOW_P (F) ? FRAME_X_FLAGS_AREA_COLS (F) : 0)
+#define FRAME_FLAGS_AREA_WIDTH(F) \
+     (FRAME_WINDOW_P (F) ? FRAME_X_FLAGS_AREA_WIDTH (F) : 0)
+#define FRAME_LEFT_FLAGS_AREA_WIDTH(F) \
+     (FRAME_WINDOW_P (F) ? FRAME_X_LEFT_FLAGS_AREA_WIDTH (F) : 0)
      
-#else
+#else /* not HAVE_WINDOW_SYSTEM */
+
 #define FRAME_FLAGS_AREA_WIDTH(F)       0
 #define FRAME_FLAGS_AREA_COLS(F)        0
 #define FRAME_LEFT_FLAGS_AREA_WIDTH(F)  0
-#endif
+
+#endif /* not HAVE_WINDOW_SYSTEM */