From 7e7723796c2c9b46302d1d036e9ef54b9727113e Mon Sep 17 00:00:00 2001 From: Lars Ingebrigtsen Date: Sat, 4 Sep 2021 09:34:29 +0200 Subject: [PATCH] Make multi-frame `M-x calendar' setup work when `pop-up-frames' * lisp/calendar/calendar.el (calendar): Make the calendar frame setup work when pop-up-frames is non-nil (bug#19256). --- lisp/calendar/calendar.el | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el index 76d6132eae1..7c929ebed0d 100644 --- a/lisp/calendar/calendar.el +++ b/lisp/calendar/calendar.el @@ -1308,7 +1308,9 @@ This function is suitable for execution in an init file." ;; Avoid loading cal-x unless it will be used. (if (and (memq calendar-setup '(one-frame two-frames calendar-only)) (display-multi-frame-p)) - (calendar-frame-setup calendar-setup arg) + ;; Calendar does its own frame setup. + (let ((pop-up-frames nil)) + (calendar-frame-setup calendar-setup arg)) (calendar-basic-setup arg))) (defun calendar-basic-setup (&optional arg nodisplay) -- 2.39.2