Require calendar rather than cal-julian.

Autoload calendar-absolute-from-julian.
(calendar-islamic-epoch): Set when compiling.  Doc fix.

diff --git a/lisp/calendar/cal-islam.el b/lisp/calendar/cal-islam.el
index e1a6e47ca4bca4b25c12b72a21752de9c402c52e..2819eb7299f0b2e375d736aac8b214fd20c1948c 100644 (file)
--- a/lisp/calendar/cal-islam.el
+++ b/lisp/calendar/cal-islam.el
@@ -36,15 +36,19 @@
 
 ;;; Code:
 
-(require 'cal-julian)
+(require 'calendar)
 
 (defconst calendar-islamic-month-name-array
   ["Muharram" "Safar" "Rabi I" "Rabi II" "Jumada I" "Jumada II"
    "Rajab" "Sha'ban" "Ramadan" "Shawwal" "Dhu al-Qada" "Dhu al-Hijjah"]
 "Array of strings giving the names of the Islamic months.")
 
-(defconst calendar-islamic-epoch (calendar-absolute-from-julian '(7 16 622))
-  "Absolute date of start of Islamic calendar = August 29, 284 AD (Julian).")
+(eval-and-compile
+  (autoload 'calendar-absolute-from-julian "cal-julian"))
+
+(defconst calendar-islamic-epoch
+  (eval-when-compile (calendar-absolute-from-julian '(7 16 622)))
+  "Absolute date of start of Islamic calendar = July 16, 622 AD (Julian).")
 
 (defun islamic-calendar-leap-year-p (year)
   "Return t if YEAR is a leap year on the Islamic calendar."