[Emacs-diffs] Changes to emacs/lisp/calendar/lunar.el

[Richard M. Stallman]

Index: emacs/lisp/calendar/lunar.el
diff -c emacs/lisp/calendar/lunar.el:1.17 emacs/lisp/calendar/lunar.el:1.18
*** emacs/lisp/calendar/lunar.el:1.17   Mon Jul 16 03:46:48 2001
--- emacs/lisp/calendar/lunar.el        Mon Jul 22 11:30:43 2002
***************
*** 236,243 ****
             (displayed-year (extract-calendar-year date)))
        (calendar-phases-of-moon))))
  
! (defun diary-phases-of-moon ()
!   "Moon phases diary entry."
    (let* ((index (* 4
                     (truncate
                      (* 12.3685
--- 236,246 ----
             (displayed-year (extract-calendar-year date)))
        (calendar-phases-of-moon))))
  
! (defun diary-phases-of-moon (&optional mark)
! "Moon phases diary entry.
! 
! An optional parameter MARK specifies a face or single-character string to 
! use when highlighting the day in the calendar."
    (let* ((index (* 4
                     (truncate
                      (* 12.3685
***************
*** 250,257 ****
        (setq index (1+ index))
        (setq phase (lunar-phase index)))
      (if (calendar-date-equal (car phase) date)
!         (concat (lunar-phase-name (car (cdr (cdr phase)))) " "
!                 (car (cdr phase))))))
  
  
  ;;  For the Chinese calendar the calculations for the new moon need to be more
--- 253,260 ----
        (setq index (1+ index))
        (setq phase (lunar-phase index)))
      (if (calendar-date-equal (car phase) date)
!         (cons mark (concat (lunar-phase-name (car (cdr (cdr phase)))) " "
!                 (car (cdr phase)))))))
  
  
  ;;  For the Chinese calendar the calculations for the new moon need to be more