diff options
| author | Morten Welinder <terra@diku.dk> | 1994-10-17 08:42:36 +0000 |
|---|---|---|
| committer | Morten Welinder <terra@diku.dk> | 1994-10-17 08:42:36 +0000 |
| commit | 87485d6fc91710d31c0ed046744f5f7a95f11115 (patch) | |
| tree | 267385687729bec531f289670a15063c4d6bae52 /src/lisp.h | |
| parent | ef88bd2dc02b0b4e709a216a02760f43f18e00d6 (diff) | |
| download | emacs-87485d6fc91710d31c0ed046744f5f7a95f11115.tar.gz | |
*** empty log message ***
Diffstat (limited to 'src/lisp.h')
| -rw-r--r-- | src/lisp.h | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/lisp.h b/src/lisp.h index a4d1ddfee6c..e5b0c367ee2 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -697,7 +697,7 @@ typedef unsigned char UCHAR; pretty quickly. */ #define GLYPH unsigned int -#ifdef HAVE_X_WINDOWS +#ifdef HAVE_FACES /* The FAST macros assume that we already know we're in an X window. */ /* Given a character code and a face ID, return the appropriate glyph. */ @@ -714,11 +714,11 @@ typedef unsigned char UCHAR; : FAST_MAKE_GLYPH (char, face)) #define GLYPH_CHAR(f, g) (FRAME_TERMCAP_P (f) ? (g) : FAST_GLYPH_CHAR (g)) #define GLYPH_FACE(f, g) (FRAME_TERMCAP_P (f) ? (0) : FAST_GLYPH_FACE (g)) -#else +#else /* not HAVE_FACES */ #define MAKE_GLYPH(f, char, face) (char) #define GLYPH_CHAR(f, g) (g) #define GLYPH_FACE(f, g) (g) -#endif +#endif /* not HAVE_FACES */ /* The ID of the mode line highlighting face. */ #define GLYPH_MODE_LINE_FACE 1 @@ -744,7 +744,15 @@ typedef unsigned char UCHAR; #define BUFFERP(x) (XTYPE ((x)) == Lisp_Buffer) #define SUBRP(x) (XTYPE ((x)) == Lisp_Subr) #define PROCESSP(x) (XTYPE ((x)) == Lisp_Process) +#ifdef MULTI_FRAME #define FRAMEP(x) (XTYPE ((x)) == Lisp_Frame) +#else +#ifdef MSDOS +/* We could use this in the !MSDOS case also, but we prefer a compile-time + error message in case FRAMEP is used. */ +#define FRAMEP(x) (EQ (x, Fselected_frame ())) +#endif +#endif #define WINDOWP(x) (XTYPE ((x)) == Lisp_Window) #define WINDOW_CONFIGURATIONP(x) (XTYPE ((x)) == Lisp_Window_Configuration) #ifdef LISP_FLOAT_TYPE |