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).

diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el
index 76d6132eae18544ca47f2e2ab78319fde41f0961..7c929ebed0de8debb7eb1119225107efe4f70056 100644 (file)
--- 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)