* cus-face.el: Provide completion for font families (bug#74362)

* lisp/cus-edit.el (custom-face--font-cache-timeout): New var.
(custom-face--font-completion): New function.
* lisp/cus-face.el (custom-face-attributes): Use it.

(cherry picked from commit ea550488233833baafda90a3f258f96953381274)

man.el: Guess flags for `man -k` to fix bug#73656

* lisp/man.el (Man-man-k-flags): New var.
(Man-completion-table): Use it.

(cherry picked from commit 347750461e71eec4668fb265cd29cffce45783f2)

; Fix last change

(cherry picked from commit b6181c9ec9f7dcbb1c5657537ccc52dc7a3bf6ac)

Tramp: Be more conservative in removing temporary files

* test/lisp/net/tramp-tests.el (Commentary): Extend.
(tramp--test-enabled): Exclude also old FUSE mount points from
deletion.

(cherry picked from commit b6e78f7d8cc6ac6b2fdea0761879e0d65f493191)

; Fix documentation of new header-line faces (bug#73862)

* doc/emacs/display.texi (Standard Faces): Fix wording.

* etc/NEWS: Fix entry about new header-line faces.

(cherry picked from commit cd490c6470d93bf4093a8e3ea411fa179b235f07)

* src/pdumper.c (dump_interval_node): Fix itree_node struct hash.

(cherry picked from commit 7ded1064cf4d9fde32c7a89473ef9476520cd556)

Fix font-lock in 'lisp-mode'

* lisp/emacs-lisp/lisp-mode.el (lisp-fdefs): Fix regexps for
"\\<>" and similar constructs.  (Bug#74307)

(cherry picked from commit 200c877cd48aa0f7638fdd5157555374f0f7bfc8)

; Fix last change

* doc/emacs/display.texi (Standard Faces): Fix indexing.

* lisp/faces.el (header-line-active, header-line-inactive): Fix
the :version tag.  (Bug#73862)

(cherry picked from commit f630520be97a9dda5e4b93765dbd82b6e9b298d0)

Add new `header-line-active' and `header-line-inactive' faces

This is all intended to parallel the 'mode-line-active' and
'mode-line-inactive' distinction.
* doc/emacs/display.texi (Standard Faces): Document the new faces.

* lisp/faces.el (header-line-active, header-line-inactive): New
faces.

* src/dispextern.h (CURRENT_HEADER_LINE_ACTIVE_FACE_ID_3)
(CURRENT_HEADER_LINE_ACTIVE_FACE_ID): New macros based on mode
line equivalents.
(face_id): New face IDs.
* src/xdisp.c (window_box_height, pos_visible_p, init_iterator)
(window_text_pixel_size, display_mode_lines, display_mode_line)
(format-mode-line): Replace all uses of HEADER_LINE_FACE_ID with
either a new macro or the new face IDs.
* src/xfaces.c (syms_of_xfaces): New lisp symbols.
(lookup_basic_face, realize_basic_faces): Map new face IDs to
their lisp symbols.  (Bug#73862)

(cherry picked from commit a4014c058b547d4f9c8c61c6737c85c2636fdb34)

Fix customization type of erc-spelling-dictionaries

* lisp/erc/erc-spelling.el (erc-spelling-dictionaries): Update :type
specification to reflect shape expected by `erc-spelling-init', and
improve description in doc string.  (Bug#74363)

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

Use helper to get erc-networks--id symbol as string

* lisp/erc/erc-networks.el (erc-networks--id-string): New function.
(erc-networks--construct-target-buffer-name)
(erc-networks--ensure-unique-server-buffer-name)
(erc-networks--rename-server-buffer): Use it.
* lisp/erc/erc-nicks.el (erc-nicks-list-faces): Use it.
* lisp/erc/erc-status-sidebar.el (erc-status-sidebar-pad-hierarchy): Use it.
* lisp/erc/erc.el (erc-generate-new-buffer-name)
(erc-log-irc-protocol)
(erc--auth-source-determine-params-defaults)
(erc-format-target-and/or-network): Use it.
* test/lisp/erc/erc-networks-tests.el (erc-networks--id-string): New test.

(cherry picked from commit 7fc048ca7781f9ba04d953f79fb29646c92cf35d)

; Fix TRAMP manual indexing

* doc/misc/tramp.texi (Customizing Methods): Make sure @item comes
after @cindex.

(cherry picked from commit d25689d6e2cfd387edbc77b01c03d0ae767f8cf0)

Remove Tramp temp files if advised during tests

* lisp/net/tramp-fuse.el (tramp-fuse-name-prefix): New defconst.
(tramp-fuse-mount-point): Use it.

* test/lisp/net/tramp-tests.el (tramp-test-name-prefix): New defconst.
(tramp--test-make-temp-name, tramp-test40-make-nearby-temp-file)
(tramp-test47-read-password, tramp-test47-read-otp-password):
Use it.
(tramp--test-enabled-checked): Move down.
(tramp--test-enabled): Delete all Tramp temp files when
environment variable $TRAMP_TEST_CLEANUP_TEMP_FILES is set.
(tramp-test02-file-name-dissect-separate):
Adapt `tramp-crypt-directories' according to syntax.
(tramp-test47-read-password):
Let-bind `tramp-connection-properties' instead of modifying
`tramp-methods'.

(cherry picked from commit 310ce93d02c5317be589803fbde96fd20b96e496)

* lisp/subr.el (read-number): Document collision with 'format-prompt'.

(cherry picked from commit c29c54410ea889bafc1bb4a29664827bc893b7d4)

; Fix TRAMP manual indexing

* doc/misc/tramp.texi (Inline methods):
(External methods):
(GVFS-based methods):
(FUSE-based methods):
(Customizing Methods):
(Remote shell setup):
(Change file name syntax):
(Archive file names):
(Frequently Asked Questions): Make sure @item comes after
@cindex and similar indexing commands.

(cherry picked from commit 68337106f910602a32dca0597137291582c6e45a)

New user option bibtex-entry-ask-for-key

(cherry picked from commit cc9188b1900079f87d76cc8b7493d64a9ccd9d36)

Don't clobber stickiness text properties when printing Eshell prompt

* lisp/eshell/em-prompt.el (eshell--append-text-property): New
function...
(eshell-emit-prompt): ... use it.

* test/lisp/eshell/em-prompt-tests.el
(em-prompt-test/field-properties/merge-stickiness): New test.
(em-prompt-test/field-properties, em-prompt-test/after-failure): Reorder
stickiness values (bug#74230).

(cherry picked from commit df288d2e4148e6e72f21752a510f98536e7705ac)

Fix errors in Tramp's password cache expiration

* doc/misc/tramp.texi (Password handling): Mention expiration of
cached passwords when a session timeout happens.

* lisp/net/tramp-adb.el (tramp-adb-maybe-open-connection): Rename
file property "process-attributes" to connection property
" process-attributes".

* lisp/net/tramp.el (tramp-read-passwd):
* lisp/net/tramp-sh.el (tramp-maybe-open-connection):
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-send-command):
Rename connection property "password-vector" to "pw-vector".

* lisp/net/tramp-sh.el (tramp-maybe-open-connection):
Use connection property "hop-vector".

* lisp/net/tramp.el (tramp-get-process-attributes)
(tramp-handle-list-system-processes): Rename file property
"process-attributes" to connection property " process-attributes".
(tramp-compute-multi-hops): Check for
`tramp-sh-file-name-handler-p', it works only for this.
(tramp-action-password, tramp-process-actions): Use connection
property "hop-vector".
(tramp-read-passwd, tramp-clear-passwd): Rewrite.  (Bug#74105)

(cherry picked from commit 6d42c70fd3e2e63c8f993a10c83dee7425f185d5)

Fix drag-n-drop on MS-Windows

* src/w32fns.c (struct w32_drop_target): New member 'ref_count'.
(w32_drop_target_AddRef): Increment reference count.
(w32_drop_target_Release): Decrement reference count, and free the
target only if the reference count is zero.
(w32_createwindow): Initialize reference count.  (Bug#74312)

(cherry picked from commit b83a45eab53b8e6d8f3be45c0acb9a42a5262cb0)

; Skip commit 5b19ca56f1d91a65c0068160790e2cb512bb2067

Add song viewer to 'mpc' (Bug#74200)

* lisp/mpc.el (mpc-describe-song): New command.
(mpc-mode-map): Bind "d" to 'mpc-describe-song'.
(mpc-mode-menu): Add menu item.
(mpc-secs-to-time): Ensure secs argument is an integer.
(mpc-song-viewer-empty, mpc-song-viewer-tag):
(mpc-song-viewer-value): New face.
(mpc-song-viewer-tags): New option.

(cherry picked from commit 32f070fa3dfccd29abad6e7566ed9121e3f1da39)

; TRAMP manual spelling and grammar fixes

* doc/misc/tramp.texi (FUSE-based methods):
(Firewalls):
(Predefined connection information):
(Remote programs):
(Remote shell setup):
(Ssh setup):
(Home directories):
(Remote processes):
(Renaming remote files):
(Archive file names):
(Bug Reports):
(Frequently Asked Questions): Use "can" instead of "could" where
it makes sense.

(cherry picked from commit 8f6ff233ef11e7cc19c524228f48b732a98aa284)

Improve font-locking and indentation in 'php-ts-mode'

* lisp/progmodes/php-ts-mode.el (php-ts-mode--language-source-alist):
Updated to latest version of PHP grammar.
(php-ts-mode--indent-styles): 'namespace_use_declaration' is now
correctly indented.
(php-ts-mode--operators): Support of the "argument unpacking
operator".
(php-ts-mode--font-lock-settings): 'nullsafe_member_call_expression'
is now highlighted correctly.
(php-ts-mode--comment-indent-new-line): Delete trailing whitespace
before inserting newline (see bug#73900 for more information).
Bug#74239

(cherry picked from commit f69f54c454eb3c0f8ff8c55cfd2b7832ea1709cf)

Fix some 'lua-ts-mode' options (Bug#74235)

* lisp/progmodes/lua-ts-mode.el (lua-ts-luacheck-program):
(lua-ts-inferior-program): Switch to 'file' type and remove 'nil'
as a choice.
(lua-ts-inferior-lua): Ensure 'lua-ts-inferior-program' is set.

(cherry picked from commit 27aacbd172f3b94926073250ef81a226616d1e45)

; Update the xwidgets-on-NS text due to fixing bug#60703

* etc/TODO: Update the xwidgets-on-NS text (bug#74295).

(cherry picked from commit a0613372a7bbc19f87f19c49153eca262eb750c1)

Improve comment indenting in 'lua-ts-mode'

* lisp/progmodes/lua-ts-mode.el (lua-ts--simple-indent-rules):
Align single line comments with the surrounding context.
(lua-ts--comment-first-sibling-matcher): Check that comment is
the first sibling.
(lua-ts--multi-line-comment-start): New function.
* test/lisp/progmodes/lua-ts-mode-resources/indent.erts:
Add tests.  (Bug#74298)

(cherry picked from commit d592832504554c6ee30bea263e55dc84feaec18d)

; Skip commit 6bc44ccf287a398d47563ddf60d13784cd64720f

Delete commented out help--describe-vector implementation

This was an attempt at lifting 'help--describe-vector' to Lisp that
turned out to be prohibitively slow.  It is still there in the Git log
if we need to refer back to it.  Currently, it is just dead weight, so
delete it.

* lisp/help.el: Delete commented out code.

(cherry picked from commit 96656c77e282939a84b19a9ccbbea5fbea948e33)

Add docstring to gnus-group-toggle-subscription

* lisp/gnus/gnus-group.el (gnus-group-toggle-subscription): Add
docstring.

(cherry picked from commit 8e27f5bc5276287038dcdbaa8d09bc42f61d1073)

* lisp/files.el (require-with-check): Fix last fix (bug#74289)

(cherry picked from commit 8afcfed825ae60c8947c41d84b431b21f32b2714)

Tramp: Rework handling of temporary connection properties

* doc/misc/tramp.texi (Ad-hoc multi-hops): Precise use of parallel
multi-hops.

* lisp/net/tramp-cache.el:
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-androidsu.el:
* lisp/net/tramp-cmds.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el: Rename connection properties "process-name",
"process-buffer" and "first-password-request" to " process-name",
" process-buffer" and " first-password-request, repectively".

* lisp/net/tramp-cache.el (tramp-dump-connection-properties):
Don't dump properties starting with a space.

(cherry picked from commit 22900b5990888cb231d65755562879108c626088)

flyspell.el: block less

New function 'alist-set'

Give Completion Preview active bindings higher precedence

Fix regression in 'Custom-newline'

(with-peg-rules): Build proper `peg-function`s

* lisp/progmodes/peg.el (with-peg-rules): Use the new (FUNC EXP)
feature in `cl-labels`.

(cherry picked from commit 986621ae1ff4d3cfad31adb20216f1f71ce0747c)

(cl-labels): Add support for (FUNC EXP) bindings (bug#59786)

Allow `cl-labels` to use the same (FUNC EXP) bindings as were already added
to `cl-flet` in Emacs-25.  The Info doc (mistakenly) already documented this
new feature.

* lisp/emacs-lisp/cl-macs.el (cl--self-tco-on-form): New function.
(cl-labels): Use it to add support for (FUNC EXP) bindings.

* test/lisp/emacs-lisp/cl-macs-tests.el (cl-macs--labels): Add test for
tail-recursive (FUNC EXP) bindings.

(cherry picked from commit 79400f4f18b80cdde72eda86023e41a81d09a164)

; * src/w32menu.c (w32_popup_dialog): Fix last change.

(cherry picked from commit a7400cb8810373b6d39347a5e0e1ac7152d3abd1)

; * src/w32menu.c (w32_popup_dialog): Fix last change (bug#74312).

(cherry picked from commit 77739d42ab2f728c61faa2fa8f6a521f9240881e)

Fix Cygw32 build

* src/pdumper.c (dump_mm_heap_cb_release): Avoid NULL pointer
dereference.
* src/w32dwrite.c (INITGUID) [CYGWIN]: Don't define for Cygwin.
* src/w32menu.c (w32_popup_dialog): Fix Cygw32 build.  (Bug#74312)

(cherry picked from commit b54fa15ffbb959e97ea0b77bfeb9ae412a63b4e8)

* src/w32fns.c (process_dropfiles): Fix cygw32 build (bug#74312).

(cherry picked from commit 6ddbe8c7010485f6bca80b6e898610d5831eac60)

lisp/files.el (require-with-check): Fix bug#74091.

(cherry picked from commit 3496234c8ed10a14f740199722ec727bd43c82d3)

; Skip commit 90c97d3fac989f3048fda4a30a626bec2c3301c5

Precise password cache in Tramp

* doc/misc/tramp.texi (Password handling):
Describe auth-source-cache-expiry and auth-source-do-cache instead
of password-cache-expiry and password-cache.  (Bug#74105)

* lisp/net/tramp.el (tramp-read-passwd): Check for `auth-sources'
being non-nil.

(cherry picked from commit c96e57609076c4d5627e698a6f12a731a77c365e)

Fix picture-mode with full-width characters

* lisp/textmodes/picture.el (picture-insert): Don't rely on
'move-to-column' to move to the column that is its argument: this
might be false when full-width characters are involved.

(cherry picked from commit 3954e8d9bbed902e750c9e0647c6527ae32523b9)

Fix movement to the left in picture-mode

* lisp/textmodes/picture.el (picture-insert): Measure width by
counting columns on display, not by using 'string-width', because
the latter is inaccurate when TABs are involved.  (Bug#74255)

(cherry picked from commit 7dabfe9465c623043e4ea1abe618a6169c155d04)

Fix some meta-calls with constant arguments

Warn about meta-calls with constant arguments

Set 'project-vc-ignores' in .dir-locals.el

Update matches count when refreshing *xref* buffer

When using Eshell's "du" implementation, deduplicate hard links

* lisp/eshell/em-unix.el (eshell-du-sum-directory): Take SEEN-FILES.
(eshell/du): Create 'seen-files' hash table.

(cherry picked from commit 1704fa4fb4164a15c7e258b922dbba190811d92d)

Don't use dynamically-bound variables for Eshell's "du" command

* lisp/eshell/em-unix.el (block-size, by-bytes, dereference-links)
(grand-total, human-readable, max-depth, only-one-filesystem, show-all)
(eshell-du-size-string): Remove.
(eshell-du-sum-directory): Accept key arguments for adjusting behavior.
(eshell/du): Use 'block-size' of 1 instead of 'by-bytes', and define a
print function.

(cherry picked from commit 37c583a2c2f97c6fb0ed0433db9c74c6a1758e3e)

Use the Lisp implemention of "du" in Eshell when querying remote dirs

* lisp/eshell/em-unix.el (eshell/du): If all directories are local, use
the external "du" instead.

(cherry picked from commit f26fb25ec8ca12901db6224973c7fef29ce938f9)

Don't pcomplete 'find -newerxy' flag

* lisp/pcmpl-gnu.el (pcomplete/find): Remove -newerxy flag.
This flag is not used verbatim like that, and we already complete
the "-newer" flag, which should be all that users need.
Problem reported by Juri Linkov <juri@linkov.net>.

(cherry picked from commit f6a63e4b441424298f1239372ec50b528d343b65)

Fix kill-all-local-variables

; Skip commit daa42ddebea6a798648f03f41497fddfcb3e0de9

Fix documentation and error message of adding local variables

* lisp/files-x.el (add-file-local-variable)
(add-file-local-variable-prop-line): Doc fixes.
(add-file-local-variable): Improve the user-error text.  (Bug#74267)

(cherry picked from commit dbcd9d782c94e34baf9aabdaeaa70efb791d8a25)

Document the 'display-line-numbers-disable' property

* doc/lispref/display.texi (Overlay Properties):
* doc/lispref/text.texi (Special Properties): Document
'display-line-numbers-disable'.  Fix indexing.

(cherry picked from commit 94bf7ad797bb7a3c1faa72d2066a1e9b883c4547)

Add functions supported by GNU Make 4.3.

* lisp/progmodes/make-mode.el (makefile-gnumake-functions-alist):
Add missing GNU Make functions, according to The GNU Make Manual
0.75 for GNU Make, and reorder the list of functions.  (Bug#74207)

(cherry picked from commit 0642d5f7da208e3237f17102858811c2d9c28990)

; Skip commit 8ee14643d2c222d9dbf0e914d878c3da0c8f2386

; Fix last changes

* lisp/color.el (color-blend): Fix quoting of apostrophe.
(color-rgb-to-hex, color-blend): Autoload.

(cherry picked from commit 17f4f2dec95d93eae3aaf3c6e4c59955732f8f62)

Replace vtable--color-blend with color-blend

* lisp/emacs-lisp/vtable.el (vtable--face-color): Use `color-blend'.
(vtable--color-blend): Remove unused function.

(cherry picked from commit fdab542a56201b1581abdc0df940e0c50abde1c7)

Add color-blend to blend two RGB lists

* lisp/color.el (color-blend): Blend two RGB lists.
* test/lisp/color-tests.el (color-tests-blend): Test color-blend.
* etc/NEWS: Announce color-blend.

(cherry picked from commit bf312529def48bc6fdf72d43d5be158d125f52f6)

; Skip commit e1e8da5e4f1951744d26b99b000c7f746a9ca8c6

; Skip commit 5def10ad944a6f6fe5e09b153c3cb4f0ce78e415

Update vtable documentation

* doc/misc/vtable.texi: Document creation of empty vtables.
* etc/NEWS: Announce empty vtables.  (Bug#73775)

(cherry picked from commit ac91d190d623f6fef186b035373cdb72347cc99d)

vtable: allow resetting column alignment when table data changes

* lisp/emacs-lisp/vtable.el (vtable--compute-columns): If a column
was not created with an explicit 'align' property, allow changing
this property when the column data changes from numeric to
non-numeric (or vice versa).  This makes it possible to add data to
an empty table, because in a table without data all columns are
assumed to be numeric and right-aligned.  (Bug#73775)

(cherry picked from commit 35e1ab970c1cfc6a1b62fbb920e0d2bb031765da)

Enable inserting new objects into empty vtable

* lisp/emacs-lisp/vtable.el (vtable-insert-object): If the vtable
is empty, add the new object and recreate + redisplay the table.
(Bug#73775)

(cherry picked from commit 425f244738e784fbf46e3fcc3461759340cfb928)

Allow empty vtable

* lisp/emacs-lisp/vtable.el (vtable--compute-widths): Set default
width for columns that have no explicit width and no data.
(Bug#73775)

(cherry picked from commit d94bb481ba1bcf8602fc600572e5779b25cd896d)

Add dark color scheme to emacs.metainfo.xml

* etc/emacs.metainfo.xml: Add dark color scheme.  Patch by Peter
Oliver <p.d.oliver@mavit.org.uk> (bug#74123).

(cherry picked from commit 764db76072847d2650f5b07349723a2802ccd45e)

Add more fields to AppStream metadata in emacs.metainfo.xml

* etc/emacs.metainfo.xml: Populate the vcs-browser and contribute URLs,
as well as the branding color.  (Bug#74123)

(cherry picked from commit 1f3434a84c13d3fbc55e8a7ace53bdfd61748db5)

Document issues with 'use-package's ':custom' and byte compilation

* doc/misc/use-package.texi (User options): Warn against
byte-compiling init files that use ':custom'.  (Bug#73609)

(cherry picked from commit b1be0f2ba6b05b7644080638ae26e619cbeac75c)

Tramp: Support different proxies for the same destination

* doc/misc/tramp.texi (Ad-hoc multi-hops): New subsection "Using
different proxies for the same destination".

* etc/NEWS: Tramp supports different proxies for the same
destination host name in parallel.
Fix typos.

* lisp/net/tramp-cmds.el (tramp-cleanup-connection): Fix docstring.

* lisp/net/tramp.el (tramp-make-tramp-file-name): Don't call
`tramp-add-hops' during file name completion.
(tramp-handle-file-name-as-directory)
(tramp-handle-file-name-directory): Use `tramp-cache-undefined'
for an empty `tramp-default-proxies-alist'.
(tramp-add-hops): Extend.  Remove existing entries with same
target and different proxy, if needed.  (Bug#74219)

(cherry picked from commit 6cde51f1bbcfd55fe8d189b045247b9d80dee4ea)

Fix 'internal_equal' so that it uses at most one hash table

The old implementation passed the hash table by value in
recursive tests, which would cause each recursive level to
initialize its own hash table, causing excess memory usage.
* src/fns.c (internal_equal): Delegate to 'internal_equal_1'.
(internal_equal_1): New function; body from old 'internal_equal'.
Pass the hash table argument by reference instead of by value.
(Bug#73883)

(cherry picked from commit 200214ca68f00722bf906bbf2a2afa81d139d5dc)

time-stamp: minor adjustments to %P and modifier characters

* lisp/time-stamp.el (time-stamp-string-preprocess): %P variations;
allow (and ignore) "*", "E", and "O" as modifier characters.
(time-stamp-inserts-lines): safe-local-variable only if booleanp

(cherry picked from commit 766ec1f9e08e6f2c7c22b514a6f2e65f79341023)

; Insert "Stealing lock" at the beginning of a message

* lisp/vc/vc.el (vc-steal-lock): Use 'mail-text' instead of
jumping to 'point-max', to avoid inserting the message after
signatures.  (Bug#74027)

(cherry picked from commit 551d1a2cd73bb3df2cad0f1f5b5d1628bb138483)

Update special attributes for Python 3.13

* lisp/progmodes/python.el (python-font-lock-keywords-level-2)
(python--treesit-special-attributes): Update special attributes,
making it current for Python 3.13.

(cherry picked from commit 11954a3a0ac67d02c18441658c1f250c9ced75de)

; * src/ftcrfont.c (ftcrhbfont_end_hb_font): Improve commentary (bug#73752).

(cherry picked from commit 775970a7831de930cd25ee592fb40004b1c2bc24)

Fix display of compositions when font style changes (Cairo backend)

* src/ftcrfont.c (ftcrhbfont_end_hb_font): Don't persist the
result of 'cairo_ft_scaled_font_lock_face' in violation of the
API contract.  (Bug#73752)

(cherry picked from commit 9149aa89ee860627cc91e27c8659ad6f4efcfcd8)

; * src/xdisp.c (face_before_or_after_it_pos): Fix thinko (bug#74241).

(cherry picked from commit 3bf00777be1e28d3d0e49692071825580f472037)

Improve 'open-network-stream' documentation.

* doc/lispref/processes.texi (Network): Correct explanation of
':warn-unless-encrypted'.  Document ':error' return keyword.
* lisp/net/network-stream.el (open-network-stream): Improve
':return-list' documentation.  Document ':error'.  Correct
explanation of ':warn-unless-encrypted'.

(cherry picked from commit 3231af3727b450404efd6f49ddf5c95c5a8cbb0f)

; Fix typos in case-conversion descriptions

* doc/lispref/nonascii.texi (Character Properties): Fix typos.
* doc/lispref/strings.texi (Case Conversion): Fix typos.
(Case Tables): Fix typos.

(cherry picked from commit fb55431c44ec00b05122eaa09d310c1dcf2684b1)

; Fix typo and indexing in the ELisp manual

* doc/lispref/display.texi (Image Descriptors): Fix typo and indexing.
(Defining Images): Fix indexing.

(cherry picked from commit 83f095d1fd4be8be5db61fd6a94fc6203cc78b2f)

; Instrument proced-tests.el further

* test/lisp/proced-tests.el
(proced--assert-process-valid-cpu-refinement): Explain also Lisp errors.

(cherry picked from commit 37b1799c9e5677db35ac509729a29fb7cd44cf39)

Improve Tramp documentation on direct async processes

* doc/misc/tramp.texi (Remote processes): Add another example
enabling direct async processes based on method name.  (Bug#74105)

* etc/NEWS: Rephrase Tramp entry on direct async processes.

(cherry picked from commit 03fa832b4dcc47276894d90f3323bca31eb0633e)

* search.el: Support changing search context regex

; Fix quoting style in comments in itree.[ch] files

* src/itree.c:
* src/itree.h: Fix quoting style in comments.

(cherry picked from commit e8b8a1121a8d1826f0ff8874e38594bfaedddfac)

Always print the expanded directory name for Eshell's "pwd" command

* lisp/eshell/em-dirs.el (eshell-pwd-convert-function): Default to
'expand-file-name' on all systems.

* etc/NEWS: Announce this change.

(cherry picked from commit ef440f59a170c3c69948fca863f368e397d503b4)

Ensure `move-frame-functions' trigger on macOS frame resize

* src/nsterm.m ([EmacsView windowWillResize:toSize:]): Call
windowDidMove to ensure that MOVE_FRAME_EVENT events are
generated when a frame is resized.  (Bug#74074)

(cherry picked from commit 3e36267b25ea9730e4acd8b0f47c5e967cea9e94)

; * lisp/net/eww.el (eww-submit): Fix last change (bug#65973).

(cherry picked from commit 4b4ca233675b7a820feca5893e5279327ab76795)

When submitting files in EWW, only send the file's basename

* lisp/net/eww.el (eww-submit): Send the basename, not the full
filename (bug#65973).

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

* lisp/net/newst-plainview.el: Fix Bug#74198

* lisp/net/newst-plainview.el
(newsticker--do-mark-item-at-point-as-read): Save feed cache immediately
when item state is changed. (Bug#74198)

(cherry picked from commit acce03eb549ec102dc2bda2e509551f03dc60175)

Enable guidance for Northern Iroquoian input methods

* lisp/leim/quail/iroquoian.el: Set GUIDANCE argument of
'quail-define-package' forms to non-nil.  (Bug#74170)

(cherry picked from commit 63d4c4b9ce469c596de9b38977ad7bf6e28349eb)

New input methods for Northern Iroquoian languages

* lisp/leim/quail/iroquoian.el: New file.  (Bug#74170)

* etc/NEWS: Announce the new input methods.

(cherry picked from commit 04b055797a4b51392658548e4847cb7513354c67)

; * etc/symbol-releases.eld: Add 'read-number'.

(cherry picked from commit e8cf271e64e69852da983da432423396b5b01b2b)

* etc/symbol-releases.eld: Add version=, version<, version<=.

(cherry picked from commit 19ce31ecab8361ef8b44c8a1777d09cf9a902714)

* lisp/net/newst-plainview.el (newsticker--buffer-do-insert-text): Bug#74197

Use "[logo: <feed name>]" instead of "<feed name>" for the string
holding the logo image.

(cherry picked from commit b5845eb5ef54162da6f0735880b36315ca984852)

* lisp/term/w32-win.el (w32--textual-mime-types): Escape literal `+`

(cherry picked from commit 42fe3420e476045228a219579343f16da29256cf)

Fix wrong value of `when` and `unless` with empty body (bug#74215)

Reported by Brennan Vincent.

* lisp/subr.el (when, unless): Return nil when the body is empty.
* test/lisp/subr-tests.el (subr-test-when): Add test cases.

(cherry picked from commit 9ee9154247454c18f9f75d0d32592b817d7e977a)

Several Tramp cleanups

* lisp/net/tramp-adb.el (tramp-adb-maybe-open-connection):
Move setting of sentinel up.

* lisp/net/tramp-cache.el (tramp-get-connection-property)
(tramp-set-connection-property): Don't raise a debug message for
the `tramp-cache-version' key.

* lisp/net/tramp.el (tramp-convert-file-attributes): Don't cache
"file-attributes-ID-FORMAT".

* test/lisp/net/tramp-tests.el (tramp--test-enabled): Cleanup also
`tramp-compat-temporary-file-directory'.
(tramp-test32-shell-command): Use `async-shell-command-width' of 512.
(tramp-test36-vc-registered): Remove double let* entry.

(cherry picked from commit 1e3d72d962b8b736741747a5ec4595e08965ef49)