Mercurial > emacs
changeset 93503:a56e8caca83b
(fancy-diary-display): Use calendar-make-temp-face.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Tue, 01 Apr 2008 04:08:41 +0000 |
| parents | 5aa73e9a6715 |
| children | 9105df157c3a |
| files | lisp/calendar/diary-lib.el |
| diffstat | 1 files changed, 3 insertions(+), 23 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/calendar/diary-lib.el Tue Apr 01 02:58:32 2008 +0000 +++ b/lisp/calendar/diary-lib.el Tue Apr 01 04:08:41 2008 +0000 @@ -939,30 +939,10 @@ :type 'diary-entry) (insert this-entry ?\n)) (save-excursion - (let* ((marks (nth 4 entry)) - (faceinfo marks) - temp-face) + (let ((marks (nth 4 entry)) + temp-face) (when marks - ;; FIXME duplicate code with calendar.el. - (setq temp-face (make-symbol - (apply - 'concat "temp-face-" - (mapcar (lambda (sym) - (if (stringp sym) - sym - (symbol-name sym))) - marks)))) - (make-face temp-face) - ;; Remove :face info from the marks, - ;; copy the face info into temp-face - (while (setq faceinfo (memq :face faceinfo)) - ;; FIXME not read. - (copy-face (read (nth 1 faceinfo)) temp-face) - (setcar faceinfo nil) - (setcar (cdr faceinfo) nil)) - (setq marks (delq nil marks)) - ;; Apply the font aspects. - (apply 'set-face-attribute temp-face nil marks) + (setq temp-face (calendar-make-temp-face marks)) (search-backward this-entry) (overlay-put (make-overlay (match-beginning 0) (match-end 0))