[Emacs-diffs] emacs-25 a3bf4a3: Make backgrounds extend to the end of the lines in shr

[Lars Ingebrigtsen]

branch: emacs-25
commit a3bf4a387fdc44e5631a6431a2e40e741c672359
Author: Lars Ingebrigtsen <address@hidden>
Commit: Lars Ingebrigtsen <address@hidden>

    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).
---
 lisp/net/shr.el |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index bfda654..66a9c04 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