From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Tue, 9 Feb 2016 03:45:22 +0000 (+1100)
Subject: Make backgrounds extend to the end of the lines in shr
X-Git-Tag: emacs-25.0.91~43
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a3bf4a387fdc44e5631a6431a2e40e741c672359;p=emacs.git

Make backgrounds extend to the end of the lines in shr

* lisp/net/shr.el (shr-face-background): Faces can also be on
the form `(:background "#fff)' (bug#22547).
---

diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index bfda6543b68..66a9c04a8f6 100644
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -1786,13 +1786,15 @@ The preference is a float determined from `shr-prefer-media-type'."
 
 (defun shr-face-background (face)
   (and (consp face)
-       (let ((background nil))
-	 (dolist (elem face)
-	   (when (and (consp elem)
-		      (eq (car elem) :background))
-	     (setq background (cadr elem))))
-	 (and background
-	      (list :background background)))))
+       (or (and (plist-get face :background)
+                (list :background (plist-get face :background)))
+           (let ((background nil))
+             (dolist (elem face)
+               (when (and (consp elem)
+                          (eq (car elem) :background))
+                 (setq background (cadr elem))))
+             (and background
+                  (list :background background))))))
 
 (defun shr-expand-alignments (start end)
   (while (< (setq start (next-single-property-change