From: Paul Eggert Date: Tue, 15 Mar 2011 01:32:33 +0000 (-0700) Subject: * lisp.h (verify_bytepos, count_markers): New decls, X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~554^2~89 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b45db52287c1a23b2c639f4843395e4b5a4dbe92;p=emacs.git * lisp.h (verify_bytepos, count_markers): New decls, so that gcc does not warn that these functions aren't declared. --- diff --git a/src/ChangeLog b/src/ChangeLog index 8bdf6881795..c438f1fb41a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,8 @@ 2011-03-15 Paul Eggert + * lisp.h (verify_bytepos, count_markers): New decls, + so that gcc does not warn that these functions aren't declared. + * insdel.c (check_markers, make_gap_larger, make_gap_smaller): (reset_var_on_error, Fcombine_after_change_execute_1): Now static. (CHECK_MARKERS): Redo to avoid gcc -Wempty-body diagnostic. diff --git a/src/lisp.h b/src/lisp.h index eacd68e42cb..3ba18186497 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -2995,12 +2995,14 @@ extern EMACS_INT marker_byte_position (Lisp_Object); extern void clear_charpos_cache (struct buffer *); extern EMACS_INT charpos_to_bytepos (EMACS_INT); extern EMACS_INT buf_charpos_to_bytepos (struct buffer *, EMACS_INT); +extern EMACS_INT verify_bytepos (EMACS_INT charpos); extern EMACS_INT buf_bytepos_to_charpos (struct buffer *, EMACS_INT); extern void unchain_marker (struct Lisp_Marker *marker); extern Lisp_Object set_marker_restricted (Lisp_Object, Lisp_Object, Lisp_Object); extern Lisp_Object set_marker_both (Lisp_Object, Lisp_Object, EMACS_INT, EMACS_INT); extern Lisp_Object set_marker_restricted_both (Lisp_Object, Lisp_Object, EMACS_INT, EMACS_INT); +extern int count_markers (struct buffer *); extern void syms_of_marker (void); /* Defined in fileio.c */