bug-gnu-emacs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

bug#4626: marked as done (23; holidays not printed on multi-month calend


From: Emacs bug Tracking System
Subject: bug#4626: marked as done (23; holidays not printed on multi-month calendar)
Date: Tue, 06 Oct 2009 02:45:07 +0000

Your message dated Mon, 05 Oct 2009 22:37:47 -0400
with message-id <address@hidden>
and subject line Re: bug#4626: 23; holidays not printed on multi-month calendar
has caused the Emacs bug report #4626,
regarding 23; holidays not printed on multi-month calendar
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact address@hidden
immediately.)


-- 
4626: http://emacsbugs.donarmstrong.com/cgi-bin/bugreport.cgi?bug=4626
Emacs Bug Tracking System
Contact address@hidden with problems
--- Begin Message --- Subject: 23; holidays not printed on multi-month calendar Date: Sat, 3 Oct 2009 14:38:07 -0700 (PDT)
Holidays are not printed after the first month of multi-month calendars.  The 
changes to cal-tex.el for determining the end date of the calendar for Emacs 23 
were not quite right.

To see the problem, try "C-u 2 t M" in an older version and in version 23 
(i.e., (cal-tex-cursor-month-landscape 2)).

The following patch seems to correct the problem.

--- /cygdrive/c/Program Files/emacs/current/lisp/calendar/cal-tex.el    
2009-08-15 17:10:00.015625000 -0500
+++ cal-tex.el    2009-10-03 16:11:33.178552200 -0500
@@ -439,13 +439,13 @@
          (end-year year)
          (cal-tex-which-days '(0 1 2 3 4 5 6))
          (d1 (calendar-absolute-from-gregorian (list month 1 year)))
-         (d2 (calendar-absolute-from-gregorian
-              (list end-month
-                    (calendar-last-day-of-month end-month end-year)
-                    end-year)))
-         (diary-list (progn
-                       (calendar-increment-month end-month end-year (1- n))
-                       (if cal-tex-diary (cal-tex-list-diary-entries d1 d2))))
+         (d2 (progn
+               (calendar-increment-month end-month end-year (1- n))
+               (calendar-absolute-from-gregorian
+                (list end-month
+                      (calendar-last-day-of-month end-month end-year)
+                      end-year))))
+         (diary-list (if cal-tex-diary (cal-tex-list-diary-entries d1 d2)))
          (holidays (if cal-tex-holidays (cal-tex-list-holidays d1 d2)))
          other-month other-year small-months-at-start)
     (cal-tex-insert-preamble (cal-tex-number-weeks month year 1) t "12pt")
@@ -508,13 +508,13 @@
          (end-month month)
          (end-year year)
          (d1 (calendar-absolute-from-gregorian (list month 1 year)))
-         (d2 (calendar-absolute-from-gregorian
-              (list end-month
-                    (calendar-last-day-of-month end-month end-year)
-                    end-year)))
-         (diary-list (progn
-                       (calendar-increment-month end-month end-year (1- n))
-                       (if cal-tex-diary (cal-tex-list-diary-entries d1 d2))))
+         (d2 (progn
+               (calendar-increment-month end-month end-year (1- n))
+               (calendar-absolute-from-gregorian
+                (list end-month
+                      (calendar-last-day-of-month end-month end-year)
+                      end-year))))
+         (diary-list (if cal-tex-diary (cal-tex-list-diary-entries d1 d2)))
          (holidays (if cal-tex-holidays (cal-tex-list-holidays d1 d2)))
          other-month other-year)
     (cal-tex-insert-preamble (cal-tex-number-weeks month year n) nil "12pt")



--- End Message ---
--- Begin Message --- Subject: Re: bug#4626: 23; holidays not printed on multi-month calendar Date: Mon, 05 Oct 2009 22:37:47 -0400 User-agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/)
Thank you for the report and the patch; applied.

--- End Message ---

reply via email to

[Prev in Thread] Current Thread [Next in Thread]