From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Michael Heerdegen Newsgroups: gmane.emacs.bugs Subject: bug#11260: 24.1.50; `holiday-sexp' may create entry twice Date: Mon, 16 Apr 2012 23:27:08 +0200 Message-ID: <8762cz4bbn.fsf@web.de> Reply-To: michael_heerdegen@web.de NNTP-Posting-Host: plane.gmane.org X-Trace: dough.gmane.org 1334611568 22861 80.91.229.3 (16 Apr 2012 21:26:08 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Mon, 16 Apr 2012 21:26:08 +0000 (UTC) To: 11260@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Apr 16 23:26:07 2012 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1SJtQz-00027o-MD for geb-bug-gnu-emacs@m.gmane.org; Mon, 16 Apr 2012 23:26:05 +0200 Original-Received: from localhost ([::1]:37728 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SJtQz-00072Q-2N for geb-bug-gnu-emacs@m.gmane.org; Mon, 16 Apr 2012 17:26:05 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:57755) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SJtQu-000720-OI for bug-gnu-emacs@gnu.org; Mon, 16 Apr 2012 17:26:03 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SJtQs-0004uN-VW for bug-gnu-emacs@gnu.org; Mon, 16 Apr 2012 17:26:00 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:36346) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SJtQs-0004uJ-SO for bug-gnu-emacs@gnu.org; Mon, 16 Apr 2012 17:25:58 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.72) (envelope-from ) id 1SJtQw-0003e7-Hr for bug-gnu-emacs@gnu.org; Mon, 16 Apr 2012 17:26:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Michael Heerdegen Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 16 Apr 2012 21:26:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 11260 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.133461153513968 (code B ref -1); Mon, 16 Apr 2012 21:26:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 16 Apr 2012 21:25:35 +0000 Original-Received: from localhost ([127.0.0.1]:37377 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SJtQS-0003dD-RB for submit@debbugs.gnu.org; Mon, 16 Apr 2012 17:25:34 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:46507) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SJtQQ-0003cz-EX for submit@debbugs.gnu.org; Mon, 16 Apr 2012 17:25:31 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SJtQF-0004fp-LJ for submit@debbugs.gnu.org; Mon, 16 Apr 2012 17:25:21 -0400 Original-Received: from lists.gnu.org ([208.118.235.17]:57660) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SJtQF-0004fb-H8 for submit@debbugs.gnu.org; Mon, 16 Apr 2012 17:25:19 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:57705) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SJtQD-0006zT-ML for bug-gnu-emacs@gnu.org; Mon, 16 Apr 2012 17:25:19 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SJtQB-0004bV-NJ for bug-gnu-emacs@gnu.org; Mon, 16 Apr 2012 17:25:17 -0400 Original-Received: from fmmailgate07.web.de ([217.72.192.248]:36072) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SJtQB-0004Yy-Dg for bug-gnu-emacs@gnu.org; Mon, 16 Apr 2012 17:25:15 -0400 Original-Received: from moweb002.kundenserver.de (moweb002.kundenserver.de [172.19.20.108]) by fmmailgate07.web.de (Postfix) with ESMTP id AD26411AB73C for ; Mon, 16 Apr 2012 23:25:13 +0200 (CEST) Original-Received: from snow.dragon ([89.204.138.158]) by smtp.web.de (mrweb001) with ESMTPA (Nemesis) id 0LwZA7-1SCzIt2iI3-018NF9; Mon, 16 Apr 2012 23:25:13 +0200 X-Provags-ID: V02:K0:ItUU/etKcAVzfpkTI0VnZJnxDqzWVDEGOkqO/QOtv4Z vjJYFnHdWAIuZLUWiEO8WIaSQkAMNOwZAQcYw0z9Dv0ZAqRcbu dBOqY6vJ4VrGubEmcDBQIUuVmXldpdbADqGevsjyx0oaas6kXx 6glISbK9pxxzyg0BELezvWFoNd9T15EF9eKhRblHCnOb96QOF4 2q81p/z2ZNfzLfsohKnZxsqw+/ogcwmKvtHdbaLovY= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:59142 Archived-At: Hi, the following happens also in Emacs 23. Recipe: 1. emacs -Q 2. M-x calendar RET 3. evaluate: (require 'holidays) 4. evaluate: (add-to-list 'calendar-holidays '(holiday-sexp '(list 4 17 2012) "April 17th 2012")) 5. In the calendar, move point to April 17th 2012 and hit h. You'll see that "April 17th 2012" appears twice. I've debugged this. `calendar-holiday-list' indeed returns two entries for this date. The bug is in `holiday-sexp': | (defun holiday-sexp (sexp string) | "Sexp holiday for dates in the calendar window. | SEXP is an expression in variable `year' that is evaluated to | give `date'. STRING is an expression in `date' that evaluates to | the holiday description of `date'. If `date' is visible in the | calendar window, the holiday STRING is on that date. If date is | nil, or if the date is not visible, there is no holiday." | (let ((m displayed-month) | (y displayed-year) | year date) | (calendar-increment-month m y -1) | (holiday-filter-visible-calendar | (list | (progn | (setq year y | date (eval sexp)) | (list date (if date (eval string)))) | (progn | (setq year (1+ y) | date (eval sexp)) ;; <------------------------------- | (list date (if date (eval string)))))))) At the marked position, there is no check if `date' is in the incremented year. I see two possible fixes: 1. Add such a check, and set date to nil when it fails. 2. Add to the doc of `holiday-sexp' that a given sexp _must_ return either nil or a date which is in the year equal to the value of `year'. I would prefer 1., because I don't see the need for such a restriction. But I'm not really familiar with calendar stuff. Thanks, Michael. In GNU Emacs 24.1.50.1 (i486-pc-linux-gnu, GTK+ Version 3.2.3) of 2012-04-10 on zelenka, modified by Debian (emacs-snapshot package, version 2:20120410-1) Windowing system distributor `The X.Org Foundation', version 11.0.11104000 Configured using: `configure '--build' 'i486-linux-gnu' '--host' 'i486-linux-gnu' '--prefix=/usr' '--sharedstatedir=/var/lib' '--libexecdir=/usr/lib' '--localstatedir=/var' '--infodir=/usr/share/info' '--mandir=/usr/share/man' '--with-pop=yes' '--enable-locallisppath=/etc/emacs-snapshot:/etc/emacs:/usr/local/share/emacs/24.1.50/site-lisp:/usr/local/share/emacs/site-lisp:/usr/share/emacs/24.1.50/site-lisp:/usr/share/emacs/site-lisp' '--without-compress-info' '--with-crt-dir=/usr/lib/i386-linux-gnu/' '--with-x=yes' '--with-x-toolkit=gtk3' '--with-imagemagick=yes' 'build_alias=i486-linux-gnu' 'host_alias=i486-linux-gnu' 'CFLAGS=-DDEBIAN -DSITELOAD_PURESIZE_EXTRA=5000 -g -O2'' Important settings: value of $LC_ALL: de_DE.utf8 value of $LC_COLLATE: nil value of $LC_CTYPE: nil value of $LC_MESSAGES: nil value of $LC_MONETARY: nil value of $LC_NUMERIC: nil value of $LC_TIME: C value of $LANG: de_DE.utf8 value of $XMODIFIERS: nil locale-coding-system: utf-8-unix default enable-multibyte-characters: t