mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-24 05:22:04 -08:00
Code Issues Projects Releases Wiki Activity

Make multi-frame M-x calendar' setup work when pop-up-frames'

Browse source 
* lisp/calendar/calendar.el (calendar): Make the calendar frame
setup work when pop-up-frames is non-nil (bug#19256).
This commit is contained in:
Lars Ingebrigtsen 2021-09-04 09:34:29 +02:00
parent 7ca949b7ef
commit 7e7723796c
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lisp/calendar/calendar.el
View file

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