Mercurial > emacs
comparison src/print.c @ 110645:7d7a02c19d8c
Fix int/EMACS_INT use in xdisp.c and print.c.
print.c (print_object): Fix format string and argument types for
printing a Lisp_Misc_Marker.
xdisp.c (pos_visible_p, c_string_pos, number_of_chars)
(load_overlay_strings, get_overlay_strings_1)
(get_overlay_strings, forward_to_next_line_start)
(back_to_previous_visible_line_start, reseat, reseat_to_string)
(get_next_display_element, next_element_from_string)
(next_element_from_c_string, next_element_from_buffer)
(move_it_vertically_backward, move_it_by_lines, add_to_log)
(message_dolog, message_log_check_duplicate, message2_nolog)
(message3, message3_nolog, vmessage, set_message, set_message_1)
(hscroll_window_tree, text_outside_line_unchanged_p)
(set_cursor_from_row, set_vertical_scroll_bar, redisplay_window)
(find_last_unchanged_at_beg_row)
(find_first_unchanged_at_end_row, row_containing_pos)
(trailing_whitespace_p, display_mode_element, decode_mode_spec)
(display_count_lines, x_produce_glyphs, note_mouse_highlight): Use
EMACS_INT for buffer and string positions.
dispextern.h (struct it) <string_nchars>: Declare EMACS_INT.
(row_containing_pos): Adjust prototype.
lisp.h (pos_visible_p, message2, message2_nolog, message3)
(message2_nolog, set_message): Adjust prototypes.
author | Eli Zaretskii <eliz@gnu.org> |
---|---|
date | Wed, 29 Sep 2010 05:06:53 -0400 |
parents | 3b57f0a3b766 |
children | b8fde5ef9e14 |
comparison
equal
deleted
inserted
replaced
110644:22d8ea06b8c7 | 110645:7d7a02c19d8c |
---|---|
2183 strout ("(moves after insertion) ", -1, -1, printcharfun, 0); | 2183 strout ("(moves after insertion) ", -1, -1, printcharfun, 0); |
2184 if (! XMARKER (obj)->buffer) | 2184 if (! XMARKER (obj)->buffer) |
2185 strout ("in no buffer", -1, -1, printcharfun, 0); | 2185 strout ("in no buffer", -1, -1, printcharfun, 0); |
2186 else | 2186 else |
2187 { | 2187 { |
2188 sprintf (buf, "at %d", marker_position (obj)); | 2188 sprintf (buf, "at %ld", (long)marker_position (obj)); |
2189 strout (buf, -1, -1, printcharfun, 0); | 2189 strout (buf, -1, -1, printcharfun, 0); |
2190 strout (" in ", -1, -1, printcharfun, 0); | 2190 strout (" in ", -1, -1, printcharfun, 0); |
2191 print_string (XMARKER (obj)->buffer->name, printcharfun); | 2191 print_string (XMARKER (obj)->buffer->name, printcharfun); |
2192 } | 2192 } |
2193 PRINTCHAR ('>'); | 2193 PRINTCHAR ('>'); |
2197 strout ("#<overlay ", -1, -1, printcharfun, 0); | 2197 strout ("#<overlay ", -1, -1, printcharfun, 0); |
2198 if (! XMARKER (OVERLAY_START (obj))->buffer) | 2198 if (! XMARKER (OVERLAY_START (obj))->buffer) |
2199 strout ("in no buffer", -1, -1, printcharfun, 0); | 2199 strout ("in no buffer", -1, -1, printcharfun, 0); |
2200 else | 2200 else |
2201 { | 2201 { |
2202 sprintf (buf, "from %d to %d in ", | 2202 sprintf (buf, "from %ld to %ld in ", |
2203 marker_position (OVERLAY_START (obj)), | 2203 (long)marker_position (OVERLAY_START (obj)), |
2204 marker_position (OVERLAY_END (obj))); | 2204 (long)marker_position (OVERLAY_END (obj))); |
2205 strout (buf, -1, -1, printcharfun, 0); | 2205 strout (buf, -1, -1, printcharfun, 0); |
2206 print_string (XMARKER (OVERLAY_START (obj))->buffer->name, | 2206 print_string (XMARKER (OVERLAY_START (obj))->buffer->name, |
2207 printcharfun); | 2207 printcharfun); |
2208 } | 2208 } |
2209 PRINTCHAR ('>'); | 2209 PRINTCHAR ('>'); |