From: Gerd Moellmann Date: Thu, 24 Aug 2000 11:06:09 +0000 (+0000) Subject: (FRAME_FLAGS_AREA_COLS, FRAME_FLAGS_AREA_WIDTH) X-Git-Tag: emacs-pretest-21.0.90~1997 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=aa5b8e155dffe1c956de8870c60fe7e1411026f2;p=emacs.git (FRAME_FLAGS_AREA_COLS, FRAME_FLAGS_AREA_WIDTH) (FRAME_LEFT_FLAGS_AREA_WIDTH): Return 0 unless frame is a graphical frame. --- 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 + + * 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 * 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 */