Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
f996bbcb
Commit
f996bbcb
authored
Jan 24, 2011
by
Stefan Monnier
Browse files
* xdisp.c (handle_fontified_prop): Be careful with font-lock changing
the buffer's point-max. Fixes: debbugs:7876
parent
10e1d5f3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
0 deletions
+14
-0
src/ChangeLog
src/ChangeLog
+5
-0
src/xdisp.c
src/xdisp.c
+9
-0
No files found.
src/ChangeLog
View file @
f996bbcb
2011-01-24 Stefan Monnier <monnier@iro.umontreal.ca>
* xdisp.c (handle_fontified_prop): Be careful with font-lock changing
the buffer's point-max (bug#7876).
2011-01-23 Chong Yidong <cyd@stupidchicken.com>
* lisp.h (XPNTR): Obey DATA_SEG_BITS in all non-USE_LSB_TAG cases.
...
...
src/xdisp.c
View file @
f996bbcb
...
...
@@ -3337,6 +3337,8 @@ handle_fontified_prop (it)
val = Vfontification_functions;
specbind (Qfontification_functions, Qnil);
xassert (it->end_charpos == ZV);
if (!CONSP (val) || EQ (XCAR (val), Qlambda))
safe_call1 (val, pos);
else
...
...
@@ -3376,6 +3378,13 @@ handle_fontified_prop (it)
unbind_to (count, Qnil);
/* The fontification code may have added/removed text.
It could do even a lot worse, but let's at least protect against
the most obvious case where only the text past `pos' gets changed',
as is/was done in grep.el where some escapes sequences are turned
into face properties (bug#7876). */
it->end_charpos = ZV;
/* Return HANDLED_RECOMPUTE_PROPS only if function fontified
something. This avoids an endless loop if they failed to
fontify the text for which reason ever. */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment