diff options
| author | Chong Yidong | 2010-12-06 01:54:52 -0500 |
|---|---|---|
| committer | Chong Yidong | 2010-12-06 01:54:52 -0500 |
| commit | d8b2a96214c9b53ab914901fdde71f5b0a931678 (patch) | |
| tree | b460510f4b2cc856332affb7c7ae2796d04acdb4 /lisp | |
| parent | 0afb6242c77237cd2cc1f0e623b08e20488c5b74 (diff) | |
| download | emacs-d8b2a96214c9b53ab914901fdde71f5b0a931678.tar.gz emacs-d8b2a96214c9b53ab914901fdde71f5b0a931678.zip | |
Fix crash with invisible text and overlays (Bug#7016).
* 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).
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/mail/rmail.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el index ff04b76bf82..3f5660e82cb 100644 --- a/lisp/mail/rmail.el +++ b/lisp/mail/rmail.el | |||
| @@ -4290,7 +4290,7 @@ With prefix argument N moves forward N messages with these labels. | |||
| 4290 | 4290 | ||
| 4291 | ;;;*** | 4291 | ;;;*** |
| 4292 | 4292 | ||
| 4293 | ;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "4a7502b4aeb3bd5f2111b48cc6512924") | 4293 | ;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "222ca7c1e672a08e5799e5a72fb25049") |
| 4294 | ;;; Generated autoloads from rmailmm.el | 4294 | ;;; Generated autoloads from rmailmm.el |
| 4295 | 4295 | ||
| 4296 | (autoload 'rmail-mime "rmailmm" "\ | 4296 | (autoload 'rmail-mime "rmailmm" "\ |
| @@ -4381,7 +4381,7 @@ If prefix argument REVERSE is non-nil, sorts in reverse order. | |||
| 4381 | 4381 | ||
| 4382 | ;;;### (autoloads (rmail-summary-by-senders rmail-summary-by-topic | 4382 | ;;;### (autoloads (rmail-summary-by-senders rmail-summary-by-topic |
| 4383 | ;;;;;; rmail-summary-by-regexp rmail-summary-by-recipients rmail-summary-by-labels | 4383 | ;;;;;; rmail-summary-by-regexp rmail-summary-by-recipients rmail-summary-by-labels |
| 4384 | ;;;;;; rmail-summary) "rmailsum" "rmailsum.el" "26b95919c7e1f8c5609ce7323aee77ae") | 4384 | ;;;;;; rmail-summary) "rmailsum" "rmailsum.el" "d855683972baef7111d4508dffbb54b6") |
| 4385 | ;;; Generated autoloads from rmailsum.el | 4385 | ;;; Generated autoloads from rmailsum.el |
| 4386 | 4386 | ||
| 4387 | (autoload 'rmail-summary "rmailsum" "\ | 4387 | (autoload 'rmail-summary "rmailsum" "\ |