bug#61460: 30.0.50; Calendar shows eclipse for quarter moon

[Michael Heerdegen <michael_heerdegen@web.de>]

[-- Attachment #1: Type: text/plain, Size: 288 bytes --]

Michael Heerdegen <michael_heerdegen@web.de> 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:


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: lunar-diary-eclipse.diff --]
[-- Type: text/x-diff, Size: 908 bytes --]

diff --git a/lisp/calendar/lunar.el b/lisp/calendar/lunar.el
index 4f8f34d954f..5b73bb6e29e 100644
--- 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.

[-- Attachment #3: Type: text/plain, Size: 11 bytes --]



Michael.