diff options
| author | Katsumi Yamaoka | 2017-10-30 23:30:19 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka | 2017-10-30 23:30:19 +0000 |
| commit | 7d32176acc0a54de0b2158e8ff6f57652bb5a629 (patch) | |
| tree | 3e4d4b778b0e45774fd396a1a0d40f7b43c9bea5 | |
| parent | ee493663ba6571a5cb47c51e68aae679d94ee1f0 (diff) | |
| download | emacs-7d32176acc0a54de0b2158e8ff6f57652bb5a629.tar.gz emacs-7d32176acc0a54de0b2158e8ff6f57652bb5a629.zip | |
Fix the bug#24034 change (revno 9eb028f) causing infloop (bug#29047)
* lisp/net/shr.el (shr-fill-line): Copy only face and image-displayer
properties to gaps (bug#29047).
| -rw-r--r-- | lisp/net/shr.el | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lisp/net/shr.el b/lisp/net/shr.el index c90d71d1596..4ba452e4b94 100644 --- a/lisp/net/shr.el +++ b/lisp/net/shr.el | |||
| @@ -700,12 +700,16 @@ size, and full-buffer size." | |||
| 700 | ;; Success; continue. | 700 | ;; Success; continue. |
| 701 | (when (= (preceding-char) ?\s) | 701 | (when (= (preceding-char) ?\s) |
| 702 | (delete-char -1)) | 702 | (delete-char -1)) |
| 703 | (let ((props (text-properties-at (point))) | 703 | (let ((props `(face ,(get-text-property (point) 'face) |
| 704 | ;; Don't break the image-displayer property | ||
| 705 | ;; as it will cause `gnus-article-show-images' | ||
| 706 | ;; to show the two or more same images. | ||
| 707 | image-displayer | ||
| 708 | ,(get-text-property (point) 'image-displayer))) | ||
| 704 | (gap-start (point))) | 709 | (gap-start (point))) |
| 705 | (insert "\n") | 710 | (insert "\n") |
| 706 | (shr-indent) | 711 | (shr-indent) |
| 707 | (when props | 712 | (add-text-properties gap-start (point) props)) |
| 708 | (add-text-properties gap-start (point) props))) | ||
| 709 | (setq start (point)) | 713 | (setq start (point)) |
| 710 | (shr-vertical-motion shr-internal-width) | 714 | (shr-vertical-motion shr-internal-width) |
| 711 | (when (looking-at " $") | 715 | (when (looking-at " $") |