master b4acb1807b 1/2: Fix restoring desktop from TTY-saved sessions

[Eli Zaretskii]

branch: master
commit b4acb1807b7044739bfd07143aee1433e87a25d4
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>

    Fix restoring desktop from TTY-saved sessions
    
    * lisp/frameset.el (frameset-restore): Don't override/fix position
    of the restored frames for which we have geometry information
    saved by a past GUI session.  (Bug#55070)
---
 lisp/frameset.el | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/lisp/frameset.el b/lisp/frameset.el
index 34572000de..23847a74a3 100644
--- a/lisp/frameset.el
+++ b/lisp/frameset.el
@@ -1309,9 +1309,14 @@ All keyword parameters default to nil."
                            (setq mb-window nil)))
                        (when mb-window
                          (push (cons 'minibuffer mb-window) frame-cfg))))))
-                  (when (frameset-switch-to-gui-p frame-cfg)
-                    ;; Apply small offsets to each frame, so that they
-                    ;; don't obscure each other.
+                  ;; Apply small offsets to each frame that came from
+                  ;; a TTY-saved desktop, so that they don't obscure
+                  ;; each other, but only if we don't have real frame
+                  ;; position infor from a GUI session in some,
+                  ;; possibly distant, past.
+                  (when (and (frameset-switch-to-gui-p frame-cfg)
+                             (null (cdr (assq 'GUI:top frame-cfg)))
+                             (null (cdr (assq 'GUI:left frame-cfg))))
                     (setq dx (+ dx 20)
                           dy (+ dy 10)))
                  ;; OK, we're ready at last to create (or reuse) a frame and