From: Katsumi Yamaoka <yamaoka@jpl.org>
Date: Mon, 30 Oct 2017 23:30:19 +0000 (+0000)
Subject: Fix the bug#24034 change (revno 9eb028f) causing infloop (bug#29047)
X-Git-Tag: emacs-26.0.91~426
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7d32176acc0a54de0b2158e8ff6f57652bb5a629;p=emacs.git

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).
---

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."
       ;; 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 " $")