* .emacs.el (tv/calendar-diary-or-holiday): New.
* .emacs.el (tv/calendar-diary-or-holiday): Fix when date is both a diary and holiday.