diff options
| author | Karoly Lorentey <lorentey@elte.hu> | 2005-04-25 11:49:38 +0000 |
|---|---|---|
| committer | Karoly Lorentey <lorentey@elte.hu> | 2005-04-25 11:49:38 +0000 |
| commit | 351c9889873cb0e8c4e43bc51f9a5b36b81ac9a6 (patch) | |
| tree | b487571bcab596eefd9c6049e9d9354e8ec0ac67 /src/indent.c | |
| parent | 5ad1bc4dead80db3e81a6855714bc0b5817f5fc0 (diff) | |
| parent | 61b397cdc2019424c47f1fc5571fc127e2ed747d (diff) | |
| download | emacs-351c9889873cb0e8c4e43bc51f9a5b36b81ac9a6.tar.gz | |
Merged from miles@gnu.org--gnu-2005 (patch 67, 270-278)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-270
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-271
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-272
src/xdisp.c (dump_glyph_row): Don't display overlay_arrow_p field.
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-273
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-274
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-275
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-276
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-277
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-278
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-67
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-332
Diffstat (limited to 'src/indent.c')
| -rw-r--r-- | src/indent.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/indent.c b/src/indent.c index 39602c60d16..d6709d56ee8 100644 --- a/src/indent.c +++ b/src/indent.c @@ -67,6 +67,8 @@ static double position_indentation P_ ((int)); int current_column_bol_cache; +extern Lisp_Object Qfontification_functions; + /* Get the display table to use for the current buffer. */ struct Lisp_Char_Table * @@ -2049,6 +2051,7 @@ whether or not it is currently displayed in some window. */) struct window *w; Lisp_Object old_buffer; struct gcpro gcpro1; + int count = SPECPDL_INDEX (); CHECK_NUMBER (lines); if (! NILP (window)) @@ -2066,6 +2069,9 @@ whether or not it is currently displayed in some window. */) XSETBUFFER (w->buffer, current_buffer); } + /* Don't fontify text that we just move across. */ + specbind (Qfontification_functions, Qnil); + if (noninteractive) { struct position pos; @@ -2111,6 +2117,7 @@ whether or not it is currently displayed in some window. */) if (BUFFERP (old_buffer)) w->buffer = old_buffer; + unbind_to (count, Qnil); RETURN_UNGCPRO (make_number (it.vpos)); } |