mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-06 11:50:51 -08:00
Code Issues Projects Releases Wiki Activity

(forward_to_next_line_start): Switch iterator's handling

Browse source 
of selective display off while searching for the next line start.
This commit is contained in:
Gerd Moellmann 2000-10-17 14:08:06 +00:00
parent 1592c1efdf
commit 54918e2b47
2 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -1,3 +1,8 @@
2000-10-17 Gerd Moellmann <gerd@gnu.org>
* xdisp.c (forward_to_next_line_start): Switch iterator's handling
of selective display off while searching for the next line start.
2000-10-17 Kenichi Handa <handa@etl.go.jp>
* Makefile.in (term.o): Depend on dispextern.h.

14
src/xdisp.c
View file

@ -3267,9 +3267,15 @@ forward_to_next_line_start (it, skipped_p)
struct it *it;
int *skipped_p;
{
int newline_found_p, n;
int old_selective, newline_found_p, n;
const int MAX_NEWLINE_DISTANCE = 500;
/* Don't handle selective display in the following. It's (a)
unnecessary and (b) leads to an infinite recursion because
next_element_from_ellipsis indirectly calls this function. */
old_selective = it->selective;
it->selective = 0;
/* Scan for a newline within MAX_NEWLINE_DISTANCE display elements
from buffer text. */
n = newline_found_p = 0;
@ -3318,6 +3324,7 @@ forward_to_next_line_start (it, skipped_p)
}
}
it->selective = old_selective;
return newline_found_p;
}
@ -4147,7 +4154,10 @@ next_element_from_ellipsis (it)
}
}
else
reseat_at_next_visible_line_start (it, 1);
{
it->method = next_element_from_buffer;
reseat_at_next_visible_line_start (it, 1);
}
return get_next_display_element (it);
}