From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Matthew Junker Newsgroups: gmane.emacs.bugs Subject: bug#4626: 23; holidays not printed on multi-month calendar Date: Sat, 3 Oct 2009 14:38:07 -0700 (PDT) Message-ID: <152846.40456.qm@web82603.mail.mud.yahoo.com> Reply-To: Matthew Junker , 4626@emacsbugs.donarmstrong.com NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1254620498 31992 80.91.229.12 (4 Oct 2009 01:41:38 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 4 Oct 2009 01:41:38 +0000 (UTC) To: bug-gnu-emacs@gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun Oct 04 03:41:32 2009 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1MuG6J-000668-SB for geb-bug-gnu-emacs@m.gmane.org; Sun, 04 Oct 2009 03:41:31 +0200 Original-Received: from localhost ([127.0.0.1]:34552 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MuG6I-0005lr-LG for geb-bug-gnu-emacs@m.gmane.org; Sat, 03 Oct 2009 21:41:26 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MuCRg-0003np-3e for bug-gnu-emacs@gnu.org; Sat, 03 Oct 2009 17:47:16 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MuCRb-0003lw-Di for bug-gnu-emacs@gnu.org; Sat, 03 Oct 2009 17:47:15 -0400 Original-Received: from [199.232.76.173] (port=55651 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MuCRb-0003lt-8v for bug-gnu-emacs@gnu.org; Sat, 03 Oct 2009 17:47:11 -0400 Original-Received: from rzlab.ucr.edu ([138.23.92.77]:37651) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1MuCRa-00046C-Gj for bug-gnu-emacs@gnu.org; Sat, 03 Oct 2009 17:47:11 -0400 Original-Received: from rzlab.ucr.edu (rzlab.ucr.edu [127.0.0.1]) by rzlab.ucr.edu (8.14.3/8.14.3/Debian-5) with ESMTP id n93Ll8Gs005821; Sat, 3 Oct 2009 14:47:08 -0700 Original-Received: (from debbugs@localhost) by rzlab.ucr.edu (8.14.3/8.14.3/Submit) id n93Lj5W6005314; Sat, 3 Oct 2009 14:45:05 -0700 Resent-Date: Sat, 3 Oct 2009 14:45:05 -0700 X-Loop: owner@emacsbugs.donarmstrong.com Resent-From: Matthew Junker Resent-To: bug-submit-list@donarmstrong.com Resent-CC: Emacs Bugs 2Resent-Date: Sat, 03 Oct 2009 21:45:05 +0000 Resent-Message-ID: Resent-Sender: owner@emacsbugs.donarmstrong.com X-Emacs-PR-Message: report 4626 X-Emacs-PR-Package: emacs X-Emacs-PR-Keywords: Original-Received: via spool by submit@emacsbugs.donarmstrong.com id=B.12546058974450 (code B ref -1); Sat, 03 Oct 2009 21:45:05 +0000 Original-Received: (at submit) by emacsbugs.donarmstrong.com; 3 Oct 2009 21:38:17 +0000 X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. Original-Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) by rzlab.ucr.edu (8.14.3/8.14.3/Debian-5) with ESMTP id n93LcFYG004447 for ; Sat, 3 Oct 2009 14:38:16 -0700 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MuCIx-0001fs-2O for bug-gnu-emacs@gnu.org; Sat, 03 Oct 2009 17:38:15 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MuCIr-0001fL-Dl for bug-gnu-emacs@gnu.org; Sat, 03 Oct 2009 17:38:13 -0400 Original-Received: from [199.232.76.173] (port=34544 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MuCIr-0001fI-9j for bug-gnu-emacs@gnu.org; Sat, 03 Oct 2009 17:38:09 -0400 Original-Received: from web82603.mail.mud.yahoo.com ([68.142.201.120]:32136) by monty-python.gnu.org with smtp (Exim 4.60) (envelope-from ) id 1MuCIq-0002og-Sf for bug-gnu-emacs@gnu.org; Sat, 03 Oct 2009 17:38:09 -0400 Original-Received: (qmail 41576 invoked by uid 60001); 3 Oct 2009 21:38:07 -0000 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=s1024; d=sbcglobal.net; h=Message-ID:X-YMail-OSG:Received:X-Mailer:Date:From:Reply-To:Subject:To:MIME-Version:Content-Type; b=UsM06CZLh4ZdI7VjYAlHVCxG60yPT3ToutwU0ceZ6C/CJQHN1DGfDcdpPC3WVWF5kNaNBORU3XIX0etaYh3BwSLt2xP8gtwMqrBOs0QhLoDmaBDow51cd5B9AUr4KIB6hFCN6sZkvUj+s/ykU3hlW7NLZHMy5BhajagJTHhe2jM=; X-YMail-OSG: p8Iz8KMVM1nV.Pv38mJ_Vytvu0pSbIlXNdp.fgfjM0XYof4ufKzZmI3bEtMSvmM5lSHAAn4_O8qt0oZML1ZcY3JlhbkhRvcY3m6O6TyrM2qsOUGnRq9ZvtSsNlGsNLQJVVj2kQ1kwRCy3_sEpuPEVK.7QYXL7ZF8wY.ap5O2ee5Z7xl27nUn5tBcPN5ahDkeDtEc5uQEgbvVdNK3zyXv_Nn0cK2Wq7YAtmc1zLnI3X_gSzJ.RWlXE0zlHSaxZ4Eijyseau0nC.K.TZ5BFVRbBGP0c2HoGFzdXZXrIP.EqPFMSLnUMmdYifz31cIeOZpdu20YYMFeNR2L82qqEmGpHmMAEASRPEkGEwJ0N_S_9eMuEKt1uKcZ Original-Received: from [76.229.171.177] by web82603.mail.mud.yahoo.com via HTTP; Sat, 03 Oct 2009 14:38:07 PDT X-Mailer: YahooMailRC/157.18 YahooMailWebService/0.7.347.3 X-detected-operating-system: by monty-python.gnu.org: FreeBSD 6.x (1) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) Resent-Date: Sat, 03 Oct 2009 17:47:15 -0400 X-Mailman-Approved-At: Sat, 03 Oct 2009 21:40:20 -0400 X-BeenThere: bug-gnu-emacs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:31668 Archived-At: 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")