[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 0b78dd6: * src/syntax.c (SETUP_SYNTAX_TABLE): Move
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] master 0b78dd6: * src/syntax.c (SETUP_SYNTAX_TABLE): Move truncation... |
Date: |
Wed, 09 Sep 2015 20:22:32 +0000 |
branch: master
commit 0b78dd60277129af9f520e4d5dc8c7e528c63eee
Author: Stefan Monnier <address@hidden>
Commit: Stefan Monnier <address@hidden>
* src/syntax.c (SETUP_SYNTAX_TABLE): Move truncation...
(parse_sexp_propertize): ...from here.
---
src/syntax.c | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/syntax.c b/src/syntax.c
index 776ff98..fcd6d01 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 0b78dd6: * src/syntax.c (SETUP_SYNTAX_TABLE): Move truncation...,
Stefan Monnier <=