From: Po Lu <luangruo@yahoo.com>
Date: Sat, 14 May 2022 04:16:34 +0000 (+0800)
Subject: Work around deleting tooltip frames clearing menubars on NS
X-Git-Tag: emacs-29.0.90~1910^2~707
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c33b048a863f9df12a0f68f51d143d0515e34043;p=emacs.git

Work around deleting tooltip frames clearing menubars on NS

* src/frame.c (delete_frame): Update menu bars if a tooltip
frame was deleted on NS.
---

diff --git a/src/frame.c b/src/frame.c
index 93028aa8958..2fb91ca5e7b 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -2333,8 +2333,13 @@ delete_frame (Lisp_Object frame, Lisp_Object force)
 	kset_default_minibuffer_frame (kb, Qnil);
     }
 
-  /* Cause frame titles to update--necessary if we now have just one frame.  */
+  /* Cause frame titles to update--necessary if we now have just one
+     frame.  On NS the menu bar becomes empty after a tooltip frame is
+     deleted for an unknown reason, so this serves to restore the
+     contents of the menu bar as well.  */
+#ifndef HAVE_NS
   if (!is_tooltip_frame)
+#endif
     update_mode_lines = 15;
 
   /* Now run the post-deletion hooks.  */