summaryrefslogtreecommitdiff
path: root/lisp/calendar
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2008-04-01 04:08:41 +0000
committerGlenn Morris <rgm@gnu.org>2008-04-01 04:08:41 +0000
commiteff756afa6d3b292aee7e32a76ebc0aab0d34845 (patch)
tree26eac993e8f2848540ea0a29e51eabdd1d372633 /lisp/calendar
parentaafb0703bfb213ccabf492ad518b6882aac6cb33 (diff)
downloademacs-eff756afa6d3b292aee7e32a76ebc0aab0d34845.tar.gz
(fancy-diary-display): Use calendar-make-temp-face.
Diffstat (limited to 'lisp/calendar')
-rw-r--r--lisp/calendar/diary-lib.el26
1 files changed, 3 insertions, 23 deletions
diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el
index c2d4e0c4f03..4e4ae6d52de 100644
--- a/lisp/calendar/diary-lib.el
+++ b/lisp/calendar/diary-lib.el
@@ -939,30 +939,10 @@ To use this function, add it to `diary-display-hook'."
: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))