From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Michael Heerdegen Newsgroups: gmane.emacs.bugs Subject: bug#61460: 30.0.50; Calendar shows eclipse for quarter moon Date: Tue, 21 Feb 2023 16:15:34 +0100 Message-ID: <87a61759t5.fsf@web.de> References: <87sffab61y.fsf@web.de> <87cz6eb10y.fsf@web.de> <87r0uu9e5v.fsf@web.de> <87mt5i9cba.fsf@web.de> <875yc4q0ee.fsf@web.de> <87y1p0obe8.fsf@web.de> <87ttzoo6px.fsf@web.de> <87pma8q2w1.fsf@web.de> <87wn4g4v1y.fsf@web.de> <87y1ovecz2.fsf@web.de> <8735739vun.fsf@web.de> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="2506"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: Eli Zaretskii , 61460@debbugs.gnu.org To: Ulrich Mueller Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue Feb 21 16:16:31 2023 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pUUNZ-0000Ke-Q5 for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 21 Feb 2023 16:16:29 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pUUNB-0005k5-4N; Tue, 21 Feb 2023 10:16:05 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pUUN8-0005ja-D0 for bug-gnu-emacs@gnu.org; Tue, 21 Feb 2023 10:16:02 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pUUN8-0005dU-3i for bug-gnu-emacs@gnu.org; Tue, 21 Feb 2023 10:16:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pUUN7-0002mV-Q1 for bug-gnu-emacs@gnu.org; Tue, 21 Feb 2023 10:16:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Michael Heerdegen Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 21 Feb 2023 15:16:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61460 X-GNU-PR-Package: emacs Original-Received: via spool by 61460-submit@debbugs.gnu.org id=B61460.167699255510666 (code B ref 61460); Tue, 21 Feb 2023 15:16:01 +0000 Original-Received: (at 61460) by debbugs.gnu.org; 21 Feb 2023 15:15:55 +0000 Original-Received: from localhost ([127.0.0.1]:57022 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pUUMx-0002lu-Bi for submit@debbugs.gnu.org; Tue, 21 Feb 2023 10:15:55 -0500 Original-Received: from mout.web.de ([212.227.15.14]:42925) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pUUMr-0002lb-Dj for 61460@debbugs.gnu.org; Tue, 21 Feb 2023 10:15:50 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=s29768273; t=1676992536; i=michael_heerdegen@web.de; bh=imZBr/ohR5kAwLi21o5G0+fxxutIL3w/+0Qe/Rd/pfI=; h=X-UI-Sender-Class:From:To:Cc:Subject:In-Reply-To:References:Date; b=f58wl2oK9DvJMcqk1A46/lMXS/HGiN9QtWUqHR0ku71gjmi8enRnJSvOs3XgkFoRv SGC1c5MdAoa3qELmGLufymEtbVwlhKQRdA3QXYNurp/UuEURf9gbLTE6a8JQ/Tghf+ nzre889SHZ7vDrkpW3xzX/iybjR/voEj0W3ieKp5SQUhwFa8ZcTv/2P4dpbGvEGYs8 ffpgAlQfsXc6XcMgE0tB26jYH4K1/MFOrO16I80cSw3AzwDXXNJOPAb+t92tfkeBLD Ch42c8tWysq4SdWZ06pPCay9MCS/Ai71pRJqw4dOX+ioBjfq6vVInIpek/3W0d6yOL 4gd6dIt6mt9OA== X-UI-Sender-Class: 814a7b36-bfc1-4dae-8640-3722d8ec6cd6 Original-Received: from drachen.dragon ([84.59.210.57]) by smtp.web.de (mrweb005 [213.165.67.108]) with ESMTPSA (Nemesis) id 1MHVen-1pHY4U3Tqz-00DYJH; Tue, 21 Feb 2023 16:15:35 +0100 In-Reply-To: <8735739vun.fsf@web.de> (Michael Heerdegen's message of "Sat, 18 Feb 2023 10:16:48 +0100") X-Provags-ID: V03:K1:c07OnRCR1Hw8lu6MCoJpe/n9imMbsoE78tFB/XeHKs89wGE5kAB i8rD9mfoRY4SAUHZ1+vpTYI5pfO85wi5cArwqzkXrozwKigUoJils00BeshtMLAT2j3KkpP PPcQaAVD5SYxNI9vLNnfI/DKDrVLHO30IsNs9ogB/Qo4ziYtx3S700u1Iw5w2mhgRJWm6JP 6cxG/QHEnbLkFMHCE7D7A== UI-OutboundReport: notjunk:1;M01:P0:H2Wkpnr0oUg=;PamN7Okv7i1oFr/1UR2EQOHeBlX Ewj7/LrUbcvrdJJg29+8HjwC79tsAC1eIGNmu+V4plc2lsLWCh+GHx+GZWgIZ3OBk5Lcxzmg2 yAPGmSBcqZOsXosZY2snLhc86MJKwsv4qx11Bt0HlthDFs7OyX69y4KEENU53BY1upD/BbI89 eZD9D9bEhaKzbDKNUQYv6yF/2yG6t2/YoMXkqyh3gUdVMdzsm0ThA2Wl0EaE2603g/AzkfZy7 m3kqz6aaxg4TX0yQ2Y1XAUB/fS3TOVkUR1wkhMX57pVB8qKXPnlBJobZC777fsBQtMW/TGBRv AVlSIOLhGZ7tmxg8zSgOGeR26MwVLSaBaba8FiA7PrUq1O89fdkmRZqzJ6nrm/NYRYeLWFUEx bn+XlwIciq9J9edVPfXCAVkFn7LuNmas6E/QwcFapJyLRd0LeA54nuC1LsNPjp+YSDZvECFrt rUzxhVVEIOBCiqzh8E30SbNH6njkH+6qMr7BZnxxqxrYZFh3r7flmy5uxUqiRXGIZt9J6yyDt hgA/yU83NT1LBrGw6XaSBiZZFrqwHXqino0u3WCV3itRLbYKuUkIM/Y0s/CUvBuTnz/FxY0KT glcxmTKvX2veHYNq3oVUzNi/sfBRdPwzla+EF8zjvId8ERbMB30CLZz5okCNZhC6aYBqz8AQO oa7F3aQjfR0wZYgYzThflgc1RNzfY0pHRg+AXICtpC+g4+Q6mfp+Ptbt21dW7/8V+9xTCUgy9 wgjmHfpcI9AgpT6Stju1aPeyrZJjaYoJho+Lb7aZRcHbOCPJdfJ26gJUi158CzTtK1MwsEMD X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:256283 Archived-At: --=-=-= Content-Type: text/plain Michael Heerdegen writes: > That remark made me think about whether we want a `diary-eclipses' - or > teach `diary-lunar-phases' to report eclipses (at the moment the latter > doesn't report eclipses, I just tried). Seems getting the latter is quite simple: --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=lunar-diary-eclipse.diff Content-Transfer-Encoding: quoted-printable diff --git a/lisp/calendar/lunar.el b/lisp/calendar/lunar.el index 4f8f34d954f..5b73bb6e29e 100644 =2D-- a/lisp/calendar/lunar.el +++ b/lisp/calendar/lunar.el @@ -284,8 +284,13 @@ diary-lunar-phases (setq index (1+ index) phase (lunar-phase index))) (if (calendar-date-equal (car phase) date) - (cons mark (concat (lunar-phase-name (nth 2 phase)) " " - (cadr phase)))))) + (cons mark + (let ((eclipse (nth 3 phase))) + (concat (lunar-phase-name (nth 2 phase)) " " + (cadr phase) + (if (string-empty-p eclipse) + "" + (concat " " eclipse)))))))) ;; For the Chinese calendar the calculations for the new moon need to be = more ;; accurate than those above, so we use more terms in the approximation. --=-=-= Content-Type: text/plain Michael. --=-=-=--