Commit 53e1a74c authored by Eli Zaretskii's avatar Eli Zaretskii
Browse files

(calendar-two-frame-setup, calendar-only-one-frame-setup)

(calendar-one-frame-setup): Use display-multi-frame-p instead of window-system.
parent 13f0f988
2001-04-23 Eli Zaretskii <eliz@is.elta.co.il>
* calendar/calendar.el (diary-entry-marker)
(calendar-today-marker, calendar-holiday-marker): Use
display-color-p instead of window-system.
(calendar-mode-map, calendar-mode): Use display-popup-menus-p
instead of window-system.
(calendar-hide-window): Use display-multi-frame-p instead of
window-system.
* calendar/cal-x.el (calendar-two-frame-setup)
(calendar-only-one-frame-setup, calendar-one-frame-setup): Use
display-multi-frame-p instead of window-system.
2001-04-23 Gerd Moellmann <gerd@gnu.org>
 
* play/fortune.el (fortune-from-region): Use `eq' instead of `eql'.
......
......@@ -70,7 +70,7 @@ 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."
(if (not window-system)
(if (not (display-multi-frame-p))
(calendar-basic-setup arg)
(if (frame-live-p calendar-frame) (delete-frame calendar-frame))
(if (frame-live-p diary-frame) (delete-frame diary-frame))
......@@ -98,7 +98,7 @@ Can be used to change frame parameters, such as font, color, location, etc.")
(defun calendar-only-one-frame-setup (&optional arg)
"Start calendar and display it in a dedicated frame."
(if (not window-system)
(if (not (display-multi-frame-p))
(calendar-basic-setup arg)
(if (frame-live-p calendar-frame) (delete-frame calendar-frame))
(let ((special-display-buffer-names nil)
......@@ -117,7 +117,7 @@ Can be used to change frame parameters, such as font, color, location, etc.")
(defun calendar-two-frame-setup (&optional arg)
"Start calendar and diary in separate, dedicated frames."
(if (not window-system)
(if (not (display-multi-frame-p))
(calendar-basic-setup arg)
(if (frame-live-p calendar-frame) (delete-frame calendar-frame))
(if (frame-live-p diary-frame) (delete-frame diary-frame))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment