[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/calendar/cal-bahai.el,v
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/calendar/cal-bahai.el,v |
Date: |
Thu, 03 Apr 2008 04:05:56 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Glenn Morris <gm> 08/04/03 04:05:56
Index: cal-bahai.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/calendar/cal-bahai.el,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- cal-bahai.el 31 Mar 2008 16:24:12 -0000 1.43
+++ cal-bahai.el 3 Apr 2008 04:05:56 -0000 1.44
@@ -226,6 +226,33 @@
(calendar-absolute-from-bahai (list month day y)))))
(list (list date string))))))
+(autoload 'holiday-fixed "holidays")
+
+;;;###holiday-autoload
+(defun holiday-bahai-new-year ()
+ "Holiday entry for the Bahá'à New Year, if visible in the calendar window."
+ (holiday-fixed 3 21
+ (format "Bahá'à New Year (Naw-Ruz) %d"
+ (- displayed-year (1- 1844)))))
+
+;;;###holiday-autoload
+(defun holiday-bahai-ridvan (&optional all)
+ "Holidays related to Ridvan, as visible in the calendar window.
+Only considers the first, ninth, and twelfth days, unless ALL or
+`all-bahai-calendar-holidays' is non-nil."
+ (let ((ord ["First" "Second" "Third" "Fourth" "Fifth" "Sixth"
+ "Seventh" "Eighth" "Ninth" "Tenth" "Eleventh" "Twelfth"])
+ (show '(0 8 11))
+ rid h)
+ (if (or all all-bahai-calendar-holidays)
+ (setq show (number-sequence 0 11)))
+ ;; More trouble than it was worth...?
+ (dolist (i show (nreverse rid))
+ (if (setq h (holiday-fixed (if (< i 10) 4 5)
+ (+ i (if (< i 10) 21 -9))
+ (format "%s Day of Ridvan" (aref ord i))))
+ (push (car h) rid)))))
+
(autoload 'diary-list-entries-1 "diary-lib")
;;;###diary-autoload
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-bahai.el,v,
Glenn Morris <=
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-bahai.el,v, Glenn Morris, 2008/04/04
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-bahai.el,v, Glenn Morris, 2008/04/04
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-bahai.el,v, Glenn Morris, 2008/04/05
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-bahai.el,v, Glenn Morris, 2008/04/06
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-bahai.el,v, Glenn Morris, 2008/04/06
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-bahai.el,v, Glenn Morris, 2008/04/08