; Document recent change to diff-apply-buffer

* doc/emacs/files.texi (Diff Mode):
* etc/NEWS: Document diff-apply-buffer considering an active
region and its new prefix argument.

(cherry picked from commit 9838b88c2e154fd4a319e06612b385f20c286177)

; Skip commit 2aef2951c06c04c23455419283a232f8d55d5ecd

; Touch up docs for exchange-point-and-mark-highlight-region

(cherry picked from commit d01a391195e4f6282a587fcc581bb6cd8b2204e1)

Correct some outdated docs for hack-local-variables

* doc/lispref/variables.texi (File Local Variables):
<hack-local-variables>: Say that it applies directory-local
variables too.  Add a cross-reference.
(Directory Local Variables): Document dir-local-variables-alist.
* lisp/files.el (hack-local-variables): Say that it always puts
into effect directory-local variables.

(cherry picked from commit 202910460538401ec585e9be80c05adb55279573)

; Skip commit c877acc261b6b7aa631e2e175d53920ef3f2104b

; Fix :version tag

Reported by Campbell Barton <ideasman42@gmail.com>.

(cherry picked from commit 85b147d32100d8da89366a19ab77f996fe011043)

; Skip commit 60c0524ad28eaeae968603010831bcacca2a5180

Add erc-compat adapter for xml-escape-string

* lisp/erc/erc-compat.el (erc-compat--xml-escape-string): New macro to
call `xml-escape-string' sans the NO-ERROR argument on Emacs 27.
* lisp/erc/erc-desktop-notifications.el (erc-notifications-notify): Use
compat macro.

(cherry picked from commit dd1b11d34cd1389fe5ee0dd80784f9cd0d66026d)

Suppress log module when inserting date stamps in ERC

* lisp/erc/erc-log.el (erc-truncate-buffer-on-save): Use
`make-obsolete-variable' because `erc-truncate-buffer-on-save' is an
option, not a function.  Already mentioned in etc/ERC-NEWS.
(erc-logging-enabled): Return nil if `log' appears in the `erc--skip'
msg prop.
* lisp/erc/erc-stamp.el (erc-stamp--defer-date-insertion-on-post-modify):
Add `log' to `erc--skip' msg prop.  This tells the log module to defer
advancing the `erc-last-saved-position' marker until after stamps have
been inserted, thus ensuring they're included in logs when
`erc-log-write-after-insert' is non-nil.
* test/lisp/erc/erc-scenarios-log.el
(erc-scenarios-log--save-buffer-in-logs/truncate-on-save): Suppress
warning for `erc-truncate-buffer-on-save'.
(erc-scenarios-log--write-after-insert): New test.  (Bug#76875)

(cherry picked from commit 3db65ff5cb3d6f58b83052760b4ce04eb77db1bc)

; Replace non-standard "CLisp" abbreviation for "Common Lisp"

(cherry picked from commit 261205dbb57f77e3426df9f27fcc5429aae48c05)

lisp/emacs-lisp/track-changes.el: Make GNU ELPA release

(cherry picked from commit ffb7d656a2c89f86ccd2de51379de9612c7a4aa3)

Unbreak track-changes in Emacs 24

* lisp/emacs-lisp/track-changes.el (track-changes--after): Don't use
'incf', added in Emacs 31; this :core package supports Emacs 24.

(cherry picked from commit 523f7924570ae339a9661c910cc99c41676d7349)

Automatically document when setopt is needed

* lisp/help-fns.el (help--recommend-setopt): New function to
automatically document the need to use `setopt` to set the values of
any defcustoms with a `:set` property.
(help-fns-describe-variable-functions): Add above new function to
hook.

* lisp/follow.el (follow-mode-prefix-key):
* lisp/minibuffer.el (minibuffer-regexp-prompts):
* lisp/register.el (register-use-preview):
* lisp/savehist.el (savehist-autosave-interval):
* lisp/saveplace.el (save-place-autosave-interval):
* lisp/tab-bar.el (tab-bar-define-keys):
* lisp/textmodes/text-mode.el (text-mode-ispell-word-completion):
Delete now redundant text from docstrings.

(cherry picked from commit 77b7e2d37b2c68b73ad770ec680281c1f82d26f1)

; Delete commented out code in help-fns.el

(cherry picked from commit f4b20c3f768c4d833c304ace2a9cf0a028346fdb)

Delete XEmacs compatibility kludge from follow.el

* lisp/follow.el (follow-select-if-end-visible): Remove XEmacs
compatibility kludge.

(cherry picked from commit 57f7d5f44a136c95958030b7920e5eca4b285309)

New user option follow-mode-prefix-key

* lisp/follow.el (Commentary): Document modern keymap functions.
(follow-mode-prefix): Make obsolete in favor of...
(follow-mode-prefix-key): ...this new user option.  Allow changing the
prefix using `setopt`.
(follow-mode-submap): New variable.
(follow-mode-map): Define using defvar-keymap.

(cherry picked from commit 27b31ebeaf32de6aec2fefe2d6824e22a102de30)

(Freplace_buffer_contents): Preserve markers more carefully

Use `replace_range` rather than `delete+insert`.

* src/insdel.c (replace_range): Allow NEW to specify a chunk
of buffer text.
* src/editfns.c (Freplace_buffer_contents): Use it.
* test/src/editfns-tests.el (replace-buffer-contents-1): Remove
incorrect check which happened to succeed because point was not
preserved carefully enough.  Make the replacement text share a bit
more content to make the test a bit more strict.
(editfns-tests--replace-region): Doesn't fail any more.

(cherry picked from commit 40d8650d5177bd291747d225c7d2cf2b4ba55856)

; Skip commit e1ceee716d7b0bb611317c455a2a49d4b0485469

; Fix project-list-file on Emacs 26.1

* lisp/progmodes/project.el (project-list-file): Unbreak use of
'locate-user-emacs-file' on Emacs 26.1.
Problem reported by Dmitry Gutov <dmitry@gutov.dev>.

(cherry picked from commit ceee1a0ae7a804fbd5307f99db4f81f3d427e40e)

Use defvar-keymap for outline-mode-prefix-map

* lisp/outline.el (outline-mode-prefix-map): Use defvar-keymap.

(cherry picked from commit b3d8e7ebb5dfb1eb9918d73571c996950026ead0)

Remove variable aliases obsolete since Emacs 23.2

* lisp/dired.el (dired-advertised-find-file):
* lisp/simple.el (advertised-undo):
* lisp/wid-edit.el (advertised-widget-backward): Remove variable
aliases obsolete since Emacs 23.2.  They are replaced by
':advertised-binding' properties.
* lisp/arc-mode.el (archive-mode-map):
* lisp/dired.el (dired-mode-map):
* lisp/obsolete/landmark.el (landmark-mode-map):
* lisp/play/decipher.el (decipher-mode-map):
* lisp/play/gomoku.el (gomoku-mode-map):
* lisp/proced.el (proced-mode-map): Don't bind above removed commands.

(cherry picked from commit af851dd82e465a3e5e28065b35332ad35162beab)

Don't recommend legacy keymap functions in documentation

* doc/emacs/mule.texi (Input Methods):
* doc/lispintro/emacs-lisp-intro.texi (Miscellaneous):
* doc/lispref/text.texi (Clickable Text):
* doc/misc/calc.texi (Defining Functions, Defining Simple Commands)
(Customizing Calc):
* doc/misc/efaq.texi (Matching parentheses, Modifying pull-down menus)
(Deleting menus and menu options, Binding keys to commands)
(Invalid prefix characters)
(Terminal setup code works after Emacs has begun)
(Backspace invokes help, Swapping keys, No Escape key)
(Binding combinations of modifiers and function keys)
(Replying to the sender of a message):
* doc/misc/eudc.texi (Installation, Emacs-only Configuration)
(External Configuration):
* doc/misc/gnus.texi (Group Parameters, Misc Group Stuff)
(Summary Buffer, Generic Marking Commands, RSS)
(nnmairix tips and tricks, Oort Gnus):
* doc/misc/ido.texi (Customization):
* doc/misc/mairix-el.texi (Using):
* doc/misc/mh-e.texi (HTML, Miscellaneous Commands and Options)
(Folders, Composing):
* doc/misc/octave-mode.texi (Running Octave from Within Emacs):
* doc/misc/reftex.texi (Citations Outside LaTeX):
* doc/misc/remember.texi (Quick Start):
* doc/misc/sem-user.texi (Smart Jump):
* doc/misc/viper.texi (Key Bindings, Vi Macros):
* doc/misc/widget.texi (Defining New Widgets):
* doc/misc/woman.texi (Word at point): Recommend 'keymap-set',
'keymap-global-set', 'keymap-global-unset', 'keymap-local-set', and
'key-translate', instead of their legacy equivalents.  (Bug#55647)

(cherry picked from commit 96a704346a282fc2783e54de3d9c30cd8f9ce955)

Fix overlay-start and overlay-end gv setters

This fixes Bug#76730.

* lisp/emacs-lisp/gv.el (overlay-start, overlay-end):
Avoid computing the set value twice.

(cherry picked from commit 0c8d30045bd92a908c0cf2067615fc1b2fbcc33d)

Adapt treesit-outline-search to the recent improvements (bug#76398)

* lisp/treesit.el (treesit-closest-parser-boundary):
Remove temporary function.
(treesit-outline-search): Use 'previous/next-single-char-property-change'
with 'treesit-parser' property to find the closest parser boundary.
(treesit-outline-level): Get the 'treesit-host-parser' overlay
and find the parent parser node with 'treesit-node-at'.

(cherry picked from commit b741023070e6cfb03a178cab0f6818244af1b0e2)

New user variable `exchange-point-and-mark-highlight-region`

When set to nil, this modifies `exchange-point-and-mark' so that it doesn't
activate mark when it is not already active.

* etc/NEWS: Introduce new variable
exchange-point-and-mark-highlight-region.

* lisp/simple.el
(exchange-point-and-mark-highlight-region): New.
(exchange-point-and-mark): Use it.

(cherry picked from commit ef79c8cf3d63f510107536901925c05e37740275)

; * lisp/treesit.el (local-parser-overlay): Fix wording of commentary.

(cherry picked from commit 5e9675367ad0697f615b5168441bf6490977168c)

; * lisp/treesit.el (treesit-local-parsers-on): Doc fix.

(cherry picked from commit 982aeaf8a104fe4314a37237f70cad41ef6a7348)

diff-apply-buffer: Operate on region, add prefix argument

* lisp/vc/diff-mode.el (diff-apply-buffer): Interactively,
operate on an active region.  Reverse-apply hunks with a prefix
argument, like C-u C-c C-a already does.

(cherry picked from commit 942bb22c9f936a5f2f55dcf12748601ec4046deb)

Fix c-ts-common-baseline-indent-rule for lists (bug#76908)

* lisp/progmodes/c-ts-common.el:
(c-ts-common-baseline-indent-rule): Use the first non-comment
sibling rather than first sibling.

(cherry picked from commit 3b3170244da44d3d0d76139b138df65ea6adc064)

Make sure treesit-local-parsers-on works when BEG = END (bug#76398)

(Unrelated to the topic of the bug, but mentioned in the thread.)

* lisp/treesit.el (treesit-local-parsers-on): Use overlays-at
when BEG = END.

(cherry picked from commit abaff36c3c26850fe883d44fa8a3359a90322d06)

Handle deleted parser in treesit-explore-mode (bug#76398)

(Unrelated to the topic of the bug, but mentioned in the
thread.)

* lisp/treesit.el (treesit--explorer-refresh-1): New function.
(treesit--explorer-refresh): Handle 'treesit-parser-deleted'
error.

(cherry picked from commit 0bcc67c8305aa649be54e036fbe475bb82ca3a8b)

; Adapt comment in tramp.el

(cherry picked from commit 894b0e3a2fe064690eecda546f3b577886638140)

Add overlays for non-local tree-sitter parsers too

* lisp/treesit.el (treesit-local-parsers-at):
(treesit-local-parsers-on): Exclude non-local parsers.
(treesit--cleanup-local-range-overlays): Don't delete non-local
parsers (because those are managed by the major mode).
(treesit--update-ranges-non-local): Apply overlay for each ranges.
(treesit--update-ranges-local): Ignore
overlays with non-local parsers, and set
'treesit-parser-local-p' property to t.
(treesit--update-range-1): Additionally pass modified-tick to
treesit--update-ranges-non-local.
(treesit-major-mode-setup): Don't delete non-local parsers.

(cherry picked from commit 57a213c91cdf4b1739b1068c5dc8ae85f1d5302c)

Remove parent-node field from tree-sitter parsers

* src/treesit.c (make_treesit_parser): Remove field.
(Ftreesit_parser_parent_node):
(Ftreesit_parser_set_parent_node): Remove
* src/treesit.h (Lisp_TS_Parser): Remove field.

(cherry picked from commit 03a6d4256f861d71e09206ac09d48f16efd52b64)

; Remove TODO item for writing to the bottom-right corner on TTYs

(cherry picked from commit f79354460d3bef4a3f859f78c6cc77738437d670)

; * src/android.c (android_rewrite_spawn_argv): Fix typo.

(cherry picked from commit f6a56ddb5dd84c9984d49c9c223e043844ae47ae)

Bump python.el package version to 0.30

* lisp/progmodes/python.el: Bump package version to 0.30.

(cherry picked from commit 672df0288b55f8bb7ebacdce5335f9e11955482e)

Make python.el compatible with Emacs 29.1

* lisp/progmodes/python.el (python--treesit-fontify-string): Don't
call treesit--compute-font-lock-level unless it is
fboundp.  (Bug#76873)

(cherry picked from commit 46f9ebaec309e45d4a1a19d1a5e69eab881d54e9)

; Temporarily disable proced tests on macOS (Bug#76898)

* test/lisp/proced-tests.el (proced-format-test, proced-update-test)
(proced-revert-test, proced-color-test): Disable tests on macOS.

(cherry picked from commit 8ea65ac642c5ae29610ef6a14f852953821dee45)

Prefer defvar-keymap in some additional Gnus libraries

* lisp/gnus/gnus-sum.el (gnus-dead-summary-mode-map):
* lisp/gnus/gnus.el (gnus-article-mode-map)
(gnus-summary-mode-map, gnus-group-mode-map):
* lisp/gnus/mm-decode.el (mm-viewer-completion-map): Prefer
defvar-keymap.
* lisp/gnus/gnus.el (gnus-suppress-keymap): Declare obsolete.

(cherry picked from commit 1393b71c2ce05128200350a0b6e4da930794f438)

lisp/emacs-lisp/track-changes.el: Make GNU ELPA release

(cherry picked from commit 4980089960ab467ad00fb2b3369b26f477cb0186)

; Add comment to explain recent change

* lisp/vc/log-edit.el (log-edit-font-lock-keywords): Add comment to
explain recent change.  Proposed by Eli Zaretskii <eliz@gnu.org>.
Ref: https://lists.gnu.org/r/emacs-devel/2025-03/msg00587.html

(cherry picked from commit bab17c7fb5161d3ed4820bf51d0cec6ee1cbb525)

Fix setting dedicatedness of WINDOW in 'window--display-buffer' (Bug#76911)

* lisp/window.el (window--display-buffer): Consult WINDOW's
'window-side' parameter in order to find out whether it is a
side window (Bug#76911).

(cherry picked from commit fd4de89460e20a1bbe0229f2e8c125f9f33bb088)

Add keyword placeholder to tramp.el

* lisp/net/tramp.el: Add Version, Package-Requires, Package-Type
and URL keywords.

(cherry picked from commit cc87717fa077b2b28319f60d6be4aa5cf57927a5)

; Fix compiler warning in html-ts-mode.el

* lisp/textmodes/html-ts-mode.el (treesit-node-end)
(treesit-node-start): Declare.

(cherry picked from commit 7a72589847107f26d0ebdc22f9cfa61962d02af4)

Fix Package name for cond-star

* lisp/emacs-lisp/cond-star.el: Fix name.  (Bug#76861)

(cherry picked from commit 6d99b74ef7701f00ccf6fe76ba7dbcbde00e241a)

; cperl-mode.el: Improve docstring cperl-fontify-trailer

* lisp/progmodes/cperl-mode.el (cperl-fontify-trailer): Document
that this setting also affects indentation (Bug#76868).

(cherry picked from commit 442d16266ee1c83ab56809acb414ac7b41c56f42)

vc-setup-buffer: Don't set current buffer as parent (bug#59457)

* lisp/vc/vc-dispatcher.el (vc-setup-buffer): Don't set the
current buffer as parent (bug#59457).

(cherry picked from commit 6d62a293aff9af73d5f53ba0c7f226f29c6e35a2)

vc-setup-buffer: Kill local file-local-variables-alist too

* lisp/vc/vc-dispatcher.el (vc-setup-buffer): Kill
file-local-variables-alist variable, too (bug#44698).
* lisp/vc/vc.el (vc-log-internal-common): Don't call
kill-all-local-variables here, that's vc-setup-buffer's job.

(cherry picked from commit e09a80143d5952b1d1d1ade2b0f2e217835e917d)

Fix handling of frame position values

* src/frame.c (tty_child_pos_param): Handle additional position
values.  New SIZE argument.
(tty_child_frame_rect): Process size before position.
(Fmake_terminal_frame): Do not store calculated size/position
values in parameters to avoid that a negative absolute position
is later interpreted as position relative to bottom/right edge
of parent.
(Fmodify_frame_parameters): For tty child frames process size
before position values so the latter can take a new size into
account.
* src/frame.h: Adjust declaration of tty_child_pos_param.
* src/gtkutil.c (xg_set_geometry): Handle negative frame
position specifications.
* src/msdos.c (IT_set_frame_parameters): For tty child frames
process size before position parameters.
* src/xfns.c (x_window): In the non-GTK toolkit variant leave
negative position values unchanged - the toolkit should know how
to handle them.  Process child frame position parameters
separately.  In the non-toolkit variant process child frame
parameters separately.

(cherry picked from commit cbad6215cf4fef826fa9c3600765a7c696872eaf)

Reenable mmap-based dump allocation on wide int configurations

* src/pdumper.c (VM_SUPPORTED): Don't define to 0 when
!USE_LSB_TAG if WIDE_EMACS_INT.

(cherry picked from commit 94ba1b097ed12b9b77ecef4899c18b46b7e2dd36)

Fix bug#76805

* src/xterm.c (x_fast_mouse_position): Clear the mouse_moved
flag whether or not mouse motion is reported, to avoid repeated
polling for mouse movement.  (bug#76806)

(cherry picked from commit ab5bfcebddf4c0613ef352231628d4034c8cb178)

; Fix function declarations in frame.el

* lisp/frame.el (widget-field-text-end, widget-field-start)
(widget-get): Correct function declarations.

(cherry picked from commit d343a80e6e1854ffdbea1378f0bc4f836fd01ea4)

Don't claim that xftfont is being considered for deletion

* configure.ac: Don't claim that Xft is being considered for
deletion or that recent releases are buggy, or imply that
HarfBuzz support is exclusive to Cairo.

(cherry picked from commit 02681b0fbf02913cd474e082f67649f14115e4a6)

(makefile-dependency-regex): Fix bug#76759

* lisp/progmodes/make-mode.el (makefile-dependency-regex):
Decompose the regexp to be more understandable, and then change
it so the target part can't accidentally match a TAB.

* test/lisp/progmodes/make-mode-tests.el (make-mode-tests--bug17400):
New test.

(cherry picked from commit c4a282316633bdc6a21077350650ecd97868934c)

; Correct typos in commentary and error messages

* src/lisp.h (USE_LSB_TAG):

* src/pdumper.c (pdumper_load): Correct typos in commentary and
error messages.

(cherry picked from commit 5176eeb3003a4d31053b07a9c6045da723fa257d)

Provide better completion for customizing frame parameters

* lisp/frame.el (frame--special-parameters): New const.
(frame--complete-parameter-value): New function.
(initial-frame-alist, minibuffer-frame-alist): Use them in
:type.  (Bug#39143)
* lisp/cus-start.el (default-frame-alist): Use them here as well.
* src/frame.c (frame_parms): Add comment to try to keep
frame--special-parameters updated.

(cherry picked from commit 0861da138b91b936a1b307fd59622d98f9b22cc6)

Rewrite ERT manual introduction

* doc/misc/ert.texi (Top): Rewrite for clarity.  Don't give such
prominent mention to to TDD or JUnit, references which now seem dated.

(cherry picked from commit 7d0d61d8549904f460c5711b93ed359f853fb4c3)

; Fix byte-compiler warning

(cherry picked from commit 731af8747cb07aea532d9e9fd246857a88625a44)

Make second arg to defvar-local optional

This change allows declaring a variable both special
and buffer-local like so:

    (defvar-local foo)

* lisp/subr.el (defvar-local): Make second argument optional.
* test/lisp/subr-tests.el (subr-test-defvar-local): New test.
* doc/lispref/variables.texi (Creating Buffer-Local): Document above change.
* etc/NEWS:

* lisp/mb-depth.el (minibuffer-depth-overlay):
* lisp/minibuf-eldef.el (minibuf-eldef-initial-input)
(minibuf-eldef-initial-buffer-length)
(minibuf-eldef-showing-default-in-prompt, minibuf-eldef-overlay):
* lisp/misc.el (list-dynamic-libraries--loaded-only-p):
* lisp/simple.el (minibuffer-history-isearch-message-overlay): Use
above new one-argument form of 'defvar-local'.

(cherry picked from commit ce03bf252ae9bff28a6def163cb3f4fa102e691a)

Use lisp-data-mode in recentf-save-file

* lisp/recentf.el (recentf-save-file-header): Add cookie to use
lisp-data-mode in recentf-save-file.

(cherry picked from commit a6523599f985eae5f884834bf15bd714c1cf557b)

Use .eld for some relevant cache and data files

* lisp/bookmark.el (bookmark-default-file):
* lisp/net/nsm.el (nsm-settings-file):
* lisp/progmodes/project.el (project-list-file):
* lisp/saveplace.el (save-place-file): Rename files to have the file
suffix ".eld".  This change is backwards-compatible.

(cherry picked from commit 3396f0e5678cf1edb0056917182b30927a35335b)

Make locate-user-emacs-file accept a list too

This can be used to migrate to a new name, while also keeping
backwards-compatible support for an old name.

* lisp/files.el (locate-user-emacs-file): Accept a list as the
NEW-NAME argument.
* test/lisp/files-tests.el (files-test-locate-user-emacs-file): New
test for the above.

(cherry picked from commit 87db670d045bea2d90139b1f741eea8db7c193ea)

Add test for 'locate-user-emacs-file'

* test/lisp/files-tests.el
(files-test-locate-user-emacs-file): New test.

(cherry picked from commit 9c6e8589ee5eae0f793994c96d434b77f54749de)

; cperl-mode.el: Don't misinterpret exec_fcn as keyword exec

* lisp/progmodes/cperl-mode.el
(cperl-after-block-and-statement-beg): Recognize _ as part of a
Perl symbol.  Fixes Bug#76851

* test/lisp/progmodes/cperl-mode-resources/cperl-indents.erts
Two new test cases around the edges of Bug#76851

(cherry picked from commit b2f124f2a8887a3bf2e68ec09500361a2d4d0850)

Re-port to 32-bit systems without alignment primitives

* configure.ac (ALIGNOF_INT, ALIGNOF_LONG, ALIGNOF_LONG_LONG):
New variables.
(emacs_cv_alignas_unavailable): Define if alignas and structure
alignment primitives are unavailable.  In such an environment,
the MSB tagging scheme must be enabled, as must the GNU malloc.

* msdos/sed2v2.inp: Adjust correspondingly.

* src/alloc.c (union emacs_align_type): Remove types which
contain flexible array members.  The address of a field
subsequent to an aggregate with flexible array members cannot
validly be taken.
(mark_memory) [!USE_LSB_TAG && !WIDE_EMACS_INT]: Strip type bits
before scanning memory.

* src/emacs.c (main):

* src/eval.c (Fautoload_do_load):

* src/fns.c (Frequire): Rename a number of illogically named
fields.

* src/lisp.h (ALIGNOF_EMACS_INT): Define to the natural
alignment of EMACS_INT.
(IDEAL_GCALIGNMENT): New macro.
(USE_LSB_TAG): Disable if no alignment specifiers are available,
WIDE_EMACS_INT is undefined, and the natural alignment of
EMACS_INT falls short of LSB tagging's requirements.
(gflags): Rename illogically named fields and don't define them
as bitfields, which runs afoul of certain compiler issues.
(will_dump_p, will_bootstrap_p, will_dump_with_pdumper_p)
(dumped_with_pdumper_p): Adjust accordingly.

* src/pdumper.c (VM_SUPPORTED): Define to 0 when !USE_LSB_TAG.
It is better to read dump files into the heap by hand than to be
supplied with an address that is not representable.
(_dump_object_start_pseudovector): Rename to
dump_object_start_pseudovector, to avoid encroaching on reserved
names.
(START_DUMP_PVEC): Adjust correspondingly.
(dump_mmap_contiguous_vm): Preserve errno around failure
cleanup.
(dump_bitset_bit_set_p): Work around certain compiler issues.
(pdumper_load) [!USE_LSB_TAG]: Reject dump file allocations
that are not representable as Lisp_Objects.

Tested on i386-unknown-solaris2.10, sparc-sun-solaris2.10.

(cherry picked from commit a5f8ce9f1eae29f87fe13adb61bd4e15faa628a2)

; Skip commit 57cef07710d91988b6332ad3ed2f5c4b4b371585

Document return values of the various read-* functions

* lisp/textmodes/string-edit.el (read-string-from-buffer):
* lisp/simple.el (read-from-kill-ring, read-shell-command)
(read-signal-name):
* lisp/replace.el (read-regexp-case-fold-search):
* lisp/auth-source.el (read-passwd):
* lisp/subr.el (read-key, read-number):
* lisp/minibuffer.el (read-file-name, read-no-blanks-input):
* lisp/international/mule-cmds.el (read-multilingual-string):
* lisp/language/japan-util.el (read-hiragana-string):
* lisp/files-x.el (read-file-local-variable)
(read-file-local-variable-mode, read-file-local-variable-value):
* lisp/faces.el (read-face-font, read-face-name):
* lisp/simple.el (read-extended-command):
* lisp/env.el (read-envvar-name):
* lisp/files.el (read-directory-name):
* lisp/faces.el (read-color):
* lisp/international/mule-diag.el (read-charset):
* lisp/emacs-lisp/map-ynp.el (read-answer):
* src/coding.c (Fread_coding_system)
(Fread_non_nil_coding_system):
* src/minibuf.c (Fread_command, Fread_from_minibuffer):
* src/lread.c (Fread_char, Fread_char_exclusive, Fread_event): Doc
fixes.

(cherry picked from commit 59d1aac49dfdc49e34be5964f547db0cfa7e127b)

Allow changing theme settings without reloading it

* lisp/custom.el (custom--should-apply-setting): Return non-nil
for an enabled theme.  Provide docstring.  This allows for users
to reevaluate a custom-theme-set-* function and see the settings
applied right away.  (Bug#76685)
(custom--inhibit-theme-enable): Adapt docstring.

* etc/NEWS: Announce the new behavior.

(cherry picked from commit 203747b87fbf976fda887d0652b05685447b8d65)

; Skip commit ee789d3d27824eaca42fed02659e7b712a6f8c66

Fix drawing to the bottom-right corner of terminals

* src/term.c (tty_write_glyphs_1): Renamed from tty_write_glyphs. Don't
check if writing the bottom-right corner.
(tty_write_glyphs): New function handling case of writing to the
bottom-right corner, and otherwise calling tty_write_glyphs_1.

(cherry picked from commit 6fb68f4310d808827b83da053fbc112b316b7757)

Guard against user saving ediff-meta-diff-buffer

* lisp/vc/ediff-mult.el (ediff-collect-custom-diffs): If the
diff buffer is visiting a file, create a new buffer.  (Bug#3348)

* test/lisp/vc/ediff-mult-tests.el: New test file.

(cherry picked from commit d01b7c85fea3e177df112513af150cead4bbb3e5)

macOS: Don't constrainFrameRect for child frames

* src/nsterm.m ([EmacsWindow constrainFrameRect:toScreen:]): Don't do
anything for child frames.

(cherry picked from commit ba20f73d8e0173a37fbdd2efe72a7a3b0d62dfa5)

Fix TAGS regeneration with Universal Ctags

* lisp/progmodes/etags-regen.el (etags-regen--append-tags): Move
the "-o" option to before the filename, as Ctags doesn't allow
it to follow the file name.  (Bug#76855)

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

Explicitly document read-string return value

* src/minibuf.c (Fread_string): Document return value explicitly.
Better document PROMPT argument, and reflow docstring.  (Bug#76797)

(cherry picked from commit af8017b23f6d94266dd05dcd084c8d7656393db8)

Improve docstrings of python.el import management

Added notes that when adding import statements for a file that
does not belong to a project, it may take some time to find
candidate import statements in the default directory.

* lisp/progmodes/python.el (python-add-import)
(python-fix-imports): Improve docstring.  (Bug#74894)

(cherry picked from commit cf03c2b6093d3b555f758f033610a6015378de57)

; Improve doc strings of Speedbar

* lisp/speedbar.el (speedbar-extension-list-to-regex)
(speedbar-query-confirmation-method)
(speedbar-show-unknown-files, speedbar-use-imenu-flag)
(speedbar-track-mouse-flag, speedbar-default-position)
(speedbar-sort-tags, speedbar-directory-button-trim-method)
(speedbar-smart-directory-expand-flag)
(speedbar-hide-button-brackets-flag, speedbar-vc-do-check)
(speedbar-vc-indicator, speedbar-obj-do-check)
(speedbar-frame-mode, speedbar-handle-delete-frame)
(speedbar-show-info-under-mouse, speedbar-item-info)
(speedbar-item-rename, speedbar-item-delete)
(speedbar-initial-keymap, speedbar-insert-files-at-point)
(speedbar-generic-list-positioned-group-p)
(speedbar-generic-list-tag-p, speedbar-check-read-only)
(speedbar-tag-file, speedbar-tag-expand)
(speedbar-find-file-in-frame, speedbar-parse-tex-string)
(speedbar-buffer-click): Doc fixes.

(cherry picked from commit 01bcc6961a6b0db36c371c9016d6eb00a1ae8ea2)

Avoid warnings about 'image-scaling-factor' in builds --without-x

* lisp/cus-start.el (standard): Exclude 'image-*' options if Emacs
was built without GUI support.  (Bug#76716)

(cherry picked from commit bd9c76ab175cde67fc98849d9d216c2ee4373042)

; * bookmark.el: Minor cleanup

completion-preview.el: Provide an API.

Add new functions for summoning and dismissing the
completion preview programmatically.  This lets Lisp code
leverage the completion preview UI for different use cases.

* lisp/completion-preview.el (completion-preview-show): New
function.
(completion-preview-hide): Rename to
'completion-preview--hide', use old name for new public API
function.
(completion-preview--hide): New name, see above.
(completion-preview-active-mode)
(completion-preview--update): Use new functions.

Make sure Comint minibuffer password prompts end with space

* lisp/comint.el (comint-watch-for-password-prompt): Add a trailing
space character to the minibuffer password prompt, if it does not
contain one already, per the minibuffer UI conventions.

Bug#76604

(cherry picked from commit 41c1c6ffac3bc3db9818ed8e0cc857c72b06d806)

; Skip commit 7e89ef2ced2d06f49705aff679f1962af94d0973

; Skip commit 2322dea77cc2f3e1f1eb08a5b03f97afdd3a4cde

; Add debug spec

* lisp/textmodes/reftex-parse.el (reftex-with-special-syntax): Add
debug spec and docstring.

(cherry picked from commit 31ebc00ece7d7234868a2a1e95f138473ea6646c)

Action button when point is just after it

* lisp/cus-edit.el (Custom-newline): If no button at point,
check for a button before point.  (Bug#72341)

(cherry picked from commit 8bea0aae3bb59bd0452c61f856d74650838f6a45)

VC: New hook to strip CVS template lines when committing

Add a hook function to strip all lines beginning with "CVS:" from the
commit message as CVS does.  Do this only if 'log-edit-vc-backend' is
'CVS'.  (Bug#72341)

* lisp/vc/log-edit.el
(log-edit-done-strip-cvs-lines): New command.
(log-edit-done-hook): Add it as an option.

* test/lisp/vc/log-edit-tests.el
(log-edit-done-strip-cvs-lines-helper): New function.
(log-edit-done-strip-cvs-lines-cvs)
(log-edit-done-strip-cvs-lines-non-cvs)
(log-edit-done-strip-cvs-lines-only-cvs-colon-blank)
(log-edit-done-strip-cvs-lines-only-cvs-colon): New test cases.

* etc/NEWS: Mention log-edit-done-strip-cvs-lines.

(cherry picked from commit 00e284fc52b44fc3cb435a5d17ce58af1b753a34)

; * java/org/gnu/emacs/EmacsWindow.java (viewLayout): Typo in comment.

(cherry picked from commit 4db604f3751ffb6a1fc3fd4277445a8f94cec13f)

Avoid reserved names in sfnt.c

* src/sfnt.c (_MIN, _MAX): Rename to INS_MIN and INS_MAX.
(sfnt_interpret_run): Adjust accordingly.

(cherry picked from commit 1e289586fc08615031783a28e1e197071b734aaf)

Use TS to support 'hs-minor-mode' in 'lua-ts-mode'

* lisp/progmodes/lua-ts-mode.el (lua-ts-mode): Add list type to
'treesit-thing-settings'.
* lisp/progmodes/hideshow.el (hs-special-modes-alist):
Remove regular expression based implementation.
* test/lisp/progmodes/lua-ts-mode-resources/hide-show.lua: New file.
* test/lisp/progmodes/lua-ts-mode-tests.el (lua-ts-test-hideshow):
Add test.  (Bug#76693)

(cherry picked from commit 2f1b1414f78e471f1c4e852c1cbd8320cb0fa60d)

Correct (debug body) edebug specs

This fixes Bug#69865.

* lisp/org/ob-exp.el (org-babel-exp--at-source):
* test/lisp/dired-tests.el (dired-test-with-temp-dirs):
* test/lisp/emacs-lisp/package-tests.el (with-fake-help-buffer):
Fix broken edebug specs (debug body) -> (debug (body)).

(cherry picked from commit 7905ea761ac8405628993708b4c1d4516370067c)

; Skip commit f23ee932509e0a67aaafc499f0cd6b25535e4b95

; Skip commit 269d337f9191cb58e70f93f8aae47a9bd8d635f9

; Skip commit 1a9c2a9505a9e006955294fe2a9a2f93e76d712c

; Enable pdumper on some buggy versions of Sun C

* src/pdumper.c (dump_sort_copied_objects, drain_reloc_list)
(dump_do_fixups, dump_do_dump_relocation): Do not expand
Fnreverse multiple times in CALLN.  Sun C 5.12 evaluates the
arguments to array initializers to which it expands, which
clobbers the lists being reversed.

(cherry picked from commit b36abc76ae3583ae30f9883ca276ff66d522bac1)

Don't lose drag-and-drop data intended for XTerm-like programs

* src/xselect.c (x_own_selection): If special values exist for
drag-and-drop to unsupported programs, retain them till the
selection is cleared.

(cherry picked from commit b0b7ad24e6efca04a373a4f2845a483984e3f1ea)

Fix crash in daemon when "C-x C-c" while a client frame shows tooltip

* src/frame.c (delete_frame): Ignore tooltip frames when looking
for other frames on the same terminal.  (Bug#76842)

(cherry picked from commit d2445c8c23595efdd444fce6f0c33ba66b596812)

; Skip commit 1bb91adea519b3e4d99f1064b8095a184e16d009

vc-log-internal-common: Kill all local variables

* lisp/vc/vc.el (vc-log-internal-common): Kill all local
variables, even permanent-local ones (bug#44698).

(cherry picked from commit a546225e1a86f16188897edef899a48f3c78e136)

; Skip commit 9bb2fe22dba96e800d1882bdebb904160c5a00fb

; Skip commit c82495dea767334c4b4423cf0358c76ca1edc4b4