[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#55070: 28.1; desktop-load doesn't work in -nw (non-gui) emacs
From: |
Juri Linkov |
Subject: |
bug#55070: 28.1; desktop-load doesn't work in -nw (non-gui) emacs |
Date: |
Thu, 28 Apr 2022 10:01:01 +0300 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (x86_64-pc-linux-gnu) |
> Did you provide another patch, Juri?
> Or is it the same one you provided yesterday in this thread?
It's the same patch. Please try it. Here it's again:
diff --git a/lisp/desktop.el b/lisp/desktop.el
index f41a41c3c3..15cd0bae89 100644
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -412,7 +412,10 @@ desktop-restore-frames
"When non-nil, save and restore the frame and window configuration.
See related options `desktop-restore-reuses-frames',
`desktop-restore-in-current-display', and `desktop-restore-forces-onscreen'."
- :type 'boolean
+ :type '(choice (const :tag "Don't restore frames" nil)
+ (const :tag "Restore frames" t)
+ (const :tag "Restore only graphical frames" x)
+ (const :tag "Restore only -nw frames" tty))
:group 'desktop
:version "24.4")
@@ -1251,7 +1254,13 @@ desktop-lazy-timer
;; ----------------------------------------------------------------------------
(defun desktop-restoring-frameset-p ()
"True if calling `desktop-restore-frameset' will actually restore it."
- (and desktop-restore-frames desktop-saved-frameset (display-graphic-p) t))
+ (and (pcase desktop-restore-frames
+ ('x (display-graphic-p))
+ ('tty (not (display-graphic-p)))
+ ('nil nil)
+ (_ t))
+ desktop-saved-frameset
+ t))
(defun desktop-restore-frameset ()
"Restore the state of a set of frames.
diff --git a/lisp/frameset.el b/lisp/frameset.el
index 05884eed3a..32966376d8 100644
--- a/lisp/frameset.el
+++ b/lisp/frameset.el
@@ -883,8 +883,8 @@ frameset-move-onscreen
(pcase-let* ((`(,left ,top ,width ,height) (cdadr (frame-monitor-attributes
frame)))
(right (+ left width -1))
(bottom (+ top height -1))
- (fr-left (frameset-compute-pos (frame-parameter frame 'left)
left right))
- (fr-top (frameset-compute-pos (frame-parameter frame 'top) top
bottom))
+ (fr-left (frameset-compute-pos (or (frame-parameter frame 'left)
0) left right))
+ (fr-top (frameset-compute-pos (or (frame-parameter frame 'top)
0) top bottom))
(ch-width (frame-char-width frame))
(ch-height (frame-char-height frame))
(fr-width (max (frame-pixel-width frame) (* ch-width
(frame-width frame))))
- bug#55070: 28.1; desktop-load doesn't work in -nw (non-gui) emacs, (continued)
- bug#55070: 28.1; desktop-load doesn't work in -nw (non-gui) emacs, Eric Swenson, 2022/04/23
- bug#55070: 28.1; desktop-load doesn't work in -nw (non-gui) emacs, Juri Linkov, 2022/04/26
- bug#55070: 28.1; desktop-load doesn't work in -nw (non-gui) emacs, Lars Ingebrigtsen, 2022/04/26
- bug#55070: 28.1; desktop-load doesn't work in -nw (non-gui) emacs, Eli Zaretskii, 2022/04/26
- bug#55070: 28.1; desktop-load doesn't work in -nw (non-gui) emacs, Juri Linkov, 2022/04/26
- bug#55070: 28.1; desktop-load doesn't work in -nw (non-gui) emacs, Eli Zaretskii, 2022/04/26
- bug#55070: 28.1; desktop-load doesn't work in -nw (non-gui) emacs, Juri Linkov, 2022/04/26
- bug#55070: 28.1; desktop-load doesn't work in -nw (non-gui) emacs, Eli Zaretskii, 2022/04/26
- bug#55070: 28.1; desktop-load doesn't work in -nw (non-gui) emacs, Juri Linkov, 2022/04/27
- bug#55070: 28.1; desktop-load doesn't work in -nw (non-gui) emacs, Eric Swenson, 2022/04/27
- bug#55070: 28.1; desktop-load doesn't work in -nw (non-gui) emacs,
Juri Linkov <=
- bug#55070: 28.1; desktop-load doesn't work in -nw (non-gui) emacs, Eric Swenson, 2022/04/28
- bug#55070: 28.1; desktop-load doesn't work in -nw (non-gui) emacs, Juri Linkov, 2022/04/28
- bug#55070: 28.1; desktop-load doesn't work in -nw (non-gui) emacs, Eli Zaretskii, 2022/04/30
- bug#55070: 28.1; desktop-load doesn't work in -nw (non-gui) emacs, Eli Zaretskii, 2022/04/27