procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* src/syntax.c (SETUP_SYNTAX_TABLE): Move truncation...

Browse source 
(parse_sexp_propertize): ...from here.
This commit is contained in:
Stefan Monnier 2015-09-09 16:22:29 -04:00
parent 75a351bc6f
commit 0b78dd6027
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/syntax.c
View file

@ -246,8 +246,15 @@ SETUP_SYNTAX_TABLE (ptrdiff_t from, ptrdiff_t count)
gl_state.object = Qnil;
gl_state.offset = 0;
if (parse_sexp_lookup_properties)
if (count > 0 || from > BEGV)
update_syntax_table (count > 0 ? from : from - 1, count, true, Qnil);
{
if (count > 0 || from > BEGV)
update_syntax_table (count > 0 ? from : from - 1, count, true, Qnil);
if (gl_state.e_property > parse_sexp_propertize_done)
{
gl_state.e_property = parse_sexp_propertize_done;
gl_state.e_property_truncated = true;
}
}
}
/* Same as above, but in OBJECT. If OBJECT is nil, use current buffer.
@ -480,11 +487,6 @@ parse_sexp_propertize (ptrdiff_t charpos)
error ("parse-sexp-propertize-function did not move"
" parse-sexp-propertize-done");
SETUP_SYNTAX_TABLE (charpos, 1);
if (gl_state.e_property > parse_sexp_propertize_done)
{
gl_state.e_property = parse_sexp_propertize_done;
gl_state.e_property_truncated = true;
}
}
void