commit a8169bee2064282a40214ef65ef0493233ed4669 (HEAD, refs/remotes/origin/master)
Author: Manuel Giraud <manuel@ledu-giraud.fr>
Date:   Fri Nov 29 16:35:47 2024 +0100

    Fix exiting Emacs after saving a tutorial
    
    * lisp/tutorial.el (tutorial--lang)
    (tutorial--point-before-chkeys): Add both variables as
    permanent-local, so that saving the tutorial to some file
    doesn't kill these buffer-local variables.  Otherwise, trying to
    exit Emacs after saving the tutorial will signal an error,
    because 'tutorial--lang' is nil.  (Bug#74364)

diff --git a/lisp/tutorial.el b/lisp/tutorial.el
index d754db238de..86537d995fe 100644
--- a/lisp/tutorial.el
+++ b/lisp/tutorial.el
@@ -650,7 +650,12 @@ with some explanatory links."
 	  (delete-region prop-start prop-end))))))
 
 (defvar tutorial--starting-point)
+
+;; For when the user saves the TUTORIAL to a file.
 (put 'tutorial--starting-point 'permanent-local t)
+(put 'tutorial--lang 'permanent-local t)
+(put 'tutorial--point-before-chkeys 'permanent-local t)
+
 (defun tutorial--save-on-kill ()
   "Query the user about saving the tutorial when killing Emacs."
   (when (buffer-live-p tutorial--buffer)

commit d06a0153ced177ab41e578baac4b26667f337b58
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Sat Nov 30 06:47:12 2024 -0500

    ; * etc/NEWS.30: Fix merge problem.

diff --git a/etc/NEWS.30 b/etc/NEWS.30
index 9f60ec7e6c3..3d691cfac40 100644
--- a/etc/NEWS.30
+++ b/etc/NEWS.30
@@ -103,6 +103,36 @@ collections of snippets automatically apply to the new Tree-Sitter modes.
 Note that those modes still do not inherit from the non-TS mode, so
 configuration settings installed via mode hooks are not affected.
 
+Loading a Tree-Sitter mode (such as by using 'M-x load-library' or with
+'M-x load-file') by default causes the corresponding non-Tree-Sitter
+mode be remapped to the Tree-Sitter mode.  This remapping affects
+visiting files for which 'auto-mode-alist' specifies a non-Tree-Sitter
+mode, and also affects mode-specification cookies on the first line of a
+file and mode specifications in file- and directory-local variables.  To
+revert to using a non-Tree-Sitter mode, reload the corresponding mode
+file anew.  To prevent file loading from turning on Tree-Sitter mode
+when 'auto-mode-alist' or the file/directory-local variables specify a
+non-Tree-Sitter mode, customize the user option 'major-mode-remap-alist'
+to specify that a non-Tree-Sitter mode is "remapped" to itself.  For
+example:
+
+    (add-to-list 'major-mode-remap-alist '(c-mode))
+
+specifies that C Mode should not be remapped to 'c-ts-mode' even if and
+when 'c-ts-mode' is loaded.  Conversely,
+
+    (add-to-list 'major-mode-remap-alist '(c-mode . c-ts-mode))
+
+tells Emacs to always invoke 'c-ts-mode' whenever 'c-mode' is
+requested, either by 'auto-mode-alist' or by file/directory-local
+variables.
+
+We recommend using 'major-mode-remap-alist' to express your preferences
+for using Tree-Sitter or non-Tree-Sitter modes for files for which both
+variants of major modes are available, because that variable overrides
+the remapping Emacs might decide to perform as result of loading Lisp
+files and features.
+
 ---
 ** Mouse wheel events should now always be 'wheel-up/down/left/right'.
 At those places where the old 'mouse-4/5/6/7' events could still occur

commit 88f6b045f482d5d842eaed1d7e949e488e8cedd1
Merge: 82bdb3bfd03 afb34a3b239
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Sat Nov 30 06:44:06 2024 -0500

    Merge from origin/emacs-30
    
    afb34a3b239 ; Improve documentation of ':box' face attribute
    b38eb6da1d1 Fix docstring of c-ts-mode-indent-style
    9fdb764898d Support PHP 8.4 and more reliable indentation (bug#74525)
    bda0bce9e43 Don't inadvertently reset frame scroll bar sizes (Bug#74435)
    3f99cdaf26d Mention special variables in lexical binding documentation
    0ef0f18f163 Allow to go back to using 'ruby-mode' after loading 'ruby...
    fc17e8727d4 Delete obsolete section in admin/notes/repo
    3e396b2c5bb Improve documentation for 'while-let'
    50b91ed458d Remove mention of treesit-defun-prefer-top-level (bug#74474)
    03ae07291e8 Fix NS non-native fullscreen on initial frame load (bug#5...
    8261d7224d3 Fix user options for listing and marking diary files
    
    # Conflicts:
    #       lisp/progmodes/c-ts-mode.el

commit 82bdb3bfd035577a43afdf1eafd18ee1a60a987c
Merge: ffa9ad5c1fe 6f6a92624e9
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Sat Nov 30 06:35:29 2024 -0500

    ; Merge from origin/emacs-30
    
    The following commit was skipped:
    
    6f6a92624e9 Avoid loading 'rx' at runtime in 'lua-ts-mode'

commit ffa9ad5c1fe732c933e12a7aa65452810ea1eced
Merge: 7c90ffcf869 d9531793206
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Sat Nov 30 06:35:16 2024 -0500

    Merge from origin/emacs-30
    
    d9531793206 Make 'jsonrpc-default-request-timeout' a defcustom
    5339c6f69ee ; Improve example of display-buffer-alist category in ELi...
    e14007ad631 Update MS-Windows build instructions
    
    # Conflicts:
    #       etc/NEWS

commit 7c90ffcf8698a55229c47845dbdb2dc6cfa9bb6f
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Sat Nov 30 12:55:19 2024 +0200

    ; * src/charset.c (Fmap_charset_chars): Fix last change (bug#74555).

diff --git a/src/charset.c b/src/charset.c
index 37d08f249c7..499782011a2 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -819,7 +819,7 @@ TO-CODE, which are CHARSET code points.  */)
     from = CHARSET_MIN_CODE (cs);
   else
     {
-      CHECK_FIXNAT(from_code);
+      CHECK_FIXNAT (from_code);
       from = XFIXNUM (from_code);
       if (from < CHARSET_MIN_CODE (cs))
 	from = CHARSET_MIN_CODE (cs);
@@ -828,7 +828,7 @@ TO-CODE, which are CHARSET code points.  */)
     to = CHARSET_MAX_CODE (cs);
   else
     {
-      CHECK_FIXNAT(to_code);
+      CHECK_FIXNAT (to_code);
       to = XFIXNUM (to_code);
       if (to > CHARSET_MAX_CODE (cs))
 	to = CHARSET_MAX_CODE (cs);

commit 2125e188ad806134dfc81408822208d75d7f3b5a
Author: altermo <107814000+altermo@users.noreply.github.com>
Date:   Wed Nov 27 10:37:28 2024 +0100

    Add more error-checking to Fmap_charset_chars
    
    * src/charset.c (Fmap_charset_chars): Signal an error if FROM_CODE
    or TO_CODE is non-nil and not a fixnum.  (Bug#74555)
    
    Copyright-paperwork-exempt: yes

diff --git a/src/charset.c b/src/charset.c
index f7d80cc3f3e..37d08f249c7 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -819,6 +819,7 @@ TO-CODE, which are CHARSET code points.  */)
     from = CHARSET_MIN_CODE (cs);
   else
     {
+      CHECK_FIXNAT(from_code);
       from = XFIXNUM (from_code);
       if (from < CHARSET_MIN_CODE (cs))
 	from = CHARSET_MIN_CODE (cs);
@@ -827,6 +828,7 @@ TO-CODE, which are CHARSET code points.  */)
     to = CHARSET_MAX_CODE (cs);
   else
     {
+      CHECK_FIXNAT(to_code);
       to = XFIXNUM (to_code);
       if (to > CHARSET_MAX_CODE (cs))
 	to = CHARSET_MAX_CODE (cs);

commit afb34a3b2393decb50e250ed8caa559b64020379
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Sat Nov 30 12:44:01 2024 +0200

    ; Improve documentation of ':box' face attribute
    
    * doc/lispref/display.texi (Face Attributes): Describe a subtlety
    of displaying ':box'.  (Bug#74536)

diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index 11faf1dc9a0..5ecca832b68 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -2803,7 +2803,11 @@ being pressed.  If it is @code{pressed-button}, the box looks like a
 If you use the @code{:box} face attribute on strings displayed instead
 of buffer text via the @code{display} text property, special
 considerations might apply if the surrounding buffer text also has the
-@code{:box} face attribute.  @xref{Replacing Specs}.
+@code{:box} face attribute.  @xref{Replacing Specs}.  Also note that the
+vertical lines of the box are only drawn when @code{:box} attribute
+changes from @code{nil} to non-@code{nil} or vice versa; two consecutive
+face properties with a non-@code{nil} @code{:box} attribute will be
+displayed without the vertical line between them.
 
 @item :inverse-video
 Whether or not characters should be displayed in inverse video.  The

commit 8ef44ca64eb40485751207096ee69930895364d9
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Sat Nov 30 12:34:40 2024 +0200

    ; Improve commentary of last change.

diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index 04d995d0404..3aa0f0919bc 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -301,7 +301,7 @@ naming the shell."
 	 "^\\s-*\\([[:alpha:]_][[:alnum:]_]*\\)\\s-*()"
 	 1)))
     ;; The difference between the Bash regular expression and the sh regular
-    ;; expression is that Bash also allows hyphens (-).
+    ;; expression is that Bash also allows hyphens (-) in function names.
     (bash
      . ((nil
          ;; function FOO

commit 2ea0919550366babfea1de6468ef9e8b1857b478
Author: James Cherti <contact@jamescherti.com>
Date:   Sun Nov 24 12:09:33 2024 -0500

    Support hyphen in Bash function names
    
    * lisp/progmodes/sh-script.el (sh-imenu-generic-expression): Add
    hyphen to function-name regexp.
    
    Copyright-paperwork-exempt: yes

diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index 8ba64100203..04d995d0404 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -300,6 +300,18 @@ naming the shell."
 	(nil
 	 "^\\s-*\\([[:alpha:]_][[:alnum:]_]*\\)\\s-*()"
 	 1)))
+    ;; The difference between the Bash regular expression and the sh regular
+    ;; expression is that Bash also allows hyphens (-).
+    (bash
+     . ((nil
+         ;; function FOO
+         ;; function FOO()
+         "^\\s-*function\\s-+\\([[:alpha:]_][[:alnum:]_-]*\\)\\s-*\\(?:()\\)?"
+         1)
+        ;; FOO()
+        (nil
+         "^\\s-*\\([[:alpha:]_][[:alnum:]_-]*\\)\\s-*()"
+         1)))
     (mksh
      . ((nil
          ;; function FOO

commit b38eb6da1d164b50f4b727b2539cf02c40b73123
Author: Yuan Fu <casouri@gmail.com>
Date:   Fri Nov 29 21:11:19 2024 -0800

    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.

diff --git a/lisp/progmodes/c-ts-mode.el b/lisp/progmodes/c-ts-mode.el
index 31f822b219d..e08e99cf087 100644
--- a/lisp/progmodes/c-ts-mode.el
+++ b/lisp/progmodes/c-ts-mode.el
@@ -147,10 +147,11 @@ symbol."
 (defcustom c-ts-mode-indent-style 'gnu
   "Style used for indentation.
 
-The selected style could be one of GNU, K&R, LINUX or BSD.  If
-one of the supplied styles doesn't suffice, the value could be
-a function instead.  This function is expected to return a list
-that follows the form of `treesit-simple-indent-rules'."
+The selected style could be one of GNU, K&R, LINUX or BSD.  If the
+supplied styles don't suffice, the value could be a function instead.
+This function takes no arguments and is expected to return a list of
+indent RULEs as described in `treesit-simple-indent-rules'.  Note that
+the list of RULEs doesn't need to contain the language symbol."
   :version "29.1"
   :type '(choice (symbol :tag "Gnu" gnu)
                  (symbol :tag "K&R" k&r)

commit 9fdb764898dd4f40f562f8540767a18c827fe7d3
Author: Vincenzo Pupillo <v.pupillo@gmail.com>
Date:   Mon Nov 25 11:06:02 2024 +0100

    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.

diff --git a/lisp/progmodes/php-ts-mode.el b/lisp/progmodes/php-ts-mode.el
index f9fd03cbf72..6052c79ccf3 100644
--- a/lisp/progmodes/php-ts-mode.el
+++ b/lisp/progmodes/php-ts-mode.el
@@ -84,7 +84,7 @@
 
 ;;; Install treesitter language parsers
 (defvar php-ts-mode--language-source-alist
-  '((php . ("https://github.com/tree-sitter/tree-sitter-php" "v0.23.5" "php/src"))
+  '((php . ("https://github.com/tree-sitter/tree-sitter-php" "v0.23.11" "php/src"))
     (phpdoc . ("https://github.com/claytonrcarter/tree-sitter-phpdoc"))
     (html . ("https://github.com/tree-sitter/tree-sitter-html"  "v0.23.0"))
     (javascript . ("https://github.com/tree-sitter/tree-sitter-javascript" "v0.23.0"))
@@ -477,16 +477,20 @@ PARENT is its parent."
               (treesit-node-start parent)
               (line-end-position))))))
 
-(defun php-ts-mode--js-css-tag-bol (node _parent &rest _)
+(defun php-ts-mode--js-css-tag-bol (_node parent &rest _)
   "Find the first non-space characters of html tags <script> or <style>.
 
-If NODE is nil return `line-beginning-position'.  PARENT is ignored.
-NODE is the node to match and PARENT is its parent."
-  (if (null node)
-      (line-beginning-position)
-    (save-excursion
-      (goto-char (treesit-node-start node))
-      (re-search-backward "<script>\\|<style>" nil t))))
+Return `line-beginning-position' when `treesit-node-at' is HTML or PHP.
+Otherwise go to the PARENT and search backward for <script> or <style> tags.
+Should be used only for Javascript or CSS indenting rules.
+NODE, ignored, is the node to match and PARENT is its parent."
+  (let ((lang (treesit-language-at (point))))
+    (if (or (eq lang 'javascript)
+	    (eq lang 'css))
+	(save-excursion
+	  (goto-char (treesit-node-start parent))
+	  (re-search-backward "<script.*>\\|<style.*>" nil t))
+      (line-beginning-position))))
 
 (defun php-ts-mode--parent-eol (_node parent &rest _)
   "Find the last non-space characters of the PARENT of the current NODE.
@@ -840,6 +844,11 @@ characters of the current line."
   (ignore-errors
     (progn (treesit-query-compile 'php "(visibility_modifier (operation))" t) t)))
 
+(defun php-ts-mode--test-property-hook-clause-p ()
+  "Return t if property_hook is a named node, nil otherwise."
+  (ignore-errors
+    (progn (treesit-query-compile 'php "(property_hook)" t) t)))
+
 (defun php-ts-mode--font-lock-settings ()
   "Tree-sitter font-lock settings."
   (treesit-font-lock-rules
@@ -948,6 +957,8 @@ characters of the current line."
       name: (_) @font-lock-type-face)
      (function_definition
       name: (_) @font-lock-function-name-face)
+     ,@(when (php-ts-mode--test-property-hook-clause-p)
+	 '((property_hook (name) @font-lock-function-name-face)))
      (method_declaration
       name: (_) @font-lock-function-name-face)
      (method_declaration
@@ -1108,14 +1119,13 @@ For NODE, OVERRIDE, START, and END, see `treesit-font-lock-rules'."
            (string-equal "plain_value" (treesit-node-type node)))
       (let ((color (css--compute-color start (treesit-node-text node t))))
         (when color
-          (treesit-fontify-with-override
-           (treesit-node-start node) (treesit-node-end node)
-           (list 'face
-                 (list :background color
-                       :foreground (readable-foreground-color
-                                    color)
-                       :box '(:line-width -1)))
-           override start end)))
+	  (with-silent-modifications
+	    (add-text-properties
+	     (treesit-node-start node) (treesit-node-end node)
+	     (list 'face (list :background color
+			       :foreground (readable-foreground-color
+                                            color)
+			       :box '(:line-width -1)))))))
     (treesit-fontify-with-override
      (treesit-node-start node) (treesit-node-end node)
      'font-lock-variable-name-face
@@ -1372,14 +1382,14 @@ Depends on `c-ts-common-comment-setup'."
      ;; PHPDOC specific
      document
      phpdoc-error)
-    (keyword string type name)
+    (keyword string property type name)
     (;; common
      attribute assignment constant escape-sequence function-scope
      base-clause literal variable-name variable
      ;; Javascript specific
      jsx number pattern string-interpolation)
     (;; common
-     argument bracket delimiter error function-call operator property
+     argument bracket delimiter error function-call operator
      ;; Javascript specific
      function)))
 

commit bda0bce9e4313c496fcfdcf4b6abeba3f68e5fac
Author: Martin Rudalics <rudalics@gmx.at>
Date:   Thu Nov 28 18:53:45 2024 +0100

    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).

diff --git a/src/frame.c b/src/frame.c
index 7f4bf274ad9..f6053fca3ef 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -5102,15 +5102,19 @@ gui_set_scroll_bar_width (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
 {
   int unit = FRAME_COLUMN_WIDTH (f);
 
-  if (RANGED_FIXNUMP (1, arg, INT_MAX)
-      && XFIXNAT (arg) != FRAME_CONFIG_SCROLL_BAR_WIDTH (f))
+  if (RANGED_FIXNUMP (1, arg, INT_MAX))
     {
-      FRAME_CONFIG_SCROLL_BAR_WIDTH (f) = XFIXNAT (arg);
-      FRAME_CONFIG_SCROLL_BAR_COLS (f) = (XFIXNAT (arg) + unit - 1) / unit;
-      if (FRAME_NATIVE_WINDOW (f))
-	adjust_frame_size (f, -1, -1, 3, 0, Qscroll_bar_width);
+      if (XFIXNAT (arg) == FRAME_CONFIG_SCROLL_BAR_WIDTH (f))
+	return;
+      else
+	{
+	  FRAME_CONFIG_SCROLL_BAR_WIDTH (f) = XFIXNAT (arg);
+	  FRAME_CONFIG_SCROLL_BAR_COLS (f) = (XFIXNAT (arg) + unit - 1) / unit;
+	  if (FRAME_NATIVE_WINDOW (f))
+	    adjust_frame_size (f, -1, -1, 3, 0, Qscroll_bar_width);
 
-      SET_FRAME_GARBAGED (f);
+	  SET_FRAME_GARBAGED (f);
+	}
     }
   else
     {
@@ -5133,15 +5137,19 @@ gui_set_scroll_bar_height (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
 #if USE_HORIZONTAL_SCROLL_BARS
   int unit = FRAME_LINE_HEIGHT (f);
 
-  if (RANGED_FIXNUMP (1, arg, INT_MAX)
-      && XFIXNAT (arg) != FRAME_CONFIG_SCROLL_BAR_HEIGHT (f))
+  if (RANGED_FIXNUMP (1, arg, INT_MAX))
     {
-      FRAME_CONFIG_SCROLL_BAR_HEIGHT (f) = XFIXNAT (arg);
-      FRAME_CONFIG_SCROLL_BAR_LINES (f) = (XFIXNAT (arg) + unit - 1) / unit;
-      if (FRAME_NATIVE_WINDOW (f))
-	adjust_frame_size (f, -1, -1, 3, 0, Qscroll_bar_height);
+      if (XFIXNAT (arg) == FRAME_CONFIG_SCROLL_BAR_HEIGHT (f))
+	return;
+      else
+	{
+	  FRAME_CONFIG_SCROLL_BAR_HEIGHT (f) = XFIXNAT (arg);
+	  FRAME_CONFIG_SCROLL_BAR_LINES (f) = (XFIXNAT (arg) + unit - 1) / unit;
+	  if (FRAME_NATIVE_WINDOW (f))
+	    adjust_frame_size (f, -1, -1, 3, 0, Qscroll_bar_height);
 
-      SET_FRAME_GARBAGED (f);
+	  SET_FRAME_GARBAGED (f);
+	}
     }
   else
     {

commit 3f99cdaf26dc606012384a6f191dc9d96483d437
Author: Mike Kupfer <kupfer@rawbw.com>
Date:   Mon Nov 25 16:52:05 2024 -0800

    Mention special variables in lexical binding documentation
    
    * doc/lispref/variables.texi (Lexical Binding): Briefly mention
    special variables and their semantics.  (Bug#74540)

diff --git a/doc/lispref/variables.texi b/doc/lispref/variables.texi
index af11e498d86..0e9124920d1 100644
--- a/doc/lispref/variables.texi
+++ b/doc/lispref/variables.texi
@@ -1096,7 +1096,7 @@ x                        ; @r{Note that @code{x} has no global value.}
 @end example
 
 @noindent
-The @code{let} binding defines a lexical environment in which the
+Here, the @code{let} binding defines a lexical environment in which the
 variable @code{x} is locally bound to 0.  Within this binding
 construct, we define a lambda expression which increments @code{x} by
 one and returns the incremented value.  This lambda expression is
@@ -1113,6 +1113,12 @@ functions which take a symbol argument (like @code{symbol-value},
 variable's dynamic binding (i.e., the contents of its symbol's value
 cell).
 
+  Note also that variables may be declared special, in which case they
+will use dynamic binding, even for new bindings such as a @code{let}
+binding.  Depending on how the variable is declared, it can be
+special globally, for a single file, or for a portion of a file.
+@xref{Dynamic Binding} for details.
+
 @node Dynamic Binding
 @subsection Dynamic Binding
 

commit 0ef0f18f163c37a9d5c0b63c34eb3f37016a0d5e
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Thu Nov 28 16:55:26 2024 +0200

    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)

diff --git a/lisp/progmodes/c-ts-mode.el b/lisp/progmodes/c-ts-mode.el
index 73c1411ad0f..31f822b219d 100644
--- a/lisp/progmodes/c-ts-mode.el
+++ b/lisp/progmodes/c-ts-mode.el
@@ -35,7 +35,7 @@
 ;; To use these modes by default, assuming you have the respective
 ;; tree-sitter grammars available, do one of the following:
 ;;
-;; - Add one or mode of the following to your init file:
+;; - Add one or more of the following lines to your init file:
 ;;
 ;;    (add-to-list 'major-mode-remap-alist '(c-mode . c-ts-mode))
 ;;    (add-to-list 'major-mode-remap-alist '(c++-mode . c++-ts-mode))
diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el
index d953ec8b25c..4c37ef45ddf 100644
--- a/lisp/progmodes/ruby-mode.el
+++ b/lisp/progmodes/ruby-mode.el
@@ -2748,6 +2748,10 @@ Currently there are `ruby-mode' and `ruby-ts-mode'."
 (dolist (name (list "ruby" "rbx" "jruby" "j?ruby\\(?:[0-9.]+\\)"))
   (add-to-list 'interpreter-mode-alist (cons (purecopy name) 'ruby-mode)))
 
+;; See ruby-ts-mode.el for why we do this.
+(setq major-mode-remap-defaults
+      (assq-delete-all 'ruby-mode major-mode-remap-defaults))
+
 (provide 'ruby-mode)
 
 ;;; ruby-mode.el ends here
diff --git a/lisp/progmodes/ruby-ts-mode.el b/lisp/progmodes/ruby-ts-mode.el
index 7c1c07ac5b6..c86ef7e0a3e 100644
--- a/lisp/progmodes/ruby-ts-mode.el
+++ b/lisp/progmodes/ruby-ts-mode.el
@@ -34,9 +34,38 @@
 ;; put somewhere Emacs can find it.  See the docstring of
 ;; `treesit-extra-load-path'.
 
-;; This mode doesn't associate itself with .rb files automatically.
-;; You can do that either by prepending to the value of
-;; `auto-mode-alist', or using `major-mode-remap-alist'.
+;; This mode doesn't associate itself with .rb files automatically.  To
+;; use this mode by default, assuming you have the tree-sitter grammar
+;; available, do one of the following:
+;;
+;; - Add the following to your init file:
+;;
+;;    (add-to-list 'major-mode-remap-alist '(ruby-mode . ruby-ts-mode))
+;;
+;; - Customize 'auto-mode-alist' to turn ruby-ts-mode automatically.
+;;   For example:
+;;
+;;    (add-to-list 'auto-mode-alist
+;;                 (cons (concat "\\(?:\\.\\(?:"
+;;                               "rbw?\\|ru\\|rake\\|thor\\|axlsx"
+;;                               "\\|jbuilder\\|rabl\\|gemspec\\|podspec"
+;;                               "\\)"
+;;                               "\\|/"
+;;                               "\\(?:Gem\\|Rake\\|Cap\\|Thor"
+;;                               "\\|Puppet\\|Berks\\|Brew\\|Fast"
+;;                               "\\|Vagrant\\|Guard\\|Pod\\)file"
+;;                               "\\)\\'")
+;;                       'ruby-ts-mode))
+;;
+;;   will turn on the ruby-ts-mode for Ruby source files.
+;;
+;; - If you have the Ruby grammar installed, add
+;;
+;;     (load "ruby-ts-mode")
+;;
+;;   to your init file.
+;;
+;; You can also turn on this mode manually in a buffer.
 
 ;; Tree Sitter brings a lot of power and versitility which can be
 ;; broken into these features.
@@ -1234,8 +1263,10 @@ leading double colon is not added."
 
 (derived-mode-add-parents 'ruby-ts-mode '(ruby-mode))
 
-(if (treesit-ready-p 'ruby)
-    (add-to-list 'major-mode-remap-defaults
+(when (treesit-ready-p 'ruby)
+  (setq major-mode-remap-defaults
+        (assq-delete-all 'ruby-mode major-mode-remap-defaults))
+  (add-to-list 'major-mode-remap-defaults
                  '(ruby-mode . ruby-ts-mode)))
 
 (provide 'ruby-ts-mode)

commit fc17e8727d48c32f2610c6fe7c17147bff7be52b
Author: Stefan Kangas <stefankangas@gmail.com>
Date:   Sun Nov 24 11:27:19 2024 +0100

    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.

diff --git a/admin/notes/repo b/admin/notes/repo
index b4535bcb556..c5caec11e35 100644
--- a/admin/notes/repo
+++ b/admin/notes/repo
@@ -77,16 +77,6 @@ variable in admin/merge-gnulib before running it.
 If you remove a gnulib module, or if a gnulib module
 removes a file, then remove the corresponding files by hand.
 
-* How to merge changes from emacs-24 to master
-
-[The section on git merge procedure has not yet been written.]
-
-You may see conflicts in autoload md5sums in comments.  Strictly
-speaking, the right thing to do is merge everything else, resolve the
-conflict by choosing either the master or branch version, then run
-'make -C lisp autoloads' to update the md5sums to the correct master
-value before committing.
-
 * Re-adding a file that has been removed from the repository
 
 Let's suppose you've done:

commit 3e396b2c5bb8abdc16218ca8c9d617b9dcf9f01e
Author: Joost Kremers <joostkremers@fastmail.com>
Date:   Mon Nov 11 23:38:49 2024 +0100

    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'.

diff --git a/doc/lispref/control.texi b/doc/lispref/control.texi
index 41f40ea852c..17f91606a86 100644
--- a/doc/lispref/control.texi
+++ b/doc/lispref/control.texi
@@ -322,25 +322,46 @@ There's a number of variations on this theme, and they're briefly
 described below.
 
 @defmac if-let* varlist then-form else-forms...
-Evaluate each binding in @var{varlist} in turn, like in @code{let*}
-(@pxref{Local Variables}), stopping if a binding value is @code{nil}.
-If all are non-@code{nil}, return the value of @var{then-form},
-otherwise the last form in @var{else-forms}.
+Evaluate each binding in @var{varlist}, stopping if a binding value is
+@code{nil}.  If all are non-@code{nil}, return the value of
+@var{then-form}, otherwise the last form in @var{else-forms}.
+
+Each element of @code{varlist} has the form @w{@code{(@var{symbol}
+@var{value-form})}}: @var{value-form} is evaluated and @var{symbol} is
+locally bound to the result.  Bindings are sequential, as in @code{let*}
+(@pxref{Local Variables}).  As a special case, @var{symbol} can be
+omitted if only the test result of @var{value-form} is of interest:
+@var{value-form} is evaluated and checked for @code{nil}, but its value
+is not bound.
 @end defmac
 
 @defmac when-let* varlist then-forms...
-Like @code{if-let*}, but without @var{else-forms}.
+Evaluate each binding in @var{varlist}, stopping if a binding value is
+@code{nil}.  If all are non-@code{nil}, return the value of the last
+form in @var{then-forms}.
+
+@var{varlist} has the same form as in @code{if-let*}: Each element of
+@code{varlist} has the form @w{@code{(@var{symbol} @var{value-form})}},
+in which @var{value-form} is evaluated and @var{symbol} is locally bound
+to the result.  Bindings are sequential, as in @code{let*} (@pxref{Local
+Variables}).  As a special case, @var{symbol} can be omitted if only the
+test result of @var{value-form} is of interest: @var{value-form} is
+evaluated and checked for @code{nil}, but its value is not bound.
 @end defmac
 
 @defmac and-let* varlist then-forms...
-Like @code{when-let*}, but in addition, if there are no
-@var{then-forms} and all the bindings evaluate to non-@code{nil}, return
+Evaluate each binding in @var{varlist}, stopping if a binding value is
+@code{nil}.  If all are non-@code{nil}, return the value of the last
+form in @var{then-forms}, or, if there are no @var{then-forms}, return
 the value of the last binding.
-@end defmac
 
-@defmac while-let spec then-forms...
-Like @code{when-let*}, but repeat until a binding in @var{spec} is
-@code{nil}.  The return value is always @code{nil}.
+@var{varlist} has the same form as in @code{if-let*}: Each element of
+@code{varlist} has the form @w{@code{(@var{symbol} @var{value-form})}},
+in which @var{value-form} is evaluated and @var{symbol} is locally bound
+to the result.  Bindings are sequential, as in @code{let*} (@pxref{Local
+Variables}).  As a special case, @var{symbol} can be omitted if only the
+test result of @var{value-form} is of interest: @var{value-form} is
+evaluated and checked for @code{nil}, but its value is not bound.
 @end defmac
 
 Some Lisp programmers follow the convention that @code{and} and
@@ -348,6 +369,27 @@ Some Lisp programmers follow the convention that @code{and} and
 @code{when} and @code{when-let*} are for forms evaluated for side-effect
 with returned values ignored.
 
+A similar macro exists to run a loop until one binding evaluates to
+@code{nil}:
+
+@defmac while-let spec then-forms...
+Evaluate each binding in @var{spec} in turn, stopping if a binding value
+is @code{nil}.  If all are non-@code{nil}, execute @var{then-forms},
+then repeat the loop.  Note that when the loop is repeated, the
+@var{value-forms} in @var{spec} are re-evaluated and the bindings are
+established anew.
+
+@var{varlist} has the same form as in @code{if-let*}: Each element of
+@code{varlist} has the form @w{@code{(@var{symbol} @var{value-form})}},
+in which @var{value-form} is evaluated and @var{symbol} is locally bound
+to the result.  Bindings are sequential, as in @code{let*} (@pxref{Local
+Variables}).  As a special case, @var{symbol} can be omitted if only the
+test result of @var{value-form} is of interest: @var{value-form} is
+evaluated and checked for @code{nil}, but its value is not bound.
+
+The return value of @code{while-let} is always @code{nil}.
+@end defmac
+
 @node Combining Conditions
 @section Constructs for Combining Conditions
 @cindex combining conditions

commit 50b91ed458df8f04359996b31b18fb318ba64a47
Author: Yuan Fu <casouri@gmail.com>
Date:   Sat Nov 23 21:39:40 2024 -0800

    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.

diff --git a/lisp/progmodes/c-ts-mode.el b/lisp/progmodes/c-ts-mode.el
index 90eeffe370c..73c1411ad0f 100644
--- a/lisp/progmodes/c-ts-mode.el
+++ b/lisp/progmodes/c-ts-mode.el
@@ -1254,9 +1254,6 @@ BEG and END are described in `treesit-range-rules'."
               `((c ,@c-ts-mode--thing-settings)
                 (cpp ,@c-ts-mode--thing-settings)))
 
-  ;; Nodes like struct/enum/union_specifier can appear in
-  ;; function_definitions, so we need to find the top-level node.
-  (setq-local treesit-defun-prefer-top-level t)
 
   ;; When the code is in incomplete state, try to make a better guess
   ;; about which node to indent against.
@@ -1346,6 +1343,9 @@ in your init files."
     ;; Font-lock.
     (setq-local treesit-font-lock-settings (c-ts-mode--font-lock-settings 'c))
     ;; Navigation.
+    ;;
+    ;; Nodes like struct/enum/union_specifier can appear in
+    ;; function_definitions, so we need to find the top-level node.
     (setq-local treesit-defun-tactic 'top-level)
     (treesit-major-mode-setup)
 
diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index 75c8111035c..5ac5b88d17f 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -3916,7 +3916,6 @@ See `treesit-thing-settings' for more information.")
     ;; Indent.
     (setq-local treesit-simple-indent-rules js--treesit-indent-rules)
     ;; Navigation.
-    (setq-local treesit-defun-prefer-top-level t)
     (setq-local treesit-defun-type-regexp
                 (rx (or "class_declaration"
                         "method_definition"
diff --git a/lisp/progmodes/php-ts-mode.el b/lisp/progmodes/php-ts-mode.el
index d8a3f60508b..f9fd03cbf72 100644
--- a/lisp/progmodes/php-ts-mode.el
+++ b/lisp/progmodes/php-ts-mode.el
@@ -1479,10 +1479,6 @@ Depends on `c-ts-common-comment-setup'."
                                   "statement")))
                    (text ,(regexp-opt '("comment" "text"))))))
 
-    ;; Nodes like struct/enum/union_specifier can appear in
-    ;; function_definitions, so we need to find the top-level node.
-    (setq-local treesit-defun-prefer-top-level t)
-
     ;; Indent.
     (when (eq php-ts-mode-indent-style 'wordpress)
       (setq-local indent-tabs-mode t))
diff --git a/lisp/progmodes/ruby-ts-mode.el b/lisp/progmodes/ruby-ts-mode.el
index adcdf15c7ad..7c1c07ac5b6 100644
--- a/lisp/progmodes/ruby-ts-mode.el
+++ b/lisp/progmodes/ruby-ts-mode.el
@@ -1198,9 +1198,6 @@ leading double colon is not added."
                                            (treesit-node-parent node))
                                           "interpolation"))))))))
 
-  ;; AFAIK, Ruby can not nest methods
-  (setq-local treesit-defun-prefer-top-level nil)
-
   ;; Imenu.
   (setq-local imenu-create-index-function #'ruby-ts--imenu)
 
diff --git a/lisp/progmodes/typescript-ts-mode.el b/lisp/progmodes/typescript-ts-mode.el
index 3606a139d50..dcf1f721f2f 100644
--- a/lisp/progmodes/typescript-ts-mode.el
+++ b/lisp/progmodes/typescript-ts-mode.el
@@ -462,7 +462,6 @@ This mode is intended to be inherited by concrete major modes."
 
   ;; Comments.
   (c-ts-common-comment-setup)
-  (setq-local treesit-defun-prefer-top-level t)
 
   ;; Electric
   (setq-local electric-indent-chars

commit 03ae07291e85fd353595806c3ce1ad3315c47649
Author: Aaron Jensen <aaronjensen@gmail.com>
Date:   Sat Nov 16 20:54:59 2024 -0800

    Fix NS non-native fullscreen on initial frame load (bug#59790)
    
    * src/nsterm.m ([EmacsView toggleFullScreen:]): Reset fs_is_native

diff --git a/src/nsterm.m b/src/nsterm.m
index 97b829d0e4c..e311e3654e8 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -8522,6 +8522,11 @@ - (void)toggleFullScreen: (id)sender
 
   NSTRACE ("[EmacsView toggleFullScreen:]");
 
+  /* Reset fs_is_native to value of ns-use-native-full-screen if not
+     fullscreen already */
+  if (fs_state != FULLSCREEN_BOTH)
+    fs_is_native = ns_use_native_fullscreen;
+
   if (fs_is_native)
     {
 #if defined (NS_IMPL_COCOA) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1070

commit 8261d7224d30feca885e031d901923c550606db0
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Sun Nov 24 11:27:00 2024 +0200

    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)

diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el
index 63bbae4d8ed..5d582f973bc 100644
--- a/lisp/calendar/diary-lib.el
+++ b/lisp/calendar/diary-lib.el
@@ -235,7 +235,8 @@ use `diary-list-entries-hook', which runs only for the main diary file."
   :type 'hook
   :options '(diary-bahai-list-entries
              diary-hebrew-list-entries
-             diary-islamic-list-entries)
+             diary-islamic-list-entries
+             diary-chinese-list-entries)
   :group 'diary)
 
 (defcustom diary-nongregorian-marking-hook nil
@@ -252,7 +253,8 @@ use `diary-mark-entries-hook', which runs only for the main diary file."
   :type 'hook
   :options '(diary-bahai-mark-entries
              diary-hebrew-mark-entries
-             diary-islamic-mark-entries)
+             diary-islamic-mark-entries
+             diary-chinese-mark-entries)
   :group 'diary)
 
 (defcustom diary-print-entries-hook #'lpr-buffer

commit 6f6a92624e9b8405d16e3c11dc2a7c348084fcb2
Author: john muhl <jm@pub.pink>
Date:   Sat Nov 23 14:08:21 2024 -0600

    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)

diff --git a/lisp/progmodes/lua-ts-mode.el b/lisp/progmodes/lua-ts-mode.el
index e5a2fafd279..d2ac67a9230 100644
--- a/lisp/progmodes/lua-ts-mode.el
+++ b/lisp/progmodes/lua-ts-mode.el
@@ -659,9 +659,9 @@ Calls REPORT-FN directly."
         (setq-local comint-input-ignoredups t
                     comint-input-ring-file-name lua-ts-inferior-history
                     comint-prompt-read-only t
-                    comint-prompt-regexp (rx-to-string `(: bol
-                                                           ,lua-ts-inferior-prompt
-                                                           (1+ space))))
+                    comint-prompt-regexp (rx bol
+                                             (literal lua-ts-inferior-prompt)
+                                             (1+ space)))
         (comint-read-input-ring t)
         (add-hook 'comint-preoutput-filter-functions
                   (lambda (string)
@@ -672,11 +672,11 @@ Calls REPORT-FN directly."
                        ;; accumulate in the output when sending regions
                        ;; to the inferior process.
                        (replace-regexp-in-string
-                        (rx-to-string `(: bol
-                                          (* ,lua-ts-inferior-prompt
-                                             (? ,lua-ts-inferior-prompt)
-                                             (1+ space))
-                                          (group (* nonl))))
+                        (rx bol
+                            (* (literal lua-ts-inferior-prompt)
+                               (? (literal lua-ts-inferior-prompt))
+                               (1+ space))
+                            (group (* nonl)))
                         "\\1" string)
                        ;; Re-add the prompt for the next line.
                        lua-ts-inferior-prompt " ")))

commit d9531793206021f1ad842cbc73df939aadf5f745
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Sat Nov 23 22:14:57 2024 +0200

    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)

diff --git a/etc/NEWS b/etc/NEWS
index 442053fa12b..3d691cfac40 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -2133,6 +2133,9 @@ The command 'makefile-switch-to-browser' command is now obsolete,
 together with related commands used in the "*Macros and Targets*"
 buffer.  We recommend using an alternative like 'imenu' instead.
 
+---
+*** 'jsonrpc-default-request-timeout' is now a defcustom.
+
 
 * New Modes and Packages in Emacs 30.1
 
diff --git a/lisp/jsonrpc.el b/lisp/jsonrpc.el
index 77efcf0b590..4971e13fae3 100644
--- a/lisp/jsonrpc.el
+++ b/lisp/jsonrpc.el
@@ -466,8 +466,17 @@ ignored."
 (define-obsolete-variable-alias 'jrpc-default-request-timeout
   'jsonrpc-default-request-timeout "28.1")
 
-(defconst jsonrpc-default-request-timeout 10
-  "Time in seconds before timing out a JSONRPC request.")
+(defgroup jsonrpc nil
+  "JSON-RPC customization."
+  :prefix "jsonrpc-"
+  :group 'comm)
+
+(defcustom jsonrpc-default-request-timeout 10
+  "Time in seconds before timing out a JSON-RPC request without response."
+  :version "30.1"
+  :type 'number
+  :safe 'numberp
+  :group 'jsonrpc)
 
 
 ;;; Specific to `jsonrpc-process-connection'

commit 5339c6f69eef7aaccd0570a3b70fdf0066b678bc
Author: Juri Linkov <juri@linkov.net>
Date:   Sat Nov 23 20:27:39 2024 +0200

    ; Improve example of display-buffer-alist category in ELisp Reference
    
    * doc/lispref/windows.texi (Choosing Window): Use 'add-to-list'
    and add an example how to override display-buffer-alist entries
    such as 'inhibit-same-window' by matching the window
    using the 'category' condition (bug#74457).

diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi
index c7e575b0e4f..0c6367da057 100644
--- a/doc/lispref/windows.texi
+++ b/doc/lispref/windows.texi
@@ -2646,10 +2646,10 @@ for example:
 
 @example
 @group
-(setopt
- display-buffer-alist
- (cons '((category . comint) (display-buffer-same-window))
-        display-buffer-alist))
+(add-to-list 'display-buffer-alist
+             '((category . comint)
+               (display-buffer-same-window)
+               (inhibit-same-window . nil)))
 
 (display-buffer (get-buffer-create "*my-shell*")
                 '(nil (category . comint)))

commit e14007ad631120a3f7521e503c8de86aca849bad
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Sat Nov 23 15:05:17 2024 +0200

    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)

diff --git a/nt/INSTALL.W64 b/nt/INSTALL.W64
index 9694e85f269..f3a16a2e3c0 100644
--- a/nt/INSTALL.W64
+++ b/nt/INSTALL.W64
@@ -60,7 +60,7 @@ packages (you can copy and paste it into the shell with Shift + Insert):
   mingw-w64-x86_64-harfbuzz \
   mingw-w64-x86_64-libgccjit \
   mingw-w64-x86_64-sqlite3 \
-  mingw-w64-x86_64-tree-sitter
+  mingw-w64-x86_64-libtree-sitter (or mingw-w64-x86_64-tree-sitter)
 
 The packages include the base developer tools (autoconf, grep, make,
 etc.), the compiler toolchain (gcc, gdb, etc.), several image
diff --git a/nt/README.W32 b/nt/README.W32
index 3eca9e90716..e862a17d812 100644
--- a/nt/README.W32
+++ b/nt/README.W32
@@ -188,15 +188,24 @@ See the end of the file for license conditions.
   where PACKAGES is the list of packages you want to install.  The
   full list is as follows:
 
-    mingw-w64-x86_64-giflib
+    base-devel
+    mingw-w64-x86_64-toolchain
+    mingw-w64-x86_64-xpm-nox
+    mingw-w64-x86_64-gmp
     mingw-w64-x86_64-gnutls
-    mingw-w64-x86_64-libjpeg-turbo
+    mingw-w64-x86_64-libtiff
+    mingw-w64-x86_64-giflib
     mingw-w64-x86_64-libpng
+    mingw-w64-x86_64-libjpeg-turbo
     mingw-w64-x86_64-librsvg
-    mingw-w64-x86_64-libtiff
-    mingw-w64-x86_64-libxml2
-    mingw-w64-x86_64-xpm-nox
+    mingw-w64-x86_64-libwebp
     mingw-w64-x86_64-lcms2
+    mingw-w64-x86_64-libxml2
+    mingw-w64-x86_64-zlib
+    mingw-w64-x86_64-harfbuzz
+    mingw-w64-x86_64-libgccjit
+    mingw-w64-x86_64-sqlite3
+    mingw-w64-x86_64-libtree-sitter (or mingw-w64-x86_64-tree-sitter)
 
   You can type any subset of this list.  When asked whether to proceed
   with installation, answer Y.