From: Michael Heerdegen <michael_heerdegen@web.de>
To: Ulrich Mueller <ulm@gentoo.org>
Cc: 61460@debbugs.gnu.org
Subject: bug#61460: 30.0.50; Calendar shows eclipse for quarter moon
Date: Wed, 22 Feb 2023 17:26:49 +0100 [thread overview]
Message-ID: <871qmhfyye.fsf@web.de> (raw)
In-Reply-To: <ulekppusy@gentoo.org> (Ulrich Mueller's message of "Wed, 22 Feb 2023 16:46:21 +0100")
[-- Attachment #1: Type: text/plain, Size: 482 bytes --]
Ulrich Mueller <ulm@gentoo.org> writes:
> >>>>> On Wed, 22 Feb 2023, Michael Heerdegen wrote:
>
> > + (let ((eclipse (nth 3 x)))
> > + (concat (calendar-date-string (car x)) ": "
> > + (lunar-phase-name (nth 2 x)) " "
> > + (cadr x) (unless (string-empty-p eclipse) " ")
> > + eclipse)))
>
> Fix the indentation? The tabs in this line are the only ones in the
> file.
Impressive discovery! Updated patch:
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Make-also-diary-lunar-phases-report-eclipses.patch --]
[-- Type: text/x-diff, Size: 2083 bytes --]
From 039668a5a4b27ea7e841592b9be42e50af1abe74 Mon Sep 17 00:00:00 2001
From: Michael Heerdegen <michael_heerdegen@web.de>
Date: Wed, 22 Feb 2023 14:56:07 +0100
Subject: [PATCH] Make also 'diary-lunar-phases' report eclipses
* lisp/calendar/lunar.el (diary-lunar-phases): Report eclipses.
(calendar-lunar-phases): Tweak.
---
lisp/calendar/lunar.el | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/lisp/calendar/lunar.el b/lisp/calendar/lunar.el
index 4f8f34d954f..5b22043102d 100644
--- a/lisp/calendar/lunar.el
+++ b/lisp/calendar/lunar.el
@@ -245,10 +245,11 @@ calendar-lunar-phases
(insert
(mapconcat
(lambda (x)
- (format "%s: %s %s %s" (calendar-date-string (car x))
- (lunar-phase-name (nth 2 x))
- (cadr x)
- (car (last x))))
+ (let ((eclipse (nth 3 x)))
+ (concat (calendar-date-string (car x)) ": "
+ (lunar-phase-name (nth 2 x)) " "
+ (cadr x) (unless (string-empty-p eclipse) " ")
+ eclipse)))
(lunar-phase-list m1 y1) "\n")))
(message "Computing phases of the moon...done"))))
@@ -283,9 +284,13 @@ diary-lunar-phases
(while (calendar-date-compare phase (list date))
(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))))))
+ (and (calendar-date-equal (car phase) date)
+ (cons mark
+ (let ((eclipse (nth 3 phase)))
+ (concat (lunar-phase-name (nth 2 phase)) " "
+ (cadr phase)
+ (unless (string-empty-p eclipse) " ")
+ 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.
--
2.30.2
[-- Attachment #3: Type: text/plain, Size: 11 bytes --]
Michael.
next prev parent reply other threads:[~2023-02-22 16:26 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-12 19:57 bug#61460: 30.0.50; Calendar shows eclipse for quarter moon Ulrich Mueller
2023-02-12 20:07 ` Ulrich Müller
2023-02-12 20:19 ` Eli Zaretskii
2023-02-12 21:13 ` Ulrich Mueller
2023-02-13 3:24 ` Eli Zaretskii
2023-02-13 3:25 ` Michael Heerdegen
2023-02-13 4:52 ` Michael Heerdegen
2023-02-13 5:13 ` Michael Heerdegen
2023-02-13 6:01 ` Michael Heerdegen
2023-02-13 7:28 ` Ulrich Mueller
2023-02-13 8:13 ` Michael Heerdegen
2023-02-13 8:52 ` Michael Heerdegen
2023-02-13 9:34 ` Ulrich Mueller
2023-02-13 10:04 ` Michael Heerdegen
2023-02-13 13:03 ` Eli Zaretskii
2023-02-13 13:30 ` Ulrich Mueller
2023-02-13 14:05 ` Eli Zaretskii
2023-02-14 5:30 ` Michael Heerdegen
2023-02-14 7:59 ` Ulrich Mueller
2023-02-14 9:15 ` Michael Heerdegen
2023-02-14 10:22 ` Ulrich Müller
2023-02-14 10:56 ` Michael Heerdegen
2023-02-16 20:26 ` Ulrich Müller
2023-02-17 5:25 ` Michael Heerdegen
2023-02-17 7:03 ` Ulrich Müller
2023-02-17 7:20 ` Michael Heerdegen
2023-02-18 5:53 ` Michael Heerdegen
2023-02-18 8:56 ` Ulrich Mueller
2023-02-18 9:16 ` Michael Heerdegen
2023-02-21 15:15 ` Michael Heerdegen
2023-02-22 9:00 ` Ulrich Mueller
2023-02-22 9:45 ` Andreas Schwab
2023-02-22 10:03 ` Michael Heerdegen
2023-02-22 11:32 ` Ulrich Mueller
2023-02-22 14:19 ` Michael Heerdegen
2023-02-22 15:46 ` Ulrich Mueller
2023-02-22 16:26 ` Michael Heerdegen [this message]
2023-02-25 16:13 ` Michael Heerdegen
2023-02-14 13:31 ` Eli Zaretskii
2023-02-14 10:49 ` Ulrich Mueller
2023-02-13 6:21 ` Ulrich Mueller
2023-02-13 7:08 ` Michael Heerdegen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=871qmhfyye.fsf@web.de \
--to=michael_heerdegen@web.de \
--cc=61460@debbugs.gnu.org \
--cc=ulm@gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).