* lisp/frame.el (frame-monitor-attributes): Fall back to the last monitor

when frames monitor attributes is still uninitialized.  (Bug#34680)

diff --git a/lisp/frame.el b/lisp/frame.el
index c5802e30b6eab3f7707277465dee9c479277fb60..7cfe546ca6a128a2bd3fda7c17d52c5b0cf1c29f 100644 (file)
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -1696,7 +1696,10 @@ keys and their meanings."
   (or frame (setq frame (selected-frame)))
   (cl-loop for attributes in (display-monitor-attributes-list frame)
           for frames = (cdr (assq 'frames attributes))
-          if (memq frame frames) return attributes))
+          if (memq frame frames) return attributes
+          ;; On broken frames monitor attributes,
+          ;; fall back to the last monitor.
+          finally return attributes))
 
 (defun frame-monitor-attribute (attribute &optional frame x y)
   "Return the value of ATTRIBUTE on FRAME's monitor.