diff options
| author | Stefan Monnier | 2015-09-24 08:54:39 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2015-09-24 08:54:39 -0400 |
| commit | 8f88db14946f46a95603dfaa2a425d64b01fbb53 (patch) | |
| tree | 88d3f5ad8b6dd0fed1eae4ade62fd60e2e42f58d /src/syntax.c | |
| parent | 8c909d75128b5bf92b090d34adbe07ed882ecd74 (diff) | |
| download | emacs-8f88db14946f46a95603dfaa2a425d64b01fbb53.tar.gz emacs-8f88db14946f46a95603dfaa2a425d64b01fbb53.zip | |
Fix recent bootstrap problems
* src/syntax.c (parse_sexp_propertize): Fix last fix.
* lisp/nxml/nxml-mode.el (nxml-comment-quote-nested): Fix paren typo.
* lisp/emacs-lisp/lisp-mode.el: Require cl-lib for cl-progv.
Diffstat (limited to 'src/syntax.c')
| -rw-r--r-- | src/syntax.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/syntax.c b/src/syntax.c index 6b1865f667f..cacdf18c2a2 100644 --- a/src/syntax.c +++ b/src/syntax.c | |||
| @@ -499,7 +499,8 @@ parse_sexp_propertize (ptrdiff_t charpos) | |||
| 499 | gl_state.e_property = syntax_propertize__done; | 499 | gl_state.e_property = syntax_propertize__done; |
| 500 | gl_state.e_property_truncated = true; | 500 | gl_state.e_property_truncated = true; |
| 501 | } | 501 | } |
| 502 | else if (gl_state.e_property_truncated) | 502 | else if (gl_state.e_property_truncated |
| 503 | && gl_state.e_property < syntax_propertize__done) | ||
| 503 | { /* When moving backward, e_property might be set without resetting | 504 | { /* When moving backward, e_property might be set without resetting |
| 504 | e_property_truncated, so the e_property_truncated flag may | 505 | e_property_truncated, so the e_property_truncated flag may |
| 505 | occasionally be left raised spuriously. This should be rare. */ | 506 | occasionally be left raised spuriously. This should be rare. */ |