; Skip commit 6412a5503c404bbe177879d113c2299288c76ccd

Show the keybinding next to command in calc's x

* lisp/calc/calc-ext.el (calc-execute-extended-command): Use
M-x's ':affixation-function' to show the keybinding of the calc
command next to its name.  (Bug#74829)

(cherry picked from commit aaacd5806c75019b052a69764ef4d193d243573c)

ruby-ts--s-p-query: Put '_' syntax on ?! method definitions

* lisp/progmodes/ruby-ts-mode.el (ruby-ts--s-p-query):
Put 'symbol' syntax on method definitions ending with [?!].
Reported in https://github.com/dgutov/robe/issues/149.

(cherry picked from commit b561f896b5e52d3e4571901fd5d545354ba29bac)

ruby-ts-mode: Refine the forward-sexp improvement

* lisp/progmodes/ruby-ts-mode.el (ruby-ts--sexp-list-p):
New function (bug#73404).
(ruby-ts-mode): Use it in sexp-list thing definition.

(cherry picked from commit 704aa2b6ebaa0e19f72dcc2e8c0f1a02aa6eadbb)

; Fix documentation of recent additions to treesit.el

* lisp/treesit.el (treesit-language-display-name-alist)
(treesit-language-display-name): Doc fixes.

* etc/NEWS: Fix wording of entry announcing the above.

(cherry picked from commit e96727f0ea0986bffe7ff235e5abc5354e63a64d)

; * doc/lispref/modes.texi (Imenu): Fix wording and markup.

(cherry picked from commit d70ef80868996b9119f032cd13911c600436e29f)

* lisp/treesit.el: Improvements for treesit-explore-mode (bug#75079)

(treesit-explorer-switch-parser): Don't use completing-read
on the single parser.
(treesit-explore-mode): Don't save treesit-explore-mode to the desktop.

(cherry picked from commit c09e056c43e344c5adda08ef819252824cff0ef0)

Improve dictionary-switch-tooltip-mode docstring

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

(cherry picked from commit 1e40be0ab830852ff5e2330c50f8b047d9ebe338)

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)

(cherry picked from commit 7cda5e7f0272d766bd2090a274faeb7776303f46)

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

(cherry picked from commit 8c7db480ead8ef623a382fcd990dd91486616dca)

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.

(cherry picked from commit e2a9af431191d5c71e2ca7a4347ce9e435e8cca0)

; Add some shortdoc examples for treesit entry

* lisp/treesit.el: Add some shortdoc examples.

(cherry picked from commit 833494d4b00a837be8ceaa09b37f54ce17d0a062)

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.

(cherry picked from commit 251b4c8c39535fee9f6da89420483304274ac03e)

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

(cherry picked from commit 563e5868f6dbab59937ad247b45b488f5523ad3c)

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.

(cherry picked from commit b061c01607aa43b8ffa1b5c4a90c3602497cf823)

* 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".

(cherry picked from commit f0afebb99158be3db1d9623758321622a1026c8d)

; Update c-ts-mode and c++-ts-mode's verified revision

* lisp/progmodes/c-ts-mode.el: Update revision.

(cherry picked from commit 7ac7ebef6cde9942905c45126cc6ef2bab01dc10)

Include lightweight tags in treesit-admin--verify-major-mode-queries

* lisp/treesit.el (treesit--language-git-revision): Include
lightweight tags as well.

(cherry picked from commit 32ad7342893833058ca2f7f8eca667bd32d42ea0)

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.

(cherry picked from commit 4def541bbfe67b1a492e8a3b6041a1d8f76d680b)

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.

(cherry picked from commit 93755ea1a6113e115ac3349b67e58e2f3fd03894)

; Minor comment improvement in c-ts-common--adaptive-fill-prefix

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

(cherry picked from commit 8d7cba7bbf8fe83bbf9a9d8cae963983f3bca8cf)

; * .mailmap: Fix UTF-8 issue.

(cherry picked from commit 6ac38396898e6324d4c6dddb2ad05d1ad0dc5e7c)

Avoid U+FFFD in commit messages

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

(cherry picked from commit 28c420afab6a0944a192c30ff2d5d9e40c88f14f)

New commands 'elisp-next/prev-occurrence'

Trust nothing by default

scope.el: Minor cleanup

New hook 'read-shell-command-minibuffer-setup-hook'

scope.el: Disregard symbol shorthands

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

(cherry picked from commit b1de495eeae9afc8abccd908e5c53c463afdb7dc)

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.

(cherry picked from commit 6017c6a986fd958732facb1bb6ea2c040981b023)

Java Mode: introduce the keyword `assert'.

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

(cherry picked from commit 39380e1bd3bfc26e355445590e243fcfa940fc9f)

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.

(cherry picked from commit 423e1ee7d6d6f34c0bc249a8dfb14a4a25eae08a)

Handle ':noquery' in 'open-gnutls-stream'

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

(cherry picked from commit ec39f669f902143a68a99fb42dd05716a27736be)

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

(cherry picked from commit fb7bf20a9c129a97ceeabad00523ecafaa58697c)

Allow viewing .dcm images via image-convert

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

(cherry picked from commit 78eb102bc3d25aafb9a2d6756b956f7a2321a715)

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.

(cherry picked from commit 7d41a23ad3b4c03ea1dea91eb70474f074dc05a4)

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

(cherry picked from commit 961cff855a9eccb9c2de31edc7d90ce697ebb65d)

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.

(cherry picked from commit 86a8b24bdea52a7aab45abcc51db2dd47308c11f)

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.

(cherry picked from commit d89d8715eeae775305d4c5790b60793e3e57a474)

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

(cherry picked from commit e59e7278924cd0dca49d4333dba188530721f5a3)

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

(cherry picked from commit 476426168106dbcee67d8ea667e11ebe80c7aaed)

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

(cherry picked from commit 5e97079cc7587ce338679ed237efb911723e4367)

; Improve commentary in calendar.el

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

(cherry picked from commit 6902673b5b9c641fd2df3881533d6fc343124371)

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)

(cherry picked from commit 08b62132ddee01f0c84bc478b718370b51fade6a)

Document representation of dates in calendar.el

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

(cherry picked from commit d8ffcf2fbaca158f3eed3b35cc181756a4c4878f)

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.

(cherry picked from commit fd529bbd076d14087d70c50d94bc9ef231cf1997)

; Fix last change

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

(cherry picked from commit b6852b67b0d462c7ba0012e5ac3b79a245f4b7e5)

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

(cherry picked from commit 308d5d54737917d449bfc0bf80815537eef69446)

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

(cherry picked from commit bf41ff24b9ab9c7426b3b3f1c1902b301e9f08a4)

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)

(cherry picked from commit 0f645b92ed3e82f149de468df7ebe0eda5104aca)

; Skip commit 40145ba971942eb8b2b9db1e28b513b1f3fdda6f

; Skip commit 31f3a760c504e76ae06805e5cc5c325b06e4a9ad

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)

(cherry picked from commit 1c960bda91237c92f9f602bcb8538ad500c0bc49)

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.

(cherry picked from commit e9591fae5e7ba772b63c6cc548bb5ebe68f583e6)

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)

(cherry picked from commit d1c670f0cbf9c66d59b24797f38203ea698813c3)

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.

(cherry picked from commit 2d173aa3d34e60206f4889eb0220aa2269b3ed4d)

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
(cherry picked from commit b71ddaf6d3ac39487302fbc27614b9de28bf6cef)

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)

(cherry picked from commit faaa13ec762ddd762725d7f0eed0aced8428354a)

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.

(cherry picked from commit 8aad208e002a8c7512df77de7a16b67303e964ec)

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.

(cherry picked from commit dbf22fd0d050423e5ed727923399099bba7d3dc2)

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.

(cherry picked from commit 07cc8abca75e9c0180e993ad10f162c5218c9e5e)

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.

(cherry picked from commit fe06a2baac291b2eceadd12db3623436ab8e2395)

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.

(cherry picked from commit 05ab13ebc7237bcf23bc84a6a345d0b563404c2d)

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.

(cherry picked from commit 926a9c864adc29f056644f5e23cf59fb90e2613c)

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.

(cherry picked from commit 82c3fcd17e3eb3756bd3533c39d89c21ec7fdce5)

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.

(cherry picked from commit 42ab0f162cb37eeddae53675fba310b8a22ff934)

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.

(cherry picked from commit 3cb86eb0385b8d5edba3dea495bc086c009614b7)

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.

(cherry picked from commit cc5afea98e8efb1a04baedf98e66863d31974ae6)

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.

(cherry picked from commit e166803f8c1f1870cefb4f5b7828422a145cd3d4)

Prefer defvar-keymap in hangul.el

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

(cherry picked from commit f0d7a395eaf818a6fe05ac1cf8b630775b02f451)

; Skip commit 68bcabf58afddb377d172857ce7648ad3ff09618

; Skip commit 9d93d717d58a41af29dec9cf80aa6b70b873c723

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.

(cherry picked from commit c19dd8e9d6c54080426623129a824e5bb2fcf7be)

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)

(cherry picked from commit d8e8e1d5ed260222e2630141d26572a361a5c75f)

; Skip commit 64dbb01993ee4e00f5af72c5df935c64ed321a3e

; Skip commit 35cf00886451ab2fddf47134117c96aa497676bf

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

(cherry picked from commit b156a69eec8af26991ede5c5bc2d7fbcd8dba134)

; Skip commit a8c83b496b3f98ad0be835d772a36f75c47d693e

; Fix a call to update_window for !HAVE_EXT_MENU_BAR

* src/dispnew.c (update_menu_bar): Remove superfluous argument.

(cherry picked from commit 5ed6cd53f7ca6570e5bb46aa32eb54c3e1b86615)

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.

(cherry picked from commit a61b968ccfe8fa7e2f1fcf7667781a1c0527389a)

; 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".

(cherry picked from commit a4f176ea6e5c28f7ccc98bdce3ee13d687b1acfd)

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.

(cherry picked from commit 76c64dcc8025e42d1a85a053d8da58d5462a95ab)

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.

(cherry picked from commit f92520d009e1ab8024b03d9d71ecc9820573c040)

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.

(cherry picked from commit 1647086d6a3a560877f386b9d153c01270307f68)

Add treesit thing 'sexp-list' to some ts-modes (bug#73404)

* lisp/progmodes/c-ts-mode.el (c-ts-mode--thing-settings):
* lisp/progmodes/js.el (js-ts-mode):
* lisp/progmodes/ruby-ts-mode.el (ruby-ts-mode):
* lisp/textmodes/html-ts-mode.el (html-ts-mode):
Add 'sexp-list' to treesit-thing-settings.
* lisp/progmodes/js.el (js--treesit-sexp-list-nodes): New variable.

(cherry picked from commit ea865c98cf3c8a4e0216a81be1b9357a48e7b9a3)

New treesit thing 'sexp-list' (bug#73404)

* lisp/treesit.el (treesit-forward-list): New command.
(treesit-forward-sexp): Check the thing 'text' only when
'treesit-sexp-type-regexp' is nil.
(treesit-forward-sexp-list): New function.
(treesit-navigate-thing): Don't try moving to parent
when thing is 'sexp-list'.
(treesit-major-mode-setup): Set 'forward-sexp-function' to
'treesit-forward-sexp-list' when the 'sexp-list' thing is defined.

(cherry picked from commit d930d7f8651897dc3130ff16731751691566d490)

Increase goto-address-fontify-maximum-size

The new value is ~4 times larger, and should be more than fine on any
reasonably modern machine.  Alternatively, the default could be set to
t, as requested here:
https://lists.gnu.org/r/bug-gnu-emacs/2003-05/msg00114.html

* lisp/net/goto-addr.el (goto-address-fontify-maximum-size): Increase
default value from 30000 to 128 KiB.

(cherry picked from commit 3281f8615aefc08b47a99eb9761c0b630b053c58)

Prefer defvar-keymap in goto-addr.el

* lisp/net/goto-addr.el (goto-address-highlight-keymap): Convert to
defvar-keymap.

(cherry picked from commit ba0c49ed662e1038cfdb34558c775cbcc4f663a7)

; Skip commit e3d1bab98d3d50375a97808cd1e422231f411c0a

Delete support for the Conkeror web browser

The last release of Conkeror was in 2017.  The project has been actively
recommending people not to use it since 2019 due to security concerns,
and it was removed from Debian in the same year.  Emacs's browse-url
support for Conkeror has been obsolete since in Emacs 28.1.

* lisp/net/browse-url.el (browse-url-conkeror-new-window-is-buffer):
(browse-url-conkeror-program, browse-url-conkeror-arguments): Delete
variables.
(browse-url-conkeror): Delete function.

(cherry picked from commit 4415102b573bb776e7f256633626f798b2ab9f28)

; Fix more obsoletion warnings

* lisp/progmodes/cc-awk.el (awk-font-lock-keywords):
* lisp/progmodes/cc-fonts.el (c-basic-matchers-before):
* lisp/progmodes/csharp-mode.el (c-basic-matchers-before): Use faces
instead of variables to silence an obsoletion warning.  (Bug#71469)

(cherry picked from commit cd7e462ea31491d93d5e781ec0343c37e024bea7)

; Skip commit 8f8da2d78545ea74853fd9b8d2156f4f93a2324a

; Skip commit 49adcf30b01a973ef2fb63d01e8142393fc6d926

; Skip commit 1381c6f9591f2851896a41e178a5ccc1a32e7471

Avoid MinGW compilation warning in lib/

* nt/mingw-cfg.site (ac_cv_func_malloc_0_nonnull)
(gl_cv_malloc_ptrdiff, gl_cv_func_malloc_posix):
* nt/gnulib-cfg.mk (OMIT_GNULIB_MODULE_malloc-gnu): Set to avoid
compiling lib/malloc.c, which is not needed and causes a
compilation warning.

(cherry picked from commit 807b6172524a7b4f3fe19bc22a06afd48cc57b71)

; Skip commit 5c0f3f5826e5f2e7c6bc29f5407ec984beb43527

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

(cherry picked from commit 8a0c9c234f15a7398d43da154f3463c92f69f9f5)

Mention network-interface-list in network-interface-info docstring

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

(cherry picked from commit c6ce11b2a48a0e6e1a62ae51f30570f3392ee55d)

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

(cherry picked from commit a7905145f70bce9681559ec37fbbe54afd52d913)

; Skip commit 4af978d650762f28e9089fa4d8fc9b85d4420763