diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2010-09-29 05:06:53 -0400 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2010-09-29 05:06:53 -0400 |
| commit | d585695f3abcb487716a35d66d9322a68f003da1 (patch) | |
| tree | 2e6c7ad90427a9951247559681cc822c522310c3 /src/lisp.h | |
| parent | b9476c045fab8bd69e446335ee350c56768f8196 (diff) | |
| download | emacs-d585695f3abcb487716a35d66d9322a68f003da1.tar.gz emacs-d585695f3abcb487716a35d66d9322a68f003da1.tar.bz2 emacs-d585695f3abcb487716a35d66d9322a68f003da1.zip | |
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.
Diffstat (limited to 'src/lisp.h')
| -rw-r--r-- | src/lisp.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lisp.h b/src/lisp.h index d4ff47630d7..a630eeec1f3 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -2657,16 +2657,16 @@ extern Lisp_Object restore_message_unwind (Lisp_Object); extern void pop_message (void); extern void restore_message (void); extern Lisp_Object current_message (void); -extern void set_message (const char *s, Lisp_Object, int, int); +extern void set_message (const char *s, Lisp_Object, EMACS_INT, int); extern void clear_message (int, int); extern void message (const char *, ...); extern void message_nolog (const char *, ...); extern void message1 (const char *); extern void message1_nolog (const char *); -extern void message2 (const char *, int, int); -extern void message2_nolog (const char *, int, int); -extern void message3 (Lisp_Object, int, int); -extern void message3_nolog (Lisp_Object, int, int); +extern void message2 (const char *, EMACS_INT, int); +extern void message2_nolog (const char *, EMACS_INT, int); +extern void message3 (Lisp_Object, EMACS_INT, int); +extern void message3_nolog (Lisp_Object, EMACS_INT, int); extern void message_dolog (const char *, EMACS_INT, int, int); extern void message_with_string (const char *, Lisp_Object, int); extern void message_log_maybe_newline (void); @@ -2682,7 +2682,7 @@ void set_frame_cursor_types (struct frame *, Lisp_Object); extern void syms_of_xdisp (void); extern void init_xdisp (void); extern Lisp_Object safe_eval (Lisp_Object); -extern int pos_visible_p (struct window *, int, int *, +extern int pos_visible_p (struct window *, EMACS_INT, int *, int *, int *, int *, int *, int *); /* Defined in xsettings.c */ |