diff options
| author | Thien-Thi Nguyen <ttn@gnuvola.org> | 2005-03-22 18:33:31 +0000 |
|---|---|---|
| committer | Thien-Thi Nguyen <ttn@gnuvola.org> | 2005-03-22 18:33:31 +0000 |
| commit | d7c4f067b911c0a564e36d65365e8123eb21886c (patch) | |
| tree | c9a6aa2684d15b3c1e4cea99b31362a554be7f45 | |
| parent | 8fe76485a5e83c2d3609c08e8b0eadccd6d9796d (diff) | |
| download | emacs-d7c4f067b911c0a564e36d65365e8123eb21886c.tar.gz | |
(FRAME_LINE_HEIGHT, FRAME_DEFAULT_FONT_WIDTH): Define if not defined.
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/frame.h | 10 |
2 files changed, 14 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 3492a48c360..f8ed02b07cc 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2005-03-22 Thien-Thi Nguyen <ttn@gnu.org> + + * frame.h (FRAME_LINE_HEIGHT, FRAME_DEFAULT_FONT_WIDTH): + Define if not defined. + 2005-03-04 Thien-Thi Nguyen <ttn@gnu.org> * 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) |