Fix naming of buffers for tags ending in Y in 'mpc'

* lisp/mpc.el (mpc-tagbrowser-buf): Use 'mpc-tagbrowser-tag-name'
to ensure buffers corresponding to tags that end in Y are
correctly pluralized; e.g. the tag "Directory" should create a
buffer named "*MPC Directories*" not "*MPC Directorys".

(cherry picked from commit 60e58be091bf075a03ac431444aa9c9b5832bb19)

; Skip commit a815becb63b48c472ee0b405c00db6a188ad6ddc

(symbol-file): Fix `C-h v pcase` where `cl-struct` lacks file info

* lisp/subr.el (symbol-file): Return an actual (and absolute) file name
for the autoload case, as is done for other cases.

(cherry picked from commit 0886ef01a8d7144771b5834c3ef6c3d44666ea76)

(help-fns-short-filename): Fix bug#73766

* lisp/help-fns.el (help-fns--radix-trees): New var.
(help-fns--filename, help-fns--radix-tree): New functions.
(help-fns-short-filename): Use them.

(cherry picked from commit e807d62cdd12b8086d360114c10085f0c0cf4116)

* admin/notes/git-workflow: Use emacs-30 in examples.

(cherry picked from commit c437d7110b388a97ff6b67b2bc3138d05fbe3576)

; Skip commit 7dbbd58d6c9cafde2136b83ff149aa608203e207

; Fix last documentation change

* doc/misc/efaq.texi (Colors on a TTY):
* doc/lispref/frames.texi (Font and Color Parameters):
* doc/emacs/cmdargs.texi (Colors X): More accurate documentation
of TTY color modes and 'tty-color-mode' frame parameter.
(Bug#73813)

(cherry picked from commit 19049efd30f5476baa4b69c4b79af15674c2650b)

Explain tty-color-mode frame parameter more.

* doc/emacs/cmdargs.texi (Colors X): Explain that tty color
support is dynamic.
* doc/lispref/frames.texi (Font and Color Parameters): Explain
that 'tty-color-mode' can be changed on the fly.
* doc/misc/efaq.texi (Colors on a TTY): Explain how to disable
'tty-color-mode', either at startup or dynamically.

(cherry picked from commit 2c640e63a8a6ea9f2fbbb55ff44d7a8a0ec0f4b4)

Replace my recent change to vc-start-logentry

* lisp/vc/vc-dispatcher.el (vc-start-logentry): Restore previous
logic for determining the parent buffer from before my recent
change to this function.  If the attempt to determine the parent
buffer fails, signal an error immediately.
(vc-dispatcher-browsing): Consider derived modes of
log-view-mode, too, as indicating that we are in a directory
browser.

(cherry picked from commit 5c59ab56e67d1880bdec98a4319d6b4be45acf9b)

Make djvused emit UTF-8 encoded text

* lisp/doc-view.el (doc-view--djvu-outline): Pass -u to djvused
to make it emit UTF-8 encoded text rather than using octal
escapes for non-ASCII string.  (bug#73846)

(cherry picked from commit 5f22c090b1ae87b516b132b36a5908a5e18c2d11)

; Fix documentation of recent changes in mpc.el

* etc/NEWS: Fix entry for 'mpc-notifications'.

* lisp/mpc.el (mpc-status-callbacks, mpc-format)
(mpc-cover-image-find, mpc-cover-image-p, mpc-notifications)
(mpc-notifications-title, mpc-notifications-body): Doc fixes.

(cherry picked from commit 09e586b38352e1661ef96a47b89d835f0ff30bd2)

; Skip commit d6ea735af8ed5e74f1cbc6d3e8285c6c7700239e

; Mark interactive Eshell output as such after inserting into the buffer

This avoids adding the "output" text properties to strings that may live
past the call to 'eshell-interactive-filter'.

* lisp/eshell/esh-mode.el (eshell-interactive-output-filter): New
function...
(eshell-interactive-print): ... call it.
(eshell-interactive-filter): Update docstring.

* lisp/eshell/esh-proc.el (eshell-interactive-process-filter)
(eshell-sentinel): Call 'eshell-interactive-output-filter'.

(cherry picked from commit 83e3ed651dca46214855552aa062cfbde019b04a)

; * src/doc.c (Ftext_quoting_style): Make doc string agree with code.

(cherry picked from commit e5d600006e2b283923044d2c139b29dd69f5ac30)

(track-changes--after): Fix problem found in bug#73041

When calling `track-changes--before` (e.g. because of a missing
b-f-c or for some other reason), it sets `track-changes--before-end`
to the right value so we shouldn't increment it right after.
Also, we should update `track-changes--buffer-size` before
calling `track-changes--before` so it doesn't risk signaling
a spurious inconsistency.

* lisp/emacs-lisp/track-changes.el (track-changes--after):
Update `track-changes--buffer-size` earlier, and don't increment
`track-changes--before-end` when we call `track-changes--before`.

(cherry picked from commit 90c6880a922029ba6e57adb2afe00a6fa57ef7fe)

; Skip commit d3c94102266fa1fe167f699a92b9064c02b63d4f

; (select-safe-coding-system-interactively): Say "safely encode".

(cherry picked from commit 78e6328fafddd4f39ed06d6ac4cecfb2f88d2fa4)

; Skip commit c5eba443ae72b94024574d56a0dfdf11f339c1aa

; * doc/lispref/display.texi (Face Attributes): Fix typo (bug#73824).

(cherry picked from commit 569186c36e3bce06e69c8c037553789ee21d722b)

* lisp/progmodes/c-ts-mode.el (treesit-node-eq): Declare to silence warning.

(cherry picked from commit d5723fc4f03924cabc504ab6f0a537efc8cd9479)

* admin/notes/emba: Docker builds do not run in a worktree.

(cherry picked from commit 0085e48f917b4ddd0c698ecea1b30684b904b666)

* lisp/calc/calc-ext.el (math-approx-sqrt-e): Doc fix (bug#73817).

(cherry picked from commit 3d30905b0223f07cba74297ba032d71b8fe2632c)

: Revert a mistaken change

* lisp/net/dictionary.el (dictionary-word-definition-face): Revert
a mistakenly installed change.

(cherry picked from commit 94d0e9c4018cf948bd1ebabb118c02699c77c037)

; * doc/emacs/search.texi (Word Search): Spelling fixes.

(cherry picked from commit 4d90a1d820916985e5e135254926f5554ddd3e46)

Fix c-ts-mode--anchor-prev-sibling (bug#73661)

* lisp/progmodes/c-ts-mode.el:
(c-ts-mode--anchor-prev-sibling):  Fix parentheses and use a
slightly more efficient function.
* test/lisp/progmodes/c-ts-mode-resources/indent.erts: Replace
the tab in the test code with spaces.

(cherry picked from commit c154047c46ae833a114e84d72e62269d12c3249d)

Fix formatting of long keyboard macros by 'list-keyboard-macros'.

* lisp/kmacro.el (kmacro-menu--refresh): Include the second
argument of 'format-kbd-macro' so that the formatted keyboard
macro is on a single line.  (Bug#73797)

(cherry picked from commit b87fda63dd4a29c3c28e235904405f2d6709239e)

; * src/fileio.c (Ffile_newer_than_file_p): Fix wording (bug#73709).

(cherry picked from commit ae75ea62324598654b32ed28bf644ec2bc4c04b2)

; Skip commit de54d922b5c239a474adb41c84ea316b266f1838

; Update lisp/ldefs-boot.el

(dired-yank): New command

gud.el: Generate less unreachable code

Don't emit obsolete function warning for recursive calls

Fix a few more warnings

Sync java-ts-mode.el

Add ':group' to a couple of faces

Fix some unreachable code

Kill *Completions* buffer on M-: minibuffer exit

hl-line.el: Simplify

(define-minor-mode): Add keywords ':on' and ':off'

; Remove unused lexical variable

flymake.el: Cosmetics

(read-passwd): Simplify

* lisp/emacs-lisp/track-changes.el (track-changes--backtrace):  Fix prefix

(cherry picked from commit f994154d0895b3bbd4a763e379a90328b5e3d87d)

mpc.el: Misc tweaks.

* lisp/mpc.el: Require `cl-lib` at run-time.
Don't require `subr-x` any more.
(mpc-status-callbacks): Improve docstring.
(mpc-cover-image-find): Avoid `and-let*`.
(mpc-cover-image-p): Use `member-ignore-case` to recover the
behavior before last patch.
(mpc-cover-image-find, mpc-cover-image-p): Move to later in the
file to avoid compiler warning.
(mpc-format, mpc-notifications-title, mpc-notifications-body):
Tweak docstring.
(mpc--notifications-format): Create only one temp buffer and use
the faster `cl-some` since we know the arg is a list.
(mpc-notifications-notify): Prefer `when-let*` since all the other
`*-let` we use are also of the `let*`family.

(cherry picked from commit 4690f2f44d38d64d8ebfea98c085844a5723df0f)

Add notifications support to 'mpc' (Bug#73538)

* lisp/mpc.el (mpc-notifications, mpc-notifications-title)
(mpc-notifications-body): New option.
(mpc--notifications-id): New variable.
(mpc-notifications-notify, mpc-cover-image-find)
(mpc-cover-image-p, mpc--notifications-format): New function.
(mpc-format): Use 'mpc-cover-find' and expand docstring to
include details about the FORMAT-SPEC.
(mpc-status-callbacks): Add file callback for
notifications.

(cherry picked from commit 49084bad7990a614bdd3ea7a24ebab0fc89627e3)

; * lisp/vc/vc.el: Drop some old notes

Firstly, we are unlikely to do any unifying, because both amend
capabilities have been around for a long time now and we don't
want to break people's usage.  Secondly, there is now a plan for
dealing with dangerous git operations described in bug#64055.

(cherry picked from commit 38071e39892fe0270f91746bd5f55c056cb00921)

log-view-modify-change-comment: Prepend Summary header

* lisp/vc/log-view.el (log-edit): Require.
(log-view-modify-change-comment): When log-edit-hook would
insert an empty Summary header, prepend one to the old comment.

(cherry picked from commit 8d7d9dd42a6c2bf1f941108148d9df91bce857fa)

New get-change-comment VC backend action

This gets us closer to using log-view-modify-change-comment with modern
VCS.  What remains is implementing the modify-change-comment backend
action for those VCS.

* lisp/vc/vc.el: New get-change-comment backend action.
(vc-modify-change-comment): Pass the backend to vc-start-logentry.
* lisp/vc/log-view.el (log-view-extract-comment): Use new
get-change-comment action.
* lisp/vc/vc-git.el (vc-git-get-change-comment): Factor out of
vc-git-log-edit-toggle-amend.

(cherry picked from commit 01c8f31a54df511913ad88cb6138a01390faafbe)

vc-start-logentry: Use current buffer as parent buffer more often

* lisp/vc/vc-dispatcher.el (vc-start-logentry): When determining
the parent buffer, if get-file-buffer returns nil, use the
current buffer.  Also, if the first file is a directory, don't
try to call get-file-buffer, just use the current buffer.

(cherry picked from commit 475a33adb9134990fa05be8a6308216f12ed4ef7)

Improve coverage of scripts by the default fontset

* lisp/international/fontset.el (setup-default-fontset): Add
missing "simple" scripts.

(cherry picked from commit 4c0d69cbff14e25fa7489804102ac416cb3590b0)

More consistently propertize Log Edit headers as fields

* lisp/vc/log-edit.el (log-edit--make-header-line): Factor out
of log-edit-insert-message-template.
(log-edit-set-header): Call log-edit--make-header-line so that
the Log Edit header is propertized as a field.

(cherry picked from commit ee265922a0df68893f4d2b23a9190f524b745b6a)

Add support for chaining conditionals in Eshell

* lisp/eshell/esh-cmd.el (eshell-structure-basic-command): Check for the
presence of the conditional.  Allow any number of BODY forms.
(eshell-rewrite-if-command): Add support for 'else' keyword and chained
conditionals.

* test/lisp/eshell/esh-cmd-tests.el (esh-cmd-test/if-else-statement):
Test 'else' keyword.
(esh-cmd-test/if-else-statement-chain): New test.

* doc/misc/eshell.texi (Control Flow): Document this change.

* etc/NEWS: Announce this change.

(cherry picked from commit fada04cfc788a486265c9da6636611986b48ae49)

Improve correctness of Eshell sub-forms

This makes sure that we treat Eshell sub-forms (whether Lisp or command
forms) as values when appropriate, or as regular invocations.  This
requires a bit more explicit work, but helps to resolve some of the
surprising differences between Lisp and command forms in complex Eshell
statements.

* lisp/eshell/esh-cmd.el (eshell-subcommand-arg-values): Make obsolete.
(eshell-parse-lisp-argument): Don't add 'eshell-command-to-value' here.
(eshell-rewrite-sexp-command): Don't check for 'eshell-command-to-value
here'; instead check for 'eshell-lisp-command'.
(eshell-structure-basic-command): Check for 'eshell-lisp-command'.
(eshell-term-as-value): New function...
(eshell-rewrite-named-command, eshell-rewrite-for-command): ... call it.

* lisp/eshell/esh-arg.el (eshell-parse-special-reference):
* lisp/eshell/esh-io.el (eshell-strip-redirections):
* lisp/eshell/esh-var.el (eshell-prepare-indices): Call
'eshell-term-as-value'.

* test/lisp/eshell/esh-arg-tests.el
(esh-arg-test/special-reference/command-form):
* test/lisp/eshell/esh-cmd-tests.el (esh-cmd-test/for-loop-lisp-body)
(esh-cmd-test/while-loop-lisp-body)
(esh-cmd-test/if-else-statement-lisp-body): New tests.

* test/lisp/eshell/esh-var-tests.el
(esh-var-test/interp-var-indices-subcommand): Add another command to
test.

* doc/misc/eshell.texi (Control Flow): Update documentation.

(cherry picked from commit 40ffacb34b194aa82273539ab7a5be2f485a706f)

Simplify creation of Eshell command forms

Previously, Eshell over-aggressively converted subcommands, which forced
control flow commands to undo that change.

* lisp/eshell/esh-cmd.el (eshell-pre-rewrite-command-hook): Remove
'eshell-subcommand-arg-values' call from here...
(eshell-rewrite-named-command): ... and put it here.
(eshell-invokify-arg): Make obsolete.
(eshell-structure-basic-command): Handle subcommand test forms.
(eshell-rewrite-for-command, eshell-rewrite-while-command)
(eshell-rewrite-if-command): Don't call 'eshell-invokify-arg'; it's not
necessary.

(cherry picked from commit af029cdb3a69ba67ae88c9e93b7564778c61a3c6)

New helper function project-read-project

* lisp/progmodes/project.el (project-read-project): New helper.

(cherry picked from commit 561ab9829dd000a8078c6c66f7e8c29056adf31c)

Add suffixes individually and use minor mode directly

  * lisp/jka-cmpr-hook.el (jka-compr-install): Add jka-compr
  suffixes individually with add-to-list rather than append.
  * (with-auto-compression-mode): Use auto-compression-mode minor mode.

(cherry picked from commit aaa734ac6e80e3375bcf32cad9c2b484c1217b57)

Use debian:bookworm for tests on emba

* test/infra/Dockerfile.emba (emacs-base): Derive from debian:bookworm.
(emacs-eglot, emacs-tree-sitter): Derive from emacs-base.
(emacs-native-comp): Install libgccjit-12-dev.

(cherry picked from commit 6213ca44d43688e14641034ebdd8fab4b360d224)

CC Mode: Fix dodgy lisp `let' form.

* lisp/progmodes/cc-engine.el (c-forward-sws): Move a `setq'
form from out of a let binding.  This form could have been
affected by the byte compiler bug bug#67116 before this was
fixed.

(cherry picked from commit 5340fdaade1f8fe7af08293619cca89ae0796fcf)

CC Mode: Rationalize and optimize cache invalidation (2).

Replace separate syntax-table text property changes and cache
invalidation with macros which do both together.  Correct a bug
in the invocation of XEmacs's map-extents.

* lisp/progmodes/cc-defs.el (c-put-syntax-table-trim-caches)
(c-clear-syntax-table-trim-caches)
(c-clear-syntax-table-properties-trim-caches)
(c-clear-syntax-table-with-value-trim-caches)
(c-clear-syntax-table-with-value-on-char-trim-caches)
(c-put-syntax-table-properties-on-char-trim-caches): New
macros.
(c-clear-char-properties, c-clear-char-property-with-value)
(c-clear-char-property-with-value-on-char): Correct the
invocation of XEmacs's map-extents by returning nil from the
mapping function to prevent premature exit from map-extents.
(c-clear-char-property-with-value-function)
(c-clear-char-property-with-value)
(c-clear-char-property-with-value-on-char-function)
(c-clear-char-property-with-value-on-char)
(c-put-char-properties-on-char): Enhance to return the position
of the first changed char property (or nil).

* lisp/progmodes/cc-awk.el
(c-awk-set-string-regexp-syntax-table-properties)
(c-awk-set-syntax-table-properties)
* lisp/progmodes/cc-engine.el
(c-depropertize-ml-string-delims)
(c-after-change-unmark-ml-strings, c-propertize-ml-string-id)
(c-propertize-ml-string-opener, c-depropertize-ml-string)
(c-depropertize-ml-strings-in-region)
* lisp/progmodes/cc-mode.el (c-depropertize-CPP)
(c-neutralize-CPP-line, c-put-syn-tab, c-clear-syn-tab)
(c-parse-quotes-before-change, c-parse-quotes-after-change)
(c-before-change-fix-comment-escapes)
(c-after-change-fix-comment-escapes): Use the new macros from
cc-defs.el.

* lisp/progmodes/cc-mode.el
(c-trim-cache-first-punctuation-prop): Remove.
(c-depropertize-CPP): Remove calls to the above function.

(cherry picked from commit fdac10b216f7b47e2eea129d2a96807a0c2055f3)

* lisp/emacs-lisp/comp-cstr.el (comp-cstr-type-p): Add assertion.

(cherry picked from commit 1686d48417315f809403aeb29559788ef4b755a6)

Fix comp branch-optim pass (bug#73270)

* test/src/comp-tests.el (comp-test-73270-1): Define new test.
* test/src/comp-resources/comp-test-funcs.el (comp-test-73270-base)
(comp-test-73270-child1, comp-test-73270-child2)
(comp-test-73270-child3, comp-test-73270-child4)
(comp-test-73270-1-f): Define.
* lisp/emacs-lisp/comp-cstr.el (comp-cstr-type-p): Fix it for nil cstrs.

(cherry picked from commit cd739d3644be618008e5c369b4e96201a05a3d1b)

* lisp/emacs-lisp/comp.el (comp--type-check-optim-block): Improve log msg.

(cherry picked from commit 358b38bc17875c462c2131b9eeb85d3456c0be2b)

; Update lisp/ldefs-boot.el

Drop IDLWAVE

Simplify in-buffer completion

Enable 'partial-completion' by default for 'symbol-help'

Add ':group' to some 'defface's

Fix extraneous parenthesis in java-ts-mode.el

Drop 'icomplete-in-buffer'

Report correct unread count for nnimap groups

* lisp/gnus/nnimap.el (nnimap-request-group): Use '(1 . 0) range
as default, and calculate the actual range the same way as other
backends.  (Bug@72949)

Copyright-paperwork-exempt: Yes
(cherry picked from commit 5c129791c5b1639481c109cc44974c7d9b7f3dcf)

Set treesit-primary-parser for tree-sitter modes

I debated whether to do this, since technically speaking it's
not needed for single-language modes.  But ultimately it's
better to be explicit and set a good example with builtin modes.

* lisp/progmodes/cmake-ts-mode.el (cmake-ts-mode):
* lisp/progmodes/csharp-mode.el (csharp-ts-mode):
* lisp/progmodes/dockerfile-ts-mode.el (dockerfile-ts-mode):
* lisp/progmodes/go-ts-mode.el (go-ts-mode):
(go-mod-ts-mode):
* lisp/progmodes/heex-ts-mode.el (heex-ts-mode):
* lisp/progmodes/json-ts-mode.el (json-ts-mode):
* lisp/progmodes/lua-ts-mode.el (lua-ts-mode):
* lisp/progmodes/python.el (python-ts-mode):
* lisp/progmodes/ruby-ts-mode.el (ruby-ts-mode):
* lisp/progmodes/rust-ts-mode.el (rust-ts-mode):
* lisp/progmodes/sh-script.el:
* lisp/progmodes/typescript-ts-mode.el (typescript-ts-mode):
(tsx-ts-mode):
* lisp/textmodes/css-mode.el (css-ts-mode):
* lisp/textmodes/html-ts-mode.el (html-ts-mode):
* lisp/textmodes/toml-ts-mode.el (toml-ts-mode):
* lisp/textmodes/yaml-ts-mode.el (yaml-ts-mode): Set
treesit-primary-parser.

(cherry picked from commit c436d4eff97b3919c9f8cdec504272d6f7ed393f)

CC Mode: Correct and simplify quoted number regexps

C++ Mode now gives correct fontification when \' is inserted
between the adjacent apostrophes in the number 0xde'adb''eef.

* lisp/progmodes/cc-mode.el (c-maybe-quoted-number-head):
Simplify and correct.
(c-maybe-quoted-number-tail, c-maybe-quoted-number): Simplify.

(cherry picked from commit 2a6f1527f6b3080c3879e6159424b824c86801a7)

Describe how to add an ELPA package to Tramp

* doc/misc/tramp.texi: Use @dots{} where appropriate.
(External packages): Rename subsection "Timers, process filters,
process sentinels, redisplay".
(Extension packages): New node.
(Top, Files directories and localnames): Add it to @menu.

(cherry picked from commit 6864ac2bc3bee1add508872b756693a6fbe0c2e7)

Adapt gitlab-ci.yml

* test/infra/gitlab-ci.yml (variables): Set GIT_DEPTH: 0.
(.job-template): Remove cache:policy.
(.build-template): Add needs and cache:policy.
(.test-template): Add cache:policy.
(.tree-sitter-template): Add files in changes.

(cherry picked from commit 19f929aaa33a3bd8cc02a7fdfa0d8dc4c2fa8fc3)

; Skip commit 29bf0a8b31baf4ece85fb8f0698525547b2fe70e

; Skip commit 9a110c390dce9600ce8323ce8e87b14d379736e4

; Skip commit da048c6927020e71b7c3d0f39e0d37cdb3ae76ab

vc-src-working-revision: Call string-trim-right on command output

* lisp/vc/vc-src.el (vc-src-working-revision): Call string-trim-right on
command output (bug#73763).

(cherry picked from commit f36d059cded88b0b6dafcc4a21a478ef0aaacf81)

Fix bug when splitting a frame's root window (Bug#73627)

* lisp/window.el (split-window): Split main window of WINDOW's
frame when that frame has side windows (Bug#73627).

(cherry picked from commit a58dc58fec8dc146cf10454c6a2b3174d1b4c2f8)

Improve face font selection on MS-Windows

* lisp/net/dictionary.el (dictionary-word-definition-face):
Special-case w32.
* lisp/faces.el (face-font-family-alternatives): Add a few modern
font families.

(cherry picked from commit 7d9513f9c48ba4d197502ad8196d51f18894145e)

Improve tests for flow-fill

* test/lisp/mail/flow-fill-tests.el
(fill-flow-tests-fill-flowed-decode): Remove debug message.
(fill-flow-tests-fill-flowed-encode): Actually test function
`fill-flowed-encode', which requires `use-hard-newline' to be
non-nil.  Also adjust test input to check behavior of the
function under different cases.  (Bug#72870)

(cherry picked from commit c3600916b6942b2a9797ec2248d29cb337c7c6fa)

Flow fill texts after the last hard newline

* lisp/mail/flow-fill.el (fill-flowed-encode): Use `(point-max)'
as `end' if there are no remaining hard newlines in buffer.
This ensures that the last paragraph will always be encoded,
even without a trailing hard newline.  (Bug#72870)

(cherry picked from commit fc214b668391abed313920cd44f3d913c8207e0e)

* lisp/progmodes/compile.el (recompile): Autoload (bug#73697).

(cherry picked from commit a724a497084dceb895f17eaea5b90bd13c05a769)

Stop highlighting current line when debuggee is running

* lisp/progmodes/gud.el (gud-hide-current-line-indicator): New
function.
(gud-sentinel):
* lisp/progmodes/gdb-mi.el (gdb-starting): Use it.  (Bug#73687)

(cherry picked from commit bd5d84e5d3311e7ab4a7d0091d6c98365927d17a)

Add foldout command for widening to current fold

* lisp/foldout.el (foldout-widen-to-current-fold): New command.
* doc/emacs/text.texi (Foldout): Document it.
* etc/NEWS: Announce it.  (Bug#73286)

(cherry picked from commit ebfd5874f0b74cec06572ffc3e9bf7288bd5e77b)

Correctly update image properties

* lisp/image-mode.el (image--update-properties): New function to
update image properties.
(image-toggle-display-image): Use it.  (Bug#73617)

(cherry picked from commit 0e9502b10e08d1c93fe9b134b8cf74eae42c1eae)

; Revise docstring from last change

(cherry picked from commit 16e835171a8ce388e581174925e47263e864727d)

Properly operate on current fileset revision in vc-hg-print-log

* lisp/vc/vc-hg.el (vc-hg-print-log): If start-revision is nil,
reliably log the working revision. (bug#73604)

(cherry picked from commit fbeb3d22b7fabf13cd788772ade2ed594ee60872)

; * doc/emacs/search.texi (Word Search): Document 'dictionary-search'.

(cherry picked from commit 0f8f0773183a07a229b23d3f970723ceb9585aef)

; * lisp/emacs-lisp/chart.el (chart-bar-quickie): Doc fix.

(cherry picked from commit fb155bcfb6f7dfdec3aaf9f535428d46419a6b4e)

Use erc-compat analog for window-no-other-p

* lisp/erc/erc-compat.el (erc-compat--window-no-other-p): New function.
* lisp/erc/erc-speedbar.el (erc-speedbar-toggle-nicknames-window-lock):
Use compat adapter for `window-no-other-p'.

(cherry picked from commit 6e80509099e27e237787186f4e8731bfdfb9b00d)

Add baseline test coverage for erc-match

* lisp/erc/erc-match.el (erc-pal-highlight-type)
(erc-fool-highlight-type, erc-dangerous-host-highlight-type): Clarify
some areas in doc strings.
* test/lisp/erc/erc-match-tests.el: Require `erc-test-common' library.
(erc-match-tests--assert-face-absent)
(erc-match-tests--assert-face-present)
(erc-match-tests--assert-speaker-highlighted)
(erc-match-tests--assert-speaker-only-highlighted)
(erc-match-tests--perform)
(erc-match-tests--hl-type-nick): New functions.
(erc-match-message/pal/nick, erc-match-message/fool/nick)
(erc-match-message/dangerous-host/nick): New tests.
(erc-match-tests--hl-type-message): New function.
(erc-match-message/pal/message)
(erc-match-message/fool/message)
(erc-match-message/dangerous-host/message): New tests.
(erc-match-tests--hl-type-all): New function.
(erc-match-message/pal/all, erc-match-message/fool/all)
(erc-match-message/dangerous-host/all): New tests.
(erc-match-tests--hl-type-nick-or-keyword): New function.
(erc-match-message/current-nick/nick-or-keyword): New test.
(erc-match-tests--hl-type-keyword): New function.
(erc-match-message/keyword/keyword): New test.
(erc-match-tests--log-matches): New function.
(erc-log-matches): New test.
* test/lisp/erc/resources/erc-tests-common.el: Require `erc-d-i'.
(erc-tests-common-add-cmem, erc-tests-common-parse-line)
(erc-tests-common-simulate-line)
(erc-tests-common-simulate-privmsg): New functions.

(cherry picked from commit 9bddb264ba851f39068773b9538de4170928e159)

Crystallize erc-nicks-track-faces behavior

* etc/ERC-NEWS: Mention changes to `erc-track-faces-normal-list' and
`erc-track-faces-priority-list'.  Also mention new choice variant for
option `erc-nicks-track-faces', although that's arguably just a bug fix
because it makes good on previously unrealized behavior implied by the
doc strings.
* lisp/erc/erc-nicks.el (erc-nicks-skip-faces): Remove faces applied by
the `match' module, namely, `erc-current-nick-face', `erc-pal-face', and
`erc-fool-face'.  That module runs its hooks after `button' on
`erc-insert-modify-hook', and because `nicks' piggybacks on `button', it
can never encounter those faces while assaying.
(erc-nicks-track-faces): Update doc, and introduce new `t' value choice.
(erc-nicks-mode, erc-nicks-disable): Update removals from
`erc-track--alt-normals-function' to reflect recent renamings.
(erc-nicks--reject-uninterned-faces): Use helper.
(erc-nicks--oursp, erc-nicks--ours-p): Rename former to latter to
respect project style guidelines regarding predicates.
(erc-nicks-track-normal-max-rank): New variable.
(erc-nicks--check-normals, erc-nicks--assess-track-faces): Rename former
to latter, and change purpose to checking for "normals" membership,
ranks position, and incumbent face ownership.  Remove unused CONTENDERS
parameter.  Additionally, change behavior to consider replacing the
current mode-line face when it's not `nicks' owned if it's explicitly
ranked lower than `erc-default-face'.
(erc-nicks--track-prioritize, erc-nicks--track-always): New
complementary functions implementing the t and `prioritize' variants of
`erc-nicks-track-faces'.  Both make use of the factored-out
`erc-nicks--check-normals' logic.
(erc-nicks--setup-track-integration): Add `erc-nicks--track-always' to
`erc-track--alt-normals-function' when `erc-track-normal-faces' is t.
* lisp/erc/erc-track.el (erc-track--massage-nick-button-faces): Change
type of symbol property `erc-track--obsolete-faces' for options
`erc-track-faces-priority-list' and friends from a boolean to an alist.
(erc-track-faces-priority-list): Add new face for buttonized speakers.
(erc-track-faces-normal-list): Add new face for buttonized speakers.
Also add `erc-notice-face'.
(erc-track--priority-faces): New local variable to cache ranked faces
and complement `erc-track--normal-faces'.
(erc-track--setup): Initialize new `erc-track--priority-faces' variable,
and refactor.
(erc-track--alt-normals-function): Doc.
(erc-track--select-mode-line-face): Update expected type of `ranks'
parameter.
(erc-track-modified-channels): Fix wrong-type bug occurring when
`erc-track-ignore-normal-contenders-p' and
`erc-track-priority-faces-only' are both non-nil.  Also fix subtle
compatibility oversight regarding an empty face list returned by
`erc-track--collect-faces-in'.
* test/lisp/erc/erc-nicks-tests.el: Load helpers and fixtures library.
(erc-nicks-tests--track-faces): New function.
(erc-nicks-track-faces/prioritize, erc-nicks-track-faces/defer)
(erc-nicks-track-faces/nil, erc-nicks-track-faces/t): New tests.
* test/lisp/erc/erc-track-tests.el
(erc-track-tests--select-mode-line-face): Update expected type of mocked
parameter.
(erc-track-tests--modified-channels/baseline): New function.
(erc-track-modified-channels/baseline)
(erc-track-modified-channels/baseline/mention)
(erc-track-modified-channels/baseline/ignore)
(erc-track-modified-channels/baseline/mention/ignore)
(erc-track-modified-channels/priority-only-all/baseline)
(erc-track-modified-channels/priority-only-all/sans-notice): New tests.
* test/lisp/erc/resources/erc-tests-common.el
(erc-tests-common-track-modified-channels)
(erc-tests-common-track-modified-channels-sans-setup): New functions.
(Bug67767)

(cherry picked from commit 9906e34f973f15c0f96ebcfcc6ea4d1144bc6e8f)

Don't create directory in erc-truncate compat check

* lisp/erc/erc-log.el (erc-log--check-writable-nocreate-p): New variable.
(erc-logging-enabled): Use `erc-log--save-in-progress-p' flag to
conditionally avoid creating a directory when checking if the location
is writable.
(erc-log--call-when-logging-enabled-sans-module)
(erc-log--check-legacy-implicit-enabling-by-truncate): Rename former to
latter, and guard against creating a ~/log directory just to see if it's
writable when calling `erc-logging-enabled'.
(erc-truncate-mode): Explain legacy "implicit logging" behavior in doc
string.
* lisp/erc/erc-truncate.el (erc-truncate--warn-about-logging): Make more
concise, and defer to `erc-truncate-mode' doc string for particulars.
* lisp/erc/erc.el (erc-directory-writable-p): Add comment to rename on
next non-patch release.

(cherry picked from commit 1de2c86317356dbbf5e7f935d3889b2698bc30f6)

; Add face customization to ERC's sample config

* doc/misc/erc.texi (Sample Configuration): Move `erc-modules' twiddling
from a `use-package' :config section to a :custom section.  In the past,
this would sometimes provoke module-loading issues, but it seems to work
fine on Emacs 30, even with repeated eval'ing of the `use-package' form.
This sample config is meant for users running the latest release anyhow.
Also add a new `use-package' block for `erc-match' showing how to
customize a face using inheritance.  Add a corresponding section further
down showing the same via Customize.

(cherry picked from commit 3f1ce47fe7eb4809bfa9ef035caae748c3c5d729)

; Skip commit a30f115daada7633ac3f6d1b93e564c8b15612a3

; * lisp/emacs-lisp/chart.el (chart-bar-quickie): Improve documentation.

(cherry picked from commit 6dbe4e99ac41bc1f5bcbdbda3c215941170bc9c5)

gnus-sum: fix missing space after prompt

* lisp/gnus/gnus-sum.el (gnus-summary-limit-exclude-marks)
(gnus-summary-limit-to-marks): Add space after prompt.

(cherry picked from commit e0b9eba35c72d67d2223f4b59c39a6e2beb9af31)

Remove buttons when disabling 'button-mode'

* lisp/button.el (button-mode): Remove all buttons when disabling.
* doc/lispref/display.texi (Button Buffer Commands): Document
the change.  (Bug#73175)

(cherry picked from commit e631a3f30679d3c4e465a5765e261b068e9357dc)

Add unbuttonize-region

* doc/lispref/display.texi (Making Buttons): Document it.
* lisp/button.el (unbuttonize-region): New function, removes all
buttons in the specified region.

(cherry picked from commit 08ee074a6f140a82e327fba446c05c96fe64932c)