Merge branch 'master' into feature/igc3feature/igc3

1 files changed, 4 insertions, 6 deletions

diff --git a/lisp/frameset.el b/lisp/frameset.el
index e11a1da7e9b..0dde10869fd 100644
--- a/lisp/frameset.el
+++ b/lisp/frameset.el
@@ -1370,12 +1370,10 @@ All keyword parameters default to nil."
                               ;; frame, as that would only trigger
                               ;; warnings.
                               (not
-                               (and (daemonp)
-                                    (equal (terminal-name (frame-terminal
-                                                           frame))
-                                           "initial_terminal"))))
-                             (delete-frame frame)))
-                       cleanup-frames)))
+                               (and (daemonp) ;; FIXME: Remove `daemonp'?
+                                    (frame-initial-p frame))))
+                     (delete-frame frame)))
+               cleanup-frames)))
         (maphash (lambda (frame _action) (push frame map)) frameset--action-map)
         (dolist (frame (sort map
                              ;; Minibufferless frames must go first to avoid