(diary-frame-parameters, calendar-frame-parameters)

(calendar-and-diary-frame-parameters, calendar-after-frame-setup-hooks):
Make defcustoms.

diff --git a/lisp/calendar/cal-x.el b/lisp/calendar/cal-x.el
index 8a889bf208551c6d244c839dfc4b39968411ebe1..84dac9a03475d6f64cbafd5cd5db8c9e6d653f3d 100644 (file)
--- a/lisp/calendar/cal-x.el
+++ b/lisp/calendar/cal-x.el
@@ -35,34 +35,43 @@
 
 (require 'calendar)
 
-(defvar calendar-frame nil "Frame in which to display the calendar.")
-
-(defvar diary-frame nil "Frame in which to display the diary.")
-
-;; This should not specify the font.  That's up to the user.
-;; Certainly it should not specify auto-lower and auto-raise
-;; since most users won't like that.
-(defvar diary-frame-parameters
+(defcustom diary-frame-parameters
   '((name . "Diary") (title . "Diary") (height . 10) (width . 80)
     (unsplittable . t) (minibuffer . nil))
   "Parameters of the diary frame, if the diary is in its own frame.
-Location and color should be set in .Xdefaults.")
+Location and color should be set in .Xdefaults."
+  :type 'sexp
+  :group 'calendar)
 
 (defvar calendar-frame-parameters
   '((name . "Calendar") (title . "Calendar") (minibuffer . nil)
     (height . 10) (width . 80) (unsplittable . t) (vertical-scroll-bars . nil))
   "Parameters of the calendar frame, if the calendar is in a separate frame.
-Location and color should be set in .Xdefaults.")
+Location and color should be set in .Xdefaults."
+  :type 'sexp
+  :group 'calendar)
 
 (defvar calendar-and-diary-frame-parameters
   '((name . "Calendar") (title . "Calendar") (height . 28) (width . 80)
     (minibuffer . nil))
   "Parameters of the frame that displays both the calendar and the diary.
-Location and color should be set in .Xdefaults.")
+Location and color should be set in .Xdefaults."
+  :type 'sexp
+  :group 'calendar)
 
-(defvar calendar-after-frame-setup-hooks nil
+(defcustom calendar-after-frame-setup-hooks nil
   "Hooks to be run just after setting up a calendar frame.
-Can be used to change frame parameters, such as font, color, location, etc.")
+Can be used to change frame parameters, such as font, color, location, etc."
+  :type 'hook
+  :group 'calendar-hooks)
+
+;;; End of user options.
+
+(defvar calendar-frame nil
+  "Frame in which to display the calendar.")
+
+(defvar diary-frame nil
+  "Frame in which to display the diary.")
 
 ;; calendar-basic-setup is called first, and will autoload diary-lib.
 (declare-function make-fancy-diary-buffer "diary-lib" nil)