From: Aaron Jensen <aaronjensen@gmail.com>
Date: Sat, 17 Mar 2018 09:58:17 +0000 (+0100)
Subject: In frameset save pixel values with frame-resize-pixelwise non-nil  (Bug#30141)
X-Git-Tag: emacs-27.0.90~5472
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f7346a584ed46fdb0bfcbbdd3673fee022d2c1c3;p=emacs.git

In frameset save pixel values with frame-resize-pixelwise non-nil  (Bug#30141)

* lisp/frameset.el (frameset--record-relationships): Replace
check for text width/height and replace with check for
frame-resize-pixelwise.  (Bug#30141)
---

diff --git a/lisp/frameset.el b/lisp/frameset.el
index 0e3363d7ae3..0d7e8025abd 100644
--- a/lisp/frameset.el
+++ b/lisp/frameset.el
@@ -800,22 +800,17 @@ Internal use only."
              (cons nil
                    (and mb-frame
                         (frameset-frame-id mb-frame)))))))))
-  ;; Now store text-pixel width and height if it differs from the calculated
-  ;; width and height and the frame is not fullscreen.
+  ;; Now store text-pixel width and height if `frame-resize-pixelwise'
+  ;; is set.  (Bug#30141)
   (dolist (frame frame-list)
-    (unless (frame-parameter frame 'fullscreen)
-      (unless (eq (* (frame-parameter frame 'width)
-                     (frame-char-width frame))
-                  (frame-text-width frame))
-        (set-frame-parameter
-         frame 'frameset--text-pixel-width
-         (frame-text-width frame)))
-      (unless (eq (* (frame-parameter frame 'height)
-                     (frame-char-height frame))
-                  (frame-text-height frame))
-        (set-frame-parameter
-         frame 'frameset--text-pixel-height
-         (frame-text-height frame))))))
+    (when (and frame-resize-pixelwise
+               (not (frame-parameter frame 'fullscreen)))
+      (set-frame-parameter
+       frame 'frameset--text-pixel-width
+       (frame-text-width frame))
+      (set-frame-parameter
+       frame 'frameset--text-pixel-height
+       (frame-text-height frame)))))
 
 ;;;###autoload
 (cl-defun frameset-save (frame-list