aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2008-04-12 03:12:29 +0000
committerGlenn Morris2008-04-12 03:12:29 +0000
commit1a9f2b775ed169747f276708071df0f0a2a3d640 (patch)
treeaec26b20f366b2313d797300e263dc727820729c
parent6a979a50dc9cb7509cf38722ea7cdb66b67171e5 (diff)
downloademacs-1a9f2b775ed169747f276708071df0f0a2a3d640.tar.gz
emacs-1a9f2b775ed169747f276708071df0f0a2a3d640.zip
Move non-autoloaded define-obsolete-variable-alias calls for
defcustoms not in dumped files before the associated defcustom.
-rw-r--r--lisp/calendar/cal-hebrew.el6
-rw-r--r--lisp/calendar/cal-x.el6
2 files changed, 6 insertions, 6 deletions
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 @@
34 34
35(require 'calendar) 35(require 'calendar)
36 36
37(define-obsolete-variable-alias 'diary-sabbath-candles-minutes
38 'diary-hebrew-sabbath-candles-minutes "23.1")
39
37(defcustom diary-hebrew-sabbath-candles-minutes 18 40(defcustom diary-hebrew-sabbath-candles-minutes 18
38 "Number of minutes before sunset for sabbath candle lighting. 41 "Number of minutes before sunset for sabbath candle lighting.
39Used by `diary-hebrew-sabbath-candles'." 42Used by `diary-hebrew-sabbath-candles'."
@@ -41,9 +44,6 @@ Used by `diary-hebrew-sabbath-candles'."
41 :type 'integer 44 :type 'integer
42 :version "21.1") 45 :version "21.1")
43 46
44(define-obsolete-variable-alias 'diary-sabbath-candles-minutes
45 'diary-hebrew-sabbath-candles-minutes "23.1")
46
47;; End of user options. 47;; End of user options.
48 48
49(defun calendar-hebrew-leap-year-p (year) 49(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'."
67 (vertical-scroll-bars boolean)) 67 (vertical-scroll-bars boolean))
68 :group 'calendar) 68 :group 'calendar)
69 69
70(define-obsolete-variable-alias 'calendar-after-frame-setup-hooks
71 'calendar-after-frame-setup-hook "23.1")
72
70(defcustom calendar-after-frame-setup-hook nil 73(defcustom calendar-after-frame-setup-hook nil
71 "List of functions to be run after creating a calendar and/or diary frame." 74 "List of functions to be run after creating a calendar and/or diary frame."
72 :type 'hook 75 :type 'hook
73 :group 'calendar-hooks) 76 :group 'calendar-hooks)
74 77
75(define-obsolete-variable-alias 'calendar-after-frame-setup-hooks
76 'calendar-after-frame-setup-hook "23.1")
77
78;;; End of user options. 78;;; End of user options.
79 79
80(defvar calendar-frame nil 80(defvar calendar-frame nil