From: Glenn Morris <rgm@gnu.org>
Date: Sat, 12 Apr 2008 03:12:29 +0000 (+0000)
Subject: Move non-autoloaded define-obsolete-variable-alias calls for
X-Git-Tag: emacs-pretest-23.0.90~6314
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1a9f2b775ed169747f276708071df0f0a2a3d640;p=emacs.git

Move non-autoloaded define-obsolete-variable-alias calls for
defcustoms not in dumped files before the associated defcustom.
---

diff --git a/lisp/calendar/cal-hebrew.el b/lisp/calendar/cal-hebrew.el
index dddc3080f1d..0d80de66d92 100644
--- a/lisp/calendar/cal-hebrew.el
+++ b/lisp/calendar/cal-hebrew.el
@@ -34,6 +34,9 @@
 
 (require 'calendar)
 
+(define-obsolete-variable-alias 'diary-sabbath-candles-minutes
+  'diary-hebrew-sabbath-candles-minutes "23.1")
+
 (defcustom diary-hebrew-sabbath-candles-minutes 18
   "Number of minutes before sunset for sabbath candle lighting.
 Used by `diary-hebrew-sabbath-candles'."
@@ -41,9 +44,6 @@ Used by `diary-hebrew-sabbath-candles'."
   :type 'integer
   :version "21.1")
 
-(define-obsolete-variable-alias 'diary-sabbath-candles-minutes
-  'diary-hebrew-sabbath-candles-minutes "23.1")
-
 ;; End of user options.
 
 (defun calendar-hebrew-leap-year-p (year)
diff --git a/lisp/calendar/cal-x.el b/lisp/calendar/cal-x.el
index 76f77315cf1..4c5f3d951fd 100644
--- a/lisp/calendar/cal-x.el
+++ b/lisp/calendar/cal-x.el
@@ -67,14 +67,14 @@ Relevant if `calendar-setup' has the value `one-frame'."
              (vertical-scroll-bars boolean))
   :group 'calendar)
 
+(define-obsolete-variable-alias 'calendar-after-frame-setup-hooks
+  'calendar-after-frame-setup-hook "23.1")
+
 (defcustom calendar-after-frame-setup-hook nil
   "List of functions to be run after creating a calendar and/or diary frame."
   :type 'hook
   :group 'calendar-hooks)
 
-(define-obsolete-variable-alias 'calendar-after-frame-setup-hooks
-  'calendar-after-frame-setup-hook "23.1")
-
 ;;; End of user options.
 
 (defvar calendar-frame nil