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

Fix string used in recent obsolete variables spec

* lisp/font-lock.el (font-lock-comment-face)
(font-lock-comment-delimiter-face, font-lock-string-face)
(font-lock-doc-face, font-lock-doc-markup-face)
(font-lock-keyword-face, font-lock-builtin-face)
(font-lock-function-name-face, font-lock-variable-name-face)
(font-lock-type-face, font-lock-constant-face)
(font-lock-warning-face, font-lock-negation-char-face)
(font-lock-preprocessor-face): Don't quote the apostrophe in the
CURRENT-NAME argument of `make-obsolete-variable', it isn't
expanded by `substitute-command-keys'.

(cherry picked from commit a20f4c7ce192082caf0da5de5b8ab5b4d28c44d3)

; * etc/NEWS (Eshell): Fix example for restoring old history search.

(cherry picked from commit 43fcda0c8eafa2c7bfc0a416a48b223c6fec4d87)

New user option browse-url-transform-alist

* lisp/net/browse-url.el (browse-url-transform-alist): New user option.
(browse-url): Transform URL before loading if above new option is set.

(cherry picked from commit 14a3dd6a30f7a720f29d51f2df8f8ab8138989a0)

Make font-lock face variables obsolete

Using these variables as "another mechanism for changing face
appearance" never really worked, since mode authors were free to use the
face instead of the variable (i.e. quoting the symbol).  This means that
when users customized the variables, it would change its appearance only
in some cases, which is a rather surprising interface.

Indeed, it turns out that some modes have not always been consistent,
and mixed using the variable and the face, increasing the confusion even
further.  Thus, the only thing users could rely on to always work was to
leave the variables at their default value, and to customize the face.

We now recommend customizing the face, and are obsoleting these
variables.  This will lead to some minor code-churn, but it is believed
that it will be ultimately worth it.  To fix existing Lisp code, you
should typically only need to quote the symbol, as this commit shows.

It might be the case that we will have to keep the obsolete variables,
that have been with us since Emacs 19, around for a longer time-period
than normal, to allow package authors to adapt.

* lisp/font-lock.el (font-lock-comment-face)
(font-lock-comment-delimiter-face, font-lock-string-face)
(font-lock-doc-face, font-lock-doc-markup-face, font-lock-keyword-face)
(font-lock-builtin-face, font-lock-function-name-face)
(font-lock-variable-name-face, font-lock-type-face)
(font-lock-constant-face, font-lock-warning-face)
(font-lock-negation-char-face, font-lock-preprocessor-face): Make face
variables obsolete in favor of customizing the faces directly
instead.  (Bug#71469)

* doc/lispref/modes.texi (Faces for Font Lock): Don't document above
obsolete variables.

* lisp/cedet/data-debug.el (data-debug-insert-hash-table)
(data-debug-insert-widget-properties, data-debug-insert-string)
(data-debug-insert-number):
* lisp/emacs-lisp/lisp-mode.el (elisp--font-lock-backslash)
(lisp-font-lock-syntactic-face-function):
* lisp/emacs-lisp/package.el (describe-package-1):
* lisp/generic-x.el (rc-generic-mode, rul-generic-mode):
* lisp/org/org-table.el (org-table-edit-formulas):
* lisp/progmodes/cc-fonts.el (c-font-lock-invalid-single-quotes)
(c-maybe-font-lock-wrong-style-comments, c-font-lock-declarators)
(c-font-lock-c++-lambda-captures, c-font-lock-c++-modules):
* lisp/progmodes/cperl-mode.el (cperl-find-sub-attrs)
(cperl-look-at-leading-count, cperl-process-here-doc)
(cperl-find-pods-heres):
* lisp/progmodes/gdb-mi.el (gdb-init-1, gdb-update, gdb-running)
(gdb-starting, gdb-stopped, gdb-internals)
(gdb-breakpoints--add-breakpoint-row, gdb-locals-handler-custom)
(gdb-registers-handler-custom, gdb-get-source-file):
* lisp/progmodes/js.el (js--font-lock-keywords-1)
(js--font-lock-keywords-2, js-font-lock-syntactic-face-function):
* lisp/progmodes/lua-ts-mode.el (lua-ts--comment-font-lock):
* lisp/progmodes/meta-mode.el (meta-indent-in-string-p):
* lisp/progmodes/prolog.el (prolog-font-lock-keywords):
* lisp/progmodes/python.el (python-font-lock-syntactic-face-function):
* lisp/progmodes/ruby-ts-mode.el (ruby-ts--comment-font-lock):
* lisp/progmodes/sh-script.el (sh-font-lock-syntactic-face-function):
* lisp/textmodes/tex-mode.el (doctex-font-lock-syntactic-face-function):
* test/lisp/faces-tests.el (faces--test-color-at-point):
* test/lisp/progmodes/cperl-mode-tests.el (cperl-test-extra-delimiters)
(cperl-test-bug-47112, cperl-test-bug-65834, cperl-test-bug-66145)
(cperl-test-bug-66161, cperl-test-bug-69604):
* test/lisp/progmodes/python-tests.el
(python-ts-mode-compound-keywords-face)
(python-ts-mode-named-assignment-face-1)
(python-ts-mode-assignment-face-2, python-ts-mode-nested-types-face-1)
(python-ts-mode-union-types-face-1, python-ts-mode-union-types-face-2)
(python-ts-mode-types-face-1, python-ts-mode-types-face-2)
(python-ts-mode-types-face-3, python-ts-mode-isinstance-type-face-1)
(python-ts-mode-isinstance-type-face-2)
(python-ts-mode-isinstance-type-face-3)
(python-ts-mode-superclass-type-face, python-ts-mode-class-patterns-face)
(python-ts-mode-dotted-decorator-face-1)
(python-ts-mode-dotted-decorator-face-2)
(python-ts-mode-builtin-call-face)
(python-ts-mode-interpolation-nested-string)
(python-ts-mode-level-fontification-wo-interpolation)
(python-ts-mode-disabled-string-interpolation)
(python-ts-mode-interpolation-doc-string):
* test/lisp/progmodes/ruby-mode-tests.el
(ruby-heredoc-font-lock, ruby-heredoc-highlights-interpolations)
(ruby-exit!-font-lock, ruby-regexp-interpolation-is-highlighted)
(ruby-recognize-symbols-starting-with-at-character)
(ruby-hash-character-not-interpolation)
(ruby-interpolation-suppresses-quotes-inside)
(ruby-interpolation-suppresses-one-double-quote)
(ruby-interpolation-inside-percent-literal)
(ruby-interpolation-inside-percent-literal-with-paren)
(ruby-interpolation-inside-another-interpolation)
(ruby-interpolation-inside-double-quoted-percent-literals)
(ruby-no-interpolation-in-single-quoted-literals):
Don't use above obsolete variables.
* lisp/progmodes/cc-fonts.el (font-lock-constant-face): Don't
declare now-unused variable.

(cherry picked from commit 3d3c1094604ceb6133a15226aec9b568f7923ee7)

Fix the DJGPP build

* msdos/sedlibmk.inp (LIB_SELINUX, USE_SELINUX_SELINUX_H):
Define to 0.

* src/conf_post.h (_GL_DIT_NOTDIR, ENOTSUP) [MSDOS]: Define to
appropriate values.

(cherry picked from commit 03249f78153a34aab70b30f23d26210c1e7ff2a3)

Update from Gnulib by running admin/merge-gnulib

* admin/merge-gnulib (AVOIDED_MODULES): Avoid gnulib-i18n.
* lib/stdlib.c, m4/selinux-selinux-h.m4:
New files, taken from Gnulib.

(cherry picked from commit b1e5f6d6ef8432a9cce0664238de72d387730bd1)

* lisp/mail/sendmail.el (mail-citation-prefix-regexp): Fix bug#24081

(cherry picked from commit 22806c65f4f8d68547d33997d017039763b4bf6a)

Fix treesit-font-lock-level in python-ts-mode

Now that 'treesit-font-lock-level' can be a number or a list, it
should be handled using 'treesit--compute-font-lock-level'.

* lisp/progmodes/python.el (python--treesit-fontify-string):
Apply 'treesit--compute-font-lock-level' to
'treesit-font-lock-level'.

(cherry picked from commit 78736420746e78445d4ff1889b56c85b66ca794e)

Rename the property 'repeat-continue-only' to 'repeat-continue'

* doc/lispref/keymaps.texi (Creating Keymaps):
* lisp/keymap.el (defvar-keymap):
* lisp/repeat.el (repeat-get-map, describe-repeat-maps):
* test/lisp/repeat-tests.el (repeat-tests-another-repeat-map)
(repeat-tests-repeat-map): Replace 'repeat-continue-only'
with 'repeat-continue' (bug#74140).

(cherry picked from commit 69facd33a80bee3f49b0518e75e8ec570978334c)

Display commands with repeat-continue-only in describe-repeat-maps

* lisp/repeat.el (describe-repeat-maps): Display commands with the
property 'repeat-continue-only' used to continue the currently
active repeat-map (bug#74140).  Also use 'cl--map-keymap-recursively'
instead of 'map-keymap' to find more deep keybindings.

(cherry picked from commit f025c9df48f8ad5f1cb13c9adac2fc1fbeb81b79)

Improve support of property repeat-continue-only in repeat-mode (bug#74140)

* lisp/repeat.el (repeat-get-map): Add optional arg 'rep-map'.
Move the check for 'repeat-continue-only' from 'repeat-pre-hook'.
Improve its logic to check if the current map 'repeat-in-progress'
exists in the list from the 'repeat-continue-only' property.
(repeat-post-hook): Set 'repeat-in-progress' to the symbol
from the property 'repeat-map'.

* test/lisp/repeat-tests.el (repeat-tests-another-repeat-map):
Add new keymap to test multiple parallel repeat-maps.
(repeat-tests-continue-another): New test that uses commands
from 'repeat-tests-another-repeat-map' shared with
'repeat-tests-repeat-map'.

(cherry picked from commit 9232c985ef3d874755b0cbf4399fcc7077c308b5)

; * lisp/frame.el (clone-frame): Doc fix (bug#74750).

(cherry picked from commit 39a438d693daeb2e770f8a30c7a02e4039bf0036)

; * etc/NEWS: Fix typo.

(cherry picked from commit b8a7e2ef71b25a851437d41e16621a07da824758)

; Skip commit cda77d9544a41845bf9408581c61da3823251e57

; Skip commit 2f4a7f5ec3c75641e2a3c66156c2783c5576b1d7

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.

(cherry picked from commit cde22c020119fd16ddd77c5c4121054c1a9424c5)

Improve browse-url-android-share docstring

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

(cherry picked from commit 5686bb5b428c4a30a8b6d485f364adc7ccf31e73)

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.

(cherry picked from commit 92041e15f4ad99ebebc40b082e40367a3aada7ba)

Don't use obsolete lisp-complete-symbol in ses.el

* lisp/ses.el (ses-mode-edit-map): Replace obsolete function
lisp-complete-symbol with completion-at-point.

(cherry picked from commit 97ae8f684d93a7cf895ebf8d9aabb31697d968a8)

unintern: Drop support for obsolete calling convention

* lisp/subr.el (unintern):
* src/lread.c (Funintern): Drop support for old calling convention,
obsolete since 23.3.
* test/lisp/progmodes/elisp-mode-tests.el
(elisp-shorthand-escape): Don't use obsolete calling convention.

(cherry picked from commit 5a8adaeac81182f080b041a3a3840580c61213d2)

all-completions: Drop support for obsolete calling convention

* src/minibuf.c (Fall_completions):
* lisp/subr.el (all-completions): Drop support for old calling
convention, obsolete since 23.1.
* src/minibuf.c (Finternal_complete_buffer): Update caller.

(cherry picked from commit 80dc431b5a453c8200260969c8e2904e2d353b1e)

Improve reb-change-syntax docstring

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

(cherry picked from commit 9fd96e2ab95d19bb7df7fb698a497d56f3cdb3af)

* lisp/dired.el (dired-summary): Use substitute-command-keys.

(cherry picked from commit 16eb038d472b5765beb3b18e1058846efbdf97af)

; Fix indentation problem

(cherry picked from commit 0d3cffe60c1e79cf2dfd2bb1a683a7f60ea6b779)

Ignore some more Python tooling directories when grepping

* lisp/progmodes/python.el (python-base-mode): Add Pytest and Rope
cache directories to 'grep-find-ignored-directories'.

(cherry picked from commit 7c94898fa53d3605ba643df25206386de70ade61)

Make VC exclude Repo directories

* lisp/vc/vc-hooks.el (vc-directory-exclusion-list): Also ignore
".repo" directory created by Repo.
Ref: https://android.googlesource.com/tools/repo

(cherry picked from commit a07c89cf9b93ac78d55b528134c09c376afc58da)

; Skip commit 02a1e3052b665b8d7d8ea122a6ecb6878c6cece0

Use substitute-command-keys in map-y-or-n-p

* lisp/emacs-lisp/map-ynp.el (map-y-or-n-p): Use
substitute-command-keys.

(cherry picked from commit 5c1889c964c99fa3cb0cd91b7703d59bd9fcb495)

Bind inhibit-read-only to t in substitute-command-keys

* lisp/help.el (substitute-command-keys): Bind inhibit-read-only to t,
to allow modifying strings that are intended for the minibuffer, and
therefore already use minibuffer-prompt-properties.

(cherry picked from commit 826b11ddc6c69a06fbed09519b78896085647af0)

; * etc/NEWS: Add 'completion-table-with-metadata' to "Lisp Changes".

(cherry picked from commit 78b50603a25d8eb366deab92ce1f475aef497a64)

; Skip commit 3aceae113bc88e52bf1c791f9dadad749a66ab53

* lisp/comint.el (comint-complete-input-ring): New command (bug#74694).

(comint-mode-map): Bind 'comint-complete-input-ring' to 'C-x <up>'.

(cherry picked from commit d2986e79b76d442f8620195a54120d8be3e4583c)

Support pixelwise frame cloning (Bug#74750)

* lisp/frame.el (clone-frame): Honor 'frame-resize-pixelwise'
when cloning a frame's geometry via the 'text-pixels' feature of
'make-frame' (Bug#74750).  Correctly specify source frame in
'display-graphic-p' test for tty selection behavior.

(cherry picked from commit 61f1d7fc682c28b3e67a9d8f529ff7046dfdbff1)

Add Qutebrowser to list of choices in customize

* lisp/net/browse-url.el (browse-url--browser-defcustom-type):
Include 'browse-url-qutebrowser' so that it appears in the Choice
menus of 'browse-url-browser-function' and
'browse-url-secondary-browser-function'.  (Bug#74904)

(cherry picked from commit d5b23b219dc620bc23437158a769138e3b972ba6)

Don't inhibit resizing when making a new frame (Bug#74750)

* src/frame.h (struct frame): Remove inhibit_horizontal_resize
and inhibit_vertical_resize slots.
* src/frame.c (frame_inhibit_resize, make_frame)
(Fframe_after_make_frame, gui_figure_window_size): Remove all
operations on frame's inhibit_horizontal_resize and
inhibit_vertical_resize slots (Bug#74750).

(cherry picked from commit b5ba5cbacf2b8122d720f89dd93d36a5c0fd39ec)

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

(cherry picked from commit b9dc337ea7416ee7ee4d873a91f6d6d9f109c04c)

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

(cherry picked from commit 4b685bc4fcd060aab287704c2b00ab9feac4abb3)

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

(cherry picked from commit c14c489571988f4fede84c69254804a89b314d26)

; Add some tree-sitter thing content to the manual

* doc/lispref/parsing.texi (User-defined Things): List "builtin"
things.

(cherry picked from commit 10f976300d03a8cb9a12a5d2548d1b275ac3edcc)

Invert preprocessor condition to fix 'C-x 4 a'

Typing 'C-x 4 a' in the main function now correctly adds 'main' to the
generated ChangeLog, whereas before it added 'andreid_emacs_init'.
Inverting the preprocessor condition seems like an easier fix than
changing the add-change-log-entry-other-window heuristic.

* src/emacs.c (main): Invert preprocessor condition to appease the
'add-change-log-entry-other-window' heuristic.

(cherry picked from commit eaf5bf736e1dd5eb977a16a3f1b3dfd3da3c4612)

Prefer defvar-keymap in info.el

* lisp/info.el (Info-mode-line-node-keymap, Info-link-keymap):
Convert to defvar-keymap.

(cherry picked from commit 29058579e9f27872d47e9d5146dfd9ce79697a0d)

Move pure+side-effect-free declarations to byte-opt.el

* src/json.c (syms_of_json): Move pure and side-effect-free declarations
for json-serialize and json-parse-string from here...
* lisp/emacs-lisp/byte-opt.el (side-effect-free-fns, pure-fns):
...to here.

(cherry picked from commit bef0d80be88906b66dec06970d7782f0f7b219c0)

; Skip commit 465544eb556777f16415c10e7607f7b72ec5a2b5

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

(cherry picked from commit 55303a6bc0a06d32ec757b6291d40e8f28565946)

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.

(cherry picked from commit 8b6c6cffd1f772301e89353de5e057835af18a30)

image-dired: Don't croak on file names with regexp characters

* lisp/image/image-dired-dired.el (image-dired-mark-tagged-files):
* lisp/image/image-dired-tags.el (image-dired-get-comment)
(image-dired-write-comments, image-dired-list-tags)
(image-dired-remove-tag, image-dired-write-tags): Quote file name
for search-forward-regexp.  (Bug#73445)

Copyright-paperwork-exempt: yes
(cherry picked from commit 7930fe2f44f50b6a7abf5fbe1218dcc15e85b28d)

; * lisp/widget.el: Delete commented out code.

(cherry picked from commit 32060cef1cb58e53896f4fea82d2d30d35501d93)

; Skip commit 69b16e5c63840479270d32f58daea923fe725b90

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

(cherry picked from commit 5c6dbc65f3642b98d3e1ff3a901c1580353783df)

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.

(cherry picked from commit 856a58e28279139cfd6503917954fd75fcdd7e78)

Update documentation of 'etags' regexps

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

(cherry picked from commit 4c68846223b91e50e4a15fbc59d2238605ce2a57)

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

(cherry picked from commit b5158bd191422e46273c4d9412f2bf097e2da2e0)

Signal errors for unimplemented features

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

(cherry picked from commit 6fa2050ee7663441e4d0aa4fff974cc5d45bffc7)