Holidays in fancy diary

[Matthew Mundell]

With the CVS Emacs, any holidays are missing from a fancily displayed
diary.

To reproduce:
    emacs -q --no-site-file
    (add-hook 'diary-display-hook 'fancy-diary-display)
    (calendar)
    g d RET jan RET 1 RET d 0 RET 0 RET  ; i.e. diary for 1 jan

This seems to be because changes to increment-calendar-month have
introduced a possible nil return, which causes fancy-diary-display to
skip the holiday processing.  A simple patch follows.

===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/calendar/diary-lib.el,v
retrieving revision 1.75
diff -u -r1.75 diary-lib.el
--- diary-lib.el        17 Jan 2004 13:46:09 -0000      1.75
+++ diary-lib.el        1 Feb 2004 21:53:30 -0000
@@ -587,8 +587,9 @@
                            (extract-calendar-month date))
                      (setq holiday-list-last-year
                            (extract-calendar-year date))
-                     (increment-calendar-month
-                      holiday-list-last-month holiday-list-last-year 1)
+                     (progn (increment-calendar-month
+                             holiday-list-last-month holiday-list-last-year 1)
+                            t)
                      (setq holiday-list
                            (let ((displayed-month holiday-list-last-month)
                                  (displayed-year holiday-list-last-year))