diff options
| author | Chong Yidong | 2010-06-27 14:24:42 -0400 |
|---|---|---|
| committer | Chong Yidong | 2010-06-27 14:24:42 -0400 |
| commit | b7d4de51858a4e320aa3c6957f3a7651251113d5 (patch) | |
| tree | d80b68428a6d7a902887885a2255b81fe95ecdc7 | |
| parent | 3726248fdce1550b9dfa9a2836f5d419a0259461 (diff) | |
| download | emacs-b7d4de51858a4e320aa3c6957f3a7651251113d5.tar.gz emacs-b7d4de51858a4e320aa3c6957f3a7651251113d5.zip | |
Minor fix for htmlfontify.el (Bug#6239).
* htmlfontify.el (hfy-face-attr-for-class): Use `append' instead
of `nconc' (Bug#6239).
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/htmlfontify.el | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8fcbf15adab..83388723a23 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2010-06-27 Masatake YAMATO <yamato@redhat.com> | ||
| 2 | |||
| 3 | * htmlfontify.el (hfy-face-attr-for-class): Use `append' instead | ||
| 4 | of `nconc' (Bug#6239). | ||
| 5 | |||
| 1 | 2010-06-27 Christoph <cschol2112@googlemail.com> (tiny change) | 6 | 2010-06-27 Christoph <cschol2112@googlemail.com> (tiny change) |
| 2 | 7 | ||
| 3 | * bookmark.el (bookmark-bmenu-2-window) | 8 | * bookmark.el (bookmark-bmenu-2-window) |
diff --git a/lisp/htmlfontify.el b/lisp/htmlfontify.el index b363156c311..f7a5382e6b8 100644 --- a/lisp/htmlfontify.el +++ b/lisp/htmlfontify.el | |||
| @@ -959,7 +959,7 @@ See also `hfy-display-class' for details of valid values for CLASS." | |||
| 959 | new-spec))))) | 959 | new-spec))))) |
| 960 | (if (or (memq :inherit face-spec) (eq 'default face)) | 960 | (if (or (memq :inherit face-spec) (eq 'default face)) |
| 961 | face-spec | 961 | face-spec |
| 962 | (nconc face-spec (list :inherit 'default))) )) | 962 | (append face-spec (list :inherit 'default))))) |
| 963 | 963 | ||
| 964 | ;; construct an assoc of (css-tag-name . css-tag-value) pairs | 964 | ;; construct an assoc of (css-tag-name . css-tag-value) pairs |
| 965 | ;; from a face or assoc of face attributes: | 965 | ;; from a face or assoc of face attributes: |