aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/calendar/cal-x.el11
1 files changed, 6 insertions, 5 deletions
diff --git a/lisp/calendar/cal-x.el b/lisp/calendar/cal-x.el
index 7d6bb5d93ef..c12e23cfa26 100644
--- a/lisp/calendar/cal-x.el
+++ b/lisp/calendar/cal-x.el
@@ -43,22 +43,23 @@
43 43
44(defvar diary-frame nil "Frame in which to display the diary.") 44(defvar diary-frame nil "Frame in which to display the diary.")
45 45
46;; This should not specify the font. That's up to the user.
47;; Certainly it should not specify auto-lower and auto-raise
48;; since most users won't like that.
46(defvar diary-frame-parameters 49(defvar diary-frame-parameters
47 '((name . "Diary") (height . 10) (width . 80) (unsplittable . t) 50 '((name . "Diary") (height . 10) (width . 80) (unsplittable . t)
48 (font . "6x13") (auto-lower . t) (auto-raise . t) (minibuffer . nil)) 51 (minibuffer . nil))
49 "Parameters of the diary frame, if the diary is in its own frame. 52 "Parameters of the diary frame, if the diary is in its own frame.
50Location and color should be set in .Xdefaults.") 53Location and color should be set in .Xdefaults.")
51 54
52(defvar calendar-frame-parameters 55(defvar calendar-frame-parameters
53 '((name . "Calendar") (minibuffer . nil) (height . 10) (width . 80) 56 '((name . "Calendar") (minibuffer . nil) (height . 10) (width . 80)
54 (auto-raise . t) (auto-lower . t) (font . "6x13") (unsplittable . t) 57 (unsplittable . t) (vertical-scroll-bars . nil))
55 (vertical-scroll-bars . nil))
56 "Parameters of the calendar frame, if the calendar is in a separate frame. 58 "Parameters of the calendar frame, if the calendar is in a separate frame.
57Location and color should be set in .Xdefaults.") 59Location and color should be set in .Xdefaults.")
58 60
59(defvar calendar-and-diary-frame-parameters 61(defvar calendar-and-diary-frame-parameters
60 '((name . "Calendar") (height . 28) (width . 80) (minibuffer . nil) 62 '((name . "Calendar") (height . 28) (width . 80) (minibuffer . nil))
61 (font . "6x13") (auto-raise . t) (auto-lower . t))
62 "Parameters of the frame that displays both the calendar and the diary. 63 "Parameters of the frame that displays both the calendar and the diary.
63Location and color should be set in .Xdefaults.") 64Location and color should be set in .Xdefaults.")
64 65