commit 1e40be0ab830852ff5e2330c50f8b047d9ebe338 (HEAD, refs/remotes/origin/master)
Author: Stefan Kangas <stefankangas@gmail.com>
Date:   Wed Dec 25 04:35:50 2024 +0100

    Improve dictionary-switch-tooltip-mode docstring
    
    * lisp/net/dictionary.el (dictionary-switch-tooltip-mode): Fix
    docstring and argument name.

diff --git a/lisp/net/dictionary.el b/lisp/net/dictionary.el
index 543a98f8de3..7add1db3099 100644
--- a/lisp/net/dictionary.el
+++ b/lisp/net/dictionary.el
@@ -1453,16 +1453,15 @@ via `dictionary-dictionaries'."
     (setq dictionary-tooltip-mouse-event (copy-sequence event))
     (tooltip-start-delayed-tip)))
 
-(defun dictionary-switch-tooltip-mode (on)
-  "Turn dictionary tooltip mode off or ON.
-
-It is normally internally called with 1 to enable support for the
-tooltip mode.  The hook function will check the value of the
-variable `dictionary-tooltip-mode' to decide if some action must be
-taken.  When disabling the tooltip mode the value of this variable
-will be set to nil."
-  (tooltip-mode on)
-  (if on
+(defun dictionary-switch-tooltip-mode (state)
+  "Turn dictionary tooltip mode on or off depending on STATE.
+
+It is normally called internally with a non-nil value to enable the
+tooltip mode.  The hook function uses the value of the variable
+`dictionary-tooltip-mode' to decide if some action must be taken.
+When disabling the tooltip mode, that variable will be set to nil."
+  (tooltip-mode state)
+  (if state
       (add-hook 'tooltip-functions #'dictionary-display-tooltip)
     (remove-hook 'tooltip-functions #'dictionary-display-tooltip)))
 

commit 7cda5e7f0272d766bd2090a274faeb7776303f46
Author: Nicholas Vollmer <iarchivedmywholelife@gmail.com>
Date:   Tue Jan 23 09:39:02 2024 -0500

    Fix checkdoc warnings in dictionary.el
    
    * lisp/net/dictionary.el (dictionary-tool-bar-map): Add missing period.
    (dictionary-process-popup-replies)
    (dictionary-read-definition)
    (dictionary-display-tooltip): Rename ignored parameters.
    (dictionary-tooltip-track-mouse): Describe what function does, not just
    when.
    (dictionary-switch-tooltip-mode): Reword docstring in terms of ON
    parameter.  (Bug#68684)

diff --git a/lisp/net/dictionary.el b/lisp/net/dictionary.el
index 8c7d87f56a5..543a98f8de3 100644
--- a/lisp/net/dictionary.el
+++ b/lisp/net/dictionary.el
@@ -1340,7 +1340,7 @@ prompt for DICTIONARY."
 			  dictionary-default-popup-strategy
 			  'dictionary-process-popup-replies))
 
-(defun dictionary-process-popup-replies (&ignore)
+(defun dictionary-process-popup-replies (_)
   (let ((list (dictionary-simple-split-string (dictionary-read-answer) "\n+")))
 
     (let ((result (mapcar (lambda (item)
@@ -1395,7 +1395,7 @@ via `dictionary-dictionaries'."
 	(dictionary-do-search word dictionary 'dictionary-read-definition t))
     nil))
 
-(defun dictionary-read-definition (&ignore)
+(defun dictionary-read-definition (_)
   (let ((list (dictionary-simple-split-string (dictionary-read-answer) "\n+")))
     (mapconcat #'identity (cdr list) "\n")))
 
@@ -1422,7 +1422,7 @@ via `dictionary-dictionaries'."
 (defvar dictionary-tooltip-mouse-event nil
   "Event that triggered the tooltip mode.")
 
-(defun dictionary-display-tooltip (&ignore)
+(defun dictionary-display-tooltip (_)
   "Search the current word in the `dictionary-tooltip-dictionary'."
   (interactive "e")
   (if (and dictionary-tooltip-mode dictionary-tooltip-dictionary)
@@ -1446,7 +1446,7 @@ via `dictionary-dictionaries'."
         nil)))
 
 (defun dictionary-tooltip-track-mouse (event)
-  "Called whenever a dictionary tooltip display is about to be triggered."
+  "Hide current tooltip and setup next tooltip in response to mouse movement EVENT."
   (interactive "e")
   (tooltip-hide)
   (when dictionary-tooltip-mode
@@ -1454,7 +1454,7 @@ via `dictionary-dictionaries'."
     (tooltip-start-delayed-tip)))
 
 (defun dictionary-switch-tooltip-mode (on)
-  "Turn off or on support for the dictionary tooltip mode.
+  "Turn dictionary tooltip mode off or ON.
 
 It is normally internally called with 1 to enable support for the
 tooltip mode.  The hook function will check the value of the

commit 8c7db480ead8ef623a382fcd990dd91486616dca
Author: Yuan Fu <casouri@gmail.com>
Date:   Tue Dec 24 13:52:03 2024 -0800

    ; * etc/NEWS: Update tree-sitter NEWS.

diff --git a/etc/NEWS b/etc/NEWS
index 9754322b1bf..ca107bb4938 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -999,6 +999,22 @@ For example, 'cpp' is translated to "C++".  Also adds a new variable
 'treesit-language-display-name-alist' that the function uses to
 translate display names.
 
++++
+*** New command 'treesit-explore'
+This command replaces 'treesit-explore-mode'.  It turns on
+'treesit-explore-mode' if it’s not on, and pops up the explorer buffer
+if it’s already on.
+
++++
+*** 'treesit-explore-mode' now supports local parsers
+Now 'treesit-explore-mode' (or 'treesit-explore') prompts for a parser
+rather than a language, and it’s now possible to select a local parser
+at point to explore.
+
++++
+*** New variable 'treesit-aggregated-simple-imenu-settings'
+This variable allows major modes to setup Imenu for multiple languages.
+
 +++
 ** New optional BUFFER argument for 'string-pixel-width'.
 If supplied, 'string-pixel-width' will use any face remappings from

commit e2a9af431191d5c71e2ca7a4347ce9e435e8cca0
Author: Yuan Fu <casouri@gmail.com>
Date:   Tue Dec 24 13:17:51 2024 -0800

    Add treesit-aggregated-simple-imenu-settings
    
    Now we support setting up Imenu for multiple languages
    
    * doc/lispref/modes.texi: Update manual.
    * lisp/treesit.el:
    (treesit-aggregated-simple-imenu-settings): New variable.
    (treesit--imenu-merge-entries): New function.
    (treesit--generate-simple-imenu): This was previously
    treesit-simple-imenu.
    (treesit-simple-imenu): Support
    treesit-aggregated-simple-imenu-settings.
    (treesit-major-mode-setup): Recognize
    treesit-aggregated-simple-imenu-settings.
    * test/src/treesit-tests.el (treesit-imenu): New test.

diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index 73edb688c85..f227bdc635f 100644
--- a/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@ -3109,6 +3109,15 @@ instead.
 automatically sets up Imenu if this variable is non-@code{nil}.
 @end defvar
 
+@defvar treesit-aggregated-simple-imenu-settings
+This variable allows major modes to configure Imenu for multiple
+languages.  Its value is an alist mapping language symbols to Imenu
+settings described in @var{treesit-simple-imenu-settings}.
+
+If both this variable and @var{treesit-simple-imenu-settings} is
+non-@code{nil}, Emacs uses this variable for setting up Imenu.
+@end defvar
+
 @node Outline Minor Mode
 @section Outline Minor Mode
 
diff --git a/lisp/treesit.el b/lisp/treesit.el
index 2cf7bccdeed..464b7e688be 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -3123,6 +3123,31 @@ node and returns the name of that defun node.  If NAME-FN is nil,
 `treesit-major-mode-setup' automatically sets up Imenu if this
 variable is non-nil.")
 
+;; `treesit-simple-imenu-settings' doesn't support multiple languages,
+;; and we need to add multi-lang support for Imenu.  One option is to
+;; extend treesit-simple-imenu-settings to specify language, either by
+;; making it optionally an alist (just like
+;; `treesit-aggregated-simple-imenu-settings'), or add a fifth element
+;; to each setting.  But either way makes borrowing Imenu settings from
+;; other modes difficult: with the alist approach, you'd need to check
+;; whether other mode uses a plain list or an alist; with the fifth
+;; element approach, again, you need to check if each setting has the
+;; fifth element, and add it if not.
+;;
+;; OTOH, with `treesit-aggregated-simple-imenu-settings', borrowing
+;; Imenu settings is easy: if `treesit-aggregated-simple-imenu-settings'
+;; is non-nil, copy everything over; if `treesit-simple-imenu-settings'
+;; is non-nil, copy the settings and put them under a language symbol.
+(defvar treesit-aggregated-simple-imenu-settings nil
+  "Settings that configure `treesit-simple-imenu' for multi-language modes.
+
+The value should be an alist of (LANG . SETTINGS), where LANG is a
+language symbol, and SETTINGS has the same form as
+`treesit-simple-imenu-settings'.
+
+When both this variable and `treesit-simple-imenu-settings' are non-nil,
+this variable takes priority.")
+
 (defun treesit--simple-imenu-1 (node pred name-fn)
   "Given a sparse tree, create an Imenu index.
 
@@ -3170,20 +3195,69 @@ ENTRY.  MARKER marks the start of each tree-sitter node."
      ;; Leaf node, return a (list of) plain index entry.
      (t (list (cons name marker))))))
 
+(defun treesit--imenu-merge-entries (entries)
+  "Merge ENTRIES by category.
+
+ENTRIES is a list of (CATEGORY . SUB-ENTRIES...).  Merge them so there's
+no duplicate CATEGORY.  CATEGORY's are strings.  The merge is stable,
+meaning the order of elements are kept."
+  (let ((return-entries nil))
+    (dolist (entry entries)
+      (let* ((category (car entry))
+             (sub-entries (cdr entry))
+             (existing-entries
+              (alist-get category return-entries nil nil #'equal)))
+        (if (not existing-entries)
+            (push entry return-entries)
+          (setf (alist-get category return-entries nil nil #'equal)
+                (append existing-entries sub-entries)))))
+    (nreverse return-entries)))
+
+(defun treesit--generate-simple-imenu (node settings)
+  "Return an Imenu index for NODE with SETTINGS.
+
+NODE usually should be a root node of a parser.  SETTINGS is described
+by `treesit-simple-imenu-settings'."
+  (mapcan (lambda (setting)
+            (pcase-let ((`(,category ,regexp ,pred ,name-fn)
+                         setting))
+              (when-let* ((tree (treesit-induce-sparse-tree
+                                 node regexp))
+                          (index (treesit--simple-imenu-1
+                                  tree pred name-fn)))
+                (if category
+                    (list (cons category index))
+                  index))))
+          settings))
+
 (defun treesit-simple-imenu ()
   "Return an Imenu index for the current buffer."
-  (let ((root (treesit-buffer-root-node)))
-    (mapcan (lambda (setting)
-              (pcase-let ((`(,category ,regexp ,pred ,name-fn)
-                           setting))
-                (when-let* ((tree (treesit-induce-sparse-tree
-                                   root regexp))
-                            (index (treesit--simple-imenu-1
-                                    tree pred name-fn)))
-                  (if category
-                      (list (cons category index))
-                    index))))
-            treesit-simple-imenu-settings)))
+  (if (not treesit-aggregated-simple-imenu-settings)
+      (treesit--generate-simple-imenu
+       (treesit-parser-root-node treesit-primary-parser)
+       treesit-simple-imenu-settings)
+    ;; Use `treesit-aggregated-simple-imenu-settings'.  Remove languages
+    ;; that doesn't have any Imenu entries.
+    (seq-filter
+     #'cdr
+     (mapcar
+      (lambda (entry)
+        (let* ((lang (car entry))
+               (settings (cdr entry))
+               (global-parser (car (treesit-parser-list nil lang)))
+               (local-parsers
+                (treesit-parser-list nil lang 'embedded)))
+          (cons (treesit-language-display-name lang)
+                ;; No one says you can't have both global and local
+                ;; parsers for the same language.  E.g., Rust uses
+                ;; local parsers for the same language to handle
+                ;; macros.
+                (treesit--imenu-merge-entries
+                 (mapcan (lambda (parser)
+                           (treesit--generate-simple-imenu
+                            (treesit-parser-root-node parser) settings))
+                         (cons global-parser local-parsers))))))
+      treesit-aggregated-simple-imenu-settings))))
 
 ;;; Outline minor mode
 
@@ -3321,7 +3395,8 @@ and `end-of-defun-function'.
 If `treesit-defun-name-function' is non-nil, set up
 `add-log-current-defun'.
 
-If `treesit-simple-imenu-settings' is non-nil, set up Imenu.
+If `treesit-simple-imenu-settings' or
+`treesit-aggregated-simple-imenu-settings' is non-nil, set up Imenu.
 
 If either `treesit-outline-predicate' or `treesit-simple-imenu-settings'
 are non-nil, and Outline minor mode settings don't already exist, setup
@@ -3395,7 +3470,8 @@ before calling this function."
     (setq-local forward-sentence-function #'treesit-forward-sentence))
 
   ;; Imenu.
-  (when treesit-simple-imenu-settings
+  (when (or treesit-aggregated-simple-imenu-settings
+            treesit-simple-imenu-settings)
     (setq-local imenu-create-index-function
                 #'treesit-simple-imenu))
 
diff --git a/test/src/treesit-tests.el b/test/src/treesit-tests.el
index 50f205421d7..43102fc97e0 100644
--- a/test/src/treesit-tests.el
+++ b/test/src/treesit-tests.el
@@ -1270,6 +1270,20 @@ This tests bug#60355."
     (should node)
     (should (equal (treesit-node-text node) "2"))))
 
+;;; Imenu
+
+(ert-deftest treesit-imenu ()
+  "Test imenu functions."
+  (should (equal (treesit--imenu-merge-entries
+                  '(("Function" . (f1 f2))
+                    ("Function" . (f3 f4 f5))
+                    ("Class" . (c1 c2 c3))
+                    ("Variables" . (v1 v2))
+                    ("Class" . (c4))))
+                 '(("Function" . (f1 f2 f3 f4 f5))
+                   ("Class" . (c1 c2 c3 c4))
+                   ("Variables" . (v1 v2))))))
+
 
 ;; TODO
 ;; - Functions in treesit.el

commit 833494d4b00a837be8ceaa09b37f54ce17d0a062
Author: Yuan Fu <casouri@gmail.com>
Date:   Mon Dec 23 21:20:18 2024 -0800

    ; Add some shortdoc examples for treesit entry
    
    * lisp/treesit.el: Add some shortdoc examples.

diff --git a/lisp/treesit.el b/lisp/treesit.el
index be264b4292a..2cf7bccdeed 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -4376,6 +4376,22 @@ generated by \"git describe\".  It only works when
    :eval (treesit-pattern-expand '(identifier))
    :eval (treesit-pattern-expand :equal))
 
+  "Tree-sitter things and navigation"
+  (treesit-thing-defined-p
+   :no-eval (treesit-thing-defined-p 'sexp)
+   :eg-result nil)
+  (treesit-thing-definition
+   :no-eval (treesit-thing-defined 'sexp)
+   :eg-result (not ,(rx (or "{" "}" "[" "]" "(" ")" ","))))
+  (treesit-thing-at
+   :no-eval (treesit-thing-at 3943)
+   :eg-result-string "#<treesit-node (identifier) in 3941-3949>")
+  (treesit-thing-next
+   :no-eval (treesit-thing-next 3943 'sexp))
+  (treesit-navigate-thing
+   :no-eval (treesit-navigate-thing 3943 1 'beg 'sexp))
+  (treesit-beginning-of-thing
+   :no-eval (treesit-beginning-of-thing 'defun 1 'nested))
 
   "Parsing a string"
   (treesit-parse-string
@@ -4388,7 +4404,15 @@ generated by \"git describe\".  It only works when
   "Misc"
   (treesit-subtree-stat
    :no-eval (treesit-subtree-stat node)
-   :eg-result (6 33 487)))
+   :eg-result (6 33 487))
+  (treesit-language-abi-version
+   :no-eval (treesit-language-abi-version 'c)
+   :eg-result 14)
+  (treesit-grammar-location
+   :no-eval (treesit-language-abi-version 'c))
+  (treesit-language-display-name
+   :no-eval (treesit-language-display-name 'cpp)
+   :eg-result "C++"))
 
 (provide 'treesit)
 

commit 251b4c8c39535fee9f6da89420483304274ac03e
Author: Yuan Fu <casouri@gmail.com>
Date:   Mon Dec 23 21:19:32 2024 -0800

    Add treesit-language-display-name
    
    * lisp/treesit.el:
    (treesit-language-display-name-alist): New variable.
    (treesit-language-display-name): New function.
    * doc/lispref/parsing.texi (Language Grammar): Add to manual.
    * etc/NEWS: Add to NEWS.

diff --git a/doc/lispref/parsing.texi b/doc/lispref/parsing.texi
index 7f21c3864fc..fc56c20304b 100644
--- a/doc/lispref/parsing.texi
+++ b/doc/lispref/parsing.texi
@@ -160,6 +160,22 @@ grammar library loaded by Emacs for @var{language}.  If @var{language}
 is unavailable, this function returns @code{nil}.
 @end defun
 
+@vindex treesit-language-display-name-alist
+@defun treesit-language-display-name language
+This function translates @var{language} to an appropriate display name.
+For example, it translates @code{ruby} to ``Ruby'', @code{cpp} to
+``C++''.
+
+Most languages has ``regular'' names, and their display name is simply
+the symbol name with first letter capitalized.  For languages that has
+``irregular'' names, @var{treesit-language-display-name-alist} maps
+language symbols to their display names.
+
+If a major mode package uses a langauge with ``irregular'' name, they
+should add a mapping into @var{treesit-language-display-name-alist} on
+load.
+@end defun
+
 @heading Concrete syntax tree
 @cindex syntax tree, concrete
 
diff --git a/etc/NEWS b/etc/NEWS
index 847cc39ce96..9754322b1bf 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -992,6 +992,13 @@ The new function 'treesit-forward-sexp-list' uses 'sexp-list'
 to move across lists.  But to move across atoms inside the list
 it uses `forward-sexp-default-function'.
 
++++
+*** New function 'treesit-language-display-name'.
+New function that returns the display name given the language symbol.
+For example, 'cpp' is translated to "C++".  Also adds a new variable
+'treesit-language-display-name-alist' that the function uses to
+translate display names.
+
 +++
 ** New optional BUFFER argument for 'string-pixel-width'.
 If supplied, 'string-pixel-width' will use any face remappings from
diff --git a/lisp/treesit.el b/lisp/treesit.el
index e37ea85ebbe..be264b4292a 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -835,6 +835,36 @@ omitted, default END to BEG."
                return rng
                finally return nil))))
 
+;;; Language display name
+
+;; The entries are sorted by `sort-lines'.
+(defvar treesit-language-display-name-alist
+  '(
+    (charp . "C#")
+    (cmake . "CMake")
+    (cpp . "C++")
+    (gomod . "Go Mod")
+    (heex . "HEEx")
+    (json . "JSON")
+    (php . "PHP")
+    (tsx . "TSX")
+    )
+  "An alist mapping language symbols to their display names.
+
+Used by `treesit-language-display-name'.  If there's no mapping in this
+alist, `treesit-language-display-name' converts the symbol to display
+name by capitalizing the first letter.  So languages like Java,
+Javascript, Rust don't need an entry in this variable.")
+
+(defun treesit-language-display-name (language)
+  "Returns the display name (a string) of LANGUAGE.
+
+If LANGUAGE has an entry in `treesit-language-display-name-alist', use
+the display name in their.  Otherwise, capitalize the first letter of
+LANGUAGE and return the string."
+  (or (alist-get language treesit-language-display-name-alist)
+      (capitalize (symbol-name language))))
+
 ;;; Fontification
 
 (define-error 'treesit-font-lock-error

commit 563e5868f6dbab59937ad247b45b488f5523ad3c
Author: Juri Linkov <juri@linkov.net>
Date:   Tue Dec 24 19:39:30 2024 +0200

    Add treesit thing 'sexp-list' to c++-ts-mode (bug#73404)
    
    * lisp/progmodes/c-ts-mode.el (c-ts-mode--thing-settings):
    Add C++ 'sexp-list' nodes for 'treesit-thing-settings'.

diff --git a/lisp/progmodes/c-ts-mode.el b/lisp/progmodes/c-ts-mode.el
index 90e73260b9b..5537439004e 100644
--- a/lisp/progmodes/c-ts-mode.el
+++ b/lisp/progmodes/c-ts-mode.el
@@ -1170,7 +1170,18 @@ if `c-ts-mode-emacs-sources-support' is non-nil."
                     "initializer_list"
                     "subscript_designator"
                     "subscript_range_designator"
-                    "string_literal")
+                    "string_literal"
+                    "system_lib_string"
+                    ;; C++
+                    "template_parameter_list"
+                    "structured_binding_declarator"
+                    "template_argument_list"
+                    "condition_clause"
+                    "subscript_argument_list"
+                    "requirement_seq"
+                    "requires_parameter_list"
+                    "lambda_capture_specifier"
+                    "fold_expression")
                   'symbols))
     ;; compound_statement makes us jump over too big units
     ;; of code, so skip that one, and include the other

commit b061c01607aa43b8ffa1b5c4a90c3602497cf823
Author: Juri Linkov <juri@linkov.net>
Date:   Tue Dec 24 19:24:11 2024 +0200

    Add treesit thing 'sexp-list' to tsx-ts-mode (bug#73404, bug#73978)
    
    * lisp/progmodes/typescript-ts-mode.el (tsx-ts-mode):
    Add 'sexp-list' to 'treesit-thing-settings' with "jsx" things.
    (typescript-ts-mode--sexp-list-nodes): Remove "jsx" things.

diff --git a/lisp/progmodes/typescript-ts-mode.el b/lisp/progmodes/typescript-ts-mode.el
index 5c3c9a24ff4..df41c179e30 100644
--- a/lisp/progmodes/typescript-ts-mode.el
+++ b/lisp/progmodes/typescript-ts-mode.el
@@ -470,8 +470,6 @@ See `treesit-thing-settings' for more information.")
     "object_pattern"
     "array"
     "array_pattern"
-    "jsx_expression"
-    "_jsx_string"
     "string"
     "regex"
     "arguments"
@@ -599,8 +597,15 @@ at least 3 (which is the default value)."
                 `((tsx
                    (sexp ,(regexp-opt
                            (append typescript-ts-mode--sexp-nodes
-                                   '("jsx"))
-                           'symbols))
+                                   '("jsx"))))
+                   (sexp-list ,(concat "^"
+                                       (regexp-opt
+                                        (append typescript-ts-mode--sexp-list-nodes
+                                                '(
+                                                  "jsx_element"
+                                                  "jsx_self_closing_element"
+                                                  "jsx_expression")))
+                                       "$"))
                    (sentence ,(regexp-opt
                                (append typescript-ts-mode--sentence-nodes
                                        '("jsx_element"

commit f0afebb99158be3db1d9623758321622a1026c8d
Author: Juri Linkov <juri@linkov.net>
Date:   Tue Dec 24 09:40:21 2024 +0200

    * lisp/progmodes/typescript-ts-mode.el: Fix regexp-opt of treesit-thing.
    
    (typescript-ts-base-mode): Add arg 'symbols' to regexp-opt of 'sexp',
    'sexp-list', 'sentence', 'text' (bug#73404, bug#74366, bug#74963).
    (tsx-ts-mode): Add arg 'symbols' to regexp-opt of 'sexp', 'sentence'.
    This avoids such mismatches as "string_fragment" by "string".

diff --git a/lisp/progmodes/typescript-ts-mode.el b/lisp/progmodes/typescript-ts-mode.el
index 08c8a71c18e..5c3c9a24ff4 100644
--- a/lisp/progmodes/typescript-ts-mode.el
+++ b/lisp/progmodes/typescript-ts-mode.el
@@ -514,12 +514,14 @@ This mode is intended to be inherited by concrete major modes."
 
   (setq-local treesit-thing-settings
               `((typescript
-                 (sexp ,(regexp-opt typescript-ts-mode--sexp-nodes))
-                 (sexp-list ,(regexp-opt typescript-ts-mode--sexp-list-nodes))
+                 (sexp ,(regexp-opt typescript-ts-mode--sexp-nodes 'symbols))
+                 (sexp-list ,(regexp-opt typescript-ts-mode--sexp-list-nodes
+                                         'symbols))
                  (sentence ,(regexp-opt
-                             typescript-ts-mode--sentence-nodes))
+                             typescript-ts-mode--sentence-nodes 'symbols))
                  (text ,(regexp-opt '("comment"
-                                      "template_string"))))))
+                                      "template_string")
+                                    'symbols)))))
 
   ;; Imenu (same as in `js-ts-mode').
   (setq-local treesit-simple-imenu-settings
@@ -597,11 +599,13 @@ at least 3 (which is the default value)."
                 `((tsx
                    (sexp ,(regexp-opt
                            (append typescript-ts-mode--sexp-nodes
-                                   '("jsx"))))
+                                   '("jsx"))
+                           'symbols))
                    (sentence ,(regexp-opt
                                (append typescript-ts-mode--sentence-nodes
                                        '("jsx_element"
-                                         "jsx_self_closing_element")))))))
+                                         "jsx_self_closing_element"))
+                               'symbols)))))
 
     ;; Font-lock.
     (setq-local treesit-font-lock-settings

commit 7ac7ebef6cde9942905c45126cc6ef2bab01dc10
Author: Yuan Fu <casouri@gmail.com>
Date:   Mon Dec 23 18:51:51 2024 -0800

    ; Update c-ts-mode and c++-ts-mode's verified revision
    
    * lisp/progmodes/c-ts-mode.el: Update revision.

diff --git a/lisp/progmodes/c-ts-mode.el b/lisp/progmodes/c-ts-mode.el
index 67ccbb8594b..90e73260b9b 100644
--- a/lisp/progmodes/c-ts-mode.el
+++ b/lisp/progmodes/c-ts-mode.el
@@ -25,10 +25,10 @@
 ;;; Tree-sitter language versions
 ;;
 ;; c-ts-mode is known to work with the following languages and version:
-;; - tree-sitter-c: v0.20.8-61-g3efee11
+;; - tree-sitter-c: v0.23.4
 ;;
 ;; c++-ts-mode is known to work with the following languages and version:
-;; - tree-sitter-cpp: v0.20.5-49-gf41b4f6
+;; - tree-sitter-cpp: v0.23.4-1-gf41b4f6
 ;;
 ;; We try our best to make builtin modes work with latest grammar
 ;; versions, so a more recent grammar version has a good chance to work.

commit 32ad7342893833058ca2f7f8eca667bd32d42ea0
Author: Yuan Fu <casouri@gmail.com>
Date:   Mon Dec 23 18:50:08 2024 -0800

    Include lightweight tags in treesit-admin--verify-major-mode-queries
    
    * lisp/treesit.el (treesit--language-git-revision): Include
    lightweight tags as well.

diff --git a/lisp/treesit.el b/lisp/treesit.el
index 69b800cb271..e37ea85ebbe 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -4013,7 +4013,7 @@ Return the output of \"git describe\". If anything goes wrong, return
 nil."
   (with-temp-buffer
     (cond
-     ((eq 0 (call-process "git" nil t nil "describe"))
+     ((eq 0 (call-process "git" nil t nil "describe" "--tags"))
       (string-trim (buffer-string)))
      ((eq 0 (progn (erase-buffer)
                    (call-process "git" nil t nil "rev-parse" "HEAD")))

commit 4def541bbfe67b1a492e8a3b6041a1d8f76d680b
Author: Yuan Fu <casouri@gmail.com>
Date:   Mon Dec 23 18:43:11 2024 -0800

    Fix cmake-ts-mode font-lock queries
    
    This commit in tree-sitter-cmake removed angle brackets:
    
    https://github.com/uyha/tree-sitter-cmake/commit/a414a4c83d54388f596269639c175a5b84bfa929
    
    * lisp/progmodes/cmake-ts-mode.el
    (cmake-ts-mode--font-lock-settings): Remove angle brackets.

diff --git a/lisp/progmodes/cmake-ts-mode.el b/lisp/progmodes/cmake-ts-mode.el
index 3ec239e89bb..1871ea39a47 100644
--- a/lisp/progmodes/cmake-ts-mode.el
+++ b/lisp/progmodes/cmake-ts-mode.el
@@ -22,6 +22,15 @@
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
+;;; Tree-sitter language versions
+;;
+;; cmake-ts-mode is known to work with the following languages and version:
+;; - tree-sitter-cmake: e409ae33f00e04cde30f2bcffb979caf1a33562a
+;;
+;; We try our best to make builtin modes work with latest grammar
+;; versions, so a more recent grammar version has a good chance to work.
+;; Send us a bug report if it doesn't.
+
 ;;; Commentary:
 ;;
 
@@ -175,7 +184,7 @@ Check if a node type is available, then return the right font lock rules."
    :feature 'misc-punctuation
    ;; Don't override strings.
    :override 'nil
-   '((["$" "{" "}" "<" ">"]) @font-lock-misc-punctuation-face)
+   '((["$" "{" "}"]) @font-lock-misc-punctuation-face)
 
    :language 'cmake
    :feature 'variable

commit 93755ea1a6113e115ac3349b67e58e2f3fd03894
Author: Yuan Fu <casouri@gmail.com>
Date:   Mon Dec 23 17:12:39 2024 -0800

    Create a blobless clone in treesit-admin--verify-major-mode-queries
    
    * admin/treesit-admin.el (treesit-admin--verify-major-mode-queries):
    Create a blobless clone.
    * lisp/treesit.el (treesit--install-language-grammar-blobless):
    New variable.
    (treesit--git-clone-repo): Support blobless clone.

diff --git a/admin/treesit-admin.el b/admin/treesit-admin.el
index 3c0798a29f2..440056aff21 100644
--- a/admin/treesit-admin.el
+++ b/admin/treesit-admin.el
@@ -96,6 +96,7 @@ queries that has problems with latest grammar."
   (let ((treesit-extra-load-path (list grammar-dir))
         (treesit-language-source-alist treesit-admin--builtin-language-sources)
         (treesit--install-language-grammar-full-clone t)
+        (treesit--install-language-grammar-blobless t)
         (version-alist nil)
         (invalid-feature-list nil)
         (valid-modes nil)
diff --git a/lisp/treesit.el b/lisp/treesit.el
index 7b7f4842505..69b800cb271 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -3925,6 +3925,9 @@ See `treesit-language-source-alist' for details."
 (defvar treesit--install-language-grammar-full-clone nil
   "If non-nil, do a full clone when cloning git repos.")
 
+(defvar treesit--install-language-grammar-blobless nil
+  "If non-nil, create a blobless clone when cloning git repos.")
+
 ;;;###autoload
 (defun treesit-install-language-grammar (lang &optional out-dir)
   "Build and install the tree-sitter language grammar library for LANG.
@@ -4048,6 +4051,8 @@ Use shallow clone by default.  Do a full clone when
   (let ((args (list "git" nil t nil "clone" url "--quiet")))
     (when (not treesit--install-language-grammar-full-clone)
       (setq args (append args (list "--depth" "1"))))
+    (when treesit--install-language-grammar-blobless
+      (setq args (append args (list "--filter=blob:none"))))
     (when revision
       (setq args (append args (list "-b" revision))))
     (setq args (append args (list workdir)))

commit 8d7cba7bbf8fe83bbf9a9d8cae963983f3bca8cf
Author: Yuan Fu <casouri@gmail.com>
Date:   Fri Dec 20 22:46:31 2024 -0800

    ; Minor comment improvement in c-ts-common--adaptive-fill-prefix
    
    * lisp/progmodes/c-ts-common.el (c-ts-common--adaptive-fill-prefix):
    Improve comment.

diff --git a/lisp/progmodes/c-ts-common.el b/lisp/progmodes/c-ts-common.el
index 137ff37a661..25b386cbaa7 100644
--- a/lisp/progmodes/c-ts-common.el
+++ b/lisp/progmodes/c-ts-common.el
@@ -249,9 +249,12 @@ This function should be called at BOL.  Used by
    ;; (3)
    ;; Current line: *, |, -
    ;; Prefix: same.
-   ;; This branch must return the same prefix as branch (1), as the
-   ;; second line in the paragraph; then the whole paragraph will use *
-   ;; as the prefix.
+   ;; Adaptive fill looks at the first and second line of a paragraph,
+   ;; only when both lines return the same prefix does it use that
+   ;; prefix for the following lines.  If the first lines matches branch
+   ;; (1) and returns * as prefix, and the second line matches this
+   ;; branch (3), and returns * as prefix, then the whole paragraph will
+   ;; use * as prefix.
    ((looking-at (rx (* (syntax whitespace))
                     (or "*" "|" "-")
                     (* (syntax whitespace))))

commit 6ac38396898e6324d4c6dddb2ad05d1ad0dc5e7c
Author: Stefan Kangas <stefankangas@gmail.com>
Date:   Tue Dec 24 00:04:51 2024 +0100

    ; * .mailmap: Fix UTF-8 issue.

diff --git a/.mailmap b/.mailmap
index bbfe4bceba1..56876a30fbe 100644
--- a/.mailmap
+++ b/.mailmap
@@ -27,6 +27,7 @@ Andrew G Cohen <cohen@andy.bu.edu> <cohen@bu.edu>
 Arash Esbati <arash@gnu.org> <arash.esbati@gmail.com>
 Arash Esbati <arash@gnu.org> <esbati@gmx.de>
 Arni Magnusson <thisisarni@gmail.com> <arnima@hafro.is>
+Arsen Arsenović <arsen@aarsen.me>
 Artur Malabarba <bruce.connor.am@gmail.com> <am12548@it055607.users.bris.ac.uk>
 Artur Malabarba <bruce.connor.am@gmail.com> Artur Malabarba <address@hidden>
 Basil L. Contovounesios <basil@contovou.net> <contovob@tcd.ie>

commit 28c420afab6a0944a192c30ff2d5d9e40c88f14f
Author: Paul Eggert <eggert@cs.ucla.edu>
Date:   Mon Dec 23 13:38:51 2024 -0800

    Avoid U+FFFD in commit messages
    
    * build-aux/git-hooks/commit-msg:
    Also check against U+FFFD REPLACEMENT CHARACTER in commit messages.

diff --git a/build-aux/git-hooks/commit-msg b/build-aux/git-hooks/commit-msg
index 1eb2560bba2..dace4c7fb66 100755
--- a/build-aux/git-hooks/commit-msg
+++ b/build-aux/git-hooks/commit-msg
@@ -31,6 +31,8 @@ fi
 # Use U+00A2 CENT SIGN to test whether the locale works.
 cent_sign_utf8_format='\302\242\n'
 cent_sign=`printf "$cent_sign_utf8_format"`
+replacement_character_utf8_format='\357\277\275\n'
+replacement_character=`printf "$replacement_character_utf8_format"`
 print_at_sign='BEGIN {print substr("'$cent_sign'@", 2)}'
 at_sign=`$awk "$print_at_sign" </dev/null 2>/dev/null`
 if test "$at_sign" != @; then
@@ -44,7 +46,12 @@ if test "$at_sign" != @; then
 fi
 
 # Check the log entry.
-exec $awk -v at_sign="$at_sign" -v cent_sign="$cent_sign" -v file="$1" '
+exec $awk \
+     -v at_sign="$at_sign" \
+     -v cent_sign="$cent_sign" \
+     -v file="$1" \
+     -v replacement_character="$replacement_character" \
+'
   BEGIN {
     # These regular expressions assume traditional Unix unibyte behavior.
     # They are needed for old or broken versions of awk, e.g.,
@@ -137,6 +144,10 @@ exec $awk -v at_sign="$at_sign" -v cent_sign="$cent_sign" -v file="$1" '
     print "Unprintable character in commit message"
     status = 1
   }
+  $0 ~ replacement_character {
+    print "Replacement character in commit message"
+    status = 1
+  }
 
   END {
     if (nlines == 0) {

commit b1de495eeae9afc8abccd908e5c53c463afdb7dc
Author: Michael Albinus <michael.albinus@gmx.de>
Date:   Mon Dec 23 12:46:23 2024 +0100

    * configure.ac (dbus): Default to ifavailable.  (Bug#75004)

diff --git a/configure.ac b/configure.ac
index 1c7545ef984..18cbb42b0ef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -578,7 +578,7 @@ OPTION_DEFAULT_OFF([w32], [use native MS Windows GUI in a Cygwin build])
 OPTION_DEFAULT_OFF([pgtk], [use GTK to support window systems other than X])
 
 OPTION_DEFAULT_ON([gpm],[don't use -lgpm for mouse support on a GNU/Linux console])
-OPTION_DEFAULT_ON([dbus],[don't compile with D-Bus support])
+OPTION_DEFAULT_IFAVAILABLE([dbus],[compile with D-Bus support])
 AC_ARG_WITH([gconf],[AS_HELP_STRING([--with-gconf],
 [compile with Gconf support (Gsettings replaces this)])],[],
 [if test $with_features = yes; then
@@ -3969,8 +3969,8 @@ dnl D-Bus has been tested under GNU/Linux only.  Must be adapted for
 dnl other platforms.
 HAVE_DBUS=no
 DBUS_OBJ=
-if test "${with_dbus}" = "yes"; then
-   EMACS_CHECK_MODULES([DBUS], [dbus-1 >= 1.0])
+if test "${with_dbus}" != "no" ; then
+   EMACS_CHECK_MODULES([DBUS], [dbus-1 >= 1.0], [HAVE_DBUS=yes], [HAVE_DBUS=no])
    if test "$HAVE_DBUS" = yes; then
      AC_DEFINE([HAVE_DBUS], [1], [Define to 1 if using D-Bus.])
      dnl dbus_watch_get_unix_fd has been introduced in D-Bus 1.1.1.
@@ -5564,6 +5564,11 @@ if test "${HAVE_X11}" = "yes"; then
        WITH_IFAVAILABLE="$WITH_IFAVAILABLE --with-tiff=ifavailable";;
   esac
 fi
+case $with_dbus,$HAVE_DBUS in
+  no,* | ifavailable,* | *,yes) ;;
+  *) MISSING="$MISSING dbus-1"
+     WITH_IFAVAILABLE="$WITH_IFAVAILABLE --with-dbus=ifavailable";;
+esac
 case $with_gnutls,$HAVE_GNUTLS in
   no,* | ifavailable,* | *,yes) ;;
   *) MISSING="$MISSING gnutls"

commit 6017c6a986fd958732facb1bb6ea2c040981b023
Author: Martin Rudalics <rudalics@gmx.at>
Date:   Mon Dec 23 10:59:11 2024 +0100

    Make 'fit-frame-to-buffer' work around size hints (Bug#74866)
    
    * lisp/window.el (fit-frame-to-buffer-1): When
    'frame-resize-pixelwise' is nil, round up requested sizes to avoid
    that lines get wrapped (Bug#74866).
    * doc/lispref/windows.texi (Resizing Windows): Mention that with
    size hints one may have to set 'frame-resize-pixelwise' to make
    'fit-frame-to-buffer' fit the buffer exactly.

diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi
index adc294e4c99..3ff78b599de 100644
--- a/doc/lispref/windows.texi
+++ b/doc/lispref/windows.texi
@@ -1166,7 +1166,9 @@ frame to its buffer using the command @code{fit-frame-to-buffer}.
 This command adjusts the size of @var{frame} to display the contents of
 its buffer exactly.  @var{frame} can be any live frame and defaults to
 the selected one.  Fitting is done only if @var{frame}'s root window is
-live.
+a live window.  On window systems that use size hints, exact fitting can
+be often achieved if and only if @code{frame-resize-pixelwise}
+(@pxref{Frame Size}) is non-@code{nil}.
 
 The arguments @var{max-height}, @var{min-height}, @var{max-width} and
 @var{min-width}, if non-@code{nil}, specify bounds on the new body size
diff --git a/lisp/window.el b/lisp/window.el
index e9d57652ec6..cd19fd73849 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -9921,6 +9921,26 @@ for `fit-frame-to-buffer'."
             ;; Move frame down.
             (setq top top-margin)))))
       ;; Apply our changes.
+      (unless frame-resize-pixelwise
+	;; When 'frame-resize-pixelwise' is nil, a frame cannot be
+	;; necessarily fit completely even if the window's calculated
+	;; width and height are integral multiples of the frame's
+	;; character width and height.  The size hints Emacs produces
+	;; are inept to handle that when the combined sizes of the
+	;; frame's fringes, scroll bar and internal border are not an
+	;; integral multiple of the frame's character width (Bug#74866).
+	;; Consequently, the window manager will round sizes down and
+	;; this may cause lines getting wrapped.  To avoid that, round
+	;; sizes up here which will, however, leave a blank space at the
+	;; end of the longest line(s).
+	(setq text-minus-body-width
+	      (+ text-minus-body-width
+		 (- char-width
+		    (% text-minus-body-width char-width))))
+	(setq text-minus-body-height
+	      (+ text-minus-body-height
+		 (- char-height
+		    (% text-minus-body-height char-height)))))
       (setq text-width
             (if width
                 (+ width text-minus-body-width)

commit 39380e1bd3bfc26e355445590e243fcfa940fc9f
Author: Arsen Arsenović <arsen@aarsen.me>
Date:   Sun Dec 22 19:33:29 2024 +0000

    Java Mode: introduce the keyword `assert'.
    
    * lisp/progmodes/cc-langs.el (c-simple-stmt-kwds): Put `assert'
    into the java value.

diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el
index a256371f850..8d3d0ed3a3b 100644
--- a/lisp/progmodes/cc-langs.el
+++ b/lisp/progmodes/cc-langs.el
@@ -3251,7 +3251,7 @@ Such a keyword is a member of `c-paren-clause-kwds."
   c++    '("break" "continue" "goto" "return" "co_return")
   objc '("break" "continue" "goto" "return" "@throw")
   ;; Note: `goto' is not valid in Java, but the keyword is still reserved.
-  java '("break" "continue" "goto" "return" "throw")
+  java '("assert" "break" "continue" "goto" "return" "throw")
   idl  nil
   pike '("break" "continue" "return")
   awk  '(;; Not sure about "delete", "exit", "getline", etc. ; ACM 2002/5/30

commit 423e1ee7d6d6f34c0bc249a8dfb14a4a25eae08a
Author: Juri Linkov <juri@linkov.net>
Date:   Sun Dec 22 21:15:18 2024 +0200

    Add treesit thing 'sexp-list' to typescript-ts-mode (bug#73404)
    
    * lisp/progmodes/typescript-ts-mode.el (typescript-ts-base-mode):
    Add 'sexp-list' to 'treesit-thing-settings'.
    (typescript-ts-mode--sexp-list-nodes): New variable.

diff --git a/lisp/progmodes/typescript-ts-mode.el b/lisp/progmodes/typescript-ts-mode.el
index edca89e5c3a..08c8a71c18e 100644
--- a/lisp/progmodes/typescript-ts-mode.el
+++ b/lisp/progmodes/typescript-ts-mode.el
@@ -459,6 +459,35 @@ See `treesit-thing-settings' for more information.")
   "Nodes that designate sexps in TypeScript.
 See `treesit-thing-settings' for more information.")
 
+(defvar typescript-ts-mode--sexp-list-nodes
+  '("export_clause"
+    "named_imports"
+    "statement_block"
+    "_for_header"
+    "switch_body"
+    "parenthesized_expression"
+    "object"
+    "object_pattern"
+    "array"
+    "array_pattern"
+    "jsx_expression"
+    "_jsx_string"
+    "string"
+    "regex"
+    "arguments"
+    "class_body"
+    "formal_parameters"
+    "computed_property_name"
+    "decorator_parenthesized_expression"
+    "enum_body"
+    "parenthesized_type"
+    "type_arguments"
+    "object_type"
+    "type_parameters"
+    "tuple_type")
+  "Nodes that designate lists in TypeScript.
+See `treesit-thing-settings' for more information.")
+
 ;;;###autoload
 (define-derived-mode typescript-ts-base-mode prog-mode "TypeScript"
   "Generic major mode for editing TypeScript.
@@ -486,6 +515,7 @@ This mode is intended to be inherited by concrete major modes."
   (setq-local treesit-thing-settings
               `((typescript
                  (sexp ,(regexp-opt typescript-ts-mode--sexp-nodes))
+                 (sexp-list ,(regexp-opt typescript-ts-mode--sexp-list-nodes))
                  (sentence ,(regexp-opt
                              typescript-ts-mode--sentence-nodes))
                  (text ,(regexp-opt '("comment"

commit ec39f669f902143a68a99fb42dd05716a27736be
Author: Augusto Stoffel <arstoffel@gmail.com>
Date:   Tue Nov 5 15:07:27 2024 +0100

    Handle ':noquery' in 'open-gnutls-stream'
    
    * lisp/net/gnutls.el (open-gnutls-stream): Extract and use
    ':noquery' keyword.  (Bug#74193).

diff --git a/lisp/net/gnutls.el b/lisp/net/gnutls.el
index b5fb4d47d57..2261ccc7e30 100644
--- a/lisp/net/gnutls.el
+++ b/lisp/net/gnutls.el
@@ -166,7 +166,7 @@ Third arg HOST is the name of the host to connect to, or its IP address.
 Fourth arg SERVICE is the name of the service desired, or an integer
 specifying a port number to connect to.
 Fifth arg PARAMETERS is an optional list of keyword/value pairs.
-Only :client-certificate, :nowait, and :coding keywords are
+Only :client-certificate, :nowait, :noquery, and :coding keywords are
 recognized, and have the same meaning as for
 `open-network-stream'.
 For historical reasons PARAMETERS can also be a symbol, which is
@@ -197,9 +197,11 @@ trust and key files, and priority string."
          (cert (network-stream-certificate host service parameters))
          (keylist (and cert (list cert)))
          (nowait (plist-get parameters :nowait))
+         (noquery (plist-get parameters :noquery))
          (process (open-network-stream
                    name buffer host service
                    :nowait nowait
+                   :noquery noquery
                    :tls-parameters
                    (and nowait
                         (cons 'gnutls-x509pki

commit fb7bf20a9c129a97ceeabad00523ecafaa58697c
Author: Michael Albinus <michael.albinus@gmx.de>
Date:   Sun Dec 22 10:20:15 2024 +0100

    * test/lisp/files-tests.el (sh-shell): Move down declaration.

diff --git a/test/lisp/files-tests.el b/test/lisp/files-tests.el
index 78fc139025c..9dbf42ee603 100644
--- a/test/lisp/files-tests.el
+++ b/test/lisp/files-tests.el
@@ -1659,8 +1659,6 @@ The door of all subtleties!
   (should (equal (file-name-base "foo") "foo"))
   (should (equal (file-name-base "foo/bar") "bar")))
 
-(defvar sh-shell)
-
 (defun files-tests--check-mode (filename)
   "Return the major mode found in `auto-mode-alist' for FILENAME."
   (set-auto-mode--find-matching-alist-entry
@@ -1682,6 +1680,8 @@ The door of all subtleties!
   (should-not (eq (files-tests--check-mode "gdbinit.5") #'gdb-script-mode))
   (should-not (eq (files-tests--check-mode ".gdbinit.py.in") #'gdb-script-mode)))
 
+(defvar sh-shell)
+
 (defun files-tests--check-shebang (shebang expected-mode &optional expected-dialect)
   "Assert that mode for SHEBANG derives from EXPECTED-MODE.
 

commit 78eb102bc3d25aafb9a2d6756b956f7a2321a715
Author: Antero Mejr <antero@mailbox.org>
Date:   Mon May 15 23:15:33 2023 +0000

    Allow viewing .dcm images via image-convert
    
    * lisp/files.el (auto-mode-alist): Support the DICOM .dcm image
    format.  (Bug#63531)

diff --git a/lisp/files.el b/lisp/files.el
index c7c2e7206b2..9144aaf0553 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -3221,6 +3221,7 @@ ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\|RAR\\|CBR\\|7Z\\|SQUASHFS\\)\\'" .
      ("\\.cmyk\\'" . image-mode)
      ("\\.cmyka\\'" . image-mode)
      ("\\.crw\\'" . image-mode)
+     ("\\.dcm\\'" . image-mode)
      ("\\.dcr\\'" . image-mode)
      ("\\.dcx\\'" . image-mode)
      ("\\.dng\\'" . image-mode)

commit 7d41a23ad3b4c03ea1dea91eb70474f074dc05a4
Author: Antero Mejr <antero@mailbox.org>
Date:   Mon May 15 21:21:12 2023 +0000

    Allow viewing .six images via image-convert
    
    * lisp/files.el (auto-mode-alist): Support the Sixel .six image
    format.  (Bug#63531)
    * lisp/image.el (imagemagick-enabled-types): Add SIX.

diff --git a/lisp/files.el b/lisp/files.el
index c92fc0608dd..c7c2e7206b2 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -3250,6 +3250,7 @@ ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\|RAR\\|CBR\\|7Z\\|SQUASHFS\\)\\'" .
      ("\\.pict\\'" . image-mode)
      ("\\.rgb\\'" . image-mode)
      ("\\.rgba\\'" . image-mode)
+     ("\\.six\\'" . image-mode)
      ("\\.tga\\'" . image-mode)
      ("\\.wbmp\\'" . image-mode)
      ("\\.webp\\'" . image-mode)
diff --git a/lisp/image.el b/lisp/image.el
index ce97eeb3ca1..29467d05678 100644
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -1174,7 +1174,7 @@ has no effect."
     KDC MIFF MNG MRW MSL MSVG MTV NEF ORF OTB PBM PCD PCDS PCL
     PCT PCX PDB PEF PGM PICT PIX PJPEG PNG PNG24 PNG32 PNG8 PNM
     PPM PSD PTIF PWP RAF RAS RBG RGB RGBA RGBO RLA RLE SCR SCT
-    SFW SGI SR2 SRF SUN SVG SVGZ TGA TIFF TIFF64 TILE TIM TTF
+    SFW SGI SIX SR2 SRF SUN SVG SVGZ TGA TIFF TIFF64 TILE TIM TTF
     UYVY VDA VICAR VID VIFF VST WBMP WPG X3F XBM XC XCF XPM XV
     XWD YCbCr YCbCrA YUV)
   "List of ImageMagick types to treat as images.

commit 961cff855a9eccb9c2de31edc7d90ce697ebb65d
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Date:   Sat Dec 21 21:45:41 2024 -0500

    * lisp/vc/smerge-mode.el (smerge-extend): New command (bug#74509)

diff --git a/etc/NEWS b/etc/NEWS
index 12a318f5ed7..847cc39ce96 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -311,6 +311,9 @@ modal editing packages.
 
 * Changes in Specialized Modes and Packages in Emacs 31.1
 
+** Smerge
+*** New command 'smerge-extend' extends a conflict over surrounding lines.
+
 ** Browse URL
 
 *** New user option 'browse-url-transform-alist'.
diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el
index 09d9ebda21b..a64ad2e0ec3 100644
--- a/lisp/vc/smerge-mode.el
+++ b/lisp/vc/smerge-mode.el
@@ -311,7 +311,7 @@ Can be nil if the style is undecided, or else:
   (let ((ends nil))
     (dolist (i '(3 2 1 0))
       (push (if (match-end i) (copy-marker (match-end i) t)) ends))
-    (setq ends (apply 'vector ends))
+    (setq ends (apply #'vector ends))
     (goto-char (aref ends 0))
     (if (not (re-search-forward smerge-begin-re nil t))
 	(error "No next conflict")
@@ -701,7 +701,7 @@ this keeps \"LLL\"."
   (smerge-keep-n 3)
   (smerge-auto-leave))
 
-(define-obsolete-function-alias 'smerge-keep-other 'smerge-keep-lower "26.1")
+(define-obsolete-function-alias 'smerge-keep-other #'smerge-keep-lower "26.1")
 
 (defun smerge-keep-upper ()
   "Keep the \"upper\" version of a merge conflict.
@@ -718,7 +718,7 @@ this keeps \"UUU\"."
   (smerge-keep-n 1)
   (smerge-auto-leave))
 
-(define-obsolete-function-alias 'smerge-keep-mine 'smerge-keep-upper "26.1")
+(define-obsolete-function-alias 'smerge-keep-mine #'smerge-keep-upper "26.1")
 
 (defun smerge-get-current ()
   (let ((i 3))
@@ -759,7 +759,7 @@ this keeps \"UUU\"."
   (smerge-diff 2 1))
 
 (define-obsolete-function-alias 'smerge-diff-base-mine
-  'smerge-diff-base-upper "26.1")
+  #'smerge-diff-base-upper "26.1")
 
 (defun smerge-diff-base-lower ()
   "Diff `base' and `lower' version in current conflict region."
@@ -767,7 +767,7 @@ this keeps \"UUU\"."
   (smerge-diff 2 3))
 
 (define-obsolete-function-alias 'smerge-diff-base-other
-  'smerge-diff-base-lower "26.1")
+  #'smerge-diff-base-lower "26.1")
 
 (defun smerge-diff-upper-lower ()
   "Diff `upper' and `lower' version in current conflict region."
@@ -775,7 +775,7 @@ this keeps \"UUU\"."
   (smerge-diff 1 3))
 
 (define-obsolete-function-alias 'smerge-diff-mine-other
-  'smerge-diff-upper-lower "26.1")
+  #'smerge-diff-upper-lower "26.1")
 
 (defun smerge-match-conflict ()
   "Get info about the conflict.  Puts the info in the `match-data'.
@@ -1207,6 +1207,7 @@ repeating the command will highlight other two parts."
 			   '((smerge . refine) (font-lock-face . smerge-refined-added))))))
 
 (defun smerge-swap ()
+  ;; FIXME: Extend for diff3 to allow swapping the middle end as well.
   "Swap the \"Upper\" and the \"Lower\" chunks.
 Can be used before things like `smerge-keep-all' or `smerge-resolve' where the
 ordering can have some subtle influence on the result, such as preferring the
@@ -1219,6 +1220,49 @@ spacing of the \"Lower\" chunk."
     (goto-char (match-beginning 1))
     (insert txt3)))
 
+(defun smerge-extend (otherpos)
+  "Extend current conflict with some of the surrounding text.
+Point should be inside a conflict and OTHERPOS should be either a marker
+indicating the position until which to extend the conflict (either before
+or after the current conflict),
+OTHERPOS can also be an integer indicating the number of lines over which
+to extend the conflict.  If positive, it extends over the lines following
+the conflict and other, it extends over the lines preceding the conflict.
+When used interactively, you can specify OTHERPOS either using an active
+region, or with a numeric prefix.  By default it uses a numeric prefix of 1."
+  (interactive
+   (list (if (use-region-p) (mark-marker)
+           (prefix-numeric-value current-prefix-arg))))
+  ;; FIXME: If OTHERPOS is inside (or next to) another conflict
+  ;; or if there are conflicts between the current conflict and OTHERPOS,
+  ;; we end up messing up the conflict markers.  We should merge the
+  ;; conflicts instead!
+  (condition-case err
+      (smerge-match-conflict)
+    (error (if (not (markerp otherpos)) (signal (car err) (cdr err))
+             (goto-char (prog1 otherpos (setq otherpos (point-marker))))
+             (smerge-match-conflict))))
+  (let ((beg (match-beginning 0))
+        (end (copy-marker (match-end 0)))
+        text)
+    (when (integerp otherpos)
+      (goto-char (if (>= otherpos 0) end beg))
+      (setq otherpos (copy-marker (line-beginning-position (+ otherpos 1)))))
+    (setq text (cond
+                ((<= end otherpos)
+                 (buffer-substring end otherpos))
+                ((<= otherpos beg)
+                 (buffer-substring otherpos beg))
+                (t (user-error "The other end should be outside the conflict"))))
+    (dotimes (i 3)
+      (let* ((mn (- 3 i))
+             (me (funcall (if (<= end otherpos) #'match-end #'match-beginning)
+                          mn)))
+       (when me
+        (goto-char me)
+        (insert text))))
+    (delete-region (if (<= end otherpos) end beg) otherpos)))
+
 (defun smerge-diff (n1 n2)
   (smerge-match-conflict)
   (smerge-ensure-match n1)
@@ -1252,7 +1296,7 @@ spacing of the \"Lower\" chunk."
 	  (let ((inhibit-read-only t))
 	    (erase-buffer)
 	    (let ((status
-		   (apply 'call-process diff-command nil t nil
+		   (apply #'call-process diff-command nil t nil
 			  (append smerge-diff-switches
 				  (and (diff-check-labels)
 				       (list "--label"
@@ -1394,7 +1438,7 @@ with a \\[universal-argument] prefix, makes up a 3-way conflict."
          (when current-prefix-arg (pop-mark) (mark))))
   ;; Start from the end so as to avoid problems with pos-changes.
   (pcase-let ((`(,pt1 ,pt2 ,pt3 ,pt4)
-               (sort `(,pt1 ,pt2 ,pt3 ,@(if pt4 (list pt4))) '>=)))
+               (sort `(,pt1 ,pt2 ,pt3 ,@(if pt4 (list pt4))) #'>=)))
     (goto-char pt1) (beginning-of-line)
     (insert ">>>>>>> LOWER\n")
     (goto-char pt2) (beginning-of-line)

commit 86a8b24bdea52a7aab45abcc51db2dd47308c11f
Author: Stefan Kangas <stefankangas@gmail.com>
Date:   Sun Dec 22 02:57:45 2024 +0100

    Match more gdbinit files in auto-mode-alist
    
    * lisp/files.el (auto-mode-alist): Match more gdbinit files,
    including XDG, and MS-Windows.  Avoid false positives.
    (set-auto-mode--find-matching-alist-entry): Break out function...
    (set-auto-mode--apply-alist): ...from here.  (Bug#74946)
    * test/lisp/files-tests.el (files-tests--check-mode): New function.
    (files-tests-auto-mode-alist): New test.

diff --git a/lisp/files.el b/lisp/files.el
index c790d4add6f..c92fc0608dd 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -3056,7 +3056,7 @@ since only a single case-insensitive search through the alist is made."
      ;; files, cross-debuggers can use something like
      ;; .PROCESSORNAME-gdbinit so that the host and target gdbinit files
      ;; don't interfere with each other.
-     ("/\\.[a-z0-9-]*gdbinit" . gdb-script-mode)
+     ("/[._]?[A-Za-z0-9-]*\\(?:gdbinit\\(?:\\.\\(?:ini?\\|loader\\)\\)?\\|gdb\\.ini\\)\\'" . gdb-script-mode)
      ;; GDB 7.5 introduced OBJFILE-gdb.gdb script files; e.g. a file
      ;; named 'emacs-gdb.gdb', if it exists, will be automatically
      ;; loaded when GDB reads an objfile called 'emacs'.
@@ -3455,6 +3455,35 @@ If FUNCTION is nil, then it is not called.")
   "Upper limit on `magic-mode-alist' regexp matches.
 Also applies to `magic-fallback-mode-alist'.")
 
+(defun set-auto-mode--find-matching-alist-entry (alist name case-insensitive)
+  "Find first matching entry in ALIST for file NAME.
+
+If CASE-INSENSITIVE, the file system of file NAME is case-insensitive."
+  (let (mode)
+    (while name
+      (setq mode
+            (if case-insensitive
+                ;; Filesystem is case-insensitive.
+                (let ((case-fold-search t))
+                  (assoc-default name alist 'string-match))
+              ;; Filesystem is case-sensitive.
+              (or
+               ;; First match case-sensitively.
+               (let ((case-fold-search nil))
+                 (assoc-default name alist 'string-match))
+               ;; Fallback to case-insensitive match.
+               (and auto-mode-case-fold
+                    (let ((case-fold-search t))
+                      (assoc-default name alist 'string-match))))))
+      (if (and mode
+               (not (functionp mode))
+               (consp mode)
+               (cadr mode))
+          (setq mode (car mode)
+                name (substring name 0 (match-beginning 0)))
+        (setq name nil)))
+    mode))
+
 (defun set-auto-mode--apply-alist (alist keep-mode-if-same dir-local)
   "Helper function for `set-auto-mode'.
 This function takes an alist of the same form as
@@ -3476,29 +3505,8 @@ extra checks should be done."
         (when (and (stringp remote-id)
                    (string-match (regexp-quote remote-id) name))
           (setq name (substring name (match-end 0))))
-        (while name
-          ;; Find first matching alist entry.
-          (setq mode
-                (if case-insensitive-p
-                    ;; Filesystem is case-insensitive.
-                    (let ((case-fold-search t))
-                      (assoc-default name alist 'string-match))
-                  ;; Filesystem is case-sensitive.
-                  (or
-                   ;; First match case-sensitively.
-                   (let ((case-fold-search nil))
-                     (assoc-default name alist 'string-match))
-                   ;; Fallback to case-insensitive match.
-                   (and auto-mode-case-fold
-                        (let ((case-fold-search t))
-                          (assoc-default name alist 'string-match))))))
-          (if (and mode
-                   (not (functionp mode))
-                   (consp mode)
-                   (cadr mode))
-              (setq mode (car mode)
-                    name (substring name 0 (match-beginning 0)))
-            (setq name nil)))
+        (setq mode (set-auto-mode--find-matching-alist-entry
+                    alist name case-insensitive-p))
         (when (and dir-local mode
                    (not (set-auto-mode--dir-local-valid-p mode)))
           (message "Ignoring invalid mode `%s'" mode)
diff --git a/test/lisp/files-tests.el b/test/lisp/files-tests.el
index ad54addf06b..78fc139025c 100644
--- a/test/lisp/files-tests.el
+++ b/test/lisp/files-tests.el
@@ -1661,6 +1661,27 @@ The door of all subtleties!
 
 (defvar sh-shell)
 
+(defun files-tests--check-mode (filename)
+  "Return the major mode found in `auto-mode-alist' for FILENAME."
+  (set-auto-mode--find-matching-alist-entry
+   auto-mode-alist
+   (concat "/home/jrhacker/" filename)
+   nil))
+
+(ert-deftest files-tests-auto-mode-alist ()
+  (should (eq (files-tests--check-mode ".gdbinit.in") #'gdb-script-mode))
+  (should (eq (files-tests--check-mode ".gdbinit") #'gdb-script-mode))
+  (should (eq (files-tests--check-mode "_gdbinit") #'gdb-script-mode)) ; for MS-DOS
+  (should (eq (files-tests--check-mode "gdb.ini") #'gdb-script-mode)) ; likewise
+  (should (eq (files-tests--check-mode "gdbinit") #'gdb-script-mode))
+  (should (eq (files-tests--check-mode "gdbinit.in") #'gdb-script-mode))
+  (should (eq (files-tests--check-mode "SOMETHING-gdbinit") #'gdb-script-mode))
+  (should (eq (files-tests--check-mode ".gdbinit.loader") #'gdb-script-mode))
+  (should-not (eq (files-tests--check-mode "gdbinit-history.exp") #'gdb-script-mode))
+  (should-not (eq (files-tests--check-mode "gdbinit.c") #'gdb-script-mode))
+  (should-not (eq (files-tests--check-mode "gdbinit.5") #'gdb-script-mode))
+  (should-not (eq (files-tests--check-mode ".gdbinit.py.in") #'gdb-script-mode)))
+
 (defun files-tests--check-shebang (shebang expected-mode &optional expected-dialect)
   "Assert that mode for SHEBANG derives from EXPECTED-MODE.
 

commit d89d8715eeae775305d4c5790b60793e3e57a474
Author: Stefan Kangas <stefankangas@gmail.com>
Date:   Sun Dec 22 02:13:07 2024 +0100

    Prefer defvar-keymap in gud.el
    
    * lisp/progmodes/gud.el (gud-gdb-repeat-map, gud-sdb-repeat-map)
    (gud-dbx-repeat-map, gud-xdb-repeat-map, gud-perldb-repeat-map)
    (gud-pdb-repeat-map, gud-guiler-repeat-map, gud-jdb-repeat-map):
    Convert to defvar-keymap.

diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index 70daa087c2b..a38378886c0 100644
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -331,20 +331,17 @@ Check it when `gud-running' is t")
       (tool-bar-local-item-from-menu
        (car x) (cdr x) map gud-menu-mode-map))))
 
-(defvar gud-gdb-repeat-map
-  (let ((map (make-sparse-keymap)))
-    (pcase-dolist (`(,key . ,cmd) '(("n" . gud-next)
-                                    ("s" . gud-step)
-                                    ("i" . gud-stepi)
-                                    ("c" . gud-cont)
-                                    ("l" . gud-refresh)
-                                    ("f" . gud-finish)
-                                    ("<" . gud-up)
-                                    (">" . gud-down)))
-      (define-key map key cmd))
-    map)
-  "Keymap to repeat `gud-gdb' stepping instructions \\`C-x C-a C-n n n'.
-Used in `repeat-mode'.")
+(defvar-keymap gud-gdb-repeat-map
+  :doc "Keymap to repeat `gud-gdb' stepping instructions \\`C-x C-a C-n n n'.
+Used in `repeat-mode'."
+  "n" #'gud-next
+  "s" #'gud-step
+  "i" #'gud-stepi
+  "c" #'gud-cont
+  "l" #'gud-refresh
+  "f" #'gud-finish
+  "<" #'gud-up
+  ">" #'gud-down)
 
 (defun gud-set-repeat-map-property (keymap-symbol)
   "Set the `repeat-map' property of relevant gud commands to KEYMAP-SYMBOL.
@@ -1062,17 +1059,14 @@ SKIP is the number of chars to skip on each line, it defaults to 0."
 
 (defvar gud-sdb-lastfile nil)
 
-(defvar gud-sdb-repeat-map
-  (let ((map (make-sparse-keymap)))
-    (pcase-dolist (`(,key . ,cmd) '(("n" . gud-next)
-                                    ("s" . gud-step)
-                                    ("i" . gud-stepi)
-                                    ("c" . gud-cont)
-                                    ("l" . gud-refresh)))
-      (define-key map key cmd))
-    map)
-  "Keymap to repeat `sdb' stepping instructions \\`C-x C-a C-n n n'.
-Used in `repeat-mode'.")
+(defvar-keymap gud-sdb-repeat-map
+  :doc "Keymap to repeat `sdb' stepping instructions \\`C-x C-a C-n n n'.
+Used in `repeat-mode'."
+  "n" #'gud-next
+  "s" #'gud-step
+  "i" #'gud-stepi
+  "c" #'gud-cont
+  "l" #'gud-refresh)
 
 (defun gud-sdb-marker-filter (string)
   (setq gud-marker-acc
@@ -1304,22 +1298,21 @@ whereby $stopformat=1 produces an output format compatible with
 ;; whereby `set $stopformat=1' reportedly produces output compatible
 ;; with `gud-dbx-marker-filter', which we prefer.
 
-(defvar gud-dbx-repeat-map
-  (let ((map (make-sparse-keymap)))
-    (pcase-dolist (`(,key . ,cmd) '(("n" . gud-next)
-                                    ("s" . gud-step)
-                                    ("i" . gud-stepi)
-                                    ("c" . gud-cont)
-                                    ("l" . gud-refresh)
-                                    ("<" . gud-up)
-                                    (">" . gud-down)))
-      (define-key map key cmd))
-    (when (or gud-mips-p
-              gud-irix-p)
-      (define-key map "f" #'gud-finish))
-    map)
-  "Keymap to repeat `dbx' stepping instructions \\`C-x C-a C-n n n'.
-Used in `repeat-mode'.")
+(defvar-keymap gud-dbx-repeat-map
+  :doc "Keymap to repeat `dbx' stepping instructions \\`C-x C-a C-n n n'.
+Used in `repeat-mode'."
+  "n" #'gud-next
+  "s" #'gud-step
+  "i" #'gud-stepi
+  "c" #'gud-cont
+  "l" #'gud-refresh
+  "<" #'gud-up
+  ">" #'gud-down)
+
+(when (or gud-mips-p
+          gud-irix-p)
+  (keymap-set gud-dbx-repeat-map "f" #'gud-finish))
+
 
 ;; The process filter is also somewhat
 ;; unreliable, sometimes not spotting the markers; I don't know
@@ -1481,20 +1474,17 @@ and source-file directory for your debugger."
 ;; History of argument lists passed to xdb.
 (defvar gud-xdb-history nil)
 
-(defvar gud-xdb-repeat-map
-  (let ((map (make-sparse-keymap)))
-    (pcase-dolist (`(,key . ,cmd) '(("n" . gud-next)
-                                    ("s" . gud-step)
-                                    ("i" . gud-stepi)
-                                    ("c" . gud-cont)
-                                    ("l" . gud-refresh)
-                                    ("f" . gud-finish)
-                                    ("<" . gud-up)
-                                    (">" . gud-down)))
-      (define-key map key cmd))
-    map)
-  "Keymap to repeat `xdb' stepping instructions \\`C-x C-a C-n n n'.
-Used in `repeat-mode'.")
+(defvar-keymap gud-xdb-repeat-map
+  :doc "Keymap to repeat `xdb' stepping instructions \\`C-x C-a C-n n n'.
+Used in `repeat-mode'."
+  "n" #'gud-next
+  "s" #'gud-step
+  "i" #'gud-stepi
+  "c" #'gud-cont
+  "l" #'gud-refresh
+  "f" #'gud-finish
+  "<" #'gud-up
+  ">" #'gud-down)
 
 (defcustom gud-xdb-directories nil
   "A list of directories that xdb should search for source code.
@@ -1573,16 +1563,13 @@ directories if your program contains sources from more than one directory."
 ;; History of argument lists passed to perldb.
 (defvar gud-perldb-history nil)
 
-(defvar gud-perldb-repeat-map
-  (let ((map (make-sparse-keymap)))
-    (pcase-dolist (`(,key . ,cmd) '(("n" . gud-next)
-                                    ("s" . gud-step)
-                                    ("c" . gud-cont)
-                                    ("l" . gud-refresh)))
-      (define-key map key cmd))
-    map)
-  "Keymap to repeat `perldb' stepping instructions \\`C-x C-a C-n n n'.
-Used in `repeat-mode'.")
+(defvar-keymap gud-perldb-repeat-map
+  :doc "Keymap to repeat `perldb' stepping instructions \\`C-x C-a C-n n n'.
+Used in `repeat-mode'."
+  "n" #'gud-next
+  "s" #'gud-step
+  "c" #'gud-cont
+  "l" #'gud-refresh)
 
 (defun gud-perldb-massage-args (_file args)
   "Convert a command line as would be typed normally to run perldb
@@ -1761,19 +1748,16 @@ working directory and source-file directory for your debugger."
 
 (defvar gud-pdb-marker-regexp-start "^> ")
 
-(defvar gud-pdb-repeat-map
-  (let ((map (make-sparse-keymap)))
-    (pcase-dolist (`(,key . ,cmd) '(("n" . gud-next)
-                                    ("s" . gud-step)
-                                    ("c" . gud-cont)
-                                    ("l" . gud-refresh)
-                                    ("f" . gud-finish)
-                                    ("<" . gud-up)
-                                    (">" . gud-down)))
-      (define-key map key cmd))
-    map)
-  "Keymap to repeat `pdb' stepping instructions \\`C-x C-a C-n n n'.
-Used in `repeat-mode'.")
+(defvar-keymap gud-pdb-repeat-map
+  :doc "Keymap to repeat `pdb' stepping instructions \\`C-x C-a C-n n n'.
+Used in `repeat-mode'."
+  "n" #'gud-next
+  "s" #'gud-step
+  "c" #'gud-cont
+  "l" #'gud-refresh
+  "f" #'gud-finish
+  "<" #'gud-up
+  ">" #'gud-down)
 
 ;; There's no guarantee that Emacs will hand the filter the entire
 ;; marker at once; it could be broken up across several strings.  We
@@ -1879,18 +1863,15 @@ directory and source-file directory for your debugger."
 
 (defvar gud-guiler-lastfile nil)
 
-(defvar gud-guiler-repeat-map
-  (let ((map (make-sparse-keymap)))
-    (pcase-dolist (`(,key . ,cmd) '(("n" . gud-next)
-                                    ("s" . gud-step)
-                                    ("l" . gud-refresh)
-                                    ("f" . gud-finish)
-                                    ("<" . gud-up)
-                                    (">" . gud-down)))
-      (define-key map key cmd))
-    map)
-  "Keymap to repeat `guiler' stepping instructions \\`C-x C-a C-n n n'.
-Used in `repeat-mode'.")
+(defvar-keymap gud-guiler-repeat-map
+  :doc "Keymap to repeat `guiler' stepping instructions \\`C-x C-a C-n n n'.
+Used in `repeat-mode'."
+  "n" #'gud-next
+  "s" #'gud-step
+  "l" #'gud-refresh
+  "f" #'gud-finish
+  "<" #'gud-up
+  ">" #'gud-down)
 
 (defun gud-guiler-marker-filter (string)
   (setq gud-marker-acc (if gud-marker-acc (concat gud-marker-acc string) string))
@@ -2404,20 +2385,17 @@ extension EXTN.  Normally EXTN is given as the regular expression
 ;; Note: Reset to this value every time a prompt is seen
 (defvar gud-jdb-lowest-stack-level 999)
 
-(defvar gud-jdb-repeat-map
-  (let ((map (make-sparse-keymap)))
-    (pcase-dolist (`(,key . ,cmd) '(("n" . gud-next)
-                                    ("s" . gud-step)
-                                    ("i" . gud-stepi)
-                                    ("c" . gud-cont)
-                                    ("f" . gud-finish)
-                                    ("<" . gud-up)
-                                    (">" . gud-down)
-                                    ("l" . gud-refresh)))
-      (define-key map key cmd))
-    map)
-  "Keymap to repeat `jdb' stepping instructions \\`C-x C-a C-n n n'.
-Used in `repeat-mode'.")
+(defvar-keymap gud-jdb-repeat-map
+  :doc "Keymap to repeat `jdb' stepping instructions \\`C-x C-a C-n n n'.
+Used in `repeat-mode'."
+  "n" #'gud-next
+  "s" #'gud-step
+  "i" #'gud-stepi
+  "c" #'gud-cont
+  "f" #'gud-finish
+  "<" #'gud-up
+  ">" #'gud-down
+  "l" #'gud-refresh)
 
 (defun gud-jdb-find-source-using-classpath (p)
   "Find source file corresponding to fully qualified class P.

commit e59e7278924cd0dca49d4333dba188530721f5a3
Author: Michael Albinus <michael.albinus@gmx.de>
Date:   Sat Dec 21 18:12:45 2024 +0100

    * lisp/net/tramp-gvfs.el (tramp-gvfs-local-file-name): New defun.

diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el
index 683f8cc12bd..f96581c1510 100644
--- a/lisp/net/tramp-gvfs.el
+++ b/lisp/net/tramp-gvfs.el
@@ -1772,6 +1772,24 @@ a downcased host name only."
        (string-match (rx bol (+ alnum) "://" (group (+ (not (any "/:"))))) url)
        (match-string 1 url)))
 
+;; This is used in GNU ELPA package tramp-locproc.el.
+(defun tramp-gvfs-local-file-name (filename)
+  "Return local mount name of FILENAME."
+  (setq filename (file-name-unquote (expand-file-name filename)))
+  (with-parsed-tramp-file-name filename nil
+    (with-tramp-file-property v localname "local-file-name"
+      ;; As long as we call `tramp-gvfs-maybe-open-connection' here,
+      ;; we cache the result.
+      (tramp-gvfs-maybe-open-connection v)
+      (let ((quoted (file-name-quoted-p localname))
+	    (localname (file-name-unquote localname)))
+	(funcall
+	 (if quoted #'file-name-quote #'identity)
+	 (expand-file-name
+	  (if (file-name-absolute-p localname)
+	      (substring localname 1) localname)
+	  (tramp-get-file-property v "/" "fuse-mountpoint")))))))
+
 
 ;; D-Bus GVFS functions.
 

commit 476426168106dbcee67d8ea667e11ebe80c7aaed
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Date:   Sat Dec 21 11:13:07 2024 -0500

    (cl-flet, cl-labels): Fix bug#74870
    
    * lisp/emacs-lisp/cl-macs.el (cl-flet, cl-labels): Wrap function
    bodies in `cl-block`.
    
    * test/lisp/emacs-lisp/cl-macs-tests.el (cl-macs--test-flet-block): New test.

diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el
index 65bc2cb9173..b1c42a23acd 100644
--- a/lisp/emacs-lisp/cl-macs.el
+++ b/lisp/emacs-lisp/cl-macs.el
@@ -2071,7 +2071,8 @@ Each definition can take the form (FUNC EXP) where
 FUNC is the function name, and EXP is an expression that returns the
 function value to which it should be bound, or it can take the more common
 form (FUNC ARGLIST BODY...) which is a shorthand
-for (FUNC (lambda ARGLIST BODY)).
+for (FUNC (lambda ARGLIST BODY)) where BODY is wrapped in
+a `cl-block' named FUNC.
 
 FUNC is defined only within FORM, not BODY, so you can't write
 recursive function definitions.  Use `cl-labels' for that.  See
@@ -2096,15 +2097,22 @@ info node `(cl) Function Bindings' for details.
                    cl-declarations body)))
   (let ((binds ()) (newenv macroexpand-all-environment))
     (dolist (binding bindings)
-      (let ((var (make-symbol (format "--cl-%s--" (car binding))))
-            (args-and-body (cdr binding)))
-        (if (and (= (length args-and-body) 1)
-                 (macroexp-copyable-p (car args-and-body)))
+      (let* ((var (make-symbol (format "--cl-%s--" (car binding))))
+             (args-and-body (cdr binding))
+             (args (car args-and-body))
+             (body (cdr args-and-body)))
+        (if (and (null body)
+                 (macroexp-copyable-p args))
             ;; Optimize (cl-flet ((fun var)) body).
-            (setq var (car args-and-body))
-          (push (list var (if (= (length args-and-body) 1)
-                              (car args-and-body)
-                            `(cl-function (lambda . ,args-and-body))))
+            (setq var args)
+          (push (list var (if (null body)
+                              args
+                            (let ((parsed-body (macroexp-parse-body body)))
+                              `(cl-function
+                                (lambda ,args
+                                  ,@(car parsed-body)
+                                  (cl-block ,(car binding)
+                                    ,@(cdr parsed-body)))))))
                 binds))
 	(push (cons (car binding)
                     (lambda (&rest args)
@@ -2271,10 +2279,11 @@ BINDINGS is a list of definitions of the form either (FUNC EXP)
 where EXP is a form that should return the function to bind to the
 function name FUNC, or (FUNC ARGLIST BODY...) where
 FUNC is the function name, ARGLIST its arguments, and BODY the
-forms of the function body.  FUNC is in scope in any BODY or EXP, as well
-as FORM, so you can write recursive and mutually recursive
-function definitions, with the caveat that EXPs are evaluated in sequence
-and you cannot call a FUNC before its EXP has been evaluated.
+forms of the function body.  BODY is wrapped in a `cl-block' named FUNC.
+FUNC is in scope in any BODY or EXP, as well as in FORM, so you can write
+recursive and mutually recursive function definitions, with the caveat
+that EXPs are evaluated in sequence and you cannot call a FUNC before its
+EXP has been evaluated.
 See info node `(cl) Function Bindings' for details.
 
 \(fn ((FUNC ARGLIST BODY...) ...) FORM...)"
@@ -2282,7 +2291,7 @@ See info node `(cl) Function Bindings' for details.
   (let ((binds ()) (newenv macroexpand-all-environment))
     (dolist (binding bindings)
       (let ((var (make-symbol (format "--cl-%s--" (car binding)))))
-	(push (cons var (cdr binding)) binds)
+	(push (cons var binding) binds)
 	(push (cons (car binding)
                     (lambda (&rest args)
                       (if (eq (car args) cl--labels-magic)
@@ -2295,12 +2304,18 @@ See info node `(cl) Function Bindings' for details.
     ;; Perform self-tail call elimination.
     `(letrec ,(mapcar
                (lambda (bind)
-                 (pcase-let* ((`(,var ,sargs . ,sbody) bind))
+                 (pcase-let* ((`(,var ,fun ,sargs . ,sbody) bind))
                    `(,var ,(cl--self-tco-on-form
                             var (macroexpand-all
                                  (if (null sbody)
                                      sargs ;A (FUNC EXP) definition.
-                                   `(cl-function (lambda ,sargs . ,sbody)))
+                                   (let ((parsed-body
+                                          (macroexp-parse-body sbody)))
+                                     `(cl-function
+                                       (lambda ,sargs
+                                         ,@(car parsed-body)
+                                         (cl-block ,fun
+                                           ,@(cdr parsed-body))))))
                                  newenv)))))
                (nreverse binds))
        . ,(macroexp-unprogn
diff --git a/test/lisp/emacs-lisp/cl-macs-tests.el b/test/lisp/emacs-lisp/cl-macs-tests.el
index 4baf5428101..e1a521dca79 100644
--- a/test/lisp/emacs-lisp/cl-macs-tests.el
+++ b/test/lisp/emacs-lisp/cl-macs-tests.el
@@ -718,6 +718,16 @@ collection clause."
                            (f lex-var)))))
       (should (equal (f nil) 'a)))))
 
+(ert-deftest cl-macs--test-flet-block ()
+  (should (equal (cl-block f1
+                   (cl-flet ((f1 (a) (cons (cl-return-from f1 a) 6)))
+                    (cons (f1 5) 6)))
+                 '(5 . 6)))
+  (should (equal (cl-block f1
+                   (cl-labels ((f1 (a) (cons (cl-return-from f1 a) 6)))
+                     (cons (f1 7) 8)))
+                 '(7 . 8))))
+
 (ert-deftest cl-flet/edebug ()
   "Check that we can instrument `cl-flet' forms (bug#65344)."
   (with-temp-buffer

commit a1d08d2c13497937475bf453c66a22a61f4e8631
Merge: b6d9183e7dd 5e97079cc75
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Sat Dec 21 07:56:28 2024 -0500

    Merge from origin/emacs-30
    
    5e97079cc75 ; Fix call to 'decode_string_utf_8' in  #ifdef'ed-away code
    6902673b5b9 ; Improve commentary in calendar.el
    08b62132dde Add 'lua-ts-mode' to 'interpreter-mode-alist'
    d8ffcf2fbac Document representation of dates in calendar.el
    faaa13ec762 Autoload 'shortdoc-help-fns-examples-function'

commit b6d9183e7dd160be902530044e6fe1ec7d467234
Merge: 3617940f322 68bcabf58af
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Sat Dec 21 07:56:28 2024 -0500

    ; Merge from origin/emacs-30
    
    The following commits were skipped:
    
    68bcabf58af * Update 'ldefs-boot.el' (don't merge)
    9d93d717d58 * Bump Emacs version to 30.0.93

commit 3617940f322c381dee8b3c1f970b8eeda13d1c11
Merge: fd529bbd076 8f8da2d7854
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Sat Dec 21 07:56:08 2024 -0500

    Merge from origin/emacs-30
    
    8f8da2d7854 ; * ChangeLog.4: Update.
    49adcf30b01 ; * etc/AUTHORS: Update.
    1381c6f9591 * Update authors.el
    5c0f3f5826e ; * etc/NEWS: Mark unmarked entries.
    8a0c9c234f1 Document 'trusted-content
    c6ce11b2a48 Mention network-interface-list in network-interface-info ...
    a7905145f70 ; * lisp/emacs-lisp/re-builder.el (reb-change-syntax): Fi...
    cde22c02011 Move NEWS items from unreleased 28.3 to released 29.1
    5686bb5b428 Improve browse-url-android-share docstring
    92041e15f4a Minor doc fix for url-handler-regexp
    9fd96e2ab95 Improve reb-change-syntax docstring
    b9dc337ea74 * lisp/files.el (trusted-content-p): Make `:all` work in ...
    4b685bc4fcd ; * src/process.c (Fnetwork_interface_list): Fix typo.
    c14c4895719 ; * lisp/net/nsm.el (nsm-trust-local-network): Fix typo.
    10f976300d0 ; Add some tree-sitter thing content to the manual
    55303a6bc0a * lisp/org/ox-texinfo.el (org-texinfo-template): Fix Info...
    8b6c6cffd1f trusted-content: Adjust the last patch based on prelimina...
    69b16e5c638 ; * etc/NEWS: Fix typos.
    5c6dbc65f36 ; * doc/lispref/frames.texi (Multiple Terminals): Add ind...
    856a58e2827 Update documentation of 'etags' regexps some more
    4c68846223b Update documentation of 'etags' regexps
    b5158bd1914 elisp-mode.el: Disable Flymake byte-compile backend in un...
    
    # Conflicts:
    #       doc/man/etags.1
    #       etc/NEWS
    #       lisp/org/ox-texinfo.el

commit 5e97079cc7587ce338679ed237efb911723e4367
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Sat Dec 21 14:12:14 2024 +0200

    ; Fix call to 'decode_string_utf_8' in  #ifdef'ed-away code
    
    * src/coding.c (Finternal_decode_string_utf_8): Fix calling
    sequence of 'decode_string_utf_8' to adapt to changes in the
    latter's signature.

diff --git a/src/coding.c b/src/coding.c
index 5591b7fed45..aee5eed4f73 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -10407,7 +10407,7 @@ DEFUN ("internal-decode-string-utf-8", Finternal_decode_string_utf_8,
   if (NILP (decode_method))
     {
       for (int i = 0; i < repeat_count; i++)
-	val = decode_string_utf_8 (string, buffer, ! NILP (nocopy),
+	val = decode_string_utf_8 (string, NULL, -1, buffer, ! NILP (nocopy),
 				   handle_8_bit, handle_over_uni);
     }
   else if (EQ (decode_method, Qt))

commit 6902673b5b9c641fd2df3881533d6fc343124371
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Sat Dec 21 13:00:05 2024 +0200

    ; Improve commentary in calendar.el
    
    * lisp/calendar/calendar.el: Expand the commentary.  Suggested by
    Richard Lawrence <rwl@recursewithless.net>.  (Bug#74965)

diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el
index f5066c61ae2..a2382f3dd1a 100644
--- a/lisp/calendar/calendar.el
+++ b/lisp/calendar/calendar.el
@@ -96,10 +96,13 @@
 ;; list of integers (MONTH DAY YEAR) -- see the functions
 ;; `calendar-extract-year', `calendar-extract-month', and
 ;; `calendar-extract-day'.  Internally it also uses an "absolute" format
-;; which is an integer number of days since December 31, 1BC (see
-;; e.g. `calendar-absolute-from-gregorian'), and converts between
-;; different calendar scales by converting to and from the absolute
-;; format (see e.g. `calendar-iso-from-absolute' in cal-iso.el).
+;; which is an integer number of days since December 31, 1BC on the
+;; Gregorian calendar (see e.g. `calendar-absolute-from-gregorian'), and
+;; converts between different calendar scales by converting to and from
+;; the absolute format (see e.g. `calendar-iso-from-absolute' in
+;; cal-iso.el).  This representation is also useful for certain
+;; calculations; e.g. `calendar-day-of-week' is simply the absolute
+;; represention modulo 7, because December 31, 1BC is a Sunday.
 
 ;; A note on free variables:
 

commit 08b62132ddee01f0c84bc478b718370b51fade6a
Author: john muhl <jm@pub.pink>
Date:   Wed Dec 18 10:59:19 2024 -0600

    Add 'lua-ts-mode' to 'interpreter-mode-alist'
    
    * lisp/progmodes/lua-ts-mode.el: Enable 'lua-ts-mode' for Lua
    scripts based on their interpreter line.  (Bug#74951)

diff --git a/lisp/progmodes/lua-ts-mode.el b/lisp/progmodes/lua-ts-mode.el
index 9d06517a97d..641ea4261b0 100644
--- a/lisp/progmodes/lua-ts-mode.el
+++ b/lisp/progmodes/lua-ts-mode.el
@@ -853,7 +853,8 @@ Calls REPORT-FN directly."
 (derived-mode-add-parents 'lua-ts-mode '(lua-mode))
 
 (when (treesit-ready-p 'lua)
-  (add-to-list 'auto-mode-alist '("\\.lua\\'" . lua-ts-mode)))
+  (add-to-list 'auto-mode-alist '("\\.lua\\'" . lua-ts-mode))
+  (add-to-list 'interpreter-mode-alist '("\\<lua\\(?:jit\\)?" . lua-ts-mode)))
 
 (provide 'lua-ts-mode)
 

commit d8ffcf2fbaca158f3eed3b35cc181756a4c4878f
Author: Richard Lawrence <rwl@recursewithless.net>
Date:   Mon Dec 16 20:46:34 2024 +0100

    Document representation of dates in calendar.el
    
    * lisp/calendar/calendar.el: Add a comment in file header
    explaining how dates are represented.

diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el
index 345687d1775..f5066c61ae2 100644
--- a/lisp/calendar/calendar.el
+++ b/lisp/calendar/calendar.el
@@ -90,6 +90,16 @@
 ;; <https://doi.org/10.1002/spe.4380230404>
 ;; <http://citeseerx.ist.psu.edu/viewdoc/download?doi=10.1.1.42.6421&rep=rep1&type=pdf>
 
+;; A note on how dates are represented:
+
+;; The standard format for a (Gregorian) calendar date in this file is a
+;; list of integers (MONTH DAY YEAR) -- see the functions
+;; `calendar-extract-year', `calendar-extract-month', and
+;; `calendar-extract-day'.  Internally it also uses an "absolute" format
+;; which is an integer number of days since December 31, 1BC (see
+;; e.g. `calendar-absolute-from-gregorian'), and converts between
+;; different calendar scales by converting to and from the absolute
+;; format (see e.g. `calendar-iso-from-absolute' in cal-iso.el).
 
 ;; A note on free variables:
 

commit fd529bbd076d14087d70c50d94bc9ef231cf1997
Author: Cecilio Pardo <cpardo@imayhem.com>
Date:   Sun Dec 15 01:13:16 2024 +0100

    Add support for the ':data' keyword for play-sound in MS-Windows.
    
    * src/sound.c (parse_sound) [WINDOWSNT]: Check that either :file
    or :data is present.
    (do_play_sound): Added parameter to select file or data, and code to
    play from data.
    (Fplay_sound_internal): Fixed volume format, and send file or data
    to 'do_play_sound'.  (Bug#74863)
    * etc/NEWS: Add entry for this change.
    * etc/PROBLEMS: Remove entry about missing support for :data.

diff --git a/etc/NEWS b/etc/NEWS
index 5b0c89b6b20..12a318f5ed7 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1111,6 +1111,11 @@ current buffer, if the major mode supports it.  (Support for
 Transformed images are smoothed using the bilinear interpolation by
 means of the GDI+ library.
 
+---
+** Emacs on MS-Windows now supports the ':data' keyword for 'play-sound'.
+In addition to ':file FILE' for playing a sound from a file, ':data
+DATA' can now be used to play a sound from memory.
+
 
 ----------------------------------------------------------------------
 This file is part of GNU Emacs.
diff --git a/etc/PROBLEMS b/etc/PROBLEMS
index 8de12a78613..c1745e8d18f 100644
--- a/etc/PROBLEMS
+++ b/etc/PROBLEMS
@@ -3278,11 +3278,6 @@ Files larger than 4GB cause overflow in the size (represented as a
 well, since the Windows port uses a Lisp emulation of 'ls', which relies
 on 'file-attributes'.
 
-** Playing sound doesn't support the :data method
-
-Sound playing is not supported with the ':data DATA' key-value pair.
-You _must_ use the ':file FILE' method.
-
 ** Typing Alt-Shift has strange effects on MS-Windows.
 
 This combination of keys is a command to change keyboard layout.  If
diff --git a/src/sound.c b/src/sound.c
index 004015fc936..843d05d2349 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -26,14 +26,12 @@ along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
   implementation of the play-sound specification for Windows.
 
   Notes:
-  In the Windows implementation of play-sound-internal only the
-  :file and :volume keywords are supported.  The :device keyword,
-  if present, is ignored.  The :data keyword, if present, will
-  cause an error to be generated.
+  In the Windows implementation of play-sound-internal the :device
+  keyword, if present, is ignored.
 
   The Windows implementation of play-sound is implemented via the
-  Windows API functions mciSendString, waveOutGetVolume, and
-  waveOutSetVolume which are exported by Winmm.dll.
+  Windows API functions mciSendString, waveOutGetVolume,
+  waveOutSetVolume and PlaySound which are exported by Winmm.dll.
 */
 
 #include <config.h>
@@ -91,6 +89,11 @@ along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 #include "w32.h"
 /* END: Windows Specific Includes */
 
+/* Missing in mingw32.  */
+#ifndef SND_SENTRY
+#define SND_SENTRY 0x00080000
+#endif
+
 #endif /* WINDOWSNT */
 
 /* BEGIN: Common Definitions */
@@ -278,7 +281,7 @@ static void au_play (struct sound *, struct sound_device *);
 #else /* WINDOWSNT */
 
 /* BEGIN: Windows Specific Definitions */
-static int do_play_sound (const char *, unsigned long);
+static int do_play_sound (const char *, unsigned long, bool);
 /*
   END: Windows Specific Definitions */
 #endif /* WINDOWSNT */
@@ -366,21 +369,10 @@ parse_sound (Lisp_Object sound, Lisp_Object *attrs)
   attrs[SOUND_DEVICE] = plist_get (sound, QCdevice);
   attrs[SOUND_VOLUME] = plist_get (sound, QCvolume);
 
-#ifndef WINDOWSNT
   /* File name or data must be specified.  */
   if (!STRINGP (attrs[SOUND_FILE])
       && !STRINGP (attrs[SOUND_DATA]))
     return 0;
-#else /* WINDOWSNT */
-  /*
-    Data is not supported in Windows.  Therefore a
-    File name MUST be supplied.
-  */
-  if (!STRINGP (attrs[SOUND_FILE]))
-    {
-      return 0;
-    }
-#endif /* WINDOWSNT */
 
   /* Volume must be in the range 0..100 or unspecified.  */
   if (!NILP (attrs[SOUND_VOLUME]))
@@ -1225,7 +1217,7 @@ alsa_init (struct sound_device *sd)
   } while (0)
 
 static int
-do_play_sound (const char *psz_file, unsigned long ui_volume)
+do_play_sound (const char *psz_file_or_data, unsigned long ui_volume, bool in_memory)
 {
   int i_result = 0;
   MCIERROR mci_error = 0;
@@ -1236,65 +1228,7 @@ do_play_sound (const char *psz_file, unsigned long ui_volume)
   BOOL b_reset_volume = FALSE;
   char warn_text[560];
 
-  /* Since UNICOWS.DLL includes only a stub for mciSendStringW, we
-     need to encode the file in the ANSI codepage on Windows 9X even
-     if w32_unicode_filenames is non-zero.  */
-  if (w32_major_version <= 4 || !w32_unicode_filenames)
-    {
-      char fname_a[MAX_PATH], shortname[MAX_PATH], *fname_to_use;
-
-      filename_to_ansi (psz_file, fname_a);
-      fname_to_use = fname_a;
-      /* If the file name is not encodable in ANSI, try its short 8+3
-	 alias.  This will only work if w32_unicode_filenames is
-	 non-zero.  */
-      if (_mbspbrk ((const unsigned char *)fname_a,
-		    (const unsigned char *)"?"))
-	{
-	  if (w32_get_short_filename (psz_file, shortname, MAX_PATH))
-	    fname_to_use = shortname;
-	  else
-	    mci_error = MCIERR_FILE_NOT_FOUND;
-	}
-
-      if (!mci_error)
-	{
-	  memset (sz_cmd_buf_a, 0, sizeof (sz_cmd_buf_a));
-	  memset (sz_ret_buf_a, 0, sizeof (sz_ret_buf_a));
-	  sprintf (sz_cmd_buf_a,
-		   "open \"%s\" alias GNUEmacs_PlaySound_Device wait",
-		   fname_to_use);
-	  mci_error = mciSendStringA (sz_cmd_buf_a,
-				      sz_ret_buf_a, sizeof (sz_ret_buf_a), NULL);
-	}
-    }
-  else
-    {
-      wchar_t sz_cmd_buf_w[520];
-      wchar_t sz_ret_buf_w[520];
-      wchar_t fname_w[MAX_PATH];
-
-      filename_to_utf16 (psz_file, fname_w);
-      memset (sz_cmd_buf_w, 0, sizeof (sz_cmd_buf_w));
-      memset (sz_ret_buf_w, 0, sizeof (sz_ret_buf_w));
-      /* _swprintf is not available on Windows 9X, so we construct the
-	 UTF-16 command string by hand.  */
-      wcscpy (sz_cmd_buf_w, L"open \"");
-      wcscat (sz_cmd_buf_w, fname_w);
-      wcscat (sz_cmd_buf_w, L"\" alias GNUEmacs_PlaySound_Device wait");
-      mci_error = mciSendStringW (sz_cmd_buf_w,
-				  sz_ret_buf_w, ARRAYELTS (sz_ret_buf_w) , NULL);
-    }
-  if (mci_error != 0)
-    {
-      strcpy (warn_text,
-	      "mciSendString: 'open' command failed to open sound file ");
-      strcat (warn_text, psz_file);
-      SOUND_WARNING (mciGetErrorString, mci_error, warn_text);
-      i_result = (int) mci_error;
-      return i_result;
-    }
-  if ((ui_volume > 0) && (ui_volume != UINT_MAX))
+  if (ui_volume > 0)
     {
       mm_result = waveOutGetVolume ((HWAVEOUT) WAVE_MAPPER, &ui_volume_org);
       if (mm_result == MMSYSERR_NOERROR)
@@ -1319,34 +1253,105 @@ do_play_sound (const char *psz_file, unsigned long ui_volume)
                          " not be used.");
         }
     }
-  memset (sz_cmd_buf_a, 0, sizeof (sz_cmd_buf_a));
-  memset (sz_ret_buf_a, 0, sizeof (sz_ret_buf_a));
-  strcpy (sz_cmd_buf_a, "play GNUEmacs_PlaySound_Device wait");
-  mci_error = mciSendStringA (sz_cmd_buf_a, sz_ret_buf_a, sizeof (sz_ret_buf_a),
-			      NULL);
-  if (mci_error != 0)
+
+  if (in_memory)
     {
-      strcpy (warn_text,
-	      "mciSendString: 'play' command failed to play sound file ");
-      strcat (warn_text, psz_file);
-      SOUND_WARNING (mciGetErrorString, mci_error, warn_text);
-      i_result = (int) mci_error;
+      int flags = SND_MEMORY;
+      if (w32_major_version >= 6) /* Vista and later */
+	flags |= SND_SENTRY;
+      i_result = !PlaySound (psz_file_or_data, NULL, flags);
     }
-  memset (sz_cmd_buf_a, 0, sizeof (sz_cmd_buf_a));
-  memset (sz_ret_buf_a, 0, sizeof (sz_ret_buf_a));
-  strcpy (sz_cmd_buf_a, "close GNUEmacs_PlaySound_Device wait");
-  mci_error = mciSendStringA (sz_cmd_buf_a, sz_ret_buf_a, sizeof (sz_ret_buf_a),
-			      NULL);
+  else
+    {
+      /* Since UNICOWS.DLL includes only a stub for mciSendStringW, we
+	 need to encode the file in the ANSI codepage on Windows 9X even
+	 if w32_unicode_filenames is non-zero.  */
+      if (w32_major_version <= 4 || !w32_unicode_filenames)
+	{
+	  char fname_a[MAX_PATH], shortname[MAX_PATH], *fname_to_use;
+
+	  filename_to_ansi (psz_file_or_data, fname_a);
+	  fname_to_use = fname_a;
+	  /* If the file name is not encodable in ANSI, try its short 8+3
+	     alias.  This will only work if w32_unicode_filenames is
+	     non-zero.  */
+	  if (_mbspbrk ((const unsigned char *)fname_a,
+			(const unsigned char *)"?"))
+	    {
+	      if (w32_get_short_filename (psz_file_or_data, shortname, MAX_PATH))
+		fname_to_use = shortname;
+	      else
+		mci_error = MCIERR_FILE_NOT_FOUND;
+	    }
+
+	  if (!mci_error)
+	    {
+	      memset (sz_cmd_buf_a, 0, sizeof (sz_cmd_buf_a));
+	      memset (sz_ret_buf_a, 0, sizeof (sz_ret_buf_a));
+	      sprintf (sz_cmd_buf_a,
+		       "open \"%s\" alias GNUEmacs_PlaySound_Device wait",
+		       fname_to_use);
+	      mci_error = mciSendStringA (sz_cmd_buf_a,
+					  sz_ret_buf_a, sizeof (sz_ret_buf_a), NULL);
+	    }
+	}
+      else
+	{
+	  wchar_t sz_cmd_buf_w[520];
+	  wchar_t sz_ret_buf_w[520];
+	  wchar_t fname_w[MAX_PATH];
+
+	  filename_to_utf16 (psz_file_or_data, fname_w);
+	  memset (sz_cmd_buf_w, 0, sizeof (sz_cmd_buf_w));
+	  memset (sz_ret_buf_w, 0, sizeof (sz_ret_buf_w));
+	  /* _swprintf is not available on Windows 9X, so we construct the
+	     UTF-16 command string by hand.  */
+	  wcscpy (sz_cmd_buf_w, L"open \"");
+	  wcscat (sz_cmd_buf_w, fname_w);
+	  wcscat (sz_cmd_buf_w, L"\" alias GNUEmacs_PlaySound_Device wait");
+	  mci_error = mciSendStringW (sz_cmd_buf_w,
+				      sz_ret_buf_w, ARRAYELTS (sz_ret_buf_w) , NULL);
+	}
+      if (mci_error != 0)
+	{
+	  strcpy (warn_text,
+		  "mciSendString: 'open' command failed to open sound file ");
+	  strcat (warn_text, psz_file_or_data);
+	  SOUND_WARNING (mciGetErrorString, mci_error, warn_text);
+	  i_result = (int) mci_error;
+	  return i_result;
+	}
+      memset (sz_cmd_buf_a, 0, sizeof (sz_cmd_buf_a));
+      memset (sz_ret_buf_a, 0, sizeof (sz_ret_buf_a));
+      strcpy (sz_cmd_buf_a, "play GNUEmacs_PlaySound_Device wait");
+      mci_error = mciSendStringA (sz_cmd_buf_a, sz_ret_buf_a, sizeof (sz_ret_buf_a),
+				  NULL);
+      if (mci_error != 0)
+	{
+	  strcpy (warn_text,
+		  "mciSendString: 'play' command failed to play sound file ");
+	  strcat (warn_text, psz_file_or_data);
+	  SOUND_WARNING (mciGetErrorString, mci_error, warn_text);
+	  i_result = (int) mci_error;
+	}
+      memset (sz_cmd_buf_a, 0, sizeof (sz_cmd_buf_a));
+      memset (sz_ret_buf_a, 0, sizeof (sz_ret_buf_a));
+      strcpy (sz_cmd_buf_a, "close GNUEmacs_PlaySound_Device wait");
+      mci_error = mciSendStringA (sz_cmd_buf_a, sz_ret_buf_a, sizeof (sz_ret_buf_a),
+				  NULL);
+    }
+
   if (b_reset_volume == TRUE)
     {
       mm_result = waveOutSetVolume ((HWAVEOUT) WAVE_MAPPER, ui_volume_org);
       if (mm_result != MMSYSERR_NOERROR)
-        {
-          SOUND_WARNING (waveOutGetErrorText, mm_result,
+	{
+	  SOUND_WARNING (waveOutGetErrorText, mm_result,
 			 "waveOutSetVolume: failed to reset the original"
-                         " volume level of the WAVE_MAPPER device.");
-        }
+			 " volume level of the WAVE_MAPPER device.");
+	}
     }
+
   return i_result;
 }
 
@@ -1364,8 +1369,7 @@ Internal use only, use `play-sound' instead.  */)
   specpdl_ref count = SPECPDL_INDEX ();
 
 #ifdef WINDOWSNT
-  unsigned long ui_volume_tmp = UINT_MAX;
-  unsigned long ui_volume = UINT_MAX;
+  unsigned long ui_volume = 0;
 #endif /* WINDOWSNT */
 
   /* Parse the sound specification.  Give up if it is invalid.  */
@@ -1432,33 +1436,31 @@ Internal use only, use `play-sound' instead.  */)
 
 #else /* WINDOWSNT */
 
-  file = Fexpand_file_name (attrs[SOUND_FILE], Vdata_directory);
-  file = ENCODE_FILE (file);
+
   if (FIXNUMP (attrs[SOUND_VOLUME]))
-    {
-      ui_volume_tmp = XFIXNAT (attrs[SOUND_VOLUME]);
-    }
+    ui_volume = XFIXNAT (attrs[SOUND_VOLUME]);
   else if (FLOATP (attrs[SOUND_VOLUME]))
-    {
-      ui_volume_tmp = XFLOAT_DATA (attrs[SOUND_VOLUME]) * 100;
-    }
+    ui_volume = XFLOAT_DATA (attrs[SOUND_VOLUME]) * 100;
+
+  if (ui_volume > 100)
+    ui_volume = 100;
+
+  /* For volume (32 bits), low order 16 bits are the value for left
+     channel, and high order 16 bits for the right channel.  We use the
+     specified volume on both channels.  */
+  ui_volume = ui_volume * 0xFFFF / 100;
+  ui_volume = (ui_volume << 16) + ui_volume;
 
   CALLN (Frun_hook_with_args, Qplay_sound_functions, sound);
 
-  /*
-    Based on some experiments I have conducted, a value of 100 or less
-    for the sound volume is much too low.  You cannot even hear it.
-    A value of UINT_MAX indicates that you wish for the sound to played
-    at the maximum possible volume.  A value of UINT_MAX/2 plays the
-    sound at 50% maximum volume.  Therefore the value passed to do_play_sound
-    (and thus to waveOutSetVolume) must be some fraction of UINT_MAX.
-    The following code adjusts the user specified volume level appropriately.
-  */
-  if ((ui_volume_tmp > 0) && (ui_volume_tmp <= 100))
+  if (STRINGP (attrs[SOUND_FILE]))
     {
-      ui_volume = ui_volume_tmp * (UINT_MAX / 100);
+      file = Fexpand_file_name (attrs[SOUND_FILE], Vdata_directory);
+      file = ENCODE_FILE (file);
+      do_play_sound (SSDATA (file), ui_volume, false);
     }
-  (void)do_play_sound (SSDATA (file), ui_volume);
+  else
+    do_play_sound (SDATA (attrs[SOUND_DATA]), ui_volume, true);
 
 #endif /* WINDOWSNT */
 

commit b6852b67b0d462c7ba0012e5ac3b79a245f4b7e5
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Sat Dec 21 12:30:44 2024 +0200

    ; Fix last change
    
    * doc/lispref/os.texi (Time Calculations): Extend documentation of
    'seconds-to-string'; add missing @end defun.  (Bug#71572)

diff --git a/doc/lispref/os.texi b/doc/lispref/os.texi
index a3ba27bdf24..2b96417f136 100644
--- a/doc/lispref/os.texi
+++ b/doc/lispref/os.texi
@@ -2205,10 +2205,26 @@ structure.  For instance, the 120th day in 2004 is April 29th.
 @end defun
 
 @defun seconds-to-string delay &optional readable abbrev precision
-Return a string describing a given @var{delay} (in seconds).  Optional
-arguments can be used to configure a human readable delay using various
-formats.  For example, a delay of 9861.5 seconds with @var{readable} set
-to the symbol @code{expanded} returns @samp{2 hours 44 minutes}.
+Return a string describing a given @var{delay} (in seconds).  By
+default, this function formats the returned string as a floating-point
+number in units selected according to the value of @var{delay}.  For
+example, a delay of 9861.5 seconds yields @samp{2.74h}, since the value
+of @var{delay} is longer than 1 hour, but shorter than 1 day.  The
+output formatting can be further controlled by the optional arguments,
+if optional argument @var{readable} is non-@code{nil}.  If
+@var{readable}'s value is @code{expanded}, the returned string will
+describe @var{delay} using two units; for example, a delay of 9861.5
+seconds with @var{readable} set to the symbol @code{expanded} returns
+@samp{2 hours 44 minutes}, but if @var{readable} is @code{t}, the
+function returns @samp{3 hours}.  Optional argument @var{abbrev}, if
+non-@code{nil}, means to abbreviate the units: use @samp{h} instead of
+@samp{hours}, @samp{m} instead of @samp{minutes}, etc.  If
+@var{precision} is a whole integer number, the function rounds the value
+of the smallest unit it produces to that many digits after the decimal
+point; thus, 9861.5 with @var{precision} set to 3 yields @samp{2.739
+hours}.  If @var{precision} is a non-negative float smaller than 1, the
+function rounds to that value.
+@end defun
 
 @node Timers
 @section Timers for Delayed Execution

commit 308d5d54737917d449bfc0bf80815537eef69446
Author: JD Smith <93749+jdtsmith@users.noreply.github.com>
Date:   Thu Jul 11 16:24:17 2024 -0400

    'seconds-to-string': new optional arguments for readable strings
    
    * lisp/calendar/time-date.el (seconds-to-string): Accept new
    optional arguments READABLE, ABBREV, and PRECISION, and format the
    output string accordingly.  (Bug#71572)
    
    * doc/lispref/os.texi (Time Calculations):
    * etc/NEWS: Document the new arguments of 'seconds-to-string'.

diff --git a/doc/lispref/os.texi b/doc/lispref/os.texi
index be26fb5063c..a3ba27bdf24 100644
--- a/doc/lispref/os.texi
+++ b/doc/lispref/os.texi
@@ -2204,6 +2204,12 @@ Return the date of @var{ordinal} in @var{year} as a decoded time
 structure.  For instance, the 120th day in 2004 is April 29th.
 @end defun
 
+@defun seconds-to-string delay &optional readable abbrev precision
+Return a string describing a given @var{delay} (in seconds).  Optional
+arguments can be used to configure a human readable delay using various
+formats.  For example, a delay of 9861.5 seconds with @var{readable} set
+to the symbol @code{expanded} returns @samp{2 hours 44 minutes}.
+
 @node Timers
 @section Timers for Delayed Execution
 @cindex timers
diff --git a/etc/NEWS b/etc/NEWS
index 9a7b320acdb..5b0c89b6b20 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -883,6 +883,9 @@ destination window is chosen using 'display-buffer-alist'.  Example:
 
 ** Nested backquotes are not supported any more in Pcase patterns.
 
+---
+** The obsolete variable `redisplay-dont-pause' has been removed.
+
 ** The 'rx' category name 'chinese-two-byte' must now be spelled correctly.
 An old alternative name (without the first 'e') has been removed.
 
@@ -919,8 +922,13 @@ 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.
+** Time & Date
+
++++
+*** 'seconds-to-string' supports new formatting options.
+Optional arguments are provided to produce human-readable time-duration
+strings in a variety of formats, for example "6 months 3 weeks" or "5m
+52.5s".
 
 ** New function 'native-compile-directory'.
 This function natively-compiles all Lisp files in a directory and in its
diff --git a/lisp/calendar/time-date.el b/lisp/calendar/time-date.el
index 9a2fb45e3bc..9b85acf1dd0 100644
--- a/lisp/calendar/time-date.el
+++ b/lisp/calendar/time-date.el
@@ -403,11 +403,85 @@ right of \"%x\", trailing zero units are not output."
         (list (* 3600 24 400) "d" (* 3600.0 24.0))
         (list nil "y" (* 365.25 24 3600)))
   "Formatting used by the function `seconds-to-string'.")
+
+(defvar seconds-to-string-readable
+  `(("Y" "year"   "years"   ,(round (* 60 60 24 365.2425)))
+    ("M" "month"  "months"  ,(round (* 60 60 24 30.436875)))
+    ("w" "week"   "weeks"   ,(* 60 60 24 7))
+    ("d" "day"    "days"    ,(* 60 60 24))
+    ("h" "hour"   "hours"   ,(* 60 60))
+    ("m" "minute" "minutes" 60)
+    ("s" "second" "seconds" 1))
+  "Formatting used by the function `seconds-to-string' with READABLE set.
+The format is an alist, with string keys ABBREV-UNIT, and elements like:
+
+  (ABBREV-UNIT UNIT UNIT-PLURAL SECS)
+
+where UNIT is a unit of time, ABBREV-UNIT is the abreviated form of
+UNIT, UNIT-PLURAL is the plural form of UNIT, and SECS is the number of
+seconds per UNIT.")
+
 ;;;###autoload
-(defun seconds-to-string (delay)
-  ;; FIXME: There's a similar (tho fancier) function in mastodon.el!
-  "Convert the time interval in seconds to a short string."
-  (cond ((> 0 delay) (concat "-" (seconds-to-string (- delay))))
+(defun seconds-to-string (delay &optional readable abbrev precision)
+  "Convert time interval DELAY (in seconds) to a string.
+By default, the returned string is formatted as a float in the smallest
+unit from the variable `seconds-to-string' that is longer than DELAY,
+and a precision of two.  If READABLE is non-nil, convert DELAY into a
+readable string, using the information provided in the variable
+`seconds-to-string-readable'.  If it is the symbol `expanded', use two
+units to describe DELAY, if appropriate.  E.g. \"1 hour 32 minutes\".
+If ABBREV is non-nil, abbreviate the readable units.  If PRECISION is a
+whole number, round the value associated with the smallest displayed
+unit to that many digits after the decimal.  If it is a non-negative
+float less than 1.0, round to that value."
+  (cond ((< delay 0)
+	 (concat "-" (seconds-to-string (- delay) readable precision)))
+        (readable
+         (let* ((stsa seconds-to-string-readable)
+		(expanded (eq readable 'expanded))
+		digits
+		(round-to (cond ((wholenump precision)
+				 (setq digits precision)
+				 (expt 10 (- precision)))
+				((and (floatp precision) (< precision 1.))
+				 (setq digits (- (floor (log precision 10))))
+				 precision)
+				(t (setq digits 0) 1)))
+		(dformat (if (> digits 0) (format "%%0.%df" digits)))
+		(padding (if abbrev "" " "))
+		here cnt cnt-pre here-pre cnt-val isfloatp)
+	   (if (= (round delay round-to) 0)
+	       (format "0%s" (if abbrev "s" " seconds"))
+	     (while (and (setq here (pop stsa)) stsa
+			 (< (/ delay (nth 3 here)) 1)))
+	     (or (and
+		  expanded stsa 	; smaller unit remains
+		  (progn
+		    (setq
+		     here-pre here here (car stsa)
+		     cnt-pre (floor (/ (float delay) (nth 3 here-pre)))
+		     cnt (round
+			  (/ (- (float delay) (* cnt-pre (nth 3 here-pre)))
+			     (nth 3 here))
+			  round-to))
+		    (if (> cnt 0) t (setq cnt cnt-pre here here-pre here-pre nil))))
+		 (setq cnt (round (/ (float delay) (nth 3 here)) round-to)))
+	     (setq cnt-val (* cnt round-to)
+                   isfloatp (and (> digits 0)
+			            (> (- cnt-val (floor cnt-val)) 0.)))
+	     (cl-labels
+		 ((unit (val here &optional plural)
+		    (cond (abbrev (car here))
+			  ((and (not plural) (<= (floor val) 1)) (nth 1 here))
+			  (t (nth 2 here)))))
+	       (concat
+		(when here-pre
+		  (concat (number-to-string cnt-pre) padding
+			  (unit cnt-pre here-pre) " "))
+		(if isfloatp (format dformat cnt-val)
+                  (number-to-string (floor cnt-val)))
+                padding
+                (unit cnt-val here isfloatp)))))) ; float formats are always plural
         ((= 0 delay) "0s")
         (t (let ((sts seconds-to-string) here)
              (while (and (car (setq here (pop sts)))

commit bf41ff24b9ab9c7426b3b3f1c1902b301e9f08a4
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Sat Dec 21 11:33:47 2024 +0200

    ; * lisp/net/browse-url.el (browse-url-with-browser-kind): Doc fix.

diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el
index ab6f8f8aff3..0fae30b09d1 100644
--- a/lisp/net/browse-url.el
+++ b/lisp/net/browse-url.el
@@ -976,11 +976,11 @@ Optional prefix argument ARG non-nil inverts the value of the option
   "Browse URL with a browser of the given browser KIND.
 
 KIND is either `internal' or `external'.  In order to find an
-appropriate browser for the given KIND, first the `browse-url-handlers'
-and `browse-url-default-handlers' lists are consulted.  If no handler is
-found, the functions `browse-url-browser-function',
+appropriate browser for the given KIND, first consult the `browse-url-handlers'
+and `browse-url-default-handlers' lists.  If no handler is found, try the
+functions `browse-url-browser-function',
 `browse-url-secondary-browser-function', `browse-url-default-browser'
-and `eww' are tried in that order.
+and `eww', in that order.
 
 When called interactively, the default browser kind is the
 opposite of the browser kind of `browse-url-browser-function'."

commit 0f645b92ed3e82f149de468df7ebe0eda5104aca
Author: Daniel Mendler <mail@daniel-mendler.de>
Date:   Thu Dec 12 12:15:10 2024 +0100

    browse-url-with-browser-kind: Improve browser function selection
    
    In order to find an appropriate browser function for the given
    kind, first the browser handler lists are consulted.  If no
    handler is found, the `browse-url-browser-function',
    `browse-url-secondary-browser-function`,
    `browse-url-default-browser' and `eww' are tried in that order
    until a browser function with a matching kind is found.  This
    way the user customization of `browse-url-browser-function' and
    `browse-url-secondary-browser-function` is respected by
    `browse-url-with-browser-kind'.
    * lisp/net/browse-url.el (browse-url-with-browser-kind): Try the
    browser functions in the aforementioned order.  (Bug#74820)

diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el
index eea7dac2f97..ab6f8f8aff3 100644
--- a/lisp/net/browse-url.el
+++ b/lisp/net/browse-url.el
@@ -974,7 +974,13 @@ Optional prefix argument ARG non-nil inverts the value of the option
 ;;;###autoload
 (defun browse-url-with-browser-kind (kind url &optional arg)
   "Browse URL with a browser of the given browser KIND.
-KIND is either `internal' or `external'.
+
+KIND is either `internal' or `external'.  In order to find an
+appropriate browser for the given KIND, first the `browse-url-handlers'
+and `browse-url-default-handlers' lists are consulted.  If no handler is
+found, the functions `browse-url-browser-function',
+`browse-url-secondary-browser-function', `browse-url-default-browser'
+and `eww' are tried in that order.
 
 When called interactively, the default browser kind is the
 opposite of the browser kind of `browse-url-browser-function'."
@@ -994,9 +1000,14 @@ opposite of the browser kind of `browse-url-browser-function'."
      (cons k url-arg)))
   (let ((function (browse-url-select-handler url kind)))
     (unless function
-      (setq function (if (eq kind 'external)
-                         #'browse-url-default-browser
-                       #'eww)))
+      (setq function
+            (seq-find
+             (lambda (fun)
+               (eq kind (browse-url--browser-kind fun url)))
+             (list browse-url-browser-function
+                   browse-url-secondary-browser-function
+                   #'browse-url-default-browser
+                   #'eww))))
     (funcall function url arg)))
 
 ;;;###autoload

commit 40145ba971942eb8b2b9db1e28b513b1f3fdda6f
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Sat Dec 21 10:57:47 2024 +0200

    ; Improve last change
    
    * lisp/net/eww.el (eww-search-confirm-send-region)
    (eww-search-words): Doc fix.
    (eww-search-words): Improve wording of confirmation request.
    (Bug#74218)

diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index 319b1e72fbb..842db3f27f4 100644
--- a/lisp/net/eww.el
+++ b/lisp/net/eww.el
@@ -53,8 +53,8 @@
   :type 'string)
 
 (defcustom eww-search-confirm-send-region t
-  "Whether to confirm before sending a region to a search engine.
-Non-nil if EWW should ask confirmation before sending the
+  "Whether to ask for confirmation before sending the region to a search engine.
+Non-nil if EWW should ask for confirmation before sending the
 selected region to the configured search engine.  This is the
 default to mitigate the risk of accidental data leak.  Set this
 variable to nil to send the region to the search engine
@@ -608,8 +608,9 @@ new buffer instead of reusing the default EWW buffer."
 ;;;###autoload
 (defun eww-search-words ()
   "Search the web for the text in the region.
-If region is active (and not whitespace), search the web for
-the text between region beginning and end.  Else, prompt the
+If region is active (and not whitespace), search the web for the
+text between region beginning and end, subject to user's confirmation
+controlled by `eww-search-confirm-send-region'.  Else, prompt the
 user for a search string.  See the variable `eww-search-prefix'
 for the search engine used."
   (interactive)
@@ -620,7 +621,7 @@ for the search engine used."
                 (or (not eww-search-confirm-send-region)
                     (yes-or-no-p
                      (format-message
-                      "Really send the entire region to the search engine? ")))
+                      "Really send the region to the search engine? ")))
               (eww region-string))
           (call-interactively #'eww)))
     (call-interactively #'eww)))

commit 31f3a760c504e76ae06805e5cc5c325b06e4a9ad
Author: Fabio Natali <me@fabionatali.com>
Date:   Tue Nov 5 23:52:30 2024 +0000

    Ask confirmation before EWW sends region to a search engine
    
    With 'eww-search-words' (by default bound to 'M-s M-w') a user
    can type in some search terms and get back the results of a web
    search from a predefined search engine.  If a region is selected,
    'eww-search-words' will use that for the web search instead of
    prompting the user.
    In its current form, 'eww-search-words' presents a security and
    usability problem.  It is relatively too easy to mistakenly
    launch the function and, if a region of text is selected, have
    potentially sensitive data sent out to a third-party service.
    This commit changes the search function's default behaviour so
    that explicit confirmation is required before a region is sent
    to a search engine.  The behaviour can be adjusted via the
    newly-introduced 'eww-search-confirm-send-region' variable,
    which is set to true by default.
    * lisp/net/eww.el (eww-search-confirm-send-region): Add.
    (eww-search-words): Update default 'eww-search-words' behaviour
    so as to ask confirmation before sending the region to a search
    engine.  (Bug#74218)

diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index 9b4bbca2e3e..319b1e72fbb 100644
--- a/lisp/net/eww.el
+++ b/lisp/net/eww.el
@@ -52,6 +52,17 @@
   :group 'eww
   :type 'string)
 
+(defcustom eww-search-confirm-send-region t
+  "Whether to confirm before sending a region to a search engine.
+Non-nil if EWW should ask confirmation before sending the
+selected region to the configured search engine.  This is the
+default to mitigate the risk of accidental data leak.  Set this
+variable to nil to send the region to the search engine
+straightaway."
+  :version "31.1"
+  :group 'eww
+  :type 'boolean)
+
 (defcustom eww-search-prefix "https://duckduckgo.com/html/?q="
   "Prefix URL to search engine."
   :version "24.4"
@@ -605,7 +616,12 @@ for the search engine used."
   (if (use-region-p)
       (let ((region-string (buffer-substring (region-beginning) (region-end))))
         (if (not (string-match-p "\\`[ \n\t\r\v\f]*\\'" region-string))
-            (eww region-string)
+            (when
+                (or (not eww-search-confirm-send-region)
+                    (yes-or-no-p
+                     (format-message
+                      "Really send the entire region to the search engine? ")))
+              (eww region-string))
           (call-interactively #'eww)))
     (call-interactively #'eww)))
 

commit 1c960bda91237c92f9f602bcb8538ad500c0bc49
Author: F. Jason Park <jp@neverwas.me>
Date:   Fri Nov 29 15:56:47 2024 -0800

    Use smarter default for erc-server-reconnect-function
    
    * doc/misc/erc.texi (Sample Configuration): Remove customization in
    `use-package' declaration for `erc-server-reconnect-function' as well as
    related language in the customization walk-through.  Do this because the
    new default incorporates `erc-server-delayed-check-reconnect' behavior
    for compatible connect functions.
    * etc/ERC-NEWS: Announce new default for `erc-server-reconnect-function'.
    * lisp/erc/erc-backend.el (erc-server-reconnect-function): Change
    default to `erc-server-prefer-check-reconnect'.
    (erc-server-delayed-check-reconnect): Use `process-send-string' instead
    of `send-string'.
    (erc--server-delayed-check-connectors): New variable.
    (erc-server-prefer-check-reconnect): New function.
    * test/lisp/erc/erc-scenarios-base-auto-recon.el
    (erc-scenarios-base-auto-recon-unavailable)
    (erc-scenarios-base-auto-recon-no-proto): Remove unnecessary
    `erc-server-reconnect-function' binding because the new default
    incorporates the behavior being tested for.
    * test/lisp/erc/erc-scenarios-base-buffer-display.el
    (erc-scenarios-base-buffer-display--reconnect-common):
    * test/lisp/erc/erc-scenarios-base-compat-rename-bouncer.el
    (erc-scenarios-common--base-compat-no-rename-bouncer):
    * test/lisp/erc/erc-scenarios-base-netid-bouncer-recon-base.el
    (erc-scenarios-base-netid-bouncer--recon-base):
    * test/lisp/erc/erc-scenarios-base-netid-bouncer-recon-both.el
    (erc-scenarios-base-netid-bouncer--recon-both):
    * test/lisp/erc/erc-scenarios-base-netid-bouncer-recon-id.el
    (erc-scenarios-base-netid-bouncer--reconnect-id-foo)
    (erc-scenarios-base-netid-bouncer--reconnect-id-bar):
    * test/lisp/erc/erc-scenarios-base-reconnect.el
    (erc-scenarios-base-reconnect-timer)
    (erc-scenarios-base-cancel-reconnect):
    * test/lisp/erc/erc-scenarios-services-misc.el
    (erc-scenarios-services-misc--reconnect-retry-nick):
    * test/lisp/erc/erc-scenarios-stamp.el
    (erc-scenarios-stamp--date-mode/reconnect): Explicitly bind
    `erc-server-reconnect-function' to `erc-server-delayed-reconnect', the
    former default, which does not do any probing.  (Bug#62044)

diff --git a/doc/misc/erc.texi b/doc/misc/erc.texi
index 0f6b6b8c5be..b5838b3b0ce 100644
--- a/doc/misc/erc.texi
+++ b/doc/misc/erc.texi
@@ -1340,8 +1340,7 @@ settings (@pxref{Sample configuration via Customize}).
   ;; Scroll all windows to prompt when submitting input.
   (erc-scrolltobottom-all t)
 
-  ;; Reconnect automatically using a fancy strategy.
-  (erc-server-reconnect-function #'erc-server-delayed-check-reconnect)
+  ;; Wait a bit longer between automatic reconnect attempts.
   (erc-server-reconnect-timeout 30)
 
   ;; Show new buffers in the current window instead of a split.
@@ -1444,30 +1443,18 @@ descriptions just in case you want to disable them later.  When
 finished, hit @kbd{C-x C-s} or click @samp{[Apply and Save]} atop the
 buffer.
 
-Now do the same for another couple options, this time having to do
-with automatic reconnection.  But instead of searching for their print
-names, try running @kbd{M-x customize-option @key{RET} @samp{<option>}
-@key{RET}}, replacing @samp{<option>} with:
+Now do the same for another option, this time having to do with
+automatic reconnection.  But instead of searching for its print name,
+try running @kbd{M-x customize-option @key{RET}
+erc-server-reconnect-timeout @key{RET}}.  (If it helps, hit @key{TAB}
+for completion.)  As you may have noticed, when customizing options
+individually, each buffer displays but a single option's widget.  For
+@code{erc-server-reconnect-timeout}, you'll encounter a text field
+(instead of a button), which works like those in a typical web form.
+Enter @samp{30} and either hit @kbd{C-x C-s} to save or @key{TAB} over
+to @samp{[State]} and hit @key{RET} followed by @kbd{1} to persist your
+changes.
 
-@itemize @bullet
-@item @code{erc-server-reconnect-function}, a function
-@item @code{erc-server-reconnect-timeout}, a number
-@end itemize
-
-@noindent
-(If it helps, hit @key{TAB} for completion.)  As you may have noticed,
-when customizing options individually, each buffer displays but a
-single option's widget.  When you get to the buffer for ``Erc Server
-Reconnect Function'', you'll see that @samp{[Toggle]} has been
-replaced with @samp{[Value Menu]} and that clicking it reveals three
-choices in a pop-up window.  Enter @kbd{1} to select
-@code{erc-server-delayed-check-reconnect} before @key{TAB}'ing over to
-@samp{[State]} and hitting @key{RET}.  Enter @kbd{1} again, this time
-to persists your changes.
-
-For the final option, @code{erc-server-reconnect-timeout}, you'll
-encounter a text field (instead of a button), which works like those
-in a typical web form.  Enter @samp{30} and hit @kbd{C-x C-s} to save.
 Just for fun, click the group link for @samp{Erc Server} at the bottom
 of the buffer.  You could just as well have set the last two options
 from this ``custom group'' buffer alone, which very much resembles the
diff --git a/etc/ERC-NEWS b/etc/ERC-NEWS
index f3c8645f02d..b7b49956d06 100644
--- a/etc/ERC-NEWS
+++ b/etc/ERC-NEWS
@@ -62,6 +62,12 @@ of concerns and the newer module's "experimental" status, the migration
 was deemed worth any potential disruption, despite this being a point
 release.  ERC appreciates your understanding in this matter.
 
+** Option 'erc-server-reconnect-function' has a new default.
+ERC 5.6 added 'erc-server-delayed-check-reconnect', whose "probing"
+strategy worked better for most users.  While compatibility concerns
+prevented it from becoming the new 'erc-server-reconnect-function'
+outright, a new solution has emerged that defers to it when sensible.
+
 ** Entry-point command 'erc-tls' once again considers option 'erc-port'.
 In its zeal to enforce a preference for TLS connections, ERC 5.5 went a
 bit far in disregarding the useful user option 'erc-port'.  When called
diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el
index 311e3a624e6..ab26a3715f1 100644
--- a/lisp/erc/erc-backend.el
+++ b/lisp/erc/erc-backend.el
@@ -429,15 +429,16 @@ this value to 120 or greater and/or exploring the option
 means of handling this situation on some servers."
   :type 'number)
 
-(defcustom erc-server-reconnect-function 'erc-server-delayed-reconnect
+(defcustom erc-server-reconnect-function 'erc-server-prefer-check-reconnect
   "Function called by the reconnect timer to create a new connection.
 Called with a server buffer as its only argument.  Potential uses
 include exponential backoff and probing for connectivity prior to
 dialing.  Use `erc-schedule-reconnect' to instead try again later
 and optionally alter the attempts tally."
-  :package-version '(ERC . "5.5")
+  :package-version '(ERC . "5.6.1")
   :type '(choice (function-item erc-server-delayed-reconnect)
                  (function-item erc-server-delayed-check-reconnect)
+                 (function-item erc-server-prefer-check-reconnect)
                  function))
 
 (defcustom erc-split-line-length 440
@@ -879,7 +880,7 @@ Expect BUFFER to be the server buffer for the current connection."
              (sentinel (lambda (proc event)
                          (pcase event
                            ("open\n"
-                            (run-at-time nil nil #'send-string proc
+                            (run-at-time nil nil #'process-send-string proc
                                          (format "PING %d\r\n"
                                                  (time-convert nil 'integer))))
                            ((or "connection broken by remote peer\n"
@@ -901,6 +902,19 @@ Expect BUFFER to be the server buffer for the current connection."
               (set-process-sentinel proc sentinel))
           (file-error (funcall reschedule nil)))))))
 
+(defvar erc--server-delayed-check-connectors
+  '(erc-open-tls-stream erc-open-network-stream)
+  "Functions compatible with `erc-server-delayed-check-reconnect'.")
+
+(defun erc-server-prefer-check-reconnect (buffer)
+  "Defer to another reconnector based on BUFFER's `erc-session-connector'.
+Prefer `erc-server-delayed-check-reconnect' if the connector is known to
+be \"check-aware\".  Otherwise, use `erc-server-delayed-reconnect'."
+  (if (memq (buffer-local-value 'erc-session-connector buffer)
+            erc--server-delayed-check-connectors)
+      (erc-server-delayed-check-reconnect buffer)
+    (erc-server-delayed-reconnect buffer)))
+
 (defun erc-server-filter-function (process string)
   "The process filter for the ERC server."
   (with-current-buffer (process-buffer process)
diff --git a/test/lisp/erc/erc-scenarios-base-auto-recon.el b/test/lisp/erc/erc-scenarios-base-auto-recon.el
index 808b1d8c4d4..d6a114147b3 100644
--- a/test/lisp/erc/erc-scenarios-base-auto-recon.el
+++ b/test/lisp/erc/erc-scenarios-base-auto-recon.el
@@ -24,6 +24,10 @@
   (let ((load-path (cons (ert-resource-directory) load-path)))
     (require 'erc-scenarios-common)))
 
+;; This tests `erc-server-delayed-check-reconnect', which is called by
+;; `erc-server-prefer-check-reconnect' (the default value of
+;; `erc-server-reconnect-function' as of ERC 5.6.1).
+
 (defun erc-scenarios-base-auto-recon--get-unused-port ()
   (let ((server (make-network-process :name "*erc-scenarios-base-auto-recon*"
                                       :host "localhost"
@@ -42,7 +46,6 @@
        (port (erc-scenarios-base-auto-recon--get-unused-port))
        (erc--server-reconnect-timeout-scale-function (lambda (_) 1))
        (erc-server-auto-reconnect t)
-       (erc-server-reconnect-function #'erc-server-delayed-check-reconnect)
        (expect (erc-d-t-make-expecter))
        (erc-scenarios-common-dialog "base/reconnect")
        (dumb-server nil))
@@ -89,7 +92,7 @@
         (erc-cmd-RECONNECT "cancel")
         (funcall expect 10 "canceled")))))
 
-;; In this test, a listener accepts but doesn't respond to any messages.
+;; Here, a listener accepts but doesn't respond to any messages.
 
 (ert-deftest erc-scenarios-base-auto-recon-no-proto ()
   :tags '(:expensive-test)
@@ -102,7 +105,6 @@
        (erc--server-reconnect-timeout-scale-function (lambda (_) 1))
        (erc--server-reconnect-timeout-check 0.5)
        (erc-server-auto-reconnect t)
-       (erc-server-reconnect-function #'erc-server-delayed-check-reconnect)
        (expect (erc-d-t-make-expecter)))
 
     (ert-info ("Session succeeds but cut short")
diff --git a/test/lisp/erc/erc-scenarios-base-buffer-display.el b/test/lisp/erc/erc-scenarios-base-buffer-display.el
index 5c3c526f86d..137db955db5 100644
--- a/test/lisp/erc/erc-scenarios-base-buffer-display.el
+++ b/test/lisp/erc/erc-scenarios-base-buffer-display.el
@@ -40,6 +40,7 @@
        (port (process-contact dumb-server :service))
        (expect (erc-d-t-make-expecter))
        (erc-server-flood-penalty 0.1)
+       (erc-server-reconnect-function #'erc-server-delayed-reconnect)
        (erc-server-auto-reconnect t)
        erc-autojoin-channels-alist)
 
diff --git a/test/lisp/erc/erc-scenarios-base-compat-rename-bouncer.el b/test/lisp/erc/erc-scenarios-base-compat-rename-bouncer.el
index d1124269e0a..0bba0446ce6 100644
--- a/test/lisp/erc/erc-scenarios-base-compat-rename-bouncer.el
+++ b/test/lisp/erc/erc-scenarios-base-compat-rename-bouncer.el
@@ -43,6 +43,7 @@
        (chan-buf-foo (format "#chan@127.0.0.1:%d" port))
        (chan-buf-bar (format "#chan@127.0.0.1:%d<2>" port))
        (expect (erc-d-t-make-expecter))
+       (erc-server-reconnect-function #'erc-server-delayed-reconnect)
        (erc-server-auto-reconnect auto)
        erc-server-buffer-foo erc-server-process-foo
        erc-server-buffer-bar erc-server-process-bar)
diff --git a/test/lisp/erc/erc-scenarios-base-netid-bouncer-recon-base.el b/test/lisp/erc/erc-scenarios-base-netid-bouncer-recon-base.el
index e5453c40e56..04ccb86643b 100644
--- a/test/lisp/erc/erc-scenarios-base-netid-bouncer-recon-base.el
+++ b/test/lisp/erc/erc-scenarios-base-netid-bouncer-recon-base.el
@@ -26,6 +26,7 @@
 
 (ert-deftest erc-scenarios-base-netid-bouncer--recon-base ()
   :tags '(:expensive-test)
-  (erc-scenarios-common--base-network-id-bouncer--reconnect nil nil))
+  (let ((erc-server-reconnect-function #'erc-server-delayed-reconnect))
+    (erc-scenarios-common--base-network-id-bouncer--reconnect nil nil)))
 
 ;;; erc-scenarios-base-netid-bouncer-recon-base.el ends here
diff --git a/test/lisp/erc/erc-scenarios-base-netid-bouncer-recon-both.el b/test/lisp/erc/erc-scenarios-base-netid-bouncer-recon-both.el
index 09ddcef5fa3..f0939d6204a 100644
--- a/test/lisp/erc/erc-scenarios-base-netid-bouncer-recon-both.el
+++ b/test/lisp/erc/erc-scenarios-base-netid-bouncer-recon-both.el
@@ -27,6 +27,8 @@
 
 (ert-deftest erc-scenarios-base-netid-bouncer--recon-both ()
   :tags '(:expensive-test)
-  (erc-scenarios-common--base-network-id-bouncer--reconnect 'foo-id 'bar-id))
+  (let ((erc-server-reconnect-function #'erc-server-delayed-reconnect))
+    (erc-scenarios-common--base-network-id-bouncer--reconnect 'foo-id
+                                                              'bar-id)))
 
 ;;; erc-scenarios-base-netid-bouncer-recon-both.el ends here
diff --git a/test/lisp/erc/erc-scenarios-base-netid-bouncer-recon-id.el b/test/lisp/erc/erc-scenarios-base-netid-bouncer-recon-id.el
index 253ab4f72c9..d77a4287976 100644
--- a/test/lisp/erc/erc-scenarios-base-netid-bouncer-recon-id.el
+++ b/test/lisp/erc/erc-scenarios-base-netid-bouncer-recon-id.el
@@ -26,11 +26,13 @@
 
 (ert-deftest erc-scenarios-base-netid-bouncer--reconnect-id-foo ()
   :tags '(:expensive-test)
-  (erc-scenarios-common--base-network-id-bouncer--reconnect 'foo-id nil))
+  (let ((erc-server-reconnect-function #'erc-server-delayed-reconnect))
+    (erc-scenarios-common--base-network-id-bouncer--reconnect 'foo-id nil)))
 
 (ert-deftest erc-scenarios-base-netid-bouncer--reconnect-id-bar ()
   :tags '(:expensive-test)
-  (erc-scenarios-common--base-network-id-bouncer--reconnect nil 'bar-id))
+  (let ((erc-server-reconnect-function #'erc-server-delayed-reconnect))
+    (erc-scenarios-common--base-network-id-bouncer--reconnect nil 'bar-id)))
 
 
 ;;; erc-scenarios-base-netid-bouncer-recon-id.el ends here
diff --git a/test/lisp/erc/erc-scenarios-base-reconnect.el b/test/lisp/erc/erc-scenarios-base-reconnect.el
index 6f968b9fcbc..2dc34362fbf 100644
--- a/test/lisp/erc/erc-scenarios-base-reconnect.el
+++ b/test/lisp/erc/erc-scenarios-base-reconnect.el
@@ -37,6 +37,7 @@
        (dumb-server (erc-d-run "localhost" t 'timer 'timer 'timer-last))
        (port (process-contact dumb-server :service))
        (expect (erc-d-t-make-expecter))
+       (erc-server-reconnect-function #'erc-server-delayed-reconnect)
        (erc-server-auto-reconnect t)
        erc-autojoin-channels-alist
        erc-server-buffer)
@@ -144,6 +145,7 @@
        (dumb-server (erc-d-run "localhost" t 'timer 'timer 'timer-last))
        (port (process-contact dumb-server :service))
        (expect (erc-d-t-make-expecter))
+       (erc-server-reconnect-function #'erc-server-delayed-reconnect)
        (erc-server-auto-reconnect t)
        erc-autojoin-channels-alist
        erc-server-buffer)
diff --git a/test/lisp/erc/erc-scenarios-services-misc.el b/test/lisp/erc/erc-scenarios-services-misc.el
index 47d0bcff41a..ee35e8b93db 100644
--- a/test/lisp/erc/erc-scenarios-services-misc.el
+++ b/test/lisp/erc/erc-scenarios-services-misc.el
@@ -155,6 +155,7 @@
        (dumb-server (erc-d-run "localhost" t 'reconnect-retry
                                'reconnect-retry-again))
        (port (process-contact dumb-server :service))
+       (erc-server-reconnect-function #'erc-server-delayed-reconnect)
        (erc-server-auto-reconnect t)
        (erc-modules `(services-regain sasl ,@erc-modules))
        (erc-services-regain-alist
diff --git a/test/lisp/erc/erc-scenarios-stamp.el b/test/lisp/erc/erc-scenarios-stamp.el
index 8aea091333b..86074a9c35a 100644
--- a/test/lisp/erc/erc-scenarios-stamp.el
+++ b/test/lisp/erc/erc-scenarios-stamp.el
@@ -188,6 +188,7 @@
       ((erc-scenarios-common-dialog "base/reconnect")
        (erc-server-flood-penalty 0.1)
        (erc-stamp--tz t)
+       (erc-server-reconnect-function #'erc-server-delayed-reconnect)
        (erc-server-auto-reconnect t)
        ;; Start close to midnight: 2024-06-02T23:58:11.055Z
        (erc-stamp--current-time (if (< emacs-major-version 29)

commit e9591fae5e7ba772b63c6cc548bb5ebe68f583e6
Author: F. Jason Park <jp@neverwas.me>
Date:   Mon Apr 22 18:11:24 2024 -0700

    Add command for teaching Imenu about ERC macros
    
    * lisp/erc/erc-backend.el (define-erc-response-handler): Add
    `doc-string' to `declare' specification.
    * test/lisp/erc/resources/erc-tests-common.el
    (erc-tests-common-add-imenu-expressions): New function for defining and
    undefining Imenu patterns useful to ERC developers.

diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el
index e72fa036f17..311e3a624e6 100644
--- a/lisp/erc/erc-backend.el
+++ b/lisp/erc/erc-backend.el
@@ -1662,6 +1662,7 @@ Would expand to:
                                   ([&or integerp symbolp]
                                    &rest [&or integerp symbolp])]
                            &optional sexp sexp def-body))
+           (doc-string 2)
            (indent defun))
   (if (numberp name) (setq name (intern (format "%03i" name))))
   (setq aliases (mapcar (lambda (a)
diff --git a/test/lisp/erc/resources/erc-tests-common.el b/test/lisp/erc/resources/erc-tests-common.el
index a9495ecb28d..546e74736b0 100644
--- a/test/lisp/erc/resources/erc-tests-common.el
+++ b/test/lisp/erc/resources/erc-tests-common.el
@@ -410,4 +410,41 @@ faces in the reverse order they appear in an inserted message."
 
     (funcall test (lambda (arg) (setq faces arg)))))
 
+;; To use this function, add something like
+;;
+;;   ("lisp/erc"
+;;    (emacs-lisp-mode (eval erc-tests-common-add-imenu-expressions)))
+;;
+;; to your ~/emacs/master/.dir-locals-2.el.  Optionally, add the sexp
+;;
+;;   (erc-tests-common-add-imenu-expressions)
+;;
+;; to the user option `safe-local-eval-forms', and load this file before
+;; hacking, possibly by autoloading this function in your init.el.
+(defun erc-tests-common-add-imenu-expressions (&optional removep)
+  "Tell `imenu' about ERC-defined macros.  With REMOVEP, do the opposite."
+  (interactive "P")
+  ;; This currently produces results like "ERC response FOO BAR", but it
+  ;; would be preferable to end up with "erc-response-FOO" and
+  ;; "erc-response-BAR" instead, possibly as separate items.  Likewise
+  ;; for modules: "erc-foo-mode" instead of "ERC module foo".
+  (dolist (item `(("ERC response"
+                   ,(rx bol (* (syntax whitespace))
+                        "(define-erc-response-handler (" (group (+ nonl)) ")")
+                   1)
+                  ("ERC module"
+                   ,(rx bol (* (syntax whitespace))
+                        ;; No `lisp-mode-symbol' in < Emacs 29.
+                        "(define-erc-module " (group (+ (| (syntax word)
+                                                           (syntax symbol)
+                                                           (: "\\" nonl)))))
+                   1)))
+    ;; This should only run in `emacs-lisp-mode' buffers, which have
+    ;; this variable set locally.
+    (cl-assert (local-variable-p 'imenu-generic-expression))
+    (if removep
+        (setq imenu-generic-expression
+              (remove item imenu-generic-expression))
+      (cl-pushnew item imenu-generic-expression :test #'equal))))
+
 (provide 'erc-tests-common)

commit d1c670f0cbf9c66d59b24797f38203ea698813c3
Author: F. Jason Park <jp@neverwas.me>
Date:   Tue Dec 17 17:53:34 2024 -0800

    Disable which-func-mode in erc-imenu buffers
    
    * lisp/erc/erc-imenu.el (erc-imenu-setup): Move after module definition
    so the variable `erc-imenu-mode' is defined.  Run teardown code when
    module is deactivated.  Set `which-func-mode' to nil locally.
    (erc-imenu-mode, erc-imenu-enable, erc-imenu-disable): Manage membership
    of `erc-imenu--disable-which-func' in `which-function-mode-hook'.
    (erc-imenu--disable-which-func): New function.  (Bug#74934)

diff --git a/lisp/erc/erc-imenu.el b/lisp/erc/erc-imenu.el
index 4c9cbfc1580..68c7895e2dd 100644
--- a/lisp/erc/erc-imenu.el
+++ b/lisp/erc/erc-imenu.el
@@ -132,23 +132,36 @@ Don't rely on this function, read it first!"
 (defvar-local erc-imenu--create-index-function nil
   "Previous local value of `imenu-create-index-function', if any.")
 
-(defun erc-imenu-setup ()
-  "Wire up support for Imenu in an ERC buffer."
-  (when (and (local-variable-p 'imenu-create-index-function)
-             imenu-create-index-function)
-    (setq erc-imenu--create-index-function imenu-create-index-function))
-  (setq imenu-create-index-function #'erc-create-imenu-index))
-
 ;;;###autoload(autoload 'erc-imenu-mode "erc-imenu" nil t)
 (define-erc-module imenu nil
   "Simple Imenu integration for ERC."
   ((add-hook 'erc-mode-hook #'erc-imenu-setup)
+   (add-hook 'which-function-mode-hook #'erc-imenu--disable-which-func)
    (unless erc--updating-modules-p (erc-buffer-do #'erc-imenu-setup)))
   ((remove-hook 'erc-mode-hook #'erc-imenu-setup)
-   (erc-with-all-buffers-of-server nil nil
-     (when erc-imenu--create-index-function
-       (setq imenu-create-index-function erc-imenu--create-index-function)
-       (kill-local-variable 'erc-imenu--create-index-function)))))
+   (remove-hook 'which-function-mode-hook #'erc-imenu--disable-which-func)
+   (erc-buffer-do #'erc-imenu-setup)))
+
+(defun erc-imenu-setup ()
+  "Set up or tear down Imenu integration."
+  (if erc-imenu-mode
+      (progn
+        (when (and (local-variable-p 'imenu-create-index-function)
+                   imenu-create-index-function)
+          (setq erc-imenu--create-index-function imenu-create-index-function))
+        (setq imenu-create-index-function #'erc-create-imenu-index)
+        (when (boundp 'which-func-mode)
+          (setq which-func-mode nil)))
+    (when erc-imenu--create-index-function
+      (setq imenu-create-index-function erc-imenu--create-index-function))
+    (kill-local-variable 'erc-imenu--create-index-function)
+    (kill-local-variable 'which-func-mode)))
+
+(defun erc-imenu--disable-which-func ()
+  "Silence `which-function-mode' in ERC buffers."
+  (defvar which-func-mode)
+  (erc-with-all-buffers-of-server nil nil
+    (setq which-func-mode nil)))
 
 (provide 'erc-imenu)
 

commit 2d173aa3d34e60206f4889eb0220aa2269b3ed4d
Author: Po Lu <luangruo@yahoo.com>
Date:   Sat Dec 21 08:53:21 2024 +0800

    Fix a number of Android compilation warnings
    
    * src/dispnew.c (frame_rect_abs, frame_pos_abs, rect_intersect)
    (copy_child_glyphs, abs_cursor_pos, is_in_matrix)
    (is_cursor_obscured) [HAVE_ANDROID]: Delete functions.

diff --git a/src/dispnew.c b/src/dispnew.c
index c252781b235..a3c02742082 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -3288,6 +3288,8 @@ struct rect
   int x, y, w, h;
 };
 
+#ifndef HAVE_ANDROID
+
 /* Compute the intersection of R1 and R2 in R.  Value is true if R1 and
    R2 intersect, false otherwise.  */
 
@@ -3330,6 +3332,8 @@ frame_rect_abs (struct frame *f)
   return (struct rect) { x, y, f->total_cols, f->total_lines };
 }
 
+#endif /* !HAVE_ANDROID */
+
 /* Return the root frame of frame F.  Follow the parent_frame chain
    until we reach a frame that has no parent.  That is the root frame.
    Note that the root of a root frame is itself. */
@@ -3512,6 +3516,8 @@ make_matrix_current (struct frame *f)
 	make_current (f, NULL, i);
 }
 
+#ifndef HAVE_ANDROID
+
 /* Prepare ROOT's desired row at index Y for copying child frame
    contents to it.  Value is the prepared desired row or NULL if we
    don't have, and can't contruct a desired row.  */
@@ -3745,6 +3751,8 @@ copy_child_glyphs (struct frame *root, struct frame *child)
     }
 }
 
+#endif /* !HAVE_ANDROID */
+
 /***********************************************************************
 			     Frame Update
  ***********************************************************************/
@@ -3837,6 +3845,8 @@ update_tty_frame (struct frame *f)
   build_frame_matrix (f);
 }
 
+#ifndef HAVE_ANDROID
+
 /* Return the cursor position of the selected window of frame F, in
    absolute coordinates in *X and *Y.  Note that if F is a child frame,
    its cursor may be clipped, i.e. outside of the bounds of the terminal
@@ -3903,8 +3913,6 @@ is_cursor_obscured (void)
   return cursor_glyph->frame != SELECTED_FRAME ();
 }
 
-#ifndef HAVE_ANDROID
-
 /* Decide where to show the cursor, and whether to hide it.
 
    This works very well for Vertico-Posframe, Transient-Posframe and

commit b71ddaf6d3ac39487302fbc27614b9de28bf6cef
Author: João Távora <joaotavora@gmail.com>
Date:   Fri Dec 20 23:11:30 2024 +0000

    Eglot: ensure quick typing doesn't undermine completion exit
    
    Some completion resolution requests in
    eglot-completion-at-point, specifically those that might be
    triggered from the :exit function, can't be cancellable, else
    the completion edit or snippet will never be obtained and the
    user is left with the nonsensical completion label in the
    buffer.
    
    Github-reference: https://github.com/joaotavora/eglot/issues/1474

diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el
index e5c27de81fc..816a1e67eca 100644
--- a/lisp/progmodes/eglot.el
+++ b/lisp/progmodes/eglot.el
@@ -3228,14 +3228,15 @@ for which LSP on-type-formatting should be requested."
             ;; Maybe completion/resolve JSON object `lsp-comp' into
             ;; another JSON object, if at all possible.  Otherwise,
             ;; just return lsp-comp.
-            (lambda (lsp-comp)
+            (lambda (lsp-comp &optional dont-cancel-on-input)
               (or (gethash lsp-comp resolved)
                   (setf (gethash lsp-comp resolved)
                         (if (and (eglot-server-capable :completionProvider
                                                         :resolveProvider)
                                  (plist-get lsp-comp :data))
                             (eglot--request server :completionItem/resolve
-                                            lsp-comp :cancel-on-input t
+                                            lsp-comp :cancel-on-input
+                                            (not dont-cancel-on-input)
                                             :immediate t)
                           lsp-comp))))))
       (when (and (consp eglot--capf-session)
@@ -3350,7 +3351,12 @@ for which LSP on-type-formatting should be requested."
                       ;; A lookup should fix that (github#148)
                       (get-text-property
                        0 'eglot--lsp-item
-                       (cl-find proxy (funcall proxies) :test #'string=))))
+                       (cl-find proxy (funcall proxies) :test #'string=)))
+                  ;; Be sure to pass non-nil here since we don't want
+                  ;; any quick typing after the soon-to-be-undone
+                  ;; insertion to potentially cancel an essential
+                  ;; resolution request (github#1474).
+                  'dont-cancel-on-input)
                (let ((snippet-fn (and (eql insertTextFormat 2)
                                       (eglot--snippet-expansion-fn))))
                  (cond (textEdit

commit faaa13ec762ddd762725d7f0eed0aced8428354a
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Fri Dec 20 22:06:06 2024 +0200

    Autoload 'shortdoc-help-fns-examples-function'
    
    * lisp/help-fns.el (shortdoc-help-fns-examples-function):
    Autoload, to allow adding it to
    'help-fns-describe-function-functions' as advertised.  (Bug#74995)

diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index 1ffe1b16588..0be0c716f6a 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -1557,6 +1557,8 @@ This cancels value editing without updating the value."
   (interactive nil help-fns--edit-value-mode)
   (help-fns-edit-mode-done t))
 
+(autoload 'shortdoc-help-fns-examples-function "shortdoc")
+
 (defun help-fns--run-describe-functions (functions &rest args)
   (with-current-buffer standard-output
     (unless (bolp)

commit 8aad208e002a8c7512df77de7a16b67303e964ec
Author: Yuan Fu <casouri@gmail.com>
Date:   Fri Dec 20 08:20:27 2024 -0800

    Move admin scripts to admin/treesit-admin.el
    
    * admin/treesit-admin.el: New file.
    * lisp/treesit.el (treesit--check-manual-coverage):
    (treesit--builtin-language-sources):
    (treesit--verify-major-mode-queries):
    (treesit-verify-major-mode-queries): Move out.

diff --git a/admin/treesit-admin.el b/admin/treesit-admin.el
new file mode 100644
index 00000000000..3c0798a29f2
--- /dev/null
+++ b/admin/treesit-admin.el
@@ -0,0 +1,207 @@
+;;; treesit-admin.el --- Tree-sitter related admin scripts  -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2024 Free Software Foundation, Inc.
+
+;; Maintainer: 付禹安 (Yuan Fu) <casouri@gmail.com>
+;; Keywords: maint
+;; Package: emacs
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;;; Code:
+
+(require 'treesit)
+(require 'rx)
+
+;;; Manual coverage
+
+(declare-function find-library-name "find-func.el")
+(defun treesit-admin-check-manual-coverage ()
+  "Print tree-sitter functions missing from the manual in message buffer."
+  (interactive)
+  (require 'find-func)
+  (let ((functions-in-source
+         (with-temp-buffer
+           (insert-file-contents (find-library-name "treesit"))
+           (cl-remove-if
+            (lambda (name) (string-search "treesit--" name))
+            (cl-sort
+             (save-excursion
+               (goto-char (point-min))
+               (cl-loop while (re-search-forward
+                               "^(defun \\([^ ]+\\)" nil t)
+                        collect (match-string-no-properties 1)))
+             #'string<))))
+        (functions-in-manual
+         (with-temp-buffer
+           (insert-file-contents (expand-file-name
+                                  "doc/lispref/parsing.texi"
+                                  source-directory))
+           (insert-file-contents (expand-file-name
+                                  "doc/lispref/modes.texi"
+                                  source-directory))
+           (cl-sort
+            (save-excursion
+              (goto-char (point-min))
+              (cl-loop while (re-search-forward
+                              "^@defun \\([^ ]+\\)" nil t)
+                       collect (match-string-no-properties 1)))
+            #'string<))))
+    (message "Missing: %s"
+             (string-join
+              (cl-remove-if
+               (lambda (name) (member name functions-in-manual))
+               functions-in-source)
+              "\n"))))
+
+;;; Query validation
+
+(defvar treesit-admin--builtin-language-sources
+  '((c "https://github.com/tree-sitter/tree-sitter-c")
+    (cpp "https://github.com/tree-sitter/tree-sitter-cpp")
+    (cmake "https://github.com/uyha/tree-sitter-cmake")
+    (dockerfile "https://github.com/camdencheek/tree-sitter-dockerfile")
+    (go "https://github.com/tree-sitter/tree-sitter-go")
+    (ruby "https://github.com/tree-sitter/tree-sitter-ruby"))
+  "A list of sources for the builtin modes.
+The source information are in the format of
+`treesit-language-source-alist'.  This is for development only.")
+
+(defun treesit-admin--verify-major-mode-queries (modes langs grammar-dir)
+  "Verify font-lock queries in MODES.
+
+LANGS is a list of languages, it should cover all the languages used by
+MODES.  GRAMMAR-DIR is a temporary direction in which grammars are
+installed.
+
+If the font-lock queries work fine with the latest grammar, insert some
+comments in the source file saying that the modes are known to work with
+that version of grammar.  At the end of the process, show a list of
+queries that has problems with latest grammar."
+  (let ((treesit-extra-load-path (list grammar-dir))
+        (treesit-language-source-alist treesit-admin--builtin-language-sources)
+        (treesit--install-language-grammar-full-clone t)
+        (version-alist nil)
+        (invalid-feature-list nil)
+        (valid-modes nil)
+        (mode-language-alist nil)
+        (file-modes-alist nil))
+    (dolist (lang langs)
+      (let ((ver (treesit-install-language-grammar lang grammar-dir)))
+        (if ver
+            (push (cons lang ver) version-alist)
+          (error "Cannot get version for %s" lang))))
+
+    ;; Validate font-lock queries for each major mode.
+    (dolist (mode modes)
+      (let ((settings
+             (with-temp-buffer
+               (ignore-errors
+                 (funcall mode)
+                 (font-lock-mode -1)
+                 treesit-font-lock-settings)))
+            (all-queries-valid t))
+        (dolist (setting settings)
+          (let* ((query (treesit-font-lock-setting-query setting))
+                 (language (treesit-query-language query))
+                 (feature (treesit-font-lock-setting-feature setting)))
+            ;; Record that MODE uses LANGUAGE.
+            (unless (memq language (alist-get mode mode-language-alist))
+              (push language (alist-get mode mode-language-alist)))
+            ;; Validate query.
+            (when (not (ignore-errors
+                         (treesit-query-compile language query t)
+                         t))
+              (push (list mode language feature) invalid-feature-list)
+              (setq all-queries-valid nil))))
+        (when all-queries-valid
+          (push mode valid-modes))))
+
+    ;; Group modes by their source file.
+    (dolist (mode valid-modes)
+      (let ((source-file (replace-regexp-in-string
+                          (rx ".elc" eos)
+                          ".el"
+                          (car (get mode 'function-history)))))
+        (unless (member mode (alist-get source-file file-modes-alist
+                                        nil nil #'equal))
+          (push mode (alist-get source-file file-modes-alist
+                                nil nil #'equal)))))
+
+    ;; Update the "known-to-work" version comment for the modes.
+    (pcase-dolist (`(,source-file . ,modes) file-modes-alist)
+      (let (beg)
+        (with-temp-buffer
+          (insert-file-contents source-file)
+          (goto-char (point-min))
+          (when (not (search-forward
+                      ";;; Tree-sitter language versions\n" nil t))
+            (re-search-forward (rx (or ";;; Commentary:" ";;; Code:")))
+            (forward-line -1)
+            (insert "\n;;; Tree-sitter language versions\n\n")
+            (forward-line -1))
+          (setq beg (point))
+          (search-forward "\n\n")
+          (delete-region beg (point))
+          (insert ";;\n")
+          (dolist (mode modes)
+            (insert (format ";; %s is known to work with the following languages and version:\n" mode))
+            (dolist (lang (alist-get mode mode-language-alist))
+              (insert (format ";; - tree-sitter-%s: %s\n" lang (alist-get lang version-alist))))
+            (insert ";;\n"))
+          (insert
+           ";; We try our best to make builtin modes work with latest grammar
+;; versions, so a more recent grammar version has a good chance to work.
+;; Send us a bug report if it doesn't.")
+          (insert "\n\n")
+          (write-file source-file))))
+
+    (pop-to-buffer (get-buffer-create "*verify major mode queries*"))
+    (let ((inhibit-read-only t))
+      (erase-buffer)
+      (insert "Verified grammar and versions:\n")
+      (pcase-dolist (`(,lang . ,version) version-alist)
+        (insert (format "- %s: %s\n" lang version)))
+      (insert "\n")
+      (if (null invalid-feature-list)
+          (insert "All the queries are valid with latest grammar.\n")
+        (insert "The following modes has invalid queries:\n")
+        (dolist (entry invalid-feature-list)
+          (insert (format "mode: %s language: %s feature: %s"
+                          (nth 0 entry)
+                          (nth 1 entry)
+                          (nth 2 entry)))))
+      (special-mode))))
+
+(defun treesit-admin-verify-major-mode-queries ()
+  "Varify font-lock queries in builtin major modes.
+
+If the font-lock queries work fine with the latest grammar, insert some
+comments in the source file saying that the modes are known to work with
+that version of grammar.  At the end of the process, show a list of
+queries that has problems with latest grammar."
+  (interactive)
+  (treesit-admin--verify-major-mode-queries
+   '(cmake-ts-mode dockerfile-ts-mode go-ts-mode ruby-ts-mode)
+   '(cmake dockerfile go ruby)
+   "/tmp/tree-sitter-grammars"))
+
+
+(provide 'treesit-admin)
+
+;;; treesit-admin.el ends here
diff --git a/lisp/treesit.el b/lisp/treesit.el
index 98054a3b1a9..7b7f4842505 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -4148,177 +4148,6 @@ generated by \"git describe\".  It only works when
         (delete-directory workdir t)))
     version))
 
-;;; Etc
-
-(declare-function find-library-name "find-func.el")
-(defun treesit--check-manual-coverage ()
-  "Print tree-sitter functions missing from the manual in message buffer."
-  (interactive)
-  (require 'find-func)
-  (let ((functions-in-source
-         (with-temp-buffer
-           (insert-file-contents (find-library-name "treesit"))
-           (cl-remove-if
-            (lambda (name) (string-search "treesit--" name))
-            (cl-sort
-             (save-excursion
-               (goto-char (point-min))
-               (cl-loop while (re-search-forward
-                               "^(defun \\([^ ]+\\)" nil t)
-                        collect (match-string-no-properties 1)))
-             #'string<))))
-        (functions-in-manual
-         (with-temp-buffer
-           (insert-file-contents (expand-file-name
-                                  "doc/lispref/parsing.texi"
-                                  source-directory))
-           (insert-file-contents (expand-file-name
-                                  "doc/lispref/modes.texi"
-                                  source-directory))
-           (cl-sort
-            (save-excursion
-              (goto-char (point-min))
-              (cl-loop while (re-search-forward
-                              "^@defun \\([^ ]+\\)" nil t)
-                       collect (match-string-no-properties 1)))
-            #'string<))))
-    (message "Missing: %s"
-             (string-join
-              (cl-remove-if
-               (lambda (name) (member name functions-in-manual))
-               functions-in-source)
-              "\n"))))
-
-(defvar treesit--builtin-language-sources
-  '((c "https://github.com/tree-sitter/tree-sitter-c")
-    (cpp "https://github.com/tree-sitter/tree-sitter-cpp")
-    (cmake "https://github.com/uyha/tree-sitter-cmake")
-    (dockerfile "https://github.com/camdencheek/tree-sitter-dockerfile")
-    (go "https://github.com/tree-sitter/tree-sitter-go")
-    (ruby "https://github.com/tree-sitter/tree-sitter-ruby"))
-  "A list of sources for the builtin modes.
-The source information are in the format of
-`treesit-language-source-alist'.  This is for development only.")
-
-(defun treesit--verify-major-mode-queries (modes langs grammar-dir)
-  "Verify font-lock queries in MODES.
-
-LANGS is a list of languages, it should cover all the languages used by
-MODES.  GRAMMAR-DIR is a temporary direction in which grammars are
-installed.
-
-If the font-lock queries work fine with the latest grammar, insert some
-comments in the source file saying that the modes are known to work with
-that version of grammar.  At the end of the process, show a list of
-queries that has problems with latest grammar."
-  (let ((treesit-extra-load-path (list grammar-dir))
-        (treesit-language-source-alist treesit--builtin-language-sources)
-        (treesit--install-language-grammar-full-clone t)
-        (version-alist nil)
-        (invalid-feature-list nil)
-        (valid-modes nil)
-        (mode-language-alist nil)
-        (file-modes-alist nil))
-    (dolist (lang langs)
-      (let ((ver (treesit-install-language-grammar lang grammar-dir)))
-        (if ver
-            (push (cons lang ver) version-alist)
-          (error "Cannot get version for %s" lang))))
-
-    ;; Validate font-lock queries for each major mode.
-    (dolist (mode modes)
-      (let ((settings
-             (with-temp-buffer
-               (ignore-errors
-                 (funcall mode)
-                 (font-lock-mode -1)
-                 treesit-font-lock-settings)))
-            (all-queries-valid t))
-        (dolist (setting settings)
-          (let* ((query (treesit-font-lock-setting-query setting))
-                 (language (treesit-query-language query))
-                 (feature (treesit-font-lock-setting-feature setting)))
-            ;; Record that MODE uses LANGUAGE.
-            (unless (memq language (alist-get mode mode-language-alist))
-              (push language (alist-get mode mode-language-alist)))
-            ;; Validate query.
-            (when (not (ignore-errors
-                         (treesit-query-compile language query t)
-                         t))
-              (push (list mode language feature) invalid-feature-list)
-              (setq all-queries-valid nil))))
-        (when all-queries-valid
-          (push mode valid-modes))))
-
-    ;; Group modes by their source file.
-    (dolist (mode valid-modes)
-      (let ((source-file (replace-regexp-in-string
-                          (rx ".elc" eos)
-                          ".el"
-                          (car (get mode 'function-history)))))
-        (unless (member mode (alist-get source-file file-modes-alist
-                                        nil nil #'equal))
-          (push mode (alist-get source-file file-modes-alist
-                                nil nil #'equal)))))
-
-    ;; Update the "known-to-work" version comment for the modes.
-    (pcase-dolist (`(,source-file . ,modes) file-modes-alist)
-      (let (beg)
-        (with-temp-buffer
-          (insert-file-contents source-file)
-          (goto-char (point-min))
-          (when (not (search-forward
-                      ";;; Tree-sitter language versions\n" nil t))
-            (re-search-forward (rx (or ";;; Commentary:" ";;; Code:")))
-            (forward-line -1)
-            (insert "\n;;; Tree-sitter language versions\n\n")
-            (forward-line -1))
-          (setq beg (point))
-          (search-forward "\n\n")
-          (delete-region beg (point))
-          (insert ";;\n")
-          (dolist (mode modes)
-            (insert (format ";; %s is known to work with the following languages and version:\n" mode))
-            (dolist (lang (alist-get mode mode-language-alist))
-              (insert (format ";; - tree-sitter-%s: %s\n" lang (alist-get lang version-alist))))
-            (insert ";;\n"))
-          (insert
-           ";; We try our best to make builtin modes work with latest grammar
-;; versions, so a more recent grammar version has a good chance to work.
-;; Send us a bug report if it doesn't.")
-          (insert "\n\n")
-          (write-file source-file))))
-
-    (pop-to-buffer (get-buffer-create "*verify major mode queries*"))
-    (let ((inhibit-read-only t))
-      (erase-buffer)
-      (insert "Verified grammar and versions:\n")
-      (pcase-dolist (`(,lang . ,version) version-alist)
-        (insert (format "- %s: %s\n" lang version)))
-      (insert "\n")
-      (if (null invalid-feature-list)
-          (insert "All the queries are valid with latest grammar.\n")
-        (insert "The following modes has invalid queries:\n")
-        (dolist (entry invalid-feature-list)
-          (insert (format "mode: %s language: %s feature: %s"
-                          (nth 0 entry)
-                          (nth 1 entry)
-                          (nth 2 entry)))))
-      (special-mode))))
-
-(defun treesit-verify-major-mode-queries ()
-  "Varify font-lock queries in builtin major modes.
-
-If the font-lock queries work fine with the latest grammar, insert some
-comments in the source file saying that the modes are known to work with
-that version of grammar.  At the end of the process, show a list of
-queries that has problems with latest grammar."
-  (interactive)
-  (treesit--verify-major-mode-queries
-   '(cmake-ts-mode dockerfile-ts-mode go-ts-mode ruby-ts-mode)
-   '(cmake dockerfile go ruby)
-   "/tmp/tree-sitter-grammars"))
-
 ;;; Shortdocs
 
 (defun treesit--generate-shortdoc-examples ()

commit dbf22fd0d050423e5ed727923399099bba7d3dc2
Author: Martin Rudalics <rudalics@gmx.at>
Date:   Fri Dec 20 16:25:44 2024 +0100

    On GTK do not inhibit implied resizing until tool bar was drawn (Bug#74750)
    
    * src/frame.c (frame_inhibit_resize): Under GTK do not inhibit
    implied resizing as long as the tool bar has not been drawn yet
    so the frame gets its intended initial height (Bug#74750).
    * src/gtkutil.c (update_frame_tool_bar): Set tool_bar_resized
    slot of frame f to true regardless of whether a tool bar was
    made or not.  This will make inhibiting implied resizes work
    again from now on.

diff --git a/src/frame.c b/src/frame.c
index 431b04fc34e..36b314c075e 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -182,6 +182,9 @@ frame_inhibit_resize (struct frame *f, bool horizontal, Lisp_Object parameter)
   Lisp_Object fullscreen = get_frame_param (f, Qfullscreen);
 
   return (f->after_make_frame
+#ifdef USE_GTK
+	  && f->tool_bar_resized
+#endif
 	  && (EQ (frame_inhibit_implied_resize, Qt)
 	      || (CONSP (frame_inhibit_implied_resize)
 		  && !NILP (Fmemq (parameter, frame_inhibit_implied_resize)))
diff --git a/src/gtkutil.c b/src/gtkutil.c
index d57627f152f..daff867af29 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -6081,13 +6081,13 @@ update_frame_tool_bar (struct frame *f)
         xg_pack_tool_bar (f, FRAME_TOOL_BAR_POSITION (f));
       gtk_widget_show_all (x->toolbar_widget);
       if (xg_update_tool_bar_sizes (f))
-	/* It's not entirely clear whether here we want a treatment
-	   similar to that for frames with internal tool bar.  */
-	adjust_frame_size (f, -1, -1, 2, 0, Qtool_bar_lines);
-
-      f->tool_bar_resized = f->tool_bar_redisplayed;
+	adjust_frame_size (f, -1, -1, 2, false, Qtool_bar_lines);
     }
 
+  /* Set this regardless of whether a tool bar was made or not.  It's
+     needed for 'frame-inhibit-implied-resize' to work on GTK.  */
+  f->tool_bar_resized = true;
+
   unblock_input ();
 }
 

commit 07cc8abca75e9c0180e993ad10f162c5218c9e5e
Author: Yuan Fu <casouri@gmail.com>
Date:   Fri Dec 20 00:22:31 2024 -0800

    Add known-to-work version for c/c++-ts-mode
    
    This is done by
    
        (treesit--verify-major-mode-queries
         '(c-ts-mode c++-ts-mode)
         '(c cpp)
         "/tmp/tree-sitter-grammars")
    
    * lisp/progmodes/c-ts-mode.el: Add comments.

diff --git a/lisp/progmodes/c-ts-mode.el b/lisp/progmodes/c-ts-mode.el
index cf1721d66ee..67ccbb8594b 100644
--- a/lisp/progmodes/c-ts-mode.el
+++ b/lisp/progmodes/c-ts-mode.el
@@ -22,6 +22,18 @@
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
+;;; Tree-sitter language versions
+;;
+;; c-ts-mode is known to work with the following languages and version:
+;; - tree-sitter-c: v0.20.8-61-g3efee11
+;;
+;; c++-ts-mode is known to work with the following languages and version:
+;; - tree-sitter-cpp: v0.20.5-49-gf41b4f6
+;;
+;; We try our best to make builtin modes work with latest grammar
+;; versions, so a more recent grammar version has a good chance to work.
+;; Send us a bug report if it doesn't.
+
 ;;; Commentary:
 ;;
 ;; This package provides major modes for C and C++, plus some handy

commit fe06a2baac291b2eceadd12db3623436ab8e2395
Author: Yuan Fu <casouri@gmail.com>
Date:   Thu Dec 19 23:10:32 2024 -0800

    Add automated process to verify tree-sitter queries
    
    This allows us to inform packagers of the grammar version they
    want to use when packaging tree-sitter grammars with Emacs.
    
    * lisp/treesit.el (treesit--builtin-language-sources):
    New variable.
    (treesit--verify-major-mode-queries):
    (treesit-verify-major-mode-queries): New functions.

diff --git a/lisp/treesit.el b/lisp/treesit.el
index 7d09934b3e6..98054a3b1a9 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -3922,6 +3922,9 @@ See `treesit-language-source-alist' for details."
 (defvar treesit--install-language-grammar-out-dir-history nil
   "History for OUT-DIR for `treesit-install-language-grammar'.")
 
+(defvar treesit--install-language-grammar-full-clone nil
+  "If non-nil, do a full clone when cloning git repos.")
+
 ;;;###autoload
 (defun treesit-install-language-grammar (lang &optional out-dir)
   "Build and install the tree-sitter language grammar library for LANG.
@@ -3942,57 +3945,77 @@ executable programs, such as the C/C++ compiler and linker.
 Interactively, prompt for the directory in which to install the
 compiled grammar files.  Non-interactively, use OUT-DIR; if it's
 nil, the grammar is installed to the standard location, the
-\"tree-sitter\" directory under `user-emacs-directory'."
+\"tree-sitter\" directory under `user-emacs-directory'.
+
+Return the git revision of the installed grammar, but it only works when
+`treesit--install-language-grammar-full-clone' is t."
   (interactive (list (intern
                       (completing-read
                        "Language: "
                        (mapcar #'car treesit-language-source-alist)))
                      'interactive))
-  (when-let* ((recipe
-               (or (assoc lang treesit-language-source-alist)
-                   (if (eq out-dir 'interactive)
-                       (treesit--install-language-grammar-build-recipe
-                        lang)
-                     (signal 'treesit-error `("Cannot find recipe for this language" ,lang)))))
-              (default-out-dir
-               (or (car treesit--install-language-grammar-out-dir-history)
-                   (locate-user-emacs-file "tree-sitter")))
-              (out-dir
-               (if (eq out-dir 'interactive)
-                   (read-string
-                    (format "Install to (default: %s): "
-                            default-out-dir)
-                    nil
-                    'treesit--install-language-grammar-out-dir-history
-                    default-out-dir)
-                 ;; When called non-interactively, OUT-DIR should
-                 ;; default to DEFAULT-OUT-DIR.
-                 (or out-dir default-out-dir))))
-    (condition-case err
-        (progn
-          (apply #'treesit--install-language-grammar-1
-                 (cons out-dir recipe))
-
-          ;; Check that the installed language grammar is loadable.
-          (pcase-let ((`(,available . ,err)
-                       (treesit-language-available-p lang t)))
-            (if (not available)
-                (display-warning
-                 'treesit
-                 (format "The installed language grammar for %s cannot be located or has problems (%s): %s"
-                         lang (nth 0 err)
-                         (string-join
-                          (mapcar (lambda (x) (format "%s" x))
-                                  (cdr err))
-                          " ")))
-              ;; If success, Save the recipe for the current session.
-              (setf (alist-get lang treesit-language-source-alist)
-                    (cdr recipe)))))
-      (error
-       (display-warning
-        'treesit
-        (format "Error encountered when installing language grammar: %s"
-                err))))))
+  (let* ((recipe
+          (or (assoc lang treesit-language-source-alist)
+              (if (eq out-dir 'interactive)
+                  (treesit--install-language-grammar-build-recipe
+                   lang)
+                (signal 'treesit-error `("Cannot find recipe for this language" ,lang)))))
+         (default-out-dir
+          (or (car treesit--install-language-grammar-out-dir-history)
+              (locate-user-emacs-file "tree-sitter")))
+         (out-dir
+          (if (eq out-dir 'interactive)
+              (read-string
+               (format "Install to (default: %s): "
+                       default-out-dir)
+               nil
+               'treesit--install-language-grammar-out-dir-history
+               default-out-dir)
+            ;; When called non-interactively, OUT-DIR should
+            ;; default to DEFAULT-OUT-DIR.
+            (or out-dir default-out-dir)))
+         version)
+    (when recipe
+      (condition-case err
+          (progn
+            (setq version (apply #'treesit--install-language-grammar-1
+                                 (cons out-dir recipe)))
+
+            ;; Check that the installed language grammar is loadable.
+            (pcase-let ((`(,available . ,err)
+                         (treesit-language-available-p lang t)))
+              (if (not available)
+                  (display-warning
+                   'treesit
+                   (format "The installed language grammar for %s cannot be located or has problems (%s): %s"
+                           lang (nth 0 err)
+                           (string-join
+                            (mapcar (lambda (x) (format "%s" x))
+                                    (cdr err))
+                            " ")))
+                ;; If success, Save the recipe for the current session.
+                (setf (alist-get lang treesit-language-source-alist)
+                      (cdr recipe)))))
+        (error
+         (display-warning
+          'treesit
+          (format "Error encountered when installing language grammar: %s"
+                  err)))))
+    version))
+
+(defun treesit--language-git-revision ()
+  "Return the Git revision of current directory.
+
+Return the output of \"git describe\". If anything goes wrong, return
+nil."
+  (with-temp-buffer
+    (cond
+     ((eq 0 (call-process "git" nil t nil "describe"))
+      (string-trim (buffer-string)))
+     ((eq 0 (progn (erase-buffer)
+                   (call-process "git" nil t nil "rev-parse" "HEAD")))
+      (string-trim (buffer-string)))
+     (t nil))))
 
 (defun treesit--call-process-signal (&rest args)
   "Run `call-process' with ARGS.
@@ -4016,16 +4039,19 @@ content as signal data, and erase buffer afterwards."
   "Clone repo pointed by URL at commit REVISION to WORKDIR.
 
 REVISION may be nil, in which case the cloned repo will be at its
-default branch."
+default branch.
+
+Use shallow clone by default.  Do a full clone when
+`treesit--install-language-grammar-full-clone' is t."
   (message "Cloning repository")
   ;; git clone xxx --depth 1 --quiet [-b yyy] workdir
-  (if revision
-      (treesit--call-process-signal
-       "git" nil t nil "clone" url "--depth" "1" "--quiet"
-       "-b" revision workdir)
-    (treesit--call-process-signal
-     "git" nil t nil "clone" url "--depth" "1" "--quiet"
-     workdir)))
+  (let ((args (list "git" nil t nil "clone" url "--quiet")))
+    (when (not treesit--install-language-grammar-full-clone)
+      (setq args (append args (list "--depth" "1"))))
+    (when revision
+      (setq args (append args (list "-b" revision))))
+    (setq args (append args (list workdir)))
+    (apply #'treesit--call-process-signal args)))
 
 (defun treesit--install-language-grammar-1
     (out-dir lang url &optional revision source-dir cc c++)
@@ -4038,7 +4064,11 @@ does not exist).
 
 For LANG, URL, REVISION, SOURCE-DIR, GRAMMAR-DIR, CC, C++, see
 `treesit-language-source-alist'.  If anything goes wrong, this
-function signals an error."
+function signals an error.
+
+Return the git revision of the installed grammar.  The revision is
+generated by \"git describe\".  It only works when
+`treesit--install-language-grammar-full-clone' is t."
   (let* ((lang (symbol-name lang))
          (maybe-repo-dir (expand-file-name url))
          (url-is-dir (file-accessible-directory-p maybe-repo-dir))
@@ -4057,7 +4087,8 @@ function signals an error."
                     (signal 'treesit-error '("Emacs cannot figure out the file extension for dynamic libraries for this system, because `dynamic-library-suffixes' is nil"))))
          (out-dir (or (and out-dir (expand-file-name out-dir))
                       (locate-user-emacs-file "tree-sitter")))
-         (lib-name (concat "libtree-sitter-" lang soext)))
+         (lib-name (concat "libtree-sitter-" lang soext))
+         version)
     (unwind-protect
         (with-temp-buffer
           (if url-is-dir
@@ -4068,6 +4099,7 @@ function signals an error."
           ;; header files use relative path (#include "../xxx").
           ;; cd "${sourcedir}"
           (setq default-directory source-dir)
+          (setq version (treesit--language-git-revision))
           (message "Compiling library")
           ;; cc -fPIC -c -I. parser.c
           (treesit--call-process-signal
@@ -4113,7 +4145,8 @@ function signals an error."
       ;; Remove workdir if it's not a repo owned by user and we
       ;; managed to create it in the first place.
       (when (and (not url-is-dir) (file-exists-p workdir))
-        (delete-directory workdir t)))))
+        (delete-directory workdir t)))
+    version))
 
 ;;; Etc
 
@@ -4156,6 +4189,136 @@ function signals an error."
                functions-in-source)
               "\n"))))
 
+(defvar treesit--builtin-language-sources
+  '((c "https://github.com/tree-sitter/tree-sitter-c")
+    (cpp "https://github.com/tree-sitter/tree-sitter-cpp")
+    (cmake "https://github.com/uyha/tree-sitter-cmake")
+    (dockerfile "https://github.com/camdencheek/tree-sitter-dockerfile")
+    (go "https://github.com/tree-sitter/tree-sitter-go")
+    (ruby "https://github.com/tree-sitter/tree-sitter-ruby"))
+  "A list of sources for the builtin modes.
+The source information are in the format of
+`treesit-language-source-alist'.  This is for development only.")
+
+(defun treesit--verify-major-mode-queries (modes langs grammar-dir)
+  "Verify font-lock queries in MODES.
+
+LANGS is a list of languages, it should cover all the languages used by
+MODES.  GRAMMAR-DIR is a temporary direction in which grammars are
+installed.
+
+If the font-lock queries work fine with the latest grammar, insert some
+comments in the source file saying that the modes are known to work with
+that version of grammar.  At the end of the process, show a list of
+queries that has problems with latest grammar."
+  (let ((treesit-extra-load-path (list grammar-dir))
+        (treesit-language-source-alist treesit--builtin-language-sources)
+        (treesit--install-language-grammar-full-clone t)
+        (version-alist nil)
+        (invalid-feature-list nil)
+        (valid-modes nil)
+        (mode-language-alist nil)
+        (file-modes-alist nil))
+    (dolist (lang langs)
+      (let ((ver (treesit-install-language-grammar lang grammar-dir)))
+        (if ver
+            (push (cons lang ver) version-alist)
+          (error "Cannot get version for %s" lang))))
+
+    ;; Validate font-lock queries for each major mode.
+    (dolist (mode modes)
+      (let ((settings
+             (with-temp-buffer
+               (ignore-errors
+                 (funcall mode)
+                 (font-lock-mode -1)
+                 treesit-font-lock-settings)))
+            (all-queries-valid t))
+        (dolist (setting settings)
+          (let* ((query (treesit-font-lock-setting-query setting))
+                 (language (treesit-query-language query))
+                 (feature (treesit-font-lock-setting-feature setting)))
+            ;; Record that MODE uses LANGUAGE.
+            (unless (memq language (alist-get mode mode-language-alist))
+              (push language (alist-get mode mode-language-alist)))
+            ;; Validate query.
+            (when (not (ignore-errors
+                         (treesit-query-compile language query t)
+                         t))
+              (push (list mode language feature) invalid-feature-list)
+              (setq all-queries-valid nil))))
+        (when all-queries-valid
+          (push mode valid-modes))))
+
+    ;; Group modes by their source file.
+    (dolist (mode valid-modes)
+      (let ((source-file (replace-regexp-in-string
+                          (rx ".elc" eos)
+                          ".el"
+                          (car (get mode 'function-history)))))
+        (unless (member mode (alist-get source-file file-modes-alist
+                                        nil nil #'equal))
+          (push mode (alist-get source-file file-modes-alist
+                                nil nil #'equal)))))
+
+    ;; Update the "known-to-work" version comment for the modes.
+    (pcase-dolist (`(,source-file . ,modes) file-modes-alist)
+      (let (beg)
+        (with-temp-buffer
+          (insert-file-contents source-file)
+          (goto-char (point-min))
+          (when (not (search-forward
+                      ";;; Tree-sitter language versions\n" nil t))
+            (re-search-forward (rx (or ";;; Commentary:" ";;; Code:")))
+            (forward-line -1)
+            (insert "\n;;; Tree-sitter language versions\n\n")
+            (forward-line -1))
+          (setq beg (point))
+          (search-forward "\n\n")
+          (delete-region beg (point))
+          (insert ";;\n")
+          (dolist (mode modes)
+            (insert (format ";; %s is known to work with the following languages and version:\n" mode))
+            (dolist (lang (alist-get mode mode-language-alist))
+              (insert (format ";; - tree-sitter-%s: %s\n" lang (alist-get lang version-alist))))
+            (insert ";;\n"))
+          (insert
+           ";; We try our best to make builtin modes work with latest grammar
+;; versions, so a more recent grammar version has a good chance to work.
+;; Send us a bug report if it doesn't.")
+          (insert "\n\n")
+          (write-file source-file))))
+
+    (pop-to-buffer (get-buffer-create "*verify major mode queries*"))
+    (let ((inhibit-read-only t))
+      (erase-buffer)
+      (insert "Verified grammar and versions:\n")
+      (pcase-dolist (`(,lang . ,version) version-alist)
+        (insert (format "- %s: %s\n" lang version)))
+      (insert "\n")
+      (if (null invalid-feature-list)
+          (insert "All the queries are valid with latest grammar.\n")
+        (insert "The following modes has invalid queries:\n")
+        (dolist (entry invalid-feature-list)
+          (insert (format "mode: %s language: %s feature: %s"
+                          (nth 0 entry)
+                          (nth 1 entry)
+                          (nth 2 entry)))))
+      (special-mode))))
+
+(defun treesit-verify-major-mode-queries ()
+  "Varify font-lock queries in builtin major modes.
+
+If the font-lock queries work fine with the latest grammar, insert some
+comments in the source file saying that the modes are known to work with
+that version of grammar.  At the end of the process, show a list of
+queries that has problems with latest grammar."
+  (interactive)
+  (treesit--verify-major-mode-queries
+   '(cmake-ts-mode dockerfile-ts-mode go-ts-mode ruby-ts-mode)
+   '(cmake dockerfile go ruby)
+   "/tmp/tree-sitter-grammars"))
+
 ;;; Shortdocs
 
 (defun treesit--generate-shortdoc-examples ()

commit 05ab13ebc7237bcf23bc84a6a345d0b563404c2d
Author: Yuan Fu <casouri@gmail.com>
Date:   Thu Dec 19 19:02:59 2024 -0800

    Add keyword :reversed to treesit-font-lock-rules
    
    This keyword will be useful for implementing
    string-interpolation feature.
    
    * doc/lispref/modes.texi (Parser-based Font Lock): Document the
    new keyword.
    * lisp/treesit.el (treesit-font-lock-settings): Document.
    (treesit-font-lock-setting-reversed): New function.
    (treesit-font-lock-rules): Add new keyword.
    (treesit-font-lock-recompute-features): Handle new keyword.

diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index 2631769c51d..73edb688c85 100644
--- a/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@ -4378,6 +4378,8 @@ Other keywords are optional:
 @item @tab @code{append} @tab Append the new face to existing ones
 @item @tab @code{prepend} @tab Prepend the new face to existing ones
 @item @tab @code{keep} @tab Fill-in regions without an existing face
+@item @code{:reversed} @tab @code{t}
+@tab Enable @var{query} when @var{feature} is not in the feature list.
 @item @code{:default-language} @tab @var{language}
 @tab Every @var{query} after this keyword will use @var{language}
 by default.
@@ -4461,6 +4463,7 @@ For this variable to take effect, a Lisp program should call
 @findex treesit-font-lock-setting-feature
 @findex treesit-font-lock-setting-enable
 @findex treesit-font-lock-setting-override
+@findex treesit-font-lock-setting-reversed
 @defvar treesit-font-lock-settings
 A list of settings for tree-sitter based font lock.  The exact format of
 each individual setting is considered internal.  One should always use
@@ -4471,7 +4474,8 @@ the setting's query, feature, enable flag and override flag:
 @code{treesit-font-lock-setting-query},
 @code{treesit-font-lock-setting-feature},
 @code{treesit-font-lock-setting-enable},
-@code{treesit-font-lock-setting-override}.
+@code{treesit-font-lock-setting-override},
+@code{treesit-font-lock-setting-reversed}.
 
 @c Because the format is internal, we don't document them here.  Though
 @c we do have it explained in the docstring.  We also expose the fact
diff --git a/lisp/treesit.el b/lisp/treesit.el
index 9db3d57b6e9..7d09934b3e6 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -866,7 +866,7 @@ debugging:
 
 Currently each SETTING has the form:
 
-    (QUERY ENABLE FEATURE OVERRIDE)
+    (QUERY ENABLE FEATURE OVERRIDE REVERSE)
 
 QUERY must be a compiled query.  See Info node `(elisp)Pattern
 Matching' for how to write a query and compile it.
@@ -880,7 +880,10 @@ which features are enabled with `treesit-font-lock-level' and
 
 OVERRIDE is the override flag for this query.  Its value can be
 t, nil, append, prepend, keep.  See more in
-`treesit-font-lock-rules'.")
+`treesit-font-lock-rules'.
+
+If REVERSED is t, enable the QUERY when FEATURE is not in the feature
+list.")
 
 ;; Follow cl-defstruct naming conventions, in case we use cl-defstruct
 ;; in the future.
@@ -900,6 +903,10 @@ t, nil, append, prepend, keep.  See more in
   "Return the OVERRIDE flag of SETTING in `treesit-font-lock-settings'."
   (nth 3 setting))
 
+(defsubst treesit-font-lock-setting-reversed (setting)
+  "Return the REVERSED flag of SETTING in `treesit-font-lock-settings'."
+  (nth 4 setting))
+
 (defsubst treesit--font-lock-setting-clone-enable (setting)
   "Return enabled SETTING."
   (let ((new-setting (copy-tree setting)))
@@ -1030,6 +1037,8 @@ Other keywords include:
              `append'   Append the new face to existing ones.
              `prepend'  Prepend the new face to existing ones.
              `keep'     Fill-in regions without an existing face.
+  :reversed  t          Enable the query only if the feature is
+                        NOT in feature list.
   :default-language  LANGUAGE  Every QUERY after this keyword
                                will use LANGUAGE by default.
 
@@ -1064,6 +1073,7 @@ name, it is ignored."
           ;; DEFAULT-LANGUAGE will be chosen when current-language is
           ;; not set.
           default-language
+          current-reversed
           ;; The list this function returns.
           (result nil))
       (while query-specs
@@ -1102,6 +1112,13 @@ name, it is ignored."
                          `("Value of :feature should be a symbol"
                            ,var)))
                (setq current-feature var)))
+            (:reversed
+             (let ((var (pop query-specs)))
+               (when (not (memq var '(t nil)))
+                 (signal 'treesit-font-lock-error
+                         `("Value of :reversed can only be t or nil"
+                           ,var)))
+               (setq current-reversed var)))
             ;; (2) Process query.
             ((pred treesit-query-p)
              (let ((lang (or default-language current-language)))
@@ -1116,12 +1133,14 @@ name, it is ignored."
                  (push `(,(treesit-query-compile lang token)
                          t
                          ,current-feature
-                         ,current-override)
+                         ,current-override
+                         ,current-reversed)
                        result))
                ;; Clears any configurations set for this query.
                (setq current-language nil
                      current-override nil
-                     current-feature nil)))
+                     current-feature nil
+                     current-reversed nil)))
             (_ (signal 'treesit-font-lock-error
                        `("Unexpected value" ,token))))))
       (nreverse result))))
@@ -1190,9 +1209,11 @@ and leave settings for other languages unchanged."
          (additive (or add-list remove-list)))
     (cl-loop for idx = 0 then (1+ idx)
              for setting in treesit-font-lock-settings
-             for lang = (treesit-query-language (nth 0 setting))
-             for feature = (nth 2 setting)
-             for current-value = (nth 1 setting)
+             for lang = (treesit-query-language
+                         (treesit-font-lock-setting-query setting))
+             for feature = (treesit-font-lock-setting-feature setting)
+             for current-value = (treesit-font-lock-setting-enable setting)
+             for reversed = (treesit-font-lock-setting-reversed setting)
              ;; Set the ENABLE flag for the setting if its language is
              ;; relevant.
              if (or (null language)
@@ -1200,7 +1221,9 @@ and leave settings for other languages unchanged."
              do (setf (nth 1 (nth idx treesit-font-lock-settings))
                       (cond
                        ((not additive)
-                        (if (memq feature features) t nil))
+                        (if (not reversed)
+                            (if (memq feature features) t nil)
+                          (if (memq feature features) nil t)))
                        ((memq feature add-list) t)
                        ((memq feature remove-list) nil)
                        (t current-value))))))

commit 926a9c864adc29f056644f5e23cf59fb90e2613c
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Fri Dec 20 09:38:50 2024 +0200

    Fix the MS-Windows build broken by recent changes
    
    * src/w32font.c (memq_no_quit):
    * src/w32uniscribe.c (memq_no_quit): Remove; use the function from
    fns.c instead.  All callers changed.

diff --git a/src/w32font.c b/src/w32font.c
index 2e6f8bed3e7..d0e837520c9 100644
--- a/src/w32font.c
+++ b/src/w32font.c
@@ -229,14 +229,6 @@ get_char_width_32_w (HDC hdc, UINT uFirstChar, UINT uLastChar, LPINT lpBuffer)
 
 #endif	/* Cygwin */
 
-static int
-memq_no_quit (Lisp_Object elt, Lisp_Object list)
-{
-  while (CONSP (list) && ! EQ (XCAR (list), elt))
-    list = XCDR (list);
-  return (CONSP (list));
-}
-
 Lisp_Object
 intern_font_name (char * string)
 {
@@ -398,7 +390,7 @@ w32font_has_char (Lisp_Object entity, int c)
      certain until we open it.  Also if the font claims support for the script
      the character is from, it may only have partial coverage, so we still
      can't be certain until we open the font.  */
-  if (NILP (script) || memq_no_quit (script, supported_scripts))
+  if (NILP (script) || !NILP (memq_no_quit (script, supported_scripts)))
     return -1;
 
   /* Font reports what scripts it supports, and none of them are the script
@@ -1192,7 +1184,7 @@ add_font_name_to_list (ENUMLOGFONTEX *logical_font,
     return 1;
 
   family = intern_font_name (logical_font->elfLogFont.lfFaceName);
-  if (! memq_no_quit (family, *list))
+  if (NILP (memq_no_quit (family, *list)))
     *list = Fcons (family, *list);
 
   return 1;
@@ -1416,7 +1408,7 @@ font_matches_spec (DWORD type, NEWTEXTMETRICEX *font,
                 {
                   Lisp_Object support
                     = font_supported_scripts (&font->ntmFontSig);
-                  if (! memq_no_quit (val, support))
+                  if (NILP (memq_no_quit (val, support)))
                     return 0;
 
 		  /* Avoid using non-Japanese fonts for Japanese, even
@@ -1681,9 +1673,9 @@ add_font_entity_to_list (ENUMLOGFONTEX *logical_font,
 			      match_data->orig_font_spec, backend,
 			      &logical_font->elfLogFont)
 	   || (!NILP (match_data->known_fonts)
-	       && memq_no_quit
-	            (intern_font_name (logical_font->elfLogFont.lfFaceName),
-		     match_data->known_fonts)))
+	       && !NILP (memq_no_quit
+			   (intern_font_name (logical_font->elfLogFont.lfFaceName),
+			    match_data->known_fonts))))
       || !w32font_coverage_ok (&physical_font->ntmFontSig,
 			       match_data->pattern.lfCharSet))
     return 1;
diff --git a/src/w32uniscribe.c b/src/w32uniscribe.c
index 66d27b81b9e..d8feeef277e 100644
--- a/src/w32uniscribe.c
+++ b/src/w32uniscribe.c
@@ -88,14 +88,6 @@ DEF_DLL_FN (void, hb_ot_font_set_funcs, (hb_font_t *));
 /* Used by uniscribe_otf_capability.  */
 static Lisp_Object otf_features (HDC context, const char *table);
 
-static int
-memq_no_quit (Lisp_Object elt, Lisp_Object list)
-{
-  while (CONSP (list) && ! EQ (XCAR (list), elt))
-    list = XCDR (list);
-  return (CONSP (list));
-}
-
 
 /* Uniscribe function pointers.  */
 static HRESULT (WINAPI * pfnScriptItemize) (const WCHAR *,
@@ -766,7 +758,7 @@ add_opentype_font_name_to_list (ENUMLOGFONTEX *logical_font,
     return 1;
 
   family = intern_font_name (logical_font->elfLogFont.lfFaceName);
-  if (! memq_no_quit (family, *list))
+  if (NILP (memq_no_quit (family, *list)))
     *list = Fcons (family, *list);
 
   return 1;

commit 82c3fcd17e3eb3756bd3533c39d89c21ec7fdce5
Author: Gerd Möllmann <gerd@gnu.org>
Date:   Fri Dec 20 07:03:59 2024 +0100

    Allow xt-mouse-tests to run
    
    This is basically a workaround for running a test in batch mode
    which should have a tty frame available but doesn't.
    
    * src/frame.c (check_tty): Relax check if noninteractive.
    * lisp/xt-mouse.el (xterm-mouse-event): Don't use frame-at if
    noninteractive.

diff --git a/lisp/xt-mouse.el b/lisp/xt-mouse.el
index 4f1ac4f2b16..2ba60ded899 100644
--- a/lisp/xt-mouse.el
+++ b/lisp/xt-mouse.el
@@ -295,7 +295,10 @@ which is the \"1006\" extension implemented in Xterm >= 277."
 			    (progn (setq xt-mouse-epoch (float-time)) 0)
 			  (car (time-convert (time-since xt-mouse-epoch)
 					     1000))))
-             (frame (frame-at x y))
+             ;; FIXME: The test for running in batch mode is here solely
+             ;; for the sake of xt-mouse-tests where the only frame is
+             ;; the initial frame.
+             (frame (unless noninteractive (frame-at x y)))
              ;;(_ (message (format "*** %S" frame)))
              (frame-pos (frame-position frame))
              ;;(_ (message (format "*** %S" frame-pos)))
diff --git a/src/frame.c b/src/frame.c
index 18e1078efe4..431b04fc34e 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -152,6 +152,13 @@ check_window_system (struct frame *f)
 void
 check_tty (struct frame *f)
 {
+  /* FIXME: the noninteractive case is here because some tests running
+     in batch mode, like xt-mouse-tests, test with the initial frame
+     which is no tty frame.  It would be nicer if the test harness
+     would allow testing with real tty frames.  */
+  if (f && noninteractive)
+    return;
+
   if (!f || !FRAME_TERMCAP_P (f))
     error ("tty frame should be used");
 }

commit 42ab0f162cb37eeddae53675fba310b8a22ff934
Author: Gerd Möllmann <gerd@gnu.org>
Date:   Fri Dec 20 06:11:18 2024 +0100

    Fix tty root frame collection in redisplay_internal
    
    * src/fns.c (memq_no_quit): New function.
    * src/lisp.h: Declare it.
    * src/xdisp.c (redisplay_internal): Use memq_no_quit instead of
    assq_no_quit.

diff --git a/src/fns.c b/src/fns.c
index ef6922c137b..0ad27dbc256 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -1924,6 +1924,15 @@ The value is actually the tail of LIST whose car is ELT.  */)
   return Qnil;
 }
 
+Lisp_Object
+memq_no_quit (Lisp_Object elt, Lisp_Object list)
+{
+  for (; CONSP (list); list = XCDR (list))
+    if (EQ (XCAR (list), elt))
+      return list;
+  return Qnil;
+}
+
 DEFUN ("memql", Fmemql, Smemql, 2, 2, 0,
        doc: /* Return non-nil if ELT is an element of LIST.  Comparison done with `eql'.
 The value is actually the tail of LIST whose car is ELT.  */)
diff --git a/src/lisp.h b/src/lisp.h
index 832a1755c04..bf6b023fc2a 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -4340,6 +4340,7 @@ extern Lisp_Object plist_put (Lisp_Object plist, Lisp_Object prop,
 extern Lisp_Object plist_member (Lisp_Object plist, Lisp_Object prop);
 extern void syms_of_fns (void);
 extern void mark_fns (void);
+Lisp_Object memq_no_quit (Lisp_Object elt, Lisp_Object list);
 
 /* Defined in sort.c  */
 extern void tim_sort (Lisp_Object, Lisp_Object, Lisp_Object *, const ptrdiff_t,
diff --git a/src/xdisp.c b/src/xdisp.c
index 91db3a87aae..ceb727d1135 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -17455,7 +17455,7 @@ redisplay_internal (void)
 
 	      /* Remember tty root frames which we've seen.  */
 	      if (!FRAME_PARENT_FRAME (f)
-		  && NILP (assq_no_quit (frame, tty_root_frames)))
+		  && NILP (memq_no_quit (frame, tty_root_frames)))
 		tty_root_frames = Fcons (frame, tty_root_frames);
 	    }
 

commit 3cb86eb0385b8d5edba3dea495bc086c009614b7
Author: Po Lu <luangruo@yahoo.com>
Date:   Fri Dec 20 11:22:22 2024 +0800

    Enable adjusting frame sizes on MS-DOS
    
    * src/dispnew.c (change_frame_size): Do not propagate changes to
    child frames to root frames and vice versa.
    
    * src/frame.c (adjust_frame_size): Do not change video modes
    in resizing a child frame.

diff --git a/src/dispnew.c b/src/dispnew.c
index 180bc173f31..c252781b235 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -6618,13 +6618,14 @@ change_frame_size (struct frame *f, int new_width, int new_height,
 {
   Lisp_Object tail, frame;
 
-  if (FRAME_MSDOS_P (f))
+  if (FRAME_MSDOS_P (f) && !FRAME_PARENT_FRAME (f))
     {
       /* On MS-DOS, all frames use the same screen, so a change in
          size affects all frames.  Termcap now supports multiple
          ttys. */
       FOR_EACH_FRAME (tail, frame)
-	if (!FRAME_WINDOW_P (XFRAME (frame)))
+	if (!FRAME_WINDOW_P (XFRAME (frame))
+	    && !FRAME_PARENT_FRAME (XFRAME (frame)))
 	  change_frame_size_1 (XFRAME (frame), new_width, new_height,
 			       pretend, delay, safe);
     }
diff --git a/src/frame.c b/src/frame.c
index 250e7e53dd4..18e1078efe4 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -837,14 +837,18 @@ adjust_frame_size (struct frame *f, int new_text_width, int new_text_height,
   block_input ();
 
 #ifdef MSDOS
-  /* We only can set screen dimensions to certain values supported by
-     our video hardware.  Try to find the smallest size greater or
-     equal to the requested dimensions, while accounting for the fact
-     that the menu-bar lines are not counted in the frame height.  */
-  int dos_new_text_lines = new_text_lines + FRAME_TOP_MARGIN (f);
-
-  dos_set_window_size (&dos_new_text_lines, &new_text_cols);
-  new_text_lines = dos_new_text_lines - FRAME_TOP_MARGIN (f);
+  if (!FRAME_PARENT_FRAME (f))
+    {
+      /* We only can set screen dimensions to certain values supported
+	 by our video hardware.  Try to find the smallest size greater
+	 or equal to the requested dimensions, while accounting for the
+	 fact that the menu-bar lines are not counted in the frame
+	 height.  */
+      int dos_new_text_lines = new_text_lines + FRAME_TOP_MARGIN (f);
+
+      dos_set_window_size (&dos_new_text_lines, &new_text_cols);
+      new_text_lines = dos_new_text_lines - FRAME_TOP_MARGIN (f);
+    }
 #endif
 
   if (new_inner_width != old_inner_width)

commit cc5afea98e8efb1a04baedf98e66863d31974ae6
Author: Po Lu <luangruo@yahoo.com>
Date:   Fri Dec 20 11:12:22 2024 +0800

    Enable TTY child frames on MS-DOS
    
    * src/conf_post.h (ENOTSUP): Define to ENOSYS as msdos.h once
    did.
    (IFTODT): Copy definition from Gnulib.
    
    * src/dispnew.c (is_tty_frame): Also test FRAME_MSDOS_P.
    
    * src/frame.c (tty_child_pos_param, tty_child_size_param):
    Export functions.
    
    * src/msdos.c (mouse_get_xy, mouse_moveto, mouse_pressed):
    Offset mouse positions by those of the selected frame.
    (it_face_override): New function.
    (IT_set_face): New argument F.  Load FACE_ID from its face
    cache.
    (IT_write_glyphs): Track the frames on which glyphs were
    generated and apply faces from their individual face caches.
    (IT_write_glyphs_with_face): New function.
    (tty_draw_row_with_mouse_face): Reimplement in line with tty.c
    and eliminate an obsolete optimization.
    (IT_clear_end_of_line, IT_clear_screen): Load faces from the
    cache of the provided frame.
    (IT_set_frame_parameters): Adjust frame geometry and garbage
    frames after geometry parameters change as a child frame.
    (BUILD_CHAR_GLYPH): Accept new parameter F.
    (IT_menu_display): Offset cursor positions by those of the
    selected frame.
    
    * src/msdos.h (ENOTSUP): Move to conf_post.h for Gnulib.
    
    * src/xdisp.c (redisplay_internal): Redisplay MSDOS frames
    unconditionally as with terminal frames.

diff --git a/src/conf_post.h b/src/conf_post.h
index e68d5a56d9b..9d3f5711bef 100644
--- a/src/conf_post.h
+++ b/src/conf_post.h
@@ -480,5 +480,10 @@ extern int emacs_setenv_TZ (char const *);
 /* These are required by file-has-acl.c but defined in dirent.h and
    errno.h, which are not generated on DOS.  */
 #define _GL_DT_NOTDIR 0x100   /* Not a directory */
-#define ENOTSUP 2007
+#define ENOTSUP ENOSYS
+# define IFTODT(mode) \
+   (S_ISREG (mode) ? DT_REG : S_ISDIR (mode) ? DT_DIR \
+    : S_ISLNK (mode) ? DT_LNK : S_ISBLK (mode) ? DT_BLK \
+    : S_ISCHR (mode) ? DT_CHR : S_ISFIFO (mode) ? DT_FIFO \
+    : S_ISSOCK (mode) ? DT_SOCK : DT_UNKNOWN)
 #endif /* MSDOS */
diff --git a/src/dispnew.c b/src/dispnew.c
index 2e95016b5f3..180bc173f31 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -3468,7 +3468,7 @@ tty_raise_lower_frame (struct frame *f, bool raise)
 bool
 is_tty_frame (struct frame *f)
 {
-  return FRAME_TERMCAP_P (f);
+  return FRAME_TERMCAP_P (f) || FRAME_MSDOS_P (f);
 }
 
 /* Return true if frame F is a tty child frame.  */
diff --git a/src/frame.c b/src/frame.c
index 5518201fca7..250e7e53dd4 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -1390,7 +1390,7 @@ get_future_frame_param (Lisp_Object parameter,
 
 #endif
 
-static int
+int
 tty_child_pos_param (struct frame *child, Lisp_Object key,
 		     Lisp_Object params, int dflt)
 {
@@ -1404,7 +1404,7 @@ tty_child_pos_param (struct frame *child, Lisp_Object key,
   return dflt;
 }
 
-static int
+int
 tty_child_size_param (struct frame *child, Lisp_Object key,
 		      Lisp_Object params, int dflt)
 {
diff --git a/src/frame.h b/src/frame.h
index cb03d5550bb..9ed2f66be22 100644
--- a/src/frame.h
+++ b/src/frame.h
@@ -1490,6 +1490,10 @@ extern struct frame *decode_live_frame (Lisp_Object);
 extern struct frame *decode_any_frame (Lisp_Object);
 extern struct frame *make_initial_frame (void);
 extern struct frame *make_frame (bool);
+extern int tty_child_pos_param (struct frame *, Lisp_Object,
+				Lisp_Object, int);
+extern int tty_child_size_param (struct frame *, Lisp_Object,
+				 Lisp_Object, int);
 #ifdef HAVE_WINDOW_SYSTEM
 extern bool display_available (void);
 #endif
diff --git a/src/msdos.c b/src/msdos.c
index 42eee89d748..78f53d5511c 100644
--- a/src/msdos.c
+++ b/src/msdos.c
@@ -237,11 +237,12 @@ static void
 mouse_get_xy (int *x, int *y)
 {
   union REGS regs;
+  struct frame *f = SELECTED_FRAME ();
 
   regs.x.ax = 0x0003;
   int86 (0x33, &regs, &regs);
-  *x = regs.x.cx / 8;
-  *y = regs.x.dx / 8;
+  *x = (regs.x.cx / 8) - f->left_pos;
+  *y = (regs.x.dx / 8) - f->top_pos;
 }
 
 void
@@ -249,12 +250,15 @@ mouse_moveto (int x, int y)
 {
   union REGS regs;
   struct tty_display_info *tty = CURTTY ();
+  struct frame *f = SELECTED_FRAME ();
 
   if (tty->termscript)
     fprintf (tty->termscript, "<M_XY=%dx%d>", x, y);
   regs.x.ax = 0x0004;
   mouse_last_x = regs.x.cx = x * 8;
   mouse_last_y = regs.x.dx = y * 8;
+  regs.x.cx += f->left_pos * 8;
+  regs.x.dx += f->top_pos * 8;
   int86 (0x33, &regs, &regs);
 }
 
@@ -262,6 +266,7 @@ static int
 mouse_pressed (int b, int *xp, int *yp)
 {
   union REGS regs;
+  struct frame *f = SELECTED_FRAME ();
 
   if (b >= mouse_button_count)
     return 0;
@@ -269,7 +274,10 @@ mouse_pressed (int b, int *xp, int *yp)
   regs.x.bx = mouse_button_translate[b];
   int86 (0x33, &regs, &regs);
   if (regs.x.bx)
-    *xp = regs.x.cx / 8, *yp = regs.x.dx / 8;
+    {
+      *xp = regs.x.cx / 8 - f->left_pos;
+      *yp = regs.x.dx / 8 - f->top_pos;
+    }
   return (regs.x.bx != 0);
 }
 
@@ -789,19 +797,23 @@ IT_ring_bell (struct frame *f)
     }
 }
 
+/* If otherwise than -1, a face ID that will override the FACE argument
+   to IT_set_face.  */
+static int it_face_override = -1;
+
 /* Given a face id FACE, extract the face parameters to be used for
    display until the face changes.  The face parameters (actually, its
    color) are used to construct the video attribute byte for each
    glyph during the construction of the buffer that is then blitted to
    the video RAM.  */
 static void
-IT_set_face (int face)
+IT_set_face (struct frame *f, int face_id)
 {
-  struct frame *sf = SELECTED_FRAME ();
-  struct face *fp  = FACE_FROM_ID_OR_NULL (sf, face);
-  struct face *dfp = FACE_FROM_ID_OR_NULL (sf, DEFAULT_FACE_ID);
+  int face = (it_face_override == -1 ? face_id : it_face_override);
+  struct face *fp  = FACE_FROM_ID_OR_NULL (f, face);
+  struct face *dfp = FACE_FROM_ID_OR_NULL (f, DEFAULT_FACE_ID);
   unsigned long fg, bg, dflt_fg, dflt_bg;
-  struct tty_display_info *tty = FRAME_TTY (sf);
+  struct tty_display_info *tty = FRAME_TTY (f);
 
   if (!fp)
     {
@@ -822,13 +834,13 @@ IT_set_face (int face)
      16 colors to be available for the background, since Emacs switches
      on this mode (and loses the blinking attribute) at startup.  */
   if (fg == FACE_TTY_DEFAULT_COLOR || fg == FACE_TTY_DEFAULT_FG_COLOR)
-    fg = FRAME_FOREGROUND_PIXEL (sf);
+    fg = FRAME_FOREGROUND_PIXEL (f);
   else if (fg == FACE_TTY_DEFAULT_BG_COLOR)
-    fg = FRAME_BACKGROUND_PIXEL (sf);
+    fg = FRAME_BACKGROUND_PIXEL (f);
   if (bg == FACE_TTY_DEFAULT_COLOR || bg == FACE_TTY_DEFAULT_BG_COLOR)
-    bg = FRAME_BACKGROUND_PIXEL (sf);
+    bg = FRAME_BACKGROUND_PIXEL (f);
   else if (bg == FACE_TTY_DEFAULT_FG_COLOR)
-    bg = FRAME_FOREGROUND_PIXEL (sf);
+    bg = FRAME_FOREGROUND_PIXEL (f);
 
   /* Make sure highlighted lines really stand out, come what may.  */
   if (fp->tty_reverse_p && (fg == dflt_fg && bg == dflt_bg))
@@ -876,8 +888,8 @@ IT_write_glyphs (struct frame *f, struct glyph *str, int str_len)
   int offset = 2 * (new_pos_X + screen_size_X * new_pos_Y);
   register int sl = str_len;
   struct tty_display_info *tty = FRAME_TTY (f);
-  struct frame *sf;
   unsigned char *conversion_buffer;
+  struct frame *cf_frame = f;
 
   /* If terminal_coding does any conversion, use it, otherwise use
      safe_terminal_coding.  We can't use CODING_REQUIRE_ENCODING here
@@ -889,14 +901,12 @@ IT_write_glyphs (struct frame *f, struct glyph *str, int str_len)
 
   if (str_len <= 0) return;
 
-  sf = SELECTED_FRAME ();
-
   /* Since faces get cached and uncached behind our back, we can't
      rely on their indices in the cache being consistent across
      invocations.  So always reset the screen face to the default
      face of the frame, before writing glyphs, and let the glyphs
      set the right face if it's different from the default.  */
-  IT_set_face (DEFAULT_FACE_ID);
+  IT_set_face (f, DEFAULT_FACE_ID);
 
   /* The mode bit CODING_MODE_LAST_BLOCK should be set to 1 only at
      the tail.  */
@@ -910,8 +920,10 @@ IT_write_glyphs (struct frame *f, struct glyph *str, int str_len)
       /* If the face of this glyph is different from the current
 	 screen face, update the screen attribute byte.  */
       cf = str->face_id;
-      if (cf != screen_face)
-	IT_set_face (cf);	/* handles invalid faces gracefully */
+      if ((cf != screen_face && cf != it_face_override)
+	  || cf_frame != str->frame)
+	IT_set_face (str->frame, cf);	/* handles invalid faces gracefully */
+      cf_frame = str->frame;
 
       /* Identify a run of glyphs with the same face.  */
       for (n = 1; n < sl; ++n)
@@ -964,6 +976,18 @@ popup_activated (void)
   return mouse_preempted;
 }
 
+/* Write a string of glyphs STRING of length LEN to F, disregarding
+   their invidiual faces in favor of FACE.  */
+
+static void
+IT_write_glyphs_with_face (struct frame *f, struct glyph *string,
+			   int len, int face_id)
+{
+  it_face_override = face_id;
+  IT_write_glyphs (f, string, len);
+  it_face_override = -1;
+}
+
 /* Draw TEXT_AREA glyphs between START and END of glyph row ROW on
    window W.  X is relative to TEXT_AREA in W.  HL is a face override
    for drawing the glyphs.  */
@@ -975,70 +999,38 @@ tty_draw_row_with_mouse_face (struct window *w, struct glyph_row *row,
   struct frame *f = XFRAME (WINDOW_FRAME (w));
   struct tty_display_info *tty = FRAME_TTY (f);
   Mouse_HLInfo *hlinfo = &tty->mouse_highlight;
+  int nglyphs = end_hpos - start_hpos;
+  int pos_y, pos_x, save_y, save_x;
 
-  if (hl == DRAW_MOUSE_FACE)
-    {
-      int vpos = row->y + WINDOW_TOP_EDGE_Y (w);
-      int kstart = (start_hpos + WINDOW_LEFT_EDGE_X (w)
-		    + row->used[LEFT_MARGIN_AREA]);
-      int nglyphs = end_hpos - start_hpos;
-      int offset = ScreenPrimary + 2*(vpos*screen_size_X + kstart) + 1;
-      int start_offset = offset;
+  if (end_hpos >= row->used[TEXT_AREA])
+    nglyphs = row->used[TEXT_AREA] - start_hpos;
+  pos_y = row->y + WINDOW_TOP_EDGE_Y (w);
+  pos_x = (row->used[LEFT_MARGIN_AREA] + start_hpos
+	   + WINDOW_LEFT_EDGE_X (w));
 
-      if (end_hpos >= row->used[TEXT_AREA])
-	nglyphs = row->used[TEXT_AREA] - start_hpos;
+  /* Save current cursor position.  */
+  save_x = f->left_pos + new_pos_X;
+  save_y = f->top_pos + new_pos_Y;
 
-      if (tty->termscript)
-	fprintf (tty->termscript, "\n<MH+ %d-%d:%d>",
-		 kstart, kstart + nglyphs - 1, vpos);
+  /* This applies child frame offsets.  */
+  cursor_to (f, pos_y, pos_x);
+  mouse_off ();
 
-      mouse_off ();
-      IT_set_face (hlinfo->mouse_face_face_id);
-      /* Since we are going to change only the _colors_ of already
-	 displayed text, there's no need to go through all the pain of
-	 generating and encoding the text from the glyphs.  Instead,
-	 we simply poke the attribute byte of each affected position
-	 in video memory with the colors computed by IT_set_face!  */
-      _farsetsel (_dos_ds);
-      while (nglyphs--)
-	{
-	  _farnspokeb (offset, ScreenAttrib);
-	  offset += 2;
-	}
-      if (screen_virtual_segment)
-	dosv_refresh_virtual_screen (start_offset, end_hpos - start_hpos);
-      mouse_on ();
-    }
-  else if (hl == DRAW_NORMAL_TEXT)
-    {
-      /* We are removing a previously-drawn mouse highlight.  The
-	 safest way to do so is to redraw the glyphs anew, since all
-	 kinds of faces and display tables could have changed behind
-	 our back.  */
-      int nglyphs = end_hpos - start_hpos;
-      int save_x = new_pos_X, save_y = new_pos_Y;
-
-      if (end_hpos >= row->used[TEXT_AREA])
-	nglyphs = row->used[TEXT_AREA] - start_hpos;
-
-      /* IT_write_glyphs writes at cursor position, so we need to
-	 temporarily move cursor coordinates to the beginning of
-	 the highlight region.  */
-      new_pos_X = start_hpos + WINDOW_LEFT_EDGE_X (w);
-      /* The coordinates supplied by the caller are relative to the
-	 text area, not the window itself.  */
-      new_pos_X += row->used[LEFT_MARGIN_AREA];
-      new_pos_Y = row->y + WINDOW_TOP_EDGE_Y (w);
+  /* Write the glyphs and restore cursor position.  */
 
-      if (tty->termscript)
-	fprintf (tty->termscript, "<MH- %d-%d:%d>",
-		 new_pos_X, new_pos_X + nglyphs - 1, new_pos_Y);
-      IT_write_glyphs (f, row->glyphs[TEXT_AREA] + start_hpos, nglyphs);
-      if (tty->termscript)
-	fputs ("\n", tty->termscript);
-      new_pos_X = save_x;
-      new_pos_Y = save_y;
+  if (hl == DRAW_MOUSE_FACE)
+    {
+      struct glyph *glyph = row->glyphs[TEXT_AREA] + start_hpos;
+      int face_id = tty->mouse_highlight.mouse_face_face_id;
+      IT_write_glyphs_with_face (f, glyph, nglyphs, face_id);
     }
+  else
+    IT_write_glyphs (f, row->glyphs[TEXT_AREA] + start_hpos,
+		     nglyphs);
+
+  mouse_on ();
+  new_pos_X = save_x;
+  new_pos_Y = save_y;
 }
 
 static void
@@ -1051,7 +1043,7 @@ IT_clear_end_of_line (struct frame *f, int first_unused)
   if (new_pos_X >= first_unused || fatal_error_in_progress)
     return;
 
-  IT_set_face (0);
+  IT_set_face (f, 0);
   i = (j = first_unused - new_pos_X) * 2;
   if (tty->termscript)
     fprintf (tty->termscript, "<CLR:EOL[%d..%d)>", new_pos_X, first_unused);
@@ -1086,10 +1078,10 @@ IT_clear_screen (struct frame *f)
      any valid faces and will abort.  Instead, use the initial screen
      colors; that should mimic what a Unix tty does, which simply clears
      the screen with whatever default colors are in use.  */
-  if (FACE_FROM_ID_OR_NULL (SELECTED_FRAME (), DEFAULT_FACE_ID) == NULL)
+  if (FACE_FROM_ID_OR_NULL (f, DEFAULT_FACE_ID) == NULL)
     ScreenAttrib = (initial_screen_colors[0] << 4) | initial_screen_colors[1];
   else
-    IT_set_face (0);
+    IT_set_face (f, 0);
   mouse_off ();
   ScreenClear ();
   if (screen_virtual_segment)
@@ -1720,6 +1712,33 @@ IT_set_frame_parameters (struct frame *f, Lisp_Object alist)
       store_frame_param (f, prop, val);
     }
 
+  /* If this frame has become a child frame, process its visibility and
+     a nuumber of other flags.  */
+  if (is_tty_child_frame (f))
+    {
+      int x = tty_child_pos_param (f, Qleft, alist, f->left_pos);
+      int y = tty_child_pos_param (f, Qtop, alist, f->top_pos);
+      if (x != f->left_pos || y != f->top_pos)
+	{
+	  f->left_pos = x;
+	  f->top_pos = y;
+	  SET_FRAME_GARBAGED (root_frame (f));
+	}
+
+      int w = tty_child_size_param (f, Qwidth, alist, f->total_cols);
+      int h = tty_child_size_param (f, Qheight, alist, f->total_lines);
+      if (w != f->total_cols || h != f->total_lines)
+	change_frame_size (f, w, h, false, false, false);
+
+      Lisp_Object visible = Fassq (Qvisibility, alist);
+      if (CONSP (visible))
+	SET_FRAME_VISIBLE (f, !NILP (Fcdr (visible)));
+
+      Lisp_Object no_special = Fassq (Qno_special_glyphs, alist);
+      if (CONSP (no_special))
+	FRAME_NO_SPECIAL_GLYPHS (f) = !NILP (Fcdr (no_special));
+    }
+
   /* If they specified "reverse", but not the colors, we need to swap
      the current frame colors.  */
   if (reverse)
@@ -2861,13 +2880,13 @@ IT_menu_calc_size (XMenu *menu, int *width, int *height)
 
 /* Display MENU at (X,Y) using FACES.  */
 
-#define BUILD_CHAR_GLYPH(GLYPH, CODE, FACE_ID, PADDING_P)  \
-  do							   \
-    {							   \
-      (GLYPH).type = CHAR_GLYPH;			   \
-      SET_CHAR_GLYPH (GLYPH, CODE, FACE_ID, PADDING_P);	   \
-      (GLYPH).charpos = -1;				   \
-    }							   \
+#define BUILD_CHAR_GLYPH(F, GLYPH, CODE, FACE_ID, PADDING_P)	\
+  do								\
+    {								\
+      (GLYPH).type = CHAR_GLYPH;				\
+      SET_CHAR_GLYPH (F, GLYPH, CODE, FACE_ID, PADDING_P);	\
+      (GLYPH).charpos = -1;					\
+    }								\
   while (0)
 
 static void
@@ -2891,7 +2910,7 @@ IT_menu_display (XMenu *menu, int y, int x, int pn, int *faces, int disp_help)
     {
       int max_width = width + 2;
 
-      IT_cursor_to (sf, y + i, x);
+      cursor_to (sf, y + i, x);
       enabled
 	= (!menu->submenu[i] && menu->panenumber[i]) || (menu->submenu[i]);
       mousehere = (y + i == my && x <= mx && mx < x + max_width);
@@ -2905,7 +2924,7 @@ IT_menu_display (XMenu *menu, int y, int x, int pn, int *faces, int disp_help)
 	  menu_help_itemno = i;
 	}
       p = text;
-      BUILD_CHAR_GLYPH (*p, ' ', face, 0);
+      BUILD_CHAR_GLYPH (sf, *p, ' ', face, 0);
       p++;
       for (j = 0, q = menu->text[i]; *q; j++)
 	{
@@ -2913,15 +2932,15 @@ IT_menu_display (XMenu *menu, int y, int x, int pn, int *faces, int disp_help)
 
 	  if (c > 26)
 	    {
-	      BUILD_CHAR_GLYPH (*p, c, face, 0);
+	      BUILD_CHAR_GLYPH (sf, *p, c, face, 0);
 	      p++;
 	    }
 	  else	/* make '^x' */
 	    {
-	      BUILD_CHAR_GLYPH (*p, '^', face, 0);
+	      BUILD_CHAR_GLYPH (sf, *p, '^', face, 0);
 	      p++;
 	      j++;
-	      BUILD_CHAR_GLYPH (*p, c + 64, face, 0);
+	      BUILD_CHAR_GLYPH (sf, *p, c + 64, face, 0);
 	      p++;
 	    }
 	}
@@ -2932,16 +2951,16 @@ IT_menu_display (XMenu *menu, int y, int x, int pn, int *faces, int disp_help)
 	  text[max_width - 1].u.ch = '$'; /* indicate it's truncated */
 	}
       for (; j < max_width - 2; j++, p++)
-	BUILD_CHAR_GLYPH (*p, ' ', face, 0);
+	BUILD_CHAR_GLYPH (sf, *p, ' ', face, 0);
 
       /* 16 is the character code of a character that on DOS terminal
 	 produces a nice-looking right-pointing arrow glyph.  */
-      BUILD_CHAR_GLYPH (*p, menu->submenu[i] ? 16 : ' ', face, 0);
+      BUILD_CHAR_GLYPH (sf, *p, menu->submenu[i] ? 16 : ' ', face, 0);
       p++;
       IT_write_glyphs (sf, text, max_width);
     }
   IT_update_end (sf);
-  IT_cursor_to (sf, row, col);
+  cursor_to (sf, row, col);
   xfree (text);
 }
 
diff --git a/src/msdos.h b/src/msdos.h
index b245d9ea761..ad19e4c89c6 100644
--- a/src/msdos.h
+++ b/src/msdos.h
@@ -78,7 +78,6 @@ void syms_of_win16select (void);
 
 /* Constants.  */
 #define EINPROGRESS 112
-#define ENOTSUP     ENOSYS
 /* Gnulib sets O_CLOEXEC to O_NOINHERIT, which gets in the way when we
    need to redirect standard handles for subprocesses using temporary
    files created by mkostemp, see callproc.c.  */
diff --git a/src/xdisp.c b/src/xdisp.c
index 08016a6e2a5..91db3a87aae 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -17460,7 +17460,8 @@ redisplay_internal (void)
 	    }
 
 	retry_frame:
-	  if (FRAME_WINDOW_P (f) || FRAME_TERMCAP_P (f) || f == sf)
+	  if (FRAME_WINDOW_P (f)
+	      || FRAME_TERMCAP_P (f) || FRAME_MSDOS_P (f) || f == sf)
 	    {
 	      /* Only GC scrollbars when we redisplay the whole frame.  */
 	      bool gcscrollbars = f->redisplay || !REDISPLAY_SOME_P ();

commit e166803f8c1f1870cefb4f5b7828422a145cd3d4
Author: Po Lu <luangruo@yahoo.com>
Date:   Fri Dec 20 08:39:29 2024 +0800

    Fix the Android port
    
    * src/dispnew.c (terminal_cursor_magic)
    (combine_updates_for_frame): Disable unused code on Android.
    
    * src/frame.c (tty_child_frame_rect): Define out on Android.

diff --git a/src/dispnew.c b/src/dispnew.c
index f628415359c..2e95016b5f3 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -3903,6 +3903,8 @@ is_cursor_obscured (void)
   return cursor_glyph->frame != SELECTED_FRAME ();
 }
 
+#ifndef HAVE_ANDROID
+
 /* Decide where to show the cursor, and whether to hide it.
 
    This works very well for Vertico-Posframe, Transient-Posframe and
@@ -3942,9 +3944,12 @@ terminal_cursor_magic (struct frame *root, struct frame *topmost_child)
     }
 }
 
+#endif /* !HAVE_ANDROID */
+
 void
 combine_updates_for_frame (struct frame *f, bool inhibit_scrolling)
 {
+#ifndef HAVE_ANDROID
   struct frame *root = root_frame (f);
   eassert (FRAME_VISIBLE_P (root));
 
@@ -3981,6 +3986,7 @@ combine_updates_for_frame (struct frame *f, bool inhibit_scrolling)
       add_frame_display_history (f, false);
 #endif
     }
+#endif /* HAVE_ANDROID */
 }
 
 /* Update on the screen all root frames ROOTS.  Called from
diff --git a/src/frame.c b/src/frame.c
index 547ad0da962..5518201fca7 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -1442,6 +1442,8 @@ tty_child_size_param (struct frame *child, Lisp_Object key,
   return dflt;
 }
 
+#ifndef HAVE_ANDROID
+
 static void
 tty_child_frame_rect (struct frame *f, Lisp_Object params,
 		      int *x, int *y, int *w, int *h)
@@ -1452,6 +1454,8 @@ tty_child_frame_rect (struct frame *f, Lisp_Object params,
   *h = tty_child_size_param (f, Qheight, params, FRAME_TOTAL_LINES (f));
 }
 
+#endif /* !HAVE_ANDROID */
+
 DEFUN ("make-terminal-frame", Fmake_terminal_frame, Smake_terminal_frame,
        1, 1, 0,
        doc: /* Create an additional terminal frame, possibly on another terminal.

commit f0d7a395eaf818a6fe05ac1cf8b630775b02f451
Author: Stefan Kangas <stefankangas@gmail.com>
Date:   Fri Dec 20 00:01:24 2024 +0100

    Prefer defvar-keymap in hangul.el
    
    * lisp/leim/quail/hangul.el (hangul-im-keymap): Convert to
    defvar-keymap.

diff --git a/lisp/leim/quail/hangul.el b/lisp/leim/quail/hangul.el
index 79526fa5aa8..d54b6f3a25b 100644
--- a/lisp/leim/quail/hangul.el
+++ b/lisp/leim/quail/hangul.el
@@ -86,13 +86,11 @@
       65 83 90 109 115 87 116 122 113 118 121 21 66 4 69 99 73 9 1 101 17
       123 124 125 126])
 
-(defvar hangul-im-keymap
-  (let ((map (make-sparse-keymap)))
-    (define-key map "\d" #'hangul-delete-backward-char)
-    (define-key map [f9] #'hangul-to-hanja-conversion)
-    (define-key map [Hangul_Hanja] #'hangul-to-hanja-conversion)
-    map)
-  "Keymap for Hangul method.  It is used by all Hangul input methods.")
+(defvar-keymap hangul-im-keymap
+  :doc "Keymap for Hangul method.  It is used by all Hangul input methods."
+  "DEL"            #'hangul-delete-backward-char
+  "<f9>"           #'hangul-to-hanja-conversion
+  "<Hangul_Hanja>" #'hangul-to-hanja-conversion)
 
 ;; Current input character buffer. Store separated hangul character.
 ;; The first and second are Choseong position.

commit 68bcabf58afddb377d172857ce7648ad3ff09618 (tag: refs/tags/emacs-30.0.93)
Author: Andrea Corallo <acorallo@gnu.org>
Date:   Thu Dec 19 22:27:07 2024 +0100

    * Update 'ldefs-boot.el' (don't merge)
    
    * lisp/ldefs-boot.el: Update.

diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el
index 06797a17e18..6416f63afbf 100644
--- a/lisp/ldefs-boot.el
+++ b/lisp/ldefs-boot.el
@@ -10399,7 +10399,9 @@ The buffer is expected to contain a mail message." t)
 (function-put 'epa-mail-decrypt 'interactive-only 't)
 (autoload 'epa-mail-verify "epa-mail" "\
 Verify OpenPGP cleartext signed messages in the current buffer.
-The buffer is expected to contain a mail message." t)
+The buffer is expected to contain a mail message.
+
+If the verification fails, signal an error." t)
 (function-put 'epa-mail-verify 'interactive-only 't)
 (autoload 'epa-mail-sign "epa-mail" "\
 Sign the current buffer.
@@ -10506,7 +10508,6 @@ Look at CONFIG and try to expand GROUP.
 (dolist (symbol '( erc-sasl erc-spelling ; 29
                   erc-imenu erc-nicks)) ; 30
  (custom-add-load symbol symbol))
-(custom-autoload 'erc-modules "erc")
 (autoload 'erc-select-read-args "erc" "\
 Prompt for connection parameters and return them in a plist.
 By default, collect `:server', `:port', `:nickname', and
@@ -11247,7 +11248,7 @@ For non-interactive use, this is superseded by `fileloop-initialize-replace'.
 (autoload 'list-tags "etags" "\
 Display list of tags in file FILE.
 Interactively, prompt for FILE, with completion, offering the current
-buffer's file name as the defaul.
+buffer's file name as the default.
 This command searches only the first table in the list of tags tables,
 and does not search included tables.
 FILE should be as it was submitted to the `etags' command, which usually
@@ -12458,9 +12459,14 @@ This command deletes all existing settings of VARIABLE (except `mode'
 and `eval') and adds a new file-local VARIABLE with VALUE to the
 Local Variables list.
 
-If there is no Local Variables list in the current file buffer
-then this function adds the first line containing the string
-`Local Variables:' and the last line containing the string `End:'.
+If there is no Local Variables list in the current file buffer,
+then this function adds it at the end of the file, with the first
+line containing the string `Local Variables:' and the last line
+containing the string `End:'.
+
+For adding local variables on the first line of a file, for example
+for settings like `lexical-binding, which must be specified there,
+use the `add-file-local-variable-prop-line' command instead.
 
 (fn VARIABLE VALUE &optional INTERACTIVE)" t)
 (autoload 'delete-file-local-variable "files-x" "\
@@ -12472,11 +12478,14 @@ Add file-local VARIABLE with its VALUE to the -*- line.
 
 This command deletes all existing settings of VARIABLE (except `mode'
 and `eval') and adds a new file-local VARIABLE with VALUE to
-the -*- line.
+the -*- line at the beginning of the file.
 
 If there is no -*- line at the beginning of the current file buffer
 then this function adds it.
 
+To add variables to the Local Variables list at the end of the file,
+use the `add-file-local-variable' command instead.
+
 (fn VARIABLE VALUE &optional INTERACTIVE)" t)
 (autoload 'delete-file-local-variable-prop-line "files-x" "\
 Delete all settings of file-local VARIABLE from the -*- line.
@@ -15603,20 +15612,20 @@ If the `kbd-help' text or overlay property at point produces a
 string, return it.  Otherwise, use the `help-echo' property.
 If this produces no string either, return nil.")
 (autoload 'display-local-help "help-at-pt" "\
-Display local help in the echo area.
-This command, by default, displays a short help message, namely
-the string produced by the `kbd-help' property at point.  If
-`kbd-help' does not produce a string, but the `help-echo'
-property does, then that string is printed instead.
+Display in the echo area `kbd-help' or `help-echo' text at point.
+This command displays the help message which is the string produced
+by the `kbd-help' property at point.  If `kbd-help' at point does not
+produce a string, but the `help-echo' property does, then that string
+is displayed instead.
 
 The string is passed through `substitute-command-keys' before it
 is displayed.
 
-If INHIBIT-WARNING is non-nil, this prevents display of a message
-in case there is no help.
+If INHIBIT-WARNING is non-nil, do not display a warning message when
+there is no help property at point.
 
 If DESCRIBE-BUTTON in non-nil (interactively, the prefix arg), and
-there's a button/widget at point, pop a buffer describing that
+there's a button/widget at point, pop up a buffer describing that
 button/widget instead.
 
 (fn &optional INHIBIT-WARNING DESCRIBE-BUTTON)" t)
@@ -22196,15 +22205,18 @@ values:
 used to decode and encode the data which the process reads and
 writes.  See `make-network-process' for details.
 
-:return-list specifies this function's return value.
-  If omitted or nil, return a process object.  A non-nil means to
-  return (PROC . PROPS), where PROC is a process object and PROPS
-  is a plist of connection properties, with these keywords:
+:return-list controls the form of the function's return value.
+  If omitted or nil, return a process object.  Anything else means to
+  return (PROC . PROPS), where PROC is a process object, and PROPS is a
+  plist of connection properties, which may include the following
+  keywords:
    :greeting -- the greeting returned by HOST (a string), or nil.
    :capabilities -- a string representing HOST's capabilities,
                     or nil if none could be found.
    :type -- the resulting connection type; `plain' (unencrypted)
             or `tls' (TLS-encrypted).
+   :error -- A string describing any error when attempting
+             to negotiate STARTTLS.
 
 :end-of-command specifies a regexp matching the end of a command.
 
@@ -22243,8 +22255,9 @@ writes.  See `make-network-process' for details.
 :use-starttls-if-possible is a boolean that says to do opportunistic
 STARTTLS upgrades even if Emacs doesn't have built-in TLS functionality.
 
-:warn-unless-encrypted is a boolean which, if :return-list is
-non-nil, is used warn the user if the connection isn't encrypted.
+:warn-unless-encrypted, if non-nil, warn the user if the connection
+isn't encrypted (i.e. STARTTLS failed).  Additionally, setting
+:return-list non-nil allows capturing any error response.
 
 :nogreeting is a boolean that can be used to inhibit waiting for
 a greeting from the server.

commit 9d93d717d58a41af29dec9cf80aa6b70b873c723
Author: Andrea Corallo <acorallo@gnu.org>
Date:   Thu Dec 19 00:48:19 2024 +0100

    * Bump Emacs version to 30.0.93
    
    * nt/README.W32: Update Emacs version.
    * msdos/sed2v2.inp: Likewise.
    * exec/configure.ac: Likewise.
    * configure.ac: Likewise.
    * README: Likewise.

diff --git a/README b/README
index 6336a0f41ab..8c274fa04ba 100644
--- a/README
+++ b/README
@@ -2,7 +2,7 @@ Copyright (C) 2001-2024 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 
-This directory tree holds version 30.0.92 of GNU Emacs, the extensible,
+This directory tree holds version 30.0.93 of GNU Emacs, the extensible,
 customizable, self-documenting real-time display editor.
 
 The file INSTALL in this directory says how to build and install GNU
diff --git a/configure.ac b/configure.ac
index 730c5ea942b..1cd0fd99441 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@ dnl  along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 AC_PREREQ([2.65])
 dnl Note this is parsed by (at least) make-dist and lisp/cedet/ede/emacs.el.
-AC_INIT([GNU Emacs], [30.0.92], [bug-gnu-emacs@gnu.org], [],
+AC_INIT([GNU Emacs], [30.0.93], [bug-gnu-emacs@gnu.org], [],
   [https://www.gnu.org/software/emacs/])
 
 if test "$XCONFIGURE" = "android"; then
diff --git a/exec/configure.ac b/exec/configure.ac
index b9d46434432..bc19cba4b05 100644
--- a/exec/configure.ac
+++ b/exec/configure.ac
@@ -22,7 +22,7 @@ dnl  You should have received a copy of the GNU General Public License
 dnl  along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 AC_PREREQ([2.65])
-AC_INIT([libexec], [30.0.92], [bug-gnu-emacs@gnu.org], [],
+AC_INIT([libexec], [30.0.93], [bug-gnu-emacs@gnu.org], [],
   [https://www.gnu.org/software/emacs/])
 
 AH_TOP([/* Copyright (C) 2024 Free Software Foundation, Inc.
diff --git a/msdos/sed2v2.inp b/msdos/sed2v2.inp
index e2f2a5e23a9..186914567e9 100644
--- a/msdos/sed2v2.inp
+++ b/msdos/sed2v2.inp
@@ -67,7 +67,7 @@
 /^#undef PACKAGE_NAME/s/^.*$/#define PACKAGE_NAME ""/
 /^#undef PACKAGE_STRING/s/^.*$/#define PACKAGE_STRING ""/
 /^#undef PACKAGE_TARNAME/s/^.*$/#define PACKAGE_TARNAME ""/
-/^#undef PACKAGE_VERSION/s/^.*$/#define PACKAGE_VERSION "30.0.92"/
+/^#undef PACKAGE_VERSION/s/^.*$/#define PACKAGE_VERSION "30.0.93"/
 /^#undef SYSTEM_TYPE/s/^.*$/#define SYSTEM_TYPE "ms-dos"/
 /^#undef HAVE_DECL_GETENV/s/^.*$/#define HAVE_DECL_GETENV 1/
 /^#undef SYS_SIGLIST_DECLARED/s/^.*$/#define SYS_SIGLIST_DECLARED 1/
diff --git a/nt/README.W32 b/nt/README.W32
index e862a17d812..365858dc4a3 100644
--- a/nt/README.W32
+++ b/nt/README.W32
@@ -1,7 +1,7 @@
 Copyright (C) 2001-2024 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
-		Emacs version 30.0.92 for MS-Windows
+		Emacs version 30.0.93 for MS-Windows
 
   This README file describes how to set up and run a precompiled
   distribution of the latest version of GNU Emacs for MS-Windows.  You

commit c19dd8e9d6c54080426623129a824e5bb2fcf7be
Author: Robert Pluim <rpluim@gmail.com>
Date:   Thu Dec 19 16:17:16 2024 +0100

    Add more documentation for TTY child frames
    
    * doc/lispref/frames.texi (Child Frames): Document that TTY
    child frames are now supported.
    * etc/NEWS: Document another limitation of TTY child frames.

diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi
index bf4d5c05f3a..cc7d3f79a7f 100644
--- a/doc/lispref/frames.texi
+++ b/doc/lispref/frames.texi
@@ -3393,8 +3393,8 @@ of its sibling child frames.
 
   By design, operations to make or modify child frames are implemented
 with the help of frame parameters (@pxref{Frame Parameters}) without any
-specialized functions or customizable variables.  Note that child frames
-are meaningful on graphical terminals only.
+specialized functions or customizable variables.  Child frames
+are meaningful on graphical and text terminals.
 
   To create a new child frame or to convert a normal frame into a child
 frame, set that frame's @code{parent-frame} parameter (@pxref{Frame
diff --git a/etc/NEWS b/etc/NEWS
index 7e5a73818ff..9a7b320acdb 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -47,8 +47,11 @@ enabled, you can disable mouse tracking by putting '(xterm-mouse-mode
 ** Child frames are now supported on TTY frames.
 This supports use-cases like Posframe, Corfu, and child frames acting
 like tooltips.  Other use-cases of child frames are not supported yet.
-In particular, trying to create minibuffer-only child frames on a TTY
-frame will signal an error.
+In particular:
+
+- trying to create minibuffer-only child frames on a TTY frame will
+  signal an error.
+- a TTY child frame cannot be converted to a root frame or vice-versa.
 
 To enable tooltips on TTY frames, call 'tty-tip-mode'.
 

commit d8e8e1d5ed260222e2630141d26572a361a5c75f
Author: Robert Pluim <rpluim@gmail.com>
Date:   Wed Dec 18 14:50:06 2024 +0100

    Fix network test failure when using VPN client
    
    When using certain VPN clients, the interface info returned by
    'getifaddrs' does not have the address family filled in for the
    ifa_netmask component (this is allowed by the standard, since
    the value is not specified).  The resulting address info causes
    network tests suite failures.  Fix by copying the address family
    from the returned interface address.
    
    * src/process.c (network_interface_list): Copy the interface address
    sa_family to the netmask address.
    (Fnetwork_lookup_address_info): Fix test for non-IP addresses to
    properly account for IPv6.
    
    * test/src/process-tests.el (process-tests-check-bug-74907): New
    test, checks that 'network-interface-list' output is as
    expected.
    
    (Bug#74907)

diff --git a/src/process.c b/src/process.c
index cd1378f07ad..4b3178005c8 100644
--- a/src/process.c
+++ b/src/process.c
@@ -4351,6 +4351,10 @@ network_interface_list (bool full, unsigned short match)
 
       if (full)
         {
+	  /* Sometimes sa_family is only filled in correctly in the
+	     interface address, not the netmask, so copy it across
+	     (Bug#74907).  */
+	  it->ifa_netmask->sa_family = it->ifa_addr->sa_family;
           elt = Fcons (conv_sockaddr_to_lisp (it->ifa_netmask, len), elt);
           /* There is an it->ifa_broadaddr field, but its contents are
              unreliable, so always calculate the broadcast address from
@@ -4764,13 +4768,17 @@ returned from the lookup.  */)
     {
       for (lres = res; lres; lres = lres->ai_next)
         {
-#ifndef AF_INET6
-          if (lres->ai_family != AF_INET)
-            continue;
+	  /* Avoid converting non-IP addresses (Bug#74907).  */
+	  if (lres->ai_family == AF_INET
+#ifdef AF_INET6
+	      || lres->ai_family == AF_INET6
 #endif
-          addresses = Fcons (conv_sockaddr_to_lisp (lres->ai_addr,
-                                                    lres->ai_addrlen),
-                             addresses);
+	      )
+	    addresses = Fcons (conv_sockaddr_to_lisp (lres->ai_addr,
+						      lres->ai_addrlen),
+			       addresses);
+	  else
+	    continue;
         }
       addresses = Fnreverse (addresses);
 
diff --git a/test/src/process-tests.el b/test/src/process-tests.el
index 98bdbbd42ee..88a622e5952 100644
--- a/test/src/process-tests.el
+++ b/test/src/process-tests.el
@@ -519,6 +519,17 @@ See Bug#30460."
 
 ;; End of tests requiring DNS
 
+(ert-deftest process-tests-check-bug-74907 ()
+  "Check that the result of `network-interface-list' is well-formed.
+(Bug#74907)"
+  (dolist (info (network-interface-list t))
+    (should (stringp (car info)))
+    (should (length= info 4))
+    (should (cl-every #'vectorp (cdr info)))
+    (let ((alen (length (cadr info))))
+      (should (memq alen '(5 9)))       ; Address info also has a port number
+      (should (cl-every (lambda (elt) (length= elt alen)) (cdr info))))))
+
 (defmacro process-tests--ignore-EMFILE (&rest body)
   "Evaluate BODY, ignoring EMFILE errors."
   (declare (indent 0) (debug t))

commit 64dbb01993ee4e00f5af72c5df935c64ed321a3e
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Thu Dec 19 16:36:30 2024 +0200

    ; Fix last change.

diff --git a/etc/NEWS b/etc/NEWS
index babe6ab4fa7..7e5a73818ff 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -47,8 +47,8 @@ enabled, you can disable mouse tracking by putting '(xterm-mouse-mode
 ** Child frames are now supported on TTY frames.
 This supports use-cases like Posframe, Corfu, and child frames acting
 like tooltips.  Other use-cases of child frames are not supported yet.
-In particular, trying to create minibuffer-only child frames on ttys
-will signal an error.
+In particular, trying to create minibuffer-only child frames on a TTY
+frame will signal an error.
 
 To enable tooltips on TTY frames, call 'tty-tip-mode'.
 

commit 35cf00886451ab2fddf47134117c96aa497676bf
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Thu Dec 19 16:35:35 2024 +0200

    ; * etc/NEWS: Fix recently-added entries.

diff --git a/etc/NEWS b/etc/NEWS
index 97d3d945b01..babe6ab4fa7 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -44,21 +44,19 @@ enabled, you can disable mouse tracking by putting '(xterm-mouse-mode
 * Changes in Emacs 31.1
 
 ---
-** Add support for child frames on tty
+** Child frames are now supported on TTY frames.
+This supports use-cases like Posframe, Corfu, and child frames acting
+like tooltips.  Other use-cases of child frames are not supported yet.
+In particular, trying to create minibuffer-only child frames on ttys
+will signal an error.
 
-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 TTY frames, call 'tty-tip-mode'.
 
-To enable tooltips on ttys, call 'tty-tip-mode'.
-
-The presence of child window support on ttys can be checked with
+The presence of child frame support on TTY frames can be checked with
 `(featurep 'tty-child-frames)'.
 
-Current versions of Posframe and Corfu are known to use child frames on
-ttys if supported.
+Recent versions of Posframe and Corfu are known to use child frames on
+TTYs if they are supported.
 
 +++
 ** Several font-lock face variables are now obsolete.
@@ -919,7 +917,8 @@ 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
+** 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.

commit 709a90d65c8f9d95acc0dcf048389ecaedcc5ddb
Merge: 4f9ed518e79 b156a69eec8
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Thu Dec 19 16:30:08 2024 +0200

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

commit b156a69eec8af26991ede5c5bc2d7fbcd8dba134
Author: Gerd Möllmann <gerd@gnu.org>
Date:   Thu Dec 19 13:42:23 2024 +0100

    NEWS entry for the removal of `redisplay-dont-pause'

diff --git a/etc/NEWS b/etc/NEWS
index c7d11a915e6..97d3d945b01 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -919,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.

commit a8c83b496b3f98ad0be835d772a36f75c47d693e
Author: Gerd Möllmann <gerd@gnu.org>
Date:   Thu Dec 19 13:37:12 2024 +0100

    NEWS entry for tty child frames

diff --git a/etc/NEWS b/etc/NEWS
index b9064829548..c7d11a915e6 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',

commit 5ed6cd53f7ca6570e5bb46aa32eb54c3e1b86615
Author: Gerd Möllmann <gerd@gnu.org>
Date:   Thu Dec 19 13:14:42 2024 +0100

    ; Fix a call to update_window for !HAVE_EXT_MENU_BAR
    
    * src/dispnew.c (update_menu_bar): Remove superfluous argument.

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
 }
 

commit 4f9ed518e792c00f6a1b27bebf9cb83779e01447
Merge: a4f176ea6e5 a61b968ccfe
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Thu Dec 19 13:22:50 2024 +0200

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

commit a61b968ccfe8fa7e2f1fcf7667781a1c0527389a
Author: Gerd Möllmann <gerd@gnu.org>
Date:   Thu Dec 19 12:13:14 2024 +0100

    Remove remaining references to redisplay-dont-pause
    
    * src/pgtkfns.c (Fpgtk_print_frames_dialog): Remove reference to
    Qredisplay_dont_pause.
    * src/pgtkterm.c (pgtk_cr_export_frames): Remove reference to
    Qredisplay_dont_pause.
    * src/xfns.c (Fx_print_frames_dialog): Remove reference to
    Qredisplay_dont_pause.
    * src/xterm.c (x_cr_export_frames): Remove reference to
    Qredisplay_dont_pause.

diff --git a/src/pgtkfns.c b/src/pgtkfns.c
index f0fd3000965..0ff3262cd11 100644
--- a/src/pgtkfns.c
+++ b/src/pgtkfns.c
@@ -3668,10 +3668,7 @@ visible.  */)
   frames = Fnreverse (tmp);
 
   /* Make sure the current matrices are up-to-date.  */
-  specpdl_ref count = SPECPDL_INDEX ();
-  specbind (Qredisplay_dont_pause, Qt);
   redisplay_preserve_echo_area (32);
-  unbind_to (count, Qnil);
 
   block_input ();
   xg_print_frames_dialog (frames);
diff --git a/src/pgtkterm.c b/src/pgtkterm.c
index 079945126e0..9bb2ea3c1b0 100644
--- a/src/pgtkterm.c
+++ b/src/pgtkterm.c
@@ -7632,7 +7632,6 @@ pgtk_cr_export_frames (Lisp_Object frames, cairo_surface_type_t surface_type)
   Lisp_Object acc = Qnil;
   specpdl_ref count = SPECPDL_INDEX ();
 
-  specbind (Qredisplay_dont_pause, Qt);
   redisplay_preserve_echo_area (31);
 
   f = XFRAME (XCAR (frames));
diff --git a/src/xfns.c b/src/xfns.c
index 3f0d8f3fcd0..23b5164b751 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -9963,10 +9963,7 @@ Note: Text drawn with the `x' font backend is shown with hollow boxes.  */)
   frames = Fnreverse (tmp);
 
   /* Make sure the current matrices are up-to-date.  */
-  specpdl_ref count = SPECPDL_INDEX ();
-  specbind (Qredisplay_dont_pause, Qt);
   redisplay_preserve_echo_area (32);
-  unbind_to (count, Qnil);
 
   block_input ();
   xg_print_frames_dialog (frames);
diff --git a/src/xterm.c b/src/xterm.c
index 0c20d38b0f7..fa24b7c1cee 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -6369,7 +6369,6 @@ x_cr_export_frames (Lisp_Object frames, cairo_surface_type_t surface_type)
   Lisp_Object acc = Qnil;
   specpdl_ref count = SPECPDL_INDEX ();
 
-  specbind (Qredisplay_dont_pause, Qt);
   redisplay_preserve_echo_area (31);
 
   f = XFRAME (XCAR (frames));

commit a4f176ea6e5c28f7ccc98bdce3ee13d687b1acfd
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Thu Dec 19 08:03:42 2024 +0200

    ; Fix compilation warnings in term.c
    
    * src/term.c (Ftty_frame_geometry, Ftty_frame_edges)
    (Ftty_frame_list_z_order, Ftty_frame_restack)
    (Ftty_display_pixel_width, Ftty_display_pixel_height): Doc fixes.
    (Ftty_frame_restack): Make it "noreturn".

diff --git a/src/term.c b/src/term.c
index 64df5261e50..98d0844d64e 100644
--- a/src/term.c
+++ b/src/term.c
@@ -4827,7 +4827,7 @@ tty_frame_geometry (Lisp_Object frame, Lisp_Object attribute)
 
 DEFUN ("tty-frame-geometry", Ftty_frame_geometry, Stty_frame_geometry, 0, 1, 0,
        doc: /* Return geometric attributes of terminal frame FRAME.
-	       See also `frame-geometry'.  */)
+See also `frame-geometry'.  */)
   (Lisp_Object frame)
 {
   return tty_frame_geometry (frame, Qnil);
@@ -4835,7 +4835,7 @@ DEFUN ("tty-frame-geometry", Ftty_frame_geometry, Stty_frame_geometry, 0, 1, 0,
 
 DEFUN ("tty-frame-edges", Ftty_frame_edges, Stty_frame_edges, 0, 2, 0,
        doc: /* Return coordinates of FRAME's edges.
-	       See also `frame-edges'.  */)
+See also `frame-edges'.  */)
   (Lisp_Object frame, Lisp_Object type)
 {
   if (!EQ (type, Qouter_edges) && !EQ (type, Qinner_edges))
@@ -4846,7 +4846,7 @@ DEFUN ("tty-frame-edges", Ftty_frame_edges, Stty_frame_edges, 0, 2, 0,
 DEFUN ("tty-frame-list-z-order", Ftty_frame_list_z_order,
        Stty_frame_list_z_order, 0, 1, 0,
        doc: /* Return list of Emacs's frames, in Z (stacking) order.
-	       See also `frame-list-z-order'.  */)
+See also `frame-list-z-order'.  */)
   (Lisp_Object frame)
 {
   struct frame *f = decode_tty_frame (frame);
@@ -4857,12 +4857,12 @@ DEFUN ("tty-frame-list-z-order", Ftty_frame_list_z_order,
 DEFUN ("tty-frame-restack", Ftty_frame_restack,
        Stty_frame_restack, 2, 3, 0,
        doc: /* Restack FRAME1 below FRAME2 on terminals.
-.	       See also `frame-restack'.  */)
+See also `frame-restack'.  */
+       attributes: noreturn)
   (Lisp_Object frame1, Lisp_Object frame2, Lisp_Object above)
 {
   /* FIXME/tty: tty-frame-restack implementation.  */
   error ("tty-frame-restack is not implemented");
-  return Qnil;
 }
 
 static void
@@ -4897,7 +4897,7 @@ tty_display_dimension (Lisp_Object frame, int *width, int *height)
 DEFUN ("tty-display-pixel-width", Ftty_display_pixel_width,
        Stty_display_pixel_width, 0, 1, 0,
        doc: /* Return the width of DISPLAY's screen in pixels.
-.	       See also `display-pixel-width'.  */)
+See also `display-pixel-width'.  */)
   (Lisp_Object display)
 {
   int width, height;
@@ -4908,7 +4908,7 @@ DEFUN ("tty-display-pixel-width", Ftty_display_pixel_width,
 DEFUN ("tty-display-pixel-height", Ftty_display_pixel_height,
        Stty_display_pixel_height, 0, 1, 0,
        doc: /* Return the height of DISPLAY's screen in pixels.
-	       See also `display-pixel-height'.  */)
+See also `display-pixel-height'.  */)
   (Lisp_Object display)
 {
   int width, height;

commit 71ad445d58680b601324c4810a07ebd1a64404a1
Merge: 1647086d6a3 76c64dcc802
Author: Michael Albinus <michael.albinus@gmx.de>
Date:   Thu Dec 19 11:47:28 2024 +0100

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

commit 76c64dcc8025e42d1a85a053d8da58d5462a95ab
Author: Gerd Möllmann <gerd@gnu.org>
Date:   Sat Nov 16 08:57:35 2024 +0100

    Remove an unused parameter of combine_updates
    
    * src/dispnew.c (combine_updates): Remove unused parameter inhibit_scrolling.
    * src/xdisp.c (redisplay_internal): Adjust caller.
    * src/dispextern.h: Change function prototype.

diff --git a/src/dispextern.h b/src/dispextern.h
index 20674a7c8b2..ea7b0399adc 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -3951,7 +3951,7 @@ Lisp_Object frames_in_reverse_z_order (struct frame *f, bool visible);
 bool is_tty_frame (struct frame *f);
 bool is_tty_child_frame (struct frame *f);
 bool is_tty_root_frame (struct frame *f);
-void combine_updates (Lisp_Object root_frames, bool inhibit_id_p);
+void combine_updates (Lisp_Object root_frames);
 void combine_updates_for_frame (struct frame *f, bool inhibit_id_p);
 void tty_raise_lower_frame (struct frame *f, bool raise);
 int max_child_z_order (struct frame *parent);
diff --git a/src/dispnew.c b/src/dispnew.c
index 37ec37b752e..cbc7d4d7aaf 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -3987,12 +3987,12 @@ combine_updates_for_frame (struct frame *f, bool inhibit_scrolling)
    redisplay_internal as the last step of redisplaying.  */
 
 void
-combine_updates (Lisp_Object roots, bool inhibit_scrolling)
+combine_updates (Lisp_Object roots)
 {
   for (; CONSP (roots); roots = XCDR (roots))
     {
       struct frame *root = XFRAME (XCAR (roots));
-      combine_updates_for_frame (root, inhibit_scrolling);
+      combine_updates_for_frame (root, false);
     }
 }
 
diff --git a/src/xdisp.c b/src/xdisp.c
index 585a9f32956..08016a6e2a5 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -17592,7 +17592,7 @@ redisplay_internal (void)
 	}
 
       if (CONSP (tty_root_frames))
-	combine_updates (tty_root_frames, false);
+	combine_updates (tty_root_frames);
 
       eassert (EQ (XFRAME (selected_frame)->selected_window, selected_window));
 

commit f92520d009e1ab8024b03d9d71ecc9820573c040
Author: Gerd Möllmann <gerd@gnu.org>
Date:   Fri Nov 15 13:34:55 2024 +0100

    Don't pause display for pending input
    
    * src/dispnew.c: Remove display_completed, redisplay_dont_pause,
    redisplay-dont-pause was declared obsolete in Emacs 24.  Remove anything
    checking pending input, change function signatures accordingly, and so
    on.
    
    * src/keyboard.c (read_char): Don't use redisplay_dont_pause.
    * src/minibuf.c (read_minibuf): Use new function signatures.
    * src/xdisp.c: Don't check display_completed. Use new API.
    
    * lisp/subr.el (redisplay-dont-pause): Remove declaration.

diff --git a/lisp/subr.el b/lisp/subr.el
index b025e39e7ba..a9061456179 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1987,7 +1987,6 @@ be a list of the form returned by `event-start' and `event-end'."
  ;; It's been announced as obsolete in NEWS and in the docstring since Emacs-25,
  ;; but it's only been marked for compilation warnings since Emacs-29.
  "25.1")
-(make-obsolete-variable 'redisplay-dont-pause nil "24.5")
 (make-obsolete-variable 'operating-system-release nil "28.1")
 (make-obsolete-variable 'inhibit-changing-match-data 'save-match-data "29.1")
 
diff --git a/src/dispextern.h b/src/dispextern.h
index 1bec5e24c85..20674a7c8b2 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -1322,9 +1322,6 @@ struct glyph_row *matrix_row (struct glyph_matrix *, int);
 
 extern struct glyph space_glyph;
 
-/* True means last display completed.  False means it was preempted.  */
-
-extern bool display_completed;
 
 /************************************************************************
 			  Glyph Strings
@@ -3835,7 +3832,7 @@ extern Lisp_Object marginal_area_string (struct window *, enum window_part,
                                          Lisp_Object *,
                                          int *, int *, int *, int *);
 extern void redraw_frame (struct frame *);
-extern bool update_frame (struct frame *, bool, bool);
+void update_frame (struct frame *, bool);
 extern void update_frame_with_menu (struct frame *, int, int);
 extern int update_mouse_position (struct frame *, int, int);
 extern void bitch_at_user (void);
@@ -3954,8 +3951,8 @@ Lisp_Object frames_in_reverse_z_order (struct frame *f, bool visible);
 bool is_tty_frame (struct frame *f);
 bool is_tty_child_frame (struct frame *f);
 bool is_tty_root_frame (struct frame *f);
-bool combine_updates (Lisp_Object root_frames, bool force_p, bool inhibit_id_p);
-bool combine_updates_for_frame (struct frame *f, bool force_p, bool inhibit_id_p);
+void combine_updates (Lisp_Object root_frames, bool inhibit_id_p);
+void combine_updates_for_frame (struct frame *f, bool inhibit_id_p);
 void tty_raise_lower_frame (struct frame *f, bool raise);
 int max_child_z_order (struct frame *parent);
 
diff --git a/src/dispnew.c b/src/dispnew.c
index d473a77e3ad..37ec37b752e 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -93,10 +93,10 @@ static void check_matrix_pointers (struct glyph_matrix *,
                                    struct glyph_matrix *);
 #endif
 static void mirror_line_dance (struct window *, int, int, int *, char *);
-static bool update_window_tree (struct window *, bool);
-static bool update_window (struct window *, bool);
-static bool write_matrix (struct frame *, bool, bool, bool, bool);
-static bool scrolling (struct frame *);
+static void update_window_tree (struct window *);
+static void update_window (struct window *);
+static void write_matrix (struct frame *, bool, bool, bool);
+static void scrolling (struct frame *);
 static void set_window_cursor_after_update (struct window *);
 static void adjust_frame_glyphs_for_window_redisplay (struct frame *);
 static void adjust_frame_glyphs_for_frame_redisplay (struct frame *);
@@ -116,10 +116,6 @@ check_rows (struct frame *f)
 }
 #endif
 
-/* True means last display completed.  False means it was preempted.  */
-
-bool display_completed;
-
 /* True means SIGWINCH happened when not safe.  */
 
 static bool delayed_size_change;
@@ -175,11 +171,10 @@ static uintmax_t history_tick;
 
 /* Add to the redisplay history how window W has been displayed.
    MSG is a trace containing the information how W's glyph matrix
-   has been constructed.  PAUSED_P means that the update
-   has been interrupted for pending input.  */
+   has been constructed.  */
 
 static void
-add_window_display_history (struct window *w, const char *msg, bool paused_p)
+add_window_display_history (struct window *w, const char *msg)
 {
   char *buf;
   void *ptr = w;
@@ -190,14 +185,13 @@ add_window_display_history (struct window *w, const char *msg, bool paused_p)
   ++history_idx;
 
   snprintf (buf, sizeof redisplay_history[0].trace,
-	    "%"PRIuMAX": window %p (%s)%s\n%s",
+	    "%"PRIuMAX": window %p %s\n%s",
 	    history_tick++,
 	    ptr,
 	    ((BUFFERP (w->contents)
 	      && STRINGP (BVAR (XBUFFER (w->contents), name)))
 	     ? SSDATA (BVAR (XBUFFER (w->contents), name))
 	     : "???"),
-	    paused_p ? " ***paused***" : "",
 	    msg);
 }
 
@@ -2136,8 +2130,7 @@ adjust_frame_glyphs_for_frame_redisplay (struct frame *f)
 	 current matrix over a call to adjust_glyph_matrix, we must
 	 make a copy of the current glyphs, and restore the current
 	 matrix' contents from that copy.  */
-      if (display_completed
-	  && !FRAME_GARBAGED_P (f)
+      if (!FRAME_GARBAGED_P (f)
 	  && matrix_dim.width == f->current_matrix->matrix_w
 	  && matrix_dim.height == f->current_matrix->matrix_h
 	  /* For some reason, the frame glyph matrix gets corrupted if
@@ -2682,7 +2675,7 @@ build_frame_matrix_from_leaf_window (struct glyph_matrix *frame_matrix, struct w
 	     frame and window share glyphs.  */
 
 	  strcpy (w->current_matrix->method, w->desired_matrix->method);
-	  add_window_display_history (w, w->current_matrix->method, 0);
+	  add_window_display_history (w, w->current_matrix->method);
 #endif
 	}
 
@@ -3778,7 +3771,7 @@ update_bar_window (Lisp_Object window, Lisp_Object *current,
       struct window *w = XWINDOW (window);
       if (w->must_be_updated_p)
 	{
-	  update_window (w, true);
+	  update_window (w);
 	  w->must_be_updated_p = false;
 	  Lisp_Object tem = *current;
 	  *current = *desired;
@@ -3808,8 +3801,8 @@ update_tool_bar (struct frame *f)
 #endif
 }
 
-static bool
-update_window_frame (struct frame *f, bool force_p)
+static void
+update_window_frame (struct frame *f)
 {
   eassert (FRAME_WINDOW_P (f));
   update_begin (f);
@@ -3817,19 +3810,17 @@ update_window_frame (struct frame *f, bool force_p)
   update_tab_bar (f);
   update_tool_bar (f);
   struct window *root_window = XWINDOW (f->root_window);
-  bool paused_p = update_window_tree (root_window, force_p);
+  update_window_tree (root_window);
   update_end (f);
   set_window_update_flags (root_window, false);
-  return paused_p;
 }
 
-static bool
-update_initial_frame (struct frame *f, bool force_p)
+static void
+update_initial_frame (struct frame *f)
 {
   build_frame_matrix (f);
   struct window *root_window = XWINDOW (f->root_window);
   set_window_update_flags (root_window, false);
-  return false;
 }
 
 static void
@@ -3840,11 +3831,10 @@ flush_terminal (struct frame *f)
   fflush (FRAME_TTY (f)->output);
 }
 
-static bool
-update_tty_frame (struct frame *f, bool force_p)
+static void
+update_tty_frame (struct frame *f)
 {
   build_frame_matrix (f);
-  return false;
 }
 
 /* Return the cursor position of the selected window of frame F, in
@@ -3952,8 +3942,8 @@ terminal_cursor_magic (struct frame *root, struct frame *topmost_child)
     }
 }
 
-bool
-combine_updates_for_frame (struct frame *f, bool force_p, bool inhibit_scrolling)
+void
+combine_updates_for_frame (struct frame *f, bool inhibit_scrolling)
 {
   struct frame *root = root_frame (f);
   eassert (FRAME_VISIBLE_P (root));
@@ -3969,13 +3959,12 @@ combine_updates_for_frame (struct frame *f, bool force_p, bool inhibit_scrolling
     }
 
   update_begin (root);
-  bool paused = write_matrix (root, force_p, inhibit_scrolling, 1, false);
-  if (!paused)
-    make_matrix_current (root);
+  write_matrix (root, inhibit_scrolling, 1, false);
+  make_matrix_current (root);
   update_end (root);
 
   /* If a child is displayed, and the cursor is displayed in another
-     frame, the child might lay above the cursor, so that it appers to
+     frame, the child might lay above the cursor, so that it appears to
      "shine through" the child.  Avoid that because it's confusing.  */
   if (topmost_child)
     terminal_cursor_magic (root, topmost_child);
@@ -3992,66 +3981,33 @@ combine_updates_for_frame (struct frame *f, bool force_p, bool inhibit_scrolling
       add_frame_display_history (f, false);
 #endif
     }
-
-  return paused;
 }
 
 /* Update on the screen all root frames ROOTS.  Called from
    redisplay_internal as the last step of redisplaying.  */
 
-bool
-combine_updates (Lisp_Object roots, bool force_p, bool inhibit_scrolling)
+void
+combine_updates (Lisp_Object roots, bool inhibit_scrolling)
 {
-  if (redisplay_dont_pause)
-    force_p = true;
-
   for (; CONSP (roots); roots = XCDR (roots))
     {
       struct frame *root = XFRAME (XCAR (roots));
-      if (combine_updates_for_frame (root, force_p, inhibit_scrolling))
-	{
-	  display_completed = false;
-	  return true;
-	}
+      combine_updates_for_frame (root, inhibit_scrolling);
     }
-
-  display_completed = true;
-  return false;
 }
 
 /* Update frame F based on the data in desired matrices.
+   If INHIBIT_SCROLLING, don't try scrolling. */
 
-   If FORCE_P, don't let redisplay be stopped by detecting pending input.
-   If INHIBIT_SCROLLING, don't try scrolling.
-
-   Value is true if redisplay was stopped due to pending input.  */
-
-bool
-update_frame (struct frame *f, bool force_p, bool inhibit_scrolling)
+void
+update_frame (struct frame *f, bool inhibit_scrolling)
 {
-  struct window *root_window = XWINDOW (f->root_window);
-
-  if (redisplay_dont_pause)
-    force_p = true;
-  else if (!force_p && detect_input_pending_ignore_squeezables ())
-    {
-      /* Reset flags indicating that a window should be updated.  */
-      set_window_update_flags (root_window, false);
-      display_completed = false;
-      return true;
-    }
-
-  bool paused;
   if (FRAME_WINDOW_P (f))
-    paused = update_window_frame (f, force_p);
+    update_window_frame (f);
   else if (FRAME_INITIAL_P (f))
-    paused = update_initial_frame (f, force_p);
+    update_initial_frame (f);
   else
-    paused = update_tty_frame (f, force_p);
-
-  if (paused)
-    display_completed = false;
-  return paused;
+    update_tty_frame (f);
 }
 
 /* Update a TTY frame F that has a menu dropped down over some of its
@@ -4077,7 +4033,7 @@ update_frame_with_menu (struct frame *f, int row, int col)
   cursor_at_point_p = !(row >= 0 && col >= 0);
   /* Do not stop due to pending input, and do not try scrolling.  This
      means that write_glyphs will always return false.  */
-  write_matrix (f, 1, 1, cursor_at_point_p, true);
+  write_matrix (f, 1, cursor_at_point_p, true);
   make_matrix_current (f);
   clear_desired_matrices (f);
   /* ROW and COL tell us where in the menu to position the cursor, so
@@ -4100,7 +4056,6 @@ update_frame_with_menu (struct frame *f, int row, int col)
 
   /* Reset flags indicating that a window should be updated.  */
   set_window_update_flags (root_window, false);
-  display_completed = true;
 }
 
 /* Update the mouse position for a frame F.  This handles both
@@ -4156,30 +4111,24 @@ properties or updating the help echo text.  */)
 			 Window-based updates
  ************************************************************************/
 
-/* Perform updates in window tree rooted at W.
-   If FORCE_P, don't stop updating if input is pending.  */
+/* Perform updates in window tree rooted at W.  */
 
-static bool
-update_window_tree (struct window *w, bool force_p)
+static void
+update_window_tree (struct window *w)
 {
-  bool paused_p = 0;
-
-  while (w && !paused_p)
+  while (w)
     {
       if (WINDOWP (w->contents))
-	paused_p |= update_window_tree (XWINDOW (w->contents), force_p);
+	update_window_tree (XWINDOW (w->contents));
       else if (w->must_be_updated_p)
-	paused_p |= update_window (w, force_p);
+	update_window (w);
 
       w = NILP (w->next) ? 0 : XWINDOW (w->next);
     }
-
-  return paused_p;
 }
 
 
-/* Update window W if its flag must_be_updated_p is set.
-   If FORCE_P, don't stop updating if input is pending.  */
+/* Update window W if its flag must_be_updated_p is set.  */
 
 void
 update_single_window (struct window *w)
@@ -4190,7 +4139,7 @@ update_single_window (struct window *w)
 
       /* Update W.  */
       update_begin (f);
-      update_window (w, true);
+      update_window (w);
       update_end (f);
 
       /* Reset flag in W.  */
@@ -4330,15 +4279,12 @@ check_current_matrix_flags (struct window *w)
 #endif /* GLYPH_DEBUG */
 
 
-/* Update display of window W.
-   If FORCE_P, don't stop updating when input is pending.  */
+/* Update display of window W.  */
 
-static bool
-update_window (struct window *w, bool force_p)
+static void
+update_window (struct window *w)
 {
   struct glyph_matrix *desired_matrix = w->desired_matrix;
-  bool paused_p;
-  int preempt_count = clip_to_bounds (1, baud_rate / 2400 + 1, INT_MAX);
 #ifdef HAVE_WINDOW_SYSTEM
   struct redisplay_interface *rif = FRAME_RIF (XFRAME (WINDOW_FRAME (w)));
 #endif
@@ -4347,224 +4293,200 @@ update_window (struct window *w, bool force_p)
   eassert (FRAME_WINDOW_P (XFRAME (WINDOW_FRAME (w))));
 #endif
 
-  /* Check pending input the first time so that we can quickly return.  */
-  if (!force_p)
-    detect_input_pending_ignore_squeezables ();
-
   /* If forced to complete the update, no input is pending, or we are
      tracking the mouse, do the update.  */
-  if (force_p || !input_pending || !NILP (track_mouse))
-    {
-      struct glyph_row *row, *end;
-      struct glyph_row *mode_line_row;
-      struct glyph_row *tab_line_row;
-      struct glyph_row *header_line_row;
-      int yb;
-      bool changed_p = 0, mouse_face_overwritten_p = 0;
-      int n_updated = 0;
-      bool invisible_rows_marked = false;
+  struct glyph_row *row, *end;
+  struct glyph_row *mode_line_row;
+  struct glyph_row *tab_line_row;
+  struct glyph_row *header_line_row;
+  int yb;
+  bool changed_p = 0, mouse_face_overwritten_p = 0;
+  bool invisible_rows_marked = false;
 
 #ifdef HAVE_WINDOW_SYSTEM
-      gui_update_window_begin (w);
+  gui_update_window_begin (w);
 #else
-      (void) changed_p;
+  (void) changed_p;
 #endif
-      yb = window_text_bottom_y (w);
-      row = MATRIX_ROW (desired_matrix, 0);
-      end = MATRIX_MODE_LINE_ROW (desired_matrix);
+  yb = window_text_bottom_y (w);
+  row = MATRIX_ROW (desired_matrix, 0);
+  end = MATRIX_MODE_LINE_ROW (desired_matrix);
 
-      /* Take note of the tab line, if there is one.  We will
-	 update it below, after updating all of the window's lines.  */
-      if (row->mode_line_p && row->tab_line_p)
-	{
-	  tab_line_row = row;
-	  ++row;
-	}
-      else
-	tab_line_row = NULL;
+  /* Take note of the tab line, if there is one.  We will
+     update it below, after updating all of the window's lines.  */
+  if (row->mode_line_p && row->tab_line_p)
+    {
+      tab_line_row = row;
+      ++row;
+    }
+  else
+    tab_line_row = NULL;
 
-      /* Take note of the header line, if there is one.  We will
-	 update it below, after updating all of the window's lines.  */
-      if (row->mode_line_p)
-	{
-	  header_line_row = row;
-	  ++row;
-	}
-      else
-	header_line_row = NULL;
+  /* Take note of the header line, if there is one.  We will
+     update it below, after updating all of the window's lines.  */
+  if (row->mode_line_p)
+    {
+      header_line_row = row;
+      ++row;
+    }
+  else
+    header_line_row = NULL;
 
-      /* Update the mode line, if necessary.  */
-      mode_line_row = MATRIX_MODE_LINE_ROW (desired_matrix);
-      if (mode_line_row->mode_line_p && mode_line_row->enabled_p)
-	{
-	  mode_line_row->y = yb + WINDOW_SCROLL_BAR_AREA_HEIGHT (w);
-	  update_window_line (w, MATRIX_ROW_VPOS (mode_line_row,
-						  desired_matrix),
-			      &mouse_face_overwritten_p);
-	}
+  /* Update the mode line, if necessary.  */
+  mode_line_row = MATRIX_MODE_LINE_ROW (desired_matrix);
+  if (mode_line_row->mode_line_p && mode_line_row->enabled_p)
+    {
+      mode_line_row->y = yb + WINDOW_SCROLL_BAR_AREA_HEIGHT (w);
+      update_window_line (w, MATRIX_ROW_VPOS (mode_line_row,
+					      desired_matrix),
+			  &mouse_face_overwritten_p);
+    }
 
-      /* Find first enabled row.  Optimizations in redisplay_internal
-	 may lead to an update with only one row enabled.  There may
-	 be also completely empty matrices.  */
-      while (row < end && !row->enabled_p)
-	++row;
+  /* Find first enabled row.  Optimizations in redisplay_internal
+     may lead to an update with only one row enabled.  There may
+     be also completely empty matrices.  */
+  while (row < end && !row->enabled_p)
+    ++row;
 
-      /* Try reusing part of the display by copying.  */
-      if (row < end && !desired_matrix->no_scrolling_p)
+  /* Try reusing part of the display by copying.  */
+  if (row < end && !desired_matrix->no_scrolling_p)
+    {
+      int rc = scrolling_window (w, (tab_line_row != NULL ? 1 : 0)
+				    + (header_line_row != NULL ? 1 : 0));
+      if (rc < 0)
 	{
-	  int rc = scrolling_window (w, (tab_line_row != NULL ? 1 : 0)
-				     + (header_line_row != NULL ? 1 : 0));
-	  if (rc < 0)
-	    {
-	      /* All rows were found to be equal.  */
-	      paused_p = 0;
-	      goto set_cursor;
-	    }
-	  else if (rc > 0)
-	    {
-	      /* We've scrolled the display.  */
-	      force_p = 1;
-	      changed_p = 1;
-	    }
+	  /* All rows were found to be equal.  */
+	  goto set_cursor;
+	}
+      else if (rc > 0)
+	{
+	  /* We've scrolled the display.  */
+	  changed_p = 1;
 	}
+    }
 
-      /* Update the rest of the lines.  */
-      for (; row < end && (force_p || !input_pending); ++row)
-	/* scrolling_window resets the enabled_p flag of the rows it
-	   reuses from current_matrix.  */
-	if (row->enabled_p)
+  /* Update the rest of the lines.  */
+  for (; row < end; ++row)
+    /* scrolling_window resets the enabled_p flag of the rows it
+       reuses from current_matrix.  */
+    if (row->enabled_p)
+      {
+	int vpos = MATRIX_ROW_VPOS (row, desired_matrix);
+	int i;
+
+	changed_p |= update_window_line (w, vpos,
+					 &mouse_face_overwritten_p);
+
+	/* Mark all rows below the last visible one in the current
+	   matrix as invalid.  This is necessary because of
+	   variable line heights.  Consider the case of three
+	   successive redisplays, where the first displays 5
+	   lines, the second 3 lines, and the third 5 lines again.
+	   If the second redisplay wouldn't mark rows in the
+	   current matrix invalid, the third redisplay might be
+	   tempted to optimize redisplay based on lines displayed
+	   in the first redisplay.  */
+	if (MATRIX_ROW_BOTTOM_Y (row) >= yb)
 	  {
-	    int vpos = MATRIX_ROW_VPOS (row, desired_matrix);
-	    int i;
-
-	    /* We'll have to play a little bit with when to
-	       detect_input_pending.  If it's done too often,
-	       scrolling large windows with repeated scroll-up
-	       commands will too quickly pause redisplay.  */
-	    if (!force_p && ++n_updated % preempt_count == 0)
-	      detect_input_pending_ignore_squeezables ();
-	    changed_p |= update_window_line (w, vpos,
-					     &mouse_face_overwritten_p);
-
-	    /* Mark all rows below the last visible one in the current
-	       matrix as invalid.  This is necessary because of
-	       variable line heights.  Consider the case of three
-	       successive redisplays, where the first displays 5
-	       lines, the second 3 lines, and the third 5 lines again.
-	       If the second redisplay wouldn't mark rows in the
-	       current matrix invalid, the third redisplay might be
-	       tempted to optimize redisplay based on lines displayed
-	       in the first redisplay.  */
-	    if (MATRIX_ROW_BOTTOM_Y (row) >= yb)
-	      {
-		for (i = vpos + 1; i < w->current_matrix->nrows - 1; ++i)
-		  SET_MATRIX_ROW_ENABLED_P (w->current_matrix, i, false);
-		invisible_rows_marked = true;
-	      }
+	    for (i = vpos + 1; i < w->current_matrix->nrows - 1; ++i)
+	      SET_MATRIX_ROW_ENABLED_P (w->current_matrix, i, false);
+	    invisible_rows_marked = true;
 	  }
+      }
 
-      /* If the window doesn't display its mode line, make sure the
-         corresponding row of the current glyph matrix is disabled, so
-         that if and when the mode line is displayed again, it will be
-         cleared and completely redrawn.  */
-      if (!window_wants_mode_line (w))
-	SET_MATRIX_ROW_ENABLED_P (w->current_matrix,
-				  w->current_matrix->nrows - 1, false);
-
-      /* Was display preempted?  */
-      paused_p = row < end;
-
-      if (!paused_p && !invisible_rows_marked)
+  /* If the window doesn't display its mode line, make sure the
+     corresponding row of the current glyph matrix is disabled, so
+     that if and when the mode line is displayed again, it will be
+     cleared and completely redrawn.  */
+  if (!window_wants_mode_line (w))
+    SET_MATRIX_ROW_ENABLED_P (w->current_matrix,
+			      w->current_matrix->nrows - 1, false);
+
+  if (!invisible_rows_marked)
+    {
+      /* If we didn't mark the invisible rows in the current
+	 matrix as invalid above, do that now.  This can happen if
+	 scrolling_window updates the last visible rows of the
+	 current matrix, in which case the above loop doesn't get
+	 to examine the last visible row.  */
+      int i;
+      for (i = 0; i < w->current_matrix->nrows - 1; ++i)
 	{
-	  /* If we didn't mark the invisible rows in the current
-	     matrix as invalid above, do that now.  This can happen if
-	     scrolling_window updates the last visible rows of the
-	     current matrix, in which case the above loop doesn't get
-	     to examine the last visible row.  */
-	  int i;
-	  for (i = 0; i < w->current_matrix->nrows - 1; ++i)
+	  struct glyph_row *current_row = MATRIX_ROW (w->current_matrix, i);
+	  if (current_row->enabled_p
+	      && MATRIX_ROW_BOTTOM_Y (current_row) >= yb)
 	    {
-	      struct glyph_row *current_row = MATRIX_ROW (w->current_matrix, i);
-	      if (current_row->enabled_p
-		  && MATRIX_ROW_BOTTOM_Y (current_row) >= yb)
-		{
-		  for (++i ; i < w->current_matrix->nrows - 1; ++i)
-		    SET_MATRIX_ROW_ENABLED_P (w->current_matrix, i, false);
-		}
+	      for (++i ; i < w->current_matrix->nrows - 1; ++i)
+		SET_MATRIX_ROW_ENABLED_P (w->current_matrix, i, false);
 	    }
 	}
+    }
 
-    set_cursor:
+ set_cursor:
 
-      /* Update the tab line after scrolling because a new tab
-	 line would otherwise overwrite lines at the top of the window
-	 that can be scrolled.  */
-      if (tab_line_row && tab_line_row->enabled_p)
-	{
-	  tab_line_row->y = 0;
-	  update_window_line (w, 0, &mouse_face_overwritten_p);
-	}
+  /* Update the tab line after scrolling because a new tab
+     line would otherwise overwrite lines at the top of the window
+     that can be scrolled.  */
+  if (tab_line_row && tab_line_row->enabled_p)
+    {
+      tab_line_row->y = 0;
+      update_window_line (w, 0, &mouse_face_overwritten_p);
+    }
 
-      /* Update the header line after scrolling because a new header
-	 line would otherwise overwrite lines at the top of the window
-	 that can be scrolled.  */
-      if (header_line_row && header_line_row->enabled_p)
-	{
-	  header_line_row->y = tab_line_row ? CURRENT_TAB_LINE_HEIGHT (w) : 0;
-	  update_window_line (w, tab_line_row ? 1 : 0, &mouse_face_overwritten_p);
-	}
+  /* Update the header line after scrolling because a new header
+     line would otherwise overwrite lines at the top of the window
+     that can be scrolled.  */
+  if (header_line_row && header_line_row->enabled_p)
+    {
+      header_line_row->y = tab_line_row ? CURRENT_TAB_LINE_HEIGHT (w) : 0;
+      update_window_line (w, tab_line_row ? 1 : 0, &mouse_face_overwritten_p);
+    }
 
-      /* Fix the appearance of overlapping/overlapped rows.  */
-      if (!paused_p && !w->pseudo_window_p)
-	{
+  /* Fix the appearance of overlapping/overlapped rows.  */
+  if (!w->pseudo_window_p)
+    {
 #ifdef HAVE_WINDOW_SYSTEM
-	  if (changed_p && rif->fix_overlapping_area)
-	    {
-	      redraw_overlapped_rows (w, yb);
-	      redraw_overlapping_rows (w, yb);
-	    }
+      if (changed_p && rif->fix_overlapping_area)
+	{
+	  redraw_overlapped_rows (w, yb);
+	  redraw_overlapping_rows (w, yb);
+	}
 #endif
 
-	  /* Make cursor visible at cursor position of W.  */
-	  set_window_cursor_after_update (w);
+      /* Make cursor visible at cursor position of W.  */
+      set_window_cursor_after_update (w);
 
 #if 0 /* Check that current matrix invariants are satisfied.  This is
-	 for debugging only.  See the comment of check_matrix_invariants.  */
-	  IF_DEBUG (check_matrix_invariants (w));
+ for debugging only.  See the comment of check_matrix_invariants.  */
+    IF_DEBUG (check_matrix_invariants (w));
 #endif
-	}
+    }
 
 #ifdef GLYPH_DEBUG
-      /* Remember the redisplay method used to display the matrix.  */
-      strcpy (w->current_matrix->method, w->desired_matrix->method);
+  /* Remember the redisplay method used to display the matrix.  */
+  strcpy (w->current_matrix->method, w->desired_matrix->method);
 #endif
 
 #ifdef HAVE_WINDOW_SYSTEM
-      update_window_fringes (w, 0);
+  update_window_fringes (w, 0);
 
-      /* End the update of window W.  Don't set the cursor if we
-         paused updating the display because in this case,
-         set_window_cursor_after_update hasn't been called, and
-         W->output_cursor doesn't contain the cursor location.  */
-      gui_update_window_end (w, !paused_p, mouse_face_overwritten_p);
+  /* End the update of window W.  Don't set the cursor if we
+     paused updating the display because in this case,
+     set_window_cursor_after_update hasn't been called, and
+     W->output_cursor doesn't contain the cursor location.  */
+  gui_update_window_end (w, true, mouse_face_overwritten_p);
 #endif
-      /* If the update wasn't interrupted, this window has been
-	 completely updated.  */
-      if (!paused_p)
-	w->must_be_updated_p = false;
-    }
-  else
-    paused_p = 1;
+  /* If the update wasn't interrupted, this window has been
+     completely updated.  */
+  w->must_be_updated_p = false;
 
 #ifdef GLYPH_DEBUG
   /* check_current_matrix_flags (w); */
-  add_window_display_history (w, w->current_matrix->method, paused_p);
+  add_window_display_history (w, w->current_matrix->method);
 #endif
 
   xwidget_end_redisplay (w, w->current_matrix);
   clear_glyph_matrix (desired_matrix);
-
-  return paused_p;
 }
 
 #ifdef HAVE_WINDOW_SYSTEM
@@ -5697,20 +5619,13 @@ tty_set_cursor (void)
 }
 
 /* Write desired matix of tty frame F and make it current.
-
-   FORCE_P means that the update should not be stopped by pending input.
    INHIBIT_ID_P means that scrolling by insert/delete should not be tried.
-   SET_CURSOR_P false means do not set cursor at point in selected window.
+   SET_CURSOR_P false means do not set cursor at point in selected window.  */
 
-   Value is true if update was stopped due to pending input.  */
-
-static bool
-write_matrix (struct frame *f, bool force_p, bool inhibit_id_p,
+static void
+write_matrix (struct frame *f, bool inhibit_id_p,
 	      bool set_cursor_p, bool updating_menu_p)
 {
-  if (!force_p && detect_input_pending_ignore_squeezables ())
-    return true;
-
   /* If we cannot insert/delete lines, it's no use trying it.  */
   if (!FRAME_LINE_INS_DEL_OK (f))
     inhibit_id_p = true;
@@ -5722,7 +5637,7 @@ write_matrix (struct frame *f, bool force_p, bool inhibit_id_p,
      i/d line if just want cursor motion.  */
   int first_row = first_enabled_row (f->desired_matrix);
   if (!inhibit_id_p && first_row >= 0)
-    force_p |= scrolling (f);
+    scrolling (f);
 
   /* Update the individual lines as needed.  Do bottom line first.  This
      is done so that messages are made visible when pausing.  */
@@ -5730,36 +5645,19 @@ write_matrix (struct frame *f, bool force_p, bool inhibit_id_p,
   if (MATRIX_ROW_ENABLED_P (f->desired_matrix, last_row))
     write_row (f, last_row, updating_menu_p);
 
-  bool pause_p = false;
   if (first_row >= 0)
-    {
-      const int preempt_count = clip_to_bounds (1, baud_rate / 2400 + 1, INT_MAX);
-
-      for (int i = first_row, n = 0; i < last_row; ++i)
-	if (MATRIX_ROW_ENABLED_P (f->desired_matrix, i))
-	  {
-	    if (!force_p && n % preempt_count == 0
-		&& detect_input_pending_ignore_squeezables ())
-	      {
-		pause_p = true;
-		break;
-	      }
-
-	    write_row (f, i, updating_menu_p);
-	    ++n;
-	  }
-    }
+    for (int i = first_row; i < last_row; ++i)
+      if (MATRIX_ROW_ENABLED_P (f->desired_matrix, i))
+	write_row (f, i, updating_menu_p);
 
   /* Now just clean up termcap drivers and set cursor, etc.  */
-  if (!pause_p && set_cursor_p)
+  if (set_cursor_p)
     tty_set_cursor ();
-
-  return pause_p;
 }
 
 /* Do line insertions/deletions on frame F for frame-based redisplay.  */
 
-static bool
+static void
 scrolling (struct frame *frame)
 {
   /* In fact this code should never be reached at all under
@@ -5796,7 +5694,7 @@ scrolling (struct frame *frame)
       if (!MATRIX_ROW_ENABLED_P (current_matrix, i))
 	{
 	  SAFE_FREE ();
-	  return false;
+	  return;
 	}
       old_hash[i] = line_hash_code (frame, MATRIX_ROW (current_matrix, i));
       if (! MATRIX_ROW_ENABLED_P (desired_matrix, i))
@@ -5827,7 +5725,7 @@ scrolling (struct frame *frame)
       || unchanged_at_bottom == height)
     {
       SAFE_FREE ();
-      return true;
+      return;
     }
 
   window_size = (height - unchanged_at_top
@@ -5857,7 +5755,6 @@ scrolling (struct frame *frame)
 
   SAFE_FREE ();
 #endif
-  return false;
 }
 
 
@@ -6989,27 +6886,18 @@ sit_for (Lisp_Object timeout, bool reading, int display_option)
 
 
 DEFUN ("redisplay", Fredisplay, Sredisplay, 0, 1, 0,
-       doc: /* Perform redisplay.
-Optional arg FORCE, if non-nil, prevents redisplay from being
-preempted by arriving input, even if `redisplay-dont-pause' is nil.
-If `redisplay-dont-pause' is non-nil (the default), redisplay is never
-preempted by arriving input, so FORCE does nothing.
-
-Return t if redisplay was performed, nil if redisplay was preempted
-immediately by pending input.  */)
+       doc : /* Perform redisplay.
+Optional arg FORCE exists for historical reasons and is ignored.
+Value is t if redisplay has been performed, nil if executing a
+keyboard macro.  */)
   (Lisp_Object force)
 {
   swallow_events (true);
-  if ((detect_input_pending_run_timers (1)
-       && NILP (force) && !redisplay_dont_pause)
-      || !NILP (Vexecuting_kbd_macro))
+  if (!NILP (Vexecuting_kbd_macro))
     return Qnil;
 
-  specpdl_ref count = SPECPDL_INDEX ();
-  if (!NILP (force) && !redisplay_dont_pause)
-    specbind (Qredisplay_dont_pause, Qt);
   redisplay_preserve_echo_area (2);
-  return unbind_to (count, Qt);
+  return Qt;
 }
 
 
@@ -7462,8 +7350,6 @@ syms_of_display (void)
   /* This is the "purpose" slot of a display table.  */
   DEFSYM (Qdisplay_table, "display-table");
   DEFSYM (Qframe__z_order_lessp, "frame--z-order-lessp");
-
-  DEFSYM (Qredisplay_dont_pause, "redisplay-dont-pause");
   DEFSYM (Qtty_non_selected_cursor, "tty-non-selected-cursor");
 
   DEFVAR_INT ("baud-rate", baud_rate,
@@ -7545,17 +7431,6 @@ It is also used for standard output and error streams.
 See `buffer-display-table' for more information.  */);
   Vstandard_display_table = Qnil;
 
-  DEFVAR_BOOL ("redisplay-dont-pause", redisplay_dont_pause,
-	       doc: /* Nil means display update is paused when input is detected.  */);
-  /* Contrary to expectations, a value of "false" can be detrimental to
-     responsiveness since aborting a redisplay throws away some of the
-     work already performed.  It's usually more efficient (and gives
-     more prompt feedback to the user) to let the redisplay terminate,
-     and just completely skip the next command's redisplay (which is
-     done regardless of this setting if there's pending input at the
-     beginning of the next redisplay).  */
-  redisplay_dont_pause = true;
-
   DEFVAR_LISP ("x-show-tooltip-timeout", Vx_show_tooltip_timeout,
 	      doc: /* The default timeout (in seconds) for `x-show-tip'.  */);
   Vx_show_tooltip_timeout = make_fixnum (5);
diff --git a/src/keyboard.c b/src/keyboard.c
index bfb5fd3592b..fe485a3efd6 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -2663,8 +2663,7 @@ read_char (int commandflag, Lisp_Object map,
 	swallow_events (false);		/* May clear input_pending.  */
 
       /* Redisplay if no pending input.  */
-      while (!(input_pending
-	       && (input_was_pending || !redisplay_dont_pause)))
+      while (!(input_pending && input_was_pending))
 	{
 	  input_was_pending = input_pending;
 	  if (help_echo_showing_p && !BASE_EQ (selected_window, minibuf_window))
diff --git a/src/minibuf.c b/src/minibuf.c
index e75ac5e51df..e50913a013f 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -914,9 +914,9 @@ read_minibuf (Lisp_Object map, Lisp_Object initial, Lisp_Object prompt,
       XWINDOW (minibuf_window)->cursor.x = 0;
       XWINDOW (minibuf_window)->must_be_updated_p = true;
       struct frame *sf = XFRAME (selected_frame);
-      update_frame (sf, true, true);
+      update_frame (sf, true);
       if (is_tty_frame (sf))
-	combine_updates_for_frame (sf, true, true);
+	combine_updates_for_frame (sf, true);
 
 #ifndef HAVE_NTGUI
       flush_frame (XFRAME (XWINDOW (minibuf_window)->frame));
diff --git a/src/xdisp.c b/src/xdisp.c
index 1f6fb438668..585a9f32956 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -1116,7 +1116,6 @@ static void set_iterator_to_next (struct it *, bool);
 static void mark_window_display_accurate_1 (struct window *, bool);
 static bool row_for_charpos_p (struct glyph_row *, ptrdiff_t);
 static bool cursor_row_p (struct glyph_row *);
-static int redisplay_mode_lines (Lisp_Object, bool);
 
 static void handle_line_prefix (struct it *);
 
@@ -13521,24 +13520,6 @@ echo_area_display (bool update_frame_p)
 	 here could cause confusion.  */
       if (update_frame_p && !redisplaying_p)
 	{
-	  int n = 0;
-
-	  /* If the display update has been interrupted by pending
-	     input, update mode lines in the frame.  Due to the
-	     pending input, it might have been that redisplay hasn't
-	     been called, so that mode lines above the echo area are
-	     garbaged.  This looks odd, so we prevent it here.  */
-	  if (!display_completed)
-	    {
-	      n = redisplay_mode_lines (FRAME_ROOT_WINDOW (f), false);
-
-#ifdef HAVE_WINDOW_SYSTEM
-              if (FRAME_WINDOW_P (f)
-                  && FRAME_RIF (f)->clear_under_internal_border)
-                FRAME_RIF (f)->clear_under_internal_border (f);
-#endif
-	    }
-
 	  if (window_height_changed_p
 	      /* Don't do this if Emacs is shutting down.  Redisplay
 	         needs to run hooks.  */
@@ -13547,13 +13528,10 @@ echo_area_display (bool update_frame_p)
 	      /* Must update other windows.  Likewise as in other
 		 cases, don't let this update be interrupted by
 		 pending input.  */
-	      specpdl_ref count = SPECPDL_INDEX ();
-	      specbind (Qredisplay_dont_pause, Qt);
 	      fset_redisplay (f);
 	      redisplay_internal ();
-	      unbind_to (count, Qnil);
 	    }
-	  else if (FRAME_WINDOW_P (f) && n == 0)
+	  else if (FRAME_WINDOW_P (f))
 	    {
 	      /* Window configuration is the same as before.
 		 Can do with a display update of the echo area,
@@ -13563,9 +13541,9 @@ echo_area_display (bool update_frame_p)
 	    }
 	  else
 	    {
-	      update_frame (f, true, true);
+	      update_frame (f, true);
 	      if (is_tty_frame (f))
-		combine_updates_for_frame (f, true, true);
+		combine_updates_for_frame (f, true);
 	    }
 
 	  /* If cursor is in the echo area, make sure that the next
@@ -16948,7 +16926,6 @@ redisplay_internal (void)
   struct window *w = XWINDOW (selected_window);
   struct window *sw;
   struct frame *fr;
-  bool pending;
   bool must_finish = false, match_p;
   struct text_pos tlbufpos, tlendpos;
   int number_of_visible_frames;
@@ -17034,7 +17011,6 @@ redisplay_internal (void)
   /* Remember the currently selected window.  */
   sw = w;
 
-  pending = false;
   forget_escape_and_glyphless_faces ();
 
   inhibit_free_realized_faces = false;
@@ -17594,7 +17570,7 @@ redisplay_internal (void)
 		    unrequest_sigio ();
 		  STOP_POLLING;
 
-		  pending |= update_frame (f, false, false);
+		  update_frame (f, false);
 		  /* On some platforms (at least MS-Windows), the
 		     scroll_run_hook called from scrolling_window
 		     called from update_frame could set the frame's
@@ -17616,27 +17592,24 @@ redisplay_internal (void)
 	}
 
       if (CONSP (tty_root_frames))
-	pending |= combine_updates (tty_root_frames, false, false);
+	combine_updates (tty_root_frames, false);
 
       eassert (EQ (XFRAME (selected_frame)->selected_window, selected_window));
 
-      if (!pending)
+      /* Do the mark_window_display_accurate after all windows have
+	 been redisplayed because this call resets flags in buffers
+	 which are needed for proper redisplay.  */
+      FOR_EACH_FRAME (tail, frame)
 	{
-	  /* Do the mark_window_display_accurate after all windows have
-	     been redisplayed because this call resets flags in buffers
-	     which are needed for proper redisplay.  */
-	  FOR_EACH_FRAME (tail, frame)
-	    {
-	      struct frame *f = XFRAME (frame);
-              if (f->updated_p)
-                {
-		  f->redisplay = false;
-		  f->garbaged = false;
-                  mark_window_display_accurate (f->root_window, true);
-                  if (FRAME_TERMINAL (f)->frame_up_to_date_hook)
-                    FRAME_TERMINAL (f)->frame_up_to_date_hook (f);
-                }
-	    }
+	  struct frame *f = XFRAME (frame);
+          if (f->updated_p)
+            {
+	      f->redisplay = false;
+	      f->garbaged = false;
+              mark_window_display_accurate (f->root_window, true);
+              if (FRAME_TERMINAL (f)->frame_up_to_date_hook)
+                FRAME_TERMINAL (f)->frame_up_to_date_hook (f);
+            }
 	}
     }
   else if (FRAME_REDISPLAY_P (sf))
@@ -17700,10 +17673,10 @@ redisplay_internal (void)
             }
 
 	  XWINDOW (selected_window)->must_be_updated_p = true;
-	  pending = update_frame (sf, false, false);
+	  update_frame (sf, false);
 
 	  if (is_tty_frame (sf))
-	    pending |= combine_updates_for_frame (sf, false, false);
+	    combine_updates_for_frame (sf, false);
 
 	  sf->cursor_type_changed = false;
 	  sf->inhibit_clear_image_cache = false;
@@ -17720,11 +17693,11 @@ redisplay_internal (void)
       if (mini_frame != sf)
 	{
 	  XWINDOW (mini_window)->must_be_updated_p = true;
-	  pending |= update_frame (mini_frame, false, false);
+	  update_frame (mini_frame, false);
 	  if (is_tty_frame (mini_frame))
-	    pending |= combine_updates_for_frame (mini_frame, false, false);
+	    combine_updates_for_frame (mini_frame, false);
 	  mini_frame->cursor_type_changed = false;
-          if (!pending && hscroll_retries <= MAX_HSCROLL_RETRIES
+          if (hscroll_retries <= MAX_HSCROLL_RETRIES
               && hscroll_windows (mini_window))
             {
               hscroll_retries++;
@@ -17733,47 +17706,26 @@ redisplay_internal (void)
 	}
     }
 
-  /* If display was paused because of pending input, make sure we do a
-     thorough update the next time.  */
-  if (pending)
+  if (!consider_all_windows_p)
     {
-      /* Prevent the optimization at the beginning of
-	 redisplay_internal that tries a single-line update of the
-	 line containing the cursor in the selected window.  */
-      CHARPOS (this_line_start_pos) = 0;
+      /* This has already been done above if
+	 consider_all_windows_p is set.  */
+      if (XBUFFER (w->contents)->text->redisplay
+	  && buffer_window_count (XBUFFER (w->contents)) > 1)
+	/* This can happen if b->text->redisplay was set during
+	   jit-lock.  */
+	propagate_buffer_redisplay ();
+      mark_window_display_accurate_1 (w, true);
 
-      /* Let the overlay arrow be updated the next time.  */
-      update_overlay_arrows (0);
+      /* Say overlay arrows are up to date.  */
+      update_overlay_arrows (1);
 
-      /* If we pause after scrolling, some rows in the current
-	 matrices of some windows are not valid.  */
-      if (!WINDOW_FULL_WIDTH_P (w)
-	  && !FRAME_WINDOW_P (XFRAME (w->frame)))
-	update_mode_lines = 36;
+      if (FRAME_TERMINAL (sf)->frame_up_to_date_hook != 0)
+	FRAME_TERMINAL (sf)->frame_up_to_date_hook (sf);
     }
-  else
-    {
-      if (!consider_all_windows_p)
-	{
-	  /* This has already been done above if
-	     consider_all_windows_p is set.  */
-	  if (XBUFFER (w->contents)->text->redisplay
-	      && buffer_window_count (XBUFFER (w->contents)) > 1)
-	    /* This can happen if b->text->redisplay was set during
-	       jit-lock.  */
-	    propagate_buffer_redisplay ();
-	  mark_window_display_accurate_1 (w, true);
 
-	  /* Say overlay arrows are up to date.  */
-	  update_overlay_arrows (1);
-
-	  if (FRAME_TERMINAL (sf)->frame_up_to_date_hook != 0)
-	    FRAME_TERMINAL (sf)->frame_up_to_date_hook (sf);
-	}
-
-      update_mode_lines = 0;
-      windows_or_buffers_changed = 0;
-    }
+  update_mode_lines = 0;
+  windows_or_buffers_changed = 0;
 
   /* Start SIGIO interrupts coming again.  Having them off during the
      code above makes it less likely one will discard output, but not
@@ -17789,26 +17741,23 @@ redisplay_internal (void)
      redisplay constructing glyphs, so simply exposing a frame won't
      display anything in this case.  So, we have to display these
      frames here explicitly.  */
-  if (!pending)
-    {
-      int new_count = 0;
-
-      FOR_EACH_FRAME (tail, frame)
-	{
-	  if (FRAME_REDISPLAY_P (XFRAME (frame)))
-	    new_count++;
-	}
+  int new_count = 0;
 
-      if (new_count != number_of_visible_frames)
-	windows_or_buffers_changed = 52;
+  FOR_EACH_FRAME (tail, frame)
+    {
+      if (FRAME_REDISPLAY_P (XFRAME (frame)))
+	new_count++;
     }
 
+    if (new_count != number_of_visible_frames)
+      windows_or_buffers_changed = 52;
+
   /* Change frame size now if a change is pending.  */
   do_pending_window_change (true);
 
   /* If we just did a pending size change, or have additional
      visible frames, or selected_window changed, redisplay again.  */
-  if ((windows_or_buffers_changed && !pending)
+  if (windows_or_buffers_changed
       || (WINDOWP (selected_window)
 	  && (w = XWINDOW (selected_window)) != sw))
     goto retry;
@@ -27432,60 +27381,6 @@ display_tty_menu_item (const char *item_text, int width, int face_id,
 			      Mode Line
  ***********************************************************************/
 
-/* Redisplay mode lines in the window tree whose root is WINDOW.
-   If FORCE, redisplay mode lines unconditionally.
-   Otherwise, redisplay only mode lines that are garbaged.  Value is
-   the number of windows whose mode lines were redisplayed.  */
-
-static int
-redisplay_mode_lines (Lisp_Object window, bool force)
-{
-  int nwindows = 0;
-
-  while (!NILP (window))
-    {
-      struct window *w = XWINDOW (window);
-
-      if (WINDOWP (w->contents))
-	nwindows += redisplay_mode_lines (w->contents, force);
-      else if (force
-	       || FRAME_GARBAGED_P (XFRAME (w->frame))
-	       || !MATRIX_MODE_LINE_ROW (w->current_matrix)->enabled_p)
-	{
-	  struct text_pos lpoint;
-	  struct buffer *old = current_buffer;
-
-	  /* Set the window's buffer for the mode line display.  */
-	  SET_TEXT_POS (lpoint, PT, PT_BYTE);
-	  set_buffer_internal_1 (XBUFFER (w->contents));
-
-	  /* Point refers normally to the selected window.  For any
-	     other window, set up appropriate value.  */
-	  if (!EQ (window, selected_window))
-	    {
-	      struct text_pos pt;
-
-	      CLIP_TEXT_POS_FROM_MARKER (pt, w->pointm);
-	      TEMP_SET_PT_BOTH (CHARPOS (pt), BYTEPOS (pt));
-	    }
-
-	  /* Display mode lines.  */
-	  clear_glyph_matrix (w->desired_matrix);
-	  if (display_mode_lines (w))
-	    ++nwindows;
-
-	  /* Restore old settings.  */
-	  set_buffer_internal_1 (old);
-	  TEMP_SET_PT_BOTH (CHARPOS (lpoint), BYTEPOS (lpoint));
-	}
-
-      window = w->next;
-    }
-
-  return nwindows;
-}
-
-
 /* Display the mode line, the header line, and the tab-line of window
    W.  Value is the sum number of mode lines, header lines, and tab
    lines actually displayed.  */

commit 1647086d6a3a560877f386b9d153c01270307f68
Author: Michael Albinus <michael.albinus@gmx.de>
Date:   Thu Dec 19 10:40:52 2024 +0100

    Fix display of obsolete variables in *Help*
    
    * doc/lispref/variables.texi (Variable Aliases):
    Mention `substitute-command-keys' in `make-obsolete-variable'.
    
    * lisp/font-lock.el: Revert last change.
    
    * lisp/help-fns.el (help-fns--var-obsolete):
    Apply `substitute-command-keys'.
    
    * lisp/emacs-lisp/byte-run.el (make-obsolete-variable):
    Adapt docstring.

diff --git a/doc/lispref/variables.texi b/doc/lispref/variables.texi
index 0e9124920d1..5010fea24a0 100644
--- a/doc/lispref/variables.texi
+++ b/doc/lispref/variables.texi
@@ -2647,10 +2647,10 @@ This function makes the byte compiler warn that the variable
 @var{obsolete-name} is obsolete.  If @var{current-name} is a symbol,
 it is the variable's new name; then the warning message says to use
 @var{current-name} instead of @var{obsolete-name}.  If
-@var{current-name} is a string, this is the message and there is no
-replacement variable.  @var{when} should be a string indicating when
-the variable was first made obsolete (usually a version number
-string).
+@var{current-name} is a string, this is the message (after passing
+through @code{substitute-command-keys}) and there is no replacement
+variable.  @var{when} should be a string indicating when the variable
+was first made obsolete (usually a version number string).
 
 The optional argument @var{access-type}, if non-@code{nil}, should
 specify the kind of access that will trigger obsolescence warnings; it
diff --git a/lisp/emacs-lisp/byte-run.el b/lisp/emacs-lisp/byte-run.el
index f1486f70634..13b43e82cc6 100644
--- a/lisp/emacs-lisp/byte-run.el
+++ b/lisp/emacs-lisp/byte-run.el
@@ -571,7 +571,8 @@ See the docstrings of `defalias' and `make-obsolete' for more details."
                                 &optional access-type)
   "Make the byte-compiler warn that OBSOLETE-NAME is obsolete.
 The warning will say that CURRENT-NAME should be used instead.
-If CURRENT-NAME is a string, that is the `use instead' message.
+If CURRENT-NAME is a string, that is the `use instead' message.  If it
+is a string, it is passed through `substitute-command-keys'.
 WHEN should be a string indicating when the variable
 was first made obsolete, for example a date or a release number.
 ACCESS-TYPE if non-nil should specify the kind of access that will trigger
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index 8103131315e..4c519ede88a 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -309,86 +309,86 @@ If a number, only buffers greater than this size have fontification messages."
 
 (make-obsolete-variable
  'font-lock-comment-face
- "use the quoted symbol instead: 'font-lock-comment-face" "31.1")
+ "use the quoted symbol instead: \\='font-lock-comment-face" "31.1")
 (defvar font-lock-comment-face		'font-lock-comment-face
   "Face name to use for comments.")
 
 (make-obsolete-variable
  'font-lock-comment-delimiter-face
- "use the quoted symbol instead: 'font-lock-comment-delimiter-face" "31.1")
+ "use the quoted symbol instead: \\='font-lock-comment-delimiter-face" "31.1")
 (defvar font-lock-comment-delimiter-face 'font-lock-comment-delimiter-face
   "Face name to use for comment delimiters.")
 
 (make-obsolete-variable
  'font-lock-string-face
- "use the quoted symbol instead: 'font-lock-string-face" "31.1")
+ "use the quoted symbol instead: \\='font-lock-string-face" "31.1")
 (defvar font-lock-string-face		'font-lock-string-face
   "Face name to use for strings.")
 
 (make-obsolete-variable
  'font-lock-doc-face
- "use the quoted symbol instead: 'font-lock-doc-face" "31.1")
+ "use the quoted symbol instead: \\='font-lock-doc-face" "31.1")
 (defvar font-lock-doc-face		'font-lock-doc-face
   "Face name to use for documentation.")
 
 (make-obsolete-variable
  'font-lock-doc-markup-face
- "use the quoted symbol instead: 'font-lock-doc-markup-face" "31.1")
+ "use the quoted symbol instead: \\='font-lock-doc-markup-face" "31.1")
 (defvar font-lock-doc-markup-face       'font-lock-doc-markup-face
   "Face name to use for documentation mark-up.")
 
 (make-obsolete-variable
  'font-lock-keyword-face
- "use the quoted symbol instead: 'font-lock-keyword-face" "31.1")
+ "use the quoted symbol instead: \\='font-lock-keyword-face" "31.1")
 (defvar font-lock-keyword-face		'font-lock-keyword-face
   "Face name to use for keywords.")
 
 (make-obsolete-variable
  'font-lock-builtin-face
- "use the quoted symbol instead: 'font-lock-builtin-face" "31.1")
+ "use the quoted symbol instead: \\='font-lock-builtin-face" "31.1")
 (defvar font-lock-builtin-face		'font-lock-builtin-face
   "Face name to use for builtins.")
 
 (make-obsolete-variable
  'font-lock-function-name-face
- "use the quoted symbol instead: 'font-lock-function-name-face" "31.1")
+ "use the quoted symbol instead: \\='font-lock-function-name-face" "31.1")
 (defvar font-lock-function-name-face	'font-lock-function-name-face
   "Face name to use for function names.")
 
 (make-obsolete-variable
  'font-lock-variable-name-face
- "use the quoted symbol instead: 'font-lock-variable-name-face" "31.1")
+ "use the quoted symbol instead: \\='font-lock-variable-name-face" "31.1")
 (defvar font-lock-variable-name-face	'font-lock-variable-name-face
   "Face name to use for variable names.")
 
 (make-obsolete-variable
  'font-lock-type-face
- "use the quoted symbol instead: 'font-lock-type-face" "31.1")
+ "use the quoted symbol instead: \\='font-lock-type-face" "31.1")
 (defvar font-lock-type-face		'font-lock-type-face
   "Face name to use for type and class names.")
 
 (make-obsolete-variable
  'font-lock-constant-face
- "use the quoted symbol instead: 'font-lock-constant-face" "31.1")
+ "use the quoted symbol instead: \\='font-lock-constant-face" "31.1")
 (defvar font-lock-constant-face		'font-lock-constant-face
   "Face name to use for constant and label names.")
 
 (make-obsolete-variable
  'font-lock-warning-face
- "use the quoted symbol instead: 'font-lock-warning-face" "31.1")
+ "use the quoted symbol instead: \\='font-lock-warning-face" "31.1")
 (defvar font-lock-warning-face		'font-lock-warning-face
   "Face name to use for things that should stand out.")
 
 (make-obsolete-variable
  'font-lock-negation-char-face
- "use the quoted symbol instead: 'font-lock-negation-char-face" "31.1")
+ "use the quoted symbol instead: \\='font-lock-negation-char-face" "31.1")
 (defvar font-lock-negation-char-face	'font-lock-negation-char-face
   "Face name to use for easy to overlook negation.
 This can be an \"!\" or the \"n\" in \"ifndef\".")
 
 (make-obsolete-variable
  'font-lock-preprocessor-face
- "use the quoted symbol instead: 'font-lock-preprocessor-face" "31.1")
+ "use the quoted symbol instead: \\='font-lock-preprocessor-face" "31.1")
 (defvar font-lock-preprocessor-face	'font-lock-preprocessor-face
   "Face name to use for preprocessor directives.")
 
diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index 157ec6b8d61..1fd86863a69 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -1717,7 +1717,7 @@ variable.\n")))
       (insert "This variable is obsolete")
       (if (nth 2 obsolete)
           (insert (format " since %s" (nth 2 obsolete))))
-      (insert (cond ((stringp use) (concat "; " use))
+      (insert (cond ((stringp use) (substitute-command-keys (concat "; " use)))
 		    (use (format-message "; use `%s' instead."
                                          (car obsolete)))
 		    (t "."))

commit 8aef5d224a6fccb675729748836d5ebfdcfa1101
Merge: ea865c98cf3 6fa2050ee76
Author: Gerd Möllmann <gerd@gnu.org>
Date:   Thu Dec 19 10:14:16 2024 +0100

    Merge branch 'scratch/tty-child-frames'
    
    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.
    
    * src/xfaces.c (free_frame_faces): Change formatting slightly.
    
    * src/xdisp.c (redisplay_trace, move_tracxe): Print to stderr because
    stdout screws up terminal display.
    (init_iterator): Remove a #ifdef HAVE_WINDOW_SYSTEM.
    (clear_garbaged_frames): Return a bool telling if we cleared matrix.
    (echo_area_display): Use combine_updates on tty frames.
    (redisplay_internal): Changes for redisplay of tty child windows.
    (deep_copy_glyph_row): Take a frame parameter.
    (display_tty_menu_item): Changes because of function signature changes.
    
    * src/w32term.c (w32_read_socket): Don't use FRAME_OBSCRURED_P,
    which has been removed.
    
    * src/w32inevt.c (do_mouse_event): Workaround for mouse events on
    child frafmes.
    
    * src/w32console.c (w32con_write_glyphs, w32con_update_end):
    Use glyphs' frame for faces.
    
    * src/treesit.c (treesit_load_language): Pacify a warning.
    
    * src/w32console.c (w32con_clear_end_of_line): Set glyph's frame.
    
    * src/terminal.c (cursor_to, raw_cursor_to): Handle case that
    frame is a child frame.
    
    * src/termhooks.h: Declare formerly static functions.
    
    * src/term.c (tty_hide_cursor, tty_show_cursor): Make externally
    visible.
    (tty_write_glyphs): Determine faces based on a glyph's frame.
    (tty_write_glyphs_with_face): Take a struct face argument instead
    of a face id.  Callers changed.
    (tty_insert_glyphs): Use faces, not face ids.
    (append_glyph, append_composite_glyph, append_glyphless_glyph):
    Set glyph's frame.
    (turn_on_face, turn_off_face): Take face argument instead of face
    id.  Callers adapted.
    (Fresume_tty): Act on root frame.
    (tty_draw_row_with_mouse_face): Handle child frames.
    (restore_desired_matrix): Make sure glyphs' is live.
    (set_tty_hooks): Set terminal's frame_raise_lower_hook.
    (tty_frame_geometry, Ftty_frame_geometry, Ftty_frame_edges)
    (Ftty_frame_list_z_order, Ftty_frame_restack)
    (tty_display_dimension, Ftty_display_pixel_width)
    (Ftty_display_pixel_height): New functions.
    (syms_of_term): Defsubr new Lisp functions.
    
    * src/minibuf.c (read_minibuf): Use combine_updates for tty
    frames.
    
    * src/frame.h (struct frame): Always define parent_frame.  Change
    'visible' to be a boolean.  Always define 'undecorated' and
    'no_accept_focus'.  Add 'z_order'.
    (FRAME_OBSCURED_P): Removed.
    (FRAME_PARENT_FRAME): Make it a function.
    (SET_FRAME_VISIBLE): Take a bool parameter, not an int.
    (FRAME_INTERNAL_BORDER_WIDTH): Don't special-base HAVE_WINDOW_SYSTEM.
    
    * src/frame.c (decode_tty_frame): New function.
    (set_menu_bar_lines): Set menu bar lines and height to 0 for tty
    child frames.  Compute min height differently.
    (adjust_frame_size): Set FrameCols/Rows only for root tty frames.
    Mark tty root frame garbaged if child frame is adjusted.  Run some
    code even if not HAVE_WINDOW_SYSTEM.
    (make_frame): Run some code even if not HAVE_WINDOW_SYSTEM.
    (make_terminal_frame): Implement child frame creation.
    (tty_child_pos_param, tty_child_size_param)
    (tty_child_frame_rect): New functions.
    (Fmake_terminal_frame): Parts rewritten for child frames.
    (do_switch_frame): Add child frame support.
    (Fframe_ancestor_p): Define if not HAVE_WINDOW_SYSTEM.
    (Fmake_frame_visible, Fmake_frame_invisible)
    (Fframe_visible_p, Fraise_frame):
    Handle tty frames differently.
    (store_frame_param): Signal error if trying to re-parent a tty
    child frame.
    (Fframe_parameters): Report some additional tty frame parameters.
    (Fmodify_frame_parameters): Handle tty child frames.
    (Fset_frame_position): Ditto.
    (frame_parms): Define index for additional frame parameters.
    (handle_frame_param): New function.
    (gui_set_frame_parameters_1): Use handle_frame_param.
    
    * src/disptab.h (DISP_TABLE_EXTRA_SLOTS): Change to 12.
    (enum box): New enumeration.
    
    * src/dispnew.c (check_rows): New function, #if 0.
    (frame_matrix_frame): Variable removed.
    (line_hash_code): Take glyph's frame into account.
    (build_frame_matrix_from_leaf_window): Do not copy glyphs from
    rows that aren't enabled.
    (fill_up_glyph_row_with_spaces): Add frame parameter, uses
    changed.
    (fill_up_glyph_row_area_with_spaces): Add frame parameter.  Set
    glyph's frame to it.
    (fill_up_frame_row_with_spaces): Ditto.
    (set_frame_matrix_frame): Function removed.
    (make_current): Change signature.  Callers changed.
    (mirrored_line_dance): Take a frame argument, not a matrix.
    (redraw_frame): Don't clear_frame a child frame.
    (struct rect): New.
    (rect_intersect, frame_pos_abs, frame_rect_abs, root_frame)
    (max_child_z_order, is_frame_ancestor, frames_with_root)
    (frames_with_parent, frame_z_order_cmp, Fframe__z_order_lessp)
    (frames_in_reverse_z_order, tty_raise_lower_frame, is_tty_frame)
    (is_tty_child_frame, is_tty_root_frame, first_enabled_row)
    (make_matrix_current, prepare_desired_root_row)
    (make_glyph_space, neutralize_wide_char, produce_box_glyphs)
    (produce_box_sides, produce_box_line, copy_child_glyphs)
    (update_window_frame, update_initial_frame, flush_terminal)
    (abs_cursor_pos, is_in_matrix, is_cursor_obscured)
    (terminal_cursor_magic, combine_updates_for_frame)
    (combine_updates): New functions.
    (update_frame): Rewritten.
    (Fdisplay__update_for_mouse_movement): Take a MOUSE_FRAME param.
    (syms_of_display): New symbol frame--z-order--lessp, tty-non-selected-cursor.
    New subr Sframe__z_order_lessp.  Provide tty-child-frames.
    
    * src/dispextern.h (struct glyph): Add member 'frame'.
    (CHAR_GLYPH_SPACE_P): Add FRAME parameter.  All uses changed.
    (GLYPH_EQUAL_P): Compare glyphs' frame.
    (SET_CHAR_GLYPH): Add parameter FRAME.
    (SET_CHAR_GLYPH_FROM_GLYPH): Ditto.
    
    * src/chartab.c (Fmake_char_table): Allow more than 10 display
    table slots.
    
    * lisp/xt-mouse.el (xterm-mouse--handle-mouse-movement): Use new
    terminal parameter xterm-mouse-frame.
    (xterm-mouse-position-function): Ditto.
    (xterm-mouse-event): Determine frame under mouse and compute
    frame-relative coordinates.  Set terminal parameter
    xterm-mouse-frame.
    
    * lisp/tty-tip.el: New file implementing tooltip for ttys.
    
    * lisp/paren.el (show-paren-function): Don't check if
    display-graphics-p when using child frames.
    
    * lisp/frame.el (frame-at): New function.
    (tty-frame-geometry, tty-frame-edges, tty-frame-restack)
    (tty-display-pixel-height, tty-frame-list-z-order)
    (tty-display-pixel-width): Declare C function.
    (frame-geometry): Use tty-frame-geometry.
    (frame-edges): Use tty-frame-edges.
    (frame-list-z-order): Use tty-frame-list-z-order.
    (frame-restack): Use tty-frame-restack.
    (display-pixel-height): Use tty-display-pixel-height.
    (display-pixel-width): Use tty-display-pixel-width.
    
    * lisp/disp-table.el (display-table): Increase size to 12.
    (box-horizontal, box-vertical, box-down-right, box-down-left)
    (box-up-right, box-up-left): New display table slot names for
    box-drawing characters.
    (display-table-slot, set-display-table-slot): Extend doc string.
    (describe-display-table): Display new display table slots.
    (standard-display-unicode-special-glyphs): New function setting
    up Unicode characters for display table entries.
    
    * .gitignore: Don't ignore patch files, they are useful to see in
    Magit status buffer when applying patches (git am).

commit 8f8da2d78545ea74853fd9b8d2156f4f93a2324a
Author: Andrea Corallo <acorallo@gnu.org>
Date:   Thu Dec 19 00:43:27 2024 +0100

    ; * ChangeLog.4: Update.

diff --git a/ChangeLog.4 b/ChangeLog.4
index 7cfdbd13184..280d59a5ff1 100644
--- a/ChangeLog.4
+++ b/ChangeLog.4
@@ -1,3 +1,855 @@
+2024-12-19  Andrea Corallo  <acorallo@gnu.org>
+
+	* Update authors.el
+
+	* admin/authors.el (authors-aliases, authors-valid-file-names)
+	(authors-renamed-files-alist): Add entry.
+
+2024-12-18  Eli Zaretskii  <eliz@gnu.org>
+
+	Document 'trusted-content
+
+	* doc/emacs/misc.texi (Host Security): Document 'trusted-content'.
+
+	* lisp/files.el (trusted-content): Doc fix.
+
+	* etc/NEWS: Mark its entry as "documented".
+
+2024-12-18  Robert Pluim  <rpluim@gmail.com>
+
+	Mention network-interface-list in network-interface-info docstring
+
+	* src/process.c (Fnetwork_interface_info): Reference
+	'network-interface-list'.
+
+2024-12-17  Stefan Kangas  <stefankangas@gmail.com>
+
+	Move NEWS items from unreleased 28.3 to released 29.1
+
+	* etc/NEWS.28: Remove empty sections for 28.3.
+	Move single pertinent item from here...
+	* etc/NEWS.29: ...to here.
+
+2024-12-17  Stefan Kangas  <stefankangas@gmail.com>
+
+	Improve browse-url-android-share docstring
+
+	* lisp/net/browse-url.el (browse-url-android-share): Clarify that
+	the option only applies to Android systems.
+
+2024-12-17  Stefan Kangas  <stefankangas@gmail.com>
+
+	Minor doc fix for url-handler-regexp
+
+	* lisp/url/url-handlers.el (url-handler-regexp): Remove mention of
+	obsolete internal protocol "about" (i.e. url-about.el).  Reflow.
+
+2024-12-16  Stefan Kangas  <stefankangas@gmail.com>
+
+	Improve reb-change-syntax docstring
+
+	* lisp/emacs-lisp/re-builder.el (reb-change-syntax): Improve docstring.
+
+2024-12-16  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* lisp/files.el (trusted-content-p): Make `:all` work in non-file buffers
+
+2024-12-15  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* lisp/org/ox-texinfo.el (org-texinfo-template): Fix Info format (bug#74844)
+
+2024-12-15  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	trusted-content: Adjust the last patch based on preliminary feedback
+
+	* lisp/files.el (trusted-content): Rename from `trusted-files`.
+	Update all references.
+
+	* lisp/progmodes/elisp-mode.el (lisp-interaction-mode):
+	* lisp/ielm.el (inferior-emacs-lisp-mode):
+	* lisp/simple.el (read--expression): Set `trusted-content` since
+	these buffers contain code that the user presumably intends to run anyway.
+	(elisp--safe-macroexpand-all): Make the warning more discreet.
+
+2024-12-15  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Update documentation of 'etags' regexps some more
+
+	* doc/emacs/maintaining.texi (Etags Regexps):
+	* doc/man/etags.1: Give more details about what's not supported.
+
+2024-12-15  Eli Zaretskii  <eliz@gnu.org>
+
+	Update documentation of 'etags' regexps
+
+	* doc/emacs/maintaining.texi (Etags Regexps):
+	* doc/man/etags.1: Say that shy groups are not supported (bug#74861).
+
+2024-12-14  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	elisp-mode.el: Disable Flymake byte-compile backend in untrusted files
+
+	To address serious security issues (CVE-2024-53920), disable
+	`elisp-flymake-byte-compile` except in those files explicitly
+	specified as "trusted".
+
+	For that introduce a new custom var `trusted-files` and new
+	function `trusted-content-p`.
+
+	While at it, similarly skip the implicit macroexpansion done during
+	completion if the current file is not trusted.
+
+	* lisp/files.el (trusted-files): New variable.
+	(trusted-content-p): New function.
+
+	* lisp/progmodes/elisp-mode.el (elisp--safe-macroexpand-all):
+	New function, extracted from `elisp--local-variables`.
+	Use `trusted-content-p`.
+	(elisp--local-variables): Use it.
+	(elisp-flymake-byte-compile): Disable according to `trusted-content-p`.
+
+2024-12-13  Stephen Gildea  <stepheng+emacs@gildea.com>
+
+	* lisp/time-stamp.el: Limit field width to two digits.
+
+2024-12-10  Philip Kaludercic  <philipk@posteo.net>
+
+	Revert "Attempt to install package first when upgrading"
+
+	This reverts commit 3d8e49c41a66a7f05cb96f84e2a10f0f308ac9ca.
+
+2024-12-10  Robert Pluim  <rpluim@gmail.com>
+
+	Fix 'gnus-select-method' custom type
+
+	* lisp/gnus/gnus.el (gnus-redefine-select-method-widget): Cater
+	for the 'gnus-search-engine' configuration variable, which takes
+	2 args instead of 1.   (Bug#74759)
+
+2024-12-10  Chu  <maedaqu@gmail.com>  (tiny change)
+
+	Fix typo in maps.texi
+
+	* doc/lispref/maps.texi (Standard Keymaps): Fix typo.  (Bug#74761)
+
+2024-12-09  Michael Albinus  <michael.albinus@gmx.de>
+
+	* doc/misc/tramp.texi (FUSE-based methods): Fix sshfs reference.
+
+2024-12-08  Stefan Kangas  <stefankangas@gmail.com>
+
+	Improve gnus.texi indexing
+
+	* doc/misc/gnus.texi (Common Variables): Improve indexing.
+
+2024-12-07  Philip Kaludercic  <philipk@posteo.net>
+
+	Attempt to install package first when upgrading
+
+	* lisp/emacs-lisp/package.el (package-upgrade): Swap the
+	'package-install' and the 'package-delete' invocations.
+	(Bug#74556)
+
+2024-12-07  john muhl  <jm@pub.pink>
+
+	Don't restrict 'lua-ts-send-file' to 'lua-ts-mode'
+
+	* lisp/progmodes/lua-ts-mode.el (lua-ts-send-file): Remove
+	restriction on interactive use.  Unlike related send-* commands
+	it can be useful to send a file to the Lua interpreter outside of
+	a 'lua-ts-mode' buffer.  (Bug#74705)
+
+2024-12-07  Vincenzo Pupillo  <vincenzo.pupillo@unimi.it>
+
+	Remove unnecessary function call from 'php-ts-mode'
+
+	* lisp/progmodes/php-ts-mode.el (php-ts-mode): Remove
+	unnecessary function call 'treesit-font-lock-recompute-features'.
+	(Bug#74688)
+
+	(cherry picked from commit c87c5b95e1309b59b6cb07d07a20234a74a73f35)
+
+2024-12-04  Robert Pluim  <rpluim@gmail.com>
+
+	Add tags to 'compilation-transform-file-match-alist' custom type
+
+	* lisp/progmodes/compile.el (compilation-filter-start): Add some
+	more meaningful tags, and switch to using 'radio' instead of
+	'choice'.
+
+2024-12-04  Robert Pluim  <rpluim@gmail.com>
+
+	Improve 'compilation-transform-file-match-alist' documentation
+
+	* doc/emacs/building.texi (Compilation Mode): Document
+	'compilation-transform-file-match-alist'.
+	* lisp/progmodes/compile.el
+	(compilation-transform-file-match-alist):
+	Expand docstring and add some examples.
+
+2024-12-04  Robert Pluim  <rpluim@gmail.com>
+
+	Improve 'compilation-hidden-output' docstring
+
+	* lisp/progmodes/compile.el (compilation-hidden-output): Escape
+	the newline so the example value is more suitable for copying.
+
+2024-12-04  Robert Pluim  <rpluim@gmail.com>
+
+	Improve docstrings of functions for moving to message headers
+
+	* lisp/gnus/message.el (message-goto-to, message-goto-from,
+	message-goto-subject, message-goto-cc, message-goto-bcc,
+	message-goto-fcc, message-goto-reply-to,
+	message-goto-newsgroups, message-goto-distribution,
+	message-goto-followup-to, message-goto-mail-followup-to,
+	message-goto-keywords, message-goto-summary): Mention that these
+	will insert an empty header if the header is not found.
+	(message-position-on-field): Explain that this inserts an empty
+	header if the header is missing, and that insertion is done
+	after the headers mentioned in AFTERS.
+
+	(cherry picked from commit 9f266e2d7cde41f5872304bae0b6d2415655f1c8)
+
+2024-12-03  Stephen Berman  <stephen.berman@gmx.net>
+
+	Fix the latest dabbrev-expand test fix
+
+	* test/lisp/dabbrev-tests.el (dabbrev-expand-after-killing-buffer):
+	In batch runs of this file, the user-error message contains curved
+	quotes, but grave quotes when running `make check' (so here was
+	evidently not passed to `substitute-command-keys'), so use grave
+	quotes so the test succeeds in both modes of execution.
+
+2024-12-02  Michael Albinus  <michael.albinus@gmx.de>
+
+	Fix password prompt in comint (don't merge)
+
+	* lisp/comint.el (comint-watch-for-password-prompt): Use whole
+	string for setting the prompt.  (Bug#74626)
+
+2024-12-02  Manuel Giraud  <manuel@ledu-giraud.fr>
+
+	Fix the version of librsvg API change
+
+	* src/image.c (init_svg_functions, svg_load_image): The first
+	official version that introduces
+	'rsvg_handle_get_pixbuf_and_error' is 2.59.0 not 2.58.0.
+	(Bug#74606)
+
+2024-12-02  Stephen Berman  <stephen.berman@gmx.net>
+
+	Fix latest test for dabbrev-expand
+
+	* test/lisp/dabbrev-tests.el (dabbrev-expand-after-killing-buffer):
+	Fix typo in a 'should' test, use part of return value of 'should-error'
+	test, and remove mistaken and unfounded FIXME comment.
+
+2024-12-01  Yuan Fu  <casouri@gmail.com>
+
+	Allow passing nil to treesit-node-match-p (bug#74612)
+
+	* src/treesit.c (Ftreesit_node_match_p): Return nil if NODE is nil.
+
+2024-12-01  Manuel Giraud  <manuel@ledu-giraud.fr>
+
+	Update to version 2.58 of librsvg API (bug#74606)
+
+	* src/image.c (init_svg_functions): Declare new function.
+	(svg_load_image): Use it.
+
+2024-12-01  Visuwesh  <visuweshm@gmail.com>
+
+	Fix decoding of non-ASCII email attachments
+
+	* lisp/mail/rfc2231.el (rfc2231-parse-string): Fix logic when a
+	non-ASCII file name is split between two filename*N* parts.
+	(Bug#74624)
+
+2024-11-30  Stephen Berman  <stephen.berman@gmx.net>
+
+	Prevent "Selecting deleted buffer" error with dabbrev-expand
+
+	* lisp/dabbrev.el (dabbrev-expand): Use the buffer where the last
+	expansion was found only if it is still a live buffer (bug#74090).
+
+	* test/lisp/dabbrev-tests.el (dabbrev-expand-test-minibuffer-3):
+	Fix typo in doc string.
+	(dabbrev-expand-after-killing-buffer): New test.
+
+2024-11-30  Yuan Fu  <casouri@gmail.com>
+
+	Fix docstring of c-ts-mode-indent-style
+
+	* lisp/progmodes/c-ts-mode.el (c-ts-mode-indent-style): Make the
+	docstring reflect what's expected by the code.
+
+2024-11-29  Vincenzo Pupillo  <v.pupillo@gmail.com>
+
+	Support PHP 8.4 and more reliable indentation (bug#74525)
+
+	Added support for PHP 8.4 property hook. More reliable CSS and
+	Javascript syntax indentation when there are attributes in
+	<script> and <style>.
+
+	* lisp/progmodes/php-ts-mode.el:
+	(php-ts-mode--language-source-alist): Switch to the latest php
+	grammar.
+	(php-ts-mode--js-css-tag-bol): CSS and Javascript indentation is
+	now more more reliable in different formatting styles.
+	(php-ts-mode--test-property-hook-clause-p): New function that
+	tests property_hook support.
+	(php-ts-mode--font-lock-settings): Use the new function.
+	(php-ts-mode--colorize-css-value): The function now behaves
+	exactly like the one in css-ts-mode.
+	(php-ts-mode--feature-list): Changed the list to match
+	css-ts-mode.
+
+2024-11-28  Martin Rudalics  <rudalics@gmx.at>
+
+	Don't inadvertently reset frame scroll bar sizes (Bug#74435)
+
+	* src/frame.c (gui_set_scroll_bar_width)
+	(gui_set_scroll_bar_height): When the new size equals the old one
+	do not reset size to default size (Bug#74435).
+
+2024-11-28  Mike Kupfer  <kupfer@rawbw.com>
+
+	Mention special variables in lexical binding documentation
+
+	* doc/lispref/variables.texi (Lexical Binding): Briefly mention
+	special variables and their semantics.  (Bug#74540)
+
+2024-11-28  Eli Zaretskii  <eliz@gnu.org>
+
+	Allow to go back to using 'ruby-mode' after loading 'ruby-ts-mode'
+
+	* lisp/progmodes/ruby-ts-mode.el (major-mode-remap-defaults):
+	Remap 'ruby-mode' to 'ruby-ts-mode'.  Add commentary.
+	* lisp/progmodes/ruby-mode.el (major-mode-remap-defaults): Remove
+	any remappings of ruby-mode'.
+	* lisp/progmodes/c-ts-mode.el: Fix a typo in a comment.  (Bug#74339)
+
+2024-11-25  Stefan Kangas  <stefankangas@gmail.com>
+
+	Delete obsolete section in admin/notes/repo
+
+	* admin/notes/repo: Delete section "How to merge changes from emacs-24
+	to master", which is documented in admin/notes/git-workflow.  Also
+	delete out-of-date autoload advice.
+
+2024-11-25  Joost Kremers  <joostkremers@fastmail.com>
+
+	Improve documentation for 'while-let'
+
+	* doc/lispref/control.texi (Conditionals): Reorganise describing
+	what's overlapping between the macros (and between the macros
+	and let*), and then improve the documentation for 'while-let'.
+
+2024-11-25  Yuan Fu  <casouri@gmail.com>
+
+	Remove mention of treesit-defun-prefer-top-level (bug#74474)
+
+	treesit-defun-prefer-top-level is removed before Emacs 29
+	released and was replaced by treesit-defun-tactic.  These
+	statements that set it doesn't do anything other than introduce
+	confusion, so we should remove them.
+
+	* lisp/progmodes/c-ts-mode.el (c-ts-base-mode):
+	* lisp/progmodes/js.el (js-ts-mode):
+	* lisp/progmodes/php-ts-mode.el (php-ts-mode):
+	* lisp/progmodes/ruby-ts-mode.el (ruby-ts-mode):
+	* lisp/progmodes/typescript-ts-mode.el:
+	(typescript-ts-base-mode):
+	Remove statements setting treesit-defun-prefer-top-level.
+
+2024-11-24  Aaron Jensen  <aaronjensen@gmail.com>
+
+	Fix NS non-native fullscreen on initial frame load (bug#59790)
+
+	* src/nsterm.m ([EmacsView toggleFullScreen:]): Reset fs_is_native
+
+2024-11-24  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix user options for listing and marking diary files
+
+	* lisp/calendar/diary-lib.el (diary-nongregorian-listing-hook)
+	(diary-nongregorian-marking-hook): Add Chinese functions to the
+	list of variable's options.  (Bug#74498)
+
+2024-11-24  john muhl  <jm@pub.pink>
+
+	Avoid loading 'rx' at runtime in 'lua-ts-mode'
+
+	* lisp/progmodes/lua-ts-mode.el (lua-ts-inferior-lua):
+	Replace 'rx-to-string' and substitution with 'rx' and 'literal'.
+	(Bug#74499)
+
+	(cherry picked from commit e71d714a815e1088f8cfe946b1e431356ec85b24)
+
+2024-11-23  Eli Zaretskii  <eliz@gnu.org>
+
+	Make 'jsonrpc-default-request-timeout' a defcustom
+
+	* lisp/jsonrpc.el (jsonrpc-default-request-timeout): New
+	defcustom, replaces a defconst.
+	(jsonrpc): New customization group.
+
+	* etc/NEWS: Announce the change.  (Bug#74338)
+
+2024-11-23  Eli Zaretskii  <eliz@gnu.org>
+
+	Update MS-Windows build instructions
+
+	* nt/INSTALL.W64:
+	* nt/README.W32: Update the name of the MSYS2 libtree-sitter
+	distribution.  Reported by Nerd <hiweedmandriva3@163.com>.
+	(Bug#74429)
+
+2024-11-22  Laurence Warne  <laurencewarne@gmail.com>
+
+	Skip proced refine tests on Darwin
+
+	* test/lisp/proced-tests.el (proced-refine-test)
+	(proced-refine-with-update-test): Skip if the system is Darwin.
+
+2024-11-21  Eli Zaretskii  <eliz@gnu.org>
+
+	Future-proof loading tree-sitter library on MS-Windows
+
+	* src/treesit.c (syms_of_treesit) <tree-sitter--library-abi>: New
+	internal variable.
+
+	* lisp/term/w32-win.el (dynamic-library-alist): Use
+	'tree-sitter--library-abi' to select a proper libtree-sitter DLL
+	version.
+
+2024-11-21  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix overriding 'c-ts-mode' by 'c-mode'
+
+	* lisp/progmodes/c-ts-mode.el: Remove all c- and c++-mode
+	associations from 'major-mode-remap-defaults' before installing
+	entries that remap to 'c-ts-mode' and 'c++-ts-mode'.  (Bug#74339)
+
+2024-11-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	lisp/progmodes/c-ts-mode.el: Demote loading c-ts-mode as a configuration
+
+	See bug#74367.
+
+2024-11-16  F. Jason Park  <jp@neverwas.me>
+
+	Backport: Don't autoload erc-modules
+
+	* doc/misc/erc.texi (Modules): Recommend using `describe-variable'
+	instead of `customize-option' because the latter needs the symbol to be
+	loaded.
+	* lisp/erc/erc.el (erc-modules): Remove autoload cookie because it
+	caused customizations for this option to load the main library.  This
+	reverts the thrust of bb894845 "Teach customize-option about
+	erc-modules", which was added in ERC 5.6 and Emacs 30.  The motivation
+	for the original offending change was to allow new users to run M-x
+	customize-option RET erc-modules RET immediately after startup instead
+	of M-x customize-group RET, followed by an I-search.  (Bug#73812)
+
+	(Cherry picked from commit 1854f2751e3f73e1e5f12f6de993b6357de1766b)
+
+	Do not merge to master.
+
+2024-11-16  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve the documentation of major-mode remapping
+
+	* etc/NEWS (example):
+	* doc/emacs/files.texi (Reverting):
+	* doc/emacs/modes.texi (Choosing Modes): Improve the documentation
+	of 'major-mode-remap-alist' and mode remapping.  (Bug#74339)
+
+2024-11-15  Robert Pluim  <rpluim@gmail.com>
+
+	Improve 'which-key-special-keys' docstring
+
+	* lisp/which-key.el (which-key-special-keys): Explain the format
+	and use 'setopt'.
+
+2024-11-15  Laurence Warne  <laurencewarne@gmail.com>
+
+	Don't error in Proced tests if %CPU is a NaN
+
+	* test/lisp/proced-tests.el (proced--cpu-at-point): New function.
+	(proced--assert-process-valid-cpu-refinement)
+	(proced-refine-test, proced-refine-with-update-test): If %CPU for any
+	process visited is a NaN skip the test.
+	(proced-update-preserves-pid-at-point-test): Fix typo in comment.
+	(proced--assert-process-valid-cpu-refinement-explainer): Add process
+	attributes to the explainer along with tweaking how the process %CPU is
+	obtained to account for circumstances where it's not numeric (most
+	notably '-nan').
+
+2024-11-15  Joseph Turner  <joseph@breatheoutbreathe.in>
+
+	* lisp/subr.el (read-number): Document collision with 'format-prompt'.
+
+2024-11-14  Vincenzo Pupillo  <v.pupillo@gmail.com>
+
+	Improve font-locking and indentation in 'php-ts-mode'
+
+	* lisp/progmodes/php-ts-mode.el (php-ts-mode--language-source-alist):
+	Updated to latest version of PHP grammar.
+	(php-ts-mode--indent-styles): 'namespace_use_declaration' is now
+	correctly indented.
+	(php-ts-mode--operators): Support of the "argument unpacking
+	operator".
+	(php-ts-mode--font-lock-settings): 'nullsafe_member_call_expression'
+	is now highlighted correctly.
+	(php-ts-mode--comment-indent-new-line): Delete trailing whitespace
+	before inserting newline (see bug#73900 for more information).
+	Bug#74239
+
+2024-11-14  john muhl  <jm@pub.pink>
+
+	Fix some 'lua-ts-mode' options (Bug#74235)
+
+	* lisp/progmodes/lua-ts-mode.el (lua-ts-luacheck-program):
+	(lua-ts-inferior-program): Switch to 'file' type and remove 'nil'
+	as a choice.
+	(lua-ts-inferior-lua): Ensure 'lua-ts-inferior-program' is set.
+
+2024-11-14  john muhl  <jm@pub.pink>
+
+	Improve comment indenting in 'lua-ts-mode'
+
+	* lisp/progmodes/lua-ts-mode.el (lua-ts--simple-indent-rules):
+	Align single line comments with the surrounding context.
+	(lua-ts--comment-first-sibling-matcher): Check that comment is
+	the first sibling.
+	(lua-ts--multi-line-comment-start): New function.
+	* test/lisp/progmodes/lua-ts-mode-resources/indent.erts:
+	Add tests.  (Bug#74298)
+
+2024-11-14  Eshel Yaron  <me@eshelyaron.com>
+
+	Update 'xref-num-matches-found' when reverting *xref* buffer
+
+	* lisp/progmodes/xref.el (xref--insert-xrefs):
+	Update 'xref-num-matches-found' here...
+	(xref--show-xref-buffer): ...instead of here (bug#74313).
+
+2024-11-13  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* lisp/files.el (require-with-check): Fix last fix (bug#74289)
+
+2024-11-10  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	lisp/files.el (require-with-check): Fix bug#74091.
+
+2024-11-10  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix handling of permanent-local variables in 'kill-all-local-variables'
+
+	The original implementation went too far and caused unexpected
+	results.
+	* src/buffer.c (reset_buffer_local_variables): Second argument is
+	now 'int', and can be 0, 1, or 2.
+	(Fkill_all_local_variables): Call 'reset_buffer_local_variables'
+	with 2nd argument 2 if KILL-PERMANENT is non-nil.  (Bug#74091)
+
+2024-11-10  Michael Albinus  <michael.albinus@gmx.de>
+
+	Precise password cache in Tramp
+
+	* doc/misc/tramp.texi (Password handling):
+	Describe auth-source-cache-expiry and auth-source-do-cache instead
+	of password-cache-expiry and password-cache.  (Bug#74105)
+
+	* lisp/net/tramp.el (tramp-read-passwd): Check for `auth-sources'
+	being non-nil.
+
+2024-11-10  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix picture-mode with full-width characters
+
+	* lisp/textmodes/picture.el (picture-insert): Don't rely on
+	'move-to-column' to move to the column that is its argument: this
+	might be false when full-width characters are involved.
+
+2024-11-10  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix movement to the left in picture-mode
+
+	* lisp/textmodes/picture.el (picture-insert): Measure width by
+	counting columns on display, not by using 'string-width', because
+	the latter is inaccurate when TABs are involved.  (Bug#74255)
+
+2024-11-09  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix documentation and error message of adding local variables
+
+	* lisp/files-x.el (add-file-local-variable)
+	(add-file-local-variable-prop-line): Doc fixes.
+	(add-file-local-variable): Improve the user-error text.  (Bug#74267)
+
+2024-11-09  Eli Zaretskii  <eliz@gnu.org>
+
+	Document the 'display-line-numbers-disable' property
+
+	* doc/lispref/display.texi (Overlay Properties):
+	* doc/lispref/text.texi (Special Properties): Document
+	'display-line-numbers-disable'.  Fix indexing.
+
+2024-11-09  Eli Zaretskii  <eliz@gnu.org>
+
+	Document issues with 'use-package's ':custom' and byte compilation
+
+	* doc/misc/use-package.texi (User options): Warn against
+	byte-compiling init files that use ':custom'.  (Bug#73609)
+
+2024-11-08  Tim Ruffing  <dev@real-or-random.org>
+
+	Fix display of compositions when font style changes (Cairo backend)
+
+	* src/ftcrfont.c (ftcrhbfont_end_hb_font): Don't persist the
+	result of 'cairo_ft_scaled_font_lock_face' in violation of the
+	API contract.  (Bug#73752)
+
+2024-11-06  Mattias Engdegård  <mattiase@acm.org>
+
+	Fix wrong value of `when` and `unless` with empty body (bug#74215)
+
+	* lisp/subr.el (when, unless): Return nil when the body is empty.
+	Reported by Brennan Vincent.
+	* test/lisp/subr-tests.el (subr-test-when): Add test cases.
+
+	(cherry picked from commit 9ee9154247454c18f9f75d0d32592b817d7e977a)
+
+2024-11-05  Robert Pluim  <rpluim@gmail.com>
+
+	Improve 'open-network-stream' documentation.
+
+	* doc/lispref/processes.texi (Network): Correct explanation of
+	':warn-unless-encrypted'.  Document ':error' return keyword.
+	* lisp/net/network-stream.el (open-network-stream): Improve
+	':return-list' documentation.  Document ':error'.  Correct
+	explanation of ':warn-unless-encrypted'.
+
+2024-11-03  Michael Albinus  <michael.albinus@gmx.de>
+
+	Improve Tramp documentation on direct async processes
+
+	* doc/misc/tramp.texi (Remote processes): Add another example
+	enabling direct async processes based on method name.  (Bug#74105)
+
+	* etc/NEWS: Rephrase Tramp entry on direct async processes.
+
+2024-11-01  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve documentation of letter-case conversions
+
+	* doc/lispref/nonascii.texi (Character Properties):
+	* doc/lispref/strings.texi (Case Conversion, Case Tables):
+	Document that special-casing rules override the case-table
+	conversions.  (Bug#74155)
+
+2024-11-01  Dmitry Gutov  <dmitry@gutov.dev>
+
+	project-tests: Add test assertion for bug#73801
+
+	* test/lisp/progmodes/project-tests.el
+	(project-vc-extra-root-markers-supports-wildcards): End with a
+	check that we didn't cache a wrong value for parent (bug#73801).
+
+	(cherry picked from commit 94a9e40e82d4180563d7bddfa0cc6c8990824f8d)
+
+2024-11-01  Dmitry Gutov  <dmitry@gutov.dev>
+
+	project-try-vc: Fix the "sometimes wrong cache" issue
+
+	* lisp/progmodes/project.el (project-try-vc--search):
+	Extract from 'project-try-vc'.
+	(project-try-vc): Use it.
+	(project-try-vc--search): Call itself recursively directly, to
+	avoid creating invalid cache entry (bug#73801).
+
+	(cherry picked from commit 29b30eb49f8bd8bad4f9e24dd56f32d62bf70121)
+
+2024-10-31  Stephen Berman  <stephen.berman@gmx.net>
+
+	Fix bugs in dabbrev-expand (bug#74090)
+
+	* lisp/dabbrev.el (dabbrev-expand): Use the buffer where the
+	expansion was found when setting the internal variables used to
+	determine the next expansion or a replacement expansion.
+
+	* test/lisp/dabbrev-tests.el (ert-x): Require for
+	'ert-with-temp-directory', 'ert-resource-directory' and
+	'ert-resource-file'.
+	(with-dabbrev-test): New macro.
+	(dabbrev-expand-test-same-buffer-{1,2,3,4})
+	(dabbrev-expand-test-other-buffer-{1,2,3,4})
+	(dabbrev-expand-test-minibuffer-{1,2,3,4}): New tests.
+
+	* test/lisp/dabbrev-resources/dabbrev-expand.el:
+	* test/lisp/dabbrev-resources/INSTALL_BEGIN: New test resources.
+
+	(cherry picked from commit f6c359cb66a0e9b851e3467b1ba9cab7efa8f744)
+
+2024-10-31  Yuan Fu  <casouri@gmail.com>
+
+	Fix undefined variable in previous commit (bug#73900)
+
+	I somehow thought allow-auto-fill is a global variable that's
+	used by cc.  But it's not.  It's just a function param used by
+	c-indent-new-comment-line.
+
+	* lisp/progmodes/c-ts-common.el:
+	(c-ts-common-comment-indent-new-line): Remove reference to
+	allow-auto-fill.
+
+2024-10-31  Yuan Fu  <casouri@gmail.com>
+
+	Fix c-ts-common-comment-indent-new-line (bug#73900)
+
+	* lisp/progmodes/c-ts-common.el:
+	(c-ts-common-comment-indent-new-line): Delete trailing
+	whitespace before inserting newline.  The insert-line-break
+	function is the same as in c-indent-new-comment-line.
+
+2024-10-31  Yuan Fu  <casouri@gmail.com>
+
+	Fix the call to treesit-thing-defined-p
+
+	* lisp/treesit.el (treesit-defun-at-point): Add the necessary
+	2nd argument.
+
+2024-10-30  Juri Linkov  <juri@linkov.net>
+
+	Backport: Call tab-bar-tab-post-open-functions during tabs initialization
+
+	* lisp/tab-bar.el (tab-bar-tabs): Run the hook
+	'tab-bar-tab-post-open-functions' after creating the first tab
+	in the selected frame's tab-bar list of tabs (bug#74087).
+	Suggested by Ship Mints <shipmints@gmail.com>.
+
+	(cherry picked from commit 2c062dfdf50970766db179ccbad7ce71c541cd72)
+
+2024-10-30  Laurence Warne  <laurencewarne@gmail.com>
+
+	Work on proced-tests.el
+
+	* test/lisp/proced-tests.el
+	(proced--assert-process-valid-cpu-refinement-explainer): New function
+	for explaining refinement test failures in greater detail.
+
+2024-10-29  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* lisp/files.el (require-with-check): Be a bit more lenient (bug74040)
+
+2024-10-29  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(with-peg-rules): Fix references to rulesets (bug#74018)
+
+	PEG rules get "compiled" to functions with name `peg-rule <RULE>`.
+	`define-peg-ruleset` instead defines it PEG rules with name
+	`peg-rule <RULESET> <RULE>`, so that they can be made visible
+	by `with-peg-rules` simply by adding local aliases from
+	`peg-rule <RULE>` to `peg-rule <RULESET> <RULE>`.
+
+	Apparently when I added `define-peg-ruleset` I somehow failed to
+	install some of the corresponding code in `with-peg-rules`, so
+	the aliases were not installed, making it "impossible" to use
+	rulesets.
+	[ I still have no idea how this happened and/or where
+	  the missing code went, so I "recreated" it.  ]
+
+	* lisp/progmodes/peg.el (with-peg-rules): Install the aliases
+	for the rulesets.
+	(peg--translate-rule-body): Try and preserve
+	location info when emitting a warning.
+
+	* test/lisp/progmodes/peg-tests.el (peg-test-myrules): New ruleset.
+	(peg-test-ruleset): New test.
+
+2024-10-27  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	Tweak doc w.r.t to "void function" (bug#73886)
+
+	* doc/lispref/functions.texi (Function Cells): Avoid talking
+	about the function cell being void.
+
+	* src/data.c (Fboundp, Ffmakunbound, Fsymbol_function):
+	Don't suggest that "void" can be considered as a kind of value.
+
+2024-10-27  Laurence Warne  <laurencewarne@gmail.com>
+
+	Fix flakey proced refine tests (Bug#73441)
+
+	* test/lisp/proced-tests.el (proced-refine-test)
+	(proced-refine-with-update-test): Use the much simpler CPU refinement
+	for testing 'proced-refine'.  The previous tests made the incorrect
+	assumption that refining on the PID of process A only filtered the
+	buffer to contain process A and its children, whereas in actuality
+	the children of process A's children, their children, and so on will
+	also be shown.
+	(proced-update-preserves-pid-at-point-test): Mark as unstable.
+
+2024-10-27  Eli Zaretskii  <eliz@gnu.org>
+
+	Another 'void' update
+
+	* doc/lispref/symbols.texi (Symbol Components): Another update due
+	to the change in 'void' function implementation.  (Bug#73886)
+
+2024-10-27  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix doc string of 'wdired-use-dired-vertical-movement'
+
+	* lisp/wdired.el (wdired-use-dired-vertical-movement): Remove the
+	incorrect reference to 'track-eol'.  (Bug#73917)
+
+2024-10-27  Eli Zaretskii  <eliz@gnu.org>
+
+	Update the documentation of void functions
+
+	* doc/lispref/functions.texi (Function Cells):
+	* src/data.c (Ffboundp, Ffmakunbound, Fsymbol_function): Update
+	documentation to the changes of how void functions are represented
+	since Emacs 24.5.  (Bug#73886)
+
+2024-10-27  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Backport some docstring updates, warn about upcoming obsolescence
+
+	Try to save people some time if they're developing on Emacs 30.x.
+
+	Do not merge to master.
+
+	* lisp/subr.el (if-let*, when-let*, if-let, when-let): Move
+	docstring text around so that if-let* and when-let* descriptions
+	no longer refer to if-let and when-let.  Note that if-let and
+	when-let will be marked obsolete, and recommend if-let*,
+	when-let* and and-let* for new code.
+
+2024-10-26  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* lisp/editorconfig.el (editorconfig--get-indentation): Fix bug#73991
+
+2024-10-26  Andrea Corallo  <acorallo@gnu.org>
+
+	Update 'ldefs-boot.el' (don't merge)
+
+	* lisp/ldefs-boot.el: Update.
+
+2024-10-26  Andrea Corallo  <acorallo@gnu.org>
+
+	Bump Emacs version to 30.0.92
+
+	* nt/README.W32: Update Emacs version.
+	* msdos/sed2v2.inp: Likewise.
+	* exec/configure.ac: Likewise.
+	* configure.ac: Likewise.
+	* README: Likewise.
+
 2024-10-25  Eli Zaretskii  <eliz@gnu.org>
 
 	Skip *.dylib files in 'loaddefs-generate'
@@ -201640,7 +202492,7 @@
 
 This file records repository revisions from
 commit f2ae39829812098d8269eafbc0fcb98959ee5bb7 (exclusive) to
-commit 8e37b537160c1560048ac53529ef09de7561963c (inclusive).
+commit 1381c6f9591f2851896a41e178a5ccc1a32e7471 (inclusive).
 See ChangeLog.3 for earlier changes.
 
 ;; Local Variables:

commit 49adcf30b01a973ef2fb63d01e8142393fc6d926
Author: Andrea Corallo <acorallo@gnu.org>
Date:   Thu Dec 19 00:42:28 2024 +0100

    ; * etc/AUTHORS: Update.

diff --git a/etc/AUTHORS b/etc/AUTHORS
index 3f62ddb8834..03f6b15a1a2 100644
--- a/etc/AUTHORS
+++ b/etc/AUTHORS
@@ -1737,8 +1737,8 @@ Eli Zaretskii: wrote [bidirectional display in xdisp.c]
 and co-wrote help-tests.el
 and changed xdisp.c display.texi w32.c msdos.c simple.el w32fns.c
   files.el fileio.c keyboard.c emacs.c configure.ac text.texi w32term.c
-  dispnew.c frames.texi w32proc.c files.texi xfaces.c window.c
-  dispextern.h lisp.h and 1398 other files
+  dispnew.c frames.texi files.texi w32proc.c xfaces.c window.c
+  dispextern.h lisp.h and 1400 other files
 
 Eliza Velasquez: changed server.el simple.el
 
@@ -1888,9 +1888,10 @@ E Sabof: changed hi-lock.el image-dired.el
 
 Eshel Yaron: wrote completion-preview.el
 and changed eglot.el emoji.el eww.el help-fns.el info.el programs.texi
-  text-mode.el window.c xdisp.c bookmark.el completion-preview-tests.el
-  dictionary.el easy-mmode.el eldoc.el emacs.texi eww.texi fixit.texi
-  frames.texi help-mode.el help.el indent.texi and 14 other files
+  text-mode.el window.c xdisp.c xref.el bookmark.el
+  completion-preview-tests.el dictionary.el easy-mmode.el eldoc.el
+  emacs.texi eww.texi fixit.texi frames.texi help-mode.el help.el
+  and 14 other files
 
 Espen Skoglund: wrote pascal.el
 
@@ -3134,8 +3135,8 @@ Jon K Hellan: wrote utf7.el
 
 Joost Diepenmaat: changed org.el
 
-Joost Kremers: changed reftex-toc.el vtable-tests.el vtable.el
-  vtable.texi
+Joost Kremers: changed control.texi reftex-toc.el vtable-tests.el
+  vtable.el vtable.texi
 
 Joram Schrijver: changed eglot.el
 
@@ -3175,7 +3176,7 @@ and changed xterm.c xfns.c keyboard.c screen.c dispnew.c xdisp.c window.c
 
 Joseph M. Kelsey: changed fileio.c skeleton.el
 
-Joseph Turner: changed package-vc.el minibuffer.el image.el subr.el
+Joseph Turner: changed package-vc.el minibuffer.el subr.el image.el
   display.texi image-tests.el info.el ispell.el lists.texi package.el
   package.texi records.texi shortdoc.el shorthands.el subr-tests.el
 
@@ -3654,7 +3655,7 @@ Lasse Rasinen: changed gnus-start.el
 
 Lassi Kortela: changed dns-mode.el
 
-Laurence Warne: changed proced.el proced-tests.el progmodes/python.el
+Laurence Warne: changed proced-tests.el proced.el progmodes/python.el
   python-tests.el
 
 Laurent Martelli: changed mm-decode.el
@@ -3812,10 +3813,10 @@ Malcolm Purvis: changed spam-stat.el
 
 Manoj Srivastava: wrote manoj-dark-theme.el
 
-Manuel Giraud: changed image-dired.el xdisp.c vc.el ox-html.el
+Manuel Giraud: changed image-dired.el xdisp.c vc.el image.c ox-html.el
   bookmark.el doc-view.el find-dired.el image-dired-util.el keyboard.c
   longlines.el ox-publish.el dired.el dispextern.h gdb-mi.el gnus.el
-  image.c paragraphs.el simple.el androidterm.c basic.texi battery.el
+  paragraphs.el simple.el androidterm.c basic.texi battery.el
   and 29 other files
 
 Manuel Gómez: changed speedbar.el
@@ -4358,7 +4359,7 @@ Mike Kazantsev: changed erc-dcc.el
 Mike Kupfer: changed mh-comp.el mh-e.el mh-mime.el mh-utils.el files.el
   ftcrfont.c mh-compat.el mh-funcs.el mh-utils-tests.el emacs-mime.texi
   files.texi gnus-mh.el gnus.texi mh-acros.el mh-e.texi mh-identity.el
-  mh-scan.el xftfont.c
+  mh-scan.el variables.texi xftfont.c
 
 Mike Lamb: changed em-unix.el esh-util.el pcmpl-unix.el
 
@@ -4447,7 +4448,7 @@ Murata Shuuichirou: changed coding.c
 M Visuwesh: changed dired-aux.el image.el ind-util.el quail/indian.el
   delsel.el doc-view.el eww.el find-dired.el mailcap.el mouse.el shr.el
   arc-mode.el comint.el dired-x.el dired.el easy-mmode.el emacsbug.el
-  ffap.el files.el files.texi gnus-group.el and 18 other files
+  ffap.el files.el files.texi gnus-group.el and 19 other files
 
 Myles English: changed org-clock.el
 
@@ -4770,7 +4771,7 @@ and co-wrote cal-dst.el
 and changed lisp.h configure.ac alloc.c fileio.c process.c editfns.c
   sysdep.c xdisp.c fns.c image.c data.c emacs.c keyboard.c lread.c
   xterm.c eval.c gnulib-comp.m4 merge-gnulib callproc.c Makefile.in
-  buffer.c and 1886 other files
+  buffer.c and 1887 other files
 
 Paul Fisher: changed fns.c
 
@@ -5300,10 +5301,11 @@ Roberto Rodríguez: changed glossary.texi widget.texi
 Robert P. Goldman: changed org.texi ob-exp.el org.el ox-latex.el
 
 Robert Pluim: wrote nsm-tests.el
-and changed configure.ac process.c keymap.el blocks.awk custom.texi
-  font.c network-stream-tests.el processes.texi emoji-zwj.awk ftfont.c
+and changed configure.ac process.c keymap.el blocks.awk processes.texi
+  custom.texi font.c network-stream-tests.el emoji-zwj.awk ftfont.c
   gtkutil.c process-tests.el unicode vc-git.el display.texi files.texi
-  nsterm.m terminal.c char-fold.el gnutls.el help.el and 215 other files
+  network-stream.el nsterm.m terminal.c char-fold.el gnutls.el
+  and 217 other files
 
 Robert Thorpe: changed cus-start.el indent.el rmail.texi
 
@@ -5528,10 +5530,10 @@ Sean O'Rourke: changed complete.el comint.el dabbrev.el find-func.el
 Sean Sieger: changed emacs-lisp-intro.texi
 
 Sean Whitton: wrote em-elecslash.el em-extpipe-tests.el em-extpipe.el
-and changed vc-git.el project.el bindings.el server.el simple.el
+and changed vc-git.el project.el bindings.el server.el simple.el subr.el
   vc-dispatcher.el vc.el window.el eshell-tests.el eshell.texi subr-x.el
-  subr.el .dir-locals.el cl-macs.el eshell-tests-helpers.el files.texi
-  ftfont.c remember.el startup.el term.el INSTALL and 34 other files
+  .dir-locals.el cl-macs.el eshell-tests-helpers.el files.texi ftfont.c
+  remember.el startup.el term.el INSTALL and 34 other files
 
 Sebastian Fieber: changed gnus-art.el mm-decode.el mm-view.el
 
@@ -5750,8 +5752,8 @@ Stefan Kangas: wrote bookmark-tests.el cal-julian-tests.el
   underline-tests.el uudecode-tests.el wallpaper.el warnings-tests.el
 and co-wrote help-tests.el keymap-tests.el
 and changed image-dired.el efaq.texi package.el cperl-mode.el checkdoc.el
-  subr.el help.el simple.el bookmark.el dired.el files.el dired-x.el
-  gnus.texi browse-url.el erc.el keymap.c image-mode.el ediff-util.el
+  subr.el help.el simple.el bookmark.el dired.el files.el gnus.texi
+  dired-x.el browse-url.el erc.el keymap.c image-mode.el ediff-util.el
   speedbar.el woman.el eglot.el and 1801 other files
 
 Stefan Merten: co-wrote rst.el
@@ -5766,8 +5768,8 @@ Stefan Monnier: wrote bibtex-style.el bytecomp-tests.el
   pcvs-util.el radix-tree.el regexp-opt-tests.el reveal.el smerge-mode.el
   smie.el subword-tests.el track-changes.el vc-mtn.el
 and co-wrote font-lock.el gitmerge.el pcvs.el visual-wrap.el
-and changed subr.el simple.el cl-macs.el bytecomp.el keyboard.c lisp.h
-  files.el vc.el eval.c xdisp.c alloc.c buffer.c sh-script.el help-fns.el
+and changed subr.el simple.el cl-macs.el bytecomp.el keyboard.c files.el
+  lisp.h vc.el eval.c xdisp.c alloc.c buffer.c sh-script.el help-fns.el
   progmodes/compile.el tex-mode.el lread.c keymap.c package.el window.c
   edebug.el and 1724 other files
 
@@ -5803,10 +5805,10 @@ Stephen A. Wood: changed fortran.el
 Stephen Berman: wrote todo-mode-tests.el
 and co-wrote todo-mode.el visual-wrap.el
 and changed wid-edit.el wdired.el todo-mode.texi wdired-tests.el
-  diary-lib.el dired.el dired-tests.el doc-view.el files.el info.el
-  minibuffer.el outline.el todo-test-1.todo widget.texi allout.el eww.el
-  find-dired.el frames.texi hl-line.el ibuffer.el menu-bar.el
-  and 71 other files
+  dabbrev-tests.el diary-lib.el dired.el dired-tests.el doc-view.el
+  files.el info.el minibuffer.el outline.el todo-test-1.todo widget.texi
+  allout.el dabbrev.el eww.el find-dired.el frames.texi hl-line.el
+  and 75 other files
 
 Stephen C. Gilardi: changed configure.ac
 
@@ -6135,7 +6137,7 @@ Timo Taipalus: changed display.texi image.c image.el
 Timothee Denizou: changed tetris.el
 
 Tim Ruffing: changed keyboard.c calc-prog.el emacs.service keyboard.h
-  macros.c dbus.el macros.h process.c subr.el term.c
+  macros.c dbus.el ftcrfont.c macros.h process.c subr.el term.c
 
 Tim Van Holder: changed emacsclient.c Makefile.in configure.ac
   progmodes/compile.el which-func.el
@@ -6652,7 +6654,7 @@ Yuan Fu: changed treesit.el treesit.c c-ts-mode.el parsing.texi
   treesit-tests.el progmodes/python.el modes.texi js.el indent.erts
   treesit.h typescript-ts-mode.el c-ts-common.el css-mode.el
   java-ts-mode.el rust-ts-mode.el print.c sh-script.el configure.ac
-  go-ts-mode.el csharp-mode.el gdb-mi.el and 78 other files
+  go-ts-mode.el csharp-mode.el gdb-mi.el and 79 other files
 
 Yuanle Song: changed rng-xsd.el
 

commit 1381c6f9591f2851896a41e178a5ccc1a32e7471
Author: Andrea Corallo <acorallo@gnu.org>
Date:   Thu Dec 19 00:16:20 2024 +0100

    * Update authors.el
    
    * admin/authors.el (authors-aliases, authors-valid-file-names)
    (authors-renamed-files-alist): Add entry.

diff --git a/admin/authors.el b/admin/authors.el
index 50f3d1ae68d..6142dc6c566 100644
--- a/admin/authors.el
+++ b/admin/authors.el
@@ -311,7 +311,7 @@ files.")
     ("Lin Zhou" "georgealbert@qq\\.com")
     (nil "yan@metatem\\.net")
     (nil "gnu_lists@halloleo\\.hailmail\\.net")
-    )
+    (nil "^Chu$" "maedaqu@gmail.com"))
   "Alist of author aliases.
 
 Each entry is of the form (REALNAME REGEXP...).
@@ -1151,7 +1151,7 @@ AUTHORS file.  There are also some more recent manual additions.")
     "admin/notes/tree-sitter/build-module/batch.sh"
     "doc/misc/gnus-coding.texi"
     "gnus-coding.texi"
-    )
+    "doc/misc/org.texi")
   "File names which are valid, but no longer exist (or cannot be found)
 in the repository.")
 
@@ -1711,7 +1711,8 @@ in the repository.")
     ("lisp/emacs-lisp/tcover-unsafep.el" . "test/lisp/emacs-lisp/unsafep-tests.el")
     ("lisp/vt100-led.el" . "lisp/obsolete/vt100-led.el")
     ("lisp/mail/metamail.el" . "lisp/obsolete/metamail.el")
-    ("lisp/sb-image.el" . "lisp/obsolete/sb-image.el"))
+    ("lisp/sb-image.el" . "lisp/obsolete/sb-image.el")
+    ("lisp/cedet/semantic/grammar-wy.el" . "lisp/cedet/semantic/grm-wy-boot.el"))
   "Alist of files which have been renamed during their lifetime.
 Elements are (OLDNAME . NEWNAME).")
 

commit 5c0f3f5826e5f2e7c6bc29f5407ec984beb43527
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Wed Dec 18 20:37:37 2024 +0200

    ; * etc/NEWS: Mark unmarked entries.

diff --git a/etc/NEWS b/etc/NEWS
index 2c3b78a4e2b..61cb66387bb 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1868,6 +1868,7 @@ In the past they included a terminating newline in most cases but not all.
 
 ** Emacs Lisp mode
 
++++
 *** 'elisp-flymake-byte-compile' is disabled for untrusted files.
 For security reasons, this backend can be used only in those files
 specified as trusted according to 'trusted-content' and emits an
@@ -2039,6 +2040,7 @@ By default it retains the previous behavior: read the contents of
 Gemfile and act accordingly.  But you can also set it to t or nil to
 skip checking the Gemfile.
 
+---
 *** New user option 'ruby-bracketed-args-indent'.
 When it is set to nil, multiple consecutive open braces/brackets/parens
 result in only one additional indentation level.  Default is t.
@@ -2386,6 +2388,7 @@ These hooks were named incorrectly, and so they never actually ran
 when unloading the corresponding feature.  Instead, you should use
 hooks named after the feature name, like 'esh-mode-unload-hook'.
 
+---
 ** User options 'eshell-process-wait-{seconds,milliseconds}' are now obsolete.
 Instead, use 'eshell-process-wait-time', which supports floating-point
 values.
@@ -2642,6 +2645,7 @@ The new function 'haiku-notifications-notify' provides a subset of the
 capabilities of the 'notifications-notify' function in a manner
 analogous to 'w32-notification-notify'.
 
+---
 ** New Haiku specific variable 'haiku-pass-control-tab-to-system'.
 This sets whether Emacs should pass 'C-TAB' on to the system instead of
 handling it, fixing a problem where window switching would not activate
@@ -3088,6 +3092,7 @@ inside 'treesit-language-source-alist', so that calling
 It may be useful, for example, for the purposes of bisecting a
 treesitter grammar.
 
++++
 ** New buffer-local variable 'tabulated-list-groups'.
 It controls display and separate sorting of groups of entries.  By
 default no grouping or sorting is done.
@@ -3123,6 +3128,7 @@ this case, would mean repeating the object in the argument list.)  When
 replacing an object with a different one, passing both the new and old
 objects is still necessary.
 
++++
 ** 'vtable-insert-object' can insert "before" or at an index.
 The signature of 'vtable-insert-object' has changed and is now:
 

commit 8a0c9c234f15a7398d43da154f3463c92f69f9f5
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Wed Dec 18 19:57:13 2024 +0200

    Document 'trusted-content
    
    * doc/emacs/misc.texi (Host Security): Document 'trusted-content'.
    
    * lisp/files.el (trusted-content): Doc fix.
    
    * etc/NEWS: Mark its entry as "documented".

diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi
index d1e8217f579..97a82747bfc 100644
--- a/doc/emacs/misc.texi
+++ b/doc/emacs/misc.texi
@@ -277,6 +277,39 @@ trusted and the default checking for these variables is irritating,
 you can set @code{enable-local-variables} to @code{:all}.  @xref{Safe
 File Variables}.
 
+@cindex trusted files and directories
+Loading a file of Emacs Lisp code with @code{load-file} or
+@code{load-library} (@pxref{Lisp Libraries}) can execute some of the
+Lisp code in the file being loaded, so you should only load Lisp files
+whose source you trust.  However, some Emacs features can in certain
+situations execute Lisp code even without your explicit command or
+request.  For example, Flymake, the on-the-fly syntax checker for Emacs
+(@pxref{Top,,, flymake, GNU Flymake}), if it is enabled, can
+automatically execute some of the code in a Lisp file you visit as part
+of its syntax-checking job.  Similarly, some completion commands
+(@pxref{Completion}) in buffers visiting Lisp files sometimes need to
+expand Lisp macros for best results.  In these cases, just visiting a
+Lisp file and performing some editing in it could trigger execution of
+Lisp code.  If the visited file came from an untrusted source, it could
+include dangerous or even malicious code that Emacs would execute in
+those situations.
+
+To protect against this, Emacs disables execution of Lisp code by
+Flymake, completion, and some other features, unless the visited file is
+@dfn{trusted}.  It is up to you to specify which files on your system
+should be trusted, by customizing the user option
+@code{trusted-content}.
+
+@defopt trusted-content
+The value of this option is @code{nil} by default, which means no file
+is trusted.  You can customize the variable to be a list of one or more
+names of trusted files and directories.  A file name that ends in a
+slash @file{/} is interpreted as a directory, which means all its files
+and subdirectories are also trusted.  A special value @code{:all} means
+@emph{all} the files and directories on your system should be trusted;
+@strong{this is not recommended}, as it opens a gaping security hole.
+@end defopt
+
 @xref{Security Considerations,,, elisp, The Emacs Lisp Reference
 Manual}, for more information about security considerations when using
 Emacs as part of a larger application.
diff --git a/etc/NEWS b/etc/NEWS
index 8e92cef2bcb..2c3b78a4e2b 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -199,6 +199,7 @@ see the variable 'url-request-extra-headers'.
 
 * Changes in Emacs 30.1
 
++++
 ** New user option 'trusted-content' to allow potentially dangerous features.
 This variable lists those files and directories whose content Emacs should
 consider as sufficiently trusted to run any part of the code contained
diff --git a/lisp/files.el b/lisp/files.el
index 0bc787aca31..86eff296459 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -725,7 +725,7 @@ Each element of the list should be a string:
 - If it ends in \"/\", it is considered as a directory name and means that
   Emacs should trust all the files whose name has this directory as a prefix.
 - else it is considered as a file name.
-Use abbreviated file names.  For example, an entry \"~/mycode\" means
+Use abbreviated file names.  For example, an entry \"~/mycode/\" means
 that Emacs will trust all the files in your directory \"mycode\".
 This variable can also be set to `:all', in which case Emacs will trust
 all files, which opens a gaping security hole."

commit c6ce11b2a48a0e6e1a62ae51f30570f3392ee55d
Author: Robert Pluim <rpluim@gmail.com>
Date:   Wed Dec 18 16:00:55 2024 +0100

    Mention network-interface-list in network-interface-info docstring
    
    * src/process.c (Fnetwork_interface_info): Reference
    'network-interface-list'.

diff --git a/src/process.c b/src/process.c
index b10020bdae4..64a62b5f016 100644
--- a/src/process.c
+++ b/src/process.c
@@ -4656,7 +4656,8 @@ where ADDR is the layer 3 address, BCAST is the layer 3 broadcast address,
 NETMASK is the layer 3 network mask, HWADDR is the layer 2 address, and
 FLAGS is the current flags of the interface.
 
-Data that is unavailable is returned as nil.  */)
+Data that is unavailable is returned as nil.  Only returns IPv4 layer 3
+addresses, for IPv6 use `network-interface-list'.  */)
   (Lisp_Object ifname)
 {
 #if ((defined HAVE_NET_IF_H			       \

commit a7905145f70bce9681559ec37fbbe54afd52d913
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Wed Dec 18 16:22:21 2024 +0200

    ; * lisp/emacs-lisp/re-builder.el (reb-change-syntax): Fix typo.

diff --git a/lisp/emacs-lisp/re-builder.el b/lisp/emacs-lisp/re-builder.el
index 1fc6c872332..92f22e335f7 100644
--- a/lisp/emacs-lisp/re-builder.el
+++ b/lisp/emacs-lisp/re-builder.el
@@ -494,7 +494,7 @@ Re-Builder currently understands three different forms of input, namely
      `query-replace-regexp' (\\[query-replace-regexp]).  There is no need to escape
      backslashes and double quotes.
 
-  2. The `read' syntax is the same syntax used as when specifying the
+  2. The `read' syntax is the syntax used when specifying the
      regexp as a string in a Lisp program.
 
   3. Finally, the `rx' syntax allows editing of symbolic regular

commit cde22c020119fd16ddd77c5c4121054c1a9424c5
Author: Stefan Kangas <stefankangas@gmail.com>
Date:   Tue Dec 17 04:46:36 2024 +0100

    Move NEWS items from unreleased 28.3 to released 29.1
    
    * etc/NEWS.28: Remove empty sections for 28.3.
    Move single pertinent item from here...
    * etc/NEWS.29: ...to here.

diff --git a/etc/NEWS.28 b/etc/NEWS.28
index ac65eaa986f..b6bed01ddce 100644
--- a/etc/NEWS.28
+++ b/etc/NEWS.28
@@ -15,41 +15,6 @@ in older Emacs versions.
 You can narrow news to a specific version by calling 'view-emacs-news'
 with a prefix argument or by typing 'C-u C-h C-n'.
 
-
-* Installation Changes in Emacs 28.3
-
-
-* Startup Changes in Emacs 28.3
-
-
-* Changes in Emacs 28.3
-
-
-* Editing Changes in Emacs 28.3
-
-
-* Changes in Specialized Modes and Packages in Emacs 28.3
-
-** 'native-comp-driver-options' on macOS.
-The value of 'native-comp-driver-options' has been changed to contain
-"-Wl,-w" to suppress warnings of the form
-
-    ld: warning: -undefined dynamic_lookup may not work with chained fixups
-
-emitted during native compilation on macOS 12.6 with Xcode 14.
-
-
-* New Modes and Packages in Emacs 28.3
-
-
-* Incompatible Lisp Changes in Emacs 28.3
-
-
-* Lisp Changes in Emacs 28.3
-
-
-* Changes in Emacs 28.3 on Non-Free Operating Systems
-
 
 * Installation Changes in Emacs 28.2
 
diff --git a/etc/NEWS.29 b/etc/NEWS.29
index d213c4b8010..52a00ef699a 100644
--- a/etc/NEWS.29
+++ b/etc/NEWS.29
@@ -4361,6 +4361,14 @@ two buttons: "Yes" and "No".
 *** The 'ns-popup-font-panel' command has been removed.
 Use the general command 'M-x menu-set-font' instead.
 
+*** 'native-comp-driver-options' on macOS.
+The value of 'native-comp-driver-options' has been changed to contain
+"-Wl,-w" to suppress warnings of the form
+
+    ld: warning: -undefined dynamic_lookup may not work with chained fixups
+
+emitted during native compilation on macOS 12.6 with Xcode 14.
+
 
 ----------------------------------------------------------------------
 This file is part of GNU Emacs.

commit 5686bb5b428c4a30a8b6d485f364adc7ccf31e73
Author: Stefan Kangas <stefankangas@gmail.com>
Date:   Tue Dec 17 04:38:18 2024 +0100

    Improve browse-url-android-share docstring
    
    * lisp/net/browse-url.el (browse-url-android-share): Clarify that
    the option only applies to Android systems.

diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el
index 1a51d2bdaac..bd40dcb7727 100644
--- a/lisp/net/browse-url.el
+++ b/lisp/net/browse-url.el
@@ -1320,7 +1320,7 @@ Default to the URL around or before point."
               'browse-url-browser-kind 'external)
 
 (defcustom browse-url-android-share nil
-  "If non-nil, share URLs instead of opening them.
+  "If non-nil, share URLs on Android systems instead of opening them.
 When non-nil, `browse-url-default-android-browser' will try to
 share the URL being browsed through programs such as mail clients
 and instant messengers instead of opening it in a web browser."

commit 92041e15f4ad99ebebc40b082e40367a3aada7ba
Author: Stefan Kangas <stefankangas@gmail.com>
Date:   Tue Dec 17 03:10:42 2024 +0100

    Minor doc fix for url-handler-regexp
    
    * lisp/url/url-handlers.el (url-handler-regexp): Remove mention of
    obsolete internal protocol "about" (i.e. url-about.el).  Reflow.

diff --git a/lisp/url/url-handlers.el b/lisp/url/url-handlers.el
index 9edc7865a74..863863c3696 100644
--- a/lisp/url/url-handlers.el
+++ b/lisp/url/url-handlers.el
@@ -1,6 +1,6 @@
 ;;; url-handlers.el --- file-name-handler stuff for URL loading  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1996-1999, 2004-2024 Free Software Foundation, Inc.
+;; Copyright (C) 1996-2024 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes, hypermedia
 
@@ -124,13 +124,13 @@ that URL in a buffer."
 (defcustom url-handler-regexp
   "\\`\\(?:https?\\|ftp\\|file\\|nfs\\|ssh\\|scp\\|rsync\\|telnet\\)://"
   "Regular expression for URLs handled by `url-handler-mode'.
-When URL Handler mode is enabled, this regular expression is
-added to `file-name-handler-alist'.
+When URL Handler mode is enabled, this regular expression is added to
+`file-name-handler-alist'.
 
-Some valid URL protocols just do not make sense to visit
-interactively (about, data, info, irc, mailto, etc.).  This
-regular expression avoids conflicts with local files that look
-like URLs (Gnus is particularly bad at this)."
+Some valid URL protocols just do not make sense to visit interactively
+(data, info, irc, mailto, etc.).  This regular expression avoids
+conflicts with local files that look like URLs (Gnus is particularly bad
+at this)."
   :group 'url
   :type 'regexp
   :version "25.1"

commit 9fd96e2ab95d19bb7df7fb698a497d56f3cdb3af
Author: Stefan Kangas <stefankangas@gmail.com>
Date:   Mon Dec 16 22:17:36 2024 +0100

    Improve reb-change-syntax docstring
    
    * lisp/emacs-lisp/re-builder.el (reb-change-syntax): Improve docstring.

diff --git a/lisp/emacs-lisp/re-builder.el b/lisp/emacs-lisp/re-builder.el
index c5307f70d08..1fc6c872332 100644
--- a/lisp/emacs-lisp/re-builder.el
+++ b/lisp/emacs-lisp/re-builder.el
@@ -485,7 +485,22 @@ If the optional PAUSE is non-nil then pause at the end in any case."
 
 (defun reb-change-syntax (&optional syntax)
   "Change the syntax used by the RE Builder.
-Optional argument SYNTAX must be specified if called non-interactively."
+Interactively, prompt for SYNTAX.
+
+Re-Builder currently understands three different forms of input, namely
+`read', `string', and `rx' syntax:
+
+  1. The `string' syntax is the same one used by functions such as
+     `query-replace-regexp' (\\[query-replace-regexp]).  There is no need to escape
+     backslashes and double quotes.
+
+  2. The `read' syntax is the same syntax used as when specifying the
+     regexp as a string in a Lisp program.
+
+  3. Finally, the `rx' syntax allows editing of symbolic regular
+     expressions supported by the package of the same name.
+
+When called from Lisp, SYNTAX must be specified."
   (interactive
    (list (intern
 	  (completing-read

commit b9dc337ea7416ee7ee4d873a91f6d6d9f109c04c
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Date:   Mon Dec 16 09:27:01 2024 -0500

    * lisp/files.el (trusted-content-p): Make `:all` work in non-file buffers

diff --git a/lisp/files.el b/lisp/files.el
index e7399ba7cda..0bc787aca31 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -742,26 +742,28 @@ See also `trusted-content'."
   ;; to try and avoid marking as trusted a file that's merely accessed
   ;; via a symlink that happens to be inside a trusted dir.
   (and (not untrusted-content)
-       buffer-file-truename
-       (with-demoted-errors "trusted-content-p: %S"
-         (let ((exists (file-exists-p buffer-file-truename)))
-           (or
-            (eq trusted-content :all)
-            ;; We can't avoid trusting the user's init file.
-            (if (and exists user-init-file)
-                (file-equal-p buffer-file-truename user-init-file)
-              (equal buffer-file-truename user-init-file))
-            (let ((file (abbreviate-file-name buffer-file-truename))
-                  (trusted nil))
-              (dolist (tf trusted-content)
-                (when (or (if exists (file-equal-p tf file) (equal tf file))
-                          ;; We don't use `file-in-directory-p' here, because
-                          ;; we want to err on the conservative side: "guilty
-                          ;; until proven innocent".
-                          (and (string-suffix-p "/" tf)
-                               (string-prefix-p tf file)))
-                  (setq trusted t)))
-              trusted))))))
+       (or
+        (eq trusted-content :all)
+        (and
+         buffer-file-truename
+         (with-demoted-errors "trusted-content-p: %S"
+           (let ((exists (file-exists-p buffer-file-truename)))
+             (or
+              ;; We can't avoid trusting the user's init file.
+              (if (and exists user-init-file)
+                  (file-equal-p buffer-file-truename user-init-file)
+                (equal buffer-file-truename user-init-file))
+              (let ((file (abbreviate-file-name buffer-file-truename))
+                    (trusted nil))
+                (dolist (tf trusted-content)
+                  (when (or (if exists (file-equal-p tf file) (equal tf file))
+                            ;; We don't use `file-in-directory-p' here, because
+                            ;; we want to err on the conservative side: "guilty
+                            ;; until proven innocent".
+                            (and (string-suffix-p "/" tf)
+                                 (string-prefix-p tf file)))
+                    (setq trusted t)))
+                trusted))))))))
 
 ;; This is an odd variable IMO.
 ;; You might wonder why it is needed, when we could just do:

commit 4b685bc4fcd060aab287704c2b00ab9feac4abb3
Author: Robert Pluim <rpluim@gmail.com>
Date:   Mon Dec 16 13:35:28 2024 +0100

    ; * src/process.c (Fnetwork_interface_list): Fix typo.

diff --git a/src/process.c b/src/process.c
index 58ce0f3e6ed..b10020bdae4 100644
--- a/src/process.c
+++ b/src/process.c
@@ -4605,7 +4605,7 @@ network_interface_info (Lisp_Object ifname)
 DEFUN ("network-interface-list", Fnetwork_interface_list,
        Snetwork_interface_list, 0, 2, 0,
        doc: /* Return an alist of all network interfaces and their network address.
-Each element is cons of the form (IFNAME . IP) where IFNAME is a
+Each element is a cons of the form (IFNAME . IP) where IFNAME is a
 string containing the interface name, and IP is the network address in
 internal format; see the description of ADDRESS in
 `make-network-process'.  The interface name is not guaranteed to be

commit c14c489571988f4fede84c69254804a89b314d26
Author: Robert Pluim <rpluim@gmail.com>
Date:   Mon Dec 16 13:25:24 2024 +0100

    ; * lisp/net/nsm.el (nsm-trust-local-network): Fix typo.

diff --git a/lisp/net/nsm.el b/lisp/net/nsm.el
index ab655dbb13b..3d0eacf4eb2 100644
--- a/lisp/net/nsm.el
+++ b/lisp/net/nsm.el
@@ -65,10 +65,10 @@ checked and warned against."
 
 The default suite of TLS checks in NSM is designed to follow the
 most current security best practices.  Under some situations,
-such as attempting to connect to an email server that do not
+such as attempting to connect to an email server that does not
 follow these practices inside a school or corporate network, NSM
 may produce warnings for such occasions.  Setting this option to
-a non-nil value, or a zero-argument function that returns non-nil
+a non-nil value, or a zero-argument function that returns non-nil,
 tells NSM to skip checking for potential TLS vulnerabilities when
 connecting to hosts on a local network.
 

commit 10f976300d03a8cb9a12a5d2548d1b275ac3edcc
Author: Yuan Fu <casouri@gmail.com>
Date:   Sun Dec 15 21:40:49 2024 -0800

    ; Add some tree-sitter thing content to the manual
    
    * doc/lispref/parsing.texi (User-defined Things): List "builtin"
    things.

diff --git a/doc/lispref/parsing.texi b/doc/lispref/parsing.texi
index f8bf0b20a7c..fbecbc69276 100644
--- a/doc/lispref/parsing.texi
+++ b/doc/lispref/parsing.texi
@@ -1590,6 +1590,16 @@ Note that this example is modified for didactic purposes, and isn't
 exactly how C and C@t{++} modes define things.
 @end defvar
 
+Emacs builtin functions already make use some thing definitions.
+Command @code{treesit-forward-sexp} uses the @code{sexp} definition if
+major mode defines it; @code{treesit-forward-sentence} uses the
+@code{sentence} definition.  Defun movement functions like
+@code{treesit-end-of-defun} uses the @code{defun} definition
+(@code{defun} definition is overridden by
+@var{treesit-defun-type-regexp} for backward compatibility).  Major
+modes can also define @code{comment}, @code{string}, @code{text}
+(generally comments and strings).
+
 The rest of this section lists a few functions that take advantage of
 the thing definitions.  Besides the functions below, some other
 functions listed elsewhere also utilize the thing feature, e.g.,

commit 55303a6bc0a06d32ec757b6291d40e8f28565946
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Date:   Sun Dec 15 17:08:25 2024 -0500

    * lisp/org/ox-texinfo.el (org-texinfo-template): Fix Info format (bug#74844)

diff --git a/lisp/org/ox-texinfo.el b/lisp/org/ox-texinfo.el
index 6adee9fca3f..8bb07feb81e 100644
--- a/lisp/org/ox-texinfo.el
+++ b/lisp/org/ox-texinfo.el
@@ -826,9 +826,9 @@ holding export options."
               ;; `dn' is presumed to be just the DIRNAME part, so generate
               ;; either `* DIRNAME: (FILENAME).' or `* FILENAME.', whichever
               ;; is shortest.
-              ((and dn (not (equal dn file)))
+              (dn
                (format "* %s: (%s)." dn (or file dn)))
-              (t (format "* %s." file)))))
+              (t (format "* (%s)." file)))))
        (concat "@dircategory " dircat "\n"
 	       "@direntry\n"
 	       (let ((dirdesc

commit 8b6c6cffd1f772301e89353de5e057835af18a30
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Date:   Sun Dec 15 17:05:55 2024 -0500

    trusted-content: Adjust the last patch based on preliminary feedback
    
    * lisp/files.el (trusted-content): Rename from `trusted-files`.
    Update all references.
    
    * lisp/progmodes/elisp-mode.el (lisp-interaction-mode):
    * lisp/ielm.el (inferior-emacs-lisp-mode):
    * lisp/simple.el (read--expression): Set `trusted-content` since
    these buffers contain code that the user presumably intends to run anyway.
    (elisp--safe-macroexpand-all): Make the warning more discreet.

diff --git a/etc/NEWS b/etc/NEWS
index c5f1123ebc1..8e92cef2bcb 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -199,7 +199,7 @@ see the variable 'url-request-extra-headers'.
 
 * Changes in Emacs 30.1
 
-** New user option 'trusted-files' to allow potentially dangerous features.
+** New user option 'trusted-content' to allow potentially dangerous features.
 This variable lists those files and directories whose content Emacs should
 consider as sufficiently trusted to run any part of the code contained
 therein even without any explicit user request.
@@ -1869,7 +1869,7 @@ In the past they included a terminating newline in most cases but not all.
 
 *** 'elisp-flymake-byte-compile' is disabled for untrusted files.
 For security reasons, this backend can be used only in those files
-specified as trusted according to 'trusted-files' and emits an
+specified as trusted according to 'trusted-content' and emits an
 "untrusted content" warning otherwise.
 This fixes CVE-2024-53920.
 
diff --git a/lisp/files.el b/lisp/files.el
index 5d9e6440f5b..e7399ba7cda 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -714,7 +714,7 @@ buffer contents as untrusted.
 This variable might be subject to change without notice.")
 (put 'untrusted-content 'permanent-local t)
 
-(defcustom trusted-files nil
+(defcustom trusted-content nil
   "List of files and directories whose content we trust.
 Be extra careful here since trusting means that Emacs might execute the
 code contained within those files and directories without an explicit
@@ -732,12 +732,12 @@ all files, which opens a gaping security hole."
   :type '(choice (repeat :tag "List" file)
                  (const :tag "Trust everything (DANGEROUS!)" :all))
   :version "30.1")
-(put 'trusted-files 'risky-local-variable t)
+(put 'trusted-content 'risky-local-variable t)
 
 (defun trusted-content-p ()
   "Return non-nil if we trust the contents of the current buffer.
 Here, \"trust\" means that we are willing to run code found inside of it.
-See also `trusted-files'."
+See also `trusted-content'."
   ;; We compare with `buffer-file-truename' i.s.o `buffer-file-name'
   ;; to try and avoid marking as trusted a file that's merely accessed
   ;; via a symlink that happens to be inside a trusted dir.
@@ -746,14 +746,14 @@ See also `trusted-files'."
        (with-demoted-errors "trusted-content-p: %S"
          (let ((exists (file-exists-p buffer-file-truename)))
            (or
-            (eq trusted-files :all)
+            (eq trusted-content :all)
             ;; We can't avoid trusting the user's init file.
             (if (and exists user-init-file)
                 (file-equal-p buffer-file-truename user-init-file)
               (equal buffer-file-truename user-init-file))
             (let ((file (abbreviate-file-name buffer-file-truename))
                   (trusted nil))
-              (dolist (tf trusted-files)
+              (dolist (tf trusted-content)
                 (when (or (if exists (file-equal-p tf file) (equal tf file))
                           ;; We don't use `file-in-directory-p' here, because
                           ;; we want to err on the conservative side: "guilty
diff --git a/lisp/ielm.el b/lisp/ielm.el
index e583e0fe32c..7511d4b02ae 100644
--- a/lisp/ielm.el
+++ b/lisp/ielm.el
@@ -580,6 +580,7 @@ Customized bindings may be defined in `ielm-map', which currently contains:
        ielm-fontify-input-enable
        (comint-fontify-input-mode))
 
+  (setq-local trusted-content :all)
   (setq comint-prompt-regexp (concat "^" (regexp-quote ielm-prompt)))
   (setq-local paragraph-separate "\\'")
   (setq-local paragraph-start comint-prompt-regexp)
diff --git a/lisp/progmodes/elisp-mode.el b/lisp/progmodes/elisp-mode.el
index ab79082d1b2..17606352c4a 100644
--- a/lisp/progmodes/elisp-mode.el
+++ b/lisp/progmodes/elisp-mode.el
@@ -457,8 +457,9 @@ use of `macroexpand-all' as a way to find the \"underlying raw code\".")
       (progn
         (when elisp--macroexpand-untrusted-warning
           (setq-local elisp--macroexpand-untrusted-warning nil) ;Don't spam!
-          (message "Completion of local vars is disabled in %s (untrusted content)"
-                   (buffer-name)))
+          (let ((inhibit-message t))      ;Only log.
+            (message "Completion of local vars is disabled in %s (untrusted content)"
+                     (buffer-name))))
         sexp)
     (let ((macroexpand-advice
            (lambda (expander form &rest args)
@@ -1336,7 +1337,8 @@ Semicolons start comments.
 
 \\{lisp-interaction-mode-map}"
   :abbrev-table nil
-  (setq-local lexical-binding t))
+  (setq-local lexical-binding t)
+  (setq-local trusted-content :all))
 
 ;;; Emacs Lisp Byte-Code mode
 
diff --git a/lisp/simple.el b/lisp/simple.el
index 3054c8ab6a7..088678ba857 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -2033,6 +2033,7 @@ function `read-from-minibuffer'."
         (set-syntax-table emacs-lisp-mode-syntax-table)
         (add-hook 'completion-at-point-functions
                   #'elisp-completion-at-point nil t)
+        (setq-local trusted-content :all)
         (run-hooks 'eval-expression-minibuffer-setup-hook))
     (read-from-minibuffer prompt initial-contents
                           read--expression-map t

commit 69b16e5c63840479270d32f58daea923fe725b90
Author: Michael Albinus <michael.albinus@gmx.de>
Date:   Sun Dec 15 09:24:40 2024 +0100

    ; * etc/NEWS: Fix typos.

diff --git a/etc/NEWS b/etc/NEWS
index a9c8f6c4801..c5f1123ebc1 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -199,11 +199,11 @@ see the variable 'url-request-extra-headers'.
 
 * Changes in Emacs 30.1
 
-** New variable 'trusted-files' to allow potentially dangerous features.
+** New user option 'trusted-files' to allow potentially dangerous features.
 This variable lists those files and directories whose content Emacs should
 consider as sufficiently trusted to run any part of the code contained
 therein even without any explicit user request.
-For example, Flymake's backend for Emacs Lisp consults this variable
+For example, Flymake's backend for Emacs Lisp consults this option
 and disables itself with an "untrusted content" warning if the file
 is not listed.
 

commit 5c6dbc65f3642b98d3e1ff3a901c1580353783df
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Sun Dec 15 09:45:58 2024 +0200

    ; * doc/lispref/frames.texi (Multiple Terminals): Add indexing.

diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi
index 996399fb19a..52ab8371f71 100644
--- a/doc/lispref/frames.texi
+++ b/doc/lispref/frames.texi
@@ -380,6 +380,9 @@ than one physical monitor.  You can use the functions
 @code{display-monitor-attributes-list} and @code{frame-monitor-attributes}
 to obtain information about such setups.
 
+@cindex display geometry
+@cindex monitor geometry
+@cindex geometry of display monitor
 @defun display-monitor-attributes-list &optional display
 This function returns a list of physical monitor attributes on
 @var{display}, which can be a display name (a string), a terminal, or

commit 856a58e28279139cfd6503917954fd75fcdd7e78
Author: Paul Eggert <eggert@cs.ucla.edu>
Date:   Sun Dec 15 00:16:10 2024 -0700

    Update documentation of 'etags' regexps some more
    
    * doc/emacs/maintaining.texi (Etags Regexps):
    * doc/man/etags.1: Give more details about what's not supported.

diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi
index adda923af7c..bc7a47482a8 100644
--- a/doc/emacs/maintaining.texi
+++ b/doc/emacs/maintaining.texi
@@ -3094,8 +3094,12 @@ and all the C character escape sequences are supported: @samp{\a} for
 bell, @samp{\b} for back space, @samp{\e} for escape, @samp{\f} for
 formfeed, @samp{\n} for newline, @samp{\r} for carriage return,
 @samp{\t} for tab, and @samp{\v} for vertical tab.  In addition,
-@samp{\d} stands for the @code{DEL} character.  Shy groups are not
-supported by @command{etags}.
+@samp{\d} stands for the @code{DEL} character.  Otherwise,
+the regular expression syntax is the same as Emacs
+except that backslash escapes are the same
+as GNU grep (which means, for example, that shy groups are not supported),
+and @samp{[:ascii:]}, @samp{[:multibyte:]}, @samp{[:nonascii:]},
+@samp{[:word:]}, and @samp{[:unibyte:]} are not supported.
 
   Ideally, @var{tagregexp} should not match more characters than are
 needed to recognize what you want to tag.  If the syntax requires you
diff --git a/doc/man/etags.1 b/doc/man/etags.1
index 12c2afc88b2..d26e2445e44 100644
--- a/doc/man/etags.1
+++ b/doc/man/etags.1
@@ -185,7 +185,10 @@ useless characters.  If the match is such that more characters than
 needed are unavoidably matched by \fItagregexp\fP, it may be useful to
 add a \fInameregexp\fP, to narrow down the tag scope.  \fBctags\fP
 ignores regexps without a \fInameregexp\fP.  The syntax of regexps is
-the same as in emacs, except that shy groups are not supported.
+the same as in Emacs, except that backslash escapes are the same
+as GNU grep (which means, for example, that shy groups are not supported),
+and \fB[:ascii:]\fP, \fB[:multibyte:]\fP, \fB[:nonascii:]\fP,
+\fB[:word:]\fP, and \fB[:unibyte:]\fP are not supported.
 The following character escape sequences are supported:
 \\a, \\b, \\d, \\e, \\f, \\n, \\r, \\t, \\v, which respectively
 stand for the ASCII characters BEL, BS, DEL, ESC, FF, NL, CR, TAB, VT.

commit 4c68846223b91e50e4a15fbc59d2238605ce2a57
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Sun Dec 15 07:52:40 2024 +0200

    Update documentation of 'etags' regexps
    
    * doc/emacs/maintaining.texi (Etags Regexps):
    * doc/man/etags.1: Say that shy groups are not supported (bug#74861).

diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi
index a632ffda4ab..adda923af7c 100644
--- a/doc/emacs/maintaining.texi
+++ b/doc/emacs/maintaining.texi
@@ -3094,7 +3094,8 @@ and all the C character escape sequences are supported: @samp{\a} for
 bell, @samp{\b} for back space, @samp{\e} for escape, @samp{\f} for
 formfeed, @samp{\n} for newline, @samp{\r} for carriage return,
 @samp{\t} for tab, and @samp{\v} for vertical tab.  In addition,
-@samp{\d} stands for the @code{DEL} character.
+@samp{\d} stands for the @code{DEL} character.  Shy groups are not
+supported by @command{etags}.
 
   Ideally, @var{tagregexp} should not match more characters than are
 needed to recognize what you want to tag.  If the syntax requires you
diff --git a/doc/man/etags.1 b/doc/man/etags.1
index 9b8df50a6bb..12c2afc88b2 100644
--- a/doc/man/etags.1
+++ b/doc/man/etags.1
@@ -1,5 +1,5 @@
 .\" See section COPYING for copyright and redistribution information.
-.TH ETAGS 1 "2022-06-10" "GNU Tools" "GNU"
+.TH ETAGS 1 "2024-12-15" "GNU Tools" "GNU"
 .de BP
 .sp
 .ti -.2i
@@ -185,10 +185,10 @@ useless characters.  If the match is such that more characters than
 needed are unavoidably matched by \fItagregexp\fP, it may be useful to
 add a \fInameregexp\fP, to narrow down the tag scope.  \fBctags\fP
 ignores regexps without a \fInameregexp\fP.  The syntax of regexps is
-the same as in emacs.  The following character escape sequences are
-supported: \\a, \\b, \\d, \\e, \\f, \\n, \\r, \\t, \\v, which
-respectively stand for the ASCII characters BEL, BS, DEL, ESC, FF, NL,
-CR, TAB, VT.
+the same as in emacs, except that shy groups are not supported.
+The following character escape sequences are supported:
+\\a, \\b, \\d, \\e, \\f, \\n, \\r, \\t, \\v, which respectively
+stand for the ASCII characters BEL, BS, DEL, ESC, FF, NL, CR, TAB, VT.
 .br
 The \fImodifiers\fP are a sequence of 0 or more characters among
 \fIi\fP, which means to ignore case when matching; \fIm\fP, which means

commit b5158bd191422e46273c4d9412f2bf097e2da2e0
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Date:   Tue Dec 10 16:26:31 2024 -0500

    elisp-mode.el: Disable Flymake byte-compile backend in untrusted files
    
    To address serious security issues (CVE-2024-53920), disable
    `elisp-flymake-byte-compile` except in those files explicitly
    specified as "trusted".
    
    For that introduce a new custom var `trusted-files` and new
    function `trusted-content-p`.
    
    While at it, similarly skip the implicit macroexpansion done during
    completion if the current file is not trusted.
    
    * lisp/files.el (trusted-files): New variable.
    (trusted-content-p): New function.
    
    * lisp/progmodes/elisp-mode.el (elisp--safe-macroexpand-all):
    New function, extracted from `elisp--local-variables`.
    Use `trusted-content-p`.
    (elisp--local-variables): Use it.
    (elisp-flymake-byte-compile): Disable according to `trusted-content-p`.

diff --git a/etc/NEWS b/etc/NEWS
index 3d691cfac40..a9c8f6c4801 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -199,6 +199,14 @@ see the variable 'url-request-extra-headers'.
 
 * Changes in Emacs 30.1
 
+** New variable 'trusted-files' to allow potentially dangerous features.
+This variable lists those files and directories whose content Emacs should
+consider as sufficiently trusted to run any part of the code contained
+therein even without any explicit user request.
+For example, Flymake's backend for Emacs Lisp consults this variable
+and disables itself with an "untrusted content" warning if the file
+is not listed.
+
 ---
 ** Emacs now supports Unicode Standard version 15.1.
 
@@ -1859,6 +1867,12 @@ In the past they included a terminating newline in most cases but not all.
 
 ** Emacs Lisp mode
 
+*** 'elisp-flymake-byte-compile' is disabled for untrusted files.
+For security reasons, this backend can be used only in those files
+specified as trusted according to 'trusted-files' and emits an
+"untrusted content" warning otherwise.
+This fixes CVE-2024-53920.
+
 ---
 *** ',@' now has 'prefix' syntax.
 Previously, the '@' character, which normally has 'symbol' syntax,
diff --git a/lisp/files.el b/lisp/files.el
index 63a08ce5b22..5d9e6440f5b 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -714,6 +714,55 @@ buffer contents as untrusted.
 This variable might be subject to change without notice.")
 (put 'untrusted-content 'permanent-local t)
 
+(defcustom trusted-files nil
+  "List of files and directories whose content we trust.
+Be extra careful here since trusting means that Emacs might execute the
+code contained within those files and directories without an explicit
+request by the user.
+One important case when this might happen is when `flymake-mode' is
+enabled (for example, when it is added to a mode hook).
+Each element of the list should be a string:
+- If it ends in \"/\", it is considered as a directory name and means that
+  Emacs should trust all the files whose name has this directory as a prefix.
+- else it is considered as a file name.
+Use abbreviated file names.  For example, an entry \"~/mycode\" means
+that Emacs will trust all the files in your directory \"mycode\".
+This variable can also be set to `:all', in which case Emacs will trust
+all files, which opens a gaping security hole."
+  :type '(choice (repeat :tag "List" file)
+                 (const :tag "Trust everything (DANGEROUS!)" :all))
+  :version "30.1")
+(put 'trusted-files 'risky-local-variable t)
+
+(defun trusted-content-p ()
+  "Return non-nil if we trust the contents of the current buffer.
+Here, \"trust\" means that we are willing to run code found inside of it.
+See also `trusted-files'."
+  ;; We compare with `buffer-file-truename' i.s.o `buffer-file-name'
+  ;; to try and avoid marking as trusted a file that's merely accessed
+  ;; via a symlink that happens to be inside a trusted dir.
+  (and (not untrusted-content)
+       buffer-file-truename
+       (with-demoted-errors "trusted-content-p: %S"
+         (let ((exists (file-exists-p buffer-file-truename)))
+           (or
+            (eq trusted-files :all)
+            ;; We can't avoid trusting the user's init file.
+            (if (and exists user-init-file)
+                (file-equal-p buffer-file-truename user-init-file)
+              (equal buffer-file-truename user-init-file))
+            (let ((file (abbreviate-file-name buffer-file-truename))
+                  (trusted nil))
+              (dolist (tf trusted-files)
+                (when (or (if exists (file-equal-p tf file) (equal tf file))
+                          ;; We don't use `file-in-directory-p' here, because
+                          ;; we want to err on the conservative side: "guilty
+                          ;; until proven innocent".
+                          (and (string-suffix-p "/" tf)
+                               (string-prefix-p tf file)))
+                  (setq trusted t)))
+              trusted))))))
+
 ;; This is an odd variable IMO.
 ;; You might wonder why it is needed, when we could just do:
 ;; (setq-local enable-local-variables nil)
diff --git a/lisp/progmodes/elisp-mode.el b/lisp/progmodes/elisp-mode.el
index 9bf6f9217c8..ab79082d1b2 100644
--- a/lisp/progmodes/elisp-mode.el
+++ b/lisp/progmodes/elisp-mode.el
@@ -448,6 +448,34 @@ be used instead.
 This is used to try and avoid the most egregious problems linked to the
 use of `macroexpand-all' as a way to find the \"underlying raw code\".")
 
+(defvar elisp--macroexpand-untrusted-warning t)
+
+(defun elisp--safe-macroexpand-all (sexp)
+  (if (not (trusted-content-p))
+      ;; FIXME: We should try and do better here, either using a notion
+      ;; of "safe" macros, or with `bwrap', or ...
+      (progn
+        (when elisp--macroexpand-untrusted-warning
+          (setq-local elisp--macroexpand-untrusted-warning nil) ;Don't spam!
+          (message "Completion of local vars is disabled in %s (untrusted content)"
+                   (buffer-name)))
+        sexp)
+    (let ((macroexpand-advice
+           (lambda (expander form &rest args)
+             (condition-case err
+                 (apply expander form args)
+               (error
+                (message "Ignoring macroexpansion error: %S" err) form)))))
+      (unwind-protect
+          ;; Silence any macro expansion errors when
+          ;; attempting completion at point (bug#58148).
+          (let ((inhibit-message t)
+                (macroexp-inhibit-compiler-macros t)
+                (warning-minimum-log-level :emergency))
+            (advice-add 'macroexpand-1 :around macroexpand-advice)
+            (macroexpand-all sexp elisp--local-macroenv))
+        (advice-remove 'macroexpand-1 macroexpand-advice)))))
+
 (defun elisp--local-variables ()
   "Return a list of locally let-bound variables at point."
   (save-excursion
@@ -463,23 +491,8 @@ use of `macroexpand-all' as a way to find the \"underlying raw code\".")
                        (car (read-from-string
                              (concat txt "elisp--witness--lisp" closer)))
                      ((invalid-read-syntax end-of-file) nil)))
-             (macroexpand-advice
-              (lambda (expander form &rest args)
-                (condition-case err
-                    (apply expander form args)
-                  (error
-                   (message "Ignoring macroexpansion error: %S" err) form))))
-             (sexp
-              (unwind-protect
-                  ;; Silence any macro expansion errors when
-                  ;; attempting completion at point (bug#58148).
-                  (let ((inhibit-message t)
-                        (macroexp-inhibit-compiler-macros t)
-                        (warning-minimum-log-level :emergency))
-                    (advice-add 'macroexpand-1 :around macroexpand-advice)
-                    (macroexpand-all sexp elisp--local-macroenv))
-                (advice-remove 'macroexpand-1 macroexpand-advice)))
-             (vars (elisp--local-variables-1 nil sexp)))
+             (vars (elisp--local-variables-1
+                    nil (elisp--safe-macroexpand-all sexp))))
         (delq nil
               (mapcar (lambda (var)
                         (and (symbolp var)
@@ -2188,6 +2201,14 @@ directory of the buffer being compiled, and nothing else.")
   "A Flymake backend for elisp byte compilation.
 Spawn an Emacs process that byte-compiles a file representing the
 current buffer state and calls REPORT-FN when done."
+  (unless (trusted-content-p)
+    ;; FIXME: Use `bwrap' and friends to compile untrusted content.
+    ;; FIXME: We emit a message *and* signal an error, because by default
+    ;; Flymake doesn't display the warning it puts into "*flmake log*".
+    (message "Disabling elisp-flymake-byte-compile in %s (untrusted content)"
+             (buffer-name))
+    (error "Disabling elisp-flymake-byte-compile in %s (untrusted content)"
+           (buffer-name)))
   (when elisp-flymake--byte-compile-process
     (when (process-live-p elisp-flymake--byte-compile-process)
       (kill-process elisp-flymake--byte-compile-process)))

commit 6fa2050ee7663441e4d0aa4fff974cc5d45bffc7
Author: Gerd Möllmann <gerd@gnu.org>
Date:   Thu Dec 12 08:00:44 2024 +0100

    Signal errors for unimplemented features
    
    * src/frame.c (make_terminal_frame): Error for minibuffer-only frames.
    * src/term.c (Ftty_frame_restack): Signal error.

diff --git a/src/frame.c b/src/frame.c
index 6ea1a31cdb8..6552567386e 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -1296,14 +1296,7 @@ make_terminal_frame (struct terminal *terminal, Lisp_Object parent,
 	  if (EQ (mini, Qnone) || NILP (mini))
 	    f = make_frame_without_minibuffer (Qnil, kb, Qnil);
 	  else if (EQ (mini, Qonly))
-	    {
-# if 0 /* No interest in this feature at the moment.  */
-	      f = make_minibuffer_frame ();
-	      /* Not sure about this, plus the unsplittable frame
-		 param.  */
-	      f->no_split = true;
-# endif
-	    }
+	    error ("minibuffer-only child frames are not implemented");
 	  else if (WINDOWP (mini))
 	    f = make_frame_without_minibuffer (mini, kb, Qnil);
 	}
diff --git a/src/term.c b/src/term.c
index a7f7baa6e3c..64df5261e50 100644
--- a/src/term.c
+++ b/src/term.c
@@ -4861,6 +4861,7 @@ DEFUN ("tty-frame-restack", Ftty_frame_restack,
   (Lisp_Object frame1, Lisp_Object frame2, Lisp_Object above)
 {
   /* FIXME/tty: tty-frame-restack implementation.  */
+  error ("tty-frame-restack is not implemented");
   return Qnil;
 }
 

commit b67feec95e8f7526fecab0bb10f91233ba06fef8
Author: Gerd Möllmann <gerd@gnu.org>
Date:   Sun Dec 8 08:56:22 2024 +0100

    * lisp/tty-tip.el (tty-tip--create-frame): Use tooltip-hide-delay

diff --git a/lisp/tty-tip.el b/lisp/tty-tip.el
index 1e44aaba02b..4052fca4b52 100644
--- a/lisp/tty-tip.el
+++ b/lisp/tty-tip.el
@@ -153,7 +153,7 @@
 	(set-frame-position tty-tip--frame x y))
       (make-frame-visible tty-tip--frame)
       (setq tty-tip--hide-timer
-            (run-with-timer x-show-tooltip-timeout nil
+            (run-with-timer tooltip-hide-delay nil
                             #'tty-tip--delete-frame)))))
 
 (defun tty-tip--delay ()

commit d22882e418eb100423c53d90cca257bb0c197b86
Author: Gerd Möllmann <gerd@gnu.org>
Date:   Sun Dec 8 06:54:47 2024 +0100

    Prevent too early hiding of tty tips
    
    * lisp/tty-tip.el (tty-tip--show-timer): Renamed from
    tty-tip--timeout-id.
    (tty-tip--hide-timer): New variable.
    (tty-tip--delete-frame): Cancel hide timer if set.
    (tty-tip--create-frame): Use run-with-timer instead of run-at-time
    for consistency.

diff --git a/lisp/tty-tip.el b/lisp/tty-tip.el
index 728c16b6856..1e44aaba02b 100644
--- a/lisp/tty-tip.el
+++ b/lisp/tty-tip.el
@@ -99,8 +99,16 @@
       (setf (alist-get 'background-color params) bg))
     params))
 
+(defvar tty-tip--help-message nil)
+(defvar tty-tip--hide-time nil)
+(defvar tty-tip--show-timer nil)
+(defvar tty-tip--hide-timer nil)
+
 (defun tty-tip--delete-frame ()
   (when tty-tip--frame
+    (when tty-tip--hide-timer
+      (cancel-timer tty-tip--hide-timer)
+      (setq tty-tip--hide-timer nil))
     (delete-frame tty-tip--frame)
     (setq tty-tip--frame nil)
     t))
@@ -144,11 +152,9 @@
              (y (cdr pos)))
 	(set-frame-position tty-tip--frame x y))
       (make-frame-visible tty-tip--frame)
-      (run-at-time x-show-tooltip-timeout nil #'tty-tip--delete-frame))))
-
-(defvar tty-tip--help-message nil)
-(defvar tty-tip--hide-time nil)
-(defvar tty-tip--timeout-id nil)
+      (setq tty-tip--hide-timer
+            (run-with-timer x-show-tooltip-timeout nil
+                            #'tty-tip--delete-frame)))))
 
 (defun tty-tip--delay ()
   (if (and tty-tip--hide-time
@@ -158,12 +164,12 @@
     tooltip-delay))
 
 (defun tty-tip--cancel-delayed-tip ()
-  (when tty-tip--timeout-id
-    (cancel-timer tty-tip--timeout-id)
-    (setq tty-tip--timeout-id nil)))
+  (when tty-tip--show-timer
+    (cancel-timer tty-tip--show-timer)
+    (setq tty-tip--show-timer nil)))
 
 (defun tty-tip--start-delayed-tip ()
-  (setq tty-tip--timeout-id
+  (setq tty-tip--show-timer
         (run-with-timer (tty-tip--delay) nil
                         (lambda ()
                           (tty-tip--create-frame

commit 196c761c66d47ff6a93d9134ca73d1c08a9125db
Author: Gerd Möllmann <gerd@gnu.org>
Date:   Mon Nov 18 16:50:51 2024 +0100

    Consider all windows for redisplay if frames have been cleared
    
    * src/xdisp.c (clear_garbaged_frames): Return true if any tty frame's
    current matrix has been cleared.
    (redisplay_internal): Consider all windows if clear_garbaged_frames
    returns true.

diff --git a/src/xdisp.c b/src/xdisp.c
index 7b6a3f3694a..9ca8dda0ac7 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -13413,18 +13413,22 @@ clear_message (bool current_p, bool last_displayed_p)
   message_buf_print = false;
 }
 
-/* Clear garbaged frames.
+/* Clear garbaged frames.  Value is true if current matrices have been
+   cleared on at least one tty frame.  This information is needed to
+   determine if more than one window has to be updated on ttys, whose
+   update requires building a frame matrix from window matrices.
 
    This function is used where the old redisplay called
    redraw_garbaged_frames which in turn called redraw_frame which in
    turn called clear_frame.  The call to clear_frame was a source of
    flickering.  I believe a clear_frame is not necessary.  It should
    suffice in the new redisplay to invalidate all current matrices,
-   and ensure a complete redisplay of all windows.  */
+   and ensure a complete redisplay of all windows. */
 
-static void
+static bool
 clear_garbaged_frames (void)
 {
+  bool current_matrices_cleared = false;
   if (frame_garbaged)
     {
       Lisp_Object tail, frame;
@@ -13446,6 +13450,8 @@ clear_garbaged_frames (void)
 		redraw_frame (f);
 	      else
 		clear_current_matrices (f);
+	      if (is_tty_frame (f))
+		current_matrices_cleared = true;
 
 #ifdef HAVE_WINDOW_SYSTEM
               if (FRAME_WINDOW_P (f)
@@ -13460,6 +13466,8 @@ clear_garbaged_frames (void)
 
       frame_garbaged = false;
     }
+
+  return current_matrices_cleared;
 }
 
 
@@ -17092,7 +17100,7 @@ redisplay_internal (void)
   do_pending_window_change (true);
 
   /* Clear frames marked as garbaged.  */
-  clear_garbaged_frames ();
+  bool current_matrices_cleared = clear_garbaged_frames ();
 
   /* Build menubar and tool-bar items.  */
   if (NILP (Vmemory_full))
@@ -17183,7 +17191,8 @@ redisplay_internal (void)
   overlay_arrows_changed_p (true);
 
   consider_all_windows_p = (update_mode_lines
-			    || windows_or_buffers_changed);
+			    || windows_or_buffers_changed
+			    || current_matrices_cleared);
 
 #define AINC(a,i)							\
   {									\

commit 7608563d3b274d805111827a39cc73aaa147eaa1
Author: Gerd Möllmann <gerd@gnu.org>
Date:   Mon Nov 18 08:21:22 2024 +0100

    * src/xdisp.c (redisplay_internal): Use assq_no_quit.

diff --git a/src/xdisp.c b/src/xdisp.c
index 8196d1236ba..7b6a3f3694a 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -17467,16 +17467,9 @@ redisplay_internal (void)
 		continue;
 
 	      /* Remember tty root frames which we've seen.  */
-	      if (!FRAME_PARENT_FRAME (f))
-		{
-		  Lisp_Object found;
-		  for (found = tty_root_frames;
-		       CONSP (found) && !EQ (XCAR (found), frame);
-		       found = XCDR (found))
-		    ;
-		  if (!CONSP (found))
-		    tty_root_frames = Fcons (frame, tty_root_frames);
-		}
+	      if (!FRAME_PARENT_FRAME (f)
+		  && NILP (assq_no_quit (frame, tty_root_frames)))
+		tty_root_frames = Fcons (frame, tty_root_frames);
 	    }
 
 	retry_frame:

commit e7359fbbc40bbf714fb5b4bffc256b455fbe9a6c
Author: Gerd Möllmann <gerd@gnu.org>
Date:   Sat Nov 16 13:52:17 2024 +0100

    Revert "Don't pause display for pending input"
    
    This reverts commit f62d70f52f4f6b7ed158d618bf790df21f171172.

diff --git a/lisp/subr.el b/lisp/subr.el
index 648e6f0f38f..6472c9d6916 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1990,6 +1990,7 @@ be a list of the form returned by `event-start' and `event-end'."
  ;; It's been announced as obsolete in NEWS and in the docstring since Emacs-25,
  ;; but it's only been marked for compilation warnings since Emacs-29.
  "25.1")
+(make-obsolete-variable 'redisplay-dont-pause nil "24.5")
 (make-obsolete-variable 'operating-system-release nil "28.1")
 (make-obsolete-variable 'inhibit-changing-match-data 'save-match-data "29.1")
 
diff --git a/src/dispextern.h b/src/dispextern.h
index 47afc48bb60..cb43d330b86 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -1322,6 +1322,9 @@ struct glyph_row *matrix_row (struct glyph_matrix *, int);
 
 extern struct glyph space_glyph;
 
+/* True means last display completed.  False means it was preempted.  */
+
+extern bool display_completed;
 
 /************************************************************************
 			  Glyph Strings
@@ -3803,7 +3806,7 @@ extern Lisp_Object marginal_area_string (struct window *, enum window_part,
                                          Lisp_Object *,
                                          int *, int *, int *, int *);
 extern void redraw_frame (struct frame *);
-void update_frame (struct frame *, bool);
+extern bool update_frame (struct frame *, bool, bool);
 extern void update_frame_with_menu (struct frame *, int, int);
 extern int update_mouse_position (struct frame *, int, int);
 extern void bitch_at_user (void);
@@ -3922,8 +3925,8 @@ Lisp_Object frames_in_reverse_z_order (struct frame *f, bool visible);
 bool is_tty_frame (struct frame *f);
 bool is_tty_child_frame (struct frame *f);
 bool is_tty_root_frame (struct frame *f);
-void combine_updates (Lisp_Object root_frames, bool inhibit_id_p);
-void combine_updates_for_frame (struct frame *f, bool inhibit_id_p);
+bool combine_updates (Lisp_Object root_frames, bool force_p, bool inhibit_id_p);
+bool combine_updates_for_frame (struct frame *f, bool force_p, bool inhibit_id_p);
 void tty_raise_lower_frame (struct frame *f, bool raise);
 int max_child_z_order (struct frame *parent);
 
diff --git a/src/dispnew.c b/src/dispnew.c
index 37ec37b752e..d473a77e3ad 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -93,10 +93,10 @@ static void check_matrix_pointers (struct glyph_matrix *,
                                    struct glyph_matrix *);
 #endif
 static void mirror_line_dance (struct window *, int, int, int *, char *);
-static void update_window_tree (struct window *);
-static void update_window (struct window *);
-static void write_matrix (struct frame *, bool, bool, bool);
-static void scrolling (struct frame *);
+static bool update_window_tree (struct window *, bool);
+static bool update_window (struct window *, bool);
+static bool write_matrix (struct frame *, bool, bool, bool, bool);
+static bool scrolling (struct frame *);
 static void set_window_cursor_after_update (struct window *);
 static void adjust_frame_glyphs_for_window_redisplay (struct frame *);
 static void adjust_frame_glyphs_for_frame_redisplay (struct frame *);
@@ -116,6 +116,10 @@ check_rows (struct frame *f)
 }
 #endif
 
+/* True means last display completed.  False means it was preempted.  */
+
+bool display_completed;
+
 /* True means SIGWINCH happened when not safe.  */
 
 static bool delayed_size_change;
@@ -171,10 +175,11 @@ static uintmax_t history_tick;
 
 /* Add to the redisplay history how window W has been displayed.
    MSG is a trace containing the information how W's glyph matrix
-   has been constructed.  */
+   has been constructed.  PAUSED_P means that the update
+   has been interrupted for pending input.  */
 
 static void
-add_window_display_history (struct window *w, const char *msg)
+add_window_display_history (struct window *w, const char *msg, bool paused_p)
 {
   char *buf;
   void *ptr = w;
@@ -185,13 +190,14 @@ add_window_display_history (struct window *w, const char *msg)
   ++history_idx;
 
   snprintf (buf, sizeof redisplay_history[0].trace,
-	    "%"PRIuMAX": window %p %s\n%s",
+	    "%"PRIuMAX": window %p (%s)%s\n%s",
 	    history_tick++,
 	    ptr,
 	    ((BUFFERP (w->contents)
 	      && STRINGP (BVAR (XBUFFER (w->contents), name)))
 	     ? SSDATA (BVAR (XBUFFER (w->contents), name))
 	     : "???"),
+	    paused_p ? " ***paused***" : "",
 	    msg);
 }
 
@@ -2130,7 +2136,8 @@ adjust_frame_glyphs_for_frame_redisplay (struct frame *f)
 	 current matrix over a call to adjust_glyph_matrix, we must
 	 make a copy of the current glyphs, and restore the current
 	 matrix' contents from that copy.  */
-      if (!FRAME_GARBAGED_P (f)
+      if (display_completed
+	  && !FRAME_GARBAGED_P (f)
 	  && matrix_dim.width == f->current_matrix->matrix_w
 	  && matrix_dim.height == f->current_matrix->matrix_h
 	  /* For some reason, the frame glyph matrix gets corrupted if
@@ -2675,7 +2682,7 @@ build_frame_matrix_from_leaf_window (struct glyph_matrix *frame_matrix, struct w
 	     frame and window share glyphs.  */
 
 	  strcpy (w->current_matrix->method, w->desired_matrix->method);
-	  add_window_display_history (w, w->current_matrix->method);
+	  add_window_display_history (w, w->current_matrix->method, 0);
 #endif
 	}
 
@@ -3771,7 +3778,7 @@ update_bar_window (Lisp_Object window, Lisp_Object *current,
       struct window *w = XWINDOW (window);
       if (w->must_be_updated_p)
 	{
-	  update_window (w);
+	  update_window (w, true);
 	  w->must_be_updated_p = false;
 	  Lisp_Object tem = *current;
 	  *current = *desired;
@@ -3801,8 +3808,8 @@ update_tool_bar (struct frame *f)
 #endif
 }
 
-static void
-update_window_frame (struct frame *f)
+static bool
+update_window_frame (struct frame *f, bool force_p)
 {
   eassert (FRAME_WINDOW_P (f));
   update_begin (f);
@@ -3810,17 +3817,19 @@ update_window_frame (struct frame *f)
   update_tab_bar (f);
   update_tool_bar (f);
   struct window *root_window = XWINDOW (f->root_window);
-  update_window_tree (root_window);
+  bool paused_p = update_window_tree (root_window, force_p);
   update_end (f);
   set_window_update_flags (root_window, false);
+  return paused_p;
 }
 
-static void
-update_initial_frame (struct frame *f)
+static bool
+update_initial_frame (struct frame *f, bool force_p)
 {
   build_frame_matrix (f);
   struct window *root_window = XWINDOW (f->root_window);
   set_window_update_flags (root_window, false);
+  return false;
 }
 
 static void
@@ -3831,10 +3840,11 @@ flush_terminal (struct frame *f)
   fflush (FRAME_TTY (f)->output);
 }
 
-static void
-update_tty_frame (struct frame *f)
+static bool
+update_tty_frame (struct frame *f, bool force_p)
 {
   build_frame_matrix (f);
+  return false;
 }
 
 /* Return the cursor position of the selected window of frame F, in
@@ -3942,8 +3952,8 @@ terminal_cursor_magic (struct frame *root, struct frame *topmost_child)
     }
 }
 
-void
-combine_updates_for_frame (struct frame *f, bool inhibit_scrolling)
+bool
+combine_updates_for_frame (struct frame *f, bool force_p, bool inhibit_scrolling)
 {
   struct frame *root = root_frame (f);
   eassert (FRAME_VISIBLE_P (root));
@@ -3959,12 +3969,13 @@ combine_updates_for_frame (struct frame *f, bool inhibit_scrolling)
     }
 
   update_begin (root);
-  write_matrix (root, inhibit_scrolling, 1, false);
-  make_matrix_current (root);
+  bool paused = write_matrix (root, force_p, inhibit_scrolling, 1, false);
+  if (!paused)
+    make_matrix_current (root);
   update_end (root);
 
   /* If a child is displayed, and the cursor is displayed in another
-     frame, the child might lay above the cursor, so that it appears to
+     frame, the child might lay above the cursor, so that it appers to
      "shine through" the child.  Avoid that because it's confusing.  */
   if (topmost_child)
     terminal_cursor_magic (root, topmost_child);
@@ -3981,33 +3992,66 @@ combine_updates_for_frame (struct frame *f, bool inhibit_scrolling)
       add_frame_display_history (f, false);
 #endif
     }
+
+  return paused;
 }
 
 /* Update on the screen all root frames ROOTS.  Called from
    redisplay_internal as the last step of redisplaying.  */
 
-void
-combine_updates (Lisp_Object roots, bool inhibit_scrolling)
+bool
+combine_updates (Lisp_Object roots, bool force_p, bool inhibit_scrolling)
 {
+  if (redisplay_dont_pause)
+    force_p = true;
+
   for (; CONSP (roots); roots = XCDR (roots))
     {
       struct frame *root = XFRAME (XCAR (roots));
-      combine_updates_for_frame (root, inhibit_scrolling);
+      if (combine_updates_for_frame (root, force_p, inhibit_scrolling))
+	{
+	  display_completed = false;
+	  return true;
+	}
     }
+
+  display_completed = true;
+  return false;
 }
 
 /* Update frame F based on the data in desired matrices.
-   If INHIBIT_SCROLLING, don't try scrolling. */
 
-void
-update_frame (struct frame *f, bool inhibit_scrolling)
+   If FORCE_P, don't let redisplay be stopped by detecting pending input.
+   If INHIBIT_SCROLLING, don't try scrolling.
+
+   Value is true if redisplay was stopped due to pending input.  */
+
+bool
+update_frame (struct frame *f, bool force_p, bool inhibit_scrolling)
 {
+  struct window *root_window = XWINDOW (f->root_window);
+
+  if (redisplay_dont_pause)
+    force_p = true;
+  else if (!force_p && detect_input_pending_ignore_squeezables ())
+    {
+      /* Reset flags indicating that a window should be updated.  */
+      set_window_update_flags (root_window, false);
+      display_completed = false;
+      return true;
+    }
+
+  bool paused;
   if (FRAME_WINDOW_P (f))
-    update_window_frame (f);
+    paused = update_window_frame (f, force_p);
   else if (FRAME_INITIAL_P (f))
-    update_initial_frame (f);
+    paused = update_initial_frame (f, force_p);
   else
-    update_tty_frame (f);
+    paused = update_tty_frame (f, force_p);
+
+  if (paused)
+    display_completed = false;
+  return paused;
 }
 
 /* Update a TTY frame F that has a menu dropped down over some of its
@@ -4033,7 +4077,7 @@ update_frame_with_menu (struct frame *f, int row, int col)
   cursor_at_point_p = !(row >= 0 && col >= 0);
   /* Do not stop due to pending input, and do not try scrolling.  This
      means that write_glyphs will always return false.  */
-  write_matrix (f, 1, cursor_at_point_p, true);
+  write_matrix (f, 1, 1, cursor_at_point_p, true);
   make_matrix_current (f);
   clear_desired_matrices (f);
   /* ROW and COL tell us where in the menu to position the cursor, so
@@ -4056,6 +4100,7 @@ update_frame_with_menu (struct frame *f, int row, int col)
 
   /* Reset flags indicating that a window should be updated.  */
   set_window_update_flags (root_window, false);
+  display_completed = true;
 }
 
 /* Update the mouse position for a frame F.  This handles both
@@ -4111,24 +4156,30 @@ properties or updating the help echo text.  */)
 			 Window-based updates
  ************************************************************************/
 
-/* Perform updates in window tree rooted at W.  */
+/* Perform updates in window tree rooted at W.
+   If FORCE_P, don't stop updating if input is pending.  */
 
-static void
-update_window_tree (struct window *w)
+static bool
+update_window_tree (struct window *w, bool force_p)
 {
-  while (w)
+  bool paused_p = 0;
+
+  while (w && !paused_p)
     {
       if (WINDOWP (w->contents))
-	update_window_tree (XWINDOW (w->contents));
+	paused_p |= update_window_tree (XWINDOW (w->contents), force_p);
       else if (w->must_be_updated_p)
-	update_window (w);
+	paused_p |= update_window (w, force_p);
 
       w = NILP (w->next) ? 0 : XWINDOW (w->next);
     }
+
+  return paused_p;
 }
 
 
-/* Update window W if its flag must_be_updated_p is set.  */
+/* Update window W if its flag must_be_updated_p is set.
+   If FORCE_P, don't stop updating if input is pending.  */
 
 void
 update_single_window (struct window *w)
@@ -4139,7 +4190,7 @@ update_single_window (struct window *w)
 
       /* Update W.  */
       update_begin (f);
-      update_window (w);
+      update_window (w, true);
       update_end (f);
 
       /* Reset flag in W.  */
@@ -4279,12 +4330,15 @@ check_current_matrix_flags (struct window *w)
 #endif /* GLYPH_DEBUG */
 
 
-/* Update display of window W.  */
+/* Update display of window W.
+   If FORCE_P, don't stop updating when input is pending.  */
 
-static void
-update_window (struct window *w)
+static bool
+update_window (struct window *w, bool force_p)
 {
   struct glyph_matrix *desired_matrix = w->desired_matrix;
+  bool paused_p;
+  int preempt_count = clip_to_bounds (1, baud_rate / 2400 + 1, INT_MAX);
 #ifdef HAVE_WINDOW_SYSTEM
   struct redisplay_interface *rif = FRAME_RIF (XFRAME (WINDOW_FRAME (w)));
 #endif
@@ -4293,200 +4347,224 @@ update_window (struct window *w)
   eassert (FRAME_WINDOW_P (XFRAME (WINDOW_FRAME (w))));
 #endif
 
+  /* Check pending input the first time so that we can quickly return.  */
+  if (!force_p)
+    detect_input_pending_ignore_squeezables ();
+
   /* If forced to complete the update, no input is pending, or we are
      tracking the mouse, do the update.  */
-  struct glyph_row *row, *end;
-  struct glyph_row *mode_line_row;
-  struct glyph_row *tab_line_row;
-  struct glyph_row *header_line_row;
-  int yb;
-  bool changed_p = 0, mouse_face_overwritten_p = 0;
-  bool invisible_rows_marked = false;
+  if (force_p || !input_pending || !NILP (track_mouse))
+    {
+      struct glyph_row *row, *end;
+      struct glyph_row *mode_line_row;
+      struct glyph_row *tab_line_row;
+      struct glyph_row *header_line_row;
+      int yb;
+      bool changed_p = 0, mouse_face_overwritten_p = 0;
+      int n_updated = 0;
+      bool invisible_rows_marked = false;
 
 #ifdef HAVE_WINDOW_SYSTEM
-  gui_update_window_begin (w);
+      gui_update_window_begin (w);
 #else
-  (void) changed_p;
+      (void) changed_p;
 #endif
-  yb = window_text_bottom_y (w);
-  row = MATRIX_ROW (desired_matrix, 0);
-  end = MATRIX_MODE_LINE_ROW (desired_matrix);
-
-  /* Take note of the tab line, if there is one.  We will
-     update it below, after updating all of the window's lines.  */
-  if (row->mode_line_p && row->tab_line_p)
-    {
-      tab_line_row = row;
-      ++row;
-    }
-  else
-    tab_line_row = NULL;
+      yb = window_text_bottom_y (w);
+      row = MATRIX_ROW (desired_matrix, 0);
+      end = MATRIX_MODE_LINE_ROW (desired_matrix);
 
-  /* Take note of the header line, if there is one.  We will
-     update it below, after updating all of the window's lines.  */
-  if (row->mode_line_p)
-    {
-      header_line_row = row;
-      ++row;
-    }
-  else
-    header_line_row = NULL;
-
-  /* Update the mode line, if necessary.  */
-  mode_line_row = MATRIX_MODE_LINE_ROW (desired_matrix);
-  if (mode_line_row->mode_line_p && mode_line_row->enabled_p)
-    {
-      mode_line_row->y = yb + WINDOW_SCROLL_BAR_AREA_HEIGHT (w);
-      update_window_line (w, MATRIX_ROW_VPOS (mode_line_row,
-					      desired_matrix),
-			  &mouse_face_overwritten_p);
-    }
+      /* Take note of the tab line, if there is one.  We will
+	 update it below, after updating all of the window's lines.  */
+      if (row->mode_line_p && row->tab_line_p)
+	{
+	  tab_line_row = row;
+	  ++row;
+	}
+      else
+	tab_line_row = NULL;
 
-  /* Find first enabled row.  Optimizations in redisplay_internal
-     may lead to an update with only one row enabled.  There may
-     be also completely empty matrices.  */
-  while (row < end && !row->enabled_p)
-    ++row;
+      /* Take note of the header line, if there is one.  We will
+	 update it below, after updating all of the window's lines.  */
+      if (row->mode_line_p)
+	{
+	  header_line_row = row;
+	  ++row;
+	}
+      else
+	header_line_row = NULL;
 
-  /* Try reusing part of the display by copying.  */
-  if (row < end && !desired_matrix->no_scrolling_p)
-    {
-      int rc = scrolling_window (w, (tab_line_row != NULL ? 1 : 0)
-				    + (header_line_row != NULL ? 1 : 0));
-      if (rc < 0)
+      /* Update the mode line, if necessary.  */
+      mode_line_row = MATRIX_MODE_LINE_ROW (desired_matrix);
+      if (mode_line_row->mode_line_p && mode_line_row->enabled_p)
 	{
-	  /* All rows were found to be equal.  */
-	  goto set_cursor;
+	  mode_line_row->y = yb + WINDOW_SCROLL_BAR_AREA_HEIGHT (w);
+	  update_window_line (w, MATRIX_ROW_VPOS (mode_line_row,
+						  desired_matrix),
+			      &mouse_face_overwritten_p);
 	}
-      else if (rc > 0)
+
+      /* Find first enabled row.  Optimizations in redisplay_internal
+	 may lead to an update with only one row enabled.  There may
+	 be also completely empty matrices.  */
+      while (row < end && !row->enabled_p)
+	++row;
+
+      /* Try reusing part of the display by copying.  */
+      if (row < end && !desired_matrix->no_scrolling_p)
 	{
-	  /* We've scrolled the display.  */
-	  changed_p = 1;
+	  int rc = scrolling_window (w, (tab_line_row != NULL ? 1 : 0)
+				     + (header_line_row != NULL ? 1 : 0));
+	  if (rc < 0)
+	    {
+	      /* All rows were found to be equal.  */
+	      paused_p = 0;
+	      goto set_cursor;
+	    }
+	  else if (rc > 0)
+	    {
+	      /* We've scrolled the display.  */
+	      force_p = 1;
+	      changed_p = 1;
+	    }
 	}
-    }
 
-  /* Update the rest of the lines.  */
-  for (; row < end; ++row)
-    /* scrolling_window resets the enabled_p flag of the rows it
-       reuses from current_matrix.  */
-    if (row->enabled_p)
-      {
-	int vpos = MATRIX_ROW_VPOS (row, desired_matrix);
-	int i;
-
-	changed_p |= update_window_line (w, vpos,
-					 &mouse_face_overwritten_p);
-
-	/* Mark all rows below the last visible one in the current
-	   matrix as invalid.  This is necessary because of
-	   variable line heights.  Consider the case of three
-	   successive redisplays, where the first displays 5
-	   lines, the second 3 lines, and the third 5 lines again.
-	   If the second redisplay wouldn't mark rows in the
-	   current matrix invalid, the third redisplay might be
-	   tempted to optimize redisplay based on lines displayed
-	   in the first redisplay.  */
-	if (MATRIX_ROW_BOTTOM_Y (row) >= yb)
+      /* Update the rest of the lines.  */
+      for (; row < end && (force_p || !input_pending); ++row)
+	/* scrolling_window resets the enabled_p flag of the rows it
+	   reuses from current_matrix.  */
+	if (row->enabled_p)
 	  {
-	    for (i = vpos + 1; i < w->current_matrix->nrows - 1; ++i)
-	      SET_MATRIX_ROW_ENABLED_P (w->current_matrix, i, false);
-	    invisible_rows_marked = true;
+	    int vpos = MATRIX_ROW_VPOS (row, desired_matrix);
+	    int i;
+
+	    /* We'll have to play a little bit with when to
+	       detect_input_pending.  If it's done too often,
+	       scrolling large windows with repeated scroll-up
+	       commands will too quickly pause redisplay.  */
+	    if (!force_p && ++n_updated % preempt_count == 0)
+	      detect_input_pending_ignore_squeezables ();
+	    changed_p |= update_window_line (w, vpos,
+					     &mouse_face_overwritten_p);
+
+	    /* Mark all rows below the last visible one in the current
+	       matrix as invalid.  This is necessary because of
+	       variable line heights.  Consider the case of three
+	       successive redisplays, where the first displays 5
+	       lines, the second 3 lines, and the third 5 lines again.
+	       If the second redisplay wouldn't mark rows in the
+	       current matrix invalid, the third redisplay might be
+	       tempted to optimize redisplay based on lines displayed
+	       in the first redisplay.  */
+	    if (MATRIX_ROW_BOTTOM_Y (row) >= yb)
+	      {
+		for (i = vpos + 1; i < w->current_matrix->nrows - 1; ++i)
+		  SET_MATRIX_ROW_ENABLED_P (w->current_matrix, i, false);
+		invisible_rows_marked = true;
+	      }
 	  }
-      }
 
-  /* If the window doesn't display its mode line, make sure the
-     corresponding row of the current glyph matrix is disabled, so
-     that if and when the mode line is displayed again, it will be
-     cleared and completely redrawn.  */
-  if (!window_wants_mode_line (w))
-    SET_MATRIX_ROW_ENABLED_P (w->current_matrix,
-			      w->current_matrix->nrows - 1, false);
-
-  if (!invisible_rows_marked)
-    {
-      /* If we didn't mark the invisible rows in the current
-	 matrix as invalid above, do that now.  This can happen if
-	 scrolling_window updates the last visible rows of the
-	 current matrix, in which case the above loop doesn't get
-	 to examine the last visible row.  */
-      int i;
-      for (i = 0; i < w->current_matrix->nrows - 1; ++i)
+      /* If the window doesn't display its mode line, make sure the
+         corresponding row of the current glyph matrix is disabled, so
+         that if and when the mode line is displayed again, it will be
+         cleared and completely redrawn.  */
+      if (!window_wants_mode_line (w))
+	SET_MATRIX_ROW_ENABLED_P (w->current_matrix,
+				  w->current_matrix->nrows - 1, false);
+
+      /* Was display preempted?  */
+      paused_p = row < end;
+
+      if (!paused_p && !invisible_rows_marked)
 	{
-	  struct glyph_row *current_row = MATRIX_ROW (w->current_matrix, i);
-	  if (current_row->enabled_p
-	      && MATRIX_ROW_BOTTOM_Y (current_row) >= yb)
+	  /* If we didn't mark the invisible rows in the current
+	     matrix as invalid above, do that now.  This can happen if
+	     scrolling_window updates the last visible rows of the
+	     current matrix, in which case the above loop doesn't get
+	     to examine the last visible row.  */
+	  int i;
+	  for (i = 0; i < w->current_matrix->nrows - 1; ++i)
 	    {
-	      for (++i ; i < w->current_matrix->nrows - 1; ++i)
-		SET_MATRIX_ROW_ENABLED_P (w->current_matrix, i, false);
+	      struct glyph_row *current_row = MATRIX_ROW (w->current_matrix, i);
+	      if (current_row->enabled_p
+		  && MATRIX_ROW_BOTTOM_Y (current_row) >= yb)
+		{
+		  for (++i ; i < w->current_matrix->nrows - 1; ++i)
+		    SET_MATRIX_ROW_ENABLED_P (w->current_matrix, i, false);
+		}
 	    }
 	}
-    }
 
- set_cursor:
+    set_cursor:
 
-  /* Update the tab line after scrolling because a new tab
-     line would otherwise overwrite lines at the top of the window
-     that can be scrolled.  */
-  if (tab_line_row && tab_line_row->enabled_p)
-    {
-      tab_line_row->y = 0;
-      update_window_line (w, 0, &mouse_face_overwritten_p);
-    }
-
-  /* Update the header line after scrolling because a new header
-     line would otherwise overwrite lines at the top of the window
-     that can be scrolled.  */
-  if (header_line_row && header_line_row->enabled_p)
-    {
-      header_line_row->y = tab_line_row ? CURRENT_TAB_LINE_HEIGHT (w) : 0;
-      update_window_line (w, tab_line_row ? 1 : 0, &mouse_face_overwritten_p);
-    }
+      /* Update the tab line after scrolling because a new tab
+	 line would otherwise overwrite lines at the top of the window
+	 that can be scrolled.  */
+      if (tab_line_row && tab_line_row->enabled_p)
+	{
+	  tab_line_row->y = 0;
+	  update_window_line (w, 0, &mouse_face_overwritten_p);
+	}
 
-  /* Fix the appearance of overlapping/overlapped rows.  */
-  if (!w->pseudo_window_p)
-    {
-#ifdef HAVE_WINDOW_SYSTEM
-      if (changed_p && rif->fix_overlapping_area)
+      /* Update the header line after scrolling because a new header
+	 line would otherwise overwrite lines at the top of the window
+	 that can be scrolled.  */
+      if (header_line_row && header_line_row->enabled_p)
 	{
-	  redraw_overlapped_rows (w, yb);
-	  redraw_overlapping_rows (w, yb);
+	  header_line_row->y = tab_line_row ? CURRENT_TAB_LINE_HEIGHT (w) : 0;
+	  update_window_line (w, tab_line_row ? 1 : 0, &mouse_face_overwritten_p);
 	}
+
+      /* Fix the appearance of overlapping/overlapped rows.  */
+      if (!paused_p && !w->pseudo_window_p)
+	{
+#ifdef HAVE_WINDOW_SYSTEM
+	  if (changed_p && rif->fix_overlapping_area)
+	    {
+	      redraw_overlapped_rows (w, yb);
+	      redraw_overlapping_rows (w, yb);
+	    }
 #endif
 
-      /* Make cursor visible at cursor position of W.  */
-      set_window_cursor_after_update (w);
+	  /* Make cursor visible at cursor position of W.  */
+	  set_window_cursor_after_update (w);
 
 #if 0 /* Check that current matrix invariants are satisfied.  This is
- for debugging only.  See the comment of check_matrix_invariants.  */
-    IF_DEBUG (check_matrix_invariants (w));
+	 for debugging only.  See the comment of check_matrix_invariants.  */
+	  IF_DEBUG (check_matrix_invariants (w));
 #endif
-    }
+	}
 
 #ifdef GLYPH_DEBUG
-  /* Remember the redisplay method used to display the matrix.  */
-  strcpy (w->current_matrix->method, w->desired_matrix->method);
+      /* Remember the redisplay method used to display the matrix.  */
+      strcpy (w->current_matrix->method, w->desired_matrix->method);
 #endif
 
 #ifdef HAVE_WINDOW_SYSTEM
-  update_window_fringes (w, 0);
+      update_window_fringes (w, 0);
 
-  /* End the update of window W.  Don't set the cursor if we
-     paused updating the display because in this case,
-     set_window_cursor_after_update hasn't been called, and
-     W->output_cursor doesn't contain the cursor location.  */
-  gui_update_window_end (w, true, mouse_face_overwritten_p);
+      /* End the update of window W.  Don't set the cursor if we
+         paused updating the display because in this case,
+         set_window_cursor_after_update hasn't been called, and
+         W->output_cursor doesn't contain the cursor location.  */
+      gui_update_window_end (w, !paused_p, mouse_face_overwritten_p);
 #endif
-  /* If the update wasn't interrupted, this window has been
-     completely updated.  */
-  w->must_be_updated_p = false;
+      /* If the update wasn't interrupted, this window has been
+	 completely updated.  */
+      if (!paused_p)
+	w->must_be_updated_p = false;
+    }
+  else
+    paused_p = 1;
 
 #ifdef GLYPH_DEBUG
   /* check_current_matrix_flags (w); */
-  add_window_display_history (w, w->current_matrix->method);
+  add_window_display_history (w, w->current_matrix->method, paused_p);
 #endif
 
   xwidget_end_redisplay (w, w->current_matrix);
   clear_glyph_matrix (desired_matrix);
+
+  return paused_p;
 }
 
 #ifdef HAVE_WINDOW_SYSTEM
@@ -5619,13 +5697,20 @@ tty_set_cursor (void)
 }
 
 /* Write desired matix of tty frame F and make it current.
+
+   FORCE_P means that the update should not be stopped by pending input.
    INHIBIT_ID_P means that scrolling by insert/delete should not be tried.
-   SET_CURSOR_P false means do not set cursor at point in selected window.  */
+   SET_CURSOR_P false means do not set cursor at point in selected window.
 
-static void
-write_matrix (struct frame *f, bool inhibit_id_p,
+   Value is true if update was stopped due to pending input.  */
+
+static bool
+write_matrix (struct frame *f, bool force_p, bool inhibit_id_p,
 	      bool set_cursor_p, bool updating_menu_p)
 {
+  if (!force_p && detect_input_pending_ignore_squeezables ())
+    return true;
+
   /* If we cannot insert/delete lines, it's no use trying it.  */
   if (!FRAME_LINE_INS_DEL_OK (f))
     inhibit_id_p = true;
@@ -5637,7 +5722,7 @@ write_matrix (struct frame *f, bool inhibit_id_p,
      i/d line if just want cursor motion.  */
   int first_row = first_enabled_row (f->desired_matrix);
   if (!inhibit_id_p && first_row >= 0)
-    scrolling (f);
+    force_p |= scrolling (f);
 
   /* Update the individual lines as needed.  Do bottom line first.  This
      is done so that messages are made visible when pausing.  */
@@ -5645,19 +5730,36 @@ write_matrix (struct frame *f, bool inhibit_id_p,
   if (MATRIX_ROW_ENABLED_P (f->desired_matrix, last_row))
     write_row (f, last_row, updating_menu_p);
 
+  bool pause_p = false;
   if (first_row >= 0)
-    for (int i = first_row; i < last_row; ++i)
-      if (MATRIX_ROW_ENABLED_P (f->desired_matrix, i))
-	write_row (f, i, updating_menu_p);
+    {
+      const int preempt_count = clip_to_bounds (1, baud_rate / 2400 + 1, INT_MAX);
+
+      for (int i = first_row, n = 0; i < last_row; ++i)
+	if (MATRIX_ROW_ENABLED_P (f->desired_matrix, i))
+	  {
+	    if (!force_p && n % preempt_count == 0
+		&& detect_input_pending_ignore_squeezables ())
+	      {
+		pause_p = true;
+		break;
+	      }
+
+	    write_row (f, i, updating_menu_p);
+	    ++n;
+	  }
+    }
 
   /* Now just clean up termcap drivers and set cursor, etc.  */
-  if (set_cursor_p)
+  if (!pause_p && set_cursor_p)
     tty_set_cursor ();
+
+  return pause_p;
 }
 
 /* Do line insertions/deletions on frame F for frame-based redisplay.  */
 
-static void
+static bool
 scrolling (struct frame *frame)
 {
   /* In fact this code should never be reached at all under
@@ -5694,7 +5796,7 @@ scrolling (struct frame *frame)
       if (!MATRIX_ROW_ENABLED_P (current_matrix, i))
 	{
 	  SAFE_FREE ();
-	  return;
+	  return false;
 	}
       old_hash[i] = line_hash_code (frame, MATRIX_ROW (current_matrix, i));
       if (! MATRIX_ROW_ENABLED_P (desired_matrix, i))
@@ -5725,7 +5827,7 @@ scrolling (struct frame *frame)
       || unchanged_at_bottom == height)
     {
       SAFE_FREE ();
-      return;
+      return true;
     }
 
   window_size = (height - unchanged_at_top
@@ -5755,6 +5857,7 @@ scrolling (struct frame *frame)
 
   SAFE_FREE ();
 #endif
+  return false;
 }
 
 
@@ -6886,18 +6989,27 @@ sit_for (Lisp_Object timeout, bool reading, int display_option)
 
 
 DEFUN ("redisplay", Fredisplay, Sredisplay, 0, 1, 0,
-       doc : /* Perform redisplay.
-Optional arg FORCE exists for historical reasons and is ignored.
-Value is t if redisplay has been performed, nil if executing a
-keyboard macro.  */)
+       doc: /* Perform redisplay.
+Optional arg FORCE, if non-nil, prevents redisplay from being
+preempted by arriving input, even if `redisplay-dont-pause' is nil.
+If `redisplay-dont-pause' is non-nil (the default), redisplay is never
+preempted by arriving input, so FORCE does nothing.
+
+Return t if redisplay was performed, nil if redisplay was preempted
+immediately by pending input.  */)
   (Lisp_Object force)
 {
   swallow_events (true);
-  if (!NILP (Vexecuting_kbd_macro))
+  if ((detect_input_pending_run_timers (1)
+       && NILP (force) && !redisplay_dont_pause)
+      || !NILP (Vexecuting_kbd_macro))
     return Qnil;
 
+  specpdl_ref count = SPECPDL_INDEX ();
+  if (!NILP (force) && !redisplay_dont_pause)
+    specbind (Qredisplay_dont_pause, Qt);
   redisplay_preserve_echo_area (2);
-  return Qt;
+  return unbind_to (count, Qt);
 }
 
 
@@ -7350,6 +7462,8 @@ syms_of_display (void)
   /* This is the "purpose" slot of a display table.  */
   DEFSYM (Qdisplay_table, "display-table");
   DEFSYM (Qframe__z_order_lessp, "frame--z-order-lessp");
+
+  DEFSYM (Qredisplay_dont_pause, "redisplay-dont-pause");
   DEFSYM (Qtty_non_selected_cursor, "tty-non-selected-cursor");
 
   DEFVAR_INT ("baud-rate", baud_rate,
@@ -7431,6 +7545,17 @@ It is also used for standard output and error streams.
 See `buffer-display-table' for more information.  */);
   Vstandard_display_table = Qnil;
 
+  DEFVAR_BOOL ("redisplay-dont-pause", redisplay_dont_pause,
+	       doc: /* Nil means display update is paused when input is detected.  */);
+  /* Contrary to expectations, a value of "false" can be detrimental to
+     responsiveness since aborting a redisplay throws away some of the
+     work already performed.  It's usually more efficient (and gives
+     more prompt feedback to the user) to let the redisplay terminate,
+     and just completely skip the next command's redisplay (which is
+     done regardless of this setting if there's pending input at the
+     beginning of the next redisplay).  */
+  redisplay_dont_pause = true;
+
   DEFVAR_LISP ("x-show-tooltip-timeout", Vx_show_tooltip_timeout,
 	      doc: /* The default timeout (in seconds) for `x-show-tip'.  */);
   Vx_show_tooltip_timeout = make_fixnum (5);
diff --git a/src/keyboard.c b/src/keyboard.c
index fe485a3efd6..bfb5fd3592b 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -2663,7 +2663,8 @@ read_char (int commandflag, Lisp_Object map,
 	swallow_events (false);		/* May clear input_pending.  */
 
       /* Redisplay if no pending input.  */
-      while (!(input_pending && input_was_pending))
+      while (!(input_pending
+	       && (input_was_pending || !redisplay_dont_pause)))
 	{
 	  input_was_pending = input_pending;
 	  if (help_echo_showing_p && !BASE_EQ (selected_window, minibuf_window))
diff --git a/src/minibuf.c b/src/minibuf.c
index 390db0d31fa..c8267045397 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -914,9 +914,9 @@ read_minibuf (Lisp_Object map, Lisp_Object initial, Lisp_Object prompt,
       XWINDOW (minibuf_window)->cursor.x = 0;
       XWINDOW (minibuf_window)->must_be_updated_p = true;
       struct frame *sf = XFRAME (selected_frame);
-      update_frame (sf, true);
+      update_frame (sf, true, true);
       if (is_tty_frame (sf))
-	combine_updates_for_frame (sf, true);
+	combine_updates_for_frame (sf, true, true);
 
 #ifndef HAVE_NTGUI
       flush_frame (XFRAME (XWINDOW (minibuf_window)->frame));
diff --git a/src/xdisp.c b/src/xdisp.c
index 3364c6870cf..8196d1236ba 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -1116,6 +1116,7 @@ static void set_iterator_to_next (struct it *, bool);
 static void mark_window_display_accurate_1 (struct window *, bool);
 static bool row_for_charpos_p (struct glyph_row *, ptrdiff_t);
 static bool cursor_row_p (struct glyph_row *);
+static int redisplay_mode_lines (Lisp_Object, bool);
 
 static void handle_line_prefix (struct it *);
 
@@ -13510,6 +13511,24 @@ echo_area_display (bool update_frame_p)
 	 here could cause confusion.  */
       if (update_frame_p && !redisplaying_p)
 	{
+	  int n = 0;
+
+	  /* If the display update has been interrupted by pending
+	     input, update mode lines in the frame.  Due to the
+	     pending input, it might have been that redisplay hasn't
+	     been called, so that mode lines above the echo area are
+	     garbaged.  This looks odd, so we prevent it here.  */
+	  if (!display_completed)
+	    {
+	      n = redisplay_mode_lines (FRAME_ROOT_WINDOW (f), false);
+
+#ifdef HAVE_WINDOW_SYSTEM
+              if (FRAME_WINDOW_P (f)
+                  && FRAME_RIF (f)->clear_under_internal_border)
+                FRAME_RIF (f)->clear_under_internal_border (f);
+#endif
+	    }
+
 	  if (window_height_changed_p
 	      /* Don't do this if Emacs is shutting down.  Redisplay
 	         needs to run hooks.  */
@@ -13518,10 +13537,13 @@ echo_area_display (bool update_frame_p)
 	      /* Must update other windows.  Likewise as in other
 		 cases, don't let this update be interrupted by
 		 pending input.  */
+	      specpdl_ref count = SPECPDL_INDEX ();
+	      specbind (Qredisplay_dont_pause, Qt);
 	      fset_redisplay (f);
 	      redisplay_internal ();
+	      unbind_to (count, Qnil);
 	    }
-	  else if (FRAME_WINDOW_P (f))
+	  else if (FRAME_WINDOW_P (f) && n == 0)
 	    {
 	      /* Window configuration is the same as before.
 		 Can do with a display update of the echo area,
@@ -13531,9 +13553,9 @@ echo_area_display (bool update_frame_p)
 	    }
 	  else
 	    {
-	      update_frame (f, true);
+	      update_frame (f, true, true);
 	      if (is_tty_frame (f))
-		combine_updates_for_frame (f, true);
+		combine_updates_for_frame (f, true, true);
 	    }
 
 	  /* If cursor is in the echo area, make sure that the next
@@ -16916,6 +16938,7 @@ redisplay_internal (void)
   struct window *w = XWINDOW (selected_window);
   struct window *sw;
   struct frame *fr;
+  bool pending;
   bool must_finish = false, match_p;
   struct text_pos tlbufpos, tlendpos;
   int number_of_visible_frames;
@@ -17001,6 +17024,7 @@ redisplay_internal (void)
   /* Remember the currently selected window.  */
   sw = w;
 
+  pending = false;
   forget_escape_and_glyphless_faces ();
 
   inhibit_free_realized_faces = false;
@@ -17566,7 +17590,7 @@ redisplay_internal (void)
 		    unrequest_sigio ();
 		  STOP_POLLING;
 
-		  update_frame (f, false);
+		  pending |= update_frame (f, false, false);
 		  /* On some platforms (at least MS-Windows), the
 		     scroll_run_hook called from scrolling_window
 		     called from update_frame could set the frame's
@@ -17588,24 +17612,27 @@ redisplay_internal (void)
 	}
 
       if (CONSP (tty_root_frames))
-	combine_updates (tty_root_frames, false);
+	pending |= combine_updates (tty_root_frames, false, false);
 
       eassert (EQ (XFRAME (selected_frame)->selected_window, selected_window));
 
-      /* Do the mark_window_display_accurate after all windows have
-	 been redisplayed because this call resets flags in buffers
-	 which are needed for proper redisplay.  */
-      FOR_EACH_FRAME (tail, frame)
+      if (!pending)
 	{
-	  struct frame *f = XFRAME (frame);
-          if (f->updated_p)
-            {
-	      f->redisplay = false;
-	      f->garbaged = false;
-              mark_window_display_accurate (f->root_window, true);
-              if (FRAME_TERMINAL (f)->frame_up_to_date_hook)
-                FRAME_TERMINAL (f)->frame_up_to_date_hook (f);
-            }
+	  /* Do the mark_window_display_accurate after all windows have
+	     been redisplayed because this call resets flags in buffers
+	     which are needed for proper redisplay.  */
+	  FOR_EACH_FRAME (tail, frame)
+	    {
+	      struct frame *f = XFRAME (frame);
+              if (f->updated_p)
+                {
+		  f->redisplay = false;
+		  f->garbaged = false;
+                  mark_window_display_accurate (f->root_window, true);
+                  if (FRAME_TERMINAL (f)->frame_up_to_date_hook)
+                    FRAME_TERMINAL (f)->frame_up_to_date_hook (f);
+                }
+	    }
 	}
     }
   else if (FRAME_REDISPLAY_P (sf))
@@ -17669,10 +17696,10 @@ redisplay_internal (void)
             }
 
 	  XWINDOW (selected_window)->must_be_updated_p = true;
-	  update_frame (sf, false);
+	  pending = update_frame (sf, false, false);
 
 	  if (is_tty_frame (sf))
-	    combine_updates_for_frame (sf, false);
+	    pending |= combine_updates_for_frame (sf, false, false);
 
 	  sf->cursor_type_changed = false;
 	  sf->inhibit_clear_image_cache = false;
@@ -17689,11 +17716,11 @@ redisplay_internal (void)
       if (mini_frame != sf)
 	{
 	  XWINDOW (mini_window)->must_be_updated_p = true;
-	  update_frame (mini_frame, false);
+	  pending |= update_frame (mini_frame, false, false);
 	  if (is_tty_frame (mini_frame))
-	    combine_updates_for_frame (mini_frame, false);
+	    pending |= combine_updates_for_frame (mini_frame, false, false);
 	  mini_frame->cursor_type_changed = false;
-          if (hscroll_retries <= MAX_HSCROLL_RETRIES
+          if (!pending && hscroll_retries <= MAX_HSCROLL_RETRIES
               && hscroll_windows (mini_window))
             {
               hscroll_retries++;
@@ -17702,26 +17729,47 @@ redisplay_internal (void)
 	}
     }
 
-  if (!consider_all_windows_p)
+  /* If display was paused because of pending input, make sure we do a
+     thorough update the next time.  */
+  if (pending)
     {
-      /* This has already been done above if
-	 consider_all_windows_p is set.  */
-      if (XBUFFER (w->contents)->text->redisplay
-	  && buffer_window_count (XBUFFER (w->contents)) > 1)
-	/* This can happen if b->text->redisplay was set during
-	   jit-lock.  */
-	propagate_buffer_redisplay ();
-      mark_window_display_accurate_1 (w, true);
+      /* Prevent the optimization at the beginning of
+	 redisplay_internal that tries a single-line update of the
+	 line containing the cursor in the selected window.  */
+      CHARPOS (this_line_start_pos) = 0;
 
-      /* Say overlay arrows are up to date.  */
-      update_overlay_arrows (1);
+      /* Let the overlay arrow be updated the next time.  */
+      update_overlay_arrows (0);
 
-      if (FRAME_TERMINAL (sf)->frame_up_to_date_hook != 0)
-	FRAME_TERMINAL (sf)->frame_up_to_date_hook (sf);
+      /* If we pause after scrolling, some rows in the current
+	 matrices of some windows are not valid.  */
+      if (!WINDOW_FULL_WIDTH_P (w)
+	  && !FRAME_WINDOW_P (XFRAME (w->frame)))
+	update_mode_lines = 36;
     }
+  else
+    {
+      if (!consider_all_windows_p)
+	{
+	  /* This has already been done above if
+	     consider_all_windows_p is set.  */
+	  if (XBUFFER (w->contents)->text->redisplay
+	      && buffer_window_count (XBUFFER (w->contents)) > 1)
+	    /* This can happen if b->text->redisplay was set during
+	       jit-lock.  */
+	    propagate_buffer_redisplay ();
+	  mark_window_display_accurate_1 (w, true);
 
-  update_mode_lines = 0;
-  windows_or_buffers_changed = 0;
+	  /* Say overlay arrows are up to date.  */
+	  update_overlay_arrows (1);
+
+	  if (FRAME_TERMINAL (sf)->frame_up_to_date_hook != 0)
+	    FRAME_TERMINAL (sf)->frame_up_to_date_hook (sf);
+	}
+
+      update_mode_lines = 0;
+      windows_or_buffers_changed = 0;
+    }
 
   /* Start SIGIO interrupts coming again.  Having them off during the
      code above makes it less likely one will discard output, but not
@@ -17737,23 +17785,26 @@ redisplay_internal (void)
      redisplay constructing glyphs, so simply exposing a frame won't
      display anything in this case.  So, we have to display these
      frames here explicitly.  */
-  int new_count = 0;
-
-  FOR_EACH_FRAME (tail, frame)
+  if (!pending)
     {
-      if (FRAME_REDISPLAY_P (XFRAME (frame)))
-	new_count++;
-    }
+      int new_count = 0;
+
+      FOR_EACH_FRAME (tail, frame)
+	{
+	  if (FRAME_REDISPLAY_P (XFRAME (frame)))
+	    new_count++;
+	}
 
-    if (new_count != number_of_visible_frames)
-      windows_or_buffers_changed = 52;
+      if (new_count != number_of_visible_frames)
+	windows_or_buffers_changed = 52;
+    }
 
   /* Change frame size now if a change is pending.  */
   do_pending_window_change (true);
 
   /* If we just did a pending size change, or have additional
      visible frames, or selected_window changed, redisplay again.  */
-  if (windows_or_buffers_changed
+  if ((windows_or_buffers_changed && !pending)
       || (WINDOWP (selected_window)
 	  && (w = XWINDOW (selected_window)) != sw))
     goto retry;
@@ -27343,6 +27394,60 @@ display_tty_menu_item (const char *item_text, int width, int face_id,
 			      Mode Line
  ***********************************************************************/
 
+/* Redisplay mode lines in the window tree whose root is WINDOW.
+   If FORCE, redisplay mode lines unconditionally.
+   Otherwise, redisplay only mode lines that are garbaged.  Value is
+   the number of windows whose mode lines were redisplayed.  */
+
+static int
+redisplay_mode_lines (Lisp_Object window, bool force)
+{
+  int nwindows = 0;
+
+  while (!NILP (window))
+    {
+      struct window *w = XWINDOW (window);
+
+      if (WINDOWP (w->contents))
+	nwindows += redisplay_mode_lines (w->contents, force);
+      else if (force
+	       || FRAME_GARBAGED_P (XFRAME (w->frame))
+	       || !MATRIX_MODE_LINE_ROW (w->current_matrix)->enabled_p)
+	{
+	  struct text_pos lpoint;
+	  struct buffer *old = current_buffer;
+
+	  /* Set the window's buffer for the mode line display.  */
+	  SET_TEXT_POS (lpoint, PT, PT_BYTE);
+	  set_buffer_internal_1 (XBUFFER (w->contents));
+
+	  /* Point refers normally to the selected window.  For any
+	     other window, set up appropriate value.  */
+	  if (!EQ (window, selected_window))
+	    {
+	      struct text_pos pt;
+
+	      CLIP_TEXT_POS_FROM_MARKER (pt, w->pointm);
+	      TEMP_SET_PT_BOTH (CHARPOS (pt), BYTEPOS (pt));
+	    }
+
+	  /* Display mode lines.  */
+	  clear_glyph_matrix (w->desired_matrix);
+	  if (display_mode_lines (w))
+	    ++nwindows;
+
+	  /* Restore old settings.  */
+	  set_buffer_internal_1 (old);
+	  TEMP_SET_PT_BOTH (CHARPOS (lpoint), BYTEPOS (lpoint));
+	}
+
+      window = w->next;
+    }
+
+  return nwindows;
+}
+
+
 /* Display the mode line, the header line, and the tab-line of window
    W.  Value is the sum number of mode lines, header lines, and tab
    lines actually displayed.  */

commit e5a2bc740dc43de63acb6e9603ad1905fac1e2c6
Author: Gerd Möllmann <gerd@gnu.org>
Date:   Sat Nov 16 13:51:50 2024 +0100

    Revert "Remove an unused parameter"
    
    This reverts commit 627cbf05b53756883a789ff45727acf23f5066a4.

diff --git a/src/dispextern.h b/src/dispextern.h
index 0bbd7beeb91..47afc48bb60 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -3922,7 +3922,7 @@ Lisp_Object frames_in_reverse_z_order (struct frame *f, bool visible);
 bool is_tty_frame (struct frame *f);
 bool is_tty_child_frame (struct frame *f);
 bool is_tty_root_frame (struct frame *f);
-void combine_updates (Lisp_Object root_frames);
+void combine_updates (Lisp_Object root_frames, bool inhibit_id_p);
 void combine_updates_for_frame (struct frame *f, bool inhibit_id_p);
 void tty_raise_lower_frame (struct frame *f, bool raise);
 int max_child_z_order (struct frame *parent);
diff --git a/src/dispnew.c b/src/dispnew.c
index cbc7d4d7aaf..37ec37b752e 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -3987,12 +3987,12 @@ combine_updates_for_frame (struct frame *f, bool inhibit_scrolling)
    redisplay_internal as the last step of redisplaying.  */
 
 void
-combine_updates (Lisp_Object roots)
+combine_updates (Lisp_Object roots, bool inhibit_scrolling)
 {
   for (; CONSP (roots); roots = XCDR (roots))
     {
       struct frame *root = XFRAME (XCAR (roots));
-      combine_updates_for_frame (root, false);
+      combine_updates_for_frame (root, inhibit_scrolling);
     }
 }
 
diff --git a/src/xdisp.c b/src/xdisp.c
index 66140fe6010..3364c6870cf 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -17588,7 +17588,7 @@ redisplay_internal (void)
 	}
 
       if (CONSP (tty_root_frames))
-	combine_updates (tty_root_frames);
+	combine_updates (tty_root_frames, false);
 
       eassert (EQ (XFRAME (selected_frame)->selected_window, selected_window));
 

commit 627cbf05b53756883a789ff45727acf23f5066a4
Author: Gerd Möllmann <gerd@gnu.org>
Date:   Sat Nov 16 08:57:35 2024 +0100

    Remove an unused parameter
    
    * src/dispnew.c (combine_updates): Remove unused parameter inhibit_scrolling.
    * src/xdisp.c (redisplay_internal): Adjust caller.
    * src/dispextern.h: Change function prototype.

diff --git a/src/dispextern.h b/src/dispextern.h
index 47afc48bb60..0bbd7beeb91 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -3922,7 +3922,7 @@ Lisp_Object frames_in_reverse_z_order (struct frame *f, bool visible);
 bool is_tty_frame (struct frame *f);
 bool is_tty_child_frame (struct frame *f);
 bool is_tty_root_frame (struct frame *f);
-void combine_updates (Lisp_Object root_frames, bool inhibit_id_p);
+void combine_updates (Lisp_Object root_frames);
 void combine_updates_for_frame (struct frame *f, bool inhibit_id_p);
 void tty_raise_lower_frame (struct frame *f, bool raise);
 int max_child_z_order (struct frame *parent);
diff --git a/src/dispnew.c b/src/dispnew.c
index 37ec37b752e..cbc7d4d7aaf 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -3987,12 +3987,12 @@ combine_updates_for_frame (struct frame *f, bool inhibit_scrolling)
    redisplay_internal as the last step of redisplaying.  */
 
 void
-combine_updates (Lisp_Object roots, bool inhibit_scrolling)
+combine_updates (Lisp_Object roots)
 {
   for (; CONSP (roots); roots = XCDR (roots))
     {
       struct frame *root = XFRAME (XCAR (roots));
-      combine_updates_for_frame (root, inhibit_scrolling);
+      combine_updates_for_frame (root, false);
     }
 }
 
diff --git a/src/xdisp.c b/src/xdisp.c
index 3364c6870cf..66140fe6010 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -17588,7 +17588,7 @@ redisplay_internal (void)
 	}
 
       if (CONSP (tty_root_frames))
-	combine_updates (tty_root_frames, false);
+	combine_updates (tty_root_frames);
 
       eassert (EQ (XFRAME (selected_frame)->selected_window, selected_window));
 

commit 36c81859f6c3d798fa1c1d9eb45cf730e0237e04
Merge: f62d70f52f4 29098a291f5
Author: Gerd Möllmann <gerd@gnu.org>
Date:   Sat Nov 16 04:31:46 2024 +0100

    Merge branch 'master' into scratch/tty-child-frames

commit f62d70f52f4f6b7ed158d618bf790df21f171172
Author: Gerd Möllmann <gerd@gnu.org>
Date:   Fri Nov 15 13:34:55 2024 +0100

    Don't pause display for pending input
    
    * src/dispnew.c: Remove display_completed, redisplay_dont_pause,
    redisplay-dont-pause was declared obsolete in Emacs 24.  Remove anything
    checking pending input, change function signatures accordingly, and so
    on.
    
    * src/keyboard.c (read_char): Don't use redisplay_dont_pause.
    * src/minibuf.c (read_minibuf): Use new function signatures.
    * src/xdisp.c: Don't check display_completed. Use new API.
    
    * lisp/subr.el (redisplay-dont-pause): Remove declaration.

diff --git a/lisp/subr.el b/lisp/subr.el
index 4771ac1fba2..8f0b6c5939c 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1990,7 +1990,6 @@ be a list of the form returned by `event-start' and `event-end'."
  ;; It's been announced as obsolete in NEWS and in the docstring since Emacs-25,
  ;; but it's only been marked for compilation warnings since Emacs-29.
  "25.1")
-(make-obsolete-variable 'redisplay-dont-pause nil "24.5")
 (make-obsolete-variable 'operating-system-release nil "28.1")
 (make-obsolete-variable 'inhibit-changing-match-data 'save-match-data "29.1")
 
diff --git a/src/dispextern.h b/src/dispextern.h
index c368e665c61..4a013236432 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -1322,9 +1322,6 @@ struct glyph_row *matrix_row (struct glyph_matrix *, int);
 
 extern struct glyph space_glyph;
 
-/* True means last display completed.  False means it was preempted.  */
-
-extern bool display_completed;
 
 /************************************************************************
 			  Glyph Strings
@@ -3805,7 +3802,7 @@ extern Lisp_Object marginal_area_string (struct window *, enum window_part,
                                          Lisp_Object *,
                                          int *, int *, int *, int *);
 extern void redraw_frame (struct frame *);
-extern bool update_frame (struct frame *, bool, bool);
+void update_frame (struct frame *, bool);
 extern void update_frame_with_menu (struct frame *, int, int);
 extern int update_mouse_position (struct frame *, int, int);
 extern void bitch_at_user (void);
@@ -3924,8 +3921,8 @@ Lisp_Object frames_in_reverse_z_order (struct frame *f, bool visible);
 bool is_tty_frame (struct frame *f);
 bool is_tty_child_frame (struct frame *f);
 bool is_tty_root_frame (struct frame *f);
-bool combine_updates (Lisp_Object root_frames, bool force_p, bool inhibit_id_p);
-bool combine_updates_for_frame (struct frame *f, bool force_p, bool inhibit_id_p);
+void combine_updates (Lisp_Object root_frames, bool inhibit_id_p);
+void combine_updates_for_frame (struct frame *f, bool inhibit_id_p);
 void tty_raise_lower_frame (struct frame *f, bool raise);
 int max_child_z_order (struct frame *parent);
 
diff --git a/src/dispnew.c b/src/dispnew.c
index d473a77e3ad..37ec37b752e 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -93,10 +93,10 @@ static void check_matrix_pointers (struct glyph_matrix *,
                                    struct glyph_matrix *);
 #endif
 static void mirror_line_dance (struct window *, int, int, int *, char *);
-static bool update_window_tree (struct window *, bool);
-static bool update_window (struct window *, bool);
-static bool write_matrix (struct frame *, bool, bool, bool, bool);
-static bool scrolling (struct frame *);
+static void update_window_tree (struct window *);
+static void update_window (struct window *);
+static void write_matrix (struct frame *, bool, bool, bool);
+static void scrolling (struct frame *);
 static void set_window_cursor_after_update (struct window *);
 static void adjust_frame_glyphs_for_window_redisplay (struct frame *);
 static void adjust_frame_glyphs_for_frame_redisplay (struct frame *);
@@ -116,10 +116,6 @@ check_rows (struct frame *f)
 }
 #endif
 
-/* True means last display completed.  False means it was preempted.  */
-
-bool display_completed;
-
 /* True means SIGWINCH happened when not safe.  */
 
 static bool delayed_size_change;
@@ -175,11 +171,10 @@ static uintmax_t history_tick;
 
 /* Add to the redisplay history how window W has been displayed.
    MSG is a trace containing the information how W's glyph matrix
-   has been constructed.  PAUSED_P means that the update
-   has been interrupted for pending input.  */
+   has been constructed.  */
 
 static void
-add_window_display_history (struct window *w, const char *msg, bool paused_p)
+add_window_display_history (struct window *w, const char *msg)
 {
   char *buf;
   void *ptr = w;
@@ -190,14 +185,13 @@ add_window_display_history (struct window *w, const char *msg, bool paused_p)
   ++history_idx;
 
   snprintf (buf, sizeof redisplay_history[0].trace,
-	    "%"PRIuMAX": window %p (%s)%s\n%s",
+	    "%"PRIuMAX": window %p %s\n%s",
 	    history_tick++,
 	    ptr,
 	    ((BUFFERP (w->contents)
 	      && STRINGP (BVAR (XBUFFER (w->contents), name)))
 	     ? SSDATA (BVAR (XBUFFER (w->contents), name))
 	     : "???"),
-	    paused_p ? " ***paused***" : "",
 	    msg);
 }
 
@@ -2136,8 +2130,7 @@ adjust_frame_glyphs_for_frame_redisplay (struct frame *f)
 	 current matrix over a call to adjust_glyph_matrix, we must
 	 make a copy of the current glyphs, and restore the current
 	 matrix' contents from that copy.  */
-      if (display_completed
-	  && !FRAME_GARBAGED_P (f)
+      if (!FRAME_GARBAGED_P (f)
 	  && matrix_dim.width == f->current_matrix->matrix_w
 	  && matrix_dim.height == f->current_matrix->matrix_h
 	  /* For some reason, the frame glyph matrix gets corrupted if
@@ -2682,7 +2675,7 @@ build_frame_matrix_from_leaf_window (struct glyph_matrix *frame_matrix, struct w
 	     frame and window share glyphs.  */
 
 	  strcpy (w->current_matrix->method, w->desired_matrix->method);
-	  add_window_display_history (w, w->current_matrix->method, 0);
+	  add_window_display_history (w, w->current_matrix->method);
 #endif
 	}
 
@@ -3778,7 +3771,7 @@ update_bar_window (Lisp_Object window, Lisp_Object *current,
       struct window *w = XWINDOW (window);
       if (w->must_be_updated_p)
 	{
-	  update_window (w, true);
+	  update_window (w);
 	  w->must_be_updated_p = false;
 	  Lisp_Object tem = *current;
 	  *current = *desired;
@@ -3808,8 +3801,8 @@ update_tool_bar (struct frame *f)
 #endif
 }
 
-static bool
-update_window_frame (struct frame *f, bool force_p)
+static void
+update_window_frame (struct frame *f)
 {
   eassert (FRAME_WINDOW_P (f));
   update_begin (f);
@@ -3817,19 +3810,17 @@ update_window_frame (struct frame *f, bool force_p)
   update_tab_bar (f);
   update_tool_bar (f);
   struct window *root_window = XWINDOW (f->root_window);
-  bool paused_p = update_window_tree (root_window, force_p);
+  update_window_tree (root_window);
   update_end (f);
   set_window_update_flags (root_window, false);
-  return paused_p;
 }
 
-static bool
-update_initial_frame (struct frame *f, bool force_p)
+static void
+update_initial_frame (struct frame *f)
 {
   build_frame_matrix (f);
   struct window *root_window = XWINDOW (f->root_window);
   set_window_update_flags (root_window, false);
-  return false;
 }
 
 static void
@@ -3840,11 +3831,10 @@ flush_terminal (struct frame *f)
   fflush (FRAME_TTY (f)->output);
 }
 
-static bool
-update_tty_frame (struct frame *f, bool force_p)
+static void
+update_tty_frame (struct frame *f)
 {
   build_frame_matrix (f);
-  return false;
 }
 
 /* Return the cursor position of the selected window of frame F, in
@@ -3952,8 +3942,8 @@ terminal_cursor_magic (struct frame *root, struct frame *topmost_child)
     }
 }
 
-bool
-combine_updates_for_frame (struct frame *f, bool force_p, bool inhibit_scrolling)
+void
+combine_updates_for_frame (struct frame *f, bool inhibit_scrolling)
 {
   struct frame *root = root_frame (f);
   eassert (FRAME_VISIBLE_P (root));
@@ -3969,13 +3959,12 @@ combine_updates_for_frame (struct frame *f, bool force_p, bool inhibit_scrolling
     }
 
   update_begin (root);
-  bool paused = write_matrix (root, force_p, inhibit_scrolling, 1, false);
-  if (!paused)
-    make_matrix_current (root);
+  write_matrix (root, inhibit_scrolling, 1, false);
+  make_matrix_current (root);
   update_end (root);
 
   /* If a child is displayed, and the cursor is displayed in another
-     frame, the child might lay above the cursor, so that it appers to
+     frame, the child might lay above the cursor, so that it appears to
      "shine through" the child.  Avoid that because it's confusing.  */
   if (topmost_child)
     terminal_cursor_magic (root, topmost_child);
@@ -3992,66 +3981,33 @@ combine_updates_for_frame (struct frame *f, bool force_p, bool inhibit_scrolling
       add_frame_display_history (f, false);
 #endif
     }
-
-  return paused;
 }
 
 /* Update on the screen all root frames ROOTS.  Called from
    redisplay_internal as the last step of redisplaying.  */
 
-bool
-combine_updates (Lisp_Object roots, bool force_p, bool inhibit_scrolling)
+void
+combine_updates (Lisp_Object roots, bool inhibit_scrolling)
 {
-  if (redisplay_dont_pause)
-    force_p = true;
-
   for (; CONSP (roots); roots = XCDR (roots))
     {
       struct frame *root = XFRAME (XCAR (roots));
-      if (combine_updates_for_frame (root, force_p, inhibit_scrolling))
-	{
-	  display_completed = false;
-	  return true;
-	}
+      combine_updates_for_frame (root, inhibit_scrolling);
     }
-
-  display_completed = true;
-  return false;
 }
 
 /* Update frame F based on the data in desired matrices.
+   If INHIBIT_SCROLLING, don't try scrolling. */
 
-   If FORCE_P, don't let redisplay be stopped by detecting pending input.
-   If INHIBIT_SCROLLING, don't try scrolling.
-
-   Value is true if redisplay was stopped due to pending input.  */
-
-bool
-update_frame (struct frame *f, bool force_p, bool inhibit_scrolling)
+void
+update_frame (struct frame *f, bool inhibit_scrolling)
 {
-  struct window *root_window = XWINDOW (f->root_window);
-
-  if (redisplay_dont_pause)
-    force_p = true;
-  else if (!force_p && detect_input_pending_ignore_squeezables ())
-    {
-      /* Reset flags indicating that a window should be updated.  */
-      set_window_update_flags (root_window, false);
-      display_completed = false;
-      return true;
-    }
-
-  bool paused;
   if (FRAME_WINDOW_P (f))
-    paused = update_window_frame (f, force_p);
+    update_window_frame (f);
   else if (FRAME_INITIAL_P (f))
-    paused = update_initial_frame (f, force_p);
+    update_initial_frame (f);
   else
-    paused = update_tty_frame (f, force_p);
-
-  if (paused)
-    display_completed = false;
-  return paused;
+    update_tty_frame (f);
 }
 
 /* Update a TTY frame F that has a menu dropped down over some of its
@@ -4077,7 +4033,7 @@ update_frame_with_menu (struct frame *f, int row, int col)
   cursor_at_point_p = !(row >= 0 && col >= 0);
   /* Do not stop due to pending input, and do not try scrolling.  This
      means that write_glyphs will always return false.  */
-  write_matrix (f, 1, 1, cursor_at_point_p, true);
+  write_matrix (f, 1, cursor_at_point_p, true);
   make_matrix_current (f);
   clear_desired_matrices (f);
   /* ROW and COL tell us where in the menu to position the cursor, so
@@ -4100,7 +4056,6 @@ update_frame_with_menu (struct frame *f, int row, int col)
 
   /* Reset flags indicating that a window should be updated.  */
   set_window_update_flags (root_window, false);
-  display_completed = true;
 }
 
 /* Update the mouse position for a frame F.  This handles both
@@ -4156,30 +4111,24 @@ properties or updating the help echo text.  */)
 			 Window-based updates
  ************************************************************************/
 
-/* Perform updates in window tree rooted at W.
-   If FORCE_P, don't stop updating if input is pending.  */
+/* Perform updates in window tree rooted at W.  */
 
-static bool
-update_window_tree (struct window *w, bool force_p)
+static void
+update_window_tree (struct window *w)
 {
-  bool paused_p = 0;
-
-  while (w && !paused_p)
+  while (w)
     {
       if (WINDOWP (w->contents))
-	paused_p |= update_window_tree (XWINDOW (w->contents), force_p);
+	update_window_tree (XWINDOW (w->contents));
       else if (w->must_be_updated_p)
-	paused_p |= update_window (w, force_p);
+	update_window (w);
 
       w = NILP (w->next) ? 0 : XWINDOW (w->next);
     }
-
-  return paused_p;
 }
 
 
-/* Update window W if its flag must_be_updated_p is set.
-   If FORCE_P, don't stop updating if input is pending.  */
+/* Update window W if its flag must_be_updated_p is set.  */
 
 void
 update_single_window (struct window *w)
@@ -4190,7 +4139,7 @@ update_single_window (struct window *w)
 
       /* Update W.  */
       update_begin (f);
-      update_window (w, true);
+      update_window (w);
       update_end (f);
 
       /* Reset flag in W.  */
@@ -4330,15 +4279,12 @@ check_current_matrix_flags (struct window *w)
 #endif /* GLYPH_DEBUG */
 
 
-/* Update display of window W.
-   If FORCE_P, don't stop updating when input is pending.  */
+/* Update display of window W.  */
 
-static bool
-update_window (struct window *w, bool force_p)
+static void
+update_window (struct window *w)
 {
   struct glyph_matrix *desired_matrix = w->desired_matrix;
-  bool paused_p;
-  int preempt_count = clip_to_bounds (1, baud_rate / 2400 + 1, INT_MAX);
 #ifdef HAVE_WINDOW_SYSTEM
   struct redisplay_interface *rif = FRAME_RIF (XFRAME (WINDOW_FRAME (w)));
 #endif
@@ -4347,224 +4293,200 @@ update_window (struct window *w, bool force_p)
   eassert (FRAME_WINDOW_P (XFRAME (WINDOW_FRAME (w))));
 #endif
 
-  /* Check pending input the first time so that we can quickly return.  */
-  if (!force_p)
-    detect_input_pending_ignore_squeezables ();
-
   /* If forced to complete the update, no input is pending, or we are
      tracking the mouse, do the update.  */
-  if (force_p || !input_pending || !NILP (track_mouse))
-    {
-      struct glyph_row *row, *end;
-      struct glyph_row *mode_line_row;
-      struct glyph_row *tab_line_row;
-      struct glyph_row *header_line_row;
-      int yb;
-      bool changed_p = 0, mouse_face_overwritten_p = 0;
-      int n_updated = 0;
-      bool invisible_rows_marked = false;
+  struct glyph_row *row, *end;
+  struct glyph_row *mode_line_row;
+  struct glyph_row *tab_line_row;
+  struct glyph_row *header_line_row;
+  int yb;
+  bool changed_p = 0, mouse_face_overwritten_p = 0;
+  bool invisible_rows_marked = false;
 
 #ifdef HAVE_WINDOW_SYSTEM
-      gui_update_window_begin (w);
+  gui_update_window_begin (w);
 #else
-      (void) changed_p;
+  (void) changed_p;
 #endif
-      yb = window_text_bottom_y (w);
-      row = MATRIX_ROW (desired_matrix, 0);
-      end = MATRIX_MODE_LINE_ROW (desired_matrix);
+  yb = window_text_bottom_y (w);
+  row = MATRIX_ROW (desired_matrix, 0);
+  end = MATRIX_MODE_LINE_ROW (desired_matrix);
 
-      /* Take note of the tab line, if there is one.  We will
-	 update it below, after updating all of the window's lines.  */
-      if (row->mode_line_p && row->tab_line_p)
-	{
-	  tab_line_row = row;
-	  ++row;
-	}
-      else
-	tab_line_row = NULL;
+  /* Take note of the tab line, if there is one.  We will
+     update it below, after updating all of the window's lines.  */
+  if (row->mode_line_p && row->tab_line_p)
+    {
+      tab_line_row = row;
+      ++row;
+    }
+  else
+    tab_line_row = NULL;
 
-      /* Take note of the header line, if there is one.  We will
-	 update it below, after updating all of the window's lines.  */
-      if (row->mode_line_p)
-	{
-	  header_line_row = row;
-	  ++row;
-	}
-      else
-	header_line_row = NULL;
+  /* Take note of the header line, if there is one.  We will
+     update it below, after updating all of the window's lines.  */
+  if (row->mode_line_p)
+    {
+      header_line_row = row;
+      ++row;
+    }
+  else
+    header_line_row = NULL;
 
-      /* Update the mode line, if necessary.  */
-      mode_line_row = MATRIX_MODE_LINE_ROW (desired_matrix);
-      if (mode_line_row->mode_line_p && mode_line_row->enabled_p)
-	{
-	  mode_line_row->y = yb + WINDOW_SCROLL_BAR_AREA_HEIGHT (w);
-	  update_window_line (w, MATRIX_ROW_VPOS (mode_line_row,
-						  desired_matrix),
-			      &mouse_face_overwritten_p);
-	}
+  /* Update the mode line, if necessary.  */
+  mode_line_row = MATRIX_MODE_LINE_ROW (desired_matrix);
+  if (mode_line_row->mode_line_p && mode_line_row->enabled_p)
+    {
+      mode_line_row->y = yb + WINDOW_SCROLL_BAR_AREA_HEIGHT (w);
+      update_window_line (w, MATRIX_ROW_VPOS (mode_line_row,
+					      desired_matrix),
+			  &mouse_face_overwritten_p);
+    }
 
-      /* Find first enabled row.  Optimizations in redisplay_internal
-	 may lead to an update with only one row enabled.  There may
-	 be also completely empty matrices.  */
-      while (row < end && !row->enabled_p)
-	++row;
+  /* Find first enabled row.  Optimizations in redisplay_internal
+     may lead to an update with only one row enabled.  There may
+     be also completely empty matrices.  */
+  while (row < end && !row->enabled_p)
+    ++row;
 
-      /* Try reusing part of the display by copying.  */
-      if (row < end && !desired_matrix->no_scrolling_p)
+  /* Try reusing part of the display by copying.  */
+  if (row < end && !desired_matrix->no_scrolling_p)
+    {
+      int rc = scrolling_window (w, (tab_line_row != NULL ? 1 : 0)
+				    + (header_line_row != NULL ? 1 : 0));
+      if (rc < 0)
 	{
-	  int rc = scrolling_window (w, (tab_line_row != NULL ? 1 : 0)
-				     + (header_line_row != NULL ? 1 : 0));
-	  if (rc < 0)
-	    {
-	      /* All rows were found to be equal.  */
-	      paused_p = 0;
-	      goto set_cursor;
-	    }
-	  else if (rc > 0)
-	    {
-	      /* We've scrolled the display.  */
-	      force_p = 1;
-	      changed_p = 1;
-	    }
+	  /* All rows were found to be equal.  */
+	  goto set_cursor;
+	}
+      else if (rc > 0)
+	{
+	  /* We've scrolled the display.  */
+	  changed_p = 1;
 	}
+    }
 
-      /* Update the rest of the lines.  */
-      for (; row < end && (force_p || !input_pending); ++row)
-	/* scrolling_window resets the enabled_p flag of the rows it
-	   reuses from current_matrix.  */
-	if (row->enabled_p)
+  /* Update the rest of the lines.  */
+  for (; row < end; ++row)
+    /* scrolling_window resets the enabled_p flag of the rows it
+       reuses from current_matrix.  */
+    if (row->enabled_p)
+      {
+	int vpos = MATRIX_ROW_VPOS (row, desired_matrix);
+	int i;
+
+	changed_p |= update_window_line (w, vpos,
+					 &mouse_face_overwritten_p);
+
+	/* Mark all rows below the last visible one in the current
+	   matrix as invalid.  This is necessary because of
+	   variable line heights.  Consider the case of three
+	   successive redisplays, where the first displays 5
+	   lines, the second 3 lines, and the third 5 lines again.
+	   If the second redisplay wouldn't mark rows in the
+	   current matrix invalid, the third redisplay might be
+	   tempted to optimize redisplay based on lines displayed
+	   in the first redisplay.  */
+	if (MATRIX_ROW_BOTTOM_Y (row) >= yb)
 	  {
-	    int vpos = MATRIX_ROW_VPOS (row, desired_matrix);
-	    int i;
-
-	    /* We'll have to play a little bit with when to
-	       detect_input_pending.  If it's done too often,
-	       scrolling large windows with repeated scroll-up
-	       commands will too quickly pause redisplay.  */
-	    if (!force_p && ++n_updated % preempt_count == 0)
-	      detect_input_pending_ignore_squeezables ();
-	    changed_p |= update_window_line (w, vpos,
-					     &mouse_face_overwritten_p);
-
-	    /* Mark all rows below the last visible one in the current
-	       matrix as invalid.  This is necessary because of
-	       variable line heights.  Consider the case of three
-	       successive redisplays, where the first displays 5
-	       lines, the second 3 lines, and the third 5 lines again.
-	       If the second redisplay wouldn't mark rows in the
-	       current matrix invalid, the third redisplay might be
-	       tempted to optimize redisplay based on lines displayed
-	       in the first redisplay.  */
-	    if (MATRIX_ROW_BOTTOM_Y (row) >= yb)
-	      {
-		for (i = vpos + 1; i < w->current_matrix->nrows - 1; ++i)
-		  SET_MATRIX_ROW_ENABLED_P (w->current_matrix, i, false);
-		invisible_rows_marked = true;
-	      }
+	    for (i = vpos + 1; i < w->current_matrix->nrows - 1; ++i)
+	      SET_MATRIX_ROW_ENABLED_P (w->current_matrix, i, false);
+	    invisible_rows_marked = true;
 	  }
+      }
 
-      /* If the window doesn't display its mode line, make sure the
-         corresponding row of the current glyph matrix is disabled, so
-         that if and when the mode line is displayed again, it will be
-         cleared and completely redrawn.  */
-      if (!window_wants_mode_line (w))
-	SET_MATRIX_ROW_ENABLED_P (w->current_matrix,
-				  w->current_matrix->nrows - 1, false);
-
-      /* Was display preempted?  */
-      paused_p = row < end;
-
-      if (!paused_p && !invisible_rows_marked)
+  /* If the window doesn't display its mode line, make sure the
+     corresponding row of the current glyph matrix is disabled, so
+     that if and when the mode line is displayed again, it will be
+     cleared and completely redrawn.  */
+  if (!window_wants_mode_line (w))
+    SET_MATRIX_ROW_ENABLED_P (w->current_matrix,
+			      w->current_matrix->nrows - 1, false);
+
+  if (!invisible_rows_marked)
+    {
+      /* If we didn't mark the invisible rows in the current
+	 matrix as invalid above, do that now.  This can happen if
+	 scrolling_window updates the last visible rows of the
+	 current matrix, in which case the above loop doesn't get
+	 to examine the last visible row.  */
+      int i;
+      for (i = 0; i < w->current_matrix->nrows - 1; ++i)
 	{
-	  /* If we didn't mark the invisible rows in the current
-	     matrix as invalid above, do that now.  This can happen if
-	     scrolling_window updates the last visible rows of the
-	     current matrix, in which case the above loop doesn't get
-	     to examine the last visible row.  */
-	  int i;
-	  for (i = 0; i < w->current_matrix->nrows - 1; ++i)
+	  struct glyph_row *current_row = MATRIX_ROW (w->current_matrix, i);
+	  if (current_row->enabled_p
+	      && MATRIX_ROW_BOTTOM_Y (current_row) >= yb)
 	    {
-	      struct glyph_row *current_row = MATRIX_ROW (w->current_matrix, i);
-	      if (current_row->enabled_p
-		  && MATRIX_ROW_BOTTOM_Y (current_row) >= yb)
-		{
-		  for (++i ; i < w->current_matrix->nrows - 1; ++i)
-		    SET_MATRIX_ROW_ENABLED_P (w->current_matrix, i, false);
-		}
+	      for (++i ; i < w->current_matrix->nrows - 1; ++i)
+		SET_MATRIX_ROW_ENABLED_P (w->current_matrix, i, false);
 	    }
 	}
+    }
 
-    set_cursor:
+ set_cursor:
 
-      /* Update the tab line after scrolling because a new tab
-	 line would otherwise overwrite lines at the top of the window
-	 that can be scrolled.  */
-      if (tab_line_row && tab_line_row->enabled_p)
-	{
-	  tab_line_row->y = 0;
-	  update_window_line (w, 0, &mouse_face_overwritten_p);
-	}
+  /* Update the tab line after scrolling because a new tab
+     line would otherwise overwrite lines at the top of the window
+     that can be scrolled.  */
+  if (tab_line_row && tab_line_row->enabled_p)
+    {
+      tab_line_row->y = 0;
+      update_window_line (w, 0, &mouse_face_overwritten_p);
+    }
 
-      /* Update the header line after scrolling because a new header
-	 line would otherwise overwrite lines at the top of the window
-	 that can be scrolled.  */
-      if (header_line_row && header_line_row->enabled_p)
-	{
-	  header_line_row->y = tab_line_row ? CURRENT_TAB_LINE_HEIGHT (w) : 0;
-	  update_window_line (w, tab_line_row ? 1 : 0, &mouse_face_overwritten_p);
-	}
+  /* Update the header line after scrolling because a new header
+     line would otherwise overwrite lines at the top of the window
+     that can be scrolled.  */
+  if (header_line_row && header_line_row->enabled_p)
+    {
+      header_line_row->y = tab_line_row ? CURRENT_TAB_LINE_HEIGHT (w) : 0;
+      update_window_line (w, tab_line_row ? 1 : 0, &mouse_face_overwritten_p);
+    }
 
-      /* Fix the appearance of overlapping/overlapped rows.  */
-      if (!paused_p && !w->pseudo_window_p)
-	{
+  /* Fix the appearance of overlapping/overlapped rows.  */
+  if (!w->pseudo_window_p)
+    {
 #ifdef HAVE_WINDOW_SYSTEM
-	  if (changed_p && rif->fix_overlapping_area)
-	    {
-	      redraw_overlapped_rows (w, yb);
-	      redraw_overlapping_rows (w, yb);
-	    }
+      if (changed_p && rif->fix_overlapping_area)
+	{
+	  redraw_overlapped_rows (w, yb);
+	  redraw_overlapping_rows (w, yb);
+	}
 #endif
 
-	  /* Make cursor visible at cursor position of W.  */
-	  set_window_cursor_after_update (w);
+      /* Make cursor visible at cursor position of W.  */
+      set_window_cursor_after_update (w);
 
 #if 0 /* Check that current matrix invariants are satisfied.  This is
-	 for debugging only.  See the comment of check_matrix_invariants.  */
-	  IF_DEBUG (check_matrix_invariants (w));
+ for debugging only.  See the comment of check_matrix_invariants.  */
+    IF_DEBUG (check_matrix_invariants (w));
 #endif
-	}
+    }
 
 #ifdef GLYPH_DEBUG
-      /* Remember the redisplay method used to display the matrix.  */
-      strcpy (w->current_matrix->method, w->desired_matrix->method);
+  /* Remember the redisplay method used to display the matrix.  */
+  strcpy (w->current_matrix->method, w->desired_matrix->method);
 #endif
 
 #ifdef HAVE_WINDOW_SYSTEM
-      update_window_fringes (w, 0);
+  update_window_fringes (w, 0);
 
-      /* End the update of window W.  Don't set the cursor if we
-         paused updating the display because in this case,
-         set_window_cursor_after_update hasn't been called, and
-         W->output_cursor doesn't contain the cursor location.  */
-      gui_update_window_end (w, !paused_p, mouse_face_overwritten_p);
+  /* End the update of window W.  Don't set the cursor if we
+     paused updating the display because in this case,
+     set_window_cursor_after_update hasn't been called, and
+     W->output_cursor doesn't contain the cursor location.  */
+  gui_update_window_end (w, true, mouse_face_overwritten_p);
 #endif
-      /* If the update wasn't interrupted, this window has been
-	 completely updated.  */
-      if (!paused_p)
-	w->must_be_updated_p = false;
-    }
-  else
-    paused_p = 1;
+  /* If the update wasn't interrupted, this window has been
+     completely updated.  */
+  w->must_be_updated_p = false;
 
 #ifdef GLYPH_DEBUG
   /* check_current_matrix_flags (w); */
-  add_window_display_history (w, w->current_matrix->method, paused_p);
+  add_window_display_history (w, w->current_matrix->method);
 #endif
 
   xwidget_end_redisplay (w, w->current_matrix);
   clear_glyph_matrix (desired_matrix);
-
-  return paused_p;
 }
 
 #ifdef HAVE_WINDOW_SYSTEM
@@ -5697,20 +5619,13 @@ tty_set_cursor (void)
 }
 
 /* Write desired matix of tty frame F and make it current.
-
-   FORCE_P means that the update should not be stopped by pending input.
    INHIBIT_ID_P means that scrolling by insert/delete should not be tried.
-   SET_CURSOR_P false means do not set cursor at point in selected window.
+   SET_CURSOR_P false means do not set cursor at point in selected window.  */
 
-   Value is true if update was stopped due to pending input.  */
-
-static bool
-write_matrix (struct frame *f, bool force_p, bool inhibit_id_p,
+static void
+write_matrix (struct frame *f, bool inhibit_id_p,
 	      bool set_cursor_p, bool updating_menu_p)
 {
-  if (!force_p && detect_input_pending_ignore_squeezables ())
-    return true;
-
   /* If we cannot insert/delete lines, it's no use trying it.  */
   if (!FRAME_LINE_INS_DEL_OK (f))
     inhibit_id_p = true;
@@ -5722,7 +5637,7 @@ write_matrix (struct frame *f, bool force_p, bool inhibit_id_p,
      i/d line if just want cursor motion.  */
   int first_row = first_enabled_row (f->desired_matrix);
   if (!inhibit_id_p && first_row >= 0)
-    force_p |= scrolling (f);
+    scrolling (f);
 
   /* Update the individual lines as needed.  Do bottom line first.  This
      is done so that messages are made visible when pausing.  */
@@ -5730,36 +5645,19 @@ write_matrix (struct frame *f, bool force_p, bool inhibit_id_p,
   if (MATRIX_ROW_ENABLED_P (f->desired_matrix, last_row))
     write_row (f, last_row, updating_menu_p);
 
-  bool pause_p = false;
   if (first_row >= 0)
-    {
-      const int preempt_count = clip_to_bounds (1, baud_rate / 2400 + 1, INT_MAX);
-
-      for (int i = first_row, n = 0; i < last_row; ++i)
-	if (MATRIX_ROW_ENABLED_P (f->desired_matrix, i))
-	  {
-	    if (!force_p && n % preempt_count == 0
-		&& detect_input_pending_ignore_squeezables ())
-	      {
-		pause_p = true;
-		break;
-	      }
-
-	    write_row (f, i, updating_menu_p);
-	    ++n;
-	  }
-    }
+    for (int i = first_row; i < last_row; ++i)
+      if (MATRIX_ROW_ENABLED_P (f->desired_matrix, i))
+	write_row (f, i, updating_menu_p);
 
   /* Now just clean up termcap drivers and set cursor, etc.  */
-  if (!pause_p && set_cursor_p)
+  if (set_cursor_p)
     tty_set_cursor ();
-
-  return pause_p;
 }
 
 /* Do line insertions/deletions on frame F for frame-based redisplay.  */
 
-static bool
+static void
 scrolling (struct frame *frame)
 {
   /* In fact this code should never be reached at all under
@@ -5796,7 +5694,7 @@ scrolling (struct frame *frame)
       if (!MATRIX_ROW_ENABLED_P (current_matrix, i))
 	{
 	  SAFE_FREE ();
-	  return false;
+	  return;
 	}
       old_hash[i] = line_hash_code (frame, MATRIX_ROW (current_matrix, i));
       if (! MATRIX_ROW_ENABLED_P (desired_matrix, i))
@@ -5827,7 +5725,7 @@ scrolling (struct frame *frame)
       || unchanged_at_bottom == height)
     {
       SAFE_FREE ();
-      return true;
+      return;
     }
 
   window_size = (height - unchanged_at_top
@@ -5857,7 +5755,6 @@ scrolling (struct frame *frame)
 
   SAFE_FREE ();
 #endif
-  return false;
 }
 
 
@@ -6989,27 +6886,18 @@ sit_for (Lisp_Object timeout, bool reading, int display_option)
 
 
 DEFUN ("redisplay", Fredisplay, Sredisplay, 0, 1, 0,
-       doc: /* Perform redisplay.
-Optional arg FORCE, if non-nil, prevents redisplay from being
-preempted by arriving input, even if `redisplay-dont-pause' is nil.
-If `redisplay-dont-pause' is non-nil (the default), redisplay is never
-preempted by arriving input, so FORCE does nothing.
-
-Return t if redisplay was performed, nil if redisplay was preempted
-immediately by pending input.  */)
+       doc : /* Perform redisplay.
+Optional arg FORCE exists for historical reasons and is ignored.
+Value is t if redisplay has been performed, nil if executing a
+keyboard macro.  */)
   (Lisp_Object force)
 {
   swallow_events (true);
-  if ((detect_input_pending_run_timers (1)
-       && NILP (force) && !redisplay_dont_pause)
-      || !NILP (Vexecuting_kbd_macro))
+  if (!NILP (Vexecuting_kbd_macro))
     return Qnil;
 
-  specpdl_ref count = SPECPDL_INDEX ();
-  if (!NILP (force) && !redisplay_dont_pause)
-    specbind (Qredisplay_dont_pause, Qt);
   redisplay_preserve_echo_area (2);
-  return unbind_to (count, Qt);
+  return Qt;
 }
 
 
@@ -7462,8 +7350,6 @@ syms_of_display (void)
   /* This is the "purpose" slot of a display table.  */
   DEFSYM (Qdisplay_table, "display-table");
   DEFSYM (Qframe__z_order_lessp, "frame--z-order-lessp");
-
-  DEFSYM (Qredisplay_dont_pause, "redisplay-dont-pause");
   DEFSYM (Qtty_non_selected_cursor, "tty-non-selected-cursor");
 
   DEFVAR_INT ("baud-rate", baud_rate,
@@ -7545,17 +7431,6 @@ It is also used for standard output and error streams.
 See `buffer-display-table' for more information.  */);
   Vstandard_display_table = Qnil;
 
-  DEFVAR_BOOL ("redisplay-dont-pause", redisplay_dont_pause,
-	       doc: /* Nil means display update is paused when input is detected.  */);
-  /* Contrary to expectations, a value of "false" can be detrimental to
-     responsiveness since aborting a redisplay throws away some of the
-     work already performed.  It's usually more efficient (and gives
-     more prompt feedback to the user) to let the redisplay terminate,
-     and just completely skip the next command's redisplay (which is
-     done regardless of this setting if there's pending input at the
-     beginning of the next redisplay).  */
-  redisplay_dont_pause = true;
-
   DEFVAR_LISP ("x-show-tooltip-timeout", Vx_show_tooltip_timeout,
 	      doc: /* The default timeout (in seconds) for `x-show-tip'.  */);
   Vx_show_tooltip_timeout = make_fixnum (5);
diff --git a/src/keyboard.c b/src/keyboard.c
index bfb5fd3592b..fe485a3efd6 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -2663,8 +2663,7 @@ read_char (int commandflag, Lisp_Object map,
 	swallow_events (false);		/* May clear input_pending.  */
 
       /* Redisplay if no pending input.  */
-      while (!(input_pending
-	       && (input_was_pending || !redisplay_dont_pause)))
+      while (!(input_pending && input_was_pending))
 	{
 	  input_was_pending = input_pending;
 	  if (help_echo_showing_p && !BASE_EQ (selected_window, minibuf_window))
diff --git a/src/minibuf.c b/src/minibuf.c
index c8267045397..390db0d31fa 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -914,9 +914,9 @@ read_minibuf (Lisp_Object map, Lisp_Object initial, Lisp_Object prompt,
       XWINDOW (minibuf_window)->cursor.x = 0;
       XWINDOW (minibuf_window)->must_be_updated_p = true;
       struct frame *sf = XFRAME (selected_frame);
-      update_frame (sf, true, true);
+      update_frame (sf, true);
       if (is_tty_frame (sf))
-	combine_updates_for_frame (sf, true, true);
+	combine_updates_for_frame (sf, true);
 
 #ifndef HAVE_NTGUI
       flush_frame (XFRAME (XWINDOW (minibuf_window)->frame));
diff --git a/src/xdisp.c b/src/xdisp.c
index f9764f82e03..7d9dd6e8e85 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -1116,7 +1116,6 @@ static void set_iterator_to_next (struct it *, bool);
 static void mark_window_display_accurate_1 (struct window *, bool);
 static bool row_for_charpos_p (struct glyph_row *, ptrdiff_t);
 static bool cursor_row_p (struct glyph_row *);
-static int redisplay_mode_lines (Lisp_Object, bool);
 
 static void handle_line_prefix (struct it *);
 
@@ -13511,24 +13510,6 @@ echo_area_display (bool update_frame_p)
 	 here could cause confusion.  */
       if (update_frame_p && !redisplaying_p)
 	{
-	  int n = 0;
-
-	  /* If the display update has been interrupted by pending
-	     input, update mode lines in the frame.  Due to the
-	     pending input, it might have been that redisplay hasn't
-	     been called, so that mode lines above the echo area are
-	     garbaged.  This looks odd, so we prevent it here.  */
-	  if (!display_completed)
-	    {
-	      n = redisplay_mode_lines (FRAME_ROOT_WINDOW (f), false);
-
-#ifdef HAVE_WINDOW_SYSTEM
-              if (FRAME_WINDOW_P (f)
-                  && FRAME_RIF (f)->clear_under_internal_border)
-                FRAME_RIF (f)->clear_under_internal_border (f);
-#endif
-	    }
-
 	  if (window_height_changed_p
 	      /* Don't do this if Emacs is shutting down.  Redisplay
 	         needs to run hooks.  */
@@ -13537,13 +13518,10 @@ echo_area_display (bool update_frame_p)
 	      /* Must update other windows.  Likewise as in other
 		 cases, don't let this update be interrupted by
 		 pending input.  */
-	      specpdl_ref count = SPECPDL_INDEX ();
-	      specbind (Qredisplay_dont_pause, Qt);
 	      fset_redisplay (f);
 	      redisplay_internal ();
-	      unbind_to (count, Qnil);
 	    }
-	  else if (FRAME_WINDOW_P (f) && n == 0)
+	  else if (FRAME_WINDOW_P (f))
 	    {
 	      /* Window configuration is the same as before.
 		 Can do with a display update of the echo area,
@@ -13553,9 +13531,9 @@ echo_area_display (bool update_frame_p)
 	    }
 	  else
 	    {
-	      update_frame (f, true, true);
+	      update_frame (f, true);
 	      if (is_tty_frame (f))
-		combine_updates_for_frame (f, true, true);
+		combine_updates_for_frame (f, true);
 	    }
 
 	  /* If cursor is in the echo area, make sure that the next
@@ -16938,7 +16916,6 @@ redisplay_internal (void)
   struct window *w = XWINDOW (selected_window);
   struct window *sw;
   struct frame *fr;
-  bool pending;
   bool must_finish = false, match_p;
   struct text_pos tlbufpos, tlendpos;
   int number_of_visible_frames;
@@ -17024,7 +17001,6 @@ redisplay_internal (void)
   /* Remember the currently selected window.  */
   sw = w;
 
-  pending = false;
   forget_escape_and_glyphless_faces ();
 
   inhibit_free_realized_faces = false;
@@ -17590,7 +17566,7 @@ redisplay_internal (void)
 		    unrequest_sigio ();
 		  STOP_POLLING;
 
-		  pending |= update_frame (f, false, false);
+		  update_frame (f, false);
 		  /* On some platforms (at least MS-Windows), the
 		     scroll_run_hook called from scrolling_window
 		     called from update_frame could set the frame's
@@ -17612,27 +17588,24 @@ redisplay_internal (void)
 	}
 
       if (CONSP (tty_root_frames))
-	pending |= combine_updates (tty_root_frames, false, false);
+	combine_updates (tty_root_frames, false);
 
       eassert (EQ (XFRAME (selected_frame)->selected_window, selected_window));
 
-      if (!pending)
+      /* Do the mark_window_display_accurate after all windows have
+	 been redisplayed because this call resets flags in buffers
+	 which are needed for proper redisplay.  */
+      FOR_EACH_FRAME (tail, frame)
 	{
-	  /* Do the mark_window_display_accurate after all windows have
-	     been redisplayed because this call resets flags in buffers
-	     which are needed for proper redisplay.  */
-	  FOR_EACH_FRAME (tail, frame)
-	    {
-	      struct frame *f = XFRAME (frame);
-              if (f->updated_p)
-                {
-		  f->redisplay = false;
-		  f->garbaged = false;
-                  mark_window_display_accurate (f->root_window, true);
-                  if (FRAME_TERMINAL (f)->frame_up_to_date_hook)
-                    FRAME_TERMINAL (f)->frame_up_to_date_hook (f);
-                }
-	    }
+	  struct frame *f = XFRAME (frame);
+          if (f->updated_p)
+            {
+	      f->redisplay = false;
+	      f->garbaged = false;
+              mark_window_display_accurate (f->root_window, true);
+              if (FRAME_TERMINAL (f)->frame_up_to_date_hook)
+                FRAME_TERMINAL (f)->frame_up_to_date_hook (f);
+            }
 	}
     }
   else if (FRAME_REDISPLAY_P (sf))
@@ -17696,10 +17669,10 @@ redisplay_internal (void)
             }
 
 	  XWINDOW (selected_window)->must_be_updated_p = true;
-	  pending = update_frame (sf, false, false);
+	  update_frame (sf, false);
 
 	  if (is_tty_frame (sf))
-	    pending |= combine_updates_for_frame (sf, false, false);
+	    combine_updates_for_frame (sf, false);
 
 	  sf->cursor_type_changed = false;
 	  sf->inhibit_clear_image_cache = false;
@@ -17716,11 +17689,11 @@ redisplay_internal (void)
       if (mini_frame != sf)
 	{
 	  XWINDOW (mini_window)->must_be_updated_p = true;
-	  pending |= update_frame (mini_frame, false, false);
+	  update_frame (mini_frame, false);
 	  if (is_tty_frame (mini_frame))
-	    pending |= combine_updates_for_frame (mini_frame, false, false);
+	    combine_updates_for_frame (mini_frame, false);
 	  mini_frame->cursor_type_changed = false;
-          if (!pending && hscroll_retries <= MAX_HSCROLL_RETRIES
+          if (hscroll_retries <= MAX_HSCROLL_RETRIES
               && hscroll_windows (mini_window))
             {
               hscroll_retries++;
@@ -17729,47 +17702,26 @@ redisplay_internal (void)
 	}
     }
 
-  /* If display was paused because of pending input, make sure we do a
-     thorough update the next time.  */
-  if (pending)
+  if (!consider_all_windows_p)
     {
-      /* Prevent the optimization at the beginning of
-	 redisplay_internal that tries a single-line update of the
-	 line containing the cursor in the selected window.  */
-      CHARPOS (this_line_start_pos) = 0;
+      /* This has already been done above if
+	 consider_all_windows_p is set.  */
+      if (XBUFFER (w->contents)->text->redisplay
+	  && buffer_window_count (XBUFFER (w->contents)) > 1)
+	/* This can happen if b->text->redisplay was set during
+	   jit-lock.  */
+	propagate_buffer_redisplay ();
+      mark_window_display_accurate_1 (w, true);
 
-      /* Let the overlay arrow be updated the next time.  */
-      update_overlay_arrows (0);
+      /* Say overlay arrows are up to date.  */
+      update_overlay_arrows (1);
 
-      /* If we pause after scrolling, some rows in the current
-	 matrices of some windows are not valid.  */
-      if (!WINDOW_FULL_WIDTH_P (w)
-	  && !FRAME_WINDOW_P (XFRAME (w->frame)))
-	update_mode_lines = 36;
+      if (FRAME_TERMINAL (sf)->frame_up_to_date_hook != 0)
+	FRAME_TERMINAL (sf)->frame_up_to_date_hook (sf);
     }
-  else
-    {
-      if (!consider_all_windows_p)
-	{
-	  /* This has already been done above if
-	     consider_all_windows_p is set.  */
-	  if (XBUFFER (w->contents)->text->redisplay
-	      && buffer_window_count (XBUFFER (w->contents)) > 1)
-	    /* This can happen if b->text->redisplay was set during
-	       jit-lock.  */
-	    propagate_buffer_redisplay ();
-	  mark_window_display_accurate_1 (w, true);
 
-	  /* Say overlay arrows are up to date.  */
-	  update_overlay_arrows (1);
-
-	  if (FRAME_TERMINAL (sf)->frame_up_to_date_hook != 0)
-	    FRAME_TERMINAL (sf)->frame_up_to_date_hook (sf);
-	}
-
-      update_mode_lines = 0;
-      windows_or_buffers_changed = 0;
-    }
+  update_mode_lines = 0;
+  windows_or_buffers_changed = 0;
 
   /* Start SIGIO interrupts coming again.  Having them off during the
      code above makes it less likely one will discard output, but not
@@ -17785,26 +17737,23 @@ redisplay_internal (void)
      redisplay constructing glyphs, so simply exposing a frame won't
      display anything in this case.  So, we have to display these
      frames here explicitly.  */
-  if (!pending)
-    {
-      int new_count = 0;
-
-      FOR_EACH_FRAME (tail, frame)
-	{
-	  if (FRAME_REDISPLAY_P (XFRAME (frame)))
-	    new_count++;
-	}
+  int new_count = 0;
 
-      if (new_count != number_of_visible_frames)
-	windows_or_buffers_changed = 52;
+  FOR_EACH_FRAME (tail, frame)
+    {
+      if (FRAME_REDISPLAY_P (XFRAME (frame)))
+	new_count++;
     }
 
+    if (new_count != number_of_visible_frames)
+      windows_or_buffers_changed = 52;
+
   /* Change frame size now if a change is pending.  */
   do_pending_window_change (true);
 
   /* If we just did a pending size change, or have additional
      visible frames, or selected_window changed, redisplay again.  */
-  if ((windows_or_buffers_changed && !pending)
+  if (windows_or_buffers_changed
       || (WINDOWP (selected_window)
 	  && (w = XWINDOW (selected_window)) != sw))
     goto retry;
@@ -27394,60 +27343,6 @@ display_tty_menu_item (const char *item_text, int width, int face_id,
 			      Mode Line
  ***********************************************************************/
 
-/* Redisplay mode lines in the window tree whose root is WINDOW.
-   If FORCE, redisplay mode lines unconditionally.
-   Otherwise, redisplay only mode lines that are garbaged.  Value is
-   the number of windows whose mode lines were redisplayed.  */
-
-static int
-redisplay_mode_lines (Lisp_Object window, bool force)
-{
-  int nwindows = 0;
-
-  while (!NILP (window))
-    {
-      struct window *w = XWINDOW (window);
-
-      if (WINDOWP (w->contents))
-	nwindows += redisplay_mode_lines (w->contents, force);
-      else if (force
-	       || FRAME_GARBAGED_P (XFRAME (w->frame))
-	       || !MATRIX_MODE_LINE_ROW (w->current_matrix)->enabled_p)
-	{
-	  struct text_pos lpoint;
-	  struct buffer *old = current_buffer;
-
-	  /* Set the window's buffer for the mode line display.  */
-	  SET_TEXT_POS (lpoint, PT, PT_BYTE);
-	  set_buffer_internal_1 (XBUFFER (w->contents));
-
-	  /* Point refers normally to the selected window.  For any
-	     other window, set up appropriate value.  */
-	  if (!EQ (window, selected_window))
-	    {
-	      struct text_pos pt;
-
-	      CLIP_TEXT_POS_FROM_MARKER (pt, w->pointm);
-	      TEMP_SET_PT_BOTH (CHARPOS (pt), BYTEPOS (pt));
-	    }
-
-	  /* Display mode lines.  */
-	  clear_glyph_matrix (w->desired_matrix);
-	  if (display_mode_lines (w))
-	    ++nwindows;
-
-	  /* Restore old settings.  */
-	  set_buffer_internal_1 (old);
-	  TEMP_SET_PT_BOTH (CHARPOS (lpoint), BYTEPOS (lpoint));
-	}
-
-      window = w->next;
-    }
-
-  return nwindows;
-}
-
-
 /* Display the mode line, the header line, and the tab-line of window
    W.  Value is the sum number of mode lines, header lines, and tab
    lines actually displayed.  */

commit 4da9abe653fe536afc67fe5e175227eac10e31cc
Author: Gerd Möllmann <gerd@gnu.org>
Date:   Fri Nov 15 08:15:10 2024 +0100

    Respect redisplay_dont_pause in combined update
    
    * src/dispnew.c (combine_updates): Respect redisplay_dont_pause. This is
    important for echo_area_display which binds that variable.

diff --git a/src/dispnew.c b/src/dispnew.c
index 06d1ae3e6c6..d473a77e3ad 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -4002,6 +4002,9 @@ combine_updates_for_frame (struct frame *f, bool force_p, bool inhibit_scrolling
 bool
 combine_updates (Lisp_Object roots, bool force_p, bool inhibit_scrolling)
 {
+  if (redisplay_dont_pause)
+    force_p = true;
+
   for (; CONSP (roots); roots = XCDR (roots))
     {
       struct frame *root = XFRAME (XCAR (roots));

commit 37cdf2897ad51f45a228c86f5f12feeb284673df
Author: Gerd Möllmann <gerd@gnu.org>
Date:   Tue Nov 12 09:23:27 2024 +0100

    Fix a FIXME In redisplay_internal
    
    * src/xdisp.c (redisplay_internal): Compare root frames before
    setting the frame garbaged.

diff --git a/src/xdisp.c b/src/xdisp.c
index bd3e8f3138d..f9764f82e03 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -17035,19 +17035,22 @@ redisplay_internal (void)
   if (face_change)
     windows_or_buffers_changed = 47;
 
-  /* FIXME: Can we do better for tty child frames?  It could be
-     a bit faster when we switch between child frames of the same
-     root frame.  OTOH, it's probably not a frequent use case.  */
+  struct frame *previous_frame;
   if ((FRAME_TERMCAP_P (sf) || FRAME_MSDOS_P (sf))
-      && FRAME_TTY (sf)->previous_frame != sf)
+      && (previous_frame = FRAME_TTY (sf)->previous_frame,
+	  previous_frame != sf))
     {
-      /* Since frames on a single ASCII terminal share the same
-	 display area, displaying a different frame means redisplay
-	 the whole thing.  */
-      SET_FRAME_GARBAGED (sf);
+      if (previous_frame == NULL
+	  || root_frame (previous_frame) != root_frame (sf))
+	{
+	  /* Since frames on a single terminal share the same display
+	     area, displaying a different frame means redisplay the
+	     whole thing.  */
+	  SET_FRAME_GARBAGED (sf);
 #if !defined DOS_NT && !defined HAVE_ANDROID
-      set_tty_color_mode (FRAME_TTY (sf), sf);
+	  set_tty_color_mode (FRAME_TTY (sf), sf);
 #endif
+	}
       FRAME_TTY (sf)->previous_frame = sf;
     }
 

commit 437ccbe612b377fd5ac492572702978ec75ea0df
Author: Gerd Möllmann <gerd@gnu.org>
Date:   Sun Nov 10 16:19:40 2024 +0100

    Change interface of prepare_desired_root_row
    
    * src/dispnew.c (prepare_desired_root_row): Return NULL if we can't
    prepare the row.
    (produce_box_line, copy_child_glyphs): Callers changed accordingly.

diff --git a/src/dispnew.c b/src/dispnew.c
index 4758aabe967..06d1ae3e6c6 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -3519,28 +3519,32 @@ make_matrix_current (struct frame *f)
 	make_current (f, NULL, i);
 }
 
-/* Prepare ROOT's desired row at index Y for copying child
-   frame contents to it.  */
+/* Prepare ROOT's desired row at index Y for copying child frame
+   contents to it.  Value is the prepared desired row or NULL if we
+   don't have, and can't contruct a desired row.  */
 
 static struct glyph_row *
 prepare_desired_root_row (struct frame *root, int y)
 {
-  /* Start with the root's desired matrix row.  If that hasn't been
-     redisplayed, copy from the root's current matrix.  */
-  struct glyph_row *root_row = MATRIX_ROW (root->desired_matrix, y);
+  /* If we have a desired row that has been displayed, use that.  */
+  struct glyph_row *desired_row = MATRIX_ROW (root->desired_matrix, y);
+  if (desired_row->enabled_p)
+    return desired_row;
+
+  /* If we have a current row that is up to date, copy that to the
+     desired row and use that.  */
   /* Don't copy rows that aren't enabled, in particuler because they
      might not have the 'frame' member of glyphs set.  */
-  if (!root_row->enabled_p)
+  struct glyph_row *current_row = MATRIX_ROW (root->current_matrix, y);
+  if (current_row->enabled_p)
     {
-      struct glyph_row *from = MATRIX_ROW (root->current_matrix, y);
-      if (from->enabled_p)
-	{
-	  memcpy (root_row->glyphs[0], from->glyphs[0],
-		  root->current_matrix->matrix_w * sizeof (struct glyph));
-	  root_row->enabled_p = true;
-	}
+      memcpy (desired_row->glyphs[0], current_row->glyphs[0],
+	      root->current_matrix->matrix_w * sizeof (struct glyph));
+      desired_row->enabled_p = true;
+      return desired_row;
     }
-  return root_row;
+
+  return NULL;
 }
 
 /* Change GLYPH to be a space glyph.  */
@@ -3667,6 +3671,8 @@ produce_box_line (struct frame *root, struct frame *child, int x, int y, int w,
 		  bool first)
 {
   struct glyph_row *root_row = prepare_desired_root_row (root, y);
+  if (root_row == NULL)
+    return;
   if (first)
     produce_box_sides (BOX_DOWN_RIGHT, BOX_DOWN_LEFT, root_row, x, w, root, child);
   else
@@ -3703,8 +3709,9 @@ copy_child_glyphs (struct frame *root, struct frame *child)
       for (int y = r.y; y < r.y + r.h; ++y)
 	{
 	  struct glyph_row *root_row = prepare_desired_root_row (root, y);
-	  produce_box_sides (BOX_VERTICAL, BOX_VERTICAL, root_row, r.x, r.w,
-			     root, child);
+	  if (root_row)
+	    produce_box_sides (BOX_VERTICAL, BOX_VERTICAL, root_row, r.x, r.w,
+			       root, child);
 	}
 
       /* Horizontal line below.  */
@@ -3722,6 +3729,8 @@ copy_child_glyphs (struct frame *root, struct frame *child)
   for (int y = r.y; y < r.y + r.h; ++y, ++child_y)
     {
       struct glyph_row *root_row = prepare_desired_root_row (root, y);
+      if (root_row == NULL)
+	continue;
 
       /* Deal with wide characters unless already done as part of
 	 drawing a box around the child frame.  */

commit 582ebedd33ed957b9ad409e35ed7ba9dafa42c01
Author: Gerd Möllmann <gerd@gnu.org>
Date:   Sun Nov 10 16:18:29 2024 +0100

    Another case of copying from non-enabled glyphs (bug#74274)
    
    * src/dispnew.c (build_frame_matrix_from_leaf_window): If current window
    row is not enabled, don't copy from it.

diff --git a/src/dispnew.c b/src/dispnew.c
index 1b8b726b7f3..4758aabe967 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -2636,10 +2636,21 @@ build_frame_matrix_from_leaf_window (struct glyph_matrix *frame_matrix, struct w
 
       if (current_row_p)
 	{
-	  /* Copy window row to frame row.  */
-	  memcpy (frame_row->glyphs[TEXT_AREA] + window_matrix->matrix_x,
-		  window_row->glyphs[0],
-		  window_matrix->matrix_w * sizeof (struct glyph));
+	  /* If the desired glyphs for this row haven't been built,
+	     copy from the corresponding current row, but only if it
+	     is enabled, because ottherwise its contents are invalid.  */
+	  struct glyph *to = frame_row->glyphs[TEXT_AREA] + window_matrix->matrix_x;
+	  struct glyph *from = window_row->glyphs[0];
+	  for (int i = 0; i < window_matrix->matrix_w; ++i)
+	    {
+	      if (window_row->enabled_p)
+		to[i] = from[i];
+	      else
+		{
+		  to[i] = space_glyph;
+		  to[i].frame = f;
+		}
+	    }
 	}
       else
 	{

commit aa8bebf9b3eff9e53eeb1dc1a91fcc9ee5ee1095
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Sat Nov 9 14:07:09 2024 +0200

    ; * src/dispnew.c (prepare_desired_root_row): Add commentary (bug#74274).

diff --git a/src/dispnew.c b/src/dispnew.c
index 260e7ef2d1d..1b8b726b7f3 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -3517,6 +3517,8 @@ prepare_desired_root_row (struct frame *root, int y)
   /* Start with the root's desired matrix row.  If that hasn't been
      redisplayed, copy from the root's current matrix.  */
   struct glyph_row *root_row = MATRIX_ROW (root->desired_matrix, y);
+  /* Don't copy rows that aren't enabled, in particuler because they
+     might not have the 'frame' member of glyphs set.  */
   if (!root_row->enabled_p)
     {
       struct glyph_row *from = MATRIX_ROW (root->current_matrix, y);

commit 8fa26765c0dcedcadf884195189e337cb9778cb8
Author: Gerd Möllmann <gerd@gnu.org>
Date:   Sat Nov 9 08:26:06 2024 +0100

    Don't copy from non-enabled current glyphs (bug#74274)
    
    * src/dispnew.c (prepare_desired_root_row): Check if current row is
    enabled.

diff --git a/src/dispnew.c b/src/dispnew.c
index b8bc9f73afa..260e7ef2d1d 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -3520,9 +3520,12 @@ prepare_desired_root_row (struct frame *root, int y)
   if (!root_row->enabled_p)
     {
       struct glyph_row *from = MATRIX_ROW (root->current_matrix, y);
-      memcpy (root_row->glyphs[0], from->glyphs[0],
-	      root->current_matrix->matrix_w * sizeof (struct glyph));
-      root_row->enabled_p = true;
+      if (from->enabled_p)
+	{
+	  memcpy (root_row->glyphs[0], from->glyphs[0],
+		  root->current_matrix->matrix_w * sizeof (struct glyph));
+	  root_row->enabled_p = true;
+	}
     }
   return root_row;
 }

commit 6cd7ce7cf2a36a790c7e1e0a5496c35fc9d56495
Author: Gerd Möllmann <gerd@gnu.org>
Date:   Wed Nov 6 14:55:59 2024 +0100

    Fix hiding tips from pre-command-hook
    
    * lisp/tty-tip.el (tty-tip-mode): Put #'tty-tip--hide on the
    pre-command-hook.

diff --git a/lisp/tty-tip.el b/lisp/tty-tip.el
index 33b4c81bfca..728c16b6856 100644
--- a/lisp/tty-tip.el
+++ b/lisp/tty-tip.el
@@ -192,10 +192,10 @@
   (unless (display-graphic-p)
     (cond (tty-tip-mode
 	   (setq show-help-function #'tty-tip--show-help)
-           (add-hook 'pre-command-hook #'tty-tip--delete-frame))
+           (add-hook 'pre-command-hook #'tty-tip--hide))
           (t
            (setq show-help-function nil)
-           (remove-hook 'pre-command-hook #'tty-tip--delete-frame)))))
+           (remove-hook 'pre-command-hook #'tty-tip--hide)))))
 
 (provide 'tty-tip)
 

commit cc3c05cad9ef42cd7b0231efdbdba228aa06de92
Author: Gerd Möllmann <gerd@gnu.org>
Date:   Wed Nov 6 14:34:47 2024 +0100

    Revert "Mark atimer allocation as ambiguous root"
    
    This reverts commit c42b90b21a4efb3c5a8ebc6e3bd6be2908d1f2ac.

diff --git a/src/atimer.c b/src/atimer.c
index 5bd282a310d..8253ae3a166 100644
--- a/src/atimer.c
+++ b/src/atimer.c
@@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
-#include "igc.h"
 
 #ifdef WINDOWSNT
 #define raise(s) w32_raise(s)
@@ -133,13 +132,7 @@ start_atimer (enum atimer_type type, struct timespec timestamp,
       free_atimers = t->next;
     }
   else
-    {
-#ifdef HAVE_MPS
-      t = igc_xzalloc_ambig (sizeof *t);
-#else
-      t = xmalloc (sizeof *t);
-#endif
-    }
+    t = xmalloc (sizeof *t);
 
   /* Fill the atimer structure.  */
   memset (t, 0, sizeof *t);

commit c42b90b21a4efb3c5a8ebc6e3bd6be2908d1f2ac
Author: Jeff Walsh <fejfighter@gmail.com>
Date:   Tue Nov 5 23:09:56 2024 +1100

    Mark atimer allocation as ambiguous root
    
    * src/atimer.c (start_atimer): Time could be passed a lisp object for
    data, we should allocate this as an ambiguous root

diff --git a/src/atimer.c b/src/atimer.c
index 8253ae3a166..5bd282a310d 100644
--- a/src/atimer.c
+++ b/src/atimer.c
@@ -17,6 +17,7 @@ You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
+#include "igc.h"
 
 #ifdef WINDOWSNT
 #define raise(s) w32_raise(s)
@@ -132,7 +133,13 @@ start_atimer (enum atimer_type type, struct timespec timestamp,
       free_atimers = t->next;
     }
   else
-    t = xmalloc (sizeof *t);
+    {
+#ifdef HAVE_MPS
+      t = igc_xzalloc_ambig (sizeof *t);
+#else
+      t = xmalloc (sizeof *t);
+#endif
+    }
 
   /* Fill the atimer structure.  */
   memset (t, 0, sizeof *t);

commit 907c735402dd26e721ca8534df1e326fc53a3012
Author: Gerd Möllmann <gerd@gnu.org>
Date:   Wed Nov 6 11:42:53 2024 +0100

    Remove tip in pre-command-hook
    
    * lisp/tty-tip.el (tty-tip-mode): install pre-command-hook that deleted
    the tip frame.

diff --git a/lisp/tty-tip.el b/lisp/tty-tip.el
index 7f600fd3772..33b4c81bfca 100644
--- a/lisp/tty-tip.el
+++ b/lisp/tty-tip.el
@@ -190,9 +190,12 @@
   "Global minor mode for displaying help in tty child frames."
   :global t :group 'help
   (unless (display-graphic-p)
-    (if tty-tip-mode
-	(setq show-help-function #'tty-tip--show-help)
-      (setq show-help-function nil))))
+    (cond (tty-tip-mode
+	   (setq show-help-function #'tty-tip--show-help)
+           (add-hook 'pre-command-hook #'tty-tip--delete-frame))
+          (t
+           (setq show-help-function nil)
+           (remove-hook 'pre-command-hook #'tty-tip--delete-frame)))))
 
 (provide 'tty-tip)
 

commit e0bfd3ce23eafb13ab0400f3046074b83784d9f8
Author: Gerd Möllmann <gerd@gnu.org>
Date:   Wed Nov 6 10:22:50 2024 +0100

    Let tty tips disappear automatically
    
    * lisp/tty-tip.el (tty-tip--create-frame): Delete tip frame after
    x-show-tooltip-timeout seconds.

diff --git a/lisp/tty-tip.el b/lisp/tty-tip.el
index 92a115b2008..7f600fd3772 100644
--- a/lisp/tty-tip.el
+++ b/lisp/tty-tip.el
@@ -3,6 +3,8 @@
 
 ;; Copyright (C) 2024 Free Software Foundation, Inc.
 
+;; This file is part of GNU Emacs.
+
 ;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation, either version 3 of the License, or
@@ -141,7 +143,8 @@
              (x (car pos))
              (y (cdr pos)))
 	(set-frame-position tty-tip--frame x y))
-      (make-frame-visible tty-tip--frame))))
+      (make-frame-visible tty-tip--frame)
+      (run-at-time x-show-tooltip-timeout nil #'tty-tip--delete-frame))))
 
 (defvar tty-tip--help-message nil)
 (defvar tty-tip--hide-time nil)

commit d27fc61755d8dd4a65db6291f1c83492003b30b1
Author: Gerd Möllmann <gerd@gnu.org>
Date:   Wed Nov 6 05:48:46 2024 +0100

    Add tty-tip.el, not tooltips, but very close

diff --git a/lisp/tty-tip.el b/lisp/tty-tip.el
new file mode 100644
index 00000000000..92a115b2008
--- /dev/null
+++ b/lisp/tty-tip.el
@@ -0,0 +1,196 @@
+;;; -*- lexical-binding: t; symbol-packages: t; -*-
+;;; tty-tip.el --- Display help in kind of tooltips on ttys
+
+;; Copyright (C) 2024 Free Software Foundation, Inc.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; This uses tty child frames to display help which looks and feels much
+;; like using tooltips (but they really aren't).
+
+;; Use `tty-tip-mode' to activate or toggle this feature.
+;;
+;; You can customize face `tooltip', `tooltip-short-delay',
+;; `tooltip-delay', `tooltip-recent-seconds'.
+
+(require 'tooltip)
+
+(defvar tty-tip--frame nil)
+
+(defun tty-tip--make-buffer (text)
+  (with-current-buffer
+      (get-buffer-create " *tty-tip*")
+    ;; Redirect focus to parent.
+    (add-hook 'pre-command-hook #'tty-tip--delete-frame nil t)
+    ;; Use an empty keymap.
+    (use-local-map (make-keymap))
+    (dolist (var '((mode-line-format . nil)
+                   (header-line-format . nil)
+                   (tab-line-format . nil)
+                   (tab-bar-format . nil) ;; Emacs 28 tab-bar-format
+                   (frame-title-format . "")
+                   (truncate-lines . t)
+                   (cursor-in-non-selected-windows . nil)
+                   (cursor-type . nil)
+                   (show-trailing-whitespace . nil)
+                   (display-line-numbers . nil)
+                   (left-fringe-width . nil)
+                   (right-fringe-width . nil)
+                   (left-margin-width . 0)
+                   (right-margin-width . 0)
+                   (fringes-outside-margins . 0)
+                   (buffer-read-only . t)))
+      (set (make-local-variable (car var)) (cdr var)))
+    (let ((inhibit-modification-hooks t)
+          (inhibit-read-only t))
+      (erase-buffer)
+      (insert text)
+      (goto-char (point-min)))
+    (current-buffer)))
+
+(defvar tty-tip-frame-parameters
+  `((visibility . nil)
+    (background-color . "lightyellow")
+    (foreground-color . "black")
+    (width . 0) (height . 0)
+    (min-width . t) (min-height . t)
+    (no-accept-focus . t)
+    (no-focus-on-map . t)
+    (border-width . 0)
+    (child-frame-border-width . 1)
+    (left-fringe . 0)
+    (right-fringe . 0)
+    (vertical-scroll-bars . nil)
+    (horizontal-scroll-bars . nil)
+    (menu-bar-lines . 0)
+    (tool-bar-lines . 0)
+    (tab-bar-lines . 0)
+    (no-other-frame . t)
+    (no-other-window . t)
+    (no-delete-other-windows . t)
+    (unsplittable . t)
+    (undecorated . t)
+    (cursor-type . nil)
+    (no-special-glyphs . t)
+    (desktop-dont-save . t)))
+
+(defun tty-tip--frame-parameters ()
+  (let ((params (copy-sequence tty-tip-frame-parameters))
+        (fg (face-attribute 'tooltip :foreground))
+        (bg (face-attribute 'tooltip :background)))
+    (when (stringp fg)
+      (setf (alist-get 'foreground-color params) fg))
+    (when (stringp bg)
+      (setf (alist-get 'background-color params) bg))
+    params))
+
+(defun tty-tip--delete-frame ()
+  (when tty-tip--frame
+    (delete-frame tty-tip--frame)
+    (setq tty-tip--frame nil)
+    t))
+
+(defun tty-tip--compute-position ()
+  (let* ((pos (mouse-position))
+         (mouse-x (car (cdr pos)))
+         (mouse-y (cdr (cdr pos)))
+	 (x (+ mouse-x 1))
+	 (y (+ mouse-y 1))
+	 (tip-width (frame-width tty-tip--frame))
+	 (tip-height (frame-height tty-tip--frame))
+	 (tty-width (display-pixel-width))
+	 (tty-height (display-pixel-height)))
+    (when (> (+ x tip-width) tty-width)
+      (setq x (max 0 (- x tip-width 1))))
+    (when (> (+ y tip-height) tty-height)
+      (setq y (max 0 (- y tip-height 1))))
+    (cons x y)))
+
+(defun tty-tip--create-frame (text)
+  (let* ((minibuffer (minibuffer-window (window-frame)))
+         (buffer (tty-tip--make-buffer text))
+         (window-min-height 1)
+         (window-min-width 1)
+         after-make-frame-functions
+	 (text-lines (string-lines text)))
+    (setq tty-tip--frame
+          (make-frame
+           `((parent-frame . ,(car (mouse-position)))
+             (minibuffer . ,minibuffer)
+             ,@(tty-tip--frame-parameters))))
+    (let ((win (frame-root-window tty-tip--frame)))
+      (set-window-buffer win buffer)
+      (set-window-dedicated-p win t)
+      (set-frame-size tty-tip--frame
+                      (apply #'max (mapcar #'string-width text-lines))
+                      (length text-lines))
+      (let* ((pos (tty-tip--compute-position))
+             (x (car pos))
+             (y (cdr pos)))
+	(set-frame-position tty-tip--frame x y))
+      (make-frame-visible tty-tip--frame))))
+
+(defvar tty-tip--help-message nil)
+(defvar tty-tip--hide-time nil)
+(defvar tty-tip--timeout-id nil)
+
+(defun tty-tip--delay ()
+  (if (and tty-tip--hide-time
+	   (time-less-p (time-since tty-tip--hide-time)
+			tooltip-recent-seconds))
+      tooltip-short-delay
+    tooltip-delay))
+
+(defun tty-tip--cancel-delayed-tip ()
+  (when tty-tip--timeout-id
+    (cancel-timer tty-tip--timeout-id)
+    (setq tty-tip--timeout-id nil)))
+
+(defun tty-tip--start-delayed-tip ()
+  (setq tty-tip--timeout-id
+        (run-with-timer (tty-tip--delay) nil
+                        (lambda ()
+                          (tty-tip--create-frame
+                           tty-tip--help-message)))))
+
+(defun tty-tip--hide (&optional _ignored-arg)
+  (tty-tip--cancel-delayed-tip)
+  (when (tty-tip--delete-frame)
+    (setq tty-tip--hide-time (float-time))))
+
+(defun tty-tip--show-help (msg)
+  (let ((previous-help tty-tip--help-message))
+    (setq tty-tip--help-message msg)
+    (cond ((null msg)
+	   (tty-tip--hide))
+	  ((equal previous-help msg)
+	   nil)
+	  (t
+	   (tty-tip--hide)
+	   (tty-tip--start-delayed-tip)))))
+
+;;;###autoload
+(define-minor-mode tty-tip-mode
+  "Global minor mode for displaying help in tty child frames."
+  :global t :group 'help
+  (unless (display-graphic-p)
+    (if tty-tip-mode
+	(setq show-help-function #'tty-tip--show-help)
+      (setq show-help-function nil))))
+
+(provide 'tty-tip)
+
+;;; End

commit 908a18c463bf7d2da3c39ea6141cab68fd7eac30
Author: Gerd Möllmann <gerd@gnu.org>
Date:   Tue Nov 5 20:10:38 2024 +0100

    * src/dispnew.c (neutralize_wide_char): Don't use used[0]

diff --git a/src/dispnew.c b/src/dispnew.c
index a7adbfb6f16..b8bc9f73afa 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -3547,20 +3547,19 @@ neutralize_wide_char (struct frame *root, struct glyph_row *row, int x)
   if (x < 0 || x >= root->desired_matrix->matrix_w)
     return;
 
-  struct glyph *glyph = row->glyphs[0] + x;
+  struct glyph *glyph = row->glyphs[TEXT_AREA] + x;
   if (glyph->type == CHAR_GLYPH && CHARACTER_WIDTH (glyph->u.ch) > 1)
     {
-      struct glyph *row_start = row->glyphs[0];
-      struct glyph *row_limit = row_start + row->used[0];
-
       /* Glyph is somewhere in a sequence of glyphs for a wide
 	 character, find the start.  */
+      struct glyph *row_start = row->glyphs[TEXT_AREA];
       while (glyph > row_start && glyph->padding_p)
 	--glyph;
 
       /* Make everything in the sequence a space glyph.  */
       eassert (!glyph->padding_p);
       make_glyph_space (glyph);
+      struct glyph *row_limit = row_start + row->used[TEXT_AREA];
       for (++glyph; glyph < row_limit && glyph->padding_p; ++glyph)
 	make_glyph_space (glyph);
     }

commit 56efab930b5c129aa9c87f99f657b7d704c6d5f9
Author: Gerd Möllmann <gerd@gnu.org>
Date:   Tue Nov 5 10:26:36 2024 +0100

    TTY menus: handle saved state referencing dead frames
    
    * src/term.c (restore_desired_matrix): If a tty menu saves a current
    matrix that contains glyphs from a child frame, handle the case that
    that child frame dies before the saved state is restored.

diff --git a/src/term.c b/src/term.c
index bd48e1f3e55..a7f7baa6e3c 100644
--- a/src/term.c
+++ b/src/term.c
@@ -3121,9 +3121,7 @@ save_and_enable_current_matrix (struct frame *f)
 static void
 restore_desired_matrix (struct frame *f, struct glyph_matrix *saved)
 {
-  int i;
-
-  for (i = 0; i < saved->nrows; ++i)
+  for (int i = 0; i < saved->nrows; ++i)
     {
       struct glyph_row *from = saved->rows + i;
       struct glyph_row *to = f->desired_matrix->rows + i;
@@ -3133,7 +3131,23 @@ restore_desired_matrix (struct frame *f, struct glyph_matrix *saved)
       memcpy (to->glyphs[TEXT_AREA], from->glyphs[TEXT_AREA], nbytes);
       to->used[TEXT_AREA] = from->used[TEXT_AREA];
       to->enabled_p = from->enabled_p;
-      to->hash = from->hash;
+
+      bool need_new_hash = false;
+      for (int x = 0; x < f->desired_matrix->matrix_w; ++x)
+	{
+	  struct glyph *glyph = to->glyphs[0] + x;
+	  if (!FRAME_LIVE_P (glyph->frame))
+	    {
+	      glyph->frame = f;
+	      glyph->face_id = DEFAULT_FACE_ID;
+	      need_new_hash = true;
+	    }
+	}
+
+      if (need_new_hash)
+	to->hash = row_hash (to);
+      else
+	to->hash = from->hash;
     }
 }
 

commit 56708ea676e0fdfaeec36607333bb2955ec3b40e
Author: Gerd Möllmann <gerd@gnu.org>
Date:   Tue Nov 5 10:25:22 2024 +0100

    Don't copy non-enabled rows from child
    
    * src/dispnew.c (copy_child_glyphs): Check if child row is enabled.

diff --git a/src/dispnew.c b/src/dispnew.c
index 2afd2cd3c5a..a7adbfb6f16 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -102,6 +102,20 @@ static void adjust_frame_glyphs_for_window_redisplay (struct frame *);
 static void adjust_frame_glyphs_for_frame_redisplay (struct frame *);
 static void set_window_update_flags (struct window *w, bool on_p);
 
+#if 0 /* Please leave this in as a debugging aid.  */
+static void
+check_rows (struct frame *f)
+{
+  for (int y = 0; y < f->desired_matrix->nrows; ++y)
+    if (MATRIX_ROW_ENABLED_P (f->desired_matrix, y))
+      {
+	struct glyph_row *row = MATRIX_ROW (f->desired_matrix, y);
+	for (int x = 0; x < row->used[TEXT_AREA]; ++x)
+	  eassert (row->glyphs[TEXT_AREA][x].frame != 0);
+      }
+}
+#endif
+
 /* True means last display completed.  False means it was preempted.  */
 
 bool display_completed;
@@ -3702,10 +3716,12 @@ copy_child_glyphs (struct frame *root, struct frame *child)
 	  neutralize_wide_char (root, root_row, r.x + r.w);
 	}
 
-      /* Copy what's visible from the child's current row.  */
+      /* Copy what's visible from the child's current row.  If that row
+	 is not enabled_p, we can't copy anything that makes sense.  */
       struct glyph_row *child_row = MATRIX_ROW (child->current_matrix, child_y);
-      memcpy (root_row->glyphs[0] + r.x, child_row->glyphs[0] + child_x,
-	      r.w * sizeof (struct glyph));
+      if (child_row->enabled_p)
+	memcpy (root_row->glyphs[0] + r.x, child_row->glyphs[0] + child_x,
+		r.w * sizeof (struct glyph));
 
       /* Compute a new hash since we changed glyphs.  */
       root_row->hash = row_hash (root_row);

commit 33f1ab5034c7a5a9333ab6ead01f14a0f91c5f97
Author: Gerd Möllmann <gerd@gnu.org>
Date:   Tue Nov 5 10:24:31 2024 +0100

    * src/frame.c (make_terminal_frame): Check parent is live.

diff --git a/src/frame.c b/src/frame.c
index c3b6565101c..6ea1a31cdb8 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -1285,7 +1285,7 @@ make_terminal_frame (struct terminal *terminal, Lisp_Object parent,
     f = make_frame (true);
   else
     {
-      CHECK_FRAME (parent);
+      CHECK_LIVE_FRAME (parent);
 
       f = NULL;
       Lisp_Object mini = Fassq (Qminibuffer, params);

commit e2323775246c6f09b2d7fb82f8888ebe8f317b0e
Author: Gerd Möllmann <gerd@gnu.org>
Date:   Thu Oct 31 21:16:13 2024 +0100

    Fix mouse-position for xterm-mouse-mode
    
    * lisp/xt-mouse.el (xterm-mouse-position-function): Return the frame
    recorded in the terminal parameter xterm-mouse-frame.

diff --git a/lisp/xt-mouse.el b/lisp/xt-mouse.el
index 131c99d790d..130bbc6ece0 100644
--- a/lisp/xt-mouse.el
+++ b/lisp/xt-mouse.el
@@ -151,10 +151,11 @@ https://invisible-island.net/xterm/ctlseqs/ctlseqs.html)."
 
 (defun xterm-mouse-position-function (pos)
   "Bound to `mouse-position-function' in XTerm mouse mode."
-  (when (terminal-parameter nil 'xterm-mouse-x)
-    (setcdr pos (cons (terminal-parameter nil 'xterm-mouse-x)
-		      (terminal-parameter nil 'xterm-mouse-y))))
-  pos)
+  (if (terminal-parameter nil 'xterm-mouse-x)
+      (cons (terminal-parameter nil 'xterm-mouse-frame)
+            (cons (terminal-parameter nil 'xterm-mouse-x)
+		  (terminal-parameter nil 'xterm-mouse-y)))
+    pos))
 
 (define-obsolete-function-alias 'xterm-mouse-truncate-wrap 'truncate "27.1")
 

commit dfb7f1942659cab4464e01f7e498efc4b269de3e
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Mon Oct 28 09:04:41 2024 -0400

    More workarounds for GDB bug 32313
    
    * src/eval.c (backtrace_args): Same treatment as
    backtrace_function.
    
    cherry-picked from commit b7b55df.

diff --git a/src/eval.c b/src/eval.c
index 874cf6d868c..d0a2abf0089 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -50,8 +50,6 @@ Lisp_Object Vsignaling_function;
 
 /* These would ordinarily be static, but they need to be visible to GDB.  */
 bool backtrace_p (union specbinding *) EXTERNALLY_VISIBLE;
-Lisp_Object *backtrace_args (union specbinding *) EXTERNALLY_VISIBLE;
-Lisp_Object backtrace_function (union specbinding *) EXTERNALLY_VISIBLE;
 union specbinding *backtrace_next (union specbinding *) EXTERNALLY_VISIBLE;
 union specbinding *backtrace_top (void) EXTERNALLY_VISIBLE;
 
@@ -108,12 +106,22 @@ specpdl_arg (union specbinding *pdl)
   return pdl->unwind.arg;
 }
 
-Lisp_Object
-backtrace_function (union specbinding *pdl)
+/* To work around GDB bug 32313
+   <https://sourceware.org/bugzilla/show_bug.cgi?id=32313> make
+   backtrace_* functions visible-to-GDB pointers instead of merely
+   being an externally visible functions themselves.  Declare the
+   pointer first to pacify gcc -Wmissing-variable-declarations.  */
+#define GDB_FUNCPTR(func, resulttype, params) \
+  extern resulttype (*const func) params EXTERNALLY_VISIBLE; \
+  resulttype (*const func) params = func##_body
+
+static Lisp_Object
+backtrace_function_body (union specbinding *pdl)
 {
   eassert (pdl->kind == SPECPDL_BACKTRACE);
   return pdl->bt.function;
 }
+GDB_FUNCPTR (backtrace_function, Lisp_Object, (union specbinding *));
 
 static ptrdiff_t
 backtrace_nargs (union specbinding *pdl)
@@ -122,12 +130,13 @@ backtrace_nargs (union specbinding *pdl)
   return pdl->bt.nargs;
 }
 
-Lisp_Object *
-backtrace_args (union specbinding *pdl)
+static Lisp_Object *
+backtrace_args_body (union specbinding *pdl)
 {
   eassert (pdl->kind == SPECPDL_BACKTRACE);
   return pdl->bt.args;
 }
+GDB_FUNCPTR (backtrace_args, Lisp_Object *, (union specbinding *));
 
 /* Functions to modify slots of backtrace records.  */
 

commit 7aa00fa90d6eb9347034106da10cdbbdc23b3d3a
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Mon Oct 28 15:43:08 2024 +0200

    Remove unneeded workaround from w32console.c
    
    * src/w32console.c (w32con_write_glyphs): Remove unneeded test.
    (w32con_clear_end_of_line): Fill in the glyph.frame member.

diff --git a/src/w32console.c b/src/w32console.c
index 7393e5b3f6b..cd01fb9de38 100644
--- a/src/w32console.c
+++ b/src/w32console.c
@@ -167,6 +167,7 @@ w32con_clear_end_of_line (struct frame *f, int end)
       for (i = 0; i < glyphs_len; i++)
         {
 	  memcpy (&glyphs[i], &space_glyph, sizeof (struct glyph));
+	  glyphs[i].frame = f;
         }
       ceol_initialized = TRUE;
     }
@@ -330,7 +331,7 @@ w32con_write_glyphs (struct frame *f, register struct glyph *string,
       /* Since this is called to deliver the frame glyph matrix to the
 	 glass, some of the glyphs might be from a child frame, which
 	 affects the interpretation of face ID.  */
-      struct frame *face_id_frame = string->frame ? string->frame : f;
+      struct frame *face_id_frame = string->frame;
       int n;
 
       for (n = 1; n < len; ++n)

commit d3f8ed730fa10d7283c6638dc4cc20cabbe4f4bf
Author: Gerd Möllmann <gerd@gnu.org>
Date:   Sun Oct 27 12:05:58 2024 +0100

    Don't work around a corner case once observed
    
    * src/term.c (tty_write_glyphs): Refactor a bit. Don't check for null
    glyph frame.

diff --git a/src/term.c b/src/term.c
index 69abbc23d92..bd48e1f3e55 100644
--- a/src/term.c
+++ b/src/term.c
@@ -751,18 +751,12 @@ encode_terminal_code (struct glyph *src, int src_len,
 static void
 tty_write_glyphs (struct frame *f, struct glyph *string, int len)
 {
-  unsigned char *conversion_buffer;
-  struct coding_system *coding;
-  int n, stringlen;
-
   struct tty_display_info *tty = FRAME_TTY (f);
-
   tty_turn_off_insert (tty);
   tty_hide_cursor (tty);
 
   /* Don't dare write in last column of bottom line, if Auto-Wrap,
      since that would scroll the whole frame on some terminals.  */
-
   if (AutoWrap (tty)
       && curY (tty) + 1 == FRAME_TOTAL_LINES (f)
       && (curX (tty) + len) == FRAME_COLS (f))
@@ -775,22 +769,19 @@ tty_write_glyphs (struct frame *f, struct glyph *string, int len)
   /* If terminal_coding does any conversion, use it, otherwise use
      safe_terminal_coding.  We can't use CODING_REQUIRE_ENCODING here
      because it always return 1 if the member src_multibyte is 1.  */
-  coding = (FRAME_TERMINAL_CODING (f)->common_flags & CODING_REQUIRE_ENCODING_MASK
-	    ? FRAME_TERMINAL_CODING (f) : &safe_terminal_coding);
+  struct coding_system *coding
+    = (FRAME_TERMINAL_CODING (f)->common_flags & CODING_REQUIRE_ENCODING_MASK
+       ? FRAME_TERMINAL_CODING (f) : &safe_terminal_coding);
+
   /* The mode bit CODING_MODE_LAST_BLOCK should be set to 1 only at
      the tail.  */
   coding->mode &= ~CODING_MODE_LAST_BLOCK;
 
-  for (stringlen = len; stringlen != 0; stringlen -= n)
+  for (int stringlen = len, n; stringlen; stringlen -= n, string += n)
     {
       /* Identify a run of glyphs with the same face.  */
       int face_id = string->face_id;
-
-      /* FIXME/tty: it happens that a single glyph's frame is NULL.  It
-	 might depend on a tab bar line being present, then switching
-	 from a buffer without header line to one with header line and
-	 opening a child frame.  */
-      struct frame *face_id_frame = string->frame ? string->frame : f;
+      struct frame *face_id_frame = string->frame;
 
       for (n = 1; n < stringlen; ++n)
 	if (string[n].face_id != face_id || string[n].frame != face_id_frame)
@@ -804,7 +795,8 @@ tty_write_glyphs (struct frame *f, struct glyph *string, int len)
       if (n == stringlen)
 	/* This is the last run.  */
 	coding->mode |= CODING_MODE_LAST_BLOCK;
-      conversion_buffer = encode_terminal_code (string, n, coding);
+      unsigned char *conversion_buffer
+	= encode_terminal_code (string, n, coding);
       if (coding->produced > 0)
 	{
 	  block_input ();
@@ -814,7 +806,6 @@ tty_write_glyphs (struct frame *f, struct glyph *string, int len)
 	    fwrite (conversion_buffer, 1, coding->produced, tty->termscript);
 	  unblock_input ();
 	}
-      string += n;
 
       /* Turn appearance modes off.  */
       turn_off_face (f, face);

commit d7bf2cfd5d5713c9a9014807567e3f7e723280cf
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Sat Oct 26 15:31:42 2024 +0300

    Temporary fix for mouse events on child frames
    
    * src/w32inevt.c (do_mouse_event): Ignore mouse events when the
    selected frame is a child frame.

diff --git a/src/w32inevt.c b/src/w32inevt.c
index 95c0927b55b..63d322087bc 100644
--- a/src/w32inevt.c
+++ b/src/w32inevt.c
@@ -471,8 +471,13 @@ do_mouse_event (MOUSE_EVENT_RECORD *event,
   DWORD but_change, mask, flags = event->dwEventFlags;
   int i;
 
-  /* Mouse didn't move unless MOUSE_MOVED says it did.  */
   struct frame *f = get_frame ();
+
+  /* For now, mouse events on child frames are ignored, because the
+     coordinate conversion is not in place; FIXME.  */
+  if (FRAMEP (f->parent_frame))
+    return 0;
+  /* Mouse didn't move unless MOUSE_MOVED says it did.  */
   f->mouse_moved = 0;
 
   switch (flags)

commit a3e41874c1b3d75d18dab9e20e0f183a3086fea4
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Sat Oct 26 15:19:53 2024 +0300

    * src/w32console.c (w32con_update_end): Fix cursor display.

diff --git a/src/w32console.c b/src/w32console.c
index b9a84bbf86a..7393e5b3f6b 100644
--- a/src/w32console.c
+++ b/src/w32console.c
@@ -535,6 +535,11 @@ static void
 w32con_update_end (struct frame * f)
 {
   SetConsoleCursorPosition (cur_screen, cursor_coords);
+  if (!XWINDOW (selected_window)->cursor_off_p
+      && cursor_coords.X < FRAME_COLS (f))
+    w32con_show_cursor ();
+  else
+    w32con_hide_cursor ();
 }
 
 /***********************************************************************

commit 0d6a014750c63a9a9d6e5bcc195e80bf58dfa276
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Sat Oct 26 14:26:02 2024 +0300

    Fix dimensions of child frames on w32 console
    
    * src/w32inevt.c (maybe_generate_resize_event): Don't generate
    resize events for child frames.

diff --git a/src/w32inevt.c b/src/w32inevt.c
index 35d3420e39f..95c0927b55b 100644
--- a/src/w32inevt.c
+++ b/src/w32inevt.c
@@ -619,6 +619,10 @@ maybe_generate_resize_event (void)
   CONSOLE_SCREEN_BUFFER_INFO info;
   struct frame *f = get_frame ();
 
+  /* Only resize the root frame.  */
+  if (FRAMEP (f->parent_frame))
+    return;
+
   GetConsoleScreenBufferInfo (GetStdHandle (STD_OUTPUT_HANDLE), &info);
 
   /* It is okay to call this unconditionally, since it will do nothing

commit 4cb7f3935e2b600d23ae78bde2ce54a8a320e08b
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Sat Oct 26 12:14:21 2024 +0300

    More fixes for w32 console build
    
    * src/w32term.c (w32_read_socket): Don't use FRAME_OBSCURED_P,
    which was removed.
    * src/frame.h (struct frame): Move !HAVE_NTGUI to its original
    place.
    * src/treesit.c (treesit_load_language): Shut up GCC warning.

diff --git a/src/frame.h b/src/frame.h
index bf0a4169f21..bc8c3498634 100644
--- a/src/frame.h
+++ b/src/frame.h
@@ -450,7 +450,6 @@ struct frame
   bool_bf no_accept_focus : 1;
 
 #ifdef HAVE_WINDOW_SYSTEM
-# ifndef HAVE_NTGUI
   /* True if this frame is a tooltip frame.  */
   bool_bf tooltip : 1;
 
@@ -464,7 +463,7 @@ struct frame
   /* Nonzero if we should actually display horizontal scroll bars on this frame.  */
   bool_bf horizontal_scroll_bars : 1;
 
-
+# ifndef HAVE_NTGUI
   /* True if this is an override_redirect frame.  */
   bool_bf override_redirect : 1;
 #endif
diff --git a/src/treesit.c b/src/treesit.c
index 6677158b9de..c02f94ec758 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -651,7 +651,7 @@ treesit_load_language (Lisp_Object language_symbol,
 
   /* Override the library name and C name, if appropriate.  */
   Lisp_Object override_name;
-  Lisp_Object override_c_name;
+  Lisp_Object override_c_name UNINIT;
   bool found_override = treesit_find_override_name (language_symbol,
 						    &override_name,
 						    &override_c_name);
diff --git a/src/w32term.c b/src/w32term.c
index 3a627308137..e41d2fa3c34 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -6347,14 +6347,13 @@ w32_read_socket (struct terminal *terminal,
 	if (FRAME_TOOLTIP_P (f))
 	  continue;
 
-	/* Check "visible" frames and mark each as obscured or not.
+	/* Check "visible" frames and mark each as visible or not.
 	   Note that visible is nonzero for unobscured and obscured
 	   frames, but zero for hidden and iconified frames.  */
 	if (FRAME_W32_P (f) && FRAME_VISIBLE_P (f))
 	  {
 	    RECT clipbox;
 	    HDC  hdc;
-	    bool obscured;
 
 	    enter_crit ();
 	    /* Query clipping rectangle for the entire window area
@@ -6368,29 +6367,11 @@ w32_read_socket (struct terminal *terminal,
 	    ReleaseDC (FRAME_W32_WINDOW (f), hdc);
 	    leave_crit ();
 
-	    obscured = FRAME_OBSCURED_P (f);
-
-	    if (clipbox.right == clipbox.left || clipbox.bottom == clipbox.top)
-	      {
-		/* Frame has become completely obscured so mark as such (we
-		   do this by setting visible to 2 so that FRAME_VISIBLE_P
-		   is still true, but redisplay will skip it).  */
-		SET_FRAME_VISIBLE (f, 2);
-
-		if (!obscured)
-		  DebPrint (("frame %p (%s) obscured\n", f, SDATA (f->name)));
-	      }
-	    else
+	    if (!(clipbox.right == clipbox.left
+		  || clipbox.bottom == clipbox.top))
 	      {
 		/* Frame is not obscured, so mark it as such.  */
 		SET_FRAME_VISIBLE (f, 1);
-
-		if (obscured)
-		  {
-		    SET_FRAME_GARBAGED (f);
-		    DebPrint (("obscured frame %p (%s) found to be visible\n",
-			       f, SDATA (f->name)));
-		  }
 	      }
 	  }
       }

commit 33586db3d34bcbe6441d98542df2b3370a1e2622
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Sat Oct 26 11:18:41 2024 +0300

    Adapt w32 console to tty-child-frame changes
    
    * src/w32console.c (w32con_write_glyphs): Use the glyph's frame,
    not the root frame, to resolve faces from face IDs.

diff --git a/src/w32console.c b/src/w32console.c
index 7dcbc795cac..b9a84bbf86a 100644
--- a/src/w32console.c
+++ b/src/w32console.c
@@ -327,14 +327,19 @@ w32con_write_glyphs (struct frame *f, register struct glyph *string,
     {
       /* Identify a run of glyphs with the same face.  */
       int face_id = string->face_id;
+      /* Since this is called to deliver the frame glyph matrix to the
+	 glass, some of the glyphs might be from a child frame, which
+	 affects the interpretation of face ID.  */
+      struct frame *face_id_frame = string->frame ? string->frame : f;
       int n;
 
       for (n = 1; n < len; ++n)
-	if (string[n].face_id != face_id)
+	if (!(string[n].face_id == face_id
+	      && string[n].frame == face_id_frame))
 	  break;
 
       /* Turn appearance modes of the face of the run on.  */
-      char_attr = w32_face_attributes (f, face_id);
+      char_attr = w32_face_attributes (face_id_frame, face_id);
 
       if (n == len)
 	/* This is the last run.  */

commit 9b8d1e0addeca9b508324537e7743d0af508a630
Author: Gerd Möllmann <gerd@gnu.org>
Date:   Wed Oct 23 12:59:09 2024 +0200

    Handle obscured cursor differently
    
    This also fixes an error made when porting this to savannah.
    
    * src/dispnew.c (abs_cursor_pos, (is_cursor_obscured)
    (terminal_cursor_magic): Port correctly and fix.

diff --git a/src/dispnew.c b/src/dispnew.c
index 6a6f983a2ce..2afd2cd3c5a 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -3807,25 +3807,68 @@ update_tty_frame (struct frame *f, bool force_p)
   return false;
 }
 
-static void
+/* Return the cursor position of the selected window of frame F, in
+   absolute coordinates in *X and *Y.  Note that if F is a child frame,
+   its cursor may be clipped, i.e. outside of the bounds of the terminal
+   window.  Value is false if the selected window of F doesn't have
+   valid cursor position info.  */
+
+static bool
 abs_cursor_pos (struct frame *f, int *x, int *y)
 {
-  frame_pos_abs (f, x, y);
   struct window *w = XWINDOW (f->selected_window);
-  *x += w->cursor.x;
-  *y += w->cursor.y;
+  if (w->cursor.vpos >= 0
+      /* The cursor vpos may be temporarily out of bounds
+	 in the following situation:  There is one window,
+	 with the cursor in the lower half of it.  The window
+	 is split, and a message causes a redisplay before
+	 a new cursor position has been computed.  */
+      && w->cursor.vpos < WINDOW_TOTAL_LINES (w))
+    {
+      int wx = WINDOW_TO_FRAME_HPOS (w, w->cursor.hpos);
+      int wy = WINDOW_TO_FRAME_VPOS (w, w->cursor.vpos);
+
+      wx += max (0, w->left_margin_cols);
+
+      int fx, fy;
+      frame_pos_abs (f, &fx, &fy);
+      *x = fx + wx;
+      *y = fy + wy;
+      return true;
+    }
+
+  *x = *y = 0;
+  return false;
+}
+
+static bool
+is_in_matrix (struct frame *f, int x, int y)
+{
+  struct frame *root = root_frame (f);
+  if (x < 0 || x >= root->current_matrix->matrix_w || y < 0
+      || y >= root->current_matrix->matrix_h)
+    return false;
+  return true;
 }
 
-/* Is the terminal cursor of frame F obscured by a child frame?  */
+/* Is the terminal cursor of the selected frame obscured by a child
+   frame?  */
 
 static bool
 is_cursor_obscured (void)
 {
+  /* Give up if we can't tell where the cursor currently is.  */
   int x, y;
-  abs_cursor_pos (SELECTED_FRAME (), &x, &y);
+  if (!abs_cursor_pos (SELECTED_FRAME (), &x, &y))
+    return false;
+
+  /* (x, y) may be outside of the root frame in case the selected frame is a
+     child frame which is clipped.  */
   struct frame *root = root_frame (SELECTED_FRAME ());
+  if (!is_in_matrix (root, x, y))
+    return true;
+
   struct glyph_row *cursor_row = MATRIX_ROW (root->current_matrix, y);
-  eassert (x < root->current_matrix->matrix_w);
   struct glyph *cursor_glyph = cursor_row->glyphs[0] + x;
   return cursor_glyph->frame != SELECTED_FRAME ();
 }
@@ -3854,14 +3897,18 @@ terminal_cursor_magic (struct frame *root, struct frame *topmost_child)
       Lisp_Object frame;
       XSETFRAME (frame, topmost_child);
 
+      int x, y;
       Lisp_Object cursor = Fframe_parameter (frame, Qtty_non_selected_cursor);
-      if (!NILP (cursor))
+      if (!NILP (cursor) && abs_cursor_pos (topmost_child, &x, &y))
 	{
-	  int x, y;
-	  abs_cursor_pos (topmost_child, &x, &y);
-	  cursor_to (root, y, x);
-	  tty_show_cursor (FRAME_TTY (topmost_child));
-	}
+	  if (is_in_matrix (root, x, y))
+	    {
+	      cursor_to (root, y, x);
+	      tty_show_cursor (FRAME_TTY (topmost_child));
+	    }
+	  else
+	    tty_hide_cursor (FRAME_TTY (root));
+      }
     }
 }
 

commit d1fd1d8fba8a6cfe774f6982bb6ad6c874d0c960
Author: Gerd Möllmann <gerd@gnu.org>
Date:   Wed Oct 23 09:55:26 2024 +0200

    Deal with wide characters
    
    * src/dispnew.c (make_glyph_space): New function.
    (neutralize_wide_char): New function.
    (produce_box_sides, copy_child_glyphs): Call neutralize_wide_char.

diff --git a/src/dispnew.c b/src/dispnew.c
index 9a41b6be578..6a6f983a2ce 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -3513,6 +3513,45 @@ prepare_desired_root_row (struct frame *root, int y)
   return root_row;
 }
 
+/* Change GLYPH to be a space glyph.  */
+
+static void
+make_glyph_space (struct glyph *glyph)
+{
+  glyph->u.ch = ' ';
+  glyph->pixel_width = 1;
+  glyph->padding_p = 0;
+}
+
+/* On root frame ROOT, if the glyph in ROW at position X is part of a
+   sequence of glyphs for a wide character, change every glyph belonging
+   to the sequence to a space.  If X is outside of ROOT, do nothing.  */
+
+static void
+neutralize_wide_char (struct frame *root, struct glyph_row *row, int x)
+{
+  if (x < 0 || x >= root->desired_matrix->matrix_w)
+    return;
+
+  struct glyph *glyph = row->glyphs[0] + x;
+  if (glyph->type == CHAR_GLYPH && CHARACTER_WIDTH (glyph->u.ch) > 1)
+    {
+      struct glyph *row_start = row->glyphs[0];
+      struct glyph *row_limit = row_start + row->used[0];
+
+      /* Glyph is somewhere in a sequence of glyphs for a wide
+	 character, find the start.  */
+      while (glyph > row_start && glyph->padding_p)
+	--glyph;
+
+      /* Make everything in the sequence a space glyph.  */
+      eassert (!glyph->padding_p);
+      make_glyph_space (glyph);
+      for (++glyph; glyph < row_limit && glyph->padding_p; ++glyph)
+	make_glyph_space (glyph);
+    }
+}
+
 /* Produce glyphs for box character BOX in ROW.  X is the position in
    ROW where to start producing glyphs.  N is the number of glyphs to
    produce.  CHILD is the frame to use for the face of the glyphs.  */
@@ -3582,9 +3621,16 @@ produce_box_sides (enum box left, enum box right, struct glyph_row *root_row, in
 		   int w, struct frame *root, struct frame *child)
 {
   if (x > 0)
-    produce_box_glyphs (left, root_row, x - 1, 1, child);
+    {
+      neutralize_wide_char (root, root_row, x - 1);
+      produce_box_glyphs (left, root_row, x - 1, 1, child);
+    }
+
   if (x + w < root->desired_matrix->matrix_w)
-    produce_box_glyphs (right, root_row, x + w, 1, child);
+    {
+      neutralize_wide_char (root, root_row, x + w);
+      produce_box_glyphs (right, root_row, x + w, 1, child);
+    }
 }
 
 static void
@@ -3648,6 +3694,14 @@ copy_child_glyphs (struct frame *root, struct frame *child)
     {
       struct glyph_row *root_row = prepare_desired_root_row (root, y);
 
+      /* Deal with wide characters unless already done as part of
+	 drawing a box around the child frame.  */
+      if (FRAME_UNDECORATED (child))
+	{
+	  neutralize_wide_char (root, root_row, r.x - 1);
+	  neutralize_wide_char (root, root_row, r.x + r.w);
+	}
+
       /* Copy what's visible from the child's current row.  */
       struct glyph_row *child_row = MATRIX_ROW (child->current_matrix, child_y);
       memcpy (root_row->glyphs[0] + r.x, child_row->glyphs[0] + child_x,

commit 669586a5e795d84436960aa6ef1a26532df63573
Merge: 4182dfb7e84 40aa1e329b6
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Wed Oct 23 03:20:16 2024 -0400

    Merge branch 'scratch/tty-child-frames' of git.sv.gnu.org:/srv/git/emacs into scratch/tty-child-frames

commit 40aa1e329b637e42fc945cba6213b4e7b4a5d60f
Author: Gerd Möllmann <gerd@gnu.org>
Date:   Wed Oct 23 07:51:12 2024 +0200

    Fix copy/paste error
    
    * src/dispnew.c (produce_box_glyphs): DonÄt set multibyte_p twice, set
    padding_p.

diff --git a/src/dispnew.c b/src/dispnew.c
index 1ece9cc1d45..8aa8e0fb5f5 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -3561,8 +3561,9 @@ produce_box_glyphs (enum box box, struct glyph_row *row, int x, int n,
       glyph->multibyte_p = 1;
       glyph->face_id = GLYPH_FACE (g);
       glyph->frame = child;
-      glyph->multibyte_p = 1;
+      glyph->padding_p = 0;
       glyph->object = Qnil;
+      glyph->padding_p = 0;
     }
 }
 

commit dac51f1f66ef93cec6d9ea17e74a193de9ae1ff3
Author: Paul Eggert <eggert@cs.ucla.edu>
Date:   Tue Oct 22 12:18:14 2024 -0700

    Fix UB in line_hash_code
    
    * src/dispnew.c (line_hash_code): Avoid undefined behavior on
    integer overflow.

diff --git a/src/dispnew.c b/src/dispnew.c
index 200ffaaca21..1ece9cc1d45 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -1175,12 +1175,12 @@ line_hash_code (struct frame *f, struct glyph_row *row)
       while (glyph < end)
 	{
 	  int c = glyph->u.ch;
-	  int face_id = glyph->face_id;
+	  unsigned int face_id = glyph->face_id;
 	  /* Struct frame can move with igc, and so on.  But we need
 	     something that takes different frames into account.  Use the
 	     face_cache pointer for that which is malloc'd.  */
 	  if (glyph->frame && glyph->frame != f)
-	    face_id += (ptrdiff_t) glyph->frame->face_cache;
+	    face_id += (uintptr_t) glyph->frame->face_cache;
 	  if (FRAME_MUST_WRITE_SPACES (f))
 	    c -= SPACEGLYPH;
 	  hash = (((hash << 4) + (hash >> 24)) & 0x0fffffff) + c;

commit 5cc5fa79bfdf0f905723e592baa41c3f0b12316d
Author: Gerd Möllmann <gerd@gnu.org>
Date:   Wed Oct 23 05:01:51 2024 +0200

    Some cleanup of frame_parm_table
    
    * src/frame.c (frame_parms): Use built-in symbols for all entries.
    (syms_of_frame): Check that entries are valid built-in symbols.

diff --git a/src/frame.c b/src/frame.c
index 0d45c2de197..c3b6565101c 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -4249,9 +4249,9 @@ multiplied to find the real number of pixels.  */)
 /* Connect the frame-parameter names for frames to the ways of passing
    the parameter values to the window system.
 
-   The name of a parameter, as a Lisp symbol, has a
-   `frame-parameter-pos' property which is an integer in Lisp that is
-   an index in this table.  */
+   The name of a parameter, a Lisp symbol, has an `x-frame-parameter'
+   property which is its index in this table.  This is initialized in
+   syms_of_frame.  */
 
 struct frame_parm_table {
   const char *name;
@@ -4262,13 +4262,13 @@ static const struct frame_parm_table frame_parms[] =
 {
   {"auto-raise",		SYMBOL_INDEX (Qauto_raise)},
   {"auto-lower",		SYMBOL_INDEX (Qauto_lower)},
-  {"background-color",		-1},
+  {"background-color",		SYMBOL_INDEX (Qbackground_color)},
   {"border-color",		SYMBOL_INDEX (Qborder_color)},
   {"border-width",		SYMBOL_INDEX (Qborder_width)},
   {"cursor-color",		SYMBOL_INDEX (Qcursor_color)},
   {"cursor-type",		SYMBOL_INDEX (Qcursor_type)},
-  {"font",			-1},
-  {"foreground-color",		-1},
+  {"font",			SYMBOL_INDEX (Qfont)},
+  {"foreground-color",		SYMBOL_INDEX (Qforeground_color)},
   {"icon-name",			SYMBOL_INDEX (Qicon_name)},
   {"icon-type",			SYMBOL_INDEX (Qicon_type)},
   {"child-frame-border-width",	SYMBOL_INDEX (Qchild_frame_border_width)},
@@ -6720,17 +6720,13 @@ syms_of_frame (void)
   DEFSYM (Quse_frame_synchronization, "use-frame-synchronization");
   DEFSYM (Qfont_parameter, "font-parameter");
 
-  {
-    int i;
-
-    for (i = 0; i < ARRAYELTS (frame_parms); i++)
-      {
-	Lisp_Object v = (frame_parms[i].sym < 0
-			 ? intern_c_string (frame_parms[i].name)
-			 : builtin_lisp_symbol (frame_parms[i].sym));
-	Fput (v, Qx_frame_parameter, make_fixnum (i));
-      }
-  }
+  for (int i = 0; i < ARRAYELTS (frame_parms); i++)
+    {
+      int sym = frame_parms[i].sym;
+      eassert (sym >= 0 && sym < ARRAYELTS (lispsym));
+      Lisp_Object v = builtin_lisp_symbol (sym);
+      Fput (v, Qx_frame_parameter, make_fixnum (i));
+    }
 
 #ifdef HAVE_WINDOW_SYSTEM
   DEFVAR_LISP ("x-resource-name", Vx_resource_name,

commit 4182dfb7e844bcc7148a3d7f1084cef6982b36d9
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Tue Oct 22 10:33:45 2024 -0400

    ; Clarify a comment in dispnew.c

diff --git a/src/dispnew.c b/src/dispnew.c
index 200ffaaca21..9caeb9d1694 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -1176,9 +1176,12 @@ line_hash_code (struct frame *f, struct glyph_row *row)
 	{
 	  int c = glyph->u.ch;
 	  int face_id = glyph->face_id;
-	  /* Struct frame can move with igc, and so on.  But we need
-	     something that takes different frames into account.  Use the
-	     face_cache pointer for that which is malloc'd.  */
+	  /* A given row of a frame glyph matrix could have glyphs
+	     from more than one frame, if child frames are displayed.
+	     Since face_id of a face depends on the frame (it's an
+	     index into the frame's face cache), we need the hash
+	     value to include something specific to the frame, and we
+	     use the frame cache's address for that purpose.  */
 	  if (glyph->frame && glyph->frame != f)
 	    face_id += (ptrdiff_t) glyph->frame->face_cache;
 	  if (FRAME_MUST_WRITE_SPACES (f))

commit 560260a631489576e99caedda3233670f2fcd66c
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Tue Oct 22 06:19:12 2024 -0400

    * src/term.c (tty_display_dimension): Avoid warnings.

diff --git a/src/term.c b/src/term.c
index 6379b4ce4a1..69abbc23d92 100644
--- a/src/term.c
+++ b/src/term.c
@@ -4882,6 +4882,7 @@ tty_display_dimension (Lisp_Object frame, int *width, int *height)
     case output_pgtk:
     case output_haiku:
     case output_android:
+    default:
       emacs_abort ();
       break;
     }

commit 4ef5ade5da60075418e0f6db1b91ec08a38bb884
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Tue Oct 22 05:42:05 2024 -0400

    Fix commenting conventions.

diff --git a/src/dispextern.h b/src/dispextern.h
index 468aee8d1ba..c368e665c61 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -482,9 +482,9 @@ struct glyph
      continuation glyphs, or the overlay-arrow glyphs on TTYs.  */
   Lisp_Object object;
 
-  /* Frame on which the glyph was produced. The face_id of this glyph
-     refers to the face_cache of this frame. This is used on tty frames
-     only. */
+  /* Frame on which the glyph was produced.  The face_id of this glyph
+     refers to the face_cache of this frame.  This is used on tty
+     frames only.  */
   struct frame *frame;
 
   /* Width in pixels.  */
diff --git a/src/dispnew.c b/src/dispnew.c
index 26181c36399..200ffaaca21 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -1177,8 +1177,8 @@ line_hash_code (struct frame *f, struct glyph_row *row)
 	  int c = glyph->u.ch;
 	  int face_id = glyph->face_id;
 	  /* Struct frame can move with igc, and so on.  But we need
-	     something that takes different frames into account. Use the
-	     face_cache pointer for that which is malloc'd. */
+	     something that takes different frames into account.  Use the
+	     face_cache pointer for that which is malloc'd.  */
 	  if (glyph->frame && glyph->frame != f)
 	    face_id += (ptrdiff_t) glyph->frame->face_cache;
 	  if (FRAME_MUST_WRITE_SPACES (f))
@@ -3195,8 +3195,8 @@ redraw_frame (struct frame *f)
        future.  */
     SET_FRAME_GARBAGED (f);
 
-  /* Clear_frame is actually a "clear_terminal", i.e.
-     is clears the entire screen. */
+  /* clear_frame is actually a "clear_terminal", i.e.
+     it clears the entire screen.  */
   if (!FRAME_PARENT_FRAME (f))
     clear_frame (f);
   clear_current_matrices (f);
@@ -3238,37 +3238,37 @@ DEFUN ("redraw-display", Fredraw_display, Sredraw_display, 0, 0, "",
 			    TTY Child Frames
  **********************************************************************/
 
-/* The new thing that child frames on ttys provide is that frames on a
-   tty no longer always occupy the whole terminal. They can overlap
-   instead.
+/* Child frames on ttys break the assumption that frames on a tty
+   always occupy the whole terminal.  They can overlap instead.
 
-   Let a "root" frame be a frame that has no parent frame. Such root
-   frames we require to be the size of the terminal screen. The current
-   glyph matrix of a root frame of a termimnal represents what is on the
-   screen. The desired matrix of a root frame represents what should be
-   one the screen.
+   Let a "root" frame be a frame that has no parent frame.  Such root
+   frames are required to be the size of the terminal screen.  The
+   current glyph matrix of a root frame of a termimnal represents what
+   is on the screen.  The desired matrix of a root frame represents
+   what should be one the screen.
 
    Building the desired matrix of root frame proceeds by
 
    - building the desired matrix of the root frame itself which is
-     the bottommost frame in z-order,
-   - building desired matrices of child frames in z-order, topmost last,
+     the bottommost frame in z-order;
+   - building desired matrices of child frames in z-order, topmost last;
    - copying the desired glyphs from child frames to the desired glyphs
      of the root frame
 
-   Updating the screen is then done using root frame matrices as it was
-   before child frames were introduced. Child frame current matrices are
-   updated by copying glyph contents of the current matrix of the root
-   frames to the current matrices of child frames. This imnplicitly
-   also updates the glyph contents of their windows' current matrices.  */
+   Updating the screen is then done using root frame matrices as it
+   was before child frames were introduced.  Child frame's current
+   matrices are updated by copying glyph contents of the current
+   matrix of the root frames to the current matrices of child
+   frames.  This implicitly also updates the glyph contents of their
+   windows' current matrices.  */
 
 struct rect
 {
   int x, y, w, h;
 };
 
-/* Compute the intersection of R1 and R2 in R. Value is true if R1 and
-   R2 intersect, false otherwise. */
+/* Compute the intersection of R1 and R2 in R.  Value is true if R1 and
+   R2 intersect, false otherwise.  */
 
 static bool
 rect_intersect (struct rect *r, struct rect r1, struct rect r2)
@@ -3285,7 +3285,7 @@ rect_intersect (struct rect *r, struct rect r1, struct rect r2)
   return true;
 }
 
-/* Return the absolute position of frame F in *X and *Y. */
+/* Return the absolute position of frame F in *X and *Y.  */
 
 static void
 frame_pos_abs (struct frame *f, int *x, int *y)
@@ -3298,7 +3298,8 @@ frame_pos_abs (struct frame *f, int *x, int *y)
     }
 }
 
-/* Return the rectangle frame F occupies. X and Y are in absolute coordinates. */
+/* Return the rectangle frame F occupies.  X and Y are in absolute
+   coordinates.  */
 
 static struct rect
 frame_rect_abs (struct frame *f)
@@ -3308,9 +3309,9 @@ frame_rect_abs (struct frame *f)
   return (struct rect) { x, y, f->total_cols, f->total_lines };
 }
 
-/* Return the root frame of frame F. Follow the parent_frame chain until
-   we reach a frame that has no parent. That is the root frame. Note
-   that the root of a root frame is itself. */
+/* Return the root frame of frame F.  Follow the parent_frame chain
+   until we reach a frame that has no parent.  That is the root frame.
+   Note that the root of a root frame is itself. */
 
 struct frame *
 root_frame (struct frame *f)
@@ -3441,7 +3442,7 @@ tty_raise_lower_frame (struct frame *f, bool raise)
   f->z_order = raise ? i : 0;
 }
 
-/* Return true if frame F is a tty frame. */
+/* Return true if frame F is a tty frame.  */
 
 bool
 is_tty_frame (struct frame *f)
@@ -3449,7 +3450,7 @@ is_tty_frame (struct frame *f)
   return FRAME_TERMCAP_P (f);
 }
 
-/* Return true if frame F is a tty child frame. */
+/* Return true if frame F is a tty child frame.  */
 
 bool
 is_tty_child_frame (struct frame *f)
@@ -3457,7 +3458,7 @@ is_tty_child_frame (struct frame *f)
   return FRAME_PARENT_FRAME (f) && is_tty_frame (f);
 }
 
-/* Return true if frame F is a tty root frame. */
+/* Return true if frame F is a tty root frame.  */
 
 bool
 is_tty_root_frame (struct frame *f)
@@ -3466,7 +3467,7 @@ is_tty_root_frame (struct frame *f)
 }
 
 /* Return the index of the first enabled row in MATRIX, or -1 if there
-   is none. */
+   is none.  */
 
 static int
 first_enabled_row (struct glyph_matrix *matrix)
@@ -3478,7 +3479,7 @@ first_enabled_row (struct glyph_matrix *matrix)
 }
 
 /* On tty frame F, make desired matrix current, without writing
-   to the terminal. */
+   to the terminal.  */
 
 static void
 make_matrix_current (struct frame *f)
@@ -3496,8 +3497,8 @@ make_matrix_current (struct frame *f)
 static struct glyph_row *
 prepare_desired_root_row (struct frame *root, int y)
 {
-  /* Start with the root's desired matrix row. If that hasn't
-     been redisplayed, copy from the root's current matrix. */
+  /* Start with the root's desired matrix row.  If that hasn't been
+     redisplayed, copy from the root's current matrix.  */
   struct glyph_row *root_row = MATRIX_ROW (root->desired_matrix, y);
   if (!root_row->enabled_p)
     {
@@ -3509,9 +3510,9 @@ prepare_desired_root_row (struct frame *root, int y)
   return root_row;
 }
 
-/* Produce glyphs for box character BOX in ROW.  X ist the position in ROW
-   where to start producing glyphs. N is the number of glyphs to produce.
-   CHILD is the frame to use for the face of the glyphs.  */
+/* Produce glyphs for box character BOX in ROW.  X is the position in
+   ROW where to start producing glyphs.  N is the number of glyphs to
+   produce.  CHILD is the frame to use for the face of the glyphs.  */
 
 static void
 produce_box_glyphs (enum box box, struct glyph_row *row, int x, int n,
@@ -3534,7 +3535,7 @@ produce_box_glyphs (enum box box, struct glyph_row *row, int x, int n,
       break;
     }
 
-  // FIXME/tty some face for the border.
+  /* FIXME/tty: some face for the border.  */
   int face_id = BORDER_FACE_ID;
   GLYPH g;
   SET_GLYPH (g, dflt, face_id);
@@ -3546,7 +3547,7 @@ produce_box_glyphs (enum box box, struct glyph_row *row, int x, int n,
       if (GLYPH_CODE_P (gc))
 	{
 	  SET_GLYPH_FROM_GLYPH_CODE (g, gc);
-	  /* Sorry, but I really don't care if the glyph has a face :-). */
+	  /* Sorry, but I really don't care if the glyph has a face :-).  */
 	}
     }
 
@@ -3567,7 +3568,7 @@ produce_box_glyphs (enum box box, struct glyph_row *row, int x, int n,
 
 /* Produce box glyphs LEFT and RIGHT in ROOT_ROW.  X and W are the start
    and width of a range in ROOT_ROW before and after which to put the
-   box glyphs, if they fit. ROOT and CHILD are root and child frame we
+   box glyphs, if they fit.  ROOT and CHILD are root and child frame we
    are working on.  ROOT is the root frame whose matrix dimensions
    determines if the box glyphs fit.  CHILD is the frame whose faces to
    use for the box glyphs.  */
@@ -3595,7 +3596,7 @@ produce_box_line (struct frame *root, struct frame *child, int x, int y, int w,
   root_row->hash = row_hash (root_row);
 }
 
-/* Copy to ROOT's desired matrix what we need from CHILD. */
+/* Copy to ROOT's desired matrix what we need from CHILD.  */
 
 static void
 copy_child_glyphs (struct frame *root, struct frame *child)
@@ -3603,20 +3604,20 @@ copy_child_glyphs (struct frame *root, struct frame *child)
   eassert (!FRAME_PARENT_FRAME (root));
   eassert (is_frame_ancestor (root, child));
 
-  /* Determine the intersection of the child frame rectangle with
-     the root frame. This is basically clipping the child frame to
-     the root frame rectangle. */
+  /* Determine the intersection of the child frame rectangle with the
+     root frame.  This is basically clipping the child frame to the
+     root frame rectangle.  */
   struct rect r;
   if (!rect_intersect (&r, frame_rect_abs (root), frame_rect_abs (child)))
     return;
 
-  /* Build CHILD's current matrix which we need to copy from it. */
+  /* Build CHILD's current matrix which we need to copy from it.  */
   make_matrix_current (child);
 
-  /* Draw borders around the child frame. */
+  /* Draw borders around the child frame.  */
   if (!FRAME_UNDECORATED (child))
     {
-      /* Horizontal line above. */
+      /* Horizontal line above.  */
       if (r.y > 0)
 	produce_box_line (root, child, r.x, r.y - 1, r.w, true);
 
@@ -3627,28 +3628,28 @@ copy_child_glyphs (struct frame *root, struct frame *child)
 			     root, child);
 	}
 
-      /* Horizontal line below */
+      /* Horizontal line below.  */
       if (r.y + r.h < root->desired_matrix->matrix_h)
 	produce_box_line (root, child, r.x, r.y + r.h, r.w, false);
     }
 
-  /* First visible row/col, relative to the child frame. */
+  /* First visible row/col, relative to the child frame.  */
   int child_x = child->left_pos < 0 ? - child->left_pos : 0;
   int child_y = child->top_pos < 0 ? - child->top_pos : 0;
 
   /* For all rows in the intersection, copy glyphs from the child's
-     current matrix to the root's desired matrix, enabling those
-     rows if they aren't already. */
+     current matrix to the root's desired matrix, enabling those rows
+     if they aren't already.  */
   for (int y = r.y; y < r.y + r.h; ++y, ++child_y)
     {
       struct glyph_row *root_row = prepare_desired_root_row (root, y);
 
-      /* Copy what's visible from the child's current row. */
+      /* Copy what's visible from the child's current row.  */
       struct glyph_row *child_row = MATRIX_ROW (child->current_matrix, child_y);
       memcpy (root_row->glyphs[0] + r.x, child_row->glyphs[0] + child_x,
 	      r.w * sizeof (struct glyph));
 
-      /* Compute a new hash since we changed glyphs. */
+      /* Compute a new hash since we changed glyphs.  */
       root_row->hash = row_hash (root_row);
     }
 }
@@ -3689,7 +3690,7 @@ update_bar_window (Lisp_Object window, Lisp_Object *current,
 }
 #endif
 
-/* Update the tab-bar window of frame F, if present. */
+/* Update the tab-bar window of frame F, if present.  */
 
 static void
 update_tab_bar (struct frame *f)
@@ -3757,7 +3758,7 @@ abs_cursor_pos (struct frame *f, int *x, int *y)
   *y += w->cursor.y;
 }
 
-/* Is the terminal cursor of frame F obscured by a child frame? */
+/* Is the terminal cursor of frame F obscured by a child frame?  */
 
 static bool
 is_cursor_obscured (void)
@@ -3771,17 +3772,17 @@ is_cursor_obscured (void)
   return cursor_glyph->frame != SELECTED_FRAME ();
 }
 
-/* Decide where to show the cursor, and if to hide it or not.
+/* Decide where to show the cursor, and whether to hide it.
 
    This works very well for Vertico-Posframe, Transient-Posframe and
    Corfu, but it's debatable if it's the right thing for a general use
-   of child frames of all sorts, nested and so on. But it is also debatable
-   if that's a realistic use case from my POV. */
+   of child frames of all sorts, nested and so on.  But it is also
+   debatable if that's a realistic use case from my POV.  */
 
 static void
 terminal_cursor_magic (struct frame *root, struct frame *topmost_child)
 {
-  /* By default, prevent the cursor "shining through" child frames. */
+  /* By default, prevent the cursor "shining through" child frames.  */
   if (is_cursor_obscured ())
     tty_hide_cursor (FRAME_TTY (root));
 
@@ -3812,8 +3813,8 @@ combine_updates_for_frame (struct frame *f, bool force_p, bool inhibit_scrolling
   struct frame *root = root_frame (f);
   eassert (FRAME_VISIBLE_P (root));
 
-  /* Process child frames in reverse z-order, topmost last. For each
-     child, copy what we need to the root's desired matrix. */
+  /* Process child frames in reverse z-order, topmost last.  For each
+     child, copy what we need to the root's desired matrix.  */
   Lisp_Object z_order = frames_in_reverse_z_order (root, true);
   struct frame *topmost_child = NULL;
   for (Lisp_Object tail = XCDR (z_order); CONSP (tail); tail = XCDR (tail))
@@ -3830,7 +3831,7 @@ combine_updates_for_frame (struct frame *f, bool force_p, bool inhibit_scrolling
 
   /* If a child is displayed, and the cursor is displayed in another
      frame, the child might lay above the cursor, so that it appers to
-     "shine through" the child. Avoid that because it's confusing. */
+     "shine through" the child.  Avoid that because it's confusing.  */
   if (topmost_child)
     terminal_cursor_magic (root, topmost_child);
   flush_terminal (root);
@@ -3850,8 +3851,8 @@ combine_updates_for_frame (struct frame *f, bool force_p, bool inhibit_scrolling
   return paused;
 }
 
-/* Update on the screen all root frames ROOTS. Called from
-   redisplay_internal as the last step of redisplaying. */
+/* Update on the screen all root frames ROOTS.  Called from
+   redisplay_internal as the last step of redisplaying.  */
 
 bool
 combine_updates (Lisp_Object roots, bool force_p, bool inhibit_scrolling)
@@ -3926,8 +3927,8 @@ update_frame_with_menu (struct frame *f, int row, int col)
   /* Update the display.  */
   update_begin (f);
   cursor_at_point_p = !(row >= 0 && col >= 0);
-  /* Do not stop due to pending input, and do not try scrolling. This
-     means that write_glyphs will always return false. */
+  /* Do not stop due to pending input, and do not try scrolling.  This
+     means that write_glyphs will always return false.  */
   write_matrix (f, 1, 1, cursor_at_point_p, true);
   make_matrix_current (f);
   clear_desired_matrices (f);
@@ -5576,7 +5577,7 @@ write_matrix (struct frame *f, bool force_p, bool inhibit_id_p,
     force_p |= scrolling (f);
 
   /* Update the individual lines as needed.  Do bottom line first.  This
-     is done so that messages are made visible when pausing. */
+     is done so that messages are made visible when pausing.  */
   int last_row = f->desired_matrix->nrows - 1;
   if (MATRIX_ROW_ENABLED_P (f->desired_matrix, last_row))
     write_row (f, last_row, updating_menu_p);
diff --git a/src/frame.c b/src/frame.c
index 6b7f04aed80..0d45c2de197 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -197,10 +197,10 @@ set_menu_bar_lines (struct frame *f, Lisp_Object value, Lisp_Object oldval)
   int olines = FRAME_MENU_BAR_LINES (f);
   int nlines = TYPE_RANGED_FIXNUMP (int, value) ? XFIXNUM (value) : 0;
 
-  /* Menu bars on child frames don't work on all platforms,
-     which is the reason why prepare_menu_bar does not update_menu_bar
-     for child frames (info from Martin Rudalics). This could be
-     implemented in ttys, but it's probaly not worth it. */
+  /* Menu bars on child frames don't work on all platforms, which is
+     the reason why prepare_menu_bar does not update_menu_bar for
+     child frames (info from Martin Rudalics).  This could be
+     implemented in ttys, but it's probaly not worth it.  */
   if (is_tty_child_frame (f))
     {
       FRAME_MENU_BAR_LINES (f) = 0;
@@ -1297,10 +1297,10 @@ make_terminal_frame (struct terminal *terminal, Lisp_Object parent,
 	    f = make_frame_without_minibuffer (Qnil, kb, Qnil);
 	  else if (EQ (mini, Qonly))
 	    {
-# if 0 /* No interest in this feature at the moment, */
+# if 0 /* No interest in this feature at the moment.  */
 	      f = make_minibuffer_frame ();
-	      /* Not sure about this plus the unsplittable frame
-		 paran. */
+	      /* Not sure about this, plus the unsplittable frame
+		 param.  */
 	      f->no_split = true;
 # endif
 	    }
@@ -1345,10 +1345,10 @@ make_terminal_frame (struct terminal *terminal, Lisp_Object parent,
   f->horizontal_scroll_bars = false;
 #endif
 
-  /* Menu bars on child frames don't work on all platforms,
-     which is the reason why prepare_menu_bar does not update_menu_bar
-     for child frames (info from Martin Rudalics). This could be
-     implemented in ttys, but it's unclear if it is worth it. */
+  /* Menu bars on child frames don't work on all platforms, which is
+     the reason why prepare_menu_bar does not update_menu_bar for
+     child frames (info from Martin Rudalics).  This could be
+     implemented in ttys, but it's unclear if it is worth it.  */
   if (NILP (parent))
     FRAME_MENU_BAR_LINES (f) = NILP (Vmenu_bar_mode) ? 0 : 1;
   else
@@ -1363,7 +1363,7 @@ make_terminal_frame (struct terminal *terminal, Lisp_Object parent,
     - FRAME_TAB_BAR_HEIGHT (f);
 
   /* Mark current topmost frame obscured if we make a new root frame.
-     Child frames don't completely obscure other frames. */
+     Child frames don't completely obscure other frames.  */
   if (NILP (parent) && FRAMEP (FRAME_TTY (f)->top_frame))
     {
       struct frame *top = XFRAME (FRAME_TTY (f)->top_frame);
@@ -1427,8 +1427,8 @@ tty_child_size_param (struct frame *child, Lisp_Object key,
       val = XCDR (val);
       if (CONSP (val))
 	{
-	  /* Width and height may look like (width text-pixels
-	     . PIXELS) on window systems.  Mimic that.  */
+	  /* Width and height may look like (width text-pixels . PIXELS)
+	     on window systems.  Mimic that.  */
 	  val = XCDR (val);
 	  if (EQ (val, Qtext_pixels))
 	    val = XCDR (val);
@@ -1545,9 +1545,9 @@ affects all frames on the same terminal device.  */)
       SAFE_FREE ();
     }
 
-  /* Make a new frame. We need to know upfront if if a parent frame is
-     specified because we behave differently in this case, e.g. child
-     frames don't obscure other frames. */
+  /* Make a new frame.  We need to know up front if a parent frame is
+     specified because we behave differently in this case, e.g., child
+     frames don't obscure other frames.  */
   Lisp_Object parent = Fcdr (Fassq (Qparent_frame, parms));
   struct frame *f = make_terminal_frame (t, parent, parms);
 
@@ -1556,20 +1556,20 @@ affects all frames on the same terminal device.  */)
 
   /* Visibility of root frames cannot be set with a frame parameter.
      Their visibility solely depends on whether or not they are the
-     top_frame on the terminal. */
+     top_frame on the terminal.  */
   if (FRAME_PARENT_FRAME (f))
     {
       Lisp_Object visible = Fassq (Qvisibility, parms);
       if (CONSP (visible))
 	SET_FRAME_VISIBLE (f, !NILP (visible));
 
-      /* FIXME/tty: The only way to get borders on a tty is
-	 to allow decorations for now. */
+      /* FIXME/tty: The only way, for now, to get borders on a tty is
+	 to allow decorations.  */
       Lisp_Object undecorated = Fassq (Qundecorated, parms);
       if (CONSP (undecorated) && !NILP (XCDR (undecorated)))
 	f->undecorated = true;
 
-      /* Unused at present. */
+      /* Unused at present.  */
       Lisp_Object no_focus = Fassq (Qno_accept_focus, parms);
       if (CONSP (no_focus) && !NILP (XCDR (no_focus)))
 	f->no_accept_focus = true;
@@ -1579,10 +1579,10 @@ affects all frames on the same terminal device.  */)
 	f->no_split = true;
     }
 
-  /* Determine width and height of the frame. For root frames use the
-     width/height of the terminal. For child frames, take it from frame
-     parameters. Note that a default (80x25) has been set in
-     make_frame. We handle root frames in this way because otherwise we
+  /* Determine width and height of the frame.  For root frames use the
+     width/height of the terminal.  For child frames, take it from frame
+     parameters.  Note that a default (80x25) has been set in
+     make_frame.  We handle root frames in this way because otherwise we
      would end up needing glyph matrices for the terminal, which is both
      more work and has its downsides (think of clipping frames to the
      terminal size).  */
@@ -1742,7 +1742,7 @@ do_switch_frame (Lisp_Object frame, int track, int for_deletion, Lisp_Object nor
 
 	  tty->top_frame = frame;
 
-	  /* Why is it correct to set FrameCols/Rows? */
+	  /* FIXME: Why is it correct to set FrameCols/Rows?  */
 	  if (!FRAME_PARENT_FRAME (f))
 	    {
 	      /* If the new TTY frame changed dimensions, we need to
@@ -1796,32 +1796,32 @@ do_switch_frame (Lisp_Object frame, int track, int for_deletion, Lisp_Object nor
      with your typing being interpreted in the new frame instead of
      the one you're actually typing in.  */
 
-  /* FIXME/tty: I don't understand this. (The comment above is from
+  /* FIXME/tty: I don't understand this.  (The comment above is from
      Jim BLandy 1993 BTW, and the frame_ancestor_p from 2017.)
 
      Setting the last event frame to nil leads to switch-frame events
      being generated even if they normally wouldn't be because the frame
-     in question equals selected-frame. See the places in keyboard.c
+     in question equals selected-frame.  See the places in keyboard.c
      where make_lispy_switch_frame is called.
 
      This leads to problems at least on ttys.
 
      Imagine that we have functions in post-command-hook that use
-     select-frame in some way (e.g. with-selected-window). Let these
+     select-frame in some way (e.g., with-selected-window).  Let these
      functions select different frames during the execution of
-     post-command-hook in command_loop_1. Setting
+     post-command-hook in command_loop_1.  Setting
      internal_last_event_frame to nil here makes these select-frame
-     calls (potentially, and reality) generate switch-frame events. (But
-     only in one direction (frame_ancestor_p), which I also don't
+     calls (potentially and in reality) generate switch-frame events.
+     (But only in one direction (frame_ancestor_p), which I also don't
      understand).
 
      These switch-frame events form an endless loop in
-     command_loop_1. It runs post-command-hook, which generates
+     command_loop_1.  It runs post-command-hook, which generates
      switch-frame events, which command_loop_1 finds (bound to '#ignore)
-     and executes, which again runs post-command-hook etc. ad
+     and executes, which again runs post-command-hook etc., ad
      infinitum.
 
-     Let's not do that for now on ttys. */
+     Let's not do that for now on ttys.  */
   if (!is_tty_frame (f))
     if (!frame_ancestor_p (f, sf))
       internal_last_event_frame = Qnil;
@@ -3135,9 +3135,9 @@ displayed in the terminal.  */)
   if (FRAME_WINDOW_P (f) && FRAME_TERMINAL (f)->frame_visible_invisible_hook)
     FRAME_TERMINAL (f)->frame_visible_invisible_hook (f, false);
 
-  /* The Elisp info manual says that this "usually" makes child frames
-     invisible, too, but without saying when not. Since users can't rely
-     on this, it's not implemented. */
+  /* The ELisp manual says that this "usually" makes child frames
+     invisible, too, but without saying when not.  Since users can't
+     rely on this, it's not implemented.  */
   if (is_tty_frame (f))
     SET_FRAME_VISIBLE (f, false);
 
@@ -4503,10 +4503,11 @@ frame_float (struct frame *f, Lisp_Object val, enum frame_float_type what,
     }
 }
 
-/* Handle frame parameter change with frame parameter handler. F is the
-   frame whose frame parameter was changed.  PROP is the name of the
-   frame parameter.  VAL and OLD_VALUE are the current value and old
-   value of the frame parameter. */
+/* Handle frame parameter change with frame parameter handler.
+   F is the frame whose frame parameter was changed.
+   PROP is the name of the frame parameter.
+   VAL and OLD_VALUE are the current and the old value of the
+   frame parameter.  */
 
 static void
 handle_frame_param (struct frame *f, Lisp_Object prop, Lisp_Object val,
diff --git a/src/frame.h b/src/frame.h
index 9a9d025e638..bf0a4169f21 100644
--- a/src/frame.h
+++ b/src/frame.h
@@ -734,7 +734,7 @@ struct frame
   struct text_conversion_state conversion;
 # endif
 
-  /* Z-order of child frames. */
+  /* Z-order of child frames.  */
   int z_order;
 } GCALIGNED_STRUCT;
 
diff --git a/src/term.c b/src/term.c
index 330da251e18..6379b4ce4a1 100644
--- a/src/term.c
+++ b/src/term.c
@@ -786,10 +786,10 @@ tty_write_glyphs (struct frame *f, struct glyph *string, int len)
       /* Identify a run of glyphs with the same face.  */
       int face_id = string->face_id;
 
-      /* FIXME/tty: it happens that a single glyph's frame is NULL. It
+      /* FIXME/tty: it happens that a single glyph's frame is NULL.  It
 	 might depend on a tab bar line being present, then switching
 	 from a buffer without header line to one with header line and
-	 opening a child frame. */
+	 opening a child frame.  */
       struct frame *face_id_frame = string->frame ? string->frame : f;
 
       for (n = 1; n < stringlen; ++n)
diff --git a/src/xdisp.c b/src/xdisp.c
index 935c75a8230..bd3e8f3138d 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -17035,9 +17035,9 @@ redisplay_internal (void)
   if (face_change)
     windows_or_buffers_changed = 47;
 
-  /* Can we do better for tty child frames? It could be
+  /* FIXME: Can we do better for tty child frames?  It could be
      a bit faster when we switch between child frames of the same
-     root frame. OTOH, it's probably not a frequent use case. */
+     root frame.  OTOH, it's probably not a frequent use case.  */
   if ((FRAME_TERMCAP_P (sf) || FRAME_MSDOS_P (sf))
       && FRAME_TTY (sf)->previous_frame != sf)
     {
@@ -17463,7 +17463,7 @@ redisplay_internal (void)
 	      if (!FRAME_VISIBLE_P (root_frame (f)))
 		continue;
 
-	      /* Remember tty root frames seen. */
+	      /* Remember tty root frames which we've seen.  */
 	      if (!FRAME_PARENT_FRAME (f))
 		{
 		  Lisp_Object found;

commit 9accfc24bcd82087d936cf7ee37470f86cac8ea7
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Tue Oct 22 04:56:19 2024 -0400

    Fix compilation warnings
    
    * src/frame.c (tty_child_size_param):
    * src/frame.h (MOUSE_HL_INFO): Avoid NULL dereference warnings.

diff --git a/src/frame.c b/src/frame.c
index 2b90d9b524c..6b7f04aed80 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -1428,7 +1428,7 @@ tty_child_size_param (struct frame *child, Lisp_Object key,
       if (CONSP (val))
 	{
 	  /* Width and height may look like (width text-pixels
-	     . PIXELS) on window systems. Mimic that. */
+	     . PIXELS) on window systems.  Mimic that.  */
 	  val = XCDR (val);
 	  if (EQ (val, Qtext_pixels))
 	    val = XCDR (val);
@@ -1436,11 +1436,17 @@ tty_child_size_param (struct frame *child, Lisp_Object key,
       else if (FLOATP (val))
 	{
 	  /* Width and height may be a float, in which case
-	     it's a multiple of the parent's value. */
+	     it's a multiple of the parent's value.  */
 	  struct frame *parent = FRAME_PARENT_FRAME (child);
-	  int sz = (EQ (key, Qwidth) ? FRAME_TOTAL_COLS (parent)
-		    : FRAME_TOTAL_LINES (parent));
-	  val = make_fixnum (XFLOAT_DATA (val) * sz);
+	  eassert (parent);	/* the caller ensures this, but... */
+	  if (parent)
+	    {
+	      int sz = (EQ (key, Qwidth) ? FRAME_TOTAL_COLS (parent)
+			: FRAME_TOTAL_LINES (parent));
+	      val = make_fixnum (XFLOAT_DATA (val) * sz);
+	    }
+	  else
+	    val = Qnil;
 	}
 
       if (FIXNATP (val))
diff --git a/src/frame.h b/src/frame.h
index 0b7368fb29b..9a9d025e638 100644
--- a/src/frame.h
+++ b/src/frame.h
@@ -1018,9 +1018,7 @@ default_pixels_per_inch_y (void)
 #ifndef HAVE_ANDROID
 #   define MOUSE_HL_INFO(F)					\
   (FRAME_WINDOW_P (F)						\
-  ? (FRAME_OUTPUT_DATA (F)					\
-     ? &FRAME_DISPLAY_INFO (F)->mouse_highlight			\
-     : NULL)							\
+   ? &FRAME_DISPLAY_INFO (F)->mouse_highlight			\
    : &(F)->output_data.tty->display_info->mouse_highlight)
 #else
 /* There is no "struct tty_output" on Android at all.  */

commit 55af24a1c29724401d66ddd485cf6e4776fe5050
Author: Gerd Möllmann <gerd@gnu.org>
Date:   Mon Oct 21 18:50:26 2024 +0200

    Don't ignore .patch files
    
    This is VERY bad for magit users like me.

diff --git a/.gitignore b/.gitignore
index c1f31514d06..ccf3f256579 100644
--- a/.gitignore
+++ b/.gitignore
@@ -323,7 +323,6 @@ gnustmp*
 *~
 \#*\#
 ChangeLog
-[0-9]*.patch
 [0-9]*.txt
 /vc-dwim-log-*
 

commit fbe63a33f1a0a0df2700245c4cd44cc446ac986e
Author: Gerd Möllmann <gerd@gnu.org>
Date:   Mon Oct 21 15:42:03 2024 +0200

    Comment

diff --git a/src/frame.c b/src/frame.c
index 25c307b3c6a..2b90d9b524c 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -1790,8 +1790,8 @@ do_switch_frame (Lisp_Object frame, int track, int for_deletion, Lisp_Object nor
      with your typing being interpreted in the new frame instead of
      the one you're actually typing in.  */
 
-  /* FIXME/tty: I don't understand this. (The comment aove is from
-     Jim BLandy 1993 BTW.)
+  /* FIXME/tty: I don't understand this. (The comment above is from
+     Jim BLandy 1993 BTW, and the frame_ancestor_p from 2017.)
 
      Setting the last event frame to nil leads to switch-frame events
      being generated even if they normally wouldn't be because the frame

commit 4a3ba42e6f86fa85b457bdeba9e08ccb4219107d
Author: Gerd Möllmann <gerd@gnu.org>
Date:   Mon Oct 21 15:40:15 2024 +0200

    Comment

diff --git a/src/frame.c b/src/frame.c
index 1cdd923150d..25c307b3c6a 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -1563,14 +1563,11 @@ affects all frames on the same terminal device.  */)
       if (CONSP (undecorated) && !NILP (XCDR (undecorated)))
 	f->undecorated = true;
 
-      /* FIXME/tty: The only way to get borders on a tty is
-	 to allow decorations for now. */
+      /* Unused at present. */
       Lisp_Object no_focus = Fassq (Qno_accept_focus, parms);
       if (CONSP (no_focus) && !NILP (XCDR (no_focus)))
 	f->no_accept_focus = true;
 
-      /* FIXME/tty: The only way to get borders on a tty is
-	 to allow decorations for now. */
       Lisp_Object no_split = Fassq (Qunsplittable, parms);
       if (CONSP (no_split) && !NILP (XCDR (no_split)))
 	f->no_split = true;
@@ -1793,25 +1790,32 @@ do_switch_frame (Lisp_Object frame, int track, int for_deletion, Lisp_Object nor
      with your typing being interpreted in the new frame instead of
      the one you're actually typing in.  */
 
-  /* FIXME/tty: I don't understand this. Setting the last event
-     frame to nil leads to switch-frame events being generated even
-     if they normally wouldn't because the frame in question equals
-     selected-frame. This leads to problems at least on ttys.
-
-     Imagine that we have functions on post-command-hook that use
-     with-selected-window (which is the case with Vertico-Posframe),
-     Secondly, let these functions select/restore windows on different
-     frames, so there will be select-frame calls with different frames
-     during the execution of post-command-hook. Setting
-     internal_last_event_frame to nil makes these select-frame calls
-     potentially generate switch-frame events (but only in one direction
-     (frame_ancestor_p), which I also don't understand).
-
-     These switch-frame events form an endless loop in command_loop_1 by
-     running post-command-hook, which generates switch-frame events,
-     which command_loop_1 finds (bound to '#ignore) and executes, which
-     again runs post-command-hook etc. ad infinitum. */
+  /* FIXME/tty: I don't understand this. (The comment aove is from
+     Jim BLandy 1993 BTW.)
+
+     Setting the last event frame to nil leads to switch-frame events
+     being generated even if they normally wouldn't be because the frame
+     in question equals selected-frame. See the places in keyboard.c
+     where make_lispy_switch_frame is called.
+
+     This leads to problems at least on ttys.
+
+     Imagine that we have functions in post-command-hook that use
+     select-frame in some way (e.g. with-selected-window). Let these
+     functions select different frames during the execution of
+     post-command-hook in command_loop_1. Setting
+     internal_last_event_frame to nil here makes these select-frame
+     calls (potentially, and reality) generate switch-frame events. (But
+     only in one direction (frame_ancestor_p), which I also don't
+     understand).
+
+     These switch-frame events form an endless loop in
+     command_loop_1. It runs post-command-hook, which generates
+     switch-frame events, which command_loop_1 finds (bound to '#ignore)
+     and executes, which again runs post-command-hook etc. ad
+     infinitum.
 
+     Let's not do that for now on ttys. */
   if (!is_tty_frame (f))
     if (!frame_ancestor_p (f, sf))
       internal_last_event_frame = Qnil;

commit 0012e555d963b1df2d2c8be9f515ddf09417e110
Author: Gerd Möllmann <gerd@gnu.org>
Date:   Mon Oct 21 11:21:17 2024 +0200

    Don't set internal_last_event_frame to nil
    
    * src/frame.c (do_switch_frame): Do not set internal_last_event_frame to
    nil on ttys.

diff --git a/src/frame.c b/src/frame.c
index 69ffc53ebbf..1cdd923150d 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -1792,8 +1792,29 @@ do_switch_frame (Lisp_Object frame, int track, int for_deletion, Lisp_Object nor
      (select-window (frame-root-window (make-frame))) doesn't end up
      with your typing being interpreted in the new frame instead of
      the one you're actually typing in.  */
-  if (!frame_ancestor_p (f, sf))
-    internal_last_event_frame = Qnil;
+
+  /* FIXME/tty: I don't understand this. Setting the last event
+     frame to nil leads to switch-frame events being generated even
+     if they normally wouldn't because the frame in question equals
+     selected-frame. This leads to problems at least on ttys.
+
+     Imagine that we have functions on post-command-hook that use
+     with-selected-window (which is the case with Vertico-Posframe),
+     Secondly, let these functions select/restore windows on different
+     frames, so there will be select-frame calls with different frames
+     during the execution of post-command-hook. Setting
+     internal_last_event_frame to nil makes these select-frame calls
+     potentially generate switch-frame events (but only in one direction
+     (frame_ancestor_p), which I also don't understand).
+
+     These switch-frame events form an endless loop in command_loop_1 by
+     running post-command-hook, which generates switch-frame events,
+     which command_loop_1 finds (bound to '#ignore) and executes, which
+     again runs post-command-hook etc. ad infinitum. */
+
+  if (!is_tty_frame (f))
+    if (!frame_ancestor_p (f, sf))
+      internal_last_event_frame = Qnil;
 
   return frame;
 }

commit 6aa203bb04fa75e7562064e9261d7760c1b6562a
Author: Gerd Möllmann <gerd@gnu.org>
Date:   Fri Oct 18 16:21:46 2024 +0200

    Minor refactoring

diff --git a/src/frame.c b/src/frame.c
index 5f07f8e8976..69ffc53ebbf 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -1435,23 +1435,23 @@ tty_child_size_param (struct frame *child, Lisp_Object key,
 	}
       else if (FLOATP (val))
 	{
-	      /* Width and height may be a float, in which case
-		 it's a multiple of the parent's value. */
-	      struct frame *parent = FRAME_PARENT_FRAME (child);
-	      int sz = (EQ (key, Qwidth) ? FRAME_TOTAL_COLS (parent)
-			: FRAME_TOTAL_LINES (parent));
-	      val = make_fixnum (XFLOAT_DATA (val) * sz);
+	  /* Width and height may be a float, in which case
+	     it's a multiple of the parent's value. */
+	  struct frame *parent = FRAME_PARENT_FRAME (child);
+	  int sz = (EQ (key, Qwidth) ? FRAME_TOTAL_COLS (parent)
+		    : FRAME_TOTAL_LINES (parent));
+	  val = make_fixnum (XFLOAT_DATA (val) * sz);
 	}
 
-      if (FIXNUMP (val) && XFIXNUM (val) >= 0)
+      if (FIXNATP (val))
 	return XFIXNUM (val);
     }
   return dflt;
 }
 
 static void
-child_frame_rect (struct frame *f, Lisp_Object params,
-		  int *x, int *y, int *w, int *h)
+tty_child_frame_rect (struct frame *f, Lisp_Object params,
+		      int *x, int *y, int *w, int *h)
 {
   *x = tty_child_pos_param (f, Qleft, params, 0);
   *y = tty_child_pos_param (f, Qtop, params, 0);
@@ -1585,7 +1585,7 @@ affects all frames on the same terminal device.  */)
      terminal size).  */
   int x = 0, y = 0, width, height;
   if (FRAME_PARENT_FRAME (f))
-    child_frame_rect (f, parms, &x, &y, &width, &height);
+    tty_child_frame_rect (f, parms, &x, &y, &width, &height);
   else
     get_tty_size (fileno (FRAME_TTY (f)->input), &width, &height);
   adjust_frame_size (f, width, height - FRAME_TOP_MARGIN (f), 5, 0,

commit 23409041b135d7b89dcb010a7f22ce9c817d8c76
Author: Gerd Möllmann <gerd@gnu.org>
Date:   Fri Oct 18 15:25:10 2024 +0200

    Accept frame param width/height of 0
    
    * src/frame.c (tty_child_size_param): Accept values of 0.

diff --git a/src/frame.c b/src/frame.c
index 4724ff1ae67..5f07f8e8976 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -1443,7 +1443,7 @@ tty_child_size_param (struct frame *child, Lisp_Object key,
 	      val = make_fixnum (XFLOAT_DATA (val) * sz);
 	}
 
-      if (FIXNUMP (val) && XFIXNUM (val) > 0)
+      if (FIXNUMP (val) && XFIXNUM (val) >= 0)
 	return XFIXNUM (val);
     }
   return dflt;

commit e0ca1256a5747470f3867b231524cc93b87ca2f2
Author: Gerd Möllmann <gerd@gnu.org>
Date:   Fri Oct 18 14:59:36 2024 +0200

    Don't check for child frame support
    
    * lisp/paren.el (show-paren-function): Don't check with
    display-graphics-p or featurep.

diff --git a/lisp/paren.el b/lisp/paren.el
index 6e1111779fa..7661e8efbf1 100644
--- a/lisp/paren.el
+++ b/lisp/paren.el
@@ -522,10 +522,7 @@ It is the default value of `show-paren-data-function'."
                               openparen))
                     (message-log-max nil))
                 (cond
-                 ((and
-                   (eq show-paren-context-when-offscreen 'child-frame)
-                   (or (display-graphic-p)
-                       (featurep 'tty-child-frames)))
+                 ((eq show-paren-context-when-offscreen 'child-frame)
                   (show-paren--show-context-in-child-frame context))
                  ((eq show-paren-context-when-offscreen 'overlay)
                   (show-paren--show-context-in-overlay context))

commit 55b72ad87554e3de518366754da64dad239a04bf
Author: Gerd Möllmann <gerd@gnu.org>
Date:   Fri Oct 18 14:58:48 2024 +0200

    Set top terminal frame also to children
    
    * src/frame.c (make_terminal_frame): Don't check for being root when
    setting top_frame.

diff --git a/src/frame.c b/src/frame.c
index 8133b646216..4724ff1ae67 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -1373,8 +1373,7 @@ make_terminal_frame (struct terminal *terminal, Lisp_Object parent,
     }
 
   /* Set the top frame to the newly created frame.  */
-  if (!FRAME_PARENT_FRAME (f))
-    FRAME_TTY (f)->top_frame = frame;
+  FRAME_TTY (f)->top_frame = frame;
   return f;
 }
 

commit 5445062fabc765b316ecedc26bbb395c75d44405
Author: Gerd Möllmann <gerd@gnu.org>
Date:   Thu Oct 17 20:02:57 2024 +0200

    Check for tty-child-frames feature in show-paren
    
    * lisp/paren.el (show-paren-function): Don't rely on display-graphic-p,
    also check tty-child-frames feature.

diff --git a/lisp/paren.el b/lisp/paren.el
index cb29b8311a5..6e1111779fa 100644
--- a/lisp/paren.el
+++ b/lisp/paren.el
@@ -524,7 +524,8 @@ It is the default value of `show-paren-data-function'."
                 (cond
                  ((and
                    (eq show-paren-context-when-offscreen 'child-frame)
-                   (display-graphic-p))
+                   (or (display-graphic-p)
+                       (featurep 'tty-child-frames)))
                   (show-paren--show-context-in-child-frame context))
                  ((eq show-paren-context-when-offscreen 'overlay)
                   (show-paren--show-context-in-overlay context))

commit 414de92a562e8912ffdc8ed2995e7ea10d05f13b
Author: Gerd Möllmann <gerd@gnu.org>
Date:   Mon Oct 21 18:32:04 2024 +0200

    Initial child frames based on master
    
    This is based on a diff from 2024-10-15 which still applied.
    Since then, I've inadvertantly modified the igc branch so that
    it is no longer possible to get a clean diff of what has changed
    since I created the branch.

diff --git a/lisp/disp-table.el b/lisp/disp-table.el
index 50428d911a3..b4b60f751f4 100644
--- a/lisp/disp-table.el
+++ b/lisp/disp-table.el
@@ -28,7 +28,7 @@
 
 ;;; Code:
 
-(put 'display-table 'char-table-extra-slots 6)
+(put 'display-table 'char-table-extra-slots 12)
 
 ;;;###autoload
 (defun make-display-table ()
@@ -46,13 +46,21 @@
 (put 'control 'display-table-slot 3)
 (put 'selective-display 'display-table-slot 4)
 (put 'vertical-border 'display-table-slot 5)
+(put 'box-vertical 'display-table-slot 6)
+(put 'box-horizontal 'display-table-slot 7)
+(put 'box-down-right 'display-table-slot 8)
+(put 'box-down-left 'display-table-slot 9)
+(put 'box-up-right 'display-table-slot 10)
+(put 'box-up-left 'display-table-slot 11)
 
 ;;;###autoload
 (defun display-table-slot (display-table slot)
   "Return the value of the extra slot in DISPLAY-TABLE named SLOT.
-SLOT may be a number from 0 to 5 inclusive, or a slot name (symbol).
+SLOT may be a number from 0 to 11 inclusive, or a slot name (symbol).
 Valid symbols are `truncation', `wrap', `escape', `control',
-`selective-display', and `vertical-border'."
+`selective-display', `vertical-border', `box-vertical',
+`box-horizontal', `box-down-right', `box-down-left', `box-up-right',
+and `box-up-left'."
   (let ((slot-number
 	 (if (numberp slot) slot
 	   (or (get slot 'display-table-slot)
@@ -62,9 +70,11 @@ Valid symbols are `truncation', `wrap', `escape', `control',
 ;;;###autoload
 (defun set-display-table-slot (display-table slot value)
   "Set the value of the extra slot in DISPLAY-TABLE named SLOT to VALUE.
-SLOT may be a number from 0 to 5 inclusive, or a name (symbol).
+SLOT may be a number from 0 to 11 inclusive, or a name (symbol).
 Valid symbols are `truncation', `wrap', `escape', `control',
-`selective-display', and `vertical-border'."
+`selective-display',  `vertical-border', `box-vertical',
+`box-horizontal', `box-down-right', `box-down-left', `box-up-right',
+and `box-up-left'."
   (let ((slot-number
 	 (if (numberp slot) slot
 	   (or (get slot 'display-table-slot)
@@ -87,6 +97,18 @@ Valid symbols are `truncation', `wrap', `escape', `control',
     (prin1 (display-table-slot dt 'selective-display))
     (princ "\nVertical window border glyph: ")
     (prin1 (display-table-slot dt 'vertical-border))
+    (princ "\nBox vertical line glyph: ")
+    (prin1 (display-table-slot dt 'box-vertical))
+    (princ "\nBox horizonal line glyph: ")
+    (prin1 (display-table-slot dt 'box-horizontal))
+    (princ "\nBox upper left corner glyph: ")
+    (prin1 (display-table-slot dt 'box-down-right))
+    (princ "\nBox upper right corner glyph: ")
+    (prin1 (display-table-slot dt 'box-down-left))
+    (princ "\nBox lower left corner glyph: ")
+    (prin1 (display-table-slot dt 'box-up-right))
+    (princ "\nBox lower right corner glyph: ")
+    (prin1 (display-table-slot dt 'box-up-left))
     (princ "\nCharacter display glyph sequences:\n")
     (with-current-buffer standard-output
       (let ((vector (make-vector 256 nil))
@@ -126,6 +148,28 @@ Valid symbols are `truncation', `wrap', `escape', `control',
 	(describe-display-table disptab)
       (message "No display table"))))
 
+;;;###autoload
+(defun standard-display-unicode-special-glyphs ()
+  "Display some glyps using Unicode characters.
+The glyphs being changed by this function are `vertical-border',
+`box-vertical', `box-horizontal', `box-down-right', `box-down-left',
+`box-up-right', and `box-up-left'."
+  (interactive)
+  (set-display-table-slot standard-display-table
+			  'vertical-border (make-glyph-code #x2502))
+  (set-display-table-slot standard-display-table
+			  'box-vertical (make-glyph-code #x2502))
+  (set-display-table-slot standard-display-table
+			  'box-horizontal (make-glyph-code #x2500))
+  (set-display-table-slot standard-display-table
+			  'box-down-right (make-glyph-code #x250c))
+  (set-display-table-slot standard-display-table
+			  'box-down-left (make-glyph-code #x2510))
+  (set-display-table-slot standard-display-table
+			  'box-up-right (make-glyph-code #x2514))
+  (set-display-table-slot standard-display-table
+			  'box-up-left (make-glyph-code #x2518)))
+
 ;;;###autoload
 (defun standard-display-8bit (l h)
   "Display characters representing raw bytes in the range L to H literally.
diff --git a/lisp/frame.el b/lisp/frame.el
index 1b5aa8cff08..14a78ea4833 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -1495,6 +1495,13 @@ FRAME defaults to the selected frame."
   (let ((edges (frame-edges frame 'outer-edges)))
     (- (nth 3 edges) (nth 1 edges))))
 
+(defun frame-at (x y)
+  "Return frame containing pixel position X, Y."
+  (cl-loop for frame in (frame-list-z-order)
+           as (x0 y0 x1 y1) = (frame-edges frame)
+           when (and (<= x0 x (1- x1)) (<= y0 y (1- y1)))
+           return frame))
+
 (declare-function x-list-fonts "xfaces.c"
                   (pattern &optional face frame maximum width))
 
@@ -1722,6 +1729,7 @@ live frame and defaults to the selected one."
 (declare-function pgtk-frame-geometry "pgtkfns.c" (&optional frame))
 (declare-function haiku-frame-geometry "haikufns.c" (&optional frame))
 (declare-function android-frame-geometry "androidfns.c" (&optional frame))
+(declare-function tty-frame-geometry "term.c" (&optional frame))
 
 (defun frame-geometry (&optional frame)
   "Return geometric attributes of FRAME.
@@ -1778,24 +1786,7 @@ and width values are in pixels.
      ((eq frame-type 'android)
       (android-frame-geometry frame))
      (t
-      (list
-       '(outer-position 0 . 0)
-       (cons 'outer-size (cons (frame-width frame) (frame-height frame)))
-       '(external-border-size 0 . 0)
-       '(outer-border-width . 0)
-       '(title-bar-size 0 . 0)
-       '(menu-bar-external . nil)
-       (let ((menu-bar-lines (frame-parameter frame 'menu-bar-lines)))
-	 (cons 'menu-bar-size
-	       (if menu-bar-lines
-		   (cons (frame-width frame) 1)
-		 1 0)))
-       '(tool-bar-external . nil)
-       '(tool-bar-position . nil)
-       '(tool-bar-size 0 . 0)
-       '(tab-bar-size 0 . 0)
-       (cons 'internal-border-width
-	     (frame-parameter frame 'internal-border-width)))))))
+      (tty-frame-geometry frame)))))
 
 (defun frame--size-history (&optional frame)
   "Print history of resize operations for FRAME.
@@ -1904,6 +1895,7 @@ of frames like calls to map a frame or change its visibility."
 (declare-function pgtk-frame-edges "pgtkfns.c" (&optional frame type))
 (declare-function haiku-frame-edges "haikufns.c" (&optional frame type))
 (declare-function android-frame-edges "androidfns.c" (&optional frame type))
+(declare-function tty-frame-edges "term.c" (&optional frame type))
 
 (defun frame-edges (&optional frame type)
   "Return coordinates of FRAME's edges.
@@ -1934,7 +1926,7 @@ FRAME."
      ((eq frame-type 'android)
       (android-frame-edges frame type))
      (t
-      (list 0 0 (frame-width frame) (frame-height frame))))))
+      (tty-frame-edges frame type)))))
 
 (declare-function w32-mouse-absolute-pixel-position "w32fns.c")
 (declare-function x-mouse-absolute-pixel-position "xfns.c")
@@ -2087,6 +2079,7 @@ workarea attribute."
 ;; (declare-function pgtk-frame-list-z-order "pgtkfns.c" (&optional display))
 (declare-function haiku-frame-list-z-order "haikufns.c" (&optional display))
 (declare-function android-frame-list-z-order "androidfns.c" (&optional display))
+(declare-function tty-frame-list-z-order "term.c" (&optional display))
 
 (defun frame-list-z-order (&optional display)
   "Return list of Emacs's frames, in Z (stacking) order.
@@ -2114,7 +2107,9 @@ Return nil if DISPLAY contains no Emacs frame."
      ((eq frame-type 'haiku)
       (haiku-frame-list-z-order display))
      ((eq frame-type 'android)
-      (android-frame-list-z-order display)))))
+      (android-frame-list-z-order display))
+     (t
+      (tty-frame-list-z-order display)))))
 
 (declare-function x-frame-restack "xfns.c" (frame1 frame2 &optional above))
 (declare-function w32-frame-restack "w32fns.c" (frame1 frame2 &optional above))
@@ -2123,6 +2118,7 @@ Return nil if DISPLAY contains no Emacs frame."
 (declare-function haiku-frame-restack "haikufns.c" (frame1 frame2 &optional above))
 (declare-function android-frame-restack "androidfns.c" (frame1 frame2
                                                                &optional above))
+(declare-function tty-frame-restack "term.c" (frame1 frame2 &optional above))
 
 (defun frame-restack (frame1 frame2 &optional above)
   "Restack FRAME1 below FRAME2.
@@ -2158,7 +2154,9 @@ Some window managers may refuse to restack windows."
          ((eq frame-type 'pgtk)
           (pgtk-frame-restack frame1 frame2 above))
          ((eq frame-type 'android)
-          (android-frame-restack frame1 frame2 above))))
+          (android-frame-restack frame1 frame2 above))
+         (t
+          (tty-frame-restack frame1 frame2 above))))
     (error "Cannot restack frames")))
 
 (defun frame-size-changed-p (&optional frame)
@@ -2311,6 +2309,7 @@ If DISPLAY is omitted or nil, it defaults to the selected frame's display."
       1))))
 
 (declare-function x-display-pixel-height "xfns.c" (&optional terminal))
+(declare-function tty-display-pixel-height "term.c" (&optional terminal))
 
 (defun display-pixel-height (&optional display)
   "Return the height of DISPLAY's screen in pixels.
@@ -2328,9 +2327,10 @@ with DISPLAY.  To get information for each physical monitor, use
      ((memq frame-type '(x w32 ns haiku pgtk android))
       (x-display-pixel-height display))
      (t
-      (frame-height (if (framep display) display (selected-frame)))))))
+      (tty-display-pixel-height display)))))
 
 (declare-function x-display-pixel-width "xfns.c" (&optional terminal))
+(declare-function tty-display-pixel-width "term.c" (&optional terminal))
 
 (defun display-pixel-width (&optional display)
   "Return the width of DISPLAY's screen in pixels.
@@ -2348,7 +2348,7 @@ with DISPLAY.  To get information for each physical monitor, use
      ((memq frame-type '(x w32 ns haiku pgtk android))
       (x-display-pixel-width display))
      (t
-      (frame-width (if (framep display) display (selected-frame)))))))
+      (tty-display-pixel-width display)))))
 
 (defcustom display-mm-dimensions-alist nil
   "Alist for specifying screen dimensions in millimeters.
diff --git a/lisp/xt-mouse.el b/lisp/xt-mouse.el
index 8cbb44ece14..131c99d790d 100644
--- a/lisp/xt-mouse.el
+++ b/lisp/xt-mouse.el
@@ -133,7 +133,8 @@ https://invisible-island.net/xterm/ctlseqs/ctlseqs.html)."
 
 (defun xterm-mouse--handle-mouse-movement ()
   "Handle mouse motion that was just generated for XTerm mouse."
-  (display--update-for-mouse-movement (terminal-parameter nil 'xterm-mouse-x)
+  (display--update-for-mouse-movement (terminal-parameter nil 'xterm-mouse-frame)
+                                      (terminal-parameter nil 'xterm-mouse-x)
                                       (terminal-parameter nil 'xterm-mouse-y)))
 
 ;; These two variables have been converted to terminal parameters.
@@ -293,7 +294,16 @@ which is the \"1006\" extension implemented in Xterm >= 277."
 			    (progn (setq xt-mouse-epoch (float-time)) 0)
 			  (car (time-convert (time-since xt-mouse-epoch)
 					     1000))))
-             (w (window-at x y))
+             (frame (frame-at x y))
+             ;;(_ (message (format "*** %S" frame)))
+             (frame-pos (frame-position frame))
+             ;;(_ (message (format "*** %S" frame-pos)))
+             (x (- x (car frame-pos)))
+             (y (- y (cdr frame-pos)))
+             ;;(_ (message (format "*** %S %S" x y)))
+             (w (window-at x y frame))
+             ;;(_ (message (format "*** %S" w)))
+
              (ltrb (window-edges w))
              (left (nth 0 ltrb))
              (top (nth 1 ltrb))
@@ -345,6 +355,7 @@ which is the \"1006\" extension implemented in Xterm >= 277."
 
         (set-terminal-parameter nil 'xterm-mouse-x x)
         (set-terminal-parameter nil 'xterm-mouse-y y)
+        (set-terminal-parameter nil 'xterm-mouse-frame frame)
         (setq last-input-event event)))))
 
 ;;;###autoload
diff --git a/src/alloc.c b/src/alloc.c
index 4fab0d54248..bbabd8c95e8 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -6853,9 +6853,11 @@ mark_glyph_matrix (struct glyph_matrix *matrix)
 	    struct glyph *end_glyph = glyph + row->used[area];
 
 	    for (; glyph < end_glyph; ++glyph)
-	      if (STRINGP (glyph->object)
-		  && !string_marked_p (XSTRING (glyph->object)))
-		mark_object (glyph->object);
+	      {
+		if (STRINGP (glyph->object)
+		    && !string_marked_p (XSTRING (glyph->object)))
+		  mark_object (glyph->object);
+	      }
 	  }
       }
 }
diff --git a/src/chartab.c b/src/chartab.c
index 58bb1658504..76a40ca7cc4 100644
--- a/src/chartab.c
+++ b/src/chartab.c
@@ -122,8 +122,6 @@ the char-table has no extra slot.  */)
   else
     {
       CHECK_FIXNAT (n);
-      if (XFIXNUM (n) > 10)
-	args_out_of_range (n, Qnil);
       n_extras = XFIXNUM (n);
     }
 
diff --git a/src/dispextern.h b/src/dispextern.h
index cc248a4472e..468aee8d1ba 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -482,6 +482,11 @@ struct glyph
      continuation glyphs, or the overlay-arrow glyphs on TTYs.  */
   Lisp_Object object;
 
+  /* Frame on which the glyph was produced. The face_id of this glyph
+     refers to the face_cache of this frame. This is used on tty frames
+     only. */
+  struct frame *frame;
+
   /* Width in pixels.  */
   short pixel_width;
 
@@ -626,10 +631,12 @@ struct glyph
 
 #define FONT_TYPE_UNKNOWN	0
 
-/* Is GLYPH a space?  */
+/* Is GLYPH a space in default face on frame FRAME?  */
 
-#define CHAR_GLYPH_SPACE_P(GLYPH) \
-  ((GLYPH).u.ch == SPACEGLYPH && (GLYPH).face_id == DEFAULT_FACE_ID)
+# define CHAR_GLYPH_SPACE_P(FRAME, GLYPH)	\
+  ((GLYPH).u.ch == SPACEGLYPH			\
+   && (GLYPH).face_id == DEFAULT_FACE_ID	\
+   && (GLYPH).frame == (FRAME))
 
 /* Are glyph slices of glyphs *X and *Y equal?  It assumes that both
    glyphs have the same type.
@@ -654,6 +661,7 @@ struct glyph
       && (X)->u.val == (Y)->u.val				\
       && GLYPH_SLICE_EQUAL_P (X, Y)				\
       && (X)->face_id == (Y)->face_id				\
+      && (X)->frame == (Y)->frame				\
       && (X)->padding_p == (Y)->padding_p			\
       && (X)->left_box_line_p == (Y)->left_box_line_p		\
       && (X)->right_box_line_p == (Y)->right_box_line_p		\
@@ -665,16 +673,18 @@ struct glyph
 #define GLYPH_CHAR_AND_FACE_EQUAL_P(X, Y)	\
   ((X)->u.ch == (Y)->u.ch			\
    && (X)->face_id == (Y)->face_id		\
+   && (X)->frame == (Y)->frame			\
    && (X)->padding_p == (Y)->padding_p)
 
 /* Fill a character glyph GLYPH.  CODE, FACE_ID, PADDING_P correspond
    to the bits defined for the typedef `GLYPH' in lisp.h.  */
 
-#define SET_CHAR_GLYPH(GLYPH, CODE, FACE_ID, PADDING_P)	\
+#define SET_CHAR_GLYPH(FRAME, GLYPH, CODE, FACE_ID, PADDING_P)	\
      do							\
        {						\
          (GLYPH).u.ch = (CODE);				\
          (GLYPH).face_id = (FACE_ID);			\
+         (GLYPH).frame = (FRAME);			\
          (GLYPH).padding_p = (PADDING_P);		\
        }						\
      while (false)
@@ -682,11 +692,9 @@ struct glyph
 /* Fill a character type glyph GLYPH from a glyph typedef FROM as
    defined in lisp.h.  */
 
-#define SET_CHAR_GLYPH_FROM_GLYPH(GLYPH, FROM)			\
-     SET_CHAR_GLYPH (GLYPH,					\
-		     GLYPH_CHAR (FROM),				\
-		     GLYPH_FACE (FROM),				\
-		     false)
+#define SET_CHAR_GLYPH_FROM_GLYPH(FRAME, GLYPH, FROM)		\
+  SET_CHAR_GLYPH (FRAME, GLYPH, GLYPH_CHAR (FROM),		\
+		  GLYPH_FACE (FROM), false)
 
 /* Construct a glyph code from a character glyph GLYPH.  If the
    character is multibyte, return -1 as we can't use glyph table for a
@@ -3805,7 +3813,7 @@ extern void adjust_frame_glyphs (struct frame *);
 void free_glyphs (struct frame *);
 void free_window_matrices (struct window *);
 void check_glyph_memory (void);
-void mirrored_line_dance (struct glyph_matrix *, int, int, int *, char *);
+void mirrored_line_dance (struct frame *f, int, int, int *, char *);
 void clear_glyph_matrix (struct glyph_matrix *);
 void clear_current_matrices (struct frame *f);
 void clear_desired_matrices (struct frame *);
@@ -3829,7 +3837,7 @@ extern bool frame_size_change_delayed (struct frame *);
 void init_display (void);
 void syms_of_display (void);
 extern void spec_glyph_lookup_face (struct window *, GLYPH *);
-extern void fill_up_frame_row_with_spaces (struct glyph_row *, int);
+extern void fill_up_frame_row_with_spaces (struct frame *, struct glyph_row *, int);
 
 /* Defined in terminal.c.  */
 
@@ -3911,6 +3919,16 @@ extern void gui_redo_mouse_highlight (Display_Info *);
 
 #endif /* HAVE_WINDOW_SYSTEM */
 
+struct frame *root_frame (struct frame *f);
+Lisp_Object frames_in_reverse_z_order (struct frame *f, bool visible);
+bool is_tty_frame (struct frame *f);
+bool is_tty_child_frame (struct frame *f);
+bool is_tty_root_frame (struct frame *f);
+bool combine_updates (Lisp_Object root_frames, bool force_p, bool inhibit_id_p);
+bool combine_updates_for_frame (struct frame *f, bool force_p, bool inhibit_id_p);
+void tty_raise_lower_frame (struct frame *f, bool raise);
+int max_child_z_order (struct frame *parent);
+
 INLINE_HEADER_END
 
 #endif /* not DISPEXTERN_H_INCLUDED */
diff --git a/src/dispnew.c b/src/dispnew.c
index 1a243079e46..26181c36399 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -42,6 +42,8 @@ along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 #include "tparam.h"
 #include "xwidget.h"
 #include "pdumper.h"
+#include "disptab.h"
+#include "cm.h"
 
 #ifdef HAVE_ANDROID
 #include "android.h"
@@ -71,7 +73,7 @@ struct dim
 
 /* Function prototypes.  */
 
-static void update_frame_line (struct frame *, int, bool);
+static void write_row (struct frame *f, int vpos, bool updating_menu_p);
 static int required_matrix_height (struct window *);
 static int required_matrix_width (struct window *);
 static void increment_row_positions (struct glyph_row *, ptrdiff_t, ptrdiff_t);
@@ -80,9 +82,9 @@ static void build_frame_matrix_from_window_tree (struct glyph_matrix *,
 static void build_frame_matrix_from_leaf_window (struct glyph_matrix *,
                                                  struct window *);
 static void adjust_decode_mode_spec_buffer (struct frame *);
-static void fill_up_glyph_row_with_spaces (struct glyph_row *);
+static void fill_up_glyph_row_with_spaces (struct frame *, struct glyph_row *);
 static void clear_window_matrices (struct window *, bool);
-static void fill_up_glyph_row_area_with_spaces (struct glyph_row *, int);
+static void fill_up_glyph_row_area_with_spaces (struct frame *, struct glyph_row *, int);
 static int scrolling_window (struct window *, int);
 static bool update_window_line (struct window *, int, bool *);
 static void mirror_make_current (struct window *, int);
@@ -93,7 +95,7 @@ static void check_matrix_pointers (struct glyph_matrix *,
 static void mirror_line_dance (struct window *, int, int, int *, char *);
 static bool update_window_tree (struct window *, bool);
 static bool update_window (struct window *, bool);
-static bool update_frame_1 (struct frame *, bool, bool, bool, bool);
+static bool write_matrix (struct frame *, bool, bool, bool, bool);
 static bool scrolling (struct frame *);
 static void set_window_cursor_after_update (struct window *);
 static void adjust_frame_glyphs_for_window_redisplay (struct frame *);
@@ -122,11 +124,6 @@ static int glyph_pool_count;
 
 #endif /* GLYPH_DEBUG and ENABLE_CHECKING */
 
-/* If non-null, the frame whose frame matrices are manipulated.  If
-   null, window matrices are worked on.  */
-
-static struct frame *frame_matrix_frame;
-
 /* Convert vpos and hpos from frame to window and vice versa.
    This may only be used for terminal frames.  */
 
@@ -1179,6 +1176,11 @@ line_hash_code (struct frame *f, struct glyph_row *row)
 	{
 	  int c = glyph->u.ch;
 	  int face_id = glyph->face_id;
+	  /* Struct frame can move with igc, and so on.  But we need
+	     something that takes different frames into account. Use the
+	     face_cache pointer for that which is malloc'd. */
+	  if (glyph->frame && glyph->frame != f)
+	    face_id += (ptrdiff_t) glyph->frame->face_cache;
 	  if (FRAME_MUST_WRITE_SPACES (f))
 	    c -= SPACEGLYPH;
 	  hash = (((hash << 4) + (hash >> 24)) & 0x0fffffff) + c;
@@ -1213,7 +1215,7 @@ line_draw_cost (struct frame *f, struct glyph_matrix *matrix, int vpos)
   if (!FRAME_MUST_WRITE_SPACES (f))
     {
       /* Skip from the end over trailing spaces.  */
-      while (end > beg && CHAR_GLYPH_SPACE_P (*(end - 1)))
+      while (end > beg && CHAR_GLYPH_SPACE_P (f, *(end - 1)))
 	--end;
 
       /* All blank line.  */
@@ -1221,7 +1223,7 @@ line_draw_cost (struct frame *f, struct glyph_matrix *matrix, int vpos)
 	return 0;
 
       /* Skip over leading spaces.  */
-      while (CHAR_GLYPH_SPACE_P (*beg))
+      while (CHAR_GLYPH_SPACE_P (f, *beg))
 	++beg;
     }
 
@@ -2558,6 +2560,7 @@ build_frame_matrix_from_leaf_window (struct glyph_matrix *frame_matrix, struct w
   int window_y, frame_y;
   /* If non-zero, a glyph to insert at the right border of W.  */
   GLYPH right_border_glyph;
+  struct frame *f = XFRAME (w->frame);
 
   SET_GLYPH_FROM_CHAR (right_border_glyph, 0);
 
@@ -2599,10 +2602,10 @@ build_frame_matrix_from_leaf_window (struct glyph_matrix *frame_matrix, struct w
 
       /* Fill up the frame row with spaces up to the left margin of the
 	 window row.  */
-      fill_up_frame_row_with_spaces (frame_row, window_matrix->matrix_x);
+      fill_up_frame_row_with_spaces (f, frame_row, window_matrix->matrix_x);
 
       /* Fill up areas in the window matrix row with spaces.  */
-      fill_up_glyph_row_with_spaces (window_row);
+      fill_up_glyph_row_with_spaces (f, window_row);
 
       /* If only part of W's desired matrix has been built, and
          window_row wasn't displayed, use the corresponding current
@@ -2638,7 +2641,7 @@ build_frame_matrix_from_leaf_window (struct glyph_matrix *frame_matrix, struct w
 		 glyph with the vertical border glyph.  */
 	      eassert (border->type == CHAR_GLYPH);
 	      border->type = CHAR_GLYPH;
-	      SET_CHAR_GLYPH_FROM_GLYPH (*border, right_border_glyph);
+	      SET_CHAR_GLYPH_FROM_GLYPH (f, *border, right_border_glyph);
 	    }
 
 #ifdef GLYPH_DEBUG
@@ -2701,11 +2704,11 @@ spec_glyph_lookup_face (struct window *w, GLYPH *glyph)
    To be called for frame-based redisplay, only.  */
 
 static void
-fill_up_glyph_row_with_spaces (struct glyph_row *row)
+fill_up_glyph_row_with_spaces (struct frame *f, struct glyph_row *row)
 {
-  fill_up_glyph_row_area_with_spaces (row, LEFT_MARGIN_AREA);
-  fill_up_glyph_row_area_with_spaces (row, TEXT_AREA);
-  fill_up_glyph_row_area_with_spaces (row, RIGHT_MARGIN_AREA);
+  fill_up_glyph_row_area_with_spaces (f, row, LEFT_MARGIN_AREA);
+  fill_up_glyph_row_area_with_spaces (f, row, TEXT_AREA);
+  fill_up_glyph_row_area_with_spaces (f, row, RIGHT_MARGIN_AREA);
 }
 
 
@@ -2713,15 +2716,19 @@ fill_up_glyph_row_with_spaces (struct glyph_row *row)
    frame-based redisplay only.  */
 
 static void
-fill_up_glyph_row_area_with_spaces (struct glyph_row *row, int area)
+fill_up_glyph_row_area_with_spaces (struct frame *f, struct glyph_row *row,
+				    int area)
 {
   if (row->glyphs[area] < row->glyphs[area + 1])
     {
       struct glyph *end = row->glyphs[area + 1];
       struct glyph *text = row->glyphs[area] + row->used[area];
 
-      while (text < end)
-	*text++ = space_glyph;
+      for (; text < end; ++text)
+	{
+	  *text = space_glyph;
+	  text->frame = f;
+	}
       row->used[area] = text - row->glyphs[area];
     }
 }
@@ -2731,13 +2738,16 @@ fill_up_glyph_row_area_with_spaces (struct glyph_row *row, int area)
    reached.  In frame matrices only one area, TEXT_AREA, is used.  */
 
 void
-fill_up_frame_row_with_spaces (struct glyph_row *row, int upto)
+fill_up_frame_row_with_spaces (struct frame *f, struct glyph_row *row, int upto)
 {
   int i = row->used[TEXT_AREA];
   struct glyph *glyph = row->glyphs[TEXT_AREA];
 
-  while (i < upto)
-    glyph[i++] = space_glyph;
+  for (; i < upto; ++i)
+    {
+      glyph[i] = space_glyph;
+      glyph[i].frame = f;
+    }
 
   row->used[TEXT_AREA] = i;
 }
@@ -2748,17 +2758,6 @@ fill_up_frame_row_with_spaces (struct glyph_row *row, int upto)
       Mirroring operations on frame matrices in window matrices
  **********************************************************************/
 
-/* Set frame being updated via frame-based redisplay to F.  This
-   function must be called before updates to make explicit that we are
-   working on frame matrices or not.  */
-
-static void
-set_frame_matrix_frame (struct frame *f)
-{
-  frame_matrix_frame = f;
-}
-
-
 /* Make sure glyph row ROW in CURRENT_MATRIX is up to date.
    DESIRED_MATRIX is the desired matrix corresponding to
    CURRENT_MATRIX.  The update is done by exchanging glyph pointers
@@ -2768,9 +2767,10 @@ set_frame_matrix_frame (struct frame *f)
    operations in window matrices of frame_matrix_frame.  */
 
 static void
-make_current (struct glyph_matrix *desired_matrix,
-	      struct glyph_matrix *current_matrix, int row)
+make_current (struct frame *f, struct window *w, int row)
 {
+  struct glyph_matrix *desired_matrix = f ? f->desired_matrix : w->desired_matrix;
+  struct glyph_matrix *current_matrix = f ? f->current_matrix : w->current_matrix;
   struct glyph_row *current_row = MATRIX_ROW (current_matrix, row);
   struct glyph_row *desired_row = MATRIX_ROW (desired_matrix, row);
   bool mouse_face_p = current_row->mouse_face_p;
@@ -2797,8 +2797,8 @@ make_current (struct glyph_matrix *desired_matrix,
 
   /* If we are called on frame matrices, perform analogous operations
      for window matrices.  */
-  if (frame_matrix_frame)
-    mirror_make_current (XWINDOW (frame_matrix_frame->root_window), row);
+  if (f)
+    mirror_make_current (XWINDOW (f->root_window), row);
 }
 
 
@@ -2862,9 +2862,11 @@ mirror_make_current (struct window *w, int frame_row)
    This function is called from do_scrolling and do_direct_scrolling.  */
 
 void
-mirrored_line_dance (struct glyph_matrix *matrix, int unchanged_at_top, int nlines,
+mirrored_line_dance (struct frame *f, int unchanged_at_top, int nlines,
 		     int *copy_from, char *retained_p)
 {
+  struct glyph_matrix *matrix = f->current_matrix;
+
   /* A copy of original rows.  */
   struct glyph_row *old_rows;
 
@@ -2894,9 +2896,8 @@ mirrored_line_dance (struct glyph_matrix *matrix, int unchanged_at_top, int nlin
     }
 
   /* Do the same for window matrices, if MATRIX is a frame matrix.  */
-  if (frame_matrix_frame)
-    mirror_line_dance (XWINDOW (frame_matrix_frame->root_window),
-		       unchanged_at_top, nlines, copy_from, retained_p);
+  mirror_line_dance (XWINDOW (f->root_window),
+		     unchanged_at_top, nlines, copy_from, retained_p);
 
   SAFE_FREE ();
 }
@@ -3194,7 +3195,10 @@ redraw_frame (struct frame *f)
        future.  */
     SET_FRAME_GARBAGED (f);
 
-  clear_frame (f);
+  /* Clear_frame is actually a "clear_terminal", i.e.
+     is clears the entire screen. */
+  if (!FRAME_PARENT_FRAME (f))
+    clear_frame (f);
   clear_current_matrices (f);
   update_end (f);
   fset_redisplay (f);
@@ -3229,145 +3233,676 @@ DEFUN ("redraw-display", Fredraw_display, Sredraw_display, 0, 0, "",
   return Qnil;
 }
 
-
 
-/***********************************************************************
-			     Frame Update
- ***********************************************************************/
+/**********************************************************************
+			    TTY Child Frames
+ **********************************************************************/
 
-/* Update frame F based on the data in desired matrices.
+/* The new thing that child frames on ttys provide is that frames on a
+   tty no longer always occupy the whole terminal. They can overlap
+   instead.
 
-   If FORCE_P, don't let redisplay be stopped by detecting pending input.
-   If INHIBIT_HAIRY_ID_P, don't try scrolling.
+   Let a "root" frame be a frame that has no parent frame. Such root
+   frames we require to be the size of the terminal screen. The current
+   glyph matrix of a root frame of a termimnal represents what is on the
+   screen. The desired matrix of a root frame represents what should be
+   one the screen.
 
-   Value is true if redisplay was stopped due to pending input.  */
+   Building the desired matrix of root frame proceeds by
 
-bool
-update_frame (struct frame *f, bool force_p, bool inhibit_hairy_id_p)
+   - building the desired matrix of the root frame itself which is
+     the bottommost frame in z-order,
+   - building desired matrices of child frames in z-order, topmost last,
+   - copying the desired glyphs from child frames to the desired glyphs
+     of the root frame
+
+   Updating the screen is then done using root frame matrices as it was
+   before child frames were introduced. Child frame current matrices are
+   updated by copying glyph contents of the current matrix of the root
+   frames to the current matrices of child frames. This imnplicitly
+   also updates the glyph contents of their windows' current matrices.  */
+
+struct rect
 {
-  /* True means display has been paused because of pending input.  */
-  bool paused_p;
-  struct window *root_window = XWINDOW (f->root_window);
+  int x, y, w, h;
+};
 
-  if (redisplay_dont_pause)
-    force_p = true;
-  else if (!force_p && detect_input_pending_ignore_squeezables ())
+/* Compute the intersection of R1 and R2 in R. Value is true if R1 and
+   R2 intersect, false otherwise. */
+
+static bool
+rect_intersect (struct rect *r, struct rect r1, struct rect r2)
+{
+  int x1 = max (r1.x, r2.x);
+  int x2 = min (r1.x + r1.w, r2.x + r2.w);
+  if (x2 < x1)
+    return false;
+  int y1 = max (r1.y, r2.y);
+  int y2 = min (r1.y + r1.h, r2.y + r2.h);
+  if (y2 < y1)
+    return false;
+  *r = (struct rect) { .x = x1, .y = y1, .w = x2 - x1, .h = y2 - y1 };
+  return true;
+}
+
+/* Return the absolute position of frame F in *X and *Y. */
+
+static void
+frame_pos_abs (struct frame *f, int *x, int *y)
+{
+  *x = *y = 0;
+  for (; f; f = FRAME_PARENT_FRAME (f))
     {
-      paused_p = true;
-      goto do_pause;
+      *x += f->left_pos;
+      *y += f->top_pos;
     }
+}
 
-  if (FRAME_WINDOW_P (f))
+/* Return the rectangle frame F occupies. X and Y are in absolute coordinates. */
+
+static struct rect
+frame_rect_abs (struct frame *f)
+{
+  int x, y;
+  frame_pos_abs (f, &x, &y);
+  return (struct rect) { x, y, f->total_cols, f->total_lines };
+}
+
+/* Return the root frame of frame F. Follow the parent_frame chain until
+   we reach a frame that has no parent. That is the root frame. Note
+   that the root of a root frame is itself. */
+
+struct frame *
+root_frame (struct frame *f)
+{
+  while (FRAME_PARENT_FRAME (f))
+    f = FRAME_PARENT_FRAME (f);
+  return f;
+}
+
+int
+max_child_z_order (struct frame *parent)
+{
+  Lisp_Object tail, frame;
+  int z_order = 0;
+  FOR_EACH_FRAME (tail, frame)
     {
-      /* We are working on window matrix basis.  All windows whose
-	 flag must_be_updated_p is set have to be updated.  */
+      struct frame *f = XFRAME (frame);
+      if (FRAME_PARENT_FRAME (f) == parent)
+	z_order = max (z_order, f->z_order);
+    }
+  return z_order;
+}
 
-      /* Record that we are not working on frame matrices.  */
-      set_frame_matrix_frame (NULL);
+/* Return true if F1 is an ancestor of F2.  */
 
-      /* Update all windows in the window tree of F, maybe stopping
-	 when pending input is detected.  */
-      update_begin (f);
+static bool
+is_frame_ancestor (struct frame *f1, struct frame *f2)
+{
+  for (struct frame *f = FRAME_PARENT_FRAME (f2); f; f = FRAME_PARENT_FRAME (f))
+    if (f == f1)
+      return true;
+  return false;
+}
 
-#if defined HAVE_WINDOW_SYSTEM && !defined HAVE_EXT_MENU_BAR
-      /* Update the menu bar on X frames that don't have toolkit
-	 support.  */
-      if (WINDOWP (f->menu_bar_window))
-	update_window (XWINDOW (f->menu_bar_window), true);
-#endif
+/* Return a list of all frames having root frame ROOT.
+   If VISIBLE_ONLY is true, return only visible frames.  */
 
-#if defined (HAVE_WINDOW_SYSTEM)
-      /* Update the tab-bar window, if present.  */
-      if (WINDOWP (f->tab_bar_window))
+static Lisp_Object
+frames_with_root (struct frame *root, bool visible_only)
+{
+  Lisp_Object list = Qnil;
+  Lisp_Object tail, frame;
+  FOR_EACH_FRAME (tail, frame)
+    {
+      struct frame *f = XFRAME (frame);
+      if (root_frame (f) == root
+	  && (!visible_only || FRAME_VISIBLE_P (f)))
+	list = Fcons (frame, list);
+    }
+  return list;
+}
+
+/* Return a list of frames having parent frame PARENT.
+   If VISIBLE_ONLY is true, return only visible frames.  */
+
+static Lisp_Object
+frames_with_parent (struct frame *parent, bool visible_only)
+{
+  Lisp_Object list = Qnil;
+  Lisp_Object tail, frame;
+  FOR_EACH_FRAME (tail, frame)
+    {
+      struct frame *f = XFRAME (frame);
+      if (FRAME_PARENT_FRAME (f) == parent
+	  && (!visible_only || FRAME_VISIBLE_P (f)))
+	list = Fcons (frame, list);
+    }
+  return list;
+}
+
+/* Compare frames F1 and F2 for z-order.  Value is like strcmp.  */
+
+static int
+frame_z_order_cmp (struct frame *f1, struct frame *f2)
+{
+  if (f1 == f2)
+    return 0;
+  if (is_frame_ancestor (f1, f2))
+    return -1;
+  if (is_frame_ancestor (f2, f1))
+    return 1;
+  return f1->z_order - f2->z_order;
+}
+
+DEFUN ("frame--z-order-lessp", Fframe__z_order_lessp, Sframe__z_order_lessp,
+       2, 2, 0, doc: /* Internal frame sorting function A < B.  */)
+  (Lisp_Object a, Lisp_Object b)
+{
+  eassert (FRAMEP (a) && FRAMEP (b));
+  return frame_z_order_cmp (XFRAME (a), XFRAME (b)) < 0 ? Qt : Qnil;
+}
+
+/* Return a z-order list of frames with the same root as F.  The list
+   is ordered topmost frame last.  Note that this list contains
+   the root frame of F itself as first element.  */
+
+Lisp_Object
+frames_in_reverse_z_order (struct frame *f, bool visible_only)
+{
+  struct frame *root = root_frame (f);
+  Lisp_Object frames = frames_with_root (root, visible_only);
+  frames = CALLN (Fsort, frames, QClessp, Qframe__z_order_lessp);
+  eassert (FRAMEP (XCAR (frames)));
+  eassert (XFRAME (XCAR (frames)) == root);
+  return frames;
+}
+
+/* Raise of lower frame F in z-order.  If RAISE is true, raise F, else
+   lower f.  */
+
+void
+tty_raise_lower_frame (struct frame *f, bool raise)
+{
+  struct frame *parent = FRAME_PARENT_FRAME (f);
+  if (parent == NULL)
+    return;
+
+  Lisp_Object siblings = frames_with_parent (parent, false);
+  siblings = CALLN (Fsort, siblings, QClessp, Qframe__z_order_lessp);
+
+  int i = 0;
+  for (Lisp_Object tail = siblings; CONSP (tail); tail = XCDR (tail))
+    {
+      struct frame *child = XFRAME (XCAR (tail));
+      if (child != f)
+	child->z_order = i++;
+    }
+  f->z_order = raise ? i : 0;
+}
+
+/* Return true if frame F is a tty frame. */
+
+bool
+is_tty_frame (struct frame *f)
+{
+  return FRAME_TERMCAP_P (f);
+}
+
+/* Return true if frame F is a tty child frame. */
+
+bool
+is_tty_child_frame (struct frame *f)
+{
+  return FRAME_PARENT_FRAME (f) && is_tty_frame (f);
+}
+
+/* Return true if frame F is a tty root frame. */
+
+bool
+is_tty_root_frame (struct frame *f)
+{
+  return !FRAME_PARENT_FRAME (f) && is_tty_frame (f);
+}
+
+/* Return the index of the first enabled row in MATRIX, or -1 if there
+   is none. */
+
+static int
+first_enabled_row (struct glyph_matrix *matrix)
+{
+  for (int i = 0; i < matrix->nrows; ++i)
+    if (MATRIX_ROW_ENABLED_P (matrix, i))
+      return i;
+  return -1;
+}
+
+/* On tty frame F, make desired matrix current, without writing
+   to the terminal. */
+
+static void
+make_matrix_current (struct frame *f)
+{
+  int first_row = first_enabled_row (f->desired_matrix);
+  if (first_row >= 0)
+    for (int i = first_row; i < f->desired_matrix->nrows; ++i)
+      if (MATRIX_ROW_ENABLED_P (f->desired_matrix, i))
+	make_current (f, NULL, i);
+}
+
+/* Prepare ROOT's desired row at index Y for copying child
+   frame contents to it.  */
+
+static struct glyph_row *
+prepare_desired_root_row (struct frame *root, int y)
+{
+  /* Start with the root's desired matrix row. If that hasn't
+     been redisplayed, copy from the root's current matrix. */
+  struct glyph_row *root_row = MATRIX_ROW (root->desired_matrix, y);
+  if (!root_row->enabled_p)
+    {
+      struct glyph_row *from = MATRIX_ROW (root->current_matrix, y);
+      memcpy (root_row->glyphs[0], from->glyphs[0],
+	      root->current_matrix->matrix_w * sizeof (struct glyph));
+      root_row->enabled_p = true;
+    }
+  return root_row;
+}
+
+/* Produce glyphs for box character BOX in ROW.  X ist the position in ROW
+   where to start producing glyphs. N is the number of glyphs to produce.
+   CHILD is the frame to use for the face of the glyphs.  */
+
+static void
+produce_box_glyphs (enum box box, struct glyph_row *row, int x, int n,
+		    struct frame *child)
+{
+  int dflt;
+  switch (box)
+    {
+    case BOX_VERTICAL:
+      dflt = '|';
+      break;
+    case BOX_HORIZONTAL:
+      dflt = '-';
+      break;
+    case BOX_DOWN_RIGHT:
+    case BOX_DOWN_LEFT:
+    case BOX_UP_RIGHT:
+    case BOX_UP_LEFT:
+      dflt = '+';
+      break;
+    }
+
+  // FIXME/tty some face for the border.
+  int face_id = BORDER_FACE_ID;
+  GLYPH g;
+  SET_GLYPH (g, dflt, face_id);
+
+  if (DISP_TABLE_P (Vstandard_display_table))
+    {
+      struct Lisp_Char_Table *dp = XCHAR_TABLE (Vstandard_display_table);
+      Lisp_Object gc = dp->extras[box];
+      if (GLYPH_CODE_P (gc))
 	{
-	  struct window *w = XWINDOW (f->tab_bar_window);
+	  SET_GLYPH_FROM_GLYPH_CODE (g, gc);
+	  /* Sorry, but I really don't care if the glyph has a face :-). */
+	}
+    }
 
-	  /* Update tab-bar window.  */
-	  if (w->must_be_updated_p)
-	    {
-	      Lisp_Object tem;
+  struct glyph *glyph = row->glyphs[0] + x;
+  for (int i = 0; i < n; ++i, ++glyph)
+    {
+      glyph->type = CHAR_GLYPH;
+      glyph->u.ch = GLYPH_CHAR (g);
+      glyph->charpos = -1;
+      glyph->pixel_width = 1;
+      glyph->multibyte_p = 1;
+      glyph->face_id = GLYPH_FACE (g);
+      glyph->frame = child;
+      glyph->multibyte_p = 1;
+      glyph->object = Qnil;
+    }
+}
 
-	      update_window (w, true);
-	      w->must_be_updated_p = false;
+/* Produce box glyphs LEFT and RIGHT in ROOT_ROW.  X and W are the start
+   and width of a range in ROOT_ROW before and after which to put the
+   box glyphs, if they fit. ROOT and CHILD are root and child frame we
+   are working on.  ROOT is the root frame whose matrix dimensions
+   determines if the box glyphs fit.  CHILD is the frame whose faces to
+   use for the box glyphs.  */
 
-	      /* Swap tab-bar strings.  We swap because we want to
-		 reuse strings.  */
-	      tem = f->current_tab_bar_string;
-	      fset_current_tab_bar_string (f, f->desired_tab_bar_string);
-	      fset_desired_tab_bar_string (f, tem);
-	    }
+static void
+produce_box_sides (enum box left, enum box right, struct glyph_row *root_row, int x,
+		   int w, struct frame *root, struct frame *child)
+{
+  if (x > 0)
+    produce_box_glyphs (left, root_row, x - 1, 1, child);
+  if (x + w < root->desired_matrix->matrix_w)
+    produce_box_glyphs (right, root_row, x + w, 1, child);
+}
+
+static void
+produce_box_line (struct frame *root, struct frame *child, int x, int y, int w,
+		  bool first)
+{
+  struct glyph_row *root_row = prepare_desired_root_row (root, y);
+  if (first)
+    produce_box_sides (BOX_DOWN_RIGHT, BOX_DOWN_LEFT, root_row, x, w, root, child);
+  else
+    produce_box_sides (BOX_UP_RIGHT, BOX_UP_LEFT, root_row, x, w, root, child);
+  produce_box_glyphs (BOX_HORIZONTAL, root_row, x, w, child);
+  root_row->hash = row_hash (root_row);
+}
+
+/* Copy to ROOT's desired matrix what we need from CHILD. */
+
+static void
+copy_child_glyphs (struct frame *root, struct frame *child)
+{
+  eassert (!FRAME_PARENT_FRAME (root));
+  eassert (is_frame_ancestor (root, child));
+
+  /* Determine the intersection of the child frame rectangle with
+     the root frame. This is basically clipping the child frame to
+     the root frame rectangle. */
+  struct rect r;
+  if (!rect_intersect (&r, frame_rect_abs (root), frame_rect_abs (child)))
+    return;
+
+  /* Build CHILD's current matrix which we need to copy from it. */
+  make_matrix_current (child);
+
+  /* Draw borders around the child frame. */
+  if (!FRAME_UNDECORATED (child))
+    {
+      /* Horizontal line above. */
+      if (r.y > 0)
+	produce_box_line (root, child, r.x, r.y - 1, r.w, true);
+
+      for (int y = r.y; y < r.y + r.h; ++y)
+	{
+	  struct glyph_row *root_row = prepare_desired_root_row (root, y);
+	  produce_box_sides (BOX_VERTICAL, BOX_VERTICAL, root_row, r.x, r.w,
+			     root, child);
 	}
+
+      /* Horizontal line below */
+      if (r.y + r.h < root->desired_matrix->matrix_h)
+	produce_box_line (root, child, r.x, r.y + r.h, r.w, false);
+    }
+
+  /* First visible row/col, relative to the child frame. */
+  int child_x = child->left_pos < 0 ? - child->left_pos : 0;
+  int child_y = child->top_pos < 0 ? - child->top_pos : 0;
+
+  /* For all rows in the intersection, copy glyphs from the child's
+     current matrix to the root's desired matrix, enabling those
+     rows if they aren't already. */
+  for (int y = r.y; y < r.y + r.h; ++y, ++child_y)
+    {
+      struct glyph_row *root_row = prepare_desired_root_row (root, y);
+
+      /* Copy what's visible from the child's current row. */
+      struct glyph_row *child_row = MATRIX_ROW (child->current_matrix, child_y);
+      memcpy (root_row->glyphs[0] + r.x, child_row->glyphs[0] + child_x,
+	      r.w * sizeof (struct glyph));
+
+      /* Compute a new hash since we changed glyphs. */
+      root_row->hash = row_hash (root_row);
+    }
+}
+
+/***********************************************************************
+			     Frame Update
+ ***********************************************************************/
+
+/* Update the menu bar on X frames that don't have toolkit
+   support.  */
+
+static void
+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);
 #endif
+}
 
-#if defined (HAVE_WINDOW_SYSTEM) && ! defined (HAVE_EXT_TOOL_BAR)
-      /* Update the tool-bar window, if present.  */
-      if (WINDOWP (f->tool_bar_window))
+#ifdef HAVE_WINDOW_SYSTEM
+static void
+update_bar_window (Lisp_Object window, Lisp_Object *current,
+		       Lisp_Object *desired)
+{
+  if (WINDOWP (window))
+    {
+      struct window *w = XWINDOW (window);
+      if (w->must_be_updated_p)
 	{
-	  struct window *w = XWINDOW (f->tool_bar_window);
+	  update_window (w, true);
+	  w->must_be_updated_p = false;
+	  Lisp_Object tem = *current;
+	  *current = *desired;
+	  *desired = tem;
+	}
+    }
+}
+#endif
 
-	  /* Update tool-bar window.  */
-	  if (w->must_be_updated_p)
-	    {
-	      Lisp_Object tem;
+/* Update the tab-bar window of frame F, if present. */
 
-	      update_window (w, true);
-	      w->must_be_updated_p = false;
+static void
+update_tab_bar (struct frame *f)
+{
+#if defined(HAVE_WINDOW_SYSTEM)
+  update_bar_window (f->tab_bar_window, &f->current_tab_bar_string,
+		     &f->desired_tab_bar_string);
+#endif
+}
 
-	      /* Swap tool-bar strings.  We swap because we want to
-		 reuse strings.  */
-	      tem = f->current_tool_bar_string;
-	      fset_current_tool_bar_string (f, f->desired_tool_bar_string);
-	      fset_desired_tool_bar_string (f, tem);
-	    }
-	}
+static void
+update_tool_bar (struct frame *f)
+{
+#if defined(HAVE_WINDOW_SYSTEM) && !defined(HAVE_EXT_TOOL_BAR)
+  update_bar_window (f->tool_bar_window, &f->current_tool_bar_string,
+		     &f->desired_tool_bar_string);
 #endif
+}
 
-      /* Update windows.  */
-      paused_p = update_window_tree (root_window, force_p);
-      update_end (f);
-    }
-  else
+static bool
+update_window_frame (struct frame *f, bool force_p)
+{
+  eassert (FRAME_WINDOW_P (f));
+  update_begin (f);
+  update_menu_bar (f);
+  update_tab_bar (f);
+  update_tool_bar (f);
+  struct window *root_window = XWINDOW (f->root_window);
+  bool paused_p = update_window_tree (root_window, force_p);
+  update_end (f);
+  set_window_update_flags (root_window, false);
+  return paused_p;
+}
+
+static bool
+update_initial_frame (struct frame *f, bool force_p)
+{
+  build_frame_matrix (f);
+  struct window *root_window = XWINDOW (f->root_window);
+  set_window_update_flags (root_window, false);
+  return false;
+}
+
+static void
+flush_terminal (struct frame *f)
+{
+  if (FRAME_TTY (f)->termscript)
+    fflush (FRAME_TTY (f)->termscript);
+  fflush (FRAME_TTY (f)->output);
+}
+
+static bool
+update_tty_frame (struct frame *f, bool force_p)
+{
+  build_frame_matrix (f);
+  return false;
+}
+
+static void
+abs_cursor_pos (struct frame *f, int *x, int *y)
+{
+  frame_pos_abs (f, x, y);
+  struct window *w = XWINDOW (f->selected_window);
+  *x += w->cursor.x;
+  *y += w->cursor.y;
+}
+
+/* Is the terminal cursor of frame F obscured by a child frame? */
+
+static bool
+is_cursor_obscured (void)
+{
+  int x, y;
+  abs_cursor_pos (SELECTED_FRAME (), &x, &y);
+  struct frame *root = root_frame (SELECTED_FRAME ());
+  struct glyph_row *cursor_row = MATRIX_ROW (root->current_matrix, y);
+  eassert (x < root->current_matrix->matrix_w);
+  struct glyph *cursor_glyph = cursor_row->glyphs[0] + x;
+  return cursor_glyph->frame != SELECTED_FRAME ();
+}
+
+/* Decide where to show the cursor, and if to hide it or not.
+
+   This works very well for Vertico-Posframe, Transient-Posframe and
+   Corfu, but it's debatable if it's the right thing for a general use
+   of child frames of all sorts, nested and so on. But it is also debatable
+   if that's a realistic use case from my POV. */
+
+static void
+terminal_cursor_magic (struct frame *root, struct frame *topmost_child)
+{
+  /* By default, prevent the cursor "shining through" child frames. */
+  if (is_cursor_obscured ())
+    tty_hide_cursor (FRAME_TTY (root));
+
+  /* If the terminal cursor is not in the topmost child, the topmost
+     child's tty-cursor-if-topmost determines what to do.  If it is
+     non-nil, display the cursor in this "non-selected" topmost child
+     frame to compensate for the fact that we can't display a
+     non-selected cursor like on a window system frame.  */
+  if (topmost_child != SELECTED_FRAME ())
     {
-      /* We are working on frame matrix basis.  Set the frame on whose
-	 frame matrix we operate.  */
-      set_frame_matrix_frame (f);
+      Lisp_Object frame;
+      XSETFRAME (frame, topmost_child);
 
-      /* Build F's desired matrix from window matrices.  */
-      build_frame_matrix (f);
+      Lisp_Object cursor = Fframe_parameter (frame, Qtty_non_selected_cursor);
+      if (!NILP (cursor))
+	{
+	  int x, y;
+	  abs_cursor_pos (topmost_child, &x, &y);
+	  cursor_to (root, y, x);
+	  tty_show_cursor (FRAME_TTY (topmost_child));
+	}
+    }
+}
 
-      /* Update the display.  */
-      if (FRAME_INITIAL_P (f))
-        /* No actual display to update so the "update" is a nop and
-           obviously isn't interrupted by pending input.  */
-        paused_p = false;
-      else
-        {
-          update_begin (f);
-          paused_p = update_frame_1 (f, force_p, inhibit_hairy_id_p, 1, false);
-          update_end (f);
-        }
-
-      if (FRAME_TERMCAP_P (f) || FRAME_MSDOS_P (f))
-        {
-          if (FRAME_TTY (f)->termscript)
-	    fflush (FRAME_TTY (f)->termscript);
-	  if (FRAME_TERMCAP_P (f))
-	    fflush (FRAME_TTY (f)->output);
-        }
-
-      /* Check window matrices for lost pointers.  */
+bool
+combine_updates_for_frame (struct frame *f, bool force_p, bool inhibit_scrolling)
+{
+  struct frame *root = root_frame (f);
+  eassert (FRAME_VISIBLE_P (root));
+
+  /* Process child frames in reverse z-order, topmost last. For each
+     child, copy what we need to the root's desired matrix. */
+  Lisp_Object z_order = frames_in_reverse_z_order (root, true);
+  struct frame *topmost_child = NULL;
+  for (Lisp_Object tail = XCDR (z_order); CONSP (tail); tail = XCDR (tail))
+    {
+      topmost_child = XFRAME (XCAR (tail));
+      copy_child_glyphs (root, topmost_child);
+    }
+
+  update_begin (root);
+  bool paused = write_matrix (root, force_p, inhibit_scrolling, 1, false);
+  if (!paused)
+    make_matrix_current (root);
+  update_end (root);
+
+  /* If a child is displayed, and the cursor is displayed in another
+     frame, the child might lay above the cursor, so that it appers to
+     "shine through" the child. Avoid that because it's confusing. */
+  if (topmost_child)
+    terminal_cursor_magic (root, topmost_child);
+  flush_terminal (root);
+
+  for (Lisp_Object tail = z_order; CONSP (tail); tail = XCDR (tail))
+    {
+      struct frame *f = XFRAME (XCAR (tail));
+      struct window *root_window = XWINDOW (f->root_window);
+      set_window_update_flags (root_window, false);
+      clear_desired_matrices (f);
 #ifdef GLYPH_DEBUG
       check_window_matrix_pointers (root_window);
-      add_frame_display_history (f, paused_p);
+      add_frame_display_history (f, false);
 #endif
     }
 
- do_pause:
-  /* Reset flags indicating that a window should be updated.  */
-  set_window_update_flags (root_window, false);
+  return paused;
+}
 
-  display_completed = !paused_p;
-  return paused_p;
+/* Update on the screen all root frames ROOTS. Called from
+   redisplay_internal as the last step of redisplaying. */
+
+bool
+combine_updates (Lisp_Object roots, bool force_p, bool inhibit_scrolling)
+{
+  for (; CONSP (roots); roots = XCDR (roots))
+    {
+      struct frame *root = XFRAME (XCAR (roots));
+      if (combine_updates_for_frame (root, force_p, inhibit_scrolling))
+	{
+	  display_completed = false;
+	  return true;
+	}
+    }
+
+  display_completed = true;
+  return false;
+}
+
+/* Update frame F based on the data in desired matrices.
+
+   If FORCE_P, don't let redisplay be stopped by detecting pending input.
+   If INHIBIT_SCROLLING, don't try scrolling.
+
+   Value is true if redisplay was stopped due to pending input.  */
+
+bool
+update_frame (struct frame *f, bool force_p, bool inhibit_scrolling)
+{
+  struct window *root_window = XWINDOW (f->root_window);
+
+  if (redisplay_dont_pause)
+    force_p = true;
+  else if (!force_p && detect_input_pending_ignore_squeezables ())
+    {
+      /* Reset flags indicating that a window should be updated.  */
+      set_window_update_flags (root_window, false);
+      display_completed = false;
+      return true;
+    }
+
+  bool paused;
+  if (FRAME_WINDOW_P (f))
+    paused = update_window_frame (f, force_p);
+  else if (FRAME_INITIAL_P (f))
+    paused = update_initial_frame (f, force_p);
+  else
+    paused = update_tty_frame (f, force_p);
+
+  if (paused)
+    display_completed = false;
+  return paused;
 }
 
 /* Update a TTY frame F that has a menu dropped down over some of its
@@ -3384,29 +3919,25 @@ void
 update_frame_with_menu (struct frame *f, int row, int col)
 {
   struct window *root_window = XWINDOW (f->root_window);
-  bool paused_p, cursor_at_point_p;
+  bool cursor_at_point_p;
 
   eassert (FRAME_TERMCAP_P (f));
 
-  /* We are working on frame matrix basis.  Set the frame on whose
-     frame matrix we operate.  */
-  set_frame_matrix_frame (f);
-
   /* Update the display.  */
   update_begin (f);
   cursor_at_point_p = !(row >= 0 && col >= 0);
-  /* Force update_frame_1 not to stop due to pending input, and not
-     try scrolling.  */
-  paused_p = update_frame_1 (f, 1, 1, cursor_at_point_p, true);
+  /* Do not stop due to pending input, and do not try scrolling. This
+     means that write_glyphs will always return false. */
+  write_matrix (f, 1, 1, cursor_at_point_p, true);
+  make_matrix_current (f);
+  clear_desired_matrices (f);
   /* ROW and COL tell us where in the menu to position the cursor, so
      that screen readers know the active region on the screen.  */
   if (!cursor_at_point_p)
     cursor_to (f, row, col);
   update_end (f);
+  flush_terminal (f);
 
-  if (FRAME_TTY (f)->termscript)
-    fflush (FRAME_TTY (f)->termscript);
-  fflush (FRAME_TTY (f)->output);
   /* Check window matrices for lost pointers.  */
 #if GLYPH_DEBUG
 #if 0
@@ -3415,12 +3946,12 @@ update_frame_with_menu (struct frame *f, int row, int col)
 	 making any updates to the window matrices.  */
   check_window_matrix_pointers (root_window);
 #endif
-  add_frame_display_history (f, paused_p);
+  add_frame_display_history (f, false);
 #endif
 
   /* Reset flags indicating that a window should be updated.  */
   set_window_update_flags (root_window, false);
-  display_completed = !paused_p;
+  display_completed = true;
 }
 
 /* Update the mouse position for a frame F.  This handles both
@@ -3453,19 +3984,20 @@ update_mouse_position (struct frame *f, int x, int y)
 }
 
 DEFUN ("display--update-for-mouse-movement", Fdisplay__update_for_mouse_movement,
-       Sdisplay__update_for_mouse_movement, 2, 2, 0,
+       Sdisplay__update_for_mouse_movement, 3, 3, 0,
        doc: /* Handle mouse movement detected by Lisp code.
 
 This function should be called when Lisp code detects the mouse has
 moved, even if `track-mouse' is nil.  This handles updates that do not
 rely on input events such as updating display for mouse-face
 properties or updating the help echo text.  */)
-  (Lisp_Object mouse_x, Lisp_Object mouse_y)
+  (Lisp_Object mouse_frame, Lisp_Object mouse_x, Lisp_Object mouse_y)
 {
+  CHECK_FRAME (mouse_frame);
   CHECK_FIXNUM (mouse_x);
   CHECK_FIXNUM (mouse_y);
 
-  update_mouse_position (SELECTED_FRAME (), XFIXNUM (mouse_x),
+  update_mouse_position (XFRAME (mouse_frame), XFIXNUM (mouse_x),
                          XFIXNUM (mouse_y));
   return Qnil;
 }
@@ -3507,9 +4039,6 @@ update_single_window (struct window *w)
     {
       struct frame *f = XFRAME (WINDOW_FRAME (w));
 
-      /* Record that this is not a frame-based redisplay.  */
-      set_frame_matrix_frame (NULL);
-
       /* Update W.  */
       update_begin (f);
       update_window (w, true);
@@ -3688,6 +4217,8 @@ update_window (struct window *w, bool force_p)
 
 #ifdef HAVE_WINDOW_SYSTEM
       gui_update_window_begin (w);
+#else
+      (void) changed_p;
 #endif
       yb = window_text_bottom_y (w);
       row = MATRIX_ROW (desired_matrix, 0);
@@ -4321,7 +4852,7 @@ update_window_line (struct window *w, int vpos, bool *mouse_face_overwritten_p)
 
   /* Update current_row from desired_row.  */
   was_stipple = current_row->stipple_p;
-  make_current (w->desired_matrix, w->current_matrix, vpos);
+  make_current (NULL, w, vpos);
 
   /* If only a partial update was performed, any stipple already
      displayed in MATRIX_ROW (w->current_matrix, vpos) might still be
@@ -4931,7 +5462,92 @@ scrolling_window (struct window *w, int tab_line_p)
 			 Frame-Based Updates
  ************************************************************************/
 
-/* Update the desired frame matrix of frame F.
+static void
+tty_set_cursor (void)
+{
+  struct frame *f = SELECTED_FRAME ();
+
+  if ((cursor_in_echo_area
+       /* If we are showing a message instead of the mini-buffer,
+	  show the cursor for the message instead of for the
+	  (now hidden) mini-buffer contents.  */
+       || (BASE_EQ (minibuf_window, selected_window)
+	   && BASE_EQ (minibuf_window, echo_area_window)
+	   && !NILP (echo_area_buffer[0])))
+      /* These cases apply only to the frame that contains
+	 the active mini-buffer window.  */
+      && FRAME_HAS_MINIBUF_P (f)
+      && BASE_EQ (FRAME_MINIBUF_WINDOW (f), echo_area_window))
+    {
+      int top = WINDOW_TOP_EDGE_LINE (XWINDOW (FRAME_MINIBUF_WINDOW (f)));
+      int col;
+
+      /* Put cursor at the end of the prompt.  If the mini-buffer
+	 is several lines high, find the last line that has
+	 any text on it.  */
+      int row = FRAME_TOTAL_LINES (f);
+      do
+	{
+	  row--;
+	  col = 0;
+
+	  if (MATRIX_ROW_ENABLED_P (f->current_matrix, row))
+	    {
+	      /* Frame rows are filled up with spaces that
+		 must be ignored here.  */
+	      struct glyph_row *r = MATRIX_ROW (f->current_matrix, row);
+	      struct glyph *start = r->glyphs[TEXT_AREA];
+
+	      col = r->used[TEXT_AREA];
+	      while (0 < col && start[col - 1].charpos < 0)
+		col--;
+	    }
+	}
+      while (row > top && col == 0);
+
+      /* We exit the loop with COL at the glyph _after_ the last one.  */
+      if (col > 0)
+	col--;
+
+      /* Make sure COL is not out of range.  */
+      if (col >= FRAME_CURSOR_X_LIMIT (f))
+	{
+	  /* If we have another row, advance cursor into it.  */
+	  if (row < FRAME_TOTAL_LINES (f) - 1)
+	    {
+	      col = FRAME_LEFT_SCROLL_BAR_COLS (f);
+	      row++;
+	    }
+	  /* Otherwise move it back in range.  */
+	  else
+	    col = FRAME_CURSOR_X_LIMIT (f) - 1;
+	}
+
+      cursor_to (f, row, col);
+    }
+  else
+    {
+      /* We have only one cursor on terminal frames.  Use it to
+	 display the cursor of the selected window.  */
+      struct window *w = XWINDOW (FRAME_SELECTED_WINDOW (f));
+      if (w->cursor.vpos >= 0
+	  /* The cursor vpos may be temporarily out of bounds
+	     in the following situation:  There is one window,
+	     with the cursor in the lower half of it.  The window
+	     is split, and a message causes a redisplay before
+	     a new cursor position has been computed.  */
+	  && w->cursor.vpos < WINDOW_TOTAL_LINES (w))
+	{
+	  int x = WINDOW_TO_FRAME_HPOS (w, w->cursor.hpos);
+	  int y = WINDOW_TO_FRAME_VPOS (w, w->cursor.vpos);
+
+	  x += max (0, w->left_margin_cols);
+	  cursor_to (f, y, x);
+	}
+    }
+}
+
+/* Write desired matix of tty frame F and make it current.
 
    FORCE_P means that the update should not be stopped by pending input.
    INHIBIT_ID_P means that scrolling by insert/delete should not be tried.
@@ -4940,167 +5556,58 @@ scrolling_window (struct window *w, int tab_line_p)
    Value is true if update was stopped due to pending input.  */
 
 static bool
-update_frame_1 (struct frame *f, bool force_p, bool inhibit_id_p,
-		bool set_cursor_p, bool updating_menu_p)
+write_matrix (struct frame *f, bool force_p, bool inhibit_id_p,
+	      bool set_cursor_p, bool updating_menu_p)
 {
-  /* Frame matrices to work on.  */
-  struct glyph_matrix *current_matrix = f->current_matrix;
-  struct glyph_matrix *desired_matrix = f->desired_matrix;
-  int i;
-  bool pause_p;
-  int preempt_count = clip_to_bounds (1, baud_rate / 2400 + 1, INT_MAX);
-
-  eassert (current_matrix && desired_matrix);
-
-  if (baud_rate != FRAME_COST_BAUD_RATE (f))
-    calculate_costs (f);
-
   if (!force_p && detect_input_pending_ignore_squeezables ())
-    {
-      pause_p = 1;
-      goto do_pause;
-    }
+    return true;
 
   /* If we cannot insert/delete lines, it's no use trying it.  */
   if (!FRAME_LINE_INS_DEL_OK (f))
-    inhibit_id_p = 1;
+    inhibit_id_p = true;
 
-  /* See if any of the desired lines are enabled; don't compute for
-     i/d line if just want cursor motion.  */
-  for (i = 0; i < desired_matrix->nrows; i++)
-    if (MATRIX_ROW_ENABLED_P (desired_matrix, i))
-      break;
+  if (baud_rate != FRAME_COST_BAUD_RATE (f))
+    calculate_costs (f);
 
-  /* Try doing i/d line, if not yet inhibited.  */
-  if (!inhibit_id_p && i < desired_matrix->nrows)
+ /* See if any of the desired lines are enabled; don't compute for
+     i/d line if just want cursor motion.  */
+  int first_row = first_enabled_row (f->desired_matrix);
+  if (!inhibit_id_p && first_row >= 0)
     force_p |= scrolling (f);
 
-  /* Update the individual lines as needed.  Do bottom line first.  */
-  if (MATRIX_ROW_ENABLED_P (desired_matrix, desired_matrix->nrows - 1))
-    update_frame_line (f, desired_matrix->nrows - 1, updating_menu_p);
+  /* Update the individual lines as needed.  Do bottom line first.  This
+     is done so that messages are made visible when pausing. */
+  int last_row = f->desired_matrix->nrows - 1;
+  if (MATRIX_ROW_ENABLED_P (f->desired_matrix, last_row))
+    write_row (f, last_row, updating_menu_p);
 
-  /* Now update the rest of the lines.  */
-  for (i = 0; i < desired_matrix->nrows - 1 && (force_p || !input_pending); i++)
+  bool pause_p = false;
+  if (first_row >= 0)
     {
-      if (MATRIX_ROW_ENABLED_P (desired_matrix, i))
-	{
-	  /* Note that output_buffer_size being 0 means that we want the
-	     old default behavior of flushing output every now and then.  */
-	  if (FRAME_TERMCAP_P (f) && FRAME_TTY (f)->output_buffer_size == 0)
-	    {
-	      /* Flush out every so many lines.
-		 Also flush out if likely to have more than 1k buffered
-		 otherwise.   I'm told that some telnet connections get
-		 really screwed by more than 1k output at once.  */
-	      FILE *display_output = FRAME_TTY (f)->output;
-	      if (display_output)
-		{
-		  ptrdiff_t outq = __fpending (display_output);
-		  if (outq > 900
-		      || (outq > 20 && ((i - 1) % preempt_count == 0)))
-		    fflush (display_output);
-		}
-	    }
+      const int preempt_count = clip_to_bounds (1, baud_rate / 2400 + 1, INT_MAX);
 
-	  if (!force_p && (i - 1) % preempt_count == 0)
-	    detect_input_pending_ignore_squeezables ();
+      for (int i = first_row, n = 0; i < last_row; ++i)
+	if (MATRIX_ROW_ENABLED_P (f->desired_matrix, i))
+	  {
+	    if (!force_p && n % preempt_count == 0
+		&& detect_input_pending_ignore_squeezables ())
+	      {
+		pause_p = true;
+		break;
+	      }
 
-	  update_frame_line (f, i, updating_menu_p);
-	}
+	    write_row (f, i, updating_menu_p);
+	    ++n;
+	  }
     }
 
-  pause_p = 0 < i && i < FRAME_TOTAL_LINES (f) - 1;
-
   /* Now just clean up termcap drivers and set cursor, etc.  */
   if (!pause_p && set_cursor_p)
-    {
-      if ((cursor_in_echo_area
-	   /* If we are showing a message instead of the mini-buffer,
-	      show the cursor for the message instead of for the
-	      (now hidden) mini-buffer contents.  */
-	   || (BASE_EQ (minibuf_window, selected_window)
-	       && BASE_EQ (minibuf_window, echo_area_window)
-	       && !NILP (echo_area_buffer[0])))
-	  /* These cases apply only to the frame that contains
-	     the active mini-buffer window.  */
-	  && FRAME_HAS_MINIBUF_P (f)
-	  && BASE_EQ (FRAME_MINIBUF_WINDOW (f), echo_area_window))
-	{
-	  int top = WINDOW_TOP_EDGE_LINE (XWINDOW (FRAME_MINIBUF_WINDOW (f)));
-	  int col;
-
-	  /* Put cursor at the end of the prompt.  If the mini-buffer
-	     is several lines high, find the last line that has
-	     any text on it.  */
-	  int row = FRAME_TOTAL_LINES (f);
-	  do
-	    {
-	      row--;
-	      col = 0;
-
-	      if (MATRIX_ROW_ENABLED_P (current_matrix, row))
-		{
-		  /* Frame rows are filled up with spaces that
-		     must be ignored here.  */
-		  struct glyph_row *r = MATRIX_ROW (current_matrix, row);
-		  struct glyph *start = r->glyphs[TEXT_AREA];
-
-		  col = r->used[TEXT_AREA];
-		  while (0 < col && start[col - 1].charpos < 0)
-		    col--;
-		}
-	    }
-	  while (row > top && col == 0);
+    tty_set_cursor ();
 
-	  /* We exit the loop with COL at the glyph _after_ the last one.  */
-	  if (col > 0)
-	    col--;
-
-	  /* Make sure COL is not out of range.  */
-	  if (col >= FRAME_CURSOR_X_LIMIT (f))
-	    {
-	      /* If we have another row, advance cursor into it.  */
-	      if (row < FRAME_TOTAL_LINES (f) - 1)
-		{
-		  col = FRAME_LEFT_SCROLL_BAR_COLS (f);
-		  row++;
-		}
-	      /* Otherwise move it back in range.  */
-	      else
-		col = FRAME_CURSOR_X_LIMIT (f) - 1;
-	    }
-
-	  cursor_to (f, row, col);
-	}
-      else
-	{
-	  /* We have only one cursor on terminal frames.  Use it to
-	     display the cursor of the selected window.  */
-	  struct window *w = XWINDOW (FRAME_SELECTED_WINDOW (f));
-	  if (w->cursor.vpos >= 0
-	      /* The cursor vpos may be temporarily out of bounds
-	         in the following situation:  There is one window,
-		 with the cursor in the lower half of it.  The window
-		 is split, and a message causes a redisplay before
-	         a new cursor position has been computed.  */
-	      && w->cursor.vpos < WINDOW_TOTAL_LINES (w))
-	    {
-	      int x = WINDOW_TO_FRAME_HPOS (w, w->cursor.hpos);
-	      int y = WINDOW_TO_FRAME_VPOS (w, w->cursor.vpos);
-
-	      x += max (0, w->left_margin_cols);
-	      cursor_to (f, y, x);
-	    }
-	}
-    }
-
- do_pause:
-
-  clear_desired_matrices (f);
   return pause_p;
 }
 
-
 /* Do line insertions/deletions on frame F for frame-based redisplay.  */
 
 static bool
@@ -5209,12 +5716,12 @@ scrolling (struct frame *frame)
    which is LEN glyphs long.  */
 
 static int
-count_blanks (struct glyph *r, int len)
+count_blanks (struct frame *f, struct glyph *r, int len)
 {
   int i;
 
   for (i = 0; i < len; ++i)
-    if (!CHAR_GLYPH_SPACE_P (r[i]))
+    if (!CHAR_GLYPH_SPACE_P (f, r[i]))
       break;
 
   return i;
@@ -5250,7 +5757,7 @@ count_match (struct glyph *str1, struct glyph *end1, struct glyph *str2, struct
 /* Perform a frame-based update on line VPOS in frame FRAME.  */
 
 static void
-update_frame_line (struct frame *f, int vpos, bool updating_menu_p)
+write_row (struct frame *f, int vpos, bool updating_menu_p)
 {
   struct glyph *obody, *nbody, *op1, *op2, *np1, *nend;
   int tem;
@@ -5264,11 +5771,6 @@ update_frame_line (struct frame *f, int vpos, bool updating_menu_p)
   bool colored_spaces_p = (FACE_FROM_ID (f, DEFAULT_FACE_ID)->background
 			   != FACE_TTY_DEFAULT_BG_COLOR);
 
-  /* This should never happen, but evidently sometimes does if one
-     resizes the frame quickly enough.  Prevent aborts in cmcheckmagic.  */
-  if (vpos >= FRAME_TOTAL_LINES (f))
-    return;
-
   if (colored_spaces_p)
     write_spaces_p = 1;
 
@@ -5287,7 +5789,7 @@ update_frame_line (struct frame *f, int vpos, bool updating_menu_p)
 
       /* Ignore trailing spaces, if we can.  */
       if (!write_spaces_p)
-	while (olen > 0 && CHAR_GLYPH_SPACE_P (obody[olen-1]))
+	while (olen > 0 && CHAR_GLYPH_SPACE_P (f, obody[olen-1]))
 	  olen--;
     }
 
@@ -5316,7 +5818,7 @@ update_frame_line (struct frame *f, int vpos, bool updating_menu_p)
     {
       /* Ignore spaces at the end, if we can.  */
       if (!write_spaces_p)
-	while (nlen > 0 && CHAR_GLYPH_SPACE_P (nbody[nlen - 1]))
+	while (nlen > 0 && CHAR_GLYPH_SPACE_P (f, nbody[nlen - 1]))
 	  --nlen;
 
       /* Write the contents of the desired line.  */
@@ -5338,15 +5840,13 @@ update_frame_line (struct frame *f, int vpos, bool updating_menu_p)
 	/* Make sure we are in the right row, otherwise cursor movement
 	   with cmgoto might use `ch' in the wrong row.  */
 	cursor_to (f, vpos, 0);
-
-      make_current (desired_matrix, current_matrix, vpos);
       return;
     }
 
   /* Pretend trailing spaces are not there at all,
      unless for one reason or another we must write all spaces.  */
   if (!write_spaces_p)
-    while (nlen > 0 && CHAR_GLYPH_SPACE_P (nbody[nlen - 1]))
+    while (nlen > 0 && CHAR_GLYPH_SPACE_P (f, nbody[nlen - 1]))
       nlen--;
 
   /* If there's no i/d char, quickly do the best we can without it.  */
@@ -5383,9 +5883,6 @@ update_frame_line (struct frame *f, int vpos, bool updating_menu_p)
 	  cursor_to (f, vpos, nlen);
 	  clear_end_of_line (f, olen);
 	}
-
-      /* Make current row = desired row.  */
-      make_current (desired_matrix, current_matrix, vpos);
       return;
     }
 
@@ -5399,7 +5896,7 @@ update_frame_line (struct frame *f, int vpos, bool updating_menu_p)
       if (write_spaces_p)
 	nsp = 0;
       else
-	nsp = count_blanks (nbody, nlen);
+	nsp = count_blanks (f, nbody, nlen);
 
       if (nlen > nsp)
 	{
@@ -5407,14 +5904,12 @@ update_frame_line (struct frame *f, int vpos, bool updating_menu_p)
 	  write_glyphs (f, nbody + nsp, nlen - nsp);
 	}
 
-      /* Exchange contents between current_frame and new_frame.  */
-      make_current (desired_matrix, current_matrix, vpos);
       return;
     }
 
   /* Compute number of leading blanks in old and new contents.  */
-  osp = count_blanks (obody, olen);
-  nsp = (colored_spaces_p ? 0 : count_blanks (nbody, nlen));
+  osp = count_blanks (f, obody, olen);
+  nsp = (colored_spaces_p ? 0 : count_blanks (f, nbody, nlen));
 
   /* Compute number of matching chars starting with first non-blank.  */
   begmatch = count_match (obody + osp, obody + olen,
@@ -5425,7 +5920,7 @@ update_frame_line (struct frame *f, int vpos, bool updating_menu_p)
   if (!write_spaces_p && osp + begmatch == olen)
     {
       np1 = nbody + nsp;
-      while (np1 + begmatch < nend && CHAR_GLYPH_SPACE_P (np1[begmatch]))
+      while (np1 + begmatch < nend && CHAR_GLYPH_SPACE_P (f, np1[begmatch]))
 	++begmatch;
     }
 
@@ -5566,9 +6061,6 @@ update_frame_line (struct frame *f, int vpos, bool updating_menu_p)
       cursor_to (f, vpos, nlen);
       clear_end_of_line (f, olen);
     }
-
-  /* Exchange contents between current_frame and new_frame.  */
-  make_current (desired_matrix, current_matrix, vpos);
 }
 
 
@@ -5967,7 +6459,8 @@ handle_window_change_signal (int sig)
 	    {
 	      struct frame *f = XFRAME (frame);
 
-	      if (FRAME_TERMCAP_P (f) && FRAME_TTY (f) == tty)
+	      if (FRAME_TERMCAP_P (f) && FRAME_TTY (f) == tty
+		  && !FRAME_PARENT_FRAME (f))
 		/* Record the new sizes, but don't reallocate the data
 		   structures now.  Let that be done later outside of the
 		   signal handler.  */
@@ -6534,7 +7027,7 @@ init_display_interactive (void)
 
   /* Construct the space glyph.  */
   space_glyph.type = CHAR_GLYPH;
-  SET_CHAR_GLYPH (space_glyph, ' ', DEFAULT_FACE_ID, 0);
+  SET_CHAR_GLYPH (NULL, space_glyph, ' ', DEFAULT_FACE_ID, 0);
   space_glyph.charpos = -1;
 
   inverse_video = 0;
@@ -6808,6 +7301,7 @@ syms_of_display (void)
   defsubr (&Ssend_string_to_terminal);
   defsubr (&Sinternal_show_cursor);
   defsubr (&Sinternal_show_cursor_p);
+  defsubr (&Sframe__z_order_lessp);
 
 #ifdef GLYPH_DEBUG
   defsubr (&Sdump_redisplay_history);
@@ -6818,8 +7312,10 @@ syms_of_display (void)
 
   /* This is the "purpose" slot of a display table.  */
   DEFSYM (Qdisplay_table, "display-table");
+  DEFSYM (Qframe__z_order_lessp, "frame--z-order-lessp");
 
   DEFSYM (Qredisplay_dont_pause, "redisplay-dont-pause");
+  DEFSYM (Qtty_non_selected_cursor, "tty-non-selected-cursor");
 
   DEFVAR_INT ("baud-rate", baud_rate,
 	      doc: /* The output baud rate of the terminal.
@@ -6921,6 +7417,8 @@ Possible values are t (below the tool bar), nil (above the tool bar).
 This option affects only builds where the tool bar is not external.  */);
 
   pdumper_do_now_and_after_load (syms_of_display_for_pdumper);
+
+  Fprovide (intern_c_string ("tty-child-frames"), Qnil);
 }
 
 static void
diff --git a/src/disptab.h b/src/disptab.h
index 2080181610a..f51d1d3044b 100644
--- a/src/disptab.h
+++ b/src/disptab.h
@@ -28,7 +28,7 @@ along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
    && EQ (XCHAR_TABLE (obj)->purpose, Qdisplay_table)			    \
    && CHAR_TABLE_EXTRA_SLOTS (XCHAR_TABLE (obj)) == DISP_TABLE_EXTRA_SLOTS)
 
-#define DISP_TABLE_EXTRA_SLOTS 6
+#define DISP_TABLE_EXTRA_SLOTS 12
 #define DISP_TRUNC_GLYPH(dp) ((dp)->extras[0])
 #define DISP_CONTINUE_GLYPH(dp) ((dp)->extras[1])
 #define DISP_ESCAPE_GLYPH(dp) ((dp)->extras[2])
@@ -36,6 +36,16 @@ along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 #define DISP_INVIS_VECTOR(dp) ((dp)->extras[4])
 #define DISP_BORDER_GLYPH(dp) ((dp)->extras[5])
 
+enum box
+{
+  BOX_VERTICAL = 6,
+  BOX_HORIZONTAL,
+  BOX_DOWN_RIGHT,
+  BOX_DOWN_LEFT,
+  BOX_UP_RIGHT,
+  BOX_UP_LEFT
+};
+
 extern Lisp_Object disp_char_vector (struct Lisp_Char_Table *, int);
 
 #define DISP_CHAR_VECTOR(dp, c)				\
diff --git a/src/frame.c b/src/frame.c
index 7f4bf274ad9..8133b646216 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -130,6 +130,14 @@ decode_window_system_frame (Lisp_Object frame)
 #endif
 }
 
+struct frame *
+decode_tty_frame (Lisp_Object frame)
+{
+  struct frame *f = decode_live_frame (frame);
+  check_tty (f);
+  return f;
+}
+
 void
 check_window_system (struct frame *f)
 {
@@ -141,6 +149,13 @@ check_window_system (struct frame *f)
 	 : "Window system is not in use or not initialized");
 }
 
+void
+check_tty (struct frame *f)
+{
+  if (!f || !FRAME_TERMCAP_P (f))
+    error ("tty frame should be used");
+}
+
 /* Return the value of frame parameter PROP in frame FRAME.  */
 
 Lisp_Object
@@ -182,6 +197,17 @@ set_menu_bar_lines (struct frame *f, Lisp_Object value, Lisp_Object oldval)
   int olines = FRAME_MENU_BAR_LINES (f);
   int nlines = TYPE_RANGED_FIXNUMP (int, value) ? XFIXNUM (value) : 0;
 
+  /* Menu bars on child frames don't work on all platforms,
+     which is the reason why prepare_menu_bar does not update_menu_bar
+     for child frames (info from Martin Rudalics). This could be
+     implemented in ttys, but it's probaly not worth it. */
+  if (is_tty_child_frame (f))
+    {
+      FRAME_MENU_BAR_LINES (f) = 0;
+      FRAME_MENU_BAR_HEIGHT (f) = 0;
+      return;
+    }
+
   /* Right now, menu bars don't work properly in minibuf-only frames;
      most of the commands try to apply themselves to the minibuffer
      frame itself, and get an error because you can't switch buffers
@@ -370,17 +396,17 @@ frame_windows_min_size (Lisp_Object frame, Lisp_Object horizontal,
     }
   else
     retval = XFIXNUM (call4 (Qframe_windows_min_size, frame, horizontal,
-			  ignore, pixelwise));
+			     ignore, pixelwise));
 
   /* Don't allow too small height of text-mode frames, or else cm.c
      might abort in cmcheckmagic.  */
   if ((FRAME_TERMCAP_P (f) || FRAME_MSDOS_P (f)) && NILP (horizontal))
     {
-      int min_height = (FRAME_MENU_BAR_LINES (f)
-			+ FRAME_TAB_BAR_LINES (f)
+      int min_height = (FRAME_MENU_BAR_LINES (f) + FRAME_TAB_BAR_LINES (f)
 			+ FRAME_WANTS_MODELINE_P (f)
-			+ 2);	/* one text line and one echo-area line */
-
+			+ FRAME_HAS_MINIBUF_P (f));
+      if (min_height == 0)
+	min_height = 1;
       if (retval < min_height)
 	retval = min_height;
     }
@@ -389,7 +415,6 @@ frame_windows_min_size (Lisp_Object frame, Lisp_Object horizontal,
 }
 
 
-#ifdef HAVE_WINDOW_SYSTEM
 /**
  * keep_ratio:
  *
@@ -508,7 +533,6 @@ keep_ratio (struct frame *f, struct frame *p, int old_width, int old_height,
 	}
     }
 }
-#endif
 
 
 static void
@@ -833,8 +857,9 @@ adjust_frame_size (struct frame *f, int new_text_width, int new_text_height,
 
       /* MSDOS frames cannot PRETEND, as they change frame size by
 	 manipulating video hardware.  */
-      if ((FRAME_TERMCAP_P (f) && !pretend) || FRAME_MSDOS_P (f))
-	FrameCols (FRAME_TTY (f)) = new_text_cols;
+      if (is_tty_root_frame (f))
+	if ((FRAME_TERMCAP_P (f) && !pretend) || FRAME_MSDOS_P (f))
+	  FrameCols (FRAME_TTY (f)) = new_text_cols;
 
 #if defined (HAVE_WINDOW_SYSTEM)
       if (WINDOWP (f->tab_bar_window))
@@ -866,9 +891,10 @@ adjust_frame_size (struct frame *f, int new_text_width, int new_text_height,
       resize_frame_windows (f, new_inner_height, false);
 
       /* MSDOS frames cannot PRETEND, as they change frame size by
-	 manipulating video hardware.  */
-      if ((FRAME_TERMCAP_P (f) && !pretend) || FRAME_MSDOS_P (f))
-	FrameRows (FRAME_TTY (f)) = new_text_lines + FRAME_TOP_MARGIN (f);
+	 manipulating video hardware. */
+      if (is_tty_root_frame (f))
+	if ((FRAME_TERMCAP_P (f) && !pretend) || FRAME_MSDOS_P (f))
+	  FrameRows (FRAME_TTY (f)) = new_text_lines + FRAME_TOP_MARGIN (f);
     }
   else if (new_text_lines != old_text_lines)
     call2 (Qwindow__pixel_to_total, frame, Qnil);
@@ -898,6 +924,9 @@ adjust_frame_size (struct frame *f, int new_text_width, int new_text_height,
   adjust_frame_glyphs (f);
   calculate_costs (f);
   SET_FRAME_GARBAGED (f);
+  if (is_tty_child_frame (f))
+    SET_FRAME_GARBAGED (root_frame (f));
+
   /* We now say here that F was resized instead of using the old
      condition below.  Some resizing must have taken place and if it was
      only shifting the root window's position (paranoia?).  */
@@ -910,7 +939,6 @@ adjust_frame_size (struct frame *f, int new_text_width, int new_text_height,
 
   unblock_input ();
 
-#ifdef HAVE_WINDOW_SYSTEM
   {
     /* Adjust size of F's child frames.  */
     Lisp_Object frames, frame1;
@@ -920,7 +948,6 @@ adjust_frame_size (struct frame *f, int new_text_width, int new_text_height,
 	keep_ratio (XFRAME (frame1), f, old_native_width, old_native_height,
 		    new_native_width, new_native_height);
   }
-#endif
 }
 
 /* Allocate basically initialized frame.  */
@@ -967,12 +994,12 @@ make_frame (bool mini_p)
   f->line_height = 1;  /* !FRAME_WINDOW_P value.  */
   f->new_width = -1;
   f->new_height = -1;
+  f->no_special_glyphs = false;
 #ifdef HAVE_WINDOW_SYSTEM
   f->vertical_scroll_bar_type = vertical_scroll_bar_none;
   f->horizontal_scroll_bars = false;
   f->want_fullscreen = FULLSCREEN_NONE;
   f->undecorated = false;
-  f->no_special_glyphs = false;
 #ifndef HAVE_NTGUI
   f->override_redirect = false;
 #endif
@@ -1089,7 +1116,6 @@ make_frame (bool mini_p)
   return f;
 }
 
-#ifdef HAVE_WINDOW_SYSTEM
 /* Make a frame using a separate minibuffer window on another frame.
    MINI_WINDOW is the minibuffer window to use.  nil means use the
    default (the global minibuffer).  */
@@ -1183,7 +1209,7 @@ make_minibuffer_frame (void)
 		      : Fcar (Vminibuffer_list)), 0, 0);
   return f;
 }
-#endif /* HAVE_WINDOW_SYSTEM */
+
 
 /* Construct a frame that refers to a terminal.  */
 
@@ -1209,7 +1235,7 @@ make_initial_frame (void)
   tty_frame_count = 1;
   fset_name (f, build_pure_c_string ("F1"));
 
-  SET_FRAME_VISIBLE (f, 1);
+  SET_FRAME_VISIBLE (f, true);
 
   f->output_method = terminal->type;
   f->terminal = terminal;
@@ -1246,23 +1272,55 @@ make_initial_frame (void)
 #ifndef HAVE_ANDROID
 
 static struct frame *
-make_terminal_frame (struct terminal *terminal)
+make_terminal_frame (struct terminal *terminal, Lisp_Object parent,
+		     Lisp_Object params)
 {
-  register struct frame *f;
-  Lisp_Object frame;
   char name[sizeof "F" + INT_STRLEN_BOUND (tty_frame_count)];
 
   if (!terminal->name)
     error ("Terminal is not live, can't create new frames on it");
 
-  f = make_frame (1);
+  struct frame *f;
+  if (NILP (parent))
+    f = make_frame (true);
+  else
+    {
+      CHECK_FRAME (parent);
+
+      f = NULL;
+      Lisp_Object mini = Fassq (Qminibuffer, params);
+      if (CONSP (mini))
+	{
+	  mini = Fcdr (mini);
+	  struct kboard *kb = FRAME_KBOARD (XFRAME (parent));
+	  if (EQ (mini, Qnone) || NILP (mini))
+	    f = make_frame_without_minibuffer (Qnil, kb, Qnil);
+	  else if (EQ (mini, Qonly))
+	    {
+# if 0 /* No interest in this feature at the moment, */
+	      f = make_minibuffer_frame ();
+	      /* Not sure about this plus the unsplittable frame
+		 paran. */
+	      f->no_split = true;
+# endif
+	    }
+	  else if (WINDOWP (mini))
+	    f = make_frame_without_minibuffer (mini, kb, Qnil);
+	}
+
+      if (f == NULL)
+	f = make_frame (true);
+      f->parent_frame = parent;
+      f->z_order = 1 + max_child_z_order (XFRAME (parent));
+    }
 
+  Lisp_Object frame;
   XSETFRAME (frame, f);
   Vframe_list = Fcons (frame, Vframe_list);
 
   fset_name (f, make_formatted_string (name, "F%"PRIdMAX, ++tty_frame_count));
 
-  SET_FRAME_VISIBLE (f, 1);
+  SET_FRAME_VISIBLE (f, true);
 
   f->terminal = terminal;
   f->terminal->reference_count++;
@@ -1287,7 +1345,15 @@ make_terminal_frame (struct terminal *terminal)
   f->horizontal_scroll_bars = false;
 #endif
 
-  FRAME_MENU_BAR_LINES (f) = NILP (Vmenu_bar_mode) ? 0 : 1;
+  /* Menu bars on child frames don't work on all platforms,
+     which is the reason why prepare_menu_bar does not update_menu_bar
+     for child frames (info from Martin Rudalics). This could be
+     implemented in ttys, but it's unclear if it is worth it. */
+  if (NILP (parent))
+    FRAME_MENU_BAR_LINES (f) = NILP (Vmenu_bar_mode) ? 0 : 1;
+  else
+    FRAME_MENU_BAR_LINES (f) = 0;
+
   FRAME_TAB_BAR_LINES (f) = NILP (Vtab_bar_mode) ? 0 : 1;
   FRAME_LINES (f) = FRAME_LINES (f) - FRAME_MENU_BAR_LINES (f)
     - FRAME_TAB_BAR_LINES (f);
@@ -1296,16 +1362,19 @@ make_terminal_frame (struct terminal *terminal)
   FRAME_TEXT_HEIGHT (f) = FRAME_TEXT_HEIGHT (f) - FRAME_MENU_BAR_HEIGHT (f)
     - FRAME_TAB_BAR_HEIGHT (f);
 
-  /* Set the top frame to the newly created frame.  */
-  if (FRAMEP (FRAME_TTY (f)->top_frame)
-      && FRAME_LIVE_P (XFRAME (FRAME_TTY (f)->top_frame)))
-    SET_FRAME_VISIBLE (XFRAME (FRAME_TTY (f)->top_frame), 2); /* obscured */
-
-  FRAME_TTY (f)->top_frame = frame;
-
-  if (!noninteractive)
-    init_frame_faces (f);
+  /* Mark current topmost frame obscured if we make a new root frame.
+     Child frames don't completely obscure other frames. */
+  if (NILP (parent) && FRAMEP (FRAME_TTY (f)->top_frame))
+    {
+      struct frame *top = XFRAME (FRAME_TTY (f)->top_frame);
+      struct frame *root = root_frame (top);
+      if (FRAME_LIVE_P (root))
+	SET_FRAME_VISIBLE (root, false);
+    }
 
+  /* Set the top frame to the newly created frame.  */
+  if (!FRAME_PARENT_FRAME (f))
+    FRAME_TTY (f)->top_frame = frame;
   return f;
 }
 
@@ -1335,6 +1404,62 @@ get_future_frame_param (Lisp_Object parameter,
 
 #endif
 
+static int
+tty_child_pos_param (struct frame *child, Lisp_Object key,
+		     Lisp_Object params, int dflt)
+{
+  Lisp_Object val = Fassq (key, params);
+  if (CONSP (val))
+    {
+      val = XCDR (val);
+      if (FIXNUMP (val))
+	return XFIXNUM (val);
+    }
+  return dflt;
+}
+
+static int
+tty_child_size_param (struct frame *child, Lisp_Object key,
+		      Lisp_Object params, int dflt)
+{
+  Lisp_Object val = Fassq (key, params);
+  if (CONSP (val))
+    {
+      val = XCDR (val);
+      if (CONSP (val))
+	{
+	  /* Width and height may look like (width text-pixels
+	     . PIXELS) on window systems. Mimic that. */
+	  val = XCDR (val);
+	  if (EQ (val, Qtext_pixels))
+	    val = XCDR (val);
+	}
+      else if (FLOATP (val))
+	{
+	      /* Width and height may be a float, in which case
+		 it's a multiple of the parent's value. */
+	      struct frame *parent = FRAME_PARENT_FRAME (child);
+	      int sz = (EQ (key, Qwidth) ? FRAME_TOTAL_COLS (parent)
+			: FRAME_TOTAL_LINES (parent));
+	      val = make_fixnum (XFLOAT_DATA (val) * sz);
+	}
+
+      if (FIXNUMP (val) && XFIXNUM (val) > 0)
+	return XFIXNUM (val);
+    }
+  return dflt;
+}
+
+static void
+child_frame_rect (struct frame *f, Lisp_Object params,
+		  int *x, int *y, int *w, int *h)
+{
+  *x = tty_child_pos_param (f, Qleft, params, 0);
+  *y = tty_child_pos_param (f, Qtop, params, 0);
+  *w = tty_child_size_param (f, Qwidth, params, FRAME_TOTAL_COLS (f));
+  *h = tty_child_size_param (f, Qheight, params, FRAME_TOTAL_LINES (f));
+}
+
 DEFUN ("make-terminal-frame", Fmake_terminal_frame, Smake_terminal_frame,
        1, 1, 0,
        doc: /* Create an additional terminal frame, possibly on another terminal.
@@ -1358,9 +1483,7 @@ affects all frames on the same terminal device.  */)
   error ("Text terminals are not supported on this platform");
   return Qnil;
 #else
-  struct frame *f;
   struct terminal *t = NULL;
-  Lisp_Object frame;
   struct frame *sf = SELECTED_FRAME ();
 
 #ifdef MSDOS
@@ -1390,7 +1513,7 @@ affects all frames on the same terminal device.  */)
       error ("Multiple terminals are not supported on this platform");
     if (!t)
       t = the_only_display_info.terminal;
-#endif
+# endif
   }
 
   if (!t)
@@ -1417,19 +1540,67 @@ affects all frames on the same terminal device.  */)
       SAFE_FREE ();
     }
 
-  f = make_terminal_frame (t);
+  /* Make a new frame. We need to know upfront if if a parent frame is
+     specified because we behave differently in this case, e.g. child
+     frames don't obscure other frames. */
+  Lisp_Object parent = Fcdr (Fassq (Qparent_frame, parms));
+  struct frame *f = make_terminal_frame (t, parent, parms);
 
-  {
-    int width, height;
-    get_tty_size (fileno (FRAME_TTY (f)->input), &width, &height);
-    /* With INHIBIT 5 pass correct text height to adjust_frame_size.  */
-    adjust_frame_size (f, width, height - FRAME_TOP_MARGIN (f),
-		       5, 0, Qterminal_frame);
-  }
+  if (!noninteractive)
+    init_frame_faces (f);
+
+  /* Visibility of root frames cannot be set with a frame parameter.
+     Their visibility solely depends on whether or not they are the
+     top_frame on the terminal. */
+  if (FRAME_PARENT_FRAME (f))
+    {
+      Lisp_Object visible = Fassq (Qvisibility, parms);
+      if (CONSP (visible))
+	SET_FRAME_VISIBLE (f, !NILP (visible));
+
+      /* FIXME/tty: The only way to get borders on a tty is
+	 to allow decorations for now. */
+      Lisp_Object undecorated = Fassq (Qundecorated, parms);
+      if (CONSP (undecorated) && !NILP (XCDR (undecorated)))
+	f->undecorated = true;
+
+      /* FIXME/tty: The only way to get borders on a tty is
+	 to allow decorations for now. */
+      Lisp_Object no_focus = Fassq (Qno_accept_focus, parms);
+      if (CONSP (no_focus) && !NILP (XCDR (no_focus)))
+	f->no_accept_focus = true;
+
+      /* FIXME/tty: The only way to get borders on a tty is
+	 to allow decorations for now. */
+      Lisp_Object no_split = Fassq (Qunsplittable, parms);
+      if (CONSP (no_split) && !NILP (XCDR (no_split)))
+	f->no_split = true;
+    }
 
+  /* Determine width and height of the frame. For root frames use the
+     width/height of the terminal. For child frames, take it from frame
+     parameters. Note that a default (80x25) has been set in
+     make_frame. We handle root frames in this way because otherwise we
+     would end up needing glyph matrices for the terminal, which is both
+     more work and has its downsides (think of clipping frames to the
+     terminal size).  */
+  int x = 0, y = 0, width, height;
+  if (FRAME_PARENT_FRAME (f))
+    child_frame_rect (f, parms, &x, &y, &width, &height);
+  else
+    get_tty_size (fileno (FRAME_TTY (f)->input), &width, &height);
+  adjust_frame_size (f, width, height - FRAME_TOP_MARGIN (f), 5, 0,
+		     Qterminal_frame);
   adjust_frame_glyphs (f);
+
   calculate_costs (f);
-  XSETFRAME (frame, f);
+
+  f->left_pos = x;
+  f->top_pos = y;
+  store_in_alist (&parms, Qleft, make_fixnum (x));
+  store_in_alist (&parms, Qtop, make_fixnum (y));
+  store_in_alist (&parms, Qwidth, make_fixnum (width));
+  store_in_alist (&parms, Qheight, make_fixnum (height));
 
   store_in_alist (&parms, Qtty_type, build_string (t->display_info.tty->type));
   store_in_alist (&parms, Qtty,
@@ -1451,7 +1622,11 @@ affects all frames on the same terminal device.  */)
   /* On terminal frames the `minibuffer' frame parameter is always
      virtually t.  Avoid that a different value in parms causes
      complaints, see Bug#24758.  */
-  store_in_alist (&parms, Qminibuffer, Qt);
+  if (!FRAME_PARENT_FRAME (f))
+    store_in_alist (&parms, Qminibuffer, Qt);
+
+  Lisp_Object frame;
+  XSETFRAME (frame, f);
   Fmodify_frame_parameters (frame, parms);
 
   f->can_set_window_size = true;
@@ -1480,8 +1655,6 @@ affects all frames on the same terminal device.  */)
 Lisp_Object
 do_switch_frame (Lisp_Object frame, int track, int for_deletion, Lisp_Object norecord)
 {
-  struct frame *sf = SELECTED_FRAME (), *f;
-
   /* If FRAME is a switch-frame event, extract the frame we should
      switch to.  */
   if (CONSP (frame)
@@ -1493,7 +1666,9 @@ do_switch_frame (Lisp_Object frame, int track, int for_deletion, Lisp_Object nor
      a switch-frame event to arrive after a frame is no longer live,
      especially when deleting the initial frame during startup.  */
   CHECK_FRAME (frame);
-  f = XFRAME (frame);
+  struct frame *f = XFRAME (frame);
+  struct frame *sf = SELECTED_FRAME ();
+
   /* Silently ignore dead and tooltip frames (Bug#47207).  */
   if (!FRAME_LIVE_P (f) || FRAME_TOOLTIP_P (f))
     return Qnil;
@@ -1546,24 +1721,37 @@ do_switch_frame (Lisp_Object frame, int track, int for_deletion, Lisp_Object nor
       struct tty_display_info *tty = FRAME_TTY (f);
       Lisp_Object top_frame = tty->top_frame;
 
-      /* Don't mark the frame garbaged and/or obscured if we are
-	 switching to the frame that is already the top frame of that
-	 TTY.  */
+      /* Don't mark the frame garbaged if we are switching to the frame
+	 that is already the top frame of that TTY.  */
       if (!EQ (frame, top_frame))
 	{
+	  struct frame *new_root = root_frame (f);
+	  SET_FRAME_VISIBLE (new_root, true);
+	  SET_FRAME_VISIBLE (f, true);
+
+	  /* Mark previously displayed frame as no longer visible.  */
 	  if (FRAMEP (top_frame))
-	    /* Mark previously displayed frame as now obscured.  */
-	    SET_FRAME_VISIBLE (XFRAME (top_frame), 2);
-	  SET_FRAME_VISIBLE (f, 1);
-	  /* If the new TTY frame changed dimensions, we need to
-	     resync term.c's idea of the frame size with the new
-	     frame's data.  */
-	  if (FRAME_COLS (f) != FrameCols (tty))
-	    FrameCols (tty) = FRAME_COLS (f);
-	  if (FRAME_TOTAL_LINES (f) != FrameRows (tty))
-	    FrameRows (tty) = FRAME_TOTAL_LINES (f);
+	    {
+	      struct frame *top = XFRAME (top_frame);
+	      struct frame *old_root = root_frame (top);
+	      if (old_root != new_root)
+		SET_FRAME_VISIBLE (old_root, false);
+	    }
+
+	  tty->top_frame = frame;
+
+	  /* Why is it correct to set FrameCols/Rows? */
+	  if (!FRAME_PARENT_FRAME (f))
+	    {
+	      /* If the new TTY frame changed dimensions, we need to
+		 resync term.c's idea of the frame size with the new
+		 frame's data.  */
+	      if (FRAME_COLS (f) != FrameCols (tty))
+		FrameCols (tty) = FRAME_COLS (f);
+	      if (FRAME_TOTAL_LINES (f) != FrameRows (tty))
+		FrameRows (tty) = FRAME_TOTAL_LINES (f);
+	    }
 	}
-      tty->top_frame = frame;
     }
 
   sf->select_mini_window_flag = MINI_WINDOW_P (XWINDOW (sf->selected_window));
@@ -1605,9 +1793,7 @@ do_switch_frame (Lisp_Object frame, int track, int for_deletion, Lisp_Object nor
      (select-window (frame-root-window (make-frame))) doesn't end up
      with your typing being interpreted in the new frame instead of
      the one you're actually typing in.  */
-#ifdef HAVE_WINDOW_SYSTEM
   if (!frame_ancestor_p (f, sf))
-#endif
     internal_last_event_frame = Qnil;
 
   return frame;
@@ -1725,7 +1911,6 @@ parent window is the window-system's root window) or an embedded window
     return Qnil;
 }
 
-#ifdef HAVE_WINDOW_SYSTEM
 bool
 frame_ancestor_p (struct frame *af, struct frame *df)
 {
@@ -1741,7 +1926,6 @@ frame_ancestor_p (struct frame *af, struct frame *df)
 
   return false;
 }
-#endif
 
 DEFUN ("frame-ancestor-p", Fframe_ancestor_p, Sframe_ancestor_p,
        2, 2, 0,
@@ -1752,15 +1936,10 @@ ANCESTOR and DESCENDANT must be live frames and default to the selected
 frame.  */)
      (Lisp_Object ancestor, Lisp_Object descendant)
 {
-#ifdef HAVE_WINDOW_SYSTEM
   struct frame *af = decode_live_frame (ancestor);
   struct frame *df = decode_live_frame (descendant);
-
   return frame_ancestor_p (af, df) ? Qt : Qnil;
-#else
-  return Qnil;
-#endif
-  }
+}
 
 /* Return CANDIDATE if it can be used as 'other-than-FRAME' frame on the
    same tty (for tty frames) or among frames which uses FRAME's keyboard.
@@ -2021,7 +2200,9 @@ other_frames (struct frame *f, bool invisible, bool force)
 	      && (invisible || NILP (get_frame_param (f1, Qdelete_before)))
 	      /* For invisibility and normal deletions, at least one
 		 visible or iconified frame must remain (Bug#26682).  */
-	      && (FRAME_VISIBLE_P (f1) || FRAME_ICONIFIED_P (f1)
+	      && (FRAME_VISIBLE_P (f1)
+		  || is_tty_frame (f1)
+		  || FRAME_ICONIFIED_P (f1)
 		  || (!invisible
 		      && (force
 			  /* Allow deleting the terminal frame when at
@@ -2282,7 +2463,7 @@ delete_frame (Lisp_Object frame, Lisp_Object force)
   fset_root_window (f, Qnil);
 
   Vframe_list = Fdelq (frame, Vframe_list);
-  SET_FRAME_VISIBLE (f, 0);
+  SET_FRAME_VISIBLE (f, false);
 
   /* Allow the vector of menu bar contents to be freed in the next
      garbage collection.  The frame object itself may not be garbage
@@ -2868,6 +3049,12 @@ If omitted, FRAME defaults to the currently selected frame.  */)
   if (FRAME_WINDOW_P (f) && FRAME_TERMINAL (f)->frame_visible_invisible_hook)
     FRAME_TERMINAL (f)->frame_visible_invisible_hook (f, true);
 
+  if (is_tty_frame (f))
+    {
+      SET_FRAME_VISIBLE (f, true);
+      tty_raise_lower_frame (f, true);
+    }
+
   make_frame_visible_1 (f->root_window);
 
   /* Make menu bar update for the Buffers and Frames menus.  */
@@ -2918,6 +3105,12 @@ displayed in the terminal.  */)
   if (FRAME_WINDOW_P (f) && FRAME_TERMINAL (f)->frame_visible_invisible_hook)
     FRAME_TERMINAL (f)->frame_visible_invisible_hook (f, false);
 
+  /* The Elisp info manual says that this "usually" makes child frames
+     invisible, too, but without saying when not. Since users can't rely
+     on this, it's not implemented. */
+  if (is_tty_frame (f))
+    SET_FRAME_VISIBLE (f, false);
+
   /* Make menu bar update for the Buffers and Frames menus.  */
   windows_or_buffers_changed = 16;
 
@@ -2977,10 +3170,13 @@ currently being displayed on the terminal.  */)
   (Lisp_Object frame)
 {
   CHECK_LIVE_FRAME (frame);
+  struct frame *f = XFRAME (frame);
 
-  if (FRAME_VISIBLE_P (XFRAME (frame)))
+  if (FRAME_VISIBLE_P (f))
     return Qt;
-  if (FRAME_ICONIFIED_P (XFRAME (frame)))
+  else if (is_tty_root_frame (f))
+    return Qt;
+  if (FRAME_ICONIFIED_P (f))
     return Qicon;
   return Qnil;
 }
@@ -3012,12 +3208,7 @@ doesn't support multiple overlapping frames, this function selects FRAME.  */)
 
   XSETFRAME (frame, f);
 
-  if (FRAME_TERMCAP_P (f))
-    /* On a text terminal select FRAME.  */
-    Fselect_frame (frame, Qnil);
-  else
-    /* Do like the documentation says. */
-    Fmake_frame_visible (frame);
+  Fmake_frame_visible (frame);
 
   if (FRAME_TERMINAL (f)->frame_raise_lower_hook)
     (*FRAME_TERMINAL (f)->frame_raise_lower_hook) (f, true);
@@ -3318,6 +3509,15 @@ store_frame_param (struct frame *f, Lisp_Object prop, Lisp_Object val)
       val = old_val;
     }
 
+  /* Re-parenting is currently not implemented when changing a root
+     frame to a child frame or vice versa.  */
+  if (is_tty_frame (f) && EQ (prop, Qparent_frame))
+    {
+      if (NILP (f->parent_frame) != NILP (val))
+	error ("Making a root frame a child or vice versa is not supported");
+      f->parent_frame = val;
+    }
+
   /* The tty color needed to be set before the frame's parameter
      alist was updated with the new value.  This is not true any more,
      but we still do this test early on.  */
@@ -3441,13 +3641,10 @@ If FRAME is omitted or nil, return information on the currently selected frame.
   else
 #endif
     {
-      /* This ought to be correct in f->param_alist for an X frame.  */
-      Lisp_Object lines;
-
-      XSETFASTINT (lines, FRAME_MENU_BAR_LINES (f));
-      store_in_alist (&alist, Qmenu_bar_lines, lines);
-      XSETFASTINT (lines, FRAME_TAB_BAR_LINES (f));
-      store_in_alist (&alist, Qtab_bar_lines, lines);
+      store_in_alist (&alist, Qmenu_bar_lines, make_fixnum (FRAME_MENU_BAR_LINES (f)));
+      store_in_alist (&alist, Qtab_bar_lines, make_fixnum (FRAME_TAB_BAR_LINES (f)));
+      store_in_alist (&alist, Qvisibility, FRAME_VISIBLE_P (f) ? Qt : Qnil);
+      store_in_alist (&alist, Qno_accept_focus, FRAME_NO_ACCEPT_FOCUS (f) ? Qt : Qnil);
     }
 
   return alist;
@@ -3525,7 +3722,6 @@ If FRAME is nil, describe the currently selected frame.  */)
   return value;
 }
 
-
 DEFUN ("modify-frame-parameters", Fmodify_frame_parameters,
        Smodify_frame_parameters, 2, 2, 0,
        doc: /* Modify FRAME according to new values of its parameters in ALIST.
@@ -3563,6 +3759,7 @@ list, but are otherwise ignored.  */)
       USE_SAFE_ALLOCA;
       SAFE_ALLOCA_LISP (parms, 2 * length);
       values = parms + length;
+      Lisp_Object params = alist;
 
       /* Extract parm names and values into those vectors.  */
 
@@ -3588,6 +3785,31 @@ list, but are otherwise ignored.  */)
 	    update_face_from_frame_parameter (f, prop, val);
 	}
 
+      if (is_tty_child_frame (f))
+	{
+	  int x = tty_child_pos_param (f, Qleft, params, f->left_pos);
+	  int y = tty_child_pos_param (f, Qtop, params, f->top_pos);
+	  if (x != f->left_pos || y != f->top_pos)
+	    {
+	      f->left_pos = x;
+	      f->top_pos = y;
+	      SET_FRAME_GARBAGED (root_frame (f));
+	    }
+
+	  int w = tty_child_size_param (f, Qwidth, params, f->total_cols);
+	  int h = tty_child_size_param (f, Qheight, params, f->total_lines);
+	  if (w != f->total_cols || h != f->total_lines)
+	    change_frame_size (f, w, h, false, false, false);
+
+	  Lisp_Object visible = Fassq (Qvisibility, params);
+	  if (CONSP (visible))
+	    SET_FRAME_VISIBLE (f, !NILP (Fcdr (visible)));
+
+	  Lisp_Object no_special = Fassq (Qno_special_glyphs, params);
+	  if (CONSP (no_special))
+	    FRAME_NO_SPECIAL_GLYPHS (f) = !NILP (Fcdr (no_special));
+	}
+
       SAFE_FREE ();
     }
   return Qnil;
@@ -3935,6 +4157,11 @@ bottom edge of FRAME's display.  */)
       (void) yval;
 #endif
     }
+  else if (is_tty_child_frame (f))
+    {
+      f->left_pos = xval;
+      f->top_pos = yval;
+    }
 
   return Qt;
 }
@@ -4246,6 +4473,28 @@ frame_float (struct frame *f, Lisp_Object val, enum frame_float_type what,
     }
 }
 
+/* Handle frame parameter change with frame parameter handler. F is the
+   frame whose frame parameter was changed.  PROP is the name of the
+   frame parameter.  VAL and OLD_VALUE are the current value and old
+   value of the frame parameter. */
+
+static void
+handle_frame_param (struct frame *f, Lisp_Object prop, Lisp_Object val,
+		    Lisp_Object old_value)
+{
+  Lisp_Object param_index = Fget (prop, Qx_frame_parameter);
+  if (FIXNATP (param_index) && XFIXNAT (param_index) < ARRAYELTS (frame_parms))
+    {
+      if (FRAME_RIF (f))
+	{
+	  frame_parm_handler handler
+	    = FRAME_RIF (f)->frame_parm_handlers[XFIXNAT (param_index)];
+	  if (handler)
+	    handler (f, val, old_value);
+	}
+    }
+}
+
 /* Change the parameters of frame F as specified by ALIST.
    If a parameter is not specially recognized, do nothing special;
    otherwise call the `gui_set_...' function for that parameter.
@@ -4387,17 +4636,9 @@ gui_set_frame_parameters_1 (struct frame *f, Lisp_Object alist,
 	}
       else
 	{
-	  Lisp_Object param_index, old_value;
-
-	  old_value = get_frame_param (f, prop);
-
+	  Lisp_Object old_value = get_frame_param (f, prop);
 	  store_frame_param (f, prop, val);
-
-	  param_index = Fget (prop, Qx_frame_parameter);
-	  if (FIXNATP (param_index)
-	      && XFIXNAT (param_index) < ARRAYELTS (frame_parms)
-	      && FRAME_RIF (f)->frame_parm_handlers[XFIXNUM (param_index)])
-	    (*(FRAME_RIF (f)->frame_parm_handlers[XFIXNUM (param_index)])) (f, val, old_value);
+	  handle_frame_param (f, prop, val, old_value);
 
 	  if (!default_parameter && EQ (prop, Qfont))
 	    /* The user manually specified the `font' frame parameter.
@@ -4716,14 +4957,7 @@ gui_set_screen_gamma (struct frame *f, Lisp_Object new_value, Lisp_Object old_va
   /* Apply the new gamma value to the frame background.  */
   bgcolor = Fassq (Qbackground_color, f->param_alist);
   if (CONSP (bgcolor) && (bgcolor = XCDR (bgcolor), STRINGP (bgcolor)))
-    {
-      Lisp_Object parm_index = Fget (Qbackground_color, Qx_frame_parameter);
-      if (FIXNATP (parm_index)
-	  && XFIXNAT (parm_index) < ARRAYELTS (frame_parms)
-	  && FRAME_RIF (f)->frame_parm_handlers[XFIXNAT (parm_index)])
-	  (*FRAME_RIF (f)->frame_parm_handlers[XFIXNAT (parm_index)])
-	    (f, bgcolor, Qnil);
-    }
+    handle_frame_param (f, Qbackground_color, bgcolor, Qnil);
 
   clear_face_cache (true);	/* FIXME: Why of all frames?  */
   fset_redisplay (f);
diff --git a/src/frame.h b/src/frame.h
index 1d920d1a6bc..0b7368fb29b 100644
--- a/src/frame.h
+++ b/src/frame.h
@@ -161,10 +161,8 @@ struct frame
      Usually it is nil.  */
   Lisp_Object title;
 
-#if defined (HAVE_WINDOW_SYSTEM)
   /* This frame's parent frame, if it has one.  */
   Lisp_Object parent_frame;
-#endif /* HAVE_WINDOW_SYSTEM */
 
   /* Last device to move over this frame.  Any value that isn't a
      string means the "Virtual core pointer".  */
@@ -385,15 +383,8 @@ struct frame
      zero if the frame has been made invisible without an icon.  */
 
   /* Nonzero if the frame is currently displayed; we check
-     it to see if we should bother updating the frame's contents.
-
-     On ttys and on Windows NT/9X, to avoid wasting effort updating
-     visible frames that are actually completely obscured by other
-     windows on the display, we bend the meaning of visible slightly:
-     if equal to 2, then the frame is obscured - we still consider
-     it to be "visible" as seen from lisp, but we don't bother
-     updating it.  */
-  unsigned visible : 2;
+     it to see if we should bother updating the frame's contents. */
+  unsigned visible : 1;
 
   /* True if the frame is currently iconified.  Do not
      set this directly, use SET_FRAME_ICONIFIED instead.  */
@@ -451,7 +442,15 @@ struct frame
      This must be the same as the terminal->type. */
   ENUM_BF (output_method) output_method : 4;
 
+  /* True if this is an undecorated frame.  */
+  bool_bf undecorated : 1;
+
+  /* Nonzero if this frame's window does not want to receive input focus
+     via mouse clicks or by moving the mouse into it.  */
+  bool_bf no_accept_focus : 1;
+
 #ifdef HAVE_WINDOW_SYSTEM
+# ifndef HAVE_NTGUI
   /* True if this frame is a tooltip frame.  */
   bool_bf tooltip : 1;
 
@@ -465,10 +464,7 @@ struct frame
   /* Nonzero if we should actually display horizontal scroll bars on this frame.  */
   bool_bf horizontal_scroll_bars : 1;
 
-  /* True if this is an undecorated frame.  */
-  bool_bf undecorated : 1;
 
-#ifndef HAVE_NTGUI
   /* True if this is an override_redirect frame.  */
   bool_bf override_redirect : 1;
 #endif
@@ -480,17 +476,13 @@ struct frame
      receive input focus when it is mapped.  */
   bool_bf no_focus_on_map : 1;
 
-  /* Nonzero if this frame's window does not want to receive input focus
-     via mouse clicks or by moving the mouse into it.  */
-  bool_bf no_accept_focus : 1;
-
   /* The z-group this frame's window belongs to. */
   ENUM_BF (z_group) z_group : 2;
+#endif /* HAVE_WINDOW_SYSTEM */
 
   /* Non-zero if display of truncation and continuation glyphs outside
      the fringes is suppressed.  */
   bool_bf no_special_glyphs : 1;
-#endif /* HAVE_WINDOW_SYSTEM */
 
   /* True means set_window_size_hook requests can be processed for
      this frame.  */
@@ -740,7 +732,10 @@ struct frame
 #ifdef HAVE_TEXT_CONVERSION
   /* Text conversion state used by certain input methods.  */
   struct text_conversion_state conversion;
-#endif
+# endif
+
+  /* Z-order of child frames. */
+  int z_order;
 } GCALIGNED_STRUCT;
 
 /* Most code should use these functions to set Lisp fields in struct frame.  */
@@ -1021,9 +1016,11 @@ default_pixels_per_inch_y (void)
    does not have FRAME_DISPLAY_INFO.  */
 #ifdef HAVE_WINDOW_SYSTEM
 #ifndef HAVE_ANDROID
-# define MOUSE_HL_INFO(F)					\
+#   define MOUSE_HL_INFO(F)					\
   (FRAME_WINDOW_P (F)						\
-   ? &FRAME_DISPLAY_INFO(F)->mouse_highlight			\
+  ? (FRAME_OUTPUT_DATA (F)					\
+     ? &FRAME_DISPLAY_INFO (F)->mouse_highlight			\
+     : NULL)							\
    : &(F)->output_data.tty->display_info->mouse_highlight)
 #else
 /* There is no "struct tty_output" on Android at all.  */
@@ -1176,9 +1173,6 @@ default_pixels_per_inch_y (void)
 				  && FRAME_X_VISIBLE (f)))
 #endif
 
-/* True if frame F is currently visible but hidden.  */
-#define FRAME_OBSCURED_P(f) ((f)->visible > 1)
-
 /* True if frame F is currently iconified.  */
 #define FRAME_ICONIFIED_P(f) (f)->iconified
 
@@ -1243,21 +1237,23 @@ default_pixels_per_inch_y (void)
 #define FRAME_HAS_VERTICAL_SCROLL_BARS_ON_RIGHT(f) ((void) (f), 0)
 #endif /* HAVE_WINDOW_SYSTEM */
 
-#if defined (HAVE_WINDOW_SYSTEM)
+INLINE struct frame *
+FRAME_PARENT_FRAME (struct frame *f)
+{
+  return NILP (f->parent_frame) ? NULL : XFRAME (f->parent_frame);
+}
+
 #define FRAME_UNDECORATED(f) ((f)->undecorated)
+
+#if defined (HAVE_WINDOW_SYSTEM)
 #ifdef HAVE_NTGUI
 #define FRAME_OVERRIDE_REDIRECT(f) ((void) (f), 0)
 #else
 #define FRAME_OVERRIDE_REDIRECT(f) ((f)->override_redirect)
 #endif
-#define FRAME_PARENT_FRAME(f)			\
-  (NILP ((f)->parent_frame)			\
-   ? NULL					\
-   : XFRAME ((f)->parent_frame))
 #define FRAME_SKIP_TASKBAR(f) ((f)->skip_taskbar)
 #define FRAME_NO_FOCUS_ON_MAP(f) ((f)->no_focus_on_map)
 #define FRAME_NO_ACCEPT_FOCUS(f) ((f)->no_accept_focus)
-#define FRAME_NO_SPECIAL_GLYPHS(f) ((f)->no_special_glyphs)
 #define FRAME_Z_GROUP(f) ((f)->z_group)
 #define FRAME_Z_GROUP_NONE(f) ((f)->z_group == z_group_none)
 #define FRAME_Z_GROUP_ABOVE(f) ((f)->z_group == z_group_above)
@@ -1270,13 +1266,10 @@ default_pixels_per_inch_y (void)
 #define FRAME_NS_TRANSPARENT_TITLEBAR(f) ((f)->ns_transparent_titlebar)
 #endif
 #else /* not HAVE_WINDOW_SYSTEM */
-#define FRAME_UNDECORATED(f) ((void) (f), 0)
 #define FRAME_OVERRIDE_REDIRECT(f) ((void) (f), 0)
-#define FRAME_PARENT_FRAME(f) ((void) (f), NULL)
 #define FRAME_SKIP_TASKBAR(f) ((void) (f), 0)
 #define FRAME_NO_FOCUS_ON_MAP(f) ((void) (f), 0)
 #define FRAME_NO_ACCEPT_FOCUS(f) ((void) (f), 0)
-#define FRAME_NO_SPECIAL_GLYPHS(f) ((void) (f), 0)
 #define FRAME_Z_GROUP(f) ((void) (f), z_group_none)
 #define FRAME_Z_GROUP_NONE(f) ((void) (f), true)
 #define FRAME_Z_GROUP_ABOVE(f) ((void) (f), false)
@@ -1284,6 +1277,8 @@ default_pixels_per_inch_y (void)
 #define FRAME_TOOLTIP_P(f) ((void) f, false)
 #endif /* HAVE_WINDOW_SYSTEM */
 
+#define FRAME_NO_SPECIAL_GLYPHS(f) ((f)->no_special_glyphs)
+
 /* Whether horizontal scroll bars are currently enabled for frame F.  */
 #if USE_HORIZONTAL_SCROLL_BARS
 #define FRAME_HAS_HORIZONTAL_SCROLL_BARS(f) \
@@ -1445,9 +1440,8 @@ extern bool frame_garbaged;
    if some changes were applied to it while it wasn't visible (and hence
    wasn't redisplayed).  */
 INLINE void
-SET_FRAME_VISIBLE (struct frame *f, int v)
+SET_FRAME_VISIBLE (struct frame *f, bool v)
 {
-  eassert (0 <= v && v <= 2);
   if (v)
     {
       if (v == 1 && f->visible != 1)
@@ -1504,13 +1498,14 @@ extern struct frame *decode_any_frame (Lisp_Object);
 extern struct frame *make_initial_frame (void);
 extern struct frame *make_frame (bool);
 #ifdef HAVE_WINDOW_SYSTEM
-extern struct frame *make_minibuffer_frame (void);
-extern struct frame *make_frame_without_minibuffer (Lisp_Object,
-                                                    struct kboard *,
-                                                    Lisp_Object);
 extern bool display_available (void);
 #endif
 
+struct frame *make_minibuffer_frame (void);
+struct frame *
+make_frame_without_minibuffer (Lisp_Object mini_window,
+			       KBOARD *kb, Lisp_Object display);
+
 INLINE bool
 window_system_available (struct frame *f)
 {
@@ -1522,6 +1517,8 @@ window_system_available (struct frame *f)
 }
 
 extern WINDOW_SYSTEM_RETURN void check_window_system (struct frame *);
+void check_tty (struct frame *f);
+struct frame *decode_tty_frame (Lisp_Object frame);
 extern void frame_make_pointer_invisible (struct frame *);
 extern void frame_make_pointer_visible (struct frame *);
 extern Lisp_Object delete_frame (Lisp_Object, Lisp_Object);
@@ -1617,15 +1614,11 @@ FRAME_CHILD_FRAME_BORDER_WIDTH (struct frame *f)
 INLINE int
 FRAME_INTERNAL_BORDER_WIDTH (struct frame *f)
 {
-#ifdef HAVE_WINDOW_SYSTEM
   return (FRAME_PARENT_FRAME(f)
 	  ? (FRAME_CHILD_FRAME_BORDER_WIDTH(f) >= 0
 	     ? FRAME_CHILD_FRAME_BORDER_WIDTH(f)
 	     : frame_dimension (f->internal_border_width))
 	  : frame_dimension (f->internal_border_width));
-#else
-  return frame_dimension (f->internal_border_width);
-#endif
 }
 
 /* Pixel-size of window divider lines.  */
@@ -1880,7 +1873,6 @@ extern Lisp_Object gui_display_get_resource (Display_Info *,
 extern void set_frame_menubar (struct frame *f, bool deep_p);
 extern void frame_set_mouse_pixel_position (struct frame *f, int pix_x, int pix_y);
 extern void free_frame_menubar (struct frame *);
-extern bool frame_ancestor_p (struct frame *af, struct frame *df);
 extern enum internal_border_part frame_internal_border_part (struct frame *f, int x, int y);
 
 #if defined HAVE_X_WINDOWS
@@ -1907,6 +1899,8 @@ gui_set_bitmap_icon (struct frame *f)
 #endif /* !HAVE_NS */
 #endif /* HAVE_WINDOW_SYSTEM */
 
+extern bool frame_ancestor_p (struct frame *af, struct frame *df);
+
 INLINE void
 flush_frame (struct frame *f)
 {
diff --git a/src/keyboard.c b/src/keyboard.c
index 6d28dca9aeb..bfb5fd3592b 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -5415,7 +5415,7 @@ static const char *const lispy_kana_keys[] =
 
 /* You'll notice that this table is arranged to be conveniently
    indexed by X Windows keysym values.  */
-#ifdef HAVE_NS
+#if defined HAVE_NS || !defined HAVE_WINDOW_SYSTEM
 /* FIXME: Why are we using X11 keysym values for NS?  */
 static
 #endif
diff --git a/src/minibuf.c b/src/minibuf.c
index 1f94e0e650e..c8267045397 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -913,7 +913,11 @@ read_minibuf (Lisp_Object map, Lisp_Object initial, Lisp_Object prompt,
       XWINDOW (minibuf_window)->cursor.hpos = 0;
       XWINDOW (minibuf_window)->cursor.x = 0;
       XWINDOW (minibuf_window)->must_be_updated_p = true;
-      update_frame (XFRAME (selected_frame), true, true);
+      struct frame *sf = XFRAME (selected_frame);
+      update_frame (sf, true, true);
+      if (is_tty_frame (sf))
+	combine_updates_for_frame (sf, true, true);
+
 #ifndef HAVE_NTGUI
       flush_frame (XFRAME (XWINDOW (minibuf_window)->frame));
 #else
diff --git a/src/nsfns.m b/src/nsfns.m
index 3c012ca8f05..1055a4b37df 100644
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -3351,7 +3351,7 @@ internalBorderWidth or internalBorder (which is what xterm calls
 	      [nswindow orderFront: NSApp];
 	      [nswindow display];
 
-	      SET_FRAME_VISIBLE (tip_f, 1);
+	      SET_FRAME_VISIBLE (tip_f, true);
 	      unblock_input ();
 
 	      goto start_timer;
@@ -3534,7 +3534,7 @@ internalBorderWidth or internalBorder (which is what xterm calls
       [nswindow orderFront: NSApp];
       [nswindow display];
 
-      SET_FRAME_VISIBLE (tip_f, YES);
+      SET_FRAME_VISIBLE (tip_f, true);
       FRAME_PIXEL_WIDTH (tip_f) = width;
       FRAME_PIXEL_HEIGHT (tip_f) = height;
       unblock_input ();
diff --git a/src/nsterm.m b/src/nsterm.m
index f68a22d9fbc..7ad794b6bdb 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -1505,7 +1505,7 @@ -(void)remove
       EmacsView *view = (EmacsView *)FRAME_NS_VIEW (f);
       EmacsWindow *window = (EmacsWindow *)[view window];
 
-      SET_FRAME_VISIBLE (f, 1);
+      SET_FRAME_VISIBLE (f, true);
       ns_raise_frame (f, ! FRAME_NO_FOCUS_ON_MAP (f));
 
       /* Making a new frame from a fullscreen frame will make the new frame
@@ -1550,7 +1550,7 @@ Hide the window (X11 semantics)
   check_window_system (f);
   view = FRAME_NS_VIEW (f);
   [[view window] orderOut: NSApp];
-  SET_FRAME_VISIBLE (f, 0);
+  SET_FRAME_VISIBLE (f, false);
   SET_FRAME_ICONIFIED (f, 0);
 }
 
diff --git a/src/scroll.c b/src/scroll.c
index fd2a9e71207..1d01ae90d72 100644
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -366,7 +366,7 @@ do_scrolling (struct frame *frame, struct glyph_matrix *current_matrix,
     eassert (copy_from[k] >= 0 && copy_from[k] < window_size);
 
   /* Perform the row swizzling.  */
-  mirrored_line_dance (current_matrix, unchanged_at_top, window_size,
+  mirrored_line_dance (frame, unchanged_at_top, window_size,
 		       copy_from, retained_p);
 
   /* Some sanity checks if GLYPH_DEBUG is defined.  */
@@ -780,7 +780,7 @@ do_direct_scrolling (struct frame *frame, struct glyph_matrix *current_matrix,
      copy_from[i] gives the original line to copy to I, and
      retained_p[copy_from[i]] is zero if line I in the new display is
      empty.  */
-  mirrored_line_dance (current_matrix, unchanged_at_top, window_size,
+  mirrored_line_dance (frame, unchanged_at_top, window_size,
 		       copy_from, retained_p);
 
   if (terminal_window_p)
diff --git a/src/term.c b/src/term.c
index 1f524880054..330da251e18 100644
--- a/src/term.c
+++ b/src/term.c
@@ -65,11 +65,9 @@ static int been_here = -1;
 #ifndef HAVE_ANDROID
 
 static void tty_set_scroll_region (struct frame *f, int start, int stop);
-static void turn_on_face (struct frame *, int face_id);
-static void turn_off_face (struct frame *, int face_id);
+static void turn_on_face (struct frame *f, struct face *face);
+static void turn_off_face (struct frame *f, struct face *face);
 static void tty_turn_off_highlight (struct tty_display_info *);
-static void tty_show_cursor (struct tty_display_info *);
-static void tty_hide_cursor (struct tty_display_info *);
 static void tty_background_highlight (struct tty_display_info *tty);
 static void clear_tty_hooks (struct terminal *terminal);
 static void set_tty_hooks (struct terminal *terminal);
@@ -336,7 +334,7 @@ tty_toggle_highlight (struct tty_display_info *tty)
 
 /* Make cursor invisible.  */
 
-static void
+void
 tty_hide_cursor (struct tty_display_info *tty)
 {
   if (tty->cursor_hidden == 0)
@@ -353,7 +351,7 @@ tty_hide_cursor (struct tty_display_info *tty)
 
 /* Ensure that cursor is visible.  */
 
-static void
+void
 tty_show_cursor (struct tty_display_info *tty)
 {
   if (tty->cursor_hidden)
@@ -788,13 +786,20 @@ tty_write_glyphs (struct frame *f, struct glyph *string, int len)
       /* Identify a run of glyphs with the same face.  */
       int face_id = string->face_id;
 
+      /* FIXME/tty: it happens that a single glyph's frame is NULL. It
+	 might depend on a tab bar line being present, then switching
+	 from a buffer without header line to one with header line and
+	 opening a child frame. */
+      struct frame *face_id_frame = string->frame ? string->frame : f;
+
       for (n = 1; n < stringlen; ++n)
-	if (string[n].face_id != face_id)
+	if (string[n].face_id != face_id || string[n].frame != face_id_frame)
 	  break;
 
       /* Turn appearance modes of the face of the run on.  */
       tty_highlight_if_desired (tty);
-      turn_on_face (f, face_id);
+      struct face *face = FACE_FROM_ID (face_id_frame, face_id);
+      turn_on_face (f, face);
 
       if (n == stringlen)
 	/* This is the last run.  */
@@ -812,7 +817,7 @@ tty_write_glyphs (struct frame *f, struct glyph *string, int len)
       string += n;
 
       /* Turn appearance modes off.  */
-      turn_off_face (f, face_id);
+      turn_off_face (f, face);
       tty_turn_off_highlight (tty);
     }
 
@@ -822,8 +827,8 @@ tty_write_glyphs (struct frame *f, struct glyph *string, int len)
 #ifndef DOS_NT
 
 static void
-tty_write_glyphs_with_face (register struct frame *f, register struct glyph *string,
-			    register int len, register int face_id)
+tty_write_glyphs_with_face (struct frame *f, struct glyph *string,
+			    int len, struct face *face)
 {
   unsigned char *conversion_buffer;
   struct coding_system *coding;
@@ -856,7 +861,7 @@ tty_write_glyphs_with_face (register struct frame *f, register struct glyph *str
 
   /* Turn appearance modes of the face.  */
   tty_highlight_if_desired (tty);
-  turn_on_face (f, face_id);
+  turn_on_face (f, face);
 
   coding->mode |= CODING_MODE_LAST_BLOCK;
   conversion_buffer = encode_terminal_code (string, len, coding);
@@ -871,7 +876,7 @@ tty_write_glyphs_with_face (register struct frame *f, register struct glyph *str
     }
 
   /* Turn appearance modes off.  */
-  turn_off_face (f, face_id);
+  turn_off_face (f, face);
   tty_turn_off_highlight (tty);
 
   cmcheckmagic (tty);
@@ -919,6 +924,7 @@ tty_insert_glyphs (struct frame *f, struct glyph *start, int len)
 
   while (len-- > 0)
     {
+      struct face *face = NULL;
       OUTPUT1_IF (tty, tty->TS_ins_char);
       if (!start)
 	{
@@ -928,7 +934,10 @@ tty_insert_glyphs (struct frame *f, struct glyph *start, int len)
       else
 	{
 	  tty_highlight_if_desired (tty);
-	  turn_on_face (f, start->face_id);
+	  int face_id = start->face_id;
+	  struct frame *face_id_frame = start->frame;
+	  face = FACE_FROM_ID (face_id_frame, face_id);
+	  turn_on_face (f, face);
 	  glyph = start;
 	  ++start;
 	  /* We must open sufficient space for a character which
@@ -957,9 +966,9 @@ tty_insert_glyphs (struct frame *f, struct glyph *start, int len)
 	}
 
       OUTPUT1_IF (tty, tty->TS_pad_inserted_char);
-      if (start)
+      if (face)
 	{
-	  turn_off_face (f, glyph->face_id);
+	  turn_off_face (f, face);
 	  tty_turn_off_highlight (tty);
 	}
     }
@@ -1542,6 +1551,7 @@ append_glyph (struct it *it)
       glyph->type = CHAR_GLYPH;
       glyph->pixel_width = 1;
       glyph->u.ch = it->char_to_display;
+      glyph->frame = it->f;
       glyph->face_id = it->face_id;
       glyph->avoid_cursor_p = it->avoid_cursor_p;
       glyph->multibyte_p = it->multibyte_p;
@@ -1769,6 +1779,7 @@ append_composite_glyph (struct it *it)
 
       glyph->avoid_cursor_p = it->avoid_cursor_p;
       glyph->multibyte_p = it->multibyte_p;
+      glyph->frame = it->f;
       glyph->face_id = it->face_id;
       glyph->padding_p = false;
       glyph->charpos = CHARPOS (it->position);
@@ -1855,6 +1866,7 @@ append_glyphless_glyph (struct it *it, int face_id, const char *str)
   glyph->pixel_width = 1;
   glyph->avoid_cursor_p = it->avoid_cursor_p;
   glyph->multibyte_p = it->multibyte_p;
+  glyph->frame = it->f;
   glyph->face_id = face_id;
   glyph->padding_p = false;
   glyph->charpos = CHARPOS (it->position);
@@ -1981,9 +1993,8 @@ produce_glyphless_glyph (struct it *it, Lisp_Object acronym)
    FACE_ID is a realized face ID number, in the face cache.  */
 
 static void
-turn_on_face (struct frame *f, int face_id)
+turn_on_face (struct frame *f, struct face *face)
 {
-  struct face *face = FACE_FROM_ID (f, face_id);
   unsigned long fg = face->foreground;
   unsigned long bg = face->background;
   struct tty_display_info *tty = FRAME_TTY (f);
@@ -2064,9 +2075,8 @@ turn_on_face (struct frame *f, int face_id)
 /* Turn off appearances of face FACE_ID on tty frame F.  */
 
 static void
-turn_off_face (struct frame *f, int face_id)
+turn_off_face (struct frame *f, struct face *face)
 {
-  struct face *face = FACE_FROM_ID (f, face_id);
   struct tty_display_info *tty = FRAME_TTY (f);
 
   if (tty->TS_exit_attribute_mode)
@@ -2399,8 +2409,10 @@ A suspended tty may be resumed by calling `resume-tty' on it.  */)
       t->display_info.tty->output = 0;
 
       if (FRAMEP (t->display_info.tty->top_frame))
-        SET_FRAME_VISIBLE (XFRAME (t->display_info.tty->top_frame), 0);
-
+	{
+	  struct frame *top = XFRAME (t->display_info.tty->top_frame);
+	  SET_FRAME_VISIBLE (root_frame (top), false);
+	}
     }
 
   /* Clear display hooks to prevent further output.  */
@@ -2472,7 +2484,8 @@ frame's terminal). */)
 
       if (FRAMEP (t->display_info.tty->top_frame))
 	{
-	  struct frame *f = XFRAME (t->display_info.tty->top_frame);
+	  struct frame *top = XFRAME (t->display_info.tty->top_frame);
+	  struct frame *f = root_frame (top);
 	  int width, height;
 	  int old_height = FRAME_COLS (f);
 	  int old_width = FRAME_TOTAL_LINES (f);
@@ -2482,7 +2495,7 @@ frame's terminal). */)
 	  get_tty_size (fileno (t->display_info.tty->input), &width, &height);
 	  if (width != old_width || height != old_height)
 	    change_frame_size (f, width, height, false, false, false);
-	  SET_FRAME_VISIBLE (XFRAME (t->display_info.tty->top_frame), 1);
+	  SET_FRAME_VISIBLE (f, true);
 	}
 
       set_tty_hooks (t);
@@ -2563,22 +2576,24 @@ tty_draw_row_with_mouse_face (struct window *w, struct glyph_row *row,
   struct frame *f = XFRAME (WINDOW_FRAME (w));
   struct tty_display_info *tty = FRAME_TTY (f);
   int face_id = tty->mouse_highlight.mouse_face_face_id;
-  int save_x, save_y, pos_x, pos_y;
 
   if (end_hpos >= row->used[TEXT_AREA])
     nglyphs = row->used[TEXT_AREA] - start_hpos;
 
-  pos_y = row->y + WINDOW_TOP_EDGE_Y (w);
-  pos_x = row->used[LEFT_MARGIN_AREA] + start_hpos + WINDOW_LEFT_EDGE_X (w);
+  int pos_y = row->y + WINDOW_TOP_EDGE_Y (w);
+  int pos_x = row->used[LEFT_MARGIN_AREA] + start_hpos + WINDOW_LEFT_EDGE_X (w);
 
   /* Save current cursor coordinates.  */
-  save_y = curY (tty);
-  save_x = curX (tty);
+  int save_y = curY (tty);
+  int save_x = curX (tty);
   cursor_to (f, pos_y, pos_x);
 
   if (draw == DRAW_MOUSE_FACE)
-    tty_write_glyphs_with_face (f, row->glyphs[TEXT_AREA] + start_hpos,
-				nglyphs, face_id);
+    {
+      struct glyph *glyph = row->glyphs[TEXT_AREA] + start_hpos;
+      struct face *face = FACE_FROM_ID (f, face_id);
+      tty_write_glyphs_with_face (f, glyph, nglyphs, face);
+    }
   else if (draw == DRAW_NORMAL_TEXT)
     write_glyphs (f, row->glyphs[TEXT_AREA] + start_hpos, nglyphs);
 
@@ -3969,7 +3984,7 @@ tty_free_frame_resources (struct frame *f)
 
 #endif
 
-
+
 
 #ifndef HAVE_ANDROID
 
@@ -4044,6 +4059,8 @@ set_tty_hooks (struct terminal *terminal)
   terminal->read_socket_hook = &tty_read_avail_input; /* keyboard.c */
   terminal->delete_frame_hook = &tty_free_frame_resources;
   terminal->delete_terminal_hook = &delete_tty;
+
+  terminal->frame_raise_lower_hook = tty_raise_lower_frame;
   /* Other hooks are NULL by default.  */
 }
 
@@ -4714,6 +4731,184 @@ delete_tty (struct terminal *terminal)
 
 #endif
 
+/* Return geometric attributes of FRAME.  According to the value of
+   ATTRIBUTES return the outer edges of FRAME (Qouter_edges), the
+   native edges of FRAME (Qnative_edges), or the inner edges of frame
+   (Qinner_edges).  Any other value means to return the geometry as
+   returned by Fx_frame_geometry.  */
+
+static Lisp_Object
+tty_frame_geometry (Lisp_Object frame, Lisp_Object attribute)
+{
+  struct frame *f = decode_live_frame (frame);
+  if (FRAME_INITIAL_P (f) || !FRAME_TTY (f))
+    return Qnil;
+
+  int native_width = f->pixel_width;
+  int native_height = f->pixel_height;
+
+  eassert (FRAME_PARENT_FRAME (f) || (f->left_pos == 0 && f->top_pos == 0));
+  int outer_left = f->left_pos;
+  int outer_top = f->top_pos;
+  int outer_right = outer_left + native_width;
+  int outer_bottom = outer_top + native_height;
+
+  int native_left = outer_left;
+  int native_top = outer_top;
+  int native_right = outer_right;
+  int native_bottom = outer_bottom;
+
+  int internal_border_width = FRAME_INTERNAL_BORDER_WIDTH (f);
+  int inner_left = native_left + internal_border_width;
+  int inner_top = native_top + internal_border_width;
+  int inner_right = native_right - internal_border_width;
+  int inner_bottom = native_bottom - internal_border_width;
+
+  int menu_bar_height = FRAME_MENU_BAR_HEIGHT (f);
+  inner_top += menu_bar_height;
+  int menu_bar_width = menu_bar_height ? native_width : 0;
+
+  int tab_bar_height = FRAME_TAB_BAR_HEIGHT (f);
+  int tab_bar_width = (tab_bar_height
+		       ? native_width - 2 * internal_border_width
+		       : 0);
+  inner_top += tab_bar_height;
+
+  int tool_bar_height = FRAME_TOOL_BAR_HEIGHT (f);
+  int tool_bar_width = (tool_bar_height
+			? native_width - 2 * internal_border_width
+			: 0);
+
+  /* Subtract or add to the inner dimensions based on the tool bar
+     position.  */
+  if (EQ (FRAME_TOOL_BAR_POSITION (f), Qtop))
+    inner_top += tool_bar_height;
+  else
+    inner_bottom -= tool_bar_height;
+
+  /* Construct list.  */
+  if (EQ (attribute, Qouter_edges))
+    return list4i (outer_left, outer_top, outer_right, outer_bottom);
+  else if (EQ (attribute, Qnative_edges))
+    return list4i (native_left, native_top, native_right, native_bottom);
+  else if (EQ (attribute, Qinner_edges))
+    return list4i (inner_left, inner_top, inner_right, inner_bottom);
+  else
+    return list (Fcons (Qouter_position, Fcons (make_fixnum (outer_left),
+						make_fixnum (outer_top))),
+		 Fcons (Qouter_size,
+			Fcons (make_fixnum (outer_right - outer_left),
+			       make_fixnum (outer_bottom - outer_top))),
+		 Fcons (Qouter_border_width, make_fixnum (0)),
+		 Fcons (Qexternal_border_size,
+			Fcons (make_fixnum (0), make_fixnum (0))),
+		 Fcons (Qtitle_bar_size,
+			Fcons (make_fixnum (0), make_fixnum (0))),
+		 Fcons (Qmenu_bar_external, Qnil),
+		 Fcons (Qmenu_bar_size,
+			Fcons (make_fixnum (menu_bar_width),
+			       make_fixnum (menu_bar_height))),
+		 Fcons (Qtab_bar_size,
+			Fcons (make_fixnum (tab_bar_width),
+			       make_fixnum (tab_bar_height))),
+		 Fcons (Qtool_bar_external, Qnil),
+		 Fcons (Qtool_bar_position, FRAME_TOOL_BAR_POSITION (f)),
+		 Fcons (Qtool_bar_size,
+			Fcons (make_fixnum (tool_bar_width),
+			       make_fixnum (tool_bar_height))),
+		 Fcons (Qinternal_border_width,
+			make_fixnum (internal_border_width)));
+}
+
+DEFUN ("tty-frame-geometry", Ftty_frame_geometry, Stty_frame_geometry, 0, 1, 0,
+       doc: /* Return geometric attributes of terminal frame FRAME.
+	       See also `frame-geometry'.  */)
+  (Lisp_Object frame)
+{
+  return tty_frame_geometry (frame, Qnil);
+}
+
+DEFUN ("tty-frame-edges", Ftty_frame_edges, Stty_frame_edges, 0, 2, 0,
+       doc: /* Return coordinates of FRAME's edges.
+	       See also `frame-edges'.  */)
+  (Lisp_Object frame, Lisp_Object type)
+{
+  if (!EQ (type, Qouter_edges) && !EQ (type, Qinner_edges))
+    type = Qnative_edges;
+  return tty_frame_geometry (frame, type);
+}
+
+DEFUN ("tty-frame-list-z-order", Ftty_frame_list_z_order,
+       Stty_frame_list_z_order, 0, 1, 0,
+       doc: /* Return list of Emacs's frames, in Z (stacking) order.
+	       See also `frame-list-z-order'.  */)
+  (Lisp_Object frame)
+{
+  struct frame *f = decode_tty_frame (frame);
+  Lisp_Object frames = frames_in_reverse_z_order (f, true);
+  return Fnreverse (frames);
+}
+
+DEFUN ("tty-frame-restack", Ftty_frame_restack,
+       Stty_frame_restack, 2, 3, 0,
+       doc: /* Restack FRAME1 below FRAME2 on terminals.
+.	       See also `frame-restack'.  */)
+  (Lisp_Object frame1, Lisp_Object frame2, Lisp_Object above)
+{
+  /* FIXME/tty: tty-frame-restack implementation.  */
+  return Qnil;
+}
+
+static void
+tty_display_dimension (Lisp_Object frame, int *width, int *height)
+{
+  if (!FRAMEP (frame))
+    frame = Fselected_frame ();
+  struct frame *f = XFRAME (frame);
+  switch (f->output_method)
+    {
+    case output_initial:
+      *width = 80;
+      *height = 25;
+      break;
+    case output_termcap:
+      *width = FrameCols (FRAME_TTY (f));
+      *height = FrameRows (FRAME_TTY (f));
+      break;
+    case output_x_window:
+    case output_msdos_raw:
+    case output_w32:
+    case output_ns:
+    case output_pgtk:
+    case output_haiku:
+    case output_android:
+      emacs_abort ();
+      break;
+    }
+}
+
+DEFUN ("tty-display-pixel-width", Ftty_display_pixel_width,
+       Stty_display_pixel_width, 0, 1, 0,
+       doc: /* Return the width of DISPLAY's screen in pixels.
+.	       See also `display-pixel-width'.  */)
+  (Lisp_Object display)
+{
+  int width, height;
+  tty_display_dimension (display, &width, &height);
+  return make_fixnum (width);
+}
+
+DEFUN ("tty-display-pixel-height", Ftty_display_pixel_height,
+       Stty_display_pixel_height, 0, 1, 0,
+       doc: /* Return the height of DISPLAY's screen in pixels.
+	       See also `display-pixel-height'.  */)
+  (Lisp_Object display)
+{
+  int width, height;
+  tty_display_dimension (display, &width, &height);
+  return make_fixnum (height);
+}
+
 void
 syms_of_term (void)
 {
@@ -4770,6 +4965,13 @@ trigger redisplay.  */);
   defsubr (&Sgpm_mouse_stop);
 #endif /* HAVE_GPM */
 
+  defsubr (&Stty_frame_geometry);
+  defsubr (&Stty_frame_edges);
+  defsubr (&Stty_frame_list_z_order);
+  defsubr (&Stty_frame_restack);
+  defsubr (&Stty_display_pixel_width);
+  defsubr (&Stty_display_pixel_height);
+
 #if !defined DOS_NT && !defined HAVE_ANDROID
   default_orig_pair = NULL;
   default_set_foreground = NULL;
diff --git a/src/termhooks.h b/src/termhooks.h
index d6a9300bac9..1c2cd46e44e 100644
--- a/src/termhooks.h
+++ b/src/termhooks.h
@@ -974,6 +974,9 @@ extern int cursorY (struct tty_display_info *);
 #define cursorY(t)  curY(t)
 #endif
 
+void tty_hide_cursor (struct tty_display_info *tty);
+void tty_show_cursor (struct tty_display_info *tty);
+
 INLINE_HEADER_END
 
 #endif /* EMACS_TERMHOOKS_H */
diff --git a/src/terminal.c b/src/terminal.c
index 5c21341d905..ad488ea3b52 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -111,7 +111,8 @@ void
 cursor_to (struct frame *f, int vpos, int hpos)
 {
   if (FRAME_TERMINAL (f)->cursor_to_hook)
-    (*FRAME_TERMINAL (f)->cursor_to_hook) (f, vpos, hpos);
+    (*FRAME_TERMINAL (f)->cursor_to_hook) (f, vpos + f->top_pos,
+					   hpos + f->left_pos);
 }
 
 /* Similar but don't take any account of the wasted characters.  */
@@ -120,7 +121,8 @@ void
 raw_cursor_to (struct frame *f, int row, int col)
 {
   if (FRAME_TERMINAL (f)->raw_cursor_to_hook)
-    (*FRAME_TERMINAL (f)->raw_cursor_to_hook) (f, row, col);
+    (*FRAME_TERMINAL (f)->raw_cursor_to_hook) (f, row + f->top_pos,
+					       col + f->left_pos);
 }
 
 /* Erase operations.  */
diff --git a/src/xdisp.c b/src/xdisp.c
index c74e81a3933..935c75a8230 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -943,7 +943,7 @@ redisplay_trace (char const *fmt, ...)
     {
       va_list ap;
       va_start (ap, fmt);
-      vprintf (fmt, ap);
+      vfprintf (stderr, fmt, ap);
       va_end (ap);
     }
 }
@@ -961,7 +961,7 @@ move_trace (char const *fmt, ...)
     {
       va_list ap;
       va_start (ap, fmt);
-      vprintf (fmt, ap);
+      vfprintf (stderr, fmt, ap);
       va_end (ap);
     }
 }
@@ -3348,9 +3348,7 @@ init_iterator (struct it *it, struct window *w,
      of the iterator's frame, when set, suppresses their display - by
      default for tooltip frames and when set via the 'no-special-glyphs'
      frame parameter.  */
-#ifdef HAVE_WINDOW_SYSTEM
-  if (!(FRAME_WINDOW_P (it->f) && it->f->no_special_glyphs))
-#endif
+  if (!it->f->no_special_glyphs)
     {
       if (it->line_wrap == TRUNCATE)
 	{
@@ -13554,7 +13552,11 @@ echo_area_display (bool update_frame_p)
 	      flush_frame (f);
 	    }
 	  else
-	    update_frame (f, true, true);
+	    {
+	      update_frame (f, true, true);
+	      if (is_tty_frame (f))
+		combine_updates_for_frame (f, true, true);
+	    }
 
 	  /* If cursor is in the echo area, make sure that the next
 	     redisplay displays the minibuffer, so that the cursor will
@@ -17033,6 +17035,9 @@ redisplay_internal (void)
   if (face_change)
     windows_or_buffers_changed = 47;
 
+  /* Can we do better for tty child frames? It could be
+     a bit faster when we switch between child frames of the same
+     root frame. OTOH, it's probably not a frequent use case. */
   if ((FRAME_TERMCAP_P (sf) || FRAME_MSDOS_P (sf))
       && FRAME_TTY (sf)->previous_frame != sf)
     {
@@ -17055,6 +17060,7 @@ redisplay_internal (void)
     {
       struct frame *f = XFRAME (frame);
 
+      /* FRAME_REDISPLAY_P true basically means the frame is visible. */
       if (FRAME_REDISPLAY_P (f))
 	{
 	  ++number_of_visible_frames;
@@ -17198,7 +17204,6 @@ redisplay_internal (void)
       && !current_buffer->clip_changed
       && !current_buffer->prevent_redisplay_optimizations_p
       && FRAME_REDISPLAY_P (XFRAME (w->frame))
-      && !FRAME_OBSCURED_P (XFRAME (w->frame))
       && !XFRAME (w->frame)->cursor_type_changed
       && !XFRAME (w->frame)->face_change
       /* Make sure recorded data applies to current buffer, etc.  */
@@ -17447,22 +17452,35 @@ redisplay_internal (void)
 
       propagate_buffer_redisplay ();
 
+      Lisp_Object tty_root_frames = Qnil;
       FOR_EACH_FRAME (tail, frame)
 	{
 	  struct frame *f = XFRAME (frame);
 
-	  /* We don't have to do anything for unselected terminal
-	     frames.  */
-	  if ((FRAME_TERMCAP_P (f) || FRAME_MSDOS_P (f))
-	      && !EQ (FRAME_TTY (f)->top_frame, frame))
-	    continue;
+	  if (is_tty_frame (f))
+	    {
+	      /* Ignore all invisble tty frames, children or root.  */
+	      if (!FRAME_VISIBLE_P (root_frame (f)))
+		continue;
+
+	      /* Remember tty root frames seen. */
+	      if (!FRAME_PARENT_FRAME (f))
+		{
+		  Lisp_Object found;
+		  for (found = tty_root_frames;
+		       CONSP (found) && !EQ (XCAR (found), frame);
+		       found = XCDR (found))
+		    ;
+		  if (!CONSP (found))
+		    tty_root_frames = Fcons (frame, tty_root_frames);
+		}
+	    }
 
 	retry_frame:
 	  if (FRAME_WINDOW_P (f) || FRAME_TERMCAP_P (f) || f == sf)
 	    {
-	      bool gcscrollbars
-		/* Only GC scrollbars when we redisplay the whole frame.  */
-		= f->redisplay || !REDISPLAY_SOME_P ();
+	      /* Only GC scrollbars when we redisplay the whole frame.  */
+	      bool gcscrollbars = f->redisplay || !REDISPLAY_SOME_P ();
 	      bool f_redisplay_flag = f->redisplay;
 
 	      /* The X error handler may have deleted that frame before
@@ -17479,7 +17497,7 @@ redisplay_internal (void)
 	      if (gcscrollbars && FRAME_TERMINAL (f)->condemn_scroll_bars_hook)
 		FRAME_TERMINAL (f)->condemn_scroll_bars_hook (f);
 
-	      if (FRAME_REDISPLAY_P (f) && !FRAME_OBSCURED_P (f))
+	      if (FRAME_REDISPLAY_P (f))
 		{
 		  /* Don't allow freeing images and faces for this
 		     frame as long as the frame's update wasn't
@@ -17505,7 +17523,7 @@ redisplay_internal (void)
 	      if (gcscrollbars && FRAME_TERMINAL (f)->judge_scroll_bars_hook)
 		FRAME_TERMINAL (f)->judge_scroll_bars_hook (f);
 
-	      if (FRAME_REDISPLAY_P (f) && !FRAME_OBSCURED_P (f))
+	      if (FRAME_REDISPLAY_P (f))
 		{
 		  /* If fonts changed on visible frame, display again.  */
 		  if (f->fonts_changed)
@@ -17590,6 +17608,9 @@ redisplay_internal (void)
 	    }
 	}
 
+      if (CONSP (tty_root_frames))
+	pending |= combine_updates (tty_root_frames, false, false);
+
       eassert (EQ (XFRAME (selected_frame)->selected_window, selected_window));
 
       if (!pending)
@@ -17611,7 +17632,7 @@ redisplay_internal (void)
 	    }
 	}
     }
-  else if (FRAME_REDISPLAY_P (sf) && !FRAME_OBSCURED_P (sf))
+  else if (FRAME_REDISPLAY_P (sf))
     {
       sf->inhibit_clear_image_cache = true;
       displayed_buffer = XBUFFER (XWINDOW (selected_window)->contents);
@@ -17662,7 +17683,7 @@ redisplay_internal (void)
 	unrequest_sigio ();
       STOP_POLLING;
 
-      if (FRAME_REDISPLAY_P (sf) && !FRAME_OBSCURED_P (sf))
+      if (FRAME_REDISPLAY_P (sf))
 	{
           if (hscroll_retries <= MAX_HSCROLL_RETRIES
               && hscroll_windows (selected_window))
@@ -17673,6 +17694,10 @@ redisplay_internal (void)
 
 	  XWINDOW (selected_window)->must_be_updated_p = true;
 	  pending = update_frame (sf, false, false);
+
+	  if (is_tty_frame (sf))
+	    pending |= combine_updates_for_frame (sf, false, false);
+
 	  sf->cursor_type_changed = false;
 	  sf->inhibit_clear_image_cache = false;
 	}
@@ -17685,10 +17710,12 @@ redisplay_internal (void)
       Lisp_Object mini_window = FRAME_MINIBUF_WINDOW (sf);
       struct frame *mini_frame = XFRAME (WINDOW_FRAME (XWINDOW (mini_window)));
 
-      if (mini_frame != sf && FRAME_WINDOW_P (mini_frame))
+      if (mini_frame != sf)
 	{
 	  XWINDOW (mini_window)->must_be_updated_p = true;
 	  pending |= update_frame (mini_frame, false, false);
+	  if (is_tty_frame (mini_frame))
+	    pending |= combine_updates_for_frame (mini_frame, false, false);
 	  mini_frame->cursor_type_changed = false;
           if (!pending && hscroll_retries <= MAX_HSCROLL_RETRIES
               && hscroll_windows (mini_window))
@@ -23975,6 +24002,7 @@ extend_face_to_end_of_line (struct it *it)
 	{
 	  it->glyph_row->glyphs[TEXT_AREA][0] = space_glyph;
 	  it->glyph_row->glyphs[TEXT_AREA][0].face_id = face->id;
+	  it->glyph_row->glyphs[TEXT_AREA][0].frame = f;
 	  it->glyph_row->used[TEXT_AREA] = 1;
 	}
       /* Mode line and the header line don't have margins, and
@@ -23994,6 +24022,7 @@ extend_face_to_end_of_line (struct it *it)
 	      it->glyph_row->glyphs[LEFT_MARGIN_AREA][0] = space_glyph;
 	      it->glyph_row->glyphs[LEFT_MARGIN_AREA][0].face_id =
 		default_face->id;
+	      it->glyph_row->glyphs[LEFT_MARGIN_AREA][0].frame = f;
 	      it->glyph_row->used[LEFT_MARGIN_AREA] = 1;
 	    }
 	  if (WINDOW_RIGHT_MARGIN_WIDTH (it->w) > 0
@@ -24002,6 +24031,7 @@ extend_face_to_end_of_line (struct it *it)
 	      it->glyph_row->glyphs[RIGHT_MARGIN_AREA][0] = space_glyph;
 	      it->glyph_row->glyphs[RIGHT_MARGIN_AREA][0].face_id =
 		default_face->id;
+	      it->glyph_row->glyphs[RIGHT_MARGIN_AREA][0].frame = f;
 	      it->glyph_row->used[RIGHT_MARGIN_AREA] = 1;
 	    }
 
@@ -24366,9 +24396,11 @@ highlight_trailing_whitespace (struct it *it)
 	      while (glyph >= start
 		     && BUFFERP (glyph->object)
 		     && (glyph->type == STRETCH_GLYPH
-			 || (glyph->type == CHAR_GLYPH
-			     && glyph->u.ch == ' ')))
-		(glyph--)->face_id = face_id;
+			 || (glyph->type == CHAR_GLYPH && glyph->u.ch == ' ')))
+		{
+		  glyph->frame = it->f;
+		  (glyph--)->face_id = face_id;
+		}
 	    }
 	  else
 	    {
@@ -24377,7 +24409,10 @@ highlight_trailing_whitespace (struct it *it)
 		     && (glyph->type == STRETCH_GLYPH
 			 || (glyph->type == CHAR_GLYPH
 			     && glyph->u.ch == ' ')))
-		(glyph++)->face_id = face_id;
+		{
+		  glyph->frame = it->f;
+		  (glyph++)->face_id = face_id;
+		}
 	    }
 	}
     }
@@ -27230,7 +27265,7 @@ display_menu_bar (struct window *w)
 
 /* Deep copy of a glyph row, including the glyphs.  */
 static void
-deep_copy_glyph_row (struct glyph_row *to, struct glyph_row *from)
+deep_copy_glyph_row (struct frame *f, struct glyph_row *to, struct glyph_row *from)
 {
   struct glyph *pointers[1 + LAST_AREA];
   int to_used = to->used[TEXT_AREA];
@@ -27251,7 +27286,7 @@ deep_copy_glyph_row (struct glyph_row *to, struct glyph_row *from)
   /* If we filled only part of the TO row, fill the rest with
      space_glyph (which will display as empty space).  */
   if (to_used > from->used[TEXT_AREA])
-    fill_up_frame_row_with_spaces (to, to_used);
+    fill_up_frame_row_with_spaces (f, to, to_used);
 }
 
 /* Display one menu item on a TTY, by overwriting the glyphs in the
@@ -27300,7 +27335,7 @@ display_tty_menu_item (const char *item_text, int width, int face_id,
   it.last_visible_x = FRAME_COLS (f) - 1;
   row = it.glyph_row;
   /* Start with the row contents from the current matrix.  */
-  deep_copy_glyph_row (row, f->current_matrix->rows + y);
+  deep_copy_glyph_row (f, row, f->current_matrix->rows + y);
   bool saved_width = row->full_width_p;
   row->full_width_p = true;
   bool saved_reversed = row->reversed_p;
diff --git a/src/xfaces.c b/src/xfaces.c
index e248279e9b7..fd321734d14 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -696,7 +696,6 @@ void
 free_frame_faces (struct frame *f)
 {
   struct face_cache *face_cache = FRAME_FACE_CACHE (f);
-
   if (face_cache)
     {
       free_face_cache (face_cache);