From: Juri Linkov <juri@linkov.net>
Date: Sun, 30 Jan 2022 16:38:24 +0000 (+0200)
Subject: * lisp/frame.el (undelete-frame--save-deleted-frame): Handle initial frame.
X-Git-Tag: emacs-29.0.90~2646
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=58bb9eb4005599155a8fce8d5c5beb531a72c534;p=emacs.git

* lisp/frame.el (undelete-frame--save-deleted-frame): Handle initial frame.

The function undelete-frame--save-deleted-frame is renamed
from undelete-frame--handle-delete-frame (bug#51883).
---

diff --git a/lisp/frame.el b/lisp/frame.el
index 56295a56e31..d39597d0aff 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -2531,12 +2531,12 @@ deleting them."
       (setq this next))))
 
 (defvar undelete-frame--deleted-frames nil
-  "Internal variable used by `undelete-frame--handle-delete-frame'.")
+  "Internal variable used by `undelete-frame--save-deleted-frame'.")
 
-(defun undelete-frame--handle-delete-frame (frame)
+(defun undelete-frame--save-deleted-frame (frame)
   "Save the configuration of frames deleted with `delete-frame'.
 Only the 16 most recently deleted frames are saved."
-  (when (frame-live-p frame)
+  (when (and after-init-time (frame-live-p frame))
     (setq undelete-frame--deleted-frames
           (cons
            (list
@@ -2564,9 +2564,9 @@ Only the 16 most recently deleted frames are saved."
   :global t
   (if undelete-frame-mode
       (add-hook 'delete-frame-functions
-                #'undelete-frame--handle-delete-frame -75)
+                #'undelete-frame--save-deleted-frame -75)
     (remove-hook 'delete-frame-functions
-                 #'undelete-frame--handle-delete-frame)
+                 #'undelete-frame--save-deleted-frame)
     (setq undelete-frame--deleted-frames nil)))
 
 (defun undelete-frame (&optional arg)