mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-08 15:35:02 +00:00
Code Issues Releases Activity

Fix crash with invisible text and overlays (Bug#7016).

Browse Source 
* src/dispextern.h (struct it): New member overlay_strings_charpos.

* src/xdisp.c (next_overlay_string, load_overlay_strings): Record the
charpos where we computed n_overlay_strings.
(next_overlay_string): Load overlay strings at recorded position,
which may not be the same as the iterator's charpos (Bug#7016).
This commit is contained in:
Chong Yidong 2010-12-06 01:54:52 -05:00
parent 0afb6242c7
commit d8b2a96214
4 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lisp/mail/rmail.el
View File

@ -4290,7 +4290,7 @@ With prefix argument N moves forward N messages with these labels.
;;;*** ;;;***
;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "4a7502b4aeb3bd5f2111b48cc6512924") ;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "222ca7c1e672a08e5799e5a72fb25049")
;;; Generated autoloads from rmailmm.el ;;; Generated autoloads from rmailmm.el
(autoload 'rmail-mime "rmailmm" "\ (autoload 'rmail-mime "rmailmm" "\
@ -4381,7 +4381,7 @@ If prefix argument REVERSE is non-nil, sorts in reverse order.
;;;### (autoloads (rmail-summary-by-senders rmail-summary-by-topic ;;;### (autoloads (rmail-summary-by-senders rmail-summary-by-topic
;;;;;; rmail-summary-by-regexp rmail-summary-by-recipients rmail-summary-by-labels ;;;;;; rmail-summary-by-regexp rmail-summary-by-recipients rmail-summary-by-labels
;;;;;; rmail-summary) "rmailsum" "rmailsum.el" "26b95919c7e1f8c5609ce7323aee77ae") ;;;;;; rmail-summary) "rmailsum" "rmailsum.el" "d855683972baef7111d4508dffbb54b6")
;;; Generated autoloads from rmailsum.el ;;; Generated autoloads from rmailsum.el
(autoload 'rmail-summary "rmailsum" "\ (autoload 'rmail-summary "rmailsum" "\

9
src/ChangeLog
View File

@ -1,3 +1,12 @@
2010-12-06 Chong Yidong <cyd@stupidchicken.com>
* dispextern.h (struct it): New member overlay_strings_charpos.
* xdisp.c (next_overlay_string, load_overlay_strings): Record the
charpos where we computed n_overlay_strings.
(next_overlay_string): Load overlay strings at recorded position,
which may not be the same as the iterator's charpos (Bug#7016).
2010-12-05 Jan Djärv <jan.h.d@swipnet.se> 2010-12-05 Jan Djärv <jan.h.d@swipnet.se>
* nsterm.m (ns_dumpglyphs_image): If drawing cursor, fill background * nsterm.m (ns_dumpglyphs_image): If drawing cursor, fill background

6
src/dispextern.h
View File

@ -1989,6 +1989,12 @@ struct it
OVERLAY_STRING_CHUNK_SIZE. */ OVERLAY_STRING_CHUNK_SIZE. */
int n_overlay_strings; int n_overlay_strings;
/* The charpos where n_overlay_strings was calculated. This should
be set at the same time as n_overlay_strings. It is needed
because we show before-strings at the start of invisible text;
see handle_invisible_prop in xdisp.c. */
int overlay_strings_charpos;
/* Vector of overlays to process. Overlay strings are processed /* Vector of overlays to process. Overlay strings are processed
OVERLAY_STRING_CHUNK_SIZE at a time. */ OVERLAY_STRING_CHUNK_SIZE at a time. */
#define OVERLAY_STRING_CHUNK_SIZE 16 #define OVERLAY_STRING_CHUNK_SIZE 16

10
src/xdisp.c
View File

@ -4717,6 +4717,7 @@ next_overlay_string (it)
&& it->stop_charpos <= it->end_charpos)); && it->stop_charpos <= it->end_charpos));
it->current.overlay_string_index = -1; it->current.overlay_string_index = -1;
it->n_overlay_strings = 0; it->n_overlay_strings = 0;
it->overlay_strings_charpos = -1;
/* If we're at the end of the buffer, record that we have /* If we're at the end of the buffer, record that we have
processed the overlay strings there already, so that processed the overlay strings there already, so that
@ -4729,11 +4730,13 @@ next_overlay_string (it)
/* There are more overlay strings to process. If /* There are more overlay strings to process. If
IT->current.overlay_string_index has advanced to a position IT->current.overlay_string_index has advanced to a position
where we must load IT->overlay_strings with more strings, do where we must load IT->overlay_strings with more strings, do
it. */ it. We must load at the IT->overlay_strings_charpos where
IT->n_overlay_strings was originally computed; when invisible
text is present, this might not be IT_CHARPOS (Bug#7016). */
int i = it->current.overlay_string_index % OVERLAY_STRING_CHUNK_SIZE; int i = it->current.overlay_string_index % OVERLAY_STRING_CHUNK_SIZE;
if (it->current.overlay_string_index && i == 0) if (it->current.overlay_string_index && i == 0)
load_overlay_strings (it, 0); load_overlay_strings (it, it->overlay_strings_charpos);
/* Initialize IT to deliver display elements from the overlay /* Initialize IT to deliver display elements from the overlay
string. */ string. */
@ -4949,8 +4952,9 @@ load_overlay_strings (it, charpos)
if (n > 1) if (n > 1)
qsort (entries, n, sizeof *entries, compare_overlay_entries); qsort (entries, n, sizeof *entries, compare_overlay_entries);
/* Record the total number of strings to process. */ /* Record number of overlay strings, and where we computed it. */
it->n_overlay_strings = n; it->n_overlay_strings = n;
it->overlay_strings_charpos = charpos;
/* IT->current.overlay_string_index is the number of overlay strings /* IT->current.overlay_string_index is the number of overlay strings
that have already been consumed by IT. Copy some of the that have already been consumed by IT. Copy some of the