Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs

2 files changed, 19 insertions, 1 deletions

diff --git a/etc/NEWS b/etc/NEWS
index b9064829548..97d3d945b01 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -43,6 +43,23 @@ enabled, you can disable mouse tracking by putting '(xterm-mouse-mode
 
 * Changes in Emacs 31.1
 
+---
+** Add support for child frames on tty
+
+The redisplay part is complete.  The frame-handling part supports
+use-cases like Posframe, Corfu, and child frames acting like tooltips.
+Other use-cases of child frames are not currently supported.  In
+particular, trying to create minibuffer-only child frames on ttys will
+signal an error.
+
+To enable tooltips on ttys, call 'tty-tip-mode'.
+
+The presence of child window support on ttys can be checked with
+`(featurep 'tty-child-frames)'.
+
+Current versions of Posframe and Corfu are known to use child frames on
+ttys if supported.
+
 +++
 ** Several font-lock face variables are now obsolete.
 The following variables are now obsolete: 'font-lock-builtin-face',
@@ -902,6 +919,7 @@ restore the old behavior, you can set 'eshell-pwd-convert-function' to
 * Lisp Changes in Emacs 31.1
 
 ---
+** The obsolete variable `redisplay-dont-pause' has been removed
 ** New function 'native-compile-directory'.
 This function natively-compiles all Lisp files in a directory and in its
 sub-directories, recursively, which were not already natively-compiled.
diff --git a/src/dispnew.c b/src/dispnew.c
index cbc7d4d7aaf..f628415359c 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -3757,7 +3757,7 @@ update_menu_bar (struct frame *f)
 {
 #if defined HAVE_WINDOW_SYSTEM && !defined HAVE_EXT_MENU_BAR
   if (WINDOWP (f->menu_bar_window))
-    update_window (XWINDOW (f->menu_bar_window), true);
+    update_window (XWINDOW (f->menu_bar_window));
 #endif
 }