master abd59ad923: Fix "Buffers->Frames" submenu in daemon sessions

[Eli Zaretskii]

branch: master
commit abd59ad923452cf342ba9d5eadf52bea02a261b0
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>

    Fix "Buffers->Frames" submenu in daemon sessions
    
    * lisp/menu-bar.el (menu-bar-update-buffers): Detect the initial
    frame by its special terminal's name.  (Bug#53740)
    
    * src/terminal.c (init_initial_terminal): Add comment about using
    the initial-terminal's name in menu-bar.el.
---
 lisp/menu-bar.el | 3 ++-
 src/terminal.c   | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index 891cdfd5d5..7678b1ece6 100644
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -2346,7 +2346,8 @@ It must accept a buffer as its only required argument.")
          ;; Ignore the initial frame if present.  It can happen if
          ;; Emacs was started as a daemon.  (bug#53740)
          (dolist (frame (frame-list))
-           (unless (eq frame frame-initial-frame)
+           (unless (equal (terminal-name (frame-terminal frame))
+                          "initial_terminal")
              (push frame frames)))
         ;; Make the menu of buffers proper.
         (setq buffers-menu
diff --git a/src/terminal.c b/src/terminal.c
index 3db80f4b1f..80f3aed700 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -622,6 +622,8 @@ init_initial_terminal (void)
     emacs_abort ();
 
   initial_terminal = create_terminal (output_initial, NULL);
+  /* Note: menu-bar.el:menu-bar-update-buffers knows about this
+     special name of the initial terminal.  */
   initial_terminal->name = xstrdup ("initial_terminal");
   initial_terminal->kboard = initial_kboard;
   initial_terminal->delete_terminal_hook = &delete_initial_terminal;