mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-03-03 12:31:32 -08:00
Code Issues Projects Releases Wiki Activity

Autoload diary-insert-entry-1.

Browse source 
(insert-islamic-diary-entry, insert-monthly-islamic-diary-entry)
(insert-yearly-islamic-diary-entry): Use diary-insert-entry-1.
This commit is contained in:
Glenn Morris 2008-03-29 02:43:32 +00:00
parent 8743fe88ed
commit 41099a1bea
1 changed files with 13 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

42
lisp/calendar/cal-islam.el
View file

@ -192,7 +192,7 @@ nil if it is not visible in the current calendar window."
(list displayed-month 15 displayed-year))))
(m (extract-calendar-month islamic-date))
(y (extract-calendar-year islamic-date))
(date))
date)
(unless (< m 1) ; Islamic calendar doesn't apply
(increment-calendar-month m y (- 10 month))
(if (> m 7) ; Islamic date might be visible
@ -241,20 +241,18 @@ window. See `list-islamic-diary-entries' for more information."
'calendar-islamic-from-absolute
'mark-islamic-calendar-date-pattern))
(autoload 'diary-insert-entry-1 "diary-lib")
;;;###cal-autoload
(defun insert-islamic-diary-entry (arg)
"Insert a diary entry.
For the Islamic date corresponding to the date indicated by point.
Prefix argument ARG makes the entry nonmarking."
(interactive "P")
(let ((calendar-month-name-array calendar-islamic-month-name-array))
(make-diary-entry
(concat islamic-diary-entry-symbol
(calendar-date-string
(calendar-islamic-from-absolute
(calendar-absolute-from-gregorian (calendar-cursor-to-date t)))
nil t))
arg)))
(diary-insert-entry-1 nil arg calendar-islamic-month-name-array
islamic-diary-entry-symbol
'calendar-islamic-from-absolute))
;;;###cal-autoload
(defun insert-monthly-islamic-diary-entry (arg)
@ -262,16 +260,9 @@ Prefix argument ARG makes the entry nonmarking."
For the day of the Islamic month corresponding to the date indicated by point.
Prefix argument ARG makes the entry nonmarking."
(interactive "P")
(let ((calendar-date-display-form (if european-calendar-style
'(day " * ")
'("* " day )))
(calendar-month-name-array calendar-islamic-month-name-array))
(make-diary-entry
(concat islamic-diary-entry-symbol
(calendar-date-string
(calendar-islamic-from-absolute
(calendar-absolute-from-gregorian (calendar-cursor-to-date t)))))
arg)))
(diary-insert-entry-1 'monthly arg calendar-islamic-month-name-array
islamic-diary-entry-symbol
'calendar-islamic-from-absolute))
;;;###cal-autoload
(defun insert-yearly-islamic-diary-entry (arg)
@ -279,16 +270,9 @@ Prefix argument ARG makes the entry nonmarking."
For the day of the Islamic year corresponding to the date indicated by point.
Prefix argument ARG makes the entry nonmarking."
(interactive "P")
(let ((calendar-date-display-form (if european-calendar-style
'(day " " monthname)
'(monthname " " day)))
(calendar-month-name-array calendar-islamic-month-name-array))
(make-diary-entry
(concat islamic-diary-entry-symbol
(calendar-date-string
(calendar-islamic-from-absolute
(calendar-absolute-from-gregorian (calendar-cursor-to-date t)))))
arg)))
(diary-insert-entry-1 'yearly arg calendar-islamic-month-name-array
islamic-diary-entry-symbol
'calendar-islamic-from-absolute))
(defvar date)