*** lisp/calendar/calendar.el	2012-06-06 18:46:34 +0000
--- lisp/calendar/calendar.el	2012-06-22 09:53:14 +0000
***************
*** 1818,1827 ****
            (dolist (w (window-list-1 nil nil t))
              (if (and (memq (window-buffer w) calendar-buffers)
                       (window-dedicated-p w))
!                 (if calendar-remove-frame-by-deleting
!                     (delete-frame (window-frame w))
!                     (iconify-frame (window-frame w)))
!               (quit-window kill w)))
          (dolist (b calendar-buffers)
            (quit-windows-on b kill))))))
  
--- 1818,1828 ----
            (dolist (w (window-list-1 nil nil t))
              (if (and (memq (window-buffer w) calendar-buffers)
                       (window-dedicated-p w))
!                 (if (eq (window-deletable-p w) 'frame)
! 		    (if calendar-remove-frame-by-deleting
! 			(delete-frame (window-frame w))
! 		      (iconify-frame (window-frame w)))
! 		  (quit-window kill w))))
          (dolist (b calendar-buffers)
            (quit-windows-on b kill))))))