[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, 13 Mar 2008 05:40:03 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Glenn Morris <gm> 08/03/13 05:40:02
Index: cal-bahai.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/calendar/cal-bahai.el,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- cal-bahai.el 8 Mar 2008 21:36:14 -0000 1.28
+++ cal-bahai.el 13 Mar 2008 05:40:02 -0000 1.29
@@ -55,12 +55,6 @@
;;; Code:
-(defvar date)
-(defvar displayed-month)
-(defvar displayed-year)
-(defvar number)
-(defvar original-date)
-
(require 'cal-julian)
(defconst calendar-bahai-month-name-array
@@ -118,7 +112,7 @@
(1- (calendar-absolute-from-bahai (list month 1 year))))))
(list month day year))))
-;;;###autoload
+;;;###cal-autoload
(defun calendar-bahai-date-string (&optional date)
"String of Bahá'à date of Gregorian DATE.
Defaults to today's date if DATE is not given."
@@ -144,14 +138,14 @@
(year (int-to-string y)))
(mapconcat 'eval calendar-date-display-form ""))))
-;;;###autoload
+;;;###cal-autoload
(defun calendar-bahai-print-date ()
"Show the Bahá'à calendar equivalent of the selected date."
(interactive)
(message "Bahá'à date: %s"
(calendar-bahai-date-string (calendar-cursor-to-date t))))
-;;;###autoload
+;;;###cal-autoload
(defun calendar-bahai-goto-date (date &optional noecho)
"Move cursor to Bahá'à date DATE.
Echo Bahá'à date unless NOECHO is t."
@@ -183,10 +177,10 @@
(lambda (x) (and (< 0 x) (<= x 19))))))
(list (list month day year))))
-(defun diary-bahai-date ()
- "Bahá'à calendar equivalent of date diary entry."
- (format "Bahá'à date: %s" (calendar-bahai-date-string date)))
+(defvar displayed-month)
+(defvar displayed-year)
+;;;###holiday-autoload
(defun holiday-bahai (month day string)
"Holiday on MONTH, DAY (Bahá'Ã) called STRING.
If MONTH, DAY (Bahá'Ã) is visible, the value returned is corresponding
@@ -207,10 +201,14 @@
(if (calendar-date-is-visible-p date)
(list (list date string))))))))
+(defvar number)
+(defvar original-date)
+
;; d-b-l-e should be called from diary code.
(declare-function add-to-diary-list "diary-lib"
(date string specifier &optional marker globcolor literal))
+;;;###diary-autoload
(defun diary-bahai-list-entries ()
"Add any Bahá'à date entries from the diary file to `diary-entries-list'.
Bahá'à date diary entries must be prefaced by an
@@ -303,6 +301,7 @@
(declare-function mark-calendar-days-named "diary-lib"
(dayname &optional color))
+;;;###diary-autoload
(defun diary-bahai-mark-entries ()
"Mark days in the calendar window that have Bahá'à date diary entries.
Each entry in `diary-file' (or included files) visible in the calendar
@@ -412,6 +411,7 @@
(calendar-bahai-mark-date-pattern mm dd yy)))))
(setq d (cdr d)))))
+;;;###diary-autoload
(defun calendar-bahai-mark-date-pattern (month day year)
"Mark dates in calendar window that conform to Bahá'à date MONTH/DAY/YEAR.
A value of 0 in any position is a wildcard."
@@ -470,7 +470,7 @@
(mark-visible-calendar-date
(calendar-gregorian-from-absolute date)))))))))
-;;;###autoload
+;;;###cal-autoload
(defun diary-bahai-insert-entry (arg)
"Insert a diary entry.
For the Bahá'à date corresponding to the date indicated by point.
@@ -487,7 +487,7 @@
nil t))
arg)))
-;;;###autoload
+;;;###cal-autoload
(defun diary-bahai-insert-monthly-entry (arg)
"Insert a monthly diary entry.
For the day of the Bahá'à month corresponding to the date indicated by point.
@@ -505,7 +505,7 @@
(calendar-cursor-to-date t)))))
arg)))
-;;;###autoload
+;;;###cal-autoload
(defun diary-bahai-insert-yearly-entry (arg)
"Insert an annual diary entry.
For the day of the Bahá'à year corresponding to the date indicated by point.
@@ -525,6 +525,15 @@
(calendar-cursor-to-date t)))))
arg)))
+(defvar date)
+
+;; To be called from list-sexp-diary-entries, where DATE is bound.
+;;;###diary-autoload
+(defun diary-bahai-date ()
+ "Bahá'à calendar equivalent of date diary entry."
+ (format "Bahá'à date: %s" (calendar-bahai-date-string date)))
+
+
;; Backward compatibility.
(define-obsolete-function-alias
'list-bahai-diary-entries 'diary-bahai-list-entries "23.1")
@@ -547,7 +556,6 @@
;; Local Variables:
;; coding: utf-8
-;; generated-autoload-file: "cal-loaddefs.el"
;; End:
;; arch-tag: c1cb1d67-862a-4264-a01c-41cb4df01f14
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-bahai.el,v, Glenn Morris, 2008/03/07
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-bahai.el,v, Glenn Morris, 2008/03/07
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-bahai.el,v, Glenn Morris, 2008/03/08
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-bahai.el,v, Glenn Morris, 2008/03/08
- [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/03/13
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-bahai.el,v, Glenn Morris, 2008/03/13
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-bahai.el,v, Glenn Morris, 2008/03/13
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-bahai.el,v, Glenn Morris, 2008/03/14
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-bahai.el,v, Glenn Morris, 2008/03/15
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-bahai.el,v, Glenn Morris, 2008/03/20
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-bahai.el,v, Glenn Morris, 2008/03/24
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-bahai.el,v, Glenn Morris, 2008/03/25
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-bahai.el,v, Glenn Morris, 2008/03/26
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-bahai.el,v, Glenn Morris, 2008/03/28