; Fix recent changes in documentation

* doc/lispref/positions.texi (List Motion): Fix indexing.
* doc/emacs/mini.texi (Completion Options): Fix wording.

(cherry picked from commit 8c044bd97266b42973abb3343eeb4ea48d0949a0)

; Skip commit e0d8879bcd58c9eb5001cdc5294c126f742db63c

; Small doc fixes

* doc/emacs/dired.texi (Operating on Files): Add indexed function
'dired-do-open' to the text.

* doc/emacs/mini.texi (Completion Options): Add indexed functions
'previous-line-completion' and 'next-line-completion' to the text.

* doc/lispref/minibuf.texi (Completion Variables): Remove self-reference.

* doc/lispref/positions.texi (List Motion): Add indexed function
'treesit-forward-sexp' to the text.  Add @vindex for
'forward-sexp-function'.

* etc/NEWS: Group tab-bar and tab-line items separately.
Move two Buffer-menu items to separate outline.

(cherry picked from commit 4ff4b78f922353236cb2970270dd175c8011ba8f)

; Reword some "allows Xing"

* doc/emacs/anti.texi (Antinews):
* etc/NEWS:
* etc/NEWS.29:
* lisp/tab-bar.el (tab-bar-select-restore-windows):
* lisp/vc/vc-git.el (vc-git-print-log-follow): Reword to avoid
"allows Xing".  This is reported to be better for non-native
readers.  Based on suggestions of Eli Zaretskii <eliz@gnu.org>.

(cherry picked from commit da980ad838e404460da8e284a62a35395833a96c)

; More accurate text about how `equal` compares various objects

* doc/lispref/objects.texi (Equality Predicates):
Attempt at improving the text further (bug#72888).

(cherry picked from commit 2ca7d5649c69efbc65a4c7c074c52d8f4f0d4a21)

; Another fix for str2sig.h

(cherry picked from commit df57e44a08fd5c7dc159254a40f5d2e4d008e8df)

; Fix last change in lib/sig2str.h.

(cherry picked from commit 91e7b47d6c56e7963be232de8057e1a3f710f1b5)

Fix MinGW build broken by recent update from Gnulib

Gnulib moved the prototypes of 'sig2str' and 'str2sig' from
sig2str.h to signal.h, but MinGW does not use the Gnulib
signal.h header, and doesn't have these functions in its
own signal.h.
* lib/sig2str.h (SIG2STR_MAX, sig2str, str2sig): Define and
prototype if not already defined.

(cherry picked from commit b737c6125d69497ad5d2a29d4b5a2b17698992e5)

Better port to Android 35

* java/INSTALL: Don't refer users to build-tools 33.0.x.

* java/res/values-v35/styles.xml: New dark theme; define status
bar colors properly for this release.

(cherry picked from commit 73367ea5c1821e46cea57fda424a8a65ac5e586a)

; Update from Gnulib

* configure.ac:

* src/conf_post.h: Remove workarounds now rendered redundant by
Gnulib.

(cherry picked from commit 1a13c5e63e1eb8fcf15c53ae4ed0caca8b928a3b)

Port to Android 35

* configure.ac: Temporary workaround for Gnulib bug.  Verify
that the provided android.jar corresponds to Android 35, or any
later version.

* cross/ndk-build/Makefile.in (NDK_BUILD_SO_LDFLAGS): New
variable.

* cross/ndk-build/ndk-resolve.mk
(NDK_LOCAL_A_NAMES_$(LOCAL_MODULE)): Define to
NDK_BUILD_SO_LDFLAGS by default to enable building binaries
with support for 16 kb page sizes.

* java/AndroidManifest.xml.in: Target SDK 35.

* java/INSTALL (16KB PAGE SIZES): New section.  Replace
references to Android 34 with 35.

* java/org/gnu/emacs/EmacsActivity.java (onCreate): Restore
pre-SDK 35 inset-relative placement.

* java/org/gnu/emacs/EmacsFillPolygon.java (perform): Suppress
deprecation warnings, and document why.

* m4/ndk-build.m4 (ndk_INIT, ndk_LATE): Check for and enable
toolchain support for 16 KB page sizes, if available.
(ndk_CONFIG_FILES): Export linker options so derived.

* src/conf_post.h [__ANDROID_API__ < 35]: Include system time.h
and redefine timezone_t to rpl_timezone_t, so that the Gnulib
replacement may not conflict with the useless OS type.

(cherry picked from commit 2847106f3b6174f25ab43551f96612209fe951c8)

New variable 'completion-preview-overlay-priority'

* lisp/completion-preview.el: Update commentary.
(completion-preview-overlay-priority): New variable.
(completion-preview--make-overlay): Use it.

; Skip commit d277123f4bf855f0d055d283a42166f123fa1fde

; * lisp/menu-bar.el (menu-bar-showhide-menu): Small optimization.

Use 'bound-and-true-p' to check for non-nil 'outline-minor-mode'.

(cherry picked from commit 92ea393a16e5c99a8860dab368c6ca3ca6abc3c5)

* lisp/progmodes/js.el: Improve sexp navigation in js-ts-mode (bug#72573)

(js--treesit-sexp-nodes): Add "template_string", "template_substitution",
"property_identifier".
(js-ts-mode): Replace "template_string" with "string_fragment"
in 'text' part of 'treesit-thing-settings'.

(cherry picked from commit 0155f2ae2c84c649452b0eaac3fd247a37e4eaff)

Explicitly include stdlib.h in src/image.c (Bug#72929)

* src/image.c: Add include.

(cherry picked from commit dc2cdd36835cdce9426d0f822590a0d2f47d0bcc)

Delete cc-compat.el from Makefile.in

* lisp/Makefile.in: Delete obsolete file cc-compat.el.  It has been
moved to obsolete/ and is compiled separately.

(cherry picked from commit 99a03ddb2d43d67577814b96e40ec069739b6421)

Fix integer overflow when reading XPM

* src/image.c (xpm_str_to_int): New function.
(xpm_load_image): Replace sscanf with strtol, to correctly handle
integer overflow when reading a malformed XPM file.  (Bug#72245)

(cherry picked from commit 73277a4097bb6c0d7c9ec1042f053584b28af1dd)

Fix broken use-package tests

* lisp/use-package/use-package-core.el (use-package-keywords): Change
keyword order to match the one before adding :pin, :ensure, :delight,
and :diminish directly to this list.  This fixes some broken unit tests.

(cherry picked from commit bca315aa4c44f4dc0feb0324e5e8c2f7b599fec8)

Better ad-hoc Emacs release of symbol introduction override

The file etc/symbol-releases.eld now contains explicit version
information for selected symbols that our NEWS* scraper doesn't
resolve correctly.

* etc/NEWS.unknown: Remove this file, replaced with...
* etc/symbol-releases.eld: ...this new file.
* lisp/help-fns.el (help-fns--first-release-override)
(help-fns--mention-first-function-release)
(help-fns--mention-first-variable-release): New.
(help-fns--mention-first-release): Try the override information first
before scraping the NEWS* files.

(cherry picked from commit 59e0b82776ade72680e7c369f6089eab4a74dc4a)

; Skip commit ca8170d906f99f40a953c399a94bf99e6466abed

; Fix last change in subr-x.el

* lisp/emacs-lisp/subr-x.el (string-pixel-width): Remove
unnecessary call to 'erase-buffer'.  (Bug#72689)

(cherry picked from commit a9889b8eeceb4f1f7835be04f66d3c91c6f36621)

; Skip commit deb31ba825937cb27ab2b0e157e3e540be215eb2

Adds NSSpeechRecognitionUsageDescription to Info.plist.in

Without this, we cannot launch processes that use macOS's
speech recognition APIs.
With NSSpeechRecognitionUsageDescription in place, macOS displays the
dialog asking the user to grant permission and allows the speech APIs
to be used from the process.
* nextstep/templates/Info.plist.in: Add
NSSpeechRecognitionUsageDescription key.  (Bug#72827)

* etc/NEWS: Announce the change.

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

Make 'python-shell--with-environment' respect buffer-local vars

* lisp/progmodes/python.el (python-shell--with-environment):
Make `with-temp-buffer' respect buffer-local values of
`process-environment' and `exec-path', if set.  (Bug#72849)

(cherry picked from commit 5fd75133cfe389004f9fca8f11e093e531c45fe2)

Avoid ANSI escape characters in Python output (bug#45938)

* lisp/progmodes/python.el (python-shell-completion-native-setup):
Prevent Readline from emitting escape characters in comint output.

(cherry picked from commit e27849ecf6ee01f6d02ef2785d0c10e32bc764e9)

; Skip commit 4f521fa14c18f57e5207bffd68e9f79454dccc79

Work around Gnuplot bug in displaying plots

* lisp/calc/calc-graph.el (calc-gnuplot-command): Prepend newline
to Gnuplot command.  Suggested by Visuwesh <visuweshm@gmail.com>.
(Bug#72778)

(cherry picked from commit bb5576fc9071590143af2106111d95ca2221a20c)

; Skip commit 608526a91a0e0f0287448eb88b0bd11c78fa8688

Make Python skeletons available in 'python-ts-mode' as well

* lisp/progmodes/python.el (python-base-mode-abbrev-table):
Renamed from 'python-mode-abbrev-table' to be available for both
'python-mode' and 'python-ts-mode'.  (Bug#72298)

(cherry picked from commit 4b60267d832e0de209dd7a7665f7ed165091bd7d)

; Fix comments in supercite

* lisp/mail/supercite.el (sc-make-citation): Remove stale comment
about gin-mode.  (Bug#72798)

(cherry picked from commit e5b6c39f5d0f51ed0a2a12a3f1e99b91f1bc6ecf)

Improve 'C-h o' in NEWS files

* lisp/textmodes/emacs-news-mode.el (emacs-news--mode-common):
Modify syntax-table of NEWS modes to consider ' as string-quoting
character.  Suggested by Visuwesh <visuweshm@gmail.com>.
(Bug#72757)

(cherry picked from commit 5cb218596639d87f4114968b8555ce19eb2c5ea2)

Use 'with-work-macro' in 'string-pixel-width'

Tweak the implementation of 'string-pixel-width' to run
faster and use less memory.  Also cater for the case where
this function is called in parallel (bug#72689).
* lisp/emacs-lisp/subr-x.el (string-pixel-width): Use
`with-work-macro'.  Prefer `remove-text-properties' to
`propertize' to avoid creating a new string on each call.

(cherry picked from commit dffdbc1f1fd6569c518e2e3b5e771a54e9e9483f)

New macro `with-work-buffer'.

* lisp/emacs-lisp/subr-x.el (work-buffer--list)
(work-buffer-limit): New variables.
(work-buffer--get, work-buffer--release): New function.
(with-work-buffer): New macro.  (Bug#72689)

* etc/NEWS: Announce 'with-work-buffer'.

(cherry picked from commit b930a698f2ba4e8b5878a4b604098e1201796b7f)

; * etc/NEWS: Minor rewording of last change.

(cherry picked from commit b25da8729dd853e352a147583a7b24699283d4d9)

; Skip commit 1baa62b2ac12ac4dcdace079fabd4c21d10e3e6e

More accurate documentation of 'equal' in ELisp Reference

* doc/lispref/objects.texi (Equality Predicates): Add lists and
conses.  (Bug#72888)

(cherry picked from commit dfcfaa0ef58bab0df243ebf816293a124f4c91c9)

; * etc/NEWS: Grammar fixes.

(cherry picked from commit ad18b145a55578d4e54baa397c9da89490fcdf0c)

; Fix some ungrammatical uses of "allows to"

* doc/emacs/anti.texi (Antinews):
* etc/NEWS:
* etc/NEWS.29:
* lib/cdefs.h:
* lisp/tab-bar.el (tab-bar-select-restore-windows):
* lisp/vc/vc-git.el (vc-git-print-log-follow):
* m4/gnulib-common.m4 (gl_CHECK_FUNCS_SET_RESULTS):
(gl_CHECK_FUNCS_ANDROID): Fix ungrammatical uses of "allows to".

(cherry picked from commit baaf97ce1a1f14e1b999ad17084022a725fbcccc)

Add manual tests for the 'min-width' display property

* test/manual/redisplay-testsuite.el (test-redisplay-5): Add some
newlines.
(test-redisplay-6): New function...
(test-redisplay): ... call it (bug#72721).

(cherry picked from commit 91851fbbf537392ead08105748f480532e7d1c50)

; Skip commit 5fbbc3d0cd277ec71de55c9fd9036afadc875020

; Skip commit 4af1dc83ae8857665162dc4dd05cb5a46e2f9449

; Skip commit a0f740c88d88fdd64738518d030951cd336327c7

; Skip commit a94338581314a5cdc6ec79f658df268c094625ca

; Skip commit 762b85be27b46ddccefa655244fbf469ded206dc

; Skip commit e24d568b565cf4417ce4a89996dbb47b9dc22f13

; Skip commit 2d723a280b3846de9cad8561b971a44ec95c7961

; Skip commit 2a5b129509fa32e6789525403ee8d3e809b6820d

; Skip commit 0db53f14a2974de5209439326d4a9e4749462f42

; Skip commit 6734b60c0c325cf4e7e0614fe67ed24fafc9dd9a

; Skip commit d809d53afc007574b3054027ff2eaf6c8d66996c

; Skip commit 766f69bab12e8d6e2955313247466329b0f48550

; Skip commit 37a097d86631b7897ceea2c01ecbf6c0039cb15e

; Fix typos

* doc/lispref/control.texi (cond* Macro):
* etc/NEWS: Fix typos.

(cherry picked from commit 00f9927693ae31868d1e9f676cd2cd9d8446cb59)

; Skip commit 0fb50e2631656546004d25d81518f9bc8c06d0c2

xwidget: Fix xwidget-at misinterpreting non-xwidget text-properties

'xwidget-open' wrongly assumed the the text-property at
min-position is an xwidget, if it exists; the fix is just
returning nil if the text-property isn't an xwidget.
* lisp/xwidget.el (xwidget-at): Use 'ignore-errors'.  (Bug#72848)

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

Fix rare segfaults due to freed fontsets

* src/xfaces.c (recompute_basic_faces): Force complete
recalculation of non-ASCII faces and their fontsets if any
non-ASCII faces are in the frame's face cache.  (Bug#72692)

(cherry picked from commit 13f69f254cfacfcc780b49c34e044b39dc333732)

; * lisp/simple.el (use-region-beginning, use-region-end): Doc fix.

(cherry picked from commit 427fb319dabf2b7fa4526f244d1e8d57f9e6cca0)

Document 'cond*'

* doc/lispref/control.texi (cond* Macro): New subsection.
Text written by Richard Stallman <rms@gnu.org>.
* etc/NEWS: Document 'cond*'.

(cherry picked from commit 38650b630bdb8b105a7e3c917cc8053133681abc)

Support "/dev/null" as a target when creating Eshell handles

Previously, you could only use this when setting the handle afterwards.

* lisp/eshell/esh-io.el (eshell-set-output-handle): Don't catch
'eshell-null-device' here...
(eshell-get-target): ... catch it here.

* test/lisp/eshell/eshell-tests.el
(eshell-test/eshell-command/output-dev-null): New test (bug#72857).

(cherry picked from commit b6f4ffcc106fdbc21dfea45c75fdc4f217d8f201)

Fix redirecting Eshell output to symbols in some places

* lisp/eshell/esh-io.el (eshell-output-object-to-target): Don't require
TARGET to be bound.

* lisp/eshell/em-script.el (eshell-execute-file):
* lisp/eshell/eshell.el (eshell-command): Quote the output/error
targets.

* test/lisp/eshell/em-script-tests.el (eshell-execute-file-output): New
variable.
(em-script-test/execute-file/output-symbol): New test.

* test/lisp/eshell/eshell-tests.el (eshell-command-output): New
variable.
(eshell-test/eshell-command/output-symbol): New test (bug#72857).

(cherry picked from commit e269cf63a67d529740d0ec2382ae7c3a982cd064)

Use 'eshell-with-handles' in a few more places

* lisp/eshell/em-alias.el (eshell-write-aliases-list):
* lisp/eshell/em-script.el (eshell-batch-file):
* lisp/eshell/esh-cmd.el (eshell-command-to-value):
* lisp/eshell/eshell.el (eshell-command): Use 'eshell-with-handles'.

* test/lisp/eshell/esh-io-tests.el (eshell-test-file-string): Move to...
* test/lisp/eshell/eshell-tests-helpers.el (eshell-test-file-string):
... here.

* test/lisp/eshell/eshell-tests.el
(eshell-test/eshell-command/output-file):
* test/lisp/eshell/em-script-tests.el
(em-script-test/execute-file/output-file): New tests.

(cherry picked from commit 5c68545a936ab42df90c8498ca77207a5e6aff1f)

; Document copyright pitfalls

* admin/notes/years: Document that nt/*.rc.in,
etc/images/gud/README, and configure.ac, need manual
intervention.

(cherry picked from commit 9cd88bd62a6b266f866e56f21c62156d24075dac)

; Fix typos

(cherry picked from commit e6c72aec9d7eba8f3312811a1b6dc925850460f4)

Use 'eshell-with-handles' when executing an Eshell file

This makes sure we close the handles as we should, which is important
for writing the output to an actual file (bug#72857).

* lisp/eshell/em-script.el (esh-cmd): Require this, just to be explicit.
(eshell-execute-file): Use 'eshell-with-handles'.

(cherry picked from commit e97ab1c41332e179939f457cc010a606a5124ff8)

(message-hide-headers): Don't bind `inhibit-modification-hooks`

This binding dates back at least to 2004 (where we bound
`after-change-functions` instead).  Maybe it had a real impact in the past,
but nowadays I can't see any effect other than maybe a negligible
performance improvement at the cost at breaking some uses of
`before-after-change-functions`.

* lisp/gnus/message.el (message-hide-headers):
Don't bind `inhibit-modification-hooks`.

(cherry picked from commit 10802fb00f59594fa8e524e836eaf0e99e87dec9)

Send useless output in flymake-tests to /dev/null (bug#70716)

* test/lisp/progmodes/flymake-resources/Makefile (check-syntax):
Avoid producing a useless file named `-.o` in the source tree.

(cherry picked from commit 1ae861ad7e5b42f9ff4a3d51316ec6bba379670b)

Eglot: fix completion highlighting (bug#72824)

* lisp/progmodes/eglot.el (eglot-completion-at-point):
Make sure to refer to 'completion-ignore-case' in the
'all-completions' method.

(cherry picked from commit 9ffa38d3925d70dea704988f68e9e3eca6c7d19c)

Hide tramp-mode

* doc/misc/tramp.texi (Frequently Asked Questions): Remove tramp-mode.

* lisp/net/tramp.el (tramp-mode): Make it a defvar.  People shouldn't
customize it manually.

(cherry picked from commit bfaa3e029f65a9f2a2509a370579ecb74589ddc5)

; Skip commit 6827335538d10cf487f07053ffb6d94259c26606

; * admin/make-tarball.txt: Document gotcha.

(cherry picked from commit d6880bc24ddf25c4bb814d80534ae66949142162)

Discuss commit log messages on feature branches

* admin/notes/git-workflow (Long-lived feature branches): New
section, discussing commit log messages on feature branches.

(cherry picked from commit afee71273b7041377148fbcfb554db5b45bcb3c9)

* admin/authors.el (authors-fixed-entries): Update docstring.

(cherry picked from commit 77302ccb6aa111ec1a4360a2a80b34b1e1ca4604)

More consistent treesit-forward-sexp around comments (bug#72525)

* lisp/treesit.el (treesit-forward-sexp): Check if point is strictly
inside a comment or string, only then use the default forward-sexp
function; otherwise use tree-sitter's forward-sexp routine.

(cherry picked from commit 3a4839d142757ce6fabe81473e337acd13f51826)

Improve php-ts-mode font lock and support latest grammar (bug#72796)

* lisp/progmodes/php-ts-mode.el:
(php-ts-mode--language-source-alist): Update the parser version.
(php-ts-mode--parent-html-heuristic): Fix commentary.
(php-ts-mode--keywords): Add "exit" keyword.
(php-ts-mode--predefined-constant): Added math constant.
(php-ts-mode--font-lock-settings): New and improved rules.

(cherry picked from commit 31293155879f5b44fc89fda2f22b41e3e5892430)

Fix tree-sitter local parser overlay cleanup routine

Sorry for sneaking in a sizable commit so late.  But I just found out
about this bug and it has to be fixed.  Before this change, we weren't
properly cleaning up overlays that store local parsers.  And in the case
of doxygen local parser in C files, the doxygen local parser overlay
sometimes bleeds out of comments and into other code, and interferes
with font-lock and indentation.

This commit adds a cleanup function that'll cleanup any overlays that
aren't being used.  I tested with doxygen in C files and everything
works smoothly now, including tricky tests like removing the ending "*/"
of a doxygen comment and adding it back.

The idea is simple, at the end of each call to (treesit-update-ranges
BEG END), we remove any overlay within BEG and END that wasn't touched
by the range setting code.

* lisp/treesit.el (treesit--cleanup-local-range-overlays): New function.
(treesit--update-ranges-local): Remove code for cleaning up zero-length
overlays since we have the cleanup function now.
(treesit-update-ranges): Wrap the function body inside a let form, which
defines modified-tick; and add a call to
treesit--cleanup-local-range-overlays at the very end.

(cherry picked from commit b8c05d73a1105851bbe9871d6a64efc06ddc5b6e)

Fix copyright years by hand (Bug#72809)

These are dates that admin/update-copyright did not update.

(cherry picked from commit aa6ed7f67ec7ed08224e6ab2aab0a5b65f2bc314)

; (el-create-index): Cease indexing functions twice.

; * lisp/imenu.el: Simplify.

; el.el, scope.el: Minor improvements.

; * lisp/imenu.el (imenu--index-alist): Update docstring.

Less chatty indentation

Add convenience to Tramp

* doc/misc/tramp.texi (Inline methods): Add tramp-docker-program,
tramp-podman-program, tramp-kubernetes-program,
tramp-toolbox-program, tramp-distrobox-program,
tramp-flatpak-program, tramp-apptainer-program, and
tramp-nspawn-program.
(Remote shell setup): Rearrange indices.
(Ssh setup): Say "user option" when needed.
(Keeping files encrypted): Add tramp-crypt-encfs-program.
(Frequently Asked Questions): Rearrange indices.  Remove duplicate
text.  Add tramp-mode.

* lisp/net/tramp.el (tramp-active-command-completion-p): New defun.

* lisp/net/tramp-cmds.el (tramp-cleanup-connection)
(tramp-cleanup-all-connections, tramp-cleanup-some-buffers)
(tramp-cleanup-all-buffers, tramp-rename-files):
* lisp/net/tramp-message.el (tramp-setup-debug-buffer):
Declare `completion'.

* lisp/net/tramp-integration.el (tramp-info-link): New widget.
(tramp-widget-info-link-action): New defun.

* lisp/net/tramp.el (tramp, tramp-mode, tramp-backup-directory-alist)
(tramp-auto-save-directory, tramp-encoding-shell)
(tramp-encoding-command-switch)
(tramp-encoding-command-interactive, tramp-default-method)
(tramp-default-method-alist, tramp-default-user)
(tramp-default-user-alist, tramp-default-host)
(tramp-default-host-alist, tramp-default-proxies-alist)
(tramp-save-ad-hoc-proxies, tramp-show-ad-hoc-proxies)
(tramp-restricted-shell-hosts-alist, tramp-local-host-regexp)
(tramp-shell-prompt-pattern, tramp-password-prompt-regexp)
(tramp-otp-password-prompt-regexp, tramp-wrong-passwd-regexp)
(tramp-terminal-type, tramp-syntax)
(tramp-ignored-file-name-regexp, tramp-chunksize)
(tramp-process-connection-type, tramp-remote-path)
(tramp-remote-process-environment)
(tramp-completion-multi-hop-methods)
(tramp-completion-use-auth-sources, tramp-use-file-attributes)
(tramp-inhibit-errors-if-setting-file-attributes-fail)
(tramp-allow-unsafe-temporary-files):
* lisp/net/tramp-adb.el (tramp-adb-program)
(tramp-adb-connect-if-not-connected):
* lisp/net/tramp-cache.el (tramp-connection-properties)
(tramp-persistency-file-name, tramp-completion-use-cache):
* lisp/net/tramp-cmds.el (tramp-cleanup-some-buffers-hook)
(tramp-default-rename-alist, tramp-confirm-rename-file-names)
(tramp-file-name-with-method):
* lisp/net/tramp-container.el (tramp-docker-program)
(tramp-podman-program, tramp-kubernetes-program)
(tramp-kubernetes-context, tramp-kubernetes-namespace)
(tramp-toolbox-program, tramp-distrobox-program)
(tramp-flatpak-program, tramp-apptainer-program)
(tramp-nspawn-program):
* lisp/net/tramp-crypt.el (tramp-crypt-encfs-program)
(tramp-crypt-encfsctl-program, tramp-crypt-encfs-option)
(tramp-crypt-save-encfs-config-remote):
* lisp/net/tramp-fuse.el (tramp-fuse-unmount-on-cleanup):
* lisp/net/tramp-gvfs.el (tramp-gvfs-methods):
* lisp/net/tramp-message.el (tramp-verbose, tramp-debug-to-file)
(tramp-debug-command-messages):
* lisp/net/tramp-rclone.el (tramp-rclone-program):
* lisp/net/tramp-sh.el (tramp-inline-compress-start-size)
(tramp-copy-size-limit, tramp-histfile-override)
(tramp-use-connection-share)
(tramp-use-scp-direct-remote-copying, tramp-sh-extra-args):
* lisp/net/tramp-sshfs.el (tramp-sshfs-program): Add `:link' key.

* lisp/net/tramp.el (tramp-enable-method): Move function ...
* lisp/net/tramp-cmds.el (tramp-enable-method): ... here.

(cherry picked from commit 7e17a1fff401e7cb98a9b140d791957ae3af2451)

(pp): Indent lines right when starting in col > 0

This refines the fix for bug#72561: commit 0a500193087e fixes
the bug by changing `ert--pp-with-indentation-and-newline`,
but it turns out that `pp` was inconsistent (it sometimes
indented the subsequent lines correctly and sometimes not,
depending on the current-buffer's major mode).
So the fix really should be in `pp`, which is what this patch does.

* lisp/emacs-lisp/pp.el (pp): Appropriately indent subsequent lines
if the first line is not inserted in column 0 (tho only when
printing into a buffer since otherwise it's somewhere between
ill-defined and impossible to implement).
* lisp/emacs-lisp/ert.el (ert--pp-with-indentation-and-newline):
Remove the indentation code after `pp` which was just working
around the bug in `pp`.  Also remove the redundant addition of
`\n` since `pp` always does it nowadays.
* test/lisp/help-mode-tests.el (help-mode-tests-xref-on-pp):
Fix thinko.

(cherry picked from commit d3311499339fab0371cb7502a1e2481fbcd2c65d)

; * test/src/treesit-tests.el (treesit-indirect-buffer): Untag.

(cherry picked from commit da6e4a862509395bf4c3e30b2b53da6674324c58)

Revert a recent change that caused redisplay slowdown

* src/xfaces.c (recompute_basic_faces): Revert the change which
caused recalculation of all the faces, as it made cursor motion
too slow.  Reported by Juri Linkov <juri@linkov.net> (bug#72692).

(cherry picked from commit 9b299dd79c1627c7ad6b037d599a8e80a92573cd)

; * doc/lispref/display.texi (Low-Level Font): Fix wording (bug#72771).

(cherry picked from commit 4eaab54896fbefb08f5ec3134f53ec5f5365f23a)

Improve computation of indent depth in SHR and 'visual-wrap-prefix-mode'

Now, we get the average-width of the current font using
'string-pixel-width' and a specified space display spec, which doesn't
require the buffer to be displayed in a window (bug#72771).

* lisp/net/shr.el (shr-indent):
* lisp/visual-wrap.el (visual-wrap--content-prefix): Fix getting the
font when the buffer isn't displayed in a window.
(visual-wrap-fill-context-prefix): Fix indentation.

(cherry picked from commit 55aad592e177dc2c503ebe9ad2a46e227683315e)

Indent ERT failure explanations rigidly

This also affects the listing of `should' forms produced by hitting
the L key on a test button in an ERT buffer.

* lisp/emacs-lisp/ert.el (ert--pp-with-indentation-and-newline):
Indent the pretty-printed result to match the caller's current column
as a reference indentation.
* test/lisp/emacs-lisp/ert-tests.el
(ert--pp-with-indentation-and-newline): New test.  (Bug#72561)

(cherry picked from commit 0a500193087efc96aa3791dc4c2084ef5f6c3c06)

[Eglot] Stricter "expand common" behavior

* lisp/progmodes/eglot.el (eglot--dumb-tryc): Check that the
expanded string matches every completion strictly (bug#72705).
And in the fallback case, check whether the table matches the
original prefix at all.  Return nil otherwise.

* test/lisp/progmodes/eglot-tests.el
(eglot-test-stop-completion-on-nonprefix)
(eglot-test-try-completion-nomatch): Corresponding tests.

* etc/EGLOT-NEWS: New entry.

(cherry picked from commit 713069dd7a87cff8388c25f1bc2c2c1b5217b1ca)

eglot-tests.el: New tests for existing completion behavior

* test/lisp/progmodes/eglot-tests.el
(eglot-test-common-prefix-completion)
(eglot-test-try-completion-inside-symbol)
(eglot-test-rust-completion-exit-function): New tests.
(eglot--wait-for-rust-analyzer): New function.

(cherry picked from commit 096730510cdf8c582972f68afeef3226ee5810ca)

Remove dangerous HTML edit from admin.el

* admin/admin.el (manual-html-fix-index-2): Avoid lax matches with
"<ul>" which could mistakenly edit unrelated parts of HTML.
(Bug#72761)

(cherry picked from commit 969498c25d0112dbdc3aa2ef75dc63681101203e)

Faster region-beginning and region-end for rectangle selections

* lisp/rect.el (rectangle--region-beginning, rectangle--region-end):
Make these run in O(1), not linear, time and space.

(cherry picked from commit 3a8222e700304e4dff84fcdfa8ff2a4e48646c82)

; Skip commit 52829bcee614af0322882e3349c2cfcd913a8531

; Fix bad references to other manuals

* doc/misc/bovine.texi (top, Optional Lambda Expression)
(Starting Rules, Bovine Grammar Rules, How Lexical Tokens Match):
* doc/misc/eudc.texi (Overview, Creating BBDB Records)
(Inline Query Expansion):
* doc/misc/dbus.texi (Top):
* doc/misc/efaq.texi (Top):
* doc/misc/wisent.texi (Wisent Semantic, Wisent Lex): Fix
cross-references to other manuals.  Remove redundant pointers from
Top node.

(cherry picked from commit 7319f5e078b6c98379414a4601a269e6581ec206)

; Still fighting with emba.gnu.org config

* test/infra/gitlab-ci.yml (variables): Remove GIT_DEPTH.
(.job-template): Set cache:policy to pull-push, as before.  Check
behavior of docker export.
(.build-template): Remove needs and cache.
(.test-template): Remove cache.  Adapt artifacts:paths.

(cherry picked from commit 1f4da7fe3e8dac64c4da0ea2ff812be521946ea2)

Fix handling of 'min-width' display property

* src/xdisp.c (get_display_property, display_min_width): Rename
BUFPOS to CHARPOS, to avoid confusion (it is not necessarily a
buffer position).  Suggested by Jim Porter <jporterbugs@gmail.com>.
(get_display_property): Call 'Fget_char_property' to support
'min-width' properties of overlays as well.
(display_min_width): Handle the buffer and string cases more
accurately, without relying only on the values of positions.
(handle_display_prop, handle_single_display_spec): Pass correct
position to 'display_min_width', when iterating over a string.
(handle_display_prop): When OBJECT is a window, pass it to
display_min_width.
(set_iterator_to_next): Call 'display_min_width' when at end of a
display or overlay string.  (Bug#72721)

* etc/NEWS: Announce the support for overlays.

(cherry picked from commit 71505b723c9fb9de20f6d38be7c73d595e9be3ce)

; Mention in PROBLEMS issues with long popup menus

* etc/PROBLEMS: Problems with very long popup menus on Lucid
builds.  (Bug#72791)

(cherry picked from commit 8c251a4c4194802a2b69165d699c3ba43d45c401)

; * src/treesit.c (Ftreesit_parse_string): Fix comment and punctuation.

(cherry picked from commit 8a94cee3b58a59eac6ca24c001769f0fe12bf020)

Fix Ftreesit_parser_create

* src/treesit.c (Ftreesit_parser_create): We recently changed something
such that base buffer and indirect buffer appears to use separate
parser-lists.  Therefore, creating a parser in one of the buffer
shouldn't reuse the parser in another buffer.

(cherry picked from commit f322905f6a31deb8da7f3d40a87e5ea097df5a73)