From: Andrii Kolomoiets <andreyk.mad@gmail.com>
Date: Thu, 11 Feb 2021 09:09:41 +0000 (+0100)
Subject: Use frame monitor in frame_float
X-Git-Tag: emacs-28.0.90~3809
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0e2b123a4ef600f5b337972a7bb61c1fc4b7d0cd;p=emacs.git

Use frame monitor in frame_float

* src/frame.c (frame_float): Use frame monitor attributes instead
of attributes of the main monitor (bug#46406).
---

diff --git a/src/frame.c b/src/frame.c
index 635fc945604..a62347c1fb2 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -3890,7 +3890,7 @@ frame_float (struct frame *f, Lisp_Object val, enum frame_float_type what,
 	      Lisp_Object frame;
 
 	      XSETFRAME (frame, f);
-	      monitor_attributes = Fcar (call1 (Qdisplay_monitor_attributes_list, frame));
+	      monitor_attributes = call1 (Qframe_monitor_attributes, frame);
 	      if (NILP (monitor_attributes))
 		{
 		  /* No monitor attributes available.  */
@@ -5890,7 +5890,7 @@ syms_of_frame (void)
   DEFSYM (Qframep, "framep");
   DEFSYM (Qframe_live_p, "frame-live-p");
   DEFSYM (Qframe_windows_min_size, "frame-windows-min-size");
-  DEFSYM (Qdisplay_monitor_attributes_list, "display-monitor-attributes-list");
+  DEFSYM (Qframe_monitor_attributes, "frame-monitor-attributes");
   DEFSYM (Qwindow__pixel_to_total, "window--pixel-to-total");
   DEFSYM (Qexplicit_name, "explicit-name");
   DEFSYM (Qheight, "height");