aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2004-01-11 22:25:58 +0000
committerGlenn Morris2004-01-11 22:25:58 +0000
commit091f692060c43ab58e611776702e08fb576e7a97 (patch)
tree6f0153e92df6a427ecb99cf1898b93a672eee8b9
parent6ecab45e491dc1eacd7f43e371db316239055327 (diff)
downloademacs-091f692060c43ab58e611776702e08fb576e7a97.tar.gz
emacs-091f692060c43ab58e611776702e08fb576e7a97.zip
(calendar-one-frame-setup)
(calendar-only-one-frame-setup, calendar-two-frame-setup): Doc change.
-rw-r--r--lisp/calendar/cal-x.el12
1 files changed, 9 insertions, 3 deletions
diff --git a/lisp/calendar/cal-x.el b/lisp/calendar/cal-x.el
index 0e46e8d3cd8..97fbb72af61 100644
--- a/lisp/calendar/cal-x.el
+++ b/lisp/calendar/cal-x.el
@@ -69,7 +69,9 @@ Location and color should be set in .Xdefaults.")
69Can be used to change frame parameters, such as font, color, location, etc.") 69Can be used to change frame parameters, such as font, color, location, etc.")
70 70
71(defun calendar-one-frame-setup (&optional arg) 71(defun calendar-one-frame-setup (&optional arg)
72 "Start calendar and display it in a dedicated frame together with the diary." 72 "Start calendar and display it in a dedicated frame together with the diary.
73This function requires a display capable of multiple frames, else
74`calendar-basic-setup' is used instead."
73 (if (not (display-multi-frame-p)) 75 (if (not (display-multi-frame-p))
74 (calendar-basic-setup arg) 76 (calendar-basic-setup arg)
75 (if (frame-live-p calendar-frame) (delete-frame calendar-frame)) 77 (if (frame-live-p calendar-frame) (delete-frame calendar-frame))
@@ -97,7 +99,9 @@ Can be used to change frame parameters, such as font, color, location, etc.")
97 'diary)))))) 99 'diary))))))
98 100
99(defun calendar-only-one-frame-setup (&optional arg) 101(defun calendar-only-one-frame-setup (&optional arg)
100 "Start calendar and display it in a dedicated frame." 102 "Start calendar and display it in a dedicated frame.
103This function requires a display capable of multiple frames, else
104`calendar-basic-setup' is used instead."
101 (if (not (display-multi-frame-p)) 105 (if (not (display-multi-frame-p))
102 (calendar-basic-setup arg) 106 (calendar-basic-setup arg)
103 (if (frame-live-p calendar-frame) (delete-frame calendar-frame)) 107 (if (frame-live-p calendar-frame) (delete-frame calendar-frame))
@@ -116,7 +120,9 @@ Can be used to change frame parameters, such as font, color, location, etc.")
116 (set-window-dedicated-p (selected-window) 'calendar)))))) 120 (set-window-dedicated-p (selected-window) 'calendar))))))
117 121
118(defun calendar-two-frame-setup (&optional arg) 122(defun calendar-two-frame-setup (&optional arg)
119 "Start calendar and diary in separate, dedicated frames." 123 "Start calendar and diary in separate, dedicated frames.
124This function requires a display capable of multiple frames, else
125`calendar-basic-setup' is used instead."
120 (if (not (display-multi-frame-p)) 126 (if (not (display-multi-frame-p))
121 (calendar-basic-setup arg) 127 (calendar-basic-setup arg)
122 (if (frame-live-p calendar-frame) (delete-frame calendar-frame)) 128 (if (frame-live-p calendar-frame) (delete-frame calendar-frame))