[Emacs-diffs] emacs-26 7d32176: Fix the bug#24034 change (revno 9eb028f) causing infloop (bug#29047)

[Katsumi Yamaoka]

branch: emacs-26
commit 7d32176acc0a54de0b2158e8ff6f57652bb5a629
Author: Katsumi Yamaoka <address@hidden>
Commit: Katsumi Yamaoka <address@hidden>

    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).
---
 lisp/net/shr.el | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index c90d71d..4ba452e 100644
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -700,12 +700,16 @@ size, and full-buffer size."
       ;; Success; continue.
       (when (= (preceding-char) ?\s)
        (delete-char -1))
-      (let ((props (text-properties-at (point)))
+      (let ((props `(face ,(get-text-property (point) 'face)
+                         ;; Don't break the image-displayer property
+                         ;; as it will cause `gnus-article-show-images'
+                         ;; to show the two or more same images.
+                         image-displayer
+                         ,(get-text-property (point) 'image-displayer)))
            (gap-start (point)))
        (insert "\n")
        (shr-indent)
-       (when props
-         (add-text-properties gap-start (point) props)))
+       (add-text-properties gap-start (point) props))
       (setq start (point))
       (shr-vertical-motion shr-internal-width)
       (when (looking-at " $")