; * lisp/emacs-lisp/crm.el (crm-change-separator): Update comment

* doc/misc/tramp.texi: Adapt some markups.

(cherry picked from commit be31c383593452c172ea6d470f400f64b5065874)

; Tweak last docstring addition in lisp/imenu.el.

(cherry picked from commit af27ecbf1556af8a428b367cdc26ec4c706df4a0)

Fix bug#70900

* lisp/net/tramp.el (tramp-handle-unlock-file): Be quiet if user
isn't interested in lock files.  Bug#70900

(cherry picked from commit af526f88562162ec053534eae510b9e7a85cb9eb)

* lisp/imenu.el: Support more values for imenu-flatten (bug#70846)

(imenu-flatten): Change type boolean to choice
of more values for prefix/suffix section names.
(imenu--completion-buffer): Add :annotation-function if
'imenu-flatten' is 'annotation'.
(imenu--flatten-index-alist): Put property 'imenu-section' if
'imenu-flatten' is 'annotation'.

(cherry picked from commit 431f8ff1e38ca4367637c6b9fbc25d13d6f760a7)

Communicate frame titles to the window manager on Android

* java/org/gnu/emacs/EmacsActivity.java (detachWindow)
(attachWindow): Call updateWmName.
(updateWmName): New function; transfer wm name from the window
attached to the task's description.

* java/org/gnu/emacs/EmacsWindow.java (EmacsWindow)
<wmName>: New field.
(setWmName): New function.

* src/android.c (android_init_emacs_window): Link to new
function.
(android_set_wm_name): New function.

* src/android.h (struct android_emacs_service): Delete unused
entries.

* src/androidfns.c (android_set_name_internal, android_set_name)
(android_implicitly_set_name, android_explicitly_set_name)
(android_set_title): Port from X.

* src/androidterm.c (android_term_init): Compute default frame
title.

* src/androidterm.h (struct android_display_info) <x_id_name>:
New field.

(cherry picked from commit 9443f8145e1db86664a4af318b3bd1448094040e)

ruby-rubocop-use-bundler: New user option

* lisp/progmodes/ruby-mode.el (ruby-rubocop-use-bundler):
New user option.
(ruby-flymake-rubocop--use-bundler-p): Use it.

* etc/NEWS: Mention it.

(cherry picked from commit f560e759338e4cd43113fef39bb6e35c9e8a5893)

; * src/epaths.in: Declare and use android_game_path.

(cherry picked from commit ad588f81317db2faa2770a700f0e29a3b74ae682)

Complete pacification of build warnings on Android

* build-aux/makecounter.sh: Introduce extern declaration of
emacs_shortlisp_counter.

* src/android.c (android_class_path): Declare static.

* src/androidfont.c (font_driver_class, font_spec_class)
(integer_class, font_metrics_class, font_object_class): Declare
static.

* src/androidterm.c (android_frame_parm_handlers): Move
declaration...

* src/androidterm.h (android_frame_parm_handlers): ... here.

(cherry picked from commit b86359d4abfb47820b5644adb0306bd628de6dd8)

Fix 'C-u C-x p g' globally and 'A' in dired-mode

* lisp/progmodes/project.el (project-find-regexp): Ensure the
DEFAULT-DIRECTORY is set correctly for the 'C-u' case (bug#70888).

* lisp/progmodes/project.el (project--files-in-directory):
Ensure that the DIR argument ends with a slash --
'dired-do-find-regexp' passes it differently, for example.

* lisp/progmodes/xref.el (xref--group-name-for-display): Ensure
the project-relative and absolute display modes work well for
groups with "relative" file names.
(xref--analyze, xref--add-log-current-defun): Change accordingly.

* test/lisp/progmodes/project-tests.el
(project-find-regexp-with-prefix): New test.

(cherry picked from commit b20d4ab374fb9b3c80b968df6acd6444f763bd40)

Add Tramp method "nspawn"

* doc/misc/tramp.texi: Adapt some markups.
(Inline methods) <nspawn>: Add.
(Default Host): Mention default host for "nspawn".
(Customizing Methods): Remove tramp-nspawn.
(Password handling): Add "nspawn".

* etc/NEWS: New Tramp method "nspawn".

* lisp/net/tramp-compat.el (tramp-nspawn): Warn, if that package is used.

* lisp/net/tramp-container.el (tramp-nspawn-program): New defcustom.
(tramp-nspawn-method): New defconst.
(tramp-nspawn--completion-function, tramp-enable-nspawn-method):
New defuns.

* lisp/net/tramp.el (tramp-local-host-regexp): Add OpenSUSE host names.

(cherry picked from commit e53e8b4cf44be0fac0eb92c816b2c7915533e283)

; Add ".DS_Store" to 'completion-ignored-extensions'

pcomplete: cease ignoring 'completion-ignored-extensions'

Improve buffer name completion annotations

completion--replace: Fix completion cycling

* lisp/minibuffer.el (completion--replace):
Don't "insert before markers" after all because in some cases
(https://lists.gnu.org/archive/html/emacs-devel/2024-05/msg00701.html)
- like cycling - BEG can be denoted by a marker as well.
(minibuffer-completion-help): Make FIELD-END simply a fixnum.  And
adjust its value manually inside the local
completion-list-insert-choice-function (bug#48356).

(cherry picked from commit 2c759b9ce620311df97f43b791ba27b1302171c4)

Fix offset of reported conversion regions

* src/androidterm.c (request_class, text_class): Pacify new
warning.
(android_update_selection): Don't redundantly subtract 1 from
compose region start.

(cherry picked from commit 6e8bee27a5cb9915c5db0f8756c8a903e4be1cec)

Revert "Avoid resizing mutation in subst-char-in-string"

This reverts commit 184d6e8c02345583264b053bb59ae031bb1c5a00.

It wasn't quite correct: the path through `string-replace` would not
preserve text properties in the input string, which broke Gnus.

(cherry picked from commit 9d7b22fcb408b3d864d4d74d14ab428a2706b45d)

Silence some macOS build warnings

* src/image.c (native_image_type): Declare static.
* src/keyboard.c (lispy_function_keys): Declare static on NS.
* src/nsmenu.m (context_menu_value):
* src/nsterm.m (ns_frame_parm_handlers): Move extern declarations...
* src/nsterm.h: ...here.
* test/src/emacs-module-resources/mod-test.c: Add extern declaration.

(cherry picked from commit 9365feadccf1e28438e41c4ce8bf60ab8e4e1def)

Safer and faster string sorting

* lisp/emacs-lisp/cl-seq.el (cl-sort):
Don't use string mutation when sorting the characters in a string.
This avoids O(n^2) run time and makes it future-safe.

(cherry picked from commit 38091e43bee991920db81263fe56da444a123fae)

Properly deinitialize directory cursors on closedir

* src/androidvfs.c (android_saf_tree_closedir): Call
cursor.close, for deleting the local reference to enable its
garbage collection is not sufficient to release all related
resources.

(cherry picked from commit 86d196c71d763ae81229e7e1eb2c6e37d0456f06)

Additional changes to processing of Num Lock on Android

* java/org/gnu/emacs/EmacsView.java (onKeyDown, onKeyMultiple)
(onKeyDown): Disregard Num and Scroll Lock keys, and return
value of window functions to the system.

* java/org/gnu/emacs/EmacsWindow.java (eventModifiers): Return
normalized meta state, not only those bits the system considers
modifiers.
(onKeyDown, onKeyUp): Ignore numpad keys to which no base
characters are assigned, so that the system may generate the
proper action keys instead.

(cherry picked from commit ea98a6af2f30eccfed3e152149c6a039bd16ff33)

Correct earlier changes to processing of Num Lock on Android

* java/org/gnu/emacs/EmacsWindow.java (onKeyDown, onKeyUp):
Cease stripping META_NUM_LOCK_ON and META_SCROLL_LOCK_ON from
meta masks reported to getUnicodeChar.

(cherry picked from commit af6df8e0454f3f51d3855683216dfd12843e6959)

; Fix a recent change in fns.c

* src/fns.c (value_cmp): Use 'subprocesses', not 'MSDOS', as
conditional for process-related functionalities.

(cherry picked from commit 5b9995052d547982281a4dd3db6d797f4006144a)

Pacify warnings in gmalloc.c

* src/gmalloc.c (__malloc_initialize_hook): Also declare in
advance on Glibc 2.24 and later.
(__after_morecore_hook, __morecore): Likewise on Glibc 2.34 and
later.

(cherry picked from commit 67b1da215c9fc103d131e8c568a1e6a75d993f83)

* oldXMenu/Activate.c (x_menu_grab_keyboard): Declare static.

(cherry picked from commit 26a407cebebdaa5b21bc896cfb79c7ea8c37a922)

Fix the DJGPP build

* src/fns.c (value_cmp) [MSDOS]: Consider processes unordered
on DOS.

(cherry picked from commit ed03b7ab9f301dba22519b529dfcaf9d83290c73)

* src/keyboard.c (lispy_function_keys): Define as static on Android.

(cherry picked from commit 41596bd7110eac11d1309b9d5a40f86d92b7ff85)

; Update last change

* msdos/sedlibmk.inp (STDDEF_NOT_IDEMPOTENT): Define to 1.

(cherry picked from commit 15fd1e2cb66884a61a84ce10a69b436e7b00772c)

Fix the DJGPP build

* msdos/sedlibmk.inp (HAVE_STRTOF, NULLPTR_T_NEEDS_STDDEF):
Define to 1.

(cherry picked from commit 47a0fc91dfc73c480fa5042810df304df647b758)

Pacify gcc -Wmissing-variable-declarations

This is a new warning diagnostic in GCC 14.
* lib-src/etags.c (mercury_heuristics_ratio):
* src/pgtkselect.c, src/xselect.c (selection_request_stack):
* src/xselect.c (outstanding_transfers):
* src/xterm.c (pending_selection_requests)
(x_dnd_waiting_for_motif_finish_display):
Now static.
* lib-src/make-docfile.c (close_emacs_globals):
Arrange for lispsym to be declared with extern first,
when compiling lread.c.
* src/alloc.c (gdb_make_enums_visible) [__GNUC__]:
* src/emacs.c (RCS_Id):
* src/keyboard.c (stop_character):
* src/print.c (print_output_debug_flag):
Now declared with extern first.
* src/lisp.h (DEFINE_GDB_SYMBOL_BEGIN) [MAIN_PROGRAM]:
Arrange for ID to be declared extern first.
* src/lisp.h (garbage_collection_inhibited):
* src/xterm.h (x_frame_parm_handlers):
Declare here, so that its interface is properly checked.  Other decls
removed.

(cherry picked from commit 99a5c75f3b0916affdc8ea4a25d4bc87e67bca88)

Update from Gnulib by running admin/merge-gnulib

(cherry picked from commit 7ae091d933b03d0a1e1e0b39a949c2811c4c3618)

Adjust to recent Gnulib changes

* admin/merge-gnulib: Also remove the new Gnulib file
m4/off64_t.m4, as Emacs doesn’t need off64_t.
* configure.ac (gl_TYPE_OFF64_T): Define a nearly no-op.

(cherry picked from commit 2e13c2adbad4fc609f560926f6e536b25281f925)

; * lisp/cus-edit.el (custom-save-all): Remove offensive commentary.

(cherry picked from commit dcb6a9ebcbf92a4ca7c0e2c393d7a8dd9b1d351e)

Fix test of whether to insert lexical-binding cookies in custom files

* lisp/cus-edit.el (custom-save-all): Test whether the buffer is
empty, not whether point is at EOB.

(cherry picked from commit 6d4179957a830fa03348c47067d9d5c1ae6e3eba)

; More coding style fixes

* src/sort.c (reverse_sortslice, tim_sort): Correct not-so
egregious misformattings.

(cherry picked from commit b990c37b9adbb4cbbcd6ef652c2a1737cf80269d)

; Fix coding style in timsort.c

* src/sort.c (reverse_slice, sortslice): Fix egregious coding
style inconsistencies.

(cherry picked from commit f43f7d7a43962aae4ec1ad353eda237f5348b40c)

; Fix byte-compilation warnings in lua-ts-mode.el

* lisp/progmodes/lua-ts-mode.el (treesit-node-eq)
(treesit-node-prev-sibling): Declare.

(cherry picked from commit 733ff78581a7d659fee53e5bfd7cc8904a31082e)

Support Python 3 in 'package-test-update-archives-async'

* test/lisp/emacs-lisp/package-resources/package-test-server.py:
Support Python 3.
* test/lisp/emacs-lisp/package-tests.el
(package-test-update-archives-async): Search for an executable
named "python", "python3", or "python2".  (Bug#70722)

Co-authored-by: Lin Sun <sunlin7@hotmail.com>
(cherry picked from commit 6380806196f3806b6c2bff60ff6cddae3eee2a19)

Fix Rmail summary by thread

* lisp/mail/rmailsum.el (rmail-summary-by-thread): Use value of
'rmail-total-messages' local to 'rmail-buffer'.  Patch by Andrea
Monaco <andrea.monaco@autistici.org>.

(cherry picked from commit 5fdc6d835710512921cb46cd8ef55bd0052c4e01)

; * lisp/net/dictionary.el (dictionary-default-strategy): Doc fix.

(cherry picked from commit 3eca0bc307f02592a509d8c243a6c9ee9b8dea61)

New Tramp method "run0"

* doc/misc/tramp.texi (Quick Start Guide, Inline methods)
(Password handling, Predefined connection information)
(Ad-hoc multi-hops): Add "run0".
(Remote processes): Mention tramp-use-connection-share.

* etc/NEWS: New Tramp method "run0".

* lisp/net/tramp.el (tramp-completion-dissect-file-name):
* lisp/net/tramp-cmds.el (tramp-list-remote-buffers):
* lisp/net/tramp-smb.el (tramp-smb-handle-insert-directory):
Use `tramp-compat-keep-seq'.

* lisp/net/tramp-cmds.el (tramp-file-name-with-method): Add "run0".

* lisp/net/tramp-sh.el (tramp-enable-run0-method): New defun.
(tramp-sh-handle-expand-file-name): Add "run0".
(tramp-maybe-open-connection): Simplify setting timeout.

(cherry picked from commit b43c31d2f50dc71680dfd62412ce9b9afb6c65a4)

Improve documentation of p-s-p-scroll-down-page

* lisp/pixel-scroll.el
(pixel-scroll-precision-scroll-down-page): Document unit in
which the height of the window is measured, and what manner of
height applies.  Reported by Eli Zaretskii <eliz@gnu.org>.

(cherry picked from commit 1c4b1ce8fa7c752454c144d78d8ae14ee88150d3)

Delete unused functions

* java/org/gnu/emacs/EmacsNative.java (dup, close):

* src/android.c (dup, close): Delete functions no longer
referenced.

(cherry picked from commit 3ff83246c86a64600712b48631b900d23c806244)

; Fix doc strings of two scroll-bar functions.

* lisp/scroll-bar.el (toggle-horizontal-scroll-bar): Fix typo and
wording.  (Bug#70864).
(toggle-scroll-bar): Fix wording.

(cherry picked from commit 0ec9a02a0d5da108ccefe32dd37b066bae357334)

Update gnus-draft-check-draft-articles to use find-buffer-visiting

* lisp/gnus/gnus-draft.el (gnus-draft-check-draft-articles): Don't loop
through all the buffers; this removes the need for the `file-remote-p'
check. Also give the user some nicer feedback about what's going on.

(cherry picked from commit 41bfca00051b590c24fca9e8614b67724fab272d)

Remove extra message-set-auto-save-file-name call in Gnus drafts

Bug#70579

* lisp/gnus/gnus-draft.el (gnus-draft-setup): This function is already
being called as part of the message-mail -> message-mode call
above. Running it twice results in a jump in assigned article numbers,
and the corresponding active value of the drafts group.

(cherry picked from commit b1e94b7bd3b18fdae66d172c7c72398d6f0d5225)

Support customization of sorting order for Imenu completion candidates

* lisp/imenu.el (imenu--completion-buffer):
Set completion-extra-properties to '(:category imenu).
(imenu--flatten-index-alist): Use imenu--subalist-p to handle
newer format (INDEX-NAME INDEX-POSITION FUNCTION ARGUMENTS...)
as well (bug#70846).

* doc/emacs/misc.texi (DocView Navigation): Fix typo.

(cherry picked from commit 5d8c2bad21cc647b3462acfe8e970419354cde83)

; Clean up some 'require' and 'declare-function' calls in Eshell

* lisp/eshell/em-ls.el:
* lisp/eshell/esh-cmd.el:
* lisp/eshell/esh-mode.el:
* lisp/eshell/esh-ext.el: Remove superfluous 'declare-function' calls.

* lisp/eshell/esh-proc.el (pcomplete): Require this explicitly instead
of transitively.

(cherry picked from commit ffc70962ca5fea86afcd984caa7770ab87a452a2)

Avoid resizing mutation in subst-char-in-string

* lisp/subr.el (subst-char-in-string):
Use string-replace to avoid resizing mutation and O(n^2) time.

(cherry picked from commit 184d6e8c02345583264b053bb59ae031bb1c5a00)

; * doc/emacs/frames.texi (Scroll Bars): Improve formatting.

(cherry picked from commit 2f8bccf9d8c39c08b1a9c85db93d2af8eda988b8)

; * lisp/textmodes/ispell.el (ispell-message): Add commentary.

(cherry picked from commit f9832e80b89d45c283c80e89471a8687df145821)

; * etc/PROBLEMS: Document macOS problems with Emacs.clr (bug#70836).

(cherry picked from commit a7d247be90c6030a0ffebc2d8280206128b0e87c)

; * doc/misc/auth.texi (The Unix password store): Fix variable name.

(Bug#70767)

Copyright-paperwork-exempt: yes
(cherry picked from commit 8560ee7b5ca94ff35868adbf4f435f1bcf358566)

; Advertise scroll bars some more

* doc/emacs/display.texi (Scrolling, Horizontal Scrolling):
Mention the scroll bars as alternative means of scrolling.

(cherry picked from commit 74c6b59af15d7e7f7456eff3620619a1b2e82c51)

Avoid errors in 'image-dired-tag-thumbnail'

* lisp/image/image-dired.el (image-dired-tag-thumbnail)
(image-dired-tag-thumbnail-remove): Move here from
image-dired-tags.el.  (Bug#70821)

(cherry picked from commit 3d65d4306b98efba59ffabe86d8c99e6f37cd8d2)

Use window parameters for *Completions* UI

; * etc/NEWS: Announce user-level change in dictionary.el.

(cherry picked from commit 78761d699eed9e05bc4007927e63246c77c70ceb)

Fix 'dictionary-tooltip-mode'

* lisp/tooltip.el (tooltip-event-buffer): Make sure 'posn-window'
returns a window before calling 'window-buffer'.

* lisp/net/dictionary.el (dictionary-default-dictionary)
(dictionary-tooltip-dictionary): Doc fixes.
(dictionary-tooltip-dictionary): Change default value to t, which
means the same dictionary as 'dictionary-default-dictionary'.
(dictionary-do-search): If NOMATCHING is non-nil, do not insert
anything into the current buffer, as that is unexpected when
showing definitions in tooltips.
(dictionary-word-at-mouse-event): Be defensive about the values
returned by 'tooltip-event-buffer' and 'posn-point': they can be
unexpected when the mouse pointer is on the tool bar or mode line
etc.
(dictionary-display-tooltip): Ignore errors in this function.
(dictionary-tooltip-mode): Ignore mouse-movement events on tool
bar and tab-bar.
(dictionary-dictionaries): Decode the server response to present
dictionaries in human-readable form.  Document in the doc string
the format of the return value.

(cherry picked from commit 3129fed4bec1137b7bb377594766b61ee76cd268)

Implement dots and dashes on MS-Windows

* src/haikuterm.c (haiku_draw_dash): Correct whitespace error.

* src/w32term.c (w32_draw_dash, w32_fill_underline)
(w32_draw_glyph_string): Port display of dash and dot underline
styles from X.

(cherry picked from commit 0f67ddd8d9e855ce0b9c17a4a1410dbd40318055)

* lisp/imenu.el (imenu-flatten): New defcustom (bug#70846).

(imenu-level-separator): Adjust the docstring.
(imenu--flatten-index-alist): New function revived
from the initial implementation of this package.
(imenu-choose-buffer-index): Use imenu--flatten-index-alist
when imenu-flatten is non-nil.
(imenu-buffer-menubar): Remove obsolete variable.

* doc/emacs/programs.texi (Imenu): Document imenu-flatten.

(cherry picked from commit 4306aba2d0447fd79c0b749a984ccd7bdbc92361)

; Remove unnecessary defvars defined in a file we already 'require'

* lisp/eshell/esh-cmd.el (eshell-output-handle, eshell-error-handle):
Remove superfluous declarations.

(cherry picked from commit 33878f29d1dee4aa1c7d0f30ed57e52138aa566b)

Remove redundant encoding of strings in androidvfs.c

* java/org/gnu/emacs/EmacsService.java (getDocumentTrees):
Accept PROVIDER as a String.

* src/android.c (android_init_emacs_service):

* src/androidvfs.c (android_saf_root_opendir): Adjust to match.

(cherry picked from commit ea2b251ab2b2bc9a3d6f52a22408655be20de266)

Document a problem with Microsoft SwiftKey

* etc/PROBLEMS (Runtime problems specific to Android): Document
incompatibility with Microsoft Swiftkey.

(cherry picked from commit dc5390d06a65f4d481b8bb20da4f6715c2079ea6)

Fix bug#70856

* lisp/pixel-scroll.el (pixel-scroll-precision-scroll-down)
(pixel-scroll-precision-scroll-up): Apply finer threshold for
the minimum unit of scrolling.
(pixel-scroll-precision-scroll-down-page): Document true
restrictions on DELTA.  (bug#70856)

(cherry picked from commit 671c9e08b2286d8c32ac6ca00eadc4c8d5e1d5e4)

Fix earlier change to content URI resolution on Android

* java/org/gnu/emacs/EmacsService.java (openContentUri): Return
-1 if fd be NULL.

* src/androidvfs.c (android_authority_open): Detect
SecurityException and suchlike.
(android_vfs_init): Initialize exception classes on Android 4.4.

(cherry picked from commit c900c707e8f3075dfe57c39a8a6363ba4575035f)

Don't limit gnus thread searches to a single message

* lisp/gnus/gnus-search.el (gnus-search-single-p): Searches for a
single message id finish after finding this one message; thread searches
continue until all messages are found.

(cherry picked from commit d335f28aa9bfb85d0e35b838ca867d97ebe5b974)

; Skip commit 006d5b70f343d95c7154632a2b59056d940018d5

Find correct parent for articles in gnus

* lisp/gnus/gnus-sum.el (gnus-summary-refer-parent-article): When an
article's headers have been altered, use the altered headers to find the
parent.

(cherry picked from commit e29eb0e0f18d7b1e4724c1bb26ff9718fe08548b)

; Provide documentation example for gnus-alter-header-function

* doc/misc/gnus.texi (Low-Level Threading): Provide an example of using
gnus-alter-header-function to remove unwanted items in References
header.

(cherry picked from commit 1b8613063cf6a3b9a1f484e1179877e36ba4b5e0)

; * lisp/mail/smtpmail.el (smtpmail-try-auth-method): quote symbol.

(cherry picked from commit 082666e528646aa9a299bd77854305c9b8231015)

; Fix an edge case with Eshell globs when the directory part is quoted

* lisp/eshell/esh-util.el (eshell-split-filename): Escaping shouldn't
matter for splitting the name (no other shells handle it like this).

* test/lisp/eshell/em-glob-tests.el
(em-glob-test/convert/quoted-start-directory): New test.

(cherry picked from commit 42c0686d6180a7ca1b89f7bde2f9fd17d6a67217)

; Reference the xoauth2 method in nnimap-authenticator docstring

* lisp/gnus/nnimap.el (nnimap-authenticator): Update variable
documentation to include xoauth2 method.

(cherry picked from commit e2e8c892ceaf27dcde9049f4a757d8fa853fe54a)

Improve static checking when using upcoming GCC 13.3

* src/lisp.h: In GCC 13.3 and later, do not ignore
-Wanalyzer-allocation-size.
* src/marker.c: In GCC 13.3 and later, do not ignore
-Wanalyzer-deref-before-check.

(cherry picked from commit fd333fd214f8e0740a4ec51705a32ed6cca93c57)

; Fix example code in nnfeed

* lisp/gnus/nnfeed.el: Backend declaration example was incorrect.

(cherry picked from commit e8ac15500424ebf40739422f40d966dc067f42df)

Tramp code cleanup

* lisp/net/tramp-compat.el (tramp-compat-seq-keep): New defalias.

* lisp/net/tramp.el (tramp-enable-method):
* lisp/net/tramp-adb.el (tramp-adb-parse-device-names):
* lisp/net/tramp-cache.el (tramp-list-connections):
* lisp/net/tramp-cmds.el (tramp-bug, tramp-append-tramp-buffers):
* lisp/net/tramp-container.el (tramp-container--completion-function)
(tramp-toolbox--completion-function)
(tramp-flatpak--completion-function)
(tramp-apptainer--completion-function):
* lisp/net/tramp-rclone.el (tramp-rclone-parse-device-names): Use it.

(cherry picked from commit 04363f9924c0f63d28f789ccdadd81a87e6f7417)

Fix 'srecode-all-template-hash' always returning nil

The issue was that the function always returned nil because
the closing parentheses were in the wrong position.  This
meant that the function couldn't give back the data it was
supposed to, making the whole srecode system not work
properly.
By moving the parentheses to the correct place, the function
now returns a hash table with all the templates it finds.
* lisp/cedet/srecode/find.el (srecode-all-template-hash):
Adjusted the position of closing parentheses so that the mhash
variable is returned correctly.  (Bug#70765)

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

; Check process in 'python-shell-completion-at-point'

* lisp/progmodes/python.el (python-shell-completion-at-point):
Check the PROCESS argument at the beginning of the function.
(Bug#70707)

(cherry picked from commit 751e21af42e905d0448baa7be4a7ae6d6ae6734a)

Add bitwise assignment operators to 'python--treesit-operators'

* lisp/progmodes/python.el (python--treesit-operators): Add
bitwise assignment operators.  (Bug#70666)

(cherry picked from commit 08799957f0bade04a8f65a06dac1606346ee8733)

Intern additional symbols ahead-of-time

* src/gnutls.c (Fgnutls_available_p, syms_of_gnutls):

* src/minibuf.c (Fread_buffer, syms_of_minibuf): Define and
intern symbols overlooked in the previous change.

(cherry picked from commit 58a7b99823c5c42161e9acf2abf6c22afd4da4cd)

Replace calls to intern with a constant string with DEFSYMs

* src/alloc.c (display_malloc_warning, syms_of_alloc):

* src/buffer.c (Fmake_indirect_buffer, Fbuffer_local_variables)
(Frename_buffer, Fkill_buffer, Fset_buffer_major_mode)
(Fset_buffer_multibyte, syms_of_buffer):

* src/callint.c (read_file_name, Fcall_interactively)
(syms_of_callint):

* src/callproc.c (call_process, create_temp_file)
(syms_of_callproc):

* src/charset.c (Fdefine_charset_internal, syms_of_charset):

* src/cmds.c (internal_self_insert, syms_of_cmds):

* src/coding.c (record_conversion_result)
(Fdefine_coding_system_internal, syms_of_coding):

* src/dbusbind.c (xd_signature, Fdbus_message_internal)
(syms_of_dbusbind):

* src/dispnew.c (init_faces_initial):

* src/doc.c (Fsnarf_documentation, syms_of_doc):

* src/dosfns.c (system_process_attributes, syms_of_dosfns):

* src/emacs.c (init_cmdargs, Fdump_emacs, decode_env_path)
(syms_of_emacs):

* src/eval.c (call_debugger, Fdefvaralias, syms_of_eval):

* src/fileio.c (barf_or_query_if_file_exists)
(Finsert_file_contents, auto_save_error, Fdo_auto_save)
(syms_of_fileio):

* src/filelock.c (lock_file_1, syms_of_filelock):

* src/fontset.c (fontset_from_font, syms_of_fontset):

* src/frame.c (make_frame_without_minibuffer, syms_of_frame):

* src/gnutls.c (emacs_gnutls_certificate_details)
(Fgnutls_peer_status_warning_describe, Fgnutls_peer_status)
(gnutls_verify_boot, syms_of_gnutls):

* src/gtkutil.c (style_changed_cb, find_rtl_image):

* src/image.c (imagemagick_filename_hint, gs_load)
(syms_of_image):

* src/keyboard.c (command_loop_1, read_char, timer_start_idle)
(read_char_minibuf_menu_prompt, Fsuspend_emacs)
(syms_of_keyboard):

* src/keymap.c (Fmap_keymap, Flookup_key, Fdescribe_vector)
(describe_vector, syms_of_keymap):

* src/lread.c (Fread, Fread_positioning_symbols, syms_of_lread):

* src/minibuf.c (Fabort_minibuffers, Fread_buffer)
(Fcompleting_read, syms_of_minibuf):

* src/msdos.c (XMenuActivate, run_msdos_command, syms_of_msdos):

* src/nsfns.m (Fx_display_backing_store, Fx_display_visual_class)
(Fns_hide_emacs, Fsystem_move_file_to_trash, ns_create_tip_frame)
(x_hide_tip, Fx_show_tip, syms_of_nsfns):

* src/nsfont.m (ns_spec_to_descriptor, ns_descriptor_to_entity)
(syms_of_nsfont):

* src/pdumper.c (Fdump_emacs_portable):

* src/pgtkfns.c (Fx_display_visual_class, x_create_tip_frame)
(Fx_show_tip, syms_of_pgtkfns):

* src/pgtkterm.c (syms_of_pgtkterm, pgtk_cr_export_frames):

* src/term.c (term_get_fkeys_1, set_tty_color_mode, Fsuspend_tty)
(Fresume_tty, tty_menu_activate, syms_of_term):

* src/terminal.c (create_terminal, syms_of_terminal):

* src/w32fns.c (Fx_display_backing_store)
(Fx_display_visual_class, Fset_message_beep, Fx_open_connection)
(Fx_show_tip, Fx_file_dialog, Fsystem_move_file_to_trash)
(Fw32_toggle_lock_key, syms_of_w32fns):

* src/w32font.c (w32_enumfont_pattern_entity, syms_of_w32font):

* src/w32term.c (w32_bitmap_icon, syms_of_w32term):

* src/xdisp.c (message_dolog, define_frame_cursor1)
(syms_of_xdisp):

* src/xfaces.c (tty_lookup_color, syms_of_xfaces):

* src/xml.c (make_dom, syms_of_xml):

* src/xterm.c (syms_of_xterm):

* src/xwidget.c (store_xwidget_download_callback_event)
(store_xwidget_js_callback_event, syms_of_xwidget): Define
symbols for symbols interned with `intern' from a constant
string, delete duplicate DEFSYM directives, and substitute them
for such calls to intern.  This excludes only those symbols
which are interned and referenced only once during Emacs's
initialization, the timing of whose interning is
inconsequential, and symbols in w32.c, which would need to be
transferred to a new syms_of_w32 function that I cannot test.

(cherry picked from commit 67ab6bcdbac572a6266d7c9d15833bd2ddd049fa)

* lisp/treesit.el (treesit-outline-search): Handle bobp specially.

At the beginning of the buffer call 'treesit-outline-search'
recursively with the `looking-at' argument set to t, since
`treesit-navigate-thing' can't find a thing at bobp (bug#70789).

(cherry picked from commit 9b7dd30807ed4be9afe4f66cfa5130aa7d178989)

Fontify for_statement variable in python-ts-mode (bug#70718)

* lisp/progmodes/python.el (python--treesit-settings): Add
font-lock query for for_statement variable in assignment feature.

(cherry picked from commit 24c02c700cad3ed94687cf694856a0bee42405ba)

Fontify namespace in c++-ts-mode

* lisp/progmodes/c-ts-mode.el (c-ts-mode--font-lock-settings): Add a
rule for namespace.

(cherry picked from commit c6a5aae3da17459be7550c8f183c0c350ba8ccb0)

Fix #if defined directive fontification in c-ts-mode

* lisp/progmodes/c-ts-mode.el (c-ts-mode--font-lock-settings): Fontify
each part separately so the identifier isn't overriden.

(cherry picked from commit 80ba6b7b96aad3659675b76a8965788fd0d73476)

Improve indentation in 'lua-ts-mode' (bug#70785)

* lisp/progmodes/lua-ts-mode.el (lua-ts--simple-indent-rules):
- Ignore comments when aligning arguments, parameters and fields.
- Apply simpler rules to simpler usage of anonymous functions.
- Better handling of table as a function argument.
(lua-ts--comment-first-sibling-matcher):
(lua-ts--first-real-sibling-anchor):
(lua-ts--last-arg-function-call-matcher):
(lua-ts--top-level-function-call-matcher): New function.
(lua-ts--g-parent):
(lua-ts--g-g-parent): New function.
(lua-ts--g-g-g-parent): Use it.
* test/lisp/progmodes/lua-ts-mode-resources/indent.erts:
Add tests.

(cherry picked from commit 73d2b829f06124fec8b65eebc68e87da48808086)

; Quietly skip 'lua-ts-mode' tests (bug#70786)

* test/lisp/align-tests.el (align-lua):
* test/lisp/progmodes/lua-ts-mode-tests.el
(lua-ts-test-indentation):
(lua-ts-test-movement):
(lua-ts-test-font-lock):
(lua-ts-test-which-function): Suppress warnings when the grammar is not
installed.

(cherry picked from commit 4eb363acc825ef3aaa5468ab5e206ecab5883acb)

Fontify doc comment in c-ts-mode with doc-face

* lisp/progmodes/c-ts-mode.el (c-ts-mode--font-lock-settings): Add
rule for /** comments.

(cherry picked from commit 03d4b96da62fbb7abfb7fa8fcfc963313e394f22)

xref--collect-matches: Fix the application of syntax-propertize

* lisp/progmodes/xref.el (xref--collect-matches):
Add syntax-ppss-flush-cache call when needed (bug#53749).

(cherry picked from commit 86187d43e2db841f8ca2893a31f05669f4a1247b)

choose-completion: Retain the suffix after completion boundary

* lisp/minibuffer.el (completion-base-suffix):
Remove as not optimal after all (bug#48356).
(completion--replace): Use insert-before-markers-and-inherit.
(minibuffer-completion-help): Don't set completion-base-affixes,
implement the same logic more optimally by local search and
querying for field boundaries.  Also fix the problem with
completion table, predicate and extra-props being looked up in the
wrong buffer.
(minibuffer-next-completion, minibuffer-choose-completion):
Don't bind completion-use-base-affixes anymore.

* lisp/simple.el (completion-base-affixes)
(completion-use-base-affixes): Remove.
(completion-list-insert-choice-function):
Don't pass them through anymore.

(cherry picked from commit ff3f17ca3cdd9e82355942f577e7807acc76ddcd)

Don't report erroneous /content directory on Android 4.3 and earlier

* src/androidvfs.c (android_content_opendir): Skip two, not one,
elements on Android <= 4.4.

(cherry picked from commit 8bc4292673dfc04ce781e242596779809f1a3634)

Prefer erc--skip property to erc-track--skipped-msgs

* lisp/erc/erc-stamp.el (erc-add-timestamp): Honor an overriding
`erc--ts' "msg prop".
(erc-stamp--defer-date-insertion-on-post-modify): Add `erc--skip'
for the `track' module.
* lisp/erc/erc-track.el (erc-track--skipped-msgs): Remove unused
variable.  Originally added as part of bug#60936.
(erc-track-modified-channels): Rely on the `erc--skip' "msg prop"
instead of the now defunct `erc-track--skipped-msgs' variable for
detecting requests to omit `track' mode-line updates during
`erc-display-message'.

(cherry picked from commit 36c68e7e34df996bbde4cc82c04ea1619349b64a)

Avoid shared-ref read syntax in ERC message catalogs

* lisp/erc/erc.el (erc--message-speaker-ctcp-action-input)
(erc--message-speaker-ctcp-action-statusmsg-input): Don't use
shared/circular references, like #1=foo ... #1#, in literal strings
because it triggers CI validation failures.  These message-format
definitions were originally introduced as part of bug#67677.

(cherry picked from commit d647a5238705bbb4a9277d71bb8069fba2cac7f3)

Add format-catalog entry for unknown chan mode in ERC

* lisp/erc/erc.el (erc--process-channel-modes): Use format spec
catalog entry, and convert char to string.
(erc-message-english-channel-mode-unknown): New variable.
;; * test/lisp/erc/erc-scenarios-base-renick.el
;; (erc-scenarios-base-renick-queries-solo): Adjust timeout.
;; * test/lisp/erc/erc-scenarios-ignore.el (erc-scenarios-ignore/basic):
;; Adjust timeouts.
;; * test/lisp/erc/erc-scenarios-misc.el (erc-scenarios-base-flood):
;; Adjust timeouts.
;; * test/lisp/erc/resources/base/assoc/bouncer-history/barnet.eld:
;; Adjust timeouts.
;; * test/lisp/erc/resources/base/reuse-buffers/channel/barnet.eld:
;; Adjust timeouts.
;; * test/lisp/erc/resources/erc-d/erc-d-tests.el (erc-d-run-basic):
;; Adjust timeouts.
;; * test/lisp/erc/resources/sasl/plain.eld: Adjust timeouts.
;; * test/lisp/erc/resources/sasl/external.eld: Adjust timeout.
;; * test/lisp/erc/resources/base/auth-source/foonet.eld: Adjust
;; timeout.

(cherry picked from commit caddc4e727a46e6b6ec7146c9e1cdc7b954f5c16)

Recognize '-fdiagnostics-parseable-fixits' compilation messages

(tramp-enable-method): Add minibuffer action

; Skip commit 840c33070dc789d5095a47fa65f4f77564cd6e59

Don't mutate strings in cl-substitute

This fixes cl-substitute, cl-substitute-if, cl-substitute-if-not,
cl-nsubstitute, cl-nsubstitute-if and cl-nsubstitute-if-not,
when called with a string sequence argument.

* lisp/emacs-lisp/cl-seq.el (cl-nsubstitute):
Avoid running in O(n^2) time and make future-safe.

(cherry picked from commit de5a89254cb8645143e9f4e51a1727a7237109e8)

Correct documentation relating to tool-bar-position

* doc/emacs/android.texi (Android Windowing): Don't claim that
tool-bar-position is unsupported on Android.

* lisp/tool-bar.el (tool-bar-position): Update doc string to
mention that bottom is supported on all systems but Nextstep.

(cherry picked from commit b82a003544c607b5c54bab13870d52b53e70aeb8)

Correct earlier change to map-ynp

* lisp/emacs-lisp/map-ynp.el (map-y-or-n-p): Don't call
set-text-conversion-style if not bound.

(cherry picked from commit 32b8c078177d6a27da535cdb5365aad90bf0f8af)

More Tramp optional methods

* doc/misc/tramp.texi (Inline methods) <krlogin, ksu>:
(External methods) <fcp, nc>: These are optional methods.

* etc/NEWS: Mention more optional Tramp methods.

* lisp/net/tramp-androidsu.el (tramp-enable-androidsu-method):
Use proper regexp for `tramp-default-user-alist'.

* lisp/net/tramp-sh.el (tramp-enable-nc-method)
(tramp-enable-ksu-method, tramp-enable-krlogin-method)
(tramp-enable-fcp-method): New defuns.  Move respective
configurations there.

* lisp/net/tramp.el (tramp-enable-method): Implement completion
for interactive use.

* test/lisp/net/tramp-tests.el (tramp-test03-file-name-defaults)
(tramp-test03-file-name-host-rules): Extend tests.

(cherry picked from commit 339b8349f436b3738cfa02b236e05c3da4c5a8a5)