Commit 2311178e authored by Thien-Thi Nguyen's avatar Thien-Thi Nguyen
Browse files

(redisplay_internal, redisplay_window, decode_mode_spec): Cast

`current_column' return value to int.
(back_to_previous_visible_line_start, reseat_at_next_visible_line_start,
next_element_from_buffer): Cast `indented_beyond_p' 3rd arg to float.
parent 9ab4a725
......@@ -3918,7 +3918,7 @@ back_to_previous_visible_line_start (it)
are invisible. */
if (it->selective > 0
&& indented_beyond_p (IT_CHARPOS (*it), IT_BYTEPOS (*it),
it->selective))
(float) it->selective)) /* iftc */
visible_p = 0;
else
{
......@@ -3978,7 +3978,7 @@ reseat_at_next_visible_line_start (it, on_newline_p)
if (it->selective > 0)
while (IT_CHARPOS (*it) < ZV
&& indented_beyond_p (IT_CHARPOS (*it), IT_BYTEPOS (*it),
it->selective))
(float) it->selective)) /* iftc */
{
xassert (FETCH_BYTE (IT_BYTEPOS (*it) - 1) == '\n');
newline_found_p = forward_to_next_line_start (it, &skipped_p);
......@@ -4871,7 +4871,7 @@ next_element_from_buffer (it)
&& IT_CHARPOS (*it) + 1 < ZV
&& indented_beyond_p (IT_CHARPOS (*it) + 1,
IT_BYTEPOS (*it) + 1,
it->selective))
(float) it->selective)) /* iftc */
{
success_p = next_element_from_ellipsis (it);
it->dpvec_char_len = -1;
......@@ -8586,7 +8586,8 @@ redisplay_internal (preserve_echo_area)
&& !(PT == XFASTINT (w->last_point)
&& XFASTINT (w->last_modified) >= MODIFF
&& XFASTINT (w->last_overlay_modified) >= OVERLAY_MODIFF)
&& XFASTINT (w->column_number_displayed) != current_column ())
&& (XFASTINT (w->column_number_displayed)
!= (int) current_column ())) /* iftc */
w->update_mode_line = Qt;
FRAME_SCROLL_BOTTOM_VPOS (XFRAME (w->frame)) = -1;
......@@ -10170,7 +10171,8 @@ redisplay_window (window, just_this_one_p)
&& !(PT == XFASTINT (w->last_point)
&& XFASTINT (w->last_modified) >= MODIFF
&& XFASTINT (w->last_overlay_modified) >= OVERLAY_MODIFF)
&& XFASTINT (w->column_number_displayed) != current_column ())
&& (XFASTINT (w->column_number_displayed)
!= (int) current_column ())) /* iftc */
update_mode_line = 1;
/* Count number of windows showing the selected buffer. An indirect
......@@ -10599,7 +10601,8 @@ redisplay_window (window, just_this_one_p)
|| INTEGERP (w->base_line_pos)
/* Column number is displayed and different from the one displayed. */
|| (!NILP (w->column_number_displayed)
&& XFASTINT (w->column_number_displayed) != current_column ()))
&& (XFASTINT (w->column_number_displayed)
!= (int) current_column ()))) /* iftc */
/* This means that the window has a mode line. */
&& (WINDOW_WANTS_MODELINE_P (w)
|| WINDOW_WANTS_HEADER_LINE_P (w)))
......@@ -14227,7 +14230,7 @@ decode_mode_spec (w, c, field_width, precision, multibyte)
case 'c':
{
int col = current_column ();
int col = (int) current_column (); /* iftc */
w->column_number_displayed = make_number (col);
pint2str (decode_mode_spec_buf, field_width, col);
return decode_mode_spec_buf;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment