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

[Michael Heerdegen]

Ulrich Mueller <ulm@gentoo.org> writes:

> It is probably a matter of personal taste, but I dislike the nested
> concats. This seems simpler (not tested, though):
>
> -        (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) "" " ")
> +                        eclipse))))))

Fine by me (my preference would be Andreas' suggestion).

We also need to fix the space handling in calendar-lunar-phases aka M in
calendar - when no eclipse occurs, the descriptions end with a
trailing space.

Michael.