(fancy-diary-display): Check for font-lock-mode before using faces. (diary-list-entries, fancy-diary-display) (print-diary-entries, mark-sexp-diary-entries, calendar-mark-complex) (calendar-mark-1, list-sexp-diary-entries, diary-remind): Reduce the number of lets. (mark-sexp-diary-entries, calendar-mark-complex): Expand calendar-for-loops.