From e08813d023325dc02574ab9437441551f67d1487 Mon Sep 17 00:00:00 2001 From: Dmitry Antipov Date: Mon, 23 Sep 2013 17:25:19 +0400 Subject: [PATCH] * xdisp.c (noninteractive_need_newline, message_log_need_newline) (overlay_arrow_seen, message_enable_multibyte, line_number_displayed) (display_last_displayed_message_p, message_buf_print) (message_cleared_p, help_echo_showing_p, hourglass_shown_p): Use bool for boolean. * dispextern.h (help_echo_showing_p, hourglass_shown_p): * lisp.h (noninteractive_need_newline): Adjust declaration. --- src/ChangeLog | 10 ++++++++++ src/dispextern.h | 4 ++-- src/lisp.h | 2 +- src/xdisp.c | 20 ++++++++++---------- 4 files changed, 23 insertions(+), 13 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index c5e267437e4..38f4b21d30b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,13 @@ +2013-09-23 Dmitry Antipov + + * xdisp.c (noninteractive_need_newline, message_log_need_newline) + (overlay_arrow_seen, message_enable_multibyte, line_number_displayed) + (display_last_displayed_message_p, message_buf_print) + (message_cleared_p, help_echo_showing_p, hourglass_shown_p): + Use bool for boolean. + * dispextern.h (help_echo_showing_p, hourglass_shown_p): + * lisp.h (noninteractive_need_newline): Adjust declaration. + 2013-09-23 Dmitry Antipov * dispnew.c (frame_garbaged, selected_frame, last_nonminibuf_frame): diff --git a/src/dispextern.h b/src/dispextern.h index 45c1bedb64c..30db19b2d03 100644 --- a/src/dispextern.h +++ b/src/dispextern.h @@ -3187,7 +3187,7 @@ int in_display_vector_p (struct it *); int frame_mode_line_height (struct frame *); extern Lisp_Object Qtool_bar; extern bool redisplaying_p; -extern int help_echo_showing_p; +extern bool help_echo_showing_p; extern Lisp_Object help_echo_string, help_echo_window; extern Lisp_Object help_echo_object, previous_help_echo_string; extern ptrdiff_t help_echo_pos; @@ -3389,7 +3389,7 @@ extern frame_parm_handler x_frame_parm_handlers[]; extern void start_hourglass (void); extern void cancel_hourglass (void); -extern int hourglass_shown_p; +extern bool hourglass_shown_p; /* If non-null, an asynchronous timer that, when it expires, displays an hourglass cursor on all frames. */ extern struct atimer *hourglass_atimer; diff --git a/src/lisp.h b/src/lisp.h index 864a169da50..a9a2c259b5b 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -3378,7 +3378,7 @@ extern Lisp_Object Qglyphless_char; extern Lisp_Object QCdata, QCfile; extern Lisp_Object QCmap; extern Lisp_Object Qrisky_local_variable; -extern int noninteractive_need_newline; +extern bool noninteractive_need_newline; extern Lisp_Object echo_area_buffer[2]; extern void add_to_log (const char *, Lisp_Object, Lisp_Object); extern void check_message_stack (void); diff --git a/src/xdisp.c b/src/xdisp.c index a3173c8fc06..e1143bec1c0 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -415,11 +415,11 @@ Lisp_Object Qboth, Qboth_horiz, Qtext_image_horiz; /* Non-zero means print newline to stdout before next mini-buffer message. */ -int noninteractive_need_newline; +bool noninteractive_need_newline; /* Non-zero means print newline to message log before next message. */ -static int message_log_need_newline; +static bool message_log_need_newline; /* Three markers that message_dolog uses. It could allocate them itself, but that causes trouble @@ -478,7 +478,7 @@ Lisp_Object Qmenu_bar_update_hook; /* Nonzero if an overlay arrow has been displayed in this window. */ -static int overlay_arrow_seen; +static bool overlay_arrow_seen; /* Vector containing glyphs for an ellipsis `...'. */ @@ -500,7 +500,7 @@ static Lisp_Object Vmessage_stack; /* Nonzero means multibyte characters were enabled when the echo area message was specified. */ -static int message_enable_multibyte; +static bool message_enable_multibyte; /* Nonzero if we should redraw the mode lines on the next redisplay. */ @@ -514,7 +514,7 @@ int windows_or_buffers_changed; /* Nonzero after display_mode_line if %l was used and it displayed a line number. */ -static int line_number_displayed; +static bool line_number_displayed; /* The name of the *Messages* buffer, a string. */ @@ -536,12 +536,12 @@ static Lisp_Object Vwith_echo_area_save_vector; /* Non-zero means display_echo_area should display the last echo area message again. Set by redisplay_preserve_echo_area. */ -static int display_last_displayed_message_p; +static bool display_last_displayed_message_p; /* Nonzero if echo area is being used by print; zero if being used by message. */ -static int message_buf_print; +static bool message_buf_print; /* The symbol `inhibit-menubar-update' and its DEFVAR_BOOL variable. */ @@ -551,7 +551,7 @@ static Lisp_Object Qmessage_truncate_lines; /* Set to 1 in clear_message to make redisplay_internal aware of an emptied echo area. */ -static int message_cleared_p; +static bool message_cleared_p; /* A scratch glyph row with contents used for generating truncation glyphs. Also used in direct_output_for_insert. */ @@ -566,7 +566,7 @@ static int last_height; /* Non-zero if there's a help-echo in the echo area. */ -int help_echo_showing_p; +bool help_echo_showing_p; /* The maximum distance to look ahead for text properties. Values that are too small let us call compute_char_face and similar @@ -742,7 +742,7 @@ Lisp_Object previous_help_echo_string; #ifdef HAVE_WINDOW_SYSTEM /* Non-zero means an hourglass cursor is currently shown. */ -int hourglass_shown_p; +bool hourglass_shown_p; /* If non-null, an asynchronous timer that, when it expires, displays an hourglass cursor on all frames. */ -- 2.39.2