(cal-menu-holidays-menu): Use calendar-cursor-holidays rather than cal-menu-today-holidays. (cal-menu-today-holidays): Remove function. (cal-menu-holiday-window-suffix): Simplify. (cal-menu-list-holidays-year, cal-menu-list-holidays-following-year) (cal-menu-list-holidays-previous-year, calendar-mouse-goto-date): Remove unused functions. (calendar-mouse-view-diary-entries): Use format rather than concat. (cal-menu-x-popup-menu): Turn it into a macro. (calendar-mouse-holidays, calendar-mouse-view-diary-entries) (calendar-mouse-print-dates): Adapt for cal-menu-x-popup-menu change. (cal-menu-event-to-date): Remove function. (calendar-mouse-holidays, calendar-mouse-view-diary-entries) (calendar-mouse-view-other-diary-entries, calendar-mouse-print-dates) (cal-menu-set-date-title): Use calendar-cursor-to-date rather than cal-menu-event-to-date. (calendar-mouse-tex-day, calendar-mouse-tex-week, calendar-mouse-tex-week2) (calendar-mouse-tex-week-iso, calendar-mouse-tex-week-monday) (calendar-mouse-tex-filofax-daily, calendar-mouse-tex-filofax-2week) (calendar-mouse-tex-filofax-week, calendar-mouse-tex-month) (calendar-mouse-tex-month-landscape, calendar-mouse-tex-year) (calendar-mouse-tex-filofax-year, calendar-mouse-tex-year-landscape): Remove functions. (cal-menu-context-mouse-menu): Replace the above functions with the cal-tex versions. Add HTML submenu.