From: Glenn Morris <rgm@gnu.org>
Date: Wed, 26 Mar 2008 03:12:02 +0000 (+0000)
Subject: Require calendar rather than cal-julian.
X-Git-Tag: emacs-pretest-23.0.90~6920
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=73f7eb5970f108a508827ac6fab97cbda6a0d43a;p=emacs.git

Require calendar rather than cal-julian.
Autoload calendar-absolute-from-julian.
(persian-calendar-epoch): Set when compiling.
---

diff --git a/lisp/calendar/cal-persia.el b/lisp/calendar/cal-persia.el
index 5b4e6ff6007..419286face2 100644
--- a/lisp/calendar/cal-persia.el
+++ b/lisp/calendar/cal-persia.el
@@ -32,14 +32,18 @@
 
 ;;; Code:
 
-(require 'cal-julian)
+(require 'calendar)
 
 (defconst persian-calendar-month-name-array
   ["Farvardin" "Ordibehest" "Xordad" "Tir" "Mordad" "Sahrivar" "Mehr" "Aban"
    "Azar" "Dey" "Bahman" "Esfand"]
   "Names of the months in the Persian calendar.")
 
-(defconst persian-calendar-epoch (calendar-absolute-from-julian '(3 19 622))
+(eval-and-compile
+  (autoload 'calendar-absolute-from-julian "cal-julian"))
+
+(defconst persian-calendar-epoch
+  (eval-when-compile (calendar-absolute-from-julian '(3 19 622)))
   "Absolute date of start of Persian calendar = March 19, 622 AD (Julian).")
 
 (defun persian-calendar-leap-year-p (year)