mirror of
https://github.com/doomemacs/doomemacs.git
synced 2026-04-27 23:31:20 -07:00
1240162d7a
Emacs 29 introduced a `restart-emacs` command that is more reliable, but it cannot restart Emacs with arbitrary arguments, which the old `restart-emacs` library could. Without this capability, `doom/restart-and-restore` is not trivially (or elegantly) possible, and I can't justify a whole extra dependency just to support that, especially in my pursuit to slim down Doom's core. This commit also removes the doom/upgrade command, which is an awkward and fickle command to support across platforms (too many edge cases).
150 lines
5.4 KiB
EmacsLisp
150 lines
5.4 KiB
EmacsLisp
;;; lisp/lib/sessions.el -*- lexical-binding: t; -*-
|
|
|
|
(defvar desktop-base-file-name)
|
|
(defvar desktop-dirname)
|
|
(defvar desktop-restore-eager)
|
|
(defvar desktop-file-modtime)
|
|
|
|
|
|
;;
|
|
;;; Helpers
|
|
|
|
;;;###autoload
|
|
(defun doom-session-file (&optional name)
|
|
"TODO"
|
|
(cond ((require 'persp-mode nil t)
|
|
(expand-file-name (or name persp-auto-save-fname) persp-save-dir))
|
|
((require 'desktop nil t)
|
|
(if name
|
|
(expand-file-name name (file-name-directory (desktop-full-file-name)))
|
|
(desktop-full-file-name)))
|
|
((error "No session backend available"))))
|
|
|
|
;;;###autoload
|
|
(defun doom-save-session (&optional file)
|
|
"TODO"
|
|
(setq file (expand-file-name (or file (doom-session-file))))
|
|
(cond ((require 'persp-mode nil t)
|
|
(unless persp-mode (persp-mode +1))
|
|
(setq persp-auto-save-opt 0)
|
|
(persp-save-state-to-file file))
|
|
((and (require 'frameset nil t)
|
|
(require 'desktop nil t))
|
|
(let ((desktop-base-file-name (file-name-nondirectory file))
|
|
(desktop-dirname (file-name-directory file))
|
|
(desktop-restore-eager t)
|
|
desktop-file-modtime)
|
|
(make-directory desktop-dirname t)
|
|
;; Prevents confirmation prompts
|
|
(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
|
|
(defun doom-load-session (&optional file)
|
|
"TODO"
|
|
(setq file (expand-file-name (or file (doom-session-file))))
|
|
(message "Attempting to load %s" file)
|
|
(cond ((not (file-readable-p file))
|
|
(message "No session file at %S to read from" file))
|
|
((require 'persp-mode nil t)
|
|
(unless persp-mode
|
|
(persp-mode +1))
|
|
(let ((allowed (persp-list-persp-names-in-file file)))
|
|
(cl-loop for name being the hash-keys of *persp-hash*
|
|
unless (member name allowed)
|
|
do (persp-kill name))
|
|
(persp-load-state-from-file file)))
|
|
((and (require 'frameset nil t)
|
|
(require 'desktop nil t))
|
|
(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)
|
|
;; 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"))))
|
|
|
|
|
|
;;
|
|
;;; Commands
|
|
|
|
;;;###autoload
|
|
(defun doom/quickload-session (force)
|
|
"Load the last session saved.
|
|
If the FORCE \\[universal-argument] is provided
|
|
then no confirmation is asked."
|
|
(interactive "P")
|
|
(if (or force
|
|
(yes-or-no-p "This will wipe your current session, do you want to continue? "))
|
|
(progn (message "Restoring session...")
|
|
(doom-load-session)
|
|
(message "Session restored. Welcome back."))
|
|
(message "Session not restored.")))
|
|
|
|
;;;###autoload
|
|
(defun doom/quicksave-session ()
|
|
"TODO"
|
|
(interactive)
|
|
(message "Saving session")
|
|
(doom-save-session)
|
|
(message "Saving session...DONE"))
|
|
|
|
;;;###autoload
|
|
(defun doom/load-session (file)
|
|
"TODO"
|
|
(interactive
|
|
(let ((session-file (doom-session-file)))
|
|
(list (or (read-file-name "Session to restore: "
|
|
(file-name-directory session-file)
|
|
(file-name-nondirectory session-file)
|
|
t)
|
|
(user-error "No session selected. Aborting")))))
|
|
(unless file
|
|
(error "No session file selected"))
|
|
(message "Loading '%s' session" file)
|
|
(doom-load-session file)
|
|
(message "Session restored. Welcome back."))
|
|
|
|
;;;###autoload
|
|
(defun doom/save-session (file)
|
|
"TODO"
|
|
(interactive
|
|
(let ((session-file (doom-session-file)))
|
|
(list (or (read-file-name "Save session to: "
|
|
(file-name-directory session-file)
|
|
(file-name-nondirectory session-file))
|
|
(user-error "No session selected. Aborting")))))
|
|
(unless file
|
|
(error "No session file selected"))
|
|
(message "Saving '%s' session" file)
|
|
(doom-save-session file))
|
|
|
|
;;;###autoload
|
|
(defun doom/restart ()
|
|
"Restart Emacs (and the daemon, if active).
|
|
|
|
Unlike `doom/restart-and-restore', does not restart the current session."
|
|
(interactive)
|
|
(unless (fboundp 'restart-emacs)
|
|
(user-error "Cannot restart Emacs 28 or older"))
|
|
(restart-emacs))
|
|
|
|
(provide 'doom-lib '(sessions))
|
|
;;; sessions.el ends here
|