Mercurial > emacs

changeset 33460:c80efdb9cea9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(CURRENT_MODE_LINE_HEIGHT) (CURRENT_HEADER_LINE_HEIGHT): Look at current_mode_line_height and current_header_line_height first. (current_mode_line_height, current_header_line_height): Declare extern.
author Gerd Moellmann <gerd@gnu.org>
date Tue, 14 Nov 2000 05:41:13 +0000
parents 5554a905806a
children ca213c01c256
files src/dispextern.h
diffstat 1 files changed, 23 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/src/dispextern.h	Tue Nov 14 04:41:56 2000 +0000
+++ b/src/dispextern.h	Tue Nov 14 05:41:13 2000 +0000
@@ -916,22 +916,30 @@
       : 0)
 
 /* Return the current height of the mode line of window W.  If not
-   known from W's current glyph matrix, return a default based on the
-   height of the font of the face `modeline'.  */
-
-#define CURRENT_MODE_LINE_HEIGHT(W)			\
-     (MATRIX_MODE_LINE_HEIGHT ((W)->current_matrix)	\
-      ? MATRIX_MODE_LINE_HEIGHT ((W)->current_matrix)	\
-      : estimate_mode_line_height (XFRAME ((W)->frame), MODE_LINE_FACE_ID))
+   known from current_mode_line_height, look at W's current glyph
+   matrix, or return a default based on the height of the font of the
+   face `mode-line'.  */
+
+#define CURRENT_MODE_LINE_HEIGHT(W)				\
+     (current_mode_line_height >= 0				\
+      ? current_mode_line_height				\
+      : (MATRIX_MODE_LINE_HEIGHT ((W)->current_matrix)		\
+	 ? MATRIX_MODE_LINE_HEIGHT ((W)->current_matrix)	\
+	 : estimate_mode_line_height (XFRAME ((W)->frame),	\
+				      MODE_LINE_FACE_ID)))
 
 /* Return the current height of the top line of window W.  If not
-   known from W's current glyph matrix, return an estimation based on
-   the height of the font of the face `top-line'.  */
-
-#define CURRENT_HEADER_LINE_HEIGHT(W)					   \
-      (MATRIX_HEADER_LINE_HEIGHT ((W)->current_matrix)			   \
-      ? MATRIX_HEADER_LINE_HEIGHT ((W)->current_matrix)			   \
-      : estimate_mode_line_height (XFRAME ((W)->frame), HEADER_LINE_FACE_ID))
+   known from current_header_line_height, look at W's current glyph
+   matrix, or return an estimation based on the height of the font of
+   the face `header-line'.  */
+
+#define CURRENT_HEADER_LINE_HEIGHT(W)				\
+      (current_header_line_height >= 0				\
+       ? current_header_line_height				\
+       : (MATRIX_HEADER_LINE_HEIGHT ((W)->current_matrix)	\
+	  ? MATRIX_HEADER_LINE_HEIGHT ((W)->current_matrix)	\
+	  : estimate_mode_line_height (XFRAME ((W)->frame),	\
+				       HEADER_LINE_FACE_ID)))
 
 /* Return the height of the desired mode line of window W.  */
 
@@ -2154,6 +2162,7 @@
 extern Lisp_Object Vimage_types;
 extern void add_to_log P_ ((char *, Lisp_Object, Lisp_Object));
 extern int help_echo_showing_p;
+extern int current_mode_line_height, current_header_line_height;
 
 /* Defined in sysdep.c */