# HG changeset patch # User Eli Zaretskii # Date 988035655 0 # Node ID bd1a8b1c88d7c1691befd34a815269ff6d6b93b0 # Parent a0e805e3a7f1e012b3fd787b9bea4678a5d9703a (calendar-two-frame-setup, calendar-only-one-frame-setup) (calendar-one-frame-setup): Use display-multi-frame-p instead of window-system. diff -r a0e805e3a7f1 -r bd1a8b1c88d7 lisp/calendar/cal-x.el --- a/lisp/calendar/cal-x.el Mon Apr 23 14:19:57 2001 +0000 +++ b/lisp/calendar/cal-x.el Mon Apr 23 14:20:55 2001 +0000 @@ -70,7 +70,7 @@ (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 @@ (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 @@ (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))