Sync to HEAD

[bpt/emacs.git] / lisp / calendar / cal-x.el

diff --git a/lisp/calendar/cal-x.el b/lisp/calendar/cal-x.el
index 416230e..97fbb72 100644 (file)
--- a/lisp/calendar/cal-x.el
+++ b/lisp/calendar/cal-x.el
@@ -69,7 +69,9 @@ Location and color should be set in .Xdefaults.")
 Can be used to change frame parameters, such as font, color, location, etc.")
 
 (defun calendar-one-frame-setup (&optional arg)
-  "Start calendar and display it in a dedicated frame together with the diary."
+  "Start calendar and display it in a dedicated frame together with the diary.
+This function requires a display capable of multiple frames, else
+`calendar-basic-setup' is used instead."
   (if (not (display-multi-frame-p))
       (calendar-basic-setup arg)
     (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.")
            'diary))))))
 
 (defun calendar-only-one-frame-setup (&optional arg)
-  "Start calendar and display it in a dedicated frame."
+  "Start calendar and display it in a dedicated frame.
+This function requires a display capable of multiple frames, else
+`calendar-basic-setup' is used instead."
   (if (not (display-multi-frame-p))
       (calendar-basic-setup arg)
     (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.")
           (set-window-dedicated-p (selected-window) 'calendar))))))
 
 (defun calendar-two-frame-setup (&optional arg)
-  "Start calendar and diary in separate, dedicated frames."
+  "Start calendar and diary in separate, dedicated frames.
+This function requires a display capable of multiple frames, else
+`calendar-basic-setup' is used instead."
   (if (not (display-multi-frame-p))
       (calendar-basic-setup arg)
     (if (frame-live-p calendar-frame) (delete-frame calendar-frame))
@@ -162,4 +168,5 @@ Can be used to change frame parameters, such as font, color, location, etc.")
 
 (provide 'cal-x)
 
+;;; arch-tag: c6dbddca-ae84-442d-87fc-244b76e38e17
 ;;; cal-x.el ends here