bug#30141: (26.0.91; text-pixel dimensions not properly saved by desktop-save-mode sometimes)

[Aaron Jensen <aaronjensen@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 543 bytes --]

On Thu, Mar 15, 2018 at 1:20 AM, martin rudalics <rudalics@gmx.at> wrote:
> Can you please resend the patch.  The column number of the first paren
> in
>
>               (cons nil
>                     (and mb-frame
>                          (frameset-frame-id mb-frame)))))))))
>
> here is 13 but 14 according to you patch.  So I can't convince git of
> applying it regardless of whether I use the --ignore-whitespace or the
> --ignore-space-change option.

I may have made the patch off of emacs-26. How about this one, it's
off of master.

[-- Attachment #2: 0001-Save-frame-pixel-width-height-if-frame-resize-pixelw.patch --]
[-- Type: application/octet-stream, Size: 2002 bytes --]

From ac2722e3249bd9e354bca2b348844ba90914a6dd Mon Sep 17 00:00:00 2001
From: Aaron Jensen <aaronjensen@gmail.com>
Date: Wed, 14 Mar 2018 07:51:25 -0700
Subject: [PATCH] Save frame pixel/width height if frame-resize-pixelwise is
 non-nil

* lisp/frameset.el (frameset--record-relationships): Replace check for
  text width/height and replace with check for
  frame-resize-pixelwise. (bug#30141)
---
 lisp/frameset.el | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/lisp/frameset.el b/lisp/frameset.el
index 0e3363d7ae..8bccc8b1d2 100644
--- a/lisp/frameset.el
+++ b/lisp/frameset.el
@@ -800,22 +800,17 @@ frameset--record-relationships
              (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.
   (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
-- 
2.15.1