From: Dmitry Antipov Date: Tue, 5 Mar 2013 23:08:11 +0000 (+0400) Subject: * lisp.h (find_next_newline_no_quit): Rename to find_next_newline. X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~2026^2~617 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ffc65beee98a7408c1420c9c55dcb7b31a6114c8;p=emacs.git * lisp.h (find_next_newline_no_quit): Rename to find_next_newline. * xdisp.c (back_to_previous_line_start, forward_to_next_line_start) (get_visually_first_element, move_it_vertically_backward): Ajust users. * bidi.c (bidi_find_paragraph_start): Likewise. * indent.c (vmotion): Likewise. --- diff --git a/src/ChangeLog b/src/ChangeLog index af03fa54291..84ba55e3bdf 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,11 @@ +2013-03-06 Dmitry Antipov + + * lisp.h (find_next_newline_no_quit): Rename to find_next_newline. + * xdisp.c (back_to_previous_line_start, forward_to_next_line_start) + (get_visually_first_element, move_it_vertically_backward): Ajust users. + * bidi.c (bidi_find_paragraph_start): Likewise. + * indent.c (vmotion): Likewise. + 2013-03-05 Paul Eggert FILE's lock is now always .#FILE and may be a regular file (Bug#13807). diff --git a/src/bidi.c b/src/bidi.c index 57d154bc544..feb422cc5d2 100644 --- a/src/bidi.c +++ b/src/bidi.c @@ -1108,7 +1108,7 @@ bidi_find_paragraph_start (ptrdiff_t pos, ptrdiff_t pos_byte) display string? And what if a display string covering some of the text over which we scan back includes paragraph_start_re? */ - pos = find_next_newline_no_quit (pos - 1, -1, &pos_byte); + pos = find_next_newline (pos - 1, -1, &pos_byte); if (n >= MAX_PARAGRAPH_SEARCH) pos_byte = BEGV_BYTE; return pos_byte; diff --git a/src/indent.c b/src/indent.c index 9bf75bc6d95..469d774f681 100644 --- a/src/indent.c +++ b/src/indent.c @@ -1843,7 +1843,7 @@ vmotion (register ptrdiff_t from, register EMACS_INT vtarget, struct window *w) ptrdiff_t bytepos; Lisp_Object propval; - prevline = find_next_newline_no_quit (from - 1, -1, &bytepos); + prevline = find_next_newline (from - 1, -1, &bytepos); while (prevline > BEGV && ((selective > 0 && indented_beyond_p (prevline, bytepos, selective)) @@ -1853,7 +1853,7 @@ vmotion (register ptrdiff_t from, register EMACS_INT vtarget, struct window *w) Qinvisible, text_prop_object), TEXT_PROP_MEANS_INVISIBLE (propval)))) - prevline = find_next_newline_no_quit (prevline - 1, -1, &bytepos); + prevline = find_next_newline (prevline - 1, -1, &bytepos); pos = *compute_motion (prevline, 0, lmargin, 0, @@ -1894,7 +1894,7 @@ vmotion (register ptrdiff_t from, register EMACS_INT vtarget, struct window *w) ptrdiff_t bytepos; Lisp_Object propval; - prevline = find_next_newline_no_quit (from, -1, &bytepos); + prevline = find_next_newline (from, -1, &bytepos); while (prevline > BEGV && ((selective > 0 && indented_beyond_p (prevline, bytepos, selective)) @@ -1904,7 +1904,7 @@ vmotion (register ptrdiff_t from, register EMACS_INT vtarget, struct window *w) Qinvisible, text_prop_object), TEXT_PROP_MEANS_INVISIBLE (propval)))) - prevline = find_next_newline_no_quit (prevline - 1, -1, &bytepos); + prevline = find_next_newline (prevline - 1, -1, &bytepos); pos = *compute_motion (prevline, 0, lmargin, 0, diff --git a/src/lisp.h b/src/lisp.h index 01574a5fe03..7d443e57d66 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -3346,8 +3346,7 @@ extern ptrdiff_t find_newline (ptrdiff_t, ptrdiff_t, ptrdiff_t, ptrdiff_t *, ptrdiff_t *, bool); extern EMACS_INT scan_newline (ptrdiff_t, ptrdiff_t, ptrdiff_t, ptrdiff_t, EMACS_INT, bool); -extern ptrdiff_t find_next_newline (ptrdiff_t, int); -extern ptrdiff_t find_next_newline_no_quit (ptrdiff_t, ptrdiff_t, ptrdiff_t *); +extern ptrdiff_t find_next_newline (ptrdiff_t, ptrdiff_t, ptrdiff_t *); extern ptrdiff_t find_before_next_newline (ptrdiff_t, ptrdiff_t, ptrdiff_t, ptrdiff_t *); extern void syms_of_search (void); diff --git a/src/search.c b/src/search.c index 1c0f57487f9..6a79208557b 100644 --- a/src/search.c +++ b/src/search.c @@ -942,7 +942,7 @@ scan_newline (ptrdiff_t start, ptrdiff_t start_byte, } ptrdiff_t -find_next_newline_no_quit (ptrdiff_t from, ptrdiff_t cnt, ptrdiff_t *bytepos) +find_next_newline (ptrdiff_t from, ptrdiff_t cnt, ptrdiff_t *bytepos) { return find_newline (from, 0, cnt, NULL, bytepos, 0); } diff --git a/src/xdisp.c b/src/xdisp.c index f304ad0915c..6dbc7637ee4 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -5906,8 +5906,7 @@ static void back_to_previous_line_start (struct it *it) { IT_CHARPOS (*it) - = find_next_newline_no_quit (IT_CHARPOS (*it) - 1, - -1, &IT_BYTEPOS (*it)); + = find_next_newline (IT_CHARPOS (*it) - 1, -1, &IT_BYTEPOS (*it)); } @@ -5979,7 +5978,7 @@ forward_to_next_line_start (struct it *it, int *skipped_p, if (!newline_found_p) { ptrdiff_t bytepos, start = IT_CHARPOS (*it); - ptrdiff_t limit = find_next_newline_no_quit (start, 1, &bytepos); + ptrdiff_t limit = find_next_newline (start, 1, &bytepos); Lisp_Object pos; eassert (!STRINGP (it->string)); @@ -7434,8 +7433,7 @@ get_visually_first_element (struct it *it) it->bidi_it.charpos = it->bidi_it.bytepos = 0; else it->bidi_it.charpos - = find_next_newline_no_quit (IT_CHARPOS (*it), -1, - &it->bidi_it.bytepos); + = find_next_newline (IT_CHARPOS (*it), -1, &it->bidi_it.bytepos); bidi_paragraph_init (it->paragraph_embedding, &it->bidi_it, 1); do { @@ -9070,7 +9068,7 @@ move_it_vertically_backward (struct it *it, int dy) && FETCH_BYTE (IT_BYTEPOS (*it) - 1) != '\n') { ptrdiff_t nl_pos = - find_next_newline_no_quit (IT_CHARPOS (*it) - 1, -1, NULL); + find_next_newline (IT_CHARPOS (*it) - 1, -1, NULL); move_it_to (it, nl_pos, -1, -1, -1, MOVE_TO_POS); }