diff options
| -rw-r--r-- | lisp/calendar/diary-lib.el | 26 |
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'." | |||
| 939 | :type 'diary-entry) | 939 | :type 'diary-entry) |
| 940 | (insert this-entry ?\n)) | 940 | (insert this-entry ?\n)) |
| 941 | (save-excursion | 941 | (save-excursion |
| 942 | (let* ((marks (nth 4 entry)) | 942 | (let ((marks (nth 4 entry)) |
| 943 | (faceinfo marks) | 943 | temp-face) |
| 944 | temp-face) | ||
| 945 | (when marks | 944 | (when marks |
| 946 | ;; FIXME duplicate code with calendar.el. | 945 | (setq temp-face (calendar-make-temp-face marks)) |
| 947 | (setq temp-face (make-symbol | ||
| 948 | (apply | ||
| 949 | 'concat "temp-face-" | ||
| 950 | (mapcar (lambda (sym) | ||
| 951 | (if (stringp sym) | ||
| 952 | sym | ||
| 953 | (symbol-name sym))) | ||
| 954 | marks)))) | ||
| 955 | (make-face temp-face) | ||
| 956 | ;; Remove :face info from the marks, | ||
| 957 | ;; copy the face info into temp-face | ||
| 958 | (while (setq faceinfo (memq :face faceinfo)) | ||
| 959 | ;; FIXME not read. | ||
| 960 | (copy-face (read (nth 1 faceinfo)) temp-face) | ||
| 961 | (setcar faceinfo nil) | ||
| 962 | (setcar (cdr faceinfo) nil)) | ||
| 963 | (setq marks (delq nil marks)) | ||
| 964 | ;; Apply the font aspects. | ||
| 965 | (apply 'set-face-attribute temp-face nil marks) | ||
| 966 | (search-backward this-entry) | 946 | (search-backward this-entry) |
| 967 | (overlay-put | 947 | (overlay-put |
| 968 | (make-overlay (match-beginning 0) (match-end 0)) | 948 | (make-overlay (match-beginning 0) (match-end 0)) |