2 files changed, 9 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 87490752f3f..d1f8d9d34ce 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2009-03-02  Glenn Morris  <rgm@gnu.org>
 
+        * calendar/calendar.el (diary-date-forms, calendar-date-display-form):
+        Add :set-after listing variables on which we might depend.
+
         * mail/rmail.el (rmail-reply): Use rmail-apply-in-message so that this
         function has access to all the headers, not just the visible ones.
 
diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el
index 172a55cfc84..47bf62fa06a 100644
--- a/lisp/calendar/calendar.el
+++ b/lisp/calendar/calendar.el
@@ -836,6 +836,9 @@ For examples of three common styles, see `diary-american-date-forms',
                          (repeat (list :inline t :format "%v"
                                        (symbol :tag "Keyword")
                                        (choice symbol regexp)))))
+  :set-after '(calendar-date-style diary-iso-date-forms
+                                   diary-european-date-forms
+                                   diary-american-date-forms)
   :initialize 'custom-initialize-default
   :set (lambda (symbol value)
          (unless (equal value (eval symbol))
@@ -903,6 +906,9 @@ would give the usual American style in fixed-length fields.  The variables
 `calendar-american-date-display-form' provide some defaults for three common
 styles."
   :type 'sexp
+  :set-after '(calendar-date-style calendar-iso-date-display-form
+                                   calendar-european-date-display-form
+                                   calendar-american-date-display-form)
   :group 'calendar)
 
 (defun calendar-set-date-style (style)