From: Glenn Morris <rgm@gnu.org>
Date: Tue, 6 Oct 2009 02:36:35 +0000 (+0000)
Subject: Matthew Junker  <matthew.junker at sbcglobal.net>  (tiny change)
X-Git-Tag: emacs-pretest-23.1.90~915
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=00169eb6835a00ca198aea8d3d6816d6dda5e4c0;p=emacs.git

Matthew Junker  <matthew.junker at sbcglobal.net>  (tiny change)

(cal-tex-cursor-month-landscape)
(cal-tex-cursor-month): Correctly increment the end date for diary and
holiday listing.  (Bug#4626)
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5523ec162d6..2c717974404 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2009-10-06  Matthew Junker  <matthew.junker@sbcglobal.net>  (tiny change)
+
+	* calendar/cal-tex.el (cal-tex-cursor-month-landscape)
+	(cal-tex-cursor-month): Correctly increment the end date for diary and
+	holiday listing.  (Bug#4626)
+
 2009-10-05  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* help-fns.el (describe-function-1): Don't burp is the function is not
diff --git a/lisp/calendar/cal-tex.el b/lisp/calendar/cal-tex.el
index 829844b3ec1..171eabdf3de 100644
--- a/lisp/calendar/cal-tex.el
+++ b/lisp/calendar/cal-tex.el
@@ -439,13 +439,13 @@ Optional EVENT indicates a buffer position to use instead of point."
          (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 @@ indicates a buffer position to use instead of point."
          (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")