[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/lisp ChangeLog calendar/cal-tex.el
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] emacs/lisp ChangeLog calendar/cal-tex.el |
Date: |
Tue, 06 Oct 2009 02:36:39 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Glenn Morris <gm> 09/10/06 02:36:38
Modified files:
lisp : ChangeLog
lisp/calendar : cal-tex.el
Log message:
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)
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16367&r2=1.16368
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/calendar/cal-tex.el?cvsroot=emacs&r1=1.49&r2=1.50
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16367
retrieving revision 1.16368
diff -u -b -r1.16367 -r1.16368
--- ChangeLog 5 Oct 2009 19:50:15 -0000 1.16367
+++ ChangeLog 6 Oct 2009 02:36:35 -0000 1.16368
@@ -1,3 +1,9 @@
+2009-10-06 Matthew Junker <address@hidden> (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 <address@hidden>
* help-fns.el (describe-function-1): Don't burp is the function is not
Index: calendar/cal-tex.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/calendar/cal-tex.el,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- calendar/cal-tex.el 15 Mar 2009 21:32:15 -0000 1.49
+++ calendar/cal-tex.el 6 Oct 2009 02:36:38 -0000 1.50
@@ -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
+ (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 (progn
- (calendar-increment-month end-month end-year (1- n))
- (if cal-tex-diary (cal-tex-list-diary-entries d1 d2))))
+ 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
+ (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 (progn
- (calendar-increment-month end-month end-year (1- n))
- (if cal-tex-diary (cal-tex-list-diary-entries d1 d2))))
+ 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")
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs/lisp ChangeLog calendar/cal-tex.el,
Glenn Morris <=