aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKen Raeburn2002-01-21 01:51:27 +0000
committerKen Raeburn2002-01-21 01:51:27 +0000
commitd7b8ee68fd42eb76c1406626dbd2257f56dbca1c (patch)
treea72f48c3824c57b956f7661ff03fbab10abf3576
parentc3c14723fa96fd582cfea0c98fb936f56ab6032b (diff)
downloademacs-d7b8ee68fd42eb76c1406626dbd2257f56dbca1c.tar.gz
emacs-d7b8ee68fd42eb76c1406626dbd2257f56dbca1c.zip
dispextern.h (WINDOW_WANTS_MODELINE_P): Use XFASTINT on window height before
comparison. (WINDOW_WANTS_HEADER_LINE_P): Likewise.
-rw-r--r--src/ChangeLog6
-rw-r--r--src/dispextern.h4
2 files changed, 8 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 9fe847c8f76..f75e5003a65 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
12002-01-20 Ken Raeburn <raeburn@gnu.org>
2
3 * dispextern.h (WINDOW_WANTS_MODELINE_P): Use XFASTINT on window
4 height before comparison.
5 (WINDOW_WANTS_HEADER_LINE_P): Likewise.
6
12002-01-20 Jason Rumney <jasonr@gnu.org> 72002-01-20 Jason Rumney <jasonr@gnu.org>
2 8
3 * w32term.c (w32_system_caret_width): Remove. 9 * w32term.c (w32_system_caret_width): Remove.
diff --git a/src/dispextern.h b/src/dispextern.h
index 74726f02559..83f539c2804 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -1117,7 +1117,7 @@ extern struct glyph_row scratch_glyph_row;
1117 && FRAME_WANTS_MODELINE_P (XFRAME (WINDOW_FRAME ((W)))) \ 1117 && FRAME_WANTS_MODELINE_P (XFRAME (WINDOW_FRAME ((W)))) \
1118 && BUFFERP ((W)->buffer) \ 1118 && BUFFERP ((W)->buffer) \
1119 && !NILP (XBUFFER ((W)->buffer)->mode_line_format) \ 1119 && !NILP (XBUFFER ((W)->buffer)->mode_line_format) \
1120 && (W)->height > 1) 1120 && XFASTINT ((W)->height) > 1)
1121 1121
1122/* Value is non-zero if window W wants a header line. */ 1122/* Value is non-zero if window W wants a header line. */
1123 1123
@@ -1127,7 +1127,7 @@ extern struct glyph_row scratch_glyph_row;
1127 && FRAME_WANTS_MODELINE_P (XFRAME (WINDOW_FRAME ((W)))) \ 1127 && FRAME_WANTS_MODELINE_P (XFRAME (WINDOW_FRAME ((W)))) \
1128 && BUFFERP ((W)->buffer) \ 1128 && BUFFERP ((W)->buffer) \
1129 && !NILP (XBUFFER ((W)->buffer)->header_line_format) \ 1129 && !NILP (XBUFFER ((W)->buffer)->header_line_format) \
1130 && (W)->height > 1 + !NILP (XBUFFER ((W)->buffer)->mode_line_format)) 1130 && XFASTINT ((W)->height) > 1 + !NILP (XBUFFER ((W)->buffer)->mode_line_format))
1131 1131
1132 1132
1133/*********************************************************************** 1133/***********************************************************************