mirrors/doomemacs
1
Fork 0
mirror of https://github.com/doomemacs/doomemacs.git synced 2026-01-18 23:21:22 -08:00
Code Issues Projects Releases Wiki Activity

fix(lib): desktop.el session load/save

Browse source 
restart-emacs--restore-frames-using-desktop had some bugs that made
doom-load-session non-functional.

Fix: #2291
This commit is contained in:
Henrik Lissner 2025-12-29 20:30:18 -05:00
parent 96498a9859
commit 46353c326a
No known key found for this signature in database
GPG key ID: B60957CA074D39A3
1 changed files with 28 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

31
lisp/lib/sessions.el
View file

@ -38,8 +38,10 @@
desktop-file-modtime)
(make-directory desktop-dirname t)
;; Prevents confirmation prompts
(let ((desktop-file-modtime (nth 5 (file-attributes (desktop-full-file-name)))))
(desktop-save desktop-dirname t))))
(let ((desktop-file-modtime
(file-attribute-modification-time
(file-attributes (desktop-full-file-name)))))
(desktop-save desktop-dirname))))
((error "No session backend to save session with"))))
;;;###autoload
@ -59,7 +61,30 @@
(persp-load-state-from-file file)))
((and (require 'frameset nil t)
(require 'restart-emacs nil t))
(restart-emacs--restore-frames-using-desktop file))
(let* ((file (expand-file-name (doom-session-file)))
desktop-file-modtime
(desktop-dirname (file-name-directory file))
(desktop-base-file-name (file-name-nondirectory file))
(desktop-base-lock-name (concat desktop-base-file-name ".lock"))
(desktop-restore-reuses-frames nil)
;; Add filter for tty frames, the filter simply logs a message
;; on the parent ttys of the frame
(frameset-filter-alist (append '((tty . restart-emacs--frameset-tty-filter))
frameset-filter-alist))
;; Disable prompts for safe variables during restoration
(enable-local-variables :safe)
;; We mock these two functions while restoring frames Calls to
;; `display-color-p' blocks Emacs in daemon mode (possibly)
;; because the call fails
(display-color-p (symbol-function 'display-color-p))
;; We mock `display-graphic-p' since desktop mode has changed to
;; not restore frames when we are not on graphic display
(display-graphic-p (symbol-function 'display-graphic-p)))
(if (daemonp)
(letf! ((#'display-color-p #'ignore)
(#'display-graphic-p #'ignore))
(desktop-read desktop-dirname))
(desktop-read desktop-dirname))))
((error "No session backend to load session with"))))