aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/net
diff options
context:
space:
mode:
authorPaul Eggert2016-02-09 14:26:40 -0800
committerPaul Eggert2016-02-09 14:26:40 -0800
commit8456ba1d493d5e5b46e450d0e8b2dd1577f246ab (patch)
tree9b57b19f6591e3c8f673e6152bfb9828c1940967 /lisp/net
parent0e7b901b905fb8db3c7e391661f1510e96ff3814 (diff)
parent145a11e1a3417d0fef60148296f2e8f97e09d5e9 (diff)
downloademacs-8456ba1d493d5e5b46e450d0e8b2dd1577f246ab.tar.gz
emacs-8456ba1d493d5e5b46e450d0e8b2dd1577f246ab.zip
-
Diffstat (limited to 'lisp/net')
-rw-r--r--lisp/net/shr.el16
1 files changed, 9 insertions, 7 deletions
diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index 567c8b807ff..9064b9668f4 100644
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -1818,13 +1818,15 @@ The preference is a float determined from `shr-prefer-media-type'."
1818 1818
1819(defun shr-face-background (face) 1819(defun shr-face-background (face)
1820 (and (consp face) 1820 (and (consp face)
1821 (let ((background nil)) 1821 (or (and (plist-get face :background)
1822 (dolist (elem face) 1822 (list :background (plist-get face :background)))
1823 (when (and (consp elem) 1823 (let ((background nil))
1824 (eq (car elem) :background)) 1824 (dolist (elem face)
1825 (setq background (cadr elem)))) 1825 (when (and (consp elem)
1826 (and background 1826 (eq (car elem) :background))
1827 (list :background background))))) 1827 (setq background (cadr elem))))
1828 (and background
1829 (list :background background))))))
1828 1830
1829(defun shr-expand-alignments (start end) 1831(defun shr-expand-alignments (start end)
1830 (while (< (setq start (next-single-property-change 1832 (while (< (setq start (next-single-property-change