diff options
| author | Phillip Lord <phillip.lord@russet.org.uk> | 2016-01-17 22:03:10 +0000 |
|---|---|---|
| committer | Phillip Lord <phillip.lord@russet.org.uk> | 2016-01-17 22:03:10 +0000 |
| commit | 4b3b524080aa897a39b20d1ff671af6d47ebd547 (patch) | |
| tree | 1a33af5bec4a2c02b8a030450fb112eabcab8fc9 | |
| parent | 05e8148a24ebe51fbe758dd16265e8fb81f85953 (diff) | |
| download | emacs-fix/htmlfontify-21990.tar.gz | |
Cope with multiple overlapping faces.fix/htmlfontify-21990
* lisp/htmlfontify.el (hfy-face-to-style-i): Treat inheritance right to
left.
(hfy-face-resolve-face): Handle font specification as well as font name
| -rw-r--r-- | lisp/htmlfontify.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/htmlfontify.el b/lisp/htmlfontify.el index 178f3a00133..ca456c7a3d1 100644 --- a/lisp/htmlfontify.el +++ b/lisp/htmlfontify.el @@ -999,7 +999,7 @@ merged by the user - `hfy-flatten-style' should do this." (append parent (hfy-face-to-style-i - (hfy-face-attr-for-class v hfy-display-class)) )))) + (hfy-face-attr-for-class v hfy-display-class)))))) (setq this (if val (case key (:family (hfy-family val)) @@ -1018,7 +1018,7 @@ merged by the user - `hfy-flatten-style' should do this." (:italic (hfy-slant 'italic)))))) (setq that (hfy-face-to-style-i next)) ;;(lwarn t :warning "%S => %S" fn (nconc this that parent)) - (nconc this that parent))) ) + (nconc this parent that))) ) (defun hfy-size-to-int (spec) "Convert SPEC, a CSS font-size specifier, to an Emacs :height attribute value. @@ -1062,7 +1062,7 @@ haven't encountered them yet. Returns a `hfy-style-assoc'." ((and (symbolp fn) (facep (symbol-value fn))) (hfy-face-attr-for-class (symbol-value fn) hfy-display-class)) - (t nil))) + (t fn))) (defun hfy-face-to-style (fn) |