# HG changeset patch # User Glenn Morris # Date 1206758612 0 # Node ID 6facf919dde4a38281d70d9e9a003663cf449fcb # Parent ed15c3f99e18f732fa45fd36806eef6e8cc380ba Autoload diary-insert-entry-1. (insert-islamic-diary-entry, insert-monthly-islamic-diary-entry) (insert-yearly-islamic-diary-entry): Use diary-insert-entry-1. diff -r ed15c3f99e18 -r 6facf919dde4 lisp/calendar/cal-islam.el --- a/lisp/calendar/cal-islam.el Sat Mar 29 02:42:52 2008 +0000 +++ b/lisp/calendar/cal-islam.el Sat Mar 29 02:43:32 2008 +0000 @@ -192,7 +192,7 @@ (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 @@ '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 @@ 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 @@ 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)