aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Ingebrigtsen2016-02-29 22:21:11 +1100
committerLars Ingebrigtsen2016-02-29 22:21:30 +1100
commitdc42d0ca0b7b6877bd22b91e19c34d3d7d7902f9 (patch)
tree9bc5745d3a89aa091afcd4c6da2853cea2a431a1
parent9781dc4da35934839bf848b576829786962655b4 (diff)
downloademacs-dc42d0ca0b7b6877bd22b91e19c34d3d7d7902f9.tar.gz
emacs-dc42d0ca0b7b6877bd22b91e19c34d3d7d7902f9.zip
Use the correct background color when filling nested <divs>
* lisp/net/shr.el (shr-face-background): Return the first background, because that's the one that's visible (bug#22680). Backport: (cherry picked from commit cad0bc70558f9c28c808711c5295dec9fc5ad6e5)
-rw-r--r--lisp/net/shr.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index b36dd56f09c..e9431325333 100644
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -1791,7 +1791,8 @@ The preference is a float determined from `shr-prefer-media-type'."
1791 (let ((background nil)) 1791 (let ((background nil))
1792 (dolist (elem face) 1792 (dolist (elem face)
1793 (when (and (consp elem) 1793 (when (and (consp elem)
1794 (eq (car elem) :background)) 1794 (eq (car elem) :background)
1795 (not background))
1795 (setq background (cadr elem)))) 1796 (setq background (cadr elem))))
1796 (and background 1797 (and background
1797 (list :background background)))))) 1798 (list :background background))))))