From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Ulrich =?UTF-8?Q?M=C3=BCller?= Newsgroups: gmane.emacs.bugs Subject: bug#61460: 30.0.50; Calendar shows eclipse for quarter moon Date: Sun, 12 Feb 2023 21:07:09 +0100 Message-ID: References: Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="3845"; mail-complaints-to="usenet@ciao.gmane.io" To: 61460@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sun Feb 12 21:08:16 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 1pRIe0-0000pv-D7 for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 12 Feb 2023 21:08:16 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pRIdo-0003Bd-TZ; Sun, 12 Feb 2023 15:08:04 -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 1pRIdn-0003BM-9v for bug-gnu-emacs@gnu.org; Sun, 12 Feb 2023 15:08:03 -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 1pRIdn-0002Yv-1e for bug-gnu-emacs@gnu.org; Sun, 12 Feb 2023 15:08:03 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pRIdm-0003Qs-CZ for bug-gnu-emacs@gnu.org; Sun, 12 Feb 2023 15:08:02 -0500 X-Loop: help-debbugs@gnu.org In-Reply-To: Resent-From: Ulrich =?UTF-8?Q?M=C3=BCller?= Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 12 Feb 2023 20:08:02 +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.167623244113144 (code B ref 61460); Sun, 12 Feb 2023 20:08:02 +0000 Original-Received: (at 61460) by debbugs.gnu.org; 12 Feb 2023 20:07:21 +0000 Original-Received: from localhost ([127.0.0.1]:46850 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pRId7-0003Pw-KV for submit@debbugs.gnu.org; Sun, 12 Feb 2023 15:07:21 -0500 Original-Received: from woodpecker.gentoo.org ([140.211.166.183]:49366 helo=smtp.gentoo.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pRId6-0003Pi-1j for 61460@debbugs.gnu.org; Sun, 12 Feb 2023 15:07:20 -0500 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:255442 Archived-At: This patch for lunar.el fixes the problem for me: >From cde66af556a76beb4c4232c4056fe8b60dbafe30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ulrich=20M=C3=BCller?= Date: Sun, 12 Feb 2023 20:57:49 +0100 Subject: [PATCH] Fix spurious display of eclipses in Calendar * lisp/calendar/lunar.el (eclipse-check): Don't show an eclipse unless it's new moon or full moon. (bug#61460) --- lisp/calendar/lunar.el | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lisp/calendar/lunar.el b/lisp/calendar/lunar.el index 0db811417af..70681f42c90 100644 --- a/lisp/calendar/lunar.el +++ b/lisp/calendar/lunar.el @@ -161,7 +161,9 @@ remainder mod 4 gives the phase: 0 new moon, 1 first quarter, 2 full moon, (phase-name (cond ((= phase 0) "Solar") ((= phase 2) "Lunar") (t "")))) - (cond ((< moon-lat 2.42600766e-1) + (cond ((string= phase-name "") + "") + ((< moon-lat 2.42600766e-1) (concat "** " phase-name " Eclipse **")) ((< moon-lat 0.37) (concat "** " phase-name " Eclipse possible **")) -- 2.39.1