From: Katsumi Yamaoka <yamaoka@jpl.org>
Date: Wed, 20 Jul 2016 22:56:42 +0000 (+0000)
Subject: * lisp/net/shr.el (shr-fill-line):
X-Git-Tag: emacs-25.1-rc1~13
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4157159a37b43712440da91a45a6d5f71eb96e8a;p=emacs.git

* lisp/net/shr.el (shr-fill-line):
Preserve text properties in folded lines (bug#24034).
---

diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index 2c8ff79763f..8718e4ffaea 100644
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -636,13 +636,12 @@ size, and full-buffer size."
       ;; Success; continue.
       (when (= (preceding-char) ?\s)
 	(delete-char -1))
-      (let ((face (get-text-property (point) 'face))
-	    (background-start (point)))
+      (let ((props (text-properties-at (point)))
+	    (gap-start (point)))
 	(insert "\n")
 	(shr-indent)
-	(when face
-	  (put-text-property background-start (point) 'face
-			     `,(shr-face-background face))))
+	(when props
+	  (add-text-properties gap-start (point) props)))
       (setq start (point))
       (shr-vertical-motion shr-internal-width)
       (when (looking-at " $")