From: Thien-Thi Nguyen Date: Tue, 22 Mar 2005 18:38:36 +0000 (+0000) Subject: (FRAME_LINE_HEIGHT, FRAME_DEFAULT_FONT_WIDTH): Define if not defined. X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1f1d29fcb421541a3c582f296e9ef47b3f9888d9;p=emacs.git (FRAME_LINE_HEIGHT, FRAME_DEFAULT_FONT_WIDTH): Define if not defined. --- diff --git a/src/ChangeLog b/src/ChangeLog index f943ac66fb3..e417bf514ad 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2005-03-22 Thien-Thi Nguyen + + * frame.h (FRAME_LINE_HEIGHT, FRAME_DEFAULT_FONT_WIDTH): + Define if not defined. + 2005-03-04 Thien-Thi Nguyen * s/vms.h: Define NO_HYPHENS_IN_FILENAMES. diff --git a/src/frame.h b/src/frame.h index 633199809e9..b1202cc7d46 100644 --- a/src/frame.h +++ b/src/frame.h @@ -706,7 +706,15 @@ extern Lisp_Object selected_frame; /* Canonical y-unit on frame F. This value currently equals the line height of the frame. Terminal specific header files are expected - to define the macro FRAME_LINE_HEIGHT. */ + to define the macro FRAME_LINE_HEIGHT. Buf if they do not, that's + fine, as well. */ + +#ifndef FRAME_LINE_HEIGHT +#define FRAME_LINE_HEIGHT(x) 0 +#endif +#ifndef FRAME_DEFAULT_FONT_WIDTH +#define FRAME_DEFAULT_FONT_WIDTH(x) 0 +#endif #define CANON_Y_UNIT(F) \ (FRAME_WINDOW_P (F) ? FRAME_LINE_HEIGHT (F) : 1)