|
From: | Hong Xu |
Subject: | bug#21990: htmlfontify fails to generate highly highlighted regions |
Date: | Mon, 18 Jan 2016 00:22:49 -0800 |
User-agent: | Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Icedove/38.5.0 |
On 01/17/2016 02:21 PM, Phillip Lord wrote: > Hong Xu <hong@topbug.net> writes: > >> This issue is also possibly caused by bug #18128, which >> diff-auto-refine-mode does not put the highlight into the font-lock. > > > I don't think it's related to font-lock, as htmlfontify checks both > 'face and 'font-lock-face. I think htmlfontify was not dealing correctly > with faces when they overlap. I've pushed a fix to > fix/htmlfontify-21990. > > http://lists.gnu.org/archive/html/emacs-diffs/2016-01/msg00277.html > > Can you test and confirm? If so, I'll finish the patch and merge. > Hi Phillip, I've tested it---yes now the highlighted regions display differently, but the highlighting actually is just the same as the background... I've attached the generated html file, so you can view it.
diff --git a/lisp/htmlfontify.el b/lisp/htmlfontify.el index 178f3a0..ca456c7 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) |
signature.asc
Description: OpenPGP digital signature
[Prev in Thread] | Current Thread | [Next in Thread] |