* calc/calc.el (calc-gregorian-switch): Move to after calc-refresh

definition.  This fixes a bootstrap failure.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 253392f..cbf8045 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * calc/calc.el (calc-gregorian-switch): Move to after calc-refresh
+       definition.  This fixes a bootstrap failure.
+
 2012-11-22  Jay Belanger  <jay.p.belanger@gmail.com>
 
        * calc/calc.el (calc-gregorian-switch): Refresh the Calc buffer

diff --git a/lisp/calc/calc.el b/lisp/calc/calc.el
index 99e4076..ff4e5d7 100644 (file)
--- a/lisp/calc/calc.el
+++ b/lisp/calc/calc.el
@@ -466,51 +466,6 @@ to be identified as that note."
 
 (defvar math-format-date-cache) ; calc-forms.el
 
-;; Dates that are built-in options for `calc-gregorian-switch' should be
-;; (YEAR MONTH DAY math-date-from-gregorian-dt(YEAR MONTH DAY)) for speed.
-(defcustom calc-gregorian-switch nil
-  "The first day the Gregorian calendar is used by Calc's date forms.
-This is `nil' (the default) if the Gregorian calendar is the only one used.
-Otherwise, it should be a list `(YEAR MONTH DAY)' when Calc begins to use
-the Gregorian calendar; Calc will use the Julian calendar for earlier dates.
-The dates in which different regions of the world began to use the
-Gregorian calendar vary quite a bit, even within a single country.
-If you want Calc's date forms to switch between the Julian and
-Gregorian calendar, you can specify the date or choose from several
-common choices.  Some of these choices should be taken with a grain
-of salt; for example different parts of France changed calendars at
-different times, and Sweden's change to the Gregorian calendar was
-complicated.  Also, the boundaries of the countries were different at
-the times of the calendar changes than they are now.
-The Vatican decided that the Gregorian calendar should take effect
-on 15 October 1582 (Gregorian), and many Catholic countries made
-the change then.  Great Britian and its colonies had the Gregorian
-calendar take effect on 14 September 1752 (Gregorian); this includes
-the United States."
-  :group 'calc
-  :version "24.4"
-  :type '(choice (const :tag "Always use the Gregorian calendar" nil)
-                 (const :tag "Great Britian and the US (1752 9 14)" (1752 9 14 639797))
-                 (const :tag "Vatican (1582 10 15)" (1582 10 15 577736))
-                 (const :tag "Czechoslovakia (1584 1 17)" (1584 1 17 578195))
-                 (const :tag "Denmark (1700 3 1)" (1700 3 1 620607))
-                 (const :tag "France (1582 12 20)" (1582 12 20 577802))
-                 (const :tag "Hungary (1587 11 1)" (1587 11 1 579579))
-                 (const :tag "Luxemburg (1582 12 25)" (1582 12 25 577807))
-                 (const :tag "Romania (1919 4 14)" (1919 4 14 700638))
-                 (const :tag "Russia (1918 2 14)" (1918 2 14 700214))
-                 (const :tag "Sweden (1753 3 1)" (1753 3 1 639965))
-                 (const :tag "Switzerland (Catholic) (1584 1 22)" (1584 1 22 578200))
-                 (const :tag "Switzerland (Protestant) (1701 1 12)" (1701 1 12 620924))
-                 (list :tag "(YEAR MONTH DAY)"
-                       (integer :tag "Year")
-                       (integer :tag "Month (integer)")
-                       (integer :tag "Day")))
-  :set (lambda (symbol value)
-         (set-default symbol value)
-         (setq math-format-date-cache nil)
-         (calc-refresh)))
-
 (defface calc-nonselected-face
   '((t :inherit shadow
        :slant italic))
@@ -2067,6 +2022,51 @@ See calc-keypad for details."
         (calc-refresh align)))
   (setq calc-refresh-count (1+ calc-refresh-count)))
 
+;; Dates that are built-in options for `calc-gregorian-switch' should be
+;; (YEAR MONTH DAY math-date-from-gregorian-dt(YEAR MONTH DAY)) for speed.
+(defcustom calc-gregorian-switch nil
+  "The first day the Gregorian calendar is used by Calc's date forms.
+This is `nil' (the default) if the Gregorian calendar is the only one used.
+Otherwise, it should be a list `(YEAR MONTH DAY)' when Calc begins to use
+the Gregorian calendar; Calc will use the Julian calendar for earlier dates.
+The dates in which different regions of the world began to use the
+Gregorian calendar vary quite a bit, even within a single country.
+If you want Calc's date forms to switch between the Julian and
+Gregorian calendar, you can specify the date or choose from several
+common choices.  Some of these choices should be taken with a grain
+of salt; for example different parts of France changed calendars at
+different times, and Sweden's change to the Gregorian calendar was
+complicated.  Also, the boundaries of the countries were different at
+the times of the calendar changes than they are now.
+The Vatican decided that the Gregorian calendar should take effect
+on 15 October 1582 (Gregorian), and many Catholic countries made
+the change then.  Great Britian and its colonies had the Gregorian
+calendar take effect on 14 September 1752 (Gregorian); this includes
+the United States."
+  :group 'calc
+  :version "24.4"
+  :type '(choice (const :tag "Always use the Gregorian calendar" nil)
+                 (const :tag "Great Britian and the US (1752 9 14)" (1752 9 14 639797))
+                 (const :tag "Vatican (1582 10 15)" (1582 10 15 577736))
+                 (const :tag "Czechoslovakia (1584 1 17)" (1584 1 17 578195))
+                 (const :tag "Denmark (1700 3 1)" (1700 3 1 620607))
+                 (const :tag "France (1582 12 20)" (1582 12 20 577802))
+                 (const :tag "Hungary (1587 11 1)" (1587 11 1 579579))
+                 (const :tag "Luxemburg (1582 12 25)" (1582 12 25 577807))
+                 (const :tag "Romania (1919 4 14)" (1919 4 14 700638))
+                 (const :tag "Russia (1918 2 14)" (1918 2 14 700214))
+                 (const :tag "Sweden (1753 3 1)" (1753 3 1 639965))
+                 (const :tag "Switzerland (Catholic) (1584 1 22)" (1584 1 22 578200))
+                 (const :tag "Switzerland (Protestant) (1701 1 12)" (1701 1 12 620924))
+                 (list :tag "(YEAR MONTH DAY)"
+                       (integer :tag "Year")
+                       (integer :tag "Month (integer)")
+                       (integer :tag "Day")))
+  :set (lambda (symbol value)
+         (set-default symbol value)
+         (setq math-format-date-cache nil)
+         (calc-refresh)))
+
 ;;;; The Calc Trail buffer.
 
 (defun calc-check-trail-aligned ()