(list-diary-entries-hook, diary-display-hook, nongregorian-diary-listing-hook) (mark-diary-entries-hook, nongregorian-diary-marking-hook): Add some customize options for these hooks. (calendar-abbrev-construct): Don't try to take a substring longer than the original string.