diff options
author | Chong Yidong <cyd@stupidchicken.com> | 2010-07-10 14:52:53 -0400 |
---|---|---|
committer | Chong Yidong <cyd@stupidchicken.com> | 2010-07-10 14:52:53 -0400 |
commit | 2ec1b5ee3464999a18b8197101e8bf08a3c564a8 (patch) | |
tree | 4837c369ac576fbfd063b1ff046a3daca372f082 /lisp/htmlfontify.el | |
parent | c971758df75640c55e6f9d7ac7d9c6909519d0b4 (diff) | |
parent | 7c33a0572280bdcf0583c5625cfda32f63fad56d (diff) | |
download | emacs-2ec1b5ee3464999a18b8197101e8bf08a3c564a8.tar.gz |
Merge changes from emacs-23 branch.
Diffstat (limited to 'lisp/htmlfontify.el')
-rw-r--r-- | lisp/htmlfontify.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/htmlfontify.el b/lisp/htmlfontify.el index 12e54972461..035b6d384e7 100644 --- a/lisp/htmlfontify.el +++ b/lisp/htmlfontify.el @@ -926,7 +926,7 @@ See also `hfy-display-class' for details of valid values for CLASS." new-spec))))) (if (or (memq :inherit face-spec) (eq 'default face)) face-spec - (nconc face-spec (list :inherit 'default))) )) + (append face-spec (list :inherit 'default))))) ;; construct an assoc of (css-tag-name . css-tag-value) pairs ;; from a face or assoc of face attributes: |