Support colored stipples on Cocoa NS (Bug#73384)

On Cocoa builds of NS Emacs, stipples are now rendered
using masked CGImages instead of patterned NSColors so that
stipples now render with color.
* src/nsimage.m ([EmacsImage stippleMask:]): Use a CGImageMask to
store the stipple mask when building for Cocoa.
* src/nsterm.m (ns_maybe_dumpglyphs_background): Perform a masked
fill to draw stipples when building for Cocoa.
(ns_draw_stretch_glyph_string): Perform a masked fill to draw
stipples when building for Cocoa.

(cherry picked from commit 9cbbdcee132588a11dc03c3da371176aaa13927c)

; * doc/emacs/android.texi (Android Software): Minor markup nits.

(cherry picked from commit 1b80bc67aadd01de00b7911ae32bf5d91b262a8a)

; * etc/PROBLEMS: Document the same problem here.

(cherry picked from commit dcfbf7d1863fdba0329dcefa73c6ec15eb8046cf)

Document requirements respecting XDG MIME databases on Android

* doc/emacs/android.texi (Android Software): State that librsvg
requires a MIME database to display embedded images, and how to
acquire such a database.

(cherry picked from commit b09bbf22afda57cbf96870c68eb31264a4ced482)

Revert “Avoid some union buffered_input_event uses”

Revert my commit 29a9fd4f4ba17822eca0f00c2037da3868bd874e
and the following commit 1ec0889e7b786d79351cee3ed4964d82295f059f.
This fixes a bug where ‘emacs -nw’ would sometimes freeze when Emacs is
configured with ‘--with-pgtk --enable-link-time-optimization
--disable-gc-mark-trace’ on GNU/Linux x86-64 (Bug#76729).
As it is not yet clear whether this freeze is due to an Emacs bug that
I introduced, or due to GCC bug 117423
<https://gcc.gnu.org/bugzilla/show_bug.cgi?id=117423>,
play it safe for now and revert to the previous state.

(cherry picked from commit 9415941a9c65b72a3bc20ae0ec1765f3c0ed657d)

; * src/eval.c (Fdefvar_1, Fdefconst_1): Properly quote apostrophe.

(cherry picked from commit 3e39b2418b3d015d94e2d24e003f47cae8c21c37)

Fix unwanted revert file prompt after repeated vc-ediff (bug#11605)

* lisp/vc/ediff-vers.el (vc-find-revision-no-save): Declare.
(ediff-vc-internal, ediff-vc-merge-internal): Bind
vc-find-revision-no-save instead of calling
ediff-delete-version-file (bug#11605).
(ediff-delete-version-file): Delete.

(cherry picked from commit a38ed1618d7c6293e38ffdc76fb2c16f8ef33874)

(advice--make-nadvice-docstring): Rename

* lisp/emacs-lisp/nadvice.el (advice--make-nadvice-docstring): Rename
from `nadvice--make-docstring`, to stick to the `advice-` namespace.
Update all callers.

(cherry picked from commit 035077febe34b0df871bb3b6e1c81fc2bfdc4059)

; Fix copyright years of the Spanish translations

These translations were created in 2025, so that is the correct
copyright year, even if the source material was created earlier.

(cherry picked from commit 93c3a269ca45f6165b4181de2386517e95d07116)

Update Makefile and docs for new Spanish refcards

* etc/refcards/Makefile (PDF_SPANISH, PS_SPANISH): New variables.
(PDF_TARGETS): Use above new variables.
(spanish, spanish-ps): New targets for Spanish translation.  (Bug#76300)
* admin/release-process:
* etc/refcards/README: Document new Spanish translation.

(cherry picked from commit 50baeb95c68eedbefd70b0814eeb9b384826cfa8)

Add Spanish translation for survival.tex

* etc/refcards/es-survival.tex: New file.  (Bug#76300)

(cherry picked from commit 05f0f14068bcdd83cfd8f131e4d1dde4342f8d71)

Add Spanish translation for refcard.tex

* etc/refcards/es-refcard.tex: New file.  (Bug#76300)

(cherry picked from commit 00ff7d7503e301aa1c005988d37555fe9add7a6a)

Add Spanish translation for dired-ref.tex

* etc/refcards/es-dired-ref.tex: New file.  (Bug#76300)

(cherry picked from commit cf0dbc34e8ef77828e2c6f8b07dddc606c44900e)

Render Android hourglass cursor mechanics more consistent with X

* src/androidterm.c (android_show_hourglass): Always define the
hourglass cursor, but...
(android_hide_hourglass): ... restore the invisible cursor
subsequently, if need be.
(android_toggle_visible_pointer): Do not hide the current cursor
if it is an hourglass.

(cherry picked from commit 144b268a84e6be81f59669b77651b4522a2f2805)

Circumvent another styling issue in Android 15 QPR1

* java/org/gnu/emacs/EmacsView.java (popupMenu): On Android 15
and later, reload the default theme before displaying popup
menus.

(cherry picked from commit d6aea7cc948f13615237a91d347b0383a3089a8a)

Replace anonymous lambda timers with named functions

* lisp/emacs-lisp/eldoc.el (eldoc--update, eldoc-schedule-timer):
* lisp/jit-lock.el (jit-lock-context--update)
(jit-lock--antiblink-update): New functions broken out from...
* lisp/emacs-lisp/eldoc.el (eldoc-schedule-timer):
* lisp/jit-lock.el (jit-lock-mode, jit-lock--antiblink-post-command):
...here.  Use them as values for timers, to give them readable names
in 'M-x list-timers'.  (Bug#71354)

(cherry picked from commit ec517d1dcf3260b2cf1684566b5e3bf3979eaceb)

; Skip commit d9218651b6103267f7282997b75d19effdc02613

; Skip commit 5dd8b7e75259663415523f3ebe35ba2f97b5b103

Avoid crashes on MS-Windows on repeated client connections

* src/w32uniscribe.c (uniscribe_close): Zero out dwrite cache.
Suggested by Richard Copley <rcopley@gmail.com>.  (Bug#76121)

(cherry picked from commit c116dad608afcf28384651101e8b6c6b7999f56e)

Fix MS-Windows build broken by buffered_input_event changes

* src/keyboard.c (kbd_buffer_store_selection_event_hold):
* src/keyboard.h (kbd_buffer_store_selection_event_hold): Declare
and define only for (HAVE_X11 || HAVE_PGTK).

(cherry picked from commit 1ec0889e7b786d79351cee3ed4964d82295f059f)

Improve treesit settings for js-ts-mode (bug#73404)

* lisp/progmodes/js.el (js--treesit-font-lock-settings):
Add 'class' alongside 'class_declaration'.
(js--treesit-defun-name): Add "variable_declaration"
alongside "lexical_declaration".
(js--treesit-valid-imenu-entry): Add "variable_declaration"
and provide the predicate to 'treesit-node-top-level'.
(js--treesit-sentence-nodes): Add "jsx_attribute" like in html-ts-mode
instead of jsx elements matched in 'js--treesit-list-nodes'.
(js--treesit-list-nodes): Add "jsx_element" and "jsx_self_closing_element"
instead of "_jsx_string".
(js--treesit-simple-imenu-settings): Move "method_definition" to separate
section "Method" from the "Class" section.  Add "variable_declaration"
to the "Variable" section.
(js-ts-mode--outline-predicate): New variable.
(js--treesit-defun-type-regexp): Add bos/eos.
(js--treesit-jsdoc-comment-regexp): Add bos/eos.
(js-ts-mode): Set treesit-outline-predicate to
'js-ts-mode--outline-predicate'.

* lisp/textmodes/mhtml-ts-mode.el (mhtml-ts-mode--html-defun-name):
Remove unused function.
(mhtml-ts-mode): Use 'js-ts-mode--outline-predicate' in
'treesit-aggregated-outline-predicate'.

* lisp/textmodes/yaml-ts-mode.el (yaml-ts-mode--outline-predicate):
Use 'treesit-node-top-level' instead of 'treesit-parent-until'.

(cherry picked from commit dbc0e5a52d855773a495e0ca89b738f8f2246df9)

Fix fontification outside hunks in Git patches

* lisp/vc/diff-mode.el (diff-font-lock-keywords): Don't fontify lines in
Git patches starting with + or - as added/removed, if they are either
before the first hunk, or in the email signature.  (Bug#75884)
(diff-buffer-type): Move definition up.
(diff--indicator-added-re, diff--indicator-removed-re): New variables.
(diff--git-preamble-end, diff--git-footer-start)
(diff--indicator-matcher-helper, diff--indicator-added-matcher)
(diff--indicator-removed-matcher): New functions.
* test/lisp/vc/diff-mode-tests.el (diff-mode-test-git-patch)
(diff-mode-test-git-patch/before-first-hunk)
(diff-mode-test-git-patch/signature): New tests.
* test/lisp/vc/diff-mode-resources/git.patch: New file.

(cherry picked from commit 10abb87f0519b3d53d6b7078703d3a0120e3aaa8)

; Skip commit eeda2a8ab1f06da5b51dc98e57ae8b4a4faa1f72

Avoid some union buffered_input_event uses

Simplify by using separate local vars for struct input_event and
struct selection_input_event, rather than a single local var that
is the union of the two.  This makes the code easier to follow by
the human reader, and should help avoid GCC bug 117423
<https://gcc.gnu.org/bugzilla/show_bug.cgi?id=117423> and
therefore work around Emacs bug 76559 <https://bugs.gnu.org/76559>.
* src/androidterm.c (handle_one_android_event):
* src/gtkutil.c (xg_widget_key_press_event_cb):
* src/pgtkterm.c (evq_flush):
* src/xterm.c (handle_one_xevent): Use struct input_event and
kbd_buffer_store_event_hold, or struct selection_input_event and
kbd_buffer_store_selection_event_hold, rather than union
buffered_input_event and union buffered_input_event.
* src/keyboard.c (beware_long_paste, maybe_quit_while_no_input):
New functions, broken out from kbd_buffer_store_buffered_event.
(kbd_buffer_store_event_hold): Define here, with a simplified
version of the body of the old kbd_buffer_store_buffered_event,
rather than defining in keyboard.h.  Specialize to struct
input_event.
(kbd_buffer_store_selection_event_hold): New function; it is
a simplified version of the old kbd_buffer_store_buffered_event,
specialized to struct selection_input_event.
(is_ignored_event_kind): Accept enum event_kind instead of
union buffered_input_event.  All callers changed.
* src/keyboard.h (kbd_buffer_store_event_hold):
Remove definition, as keyboard.c now defines it.
* src/pgtkterm.c (evq_grow_if_needed): New function.
(evq_enqueue, evq_selection_enqueue): Two functions now,
not one.  Args are now struct input_event const * or
struct selection_input_event const *, not
union buffered_input_event *.  All callers changed.
This lets us simplify the callers so that they need
not use the union.

(cherry picked from commit 29a9fd4f4ba17822eca0f00c2037da3868bd874e)

Fix styling issues on Android 15 QPR1

* java/org/gnu/emacs/EmacsView.java (EmacsView): Guarantee that
frame views are created with the correct theme.

* java/res/values-v20/style.xml (EmacsStyle):

* java/res/values-v29/style.xml (EmacsStyle): Disable a swiping
gesture enabled on certain Android systems.

* java/res/values-v35/style.xml: Rename from `styles'.xml.

(cherry picked from commit 96d26b493618f59bbdd4de86be65e784735541c8)

; Skip commit f372508f68c9797f8d17cce0293526f3f30cb4c4

* lisp/wid-edit.el (widget-get): Make faster.

(cherry picked from commit 7b504f898d36b24d3ec4a55b9814edb27f379f6b)

Strengthen widget-get/put tests

* test/lisp/wid-edit-tests.el
(widget-test-editable-field-widget-get/put): Test on inherited properties.

(cherry picked from commit 932397ce52ec0fa112afcd8d52324b8cdfbb66af)

; * test/infra/android/test-controller.el: minor regexp snags

(cherry picked from commit 773108fc0456c6c164aa60881929fdd59232c946)

; Fix my previous commit

* lisp/treesit.el (treesit--update-range-1): Actually guard
against calling treesit-query-language on a function.

(cherry picked from commit f1950fbdb49abfcea26b995b38223c1e89b3c720)

Don't process function range settings in treesit--update-range-1

This fixes a bug where we call treesit-query-language on a
function, which happens before the QUERY in a range setting can
be either a function or a query, but we call it with
treesit-query-language before knowing whether it's a query or
function.

* lisp/treesit.el:
(treesit--update-range-1): Skip function range settings.
(treesit-update-ranges): Handle function range settings here.

(cherry picked from commit a211a940a1e085d53172ceddf6bfc2391985e861)

Pacify GCC in pgtkselect malloc alignment

This is a better fix for Bug#76414.
* src/pgtkselect.c (pgtk_nalloc): New function.
(pgtk_get_window_property, lisp_data_to_selection_data): Use it.

(cherry picked from commit 76342efe9d758a6ca66cdc0ed197381664a6fbbd)

Eglot: fix invocation of neocmakelsp

* lisp/progmodes/eglot.el (eglot-server-programs): Fix invocation
of neocmakelsp

(cherry picked from commit 07bbfea901a71a89d54129ee690e71e9a79b7720)

Eglot: implement additionalPropertiesSupport for showMessage

This feature was introduced in LSP v3.16.

https://microsoft.github.io/language-server-protocol/specifications/lsp/3.18/specification/#window_showMessageRequest

* lisp/progmodes/eglot.el (eglot-client-capabilities): Set
window/showMessage/messageActionItem/additionalPropertiesSupport to t.
(eglot-handle-request window/showMessageRequest): Return the whole
selected MessageActionItem, not just its title.

Co-authored-by: João Távora <joaotavora@gmail.com>
(cherry picked from commit 18c81b76bc4c0fcd3effac3114763bae887a9d67)

Add auto-margin enable/disable to term

* test/lisp/term-tests.el (term-line-wrap-no-auto-margins): add test

* lisp/term.el (term-auto-margins): new variable
(term-mode): documentation
(term-termcap-format): mention auto-margins flag
(term-emulate-terminal): support it
(term-reset-terminal): reset it
(term-handle-ansi-escape): notice it

* etc/e/eterm-color.ti: add auto margin capability

* etc/e/README: fix build documentation

* etc/NEWS: mention auto-margins

(cherry picked from commit 13b1436d975b270cb1001cf475fa65cc854ec462)

; Fix thinko

(cherry picked from commit 83e2e5e24b72f7a271c04a0ce9cad1399fb2a0f9)

; Add missing lexical-binding cookies

(cherry picked from commit 56202138a3f63875b962ecec70afd46b19c23e00)

; Fix my last commit

(cherry picked from commit b5fe1702405daab4a5332d3584e1bbde5f4e2768)

Adapt recent css-ts-mode changes to mhtml-ts-mode

* lisp/textmodes/css-mode.el (css--treesit-thing-settings):
(css-ts-mode--outline-predicate): New variables.
(css-ts-mode): Set treesit-outline-predicate.

* lisp/textmodes/mhtml-ts-mode.el (mhtml-ts-mode--treesit-thing-settings):
Use css--treesit-thing-settings and css--treesit-defun-type-regexp.
(mhtml-ts-mode): Use 'css-ts-mode--outline-predicate' for
'treesit-aggregated-outline-predicate'.

(cherry picked from commit 888a2b5394f4574edd5fe6e76bef91aab8111ebd)

Improve treesit settings for css-ts-mode (bug#73404)

* lisp/textmodes/css-mode.el (css--treesit-settings): Add
"@supports" and '(at_keyword)' to 'keyword', 'keyframe_block' to
'selector', 'keyframes_name' to 'query'.
(css--treesit-defun-name): Support "keyframe_block",
"keyframes_statement" and "supports_statement" as well.
(css--treesit-simple-imenu-settings): Add "keyframes_statement",
"keyframe_block", "supports_statement".
(css--treesit-defun-type-regexp): Add "keyframe_block".
(css-ts-mode): Add 'treesit-thing-settings'.

(cherry picked from commit a5e82110b087f05d50a9d628e70009ce33c33bc2)

; Move python.el Maintainer header further up

This is more consistent with our common practices.

(cherry picked from commit 1b77e94bcc2bcab4e160cc736db74211e2b6421c)

Bump python.el package version to 0.29

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

(cherry picked from commit 538ab57dc5b8371b3a6d3ccb635deb8b35133fc4)

Bump python.el requirement to Emacs 29.1

* lisp/progmodes/python.el: Require Emacs 26.3, flymake 1.0 and
project 0.1.  (Bug#75526)

(cherry picked from commit 0cff855690109ab57216aeda6c0daa2ec566294e)

Don't warn when calling hl-lock-mode from init file

This was a compatibility kluge introduced in Emacs 22.1, twenty years
ago.  It's fair to assume that any former Emacs 21 user have seen this
warning already, and will have updated their init file.  So remove it.

* lisp/hi-lock.el (hi-lock-mode): Don't warn when calling plain
hi-lock-mode from init file.
(hi-lock-archaic-interface-message-used)
(hi-lock-archaic-interface-deduce): Remove associated variables.

(cherry picked from commit fad9b7dce73d81d669cb22f880b65c867ac36b54)

New commands to convert ASCII to fullwidth characters and back

* lisp/textmodes/text-mode.el (text-mode--fullwidth-table): New
variable.
(text-mode--get-fullwidth-table): New internal function.
(fullwidth-region, halfwidth-region, fullwidth-word)
(halfwidth-word): New commands.  (Bug#71822)

* etc/NEWS: Announce new commands.

(cherry picked from commit 8937dee9e418c64587769dd22bb9683cd3690688)

; Skip commit e34d7a7c4eb90cde7a2dc55ac5a02fae303e5d0f

Specifically report attempts to exit Emacs during test execution

* test/infra/android/test-driver.el (ats-in-eval): Fix typo in
doc string.
(ats-eval-as-printed, ats-eval-serial, ats-eval-do-decode):
Render buffer-local.
(ats-executing-form): New variable.
(ats-process-filter): Bind the same around `eval'.
(ats-kill-emacs-function): New function; register it to execute
when Emacs exits.

(cherry picked from commit 749e33bb481eedbefe0fd24124b446f9c47728d5)

Fix a vc test for Breezy by setting $HOME

* test/lisp/vc/vc-tests.el (vc--fix-home-for-bzr): New macro.
(vc-test--create-repo, vc-test--register, vc-test--working-revision)
(vc-test--checkout-model, vc-test--rename-file)
(vc-test--version-diff): Fix test for Breezy by setting HOME to a
temporary directory.  (Bug#70195)

(cherry picked from commit e4d8095c3dccc4f37be54b083d8b511fac0142b3)

Don't byte compile early-init.el

* test/infra/android/early-init.el (frame-initialize): Remove
redundant debugging printouts.

(cherry picked from commit c73003ade161a50728aa15cc10967ad04fe90b05)

; * test/infra/android/test-driver.el: Don't byte-compile.

(cherry picked from commit 8e007f79908abf95d5e0495cdf5d8f4a8d32be70)

Exclude files under `infra' from automatic testing

* test/Makefile.in (ELFILES): Exclude files within `infra'.
Reported by Stefan Kangas <skangas@gmail.com>.

(cherry picked from commit ecbb0808657e04c0e561e9d62c0ade39eb01351b)

; Silence byte-compiler in Android tests

(cherry picked from commit c4232a08f135b347a24cb75bb901659d45c61787)

; * lisp/treesit.el: Silence byte-compiler.

(cherry picked from commit 2ba2157a610346b56507a8ed7c771f6f57263ee6)

Run Android tests in the initial frame

* test/infra/android/early-init.el: New file.

* test/infra/android/test-controller.el (ats-connect): Upload
`early-init.el' to the staging directory and configure that
directory as the Emacs instance's initialization directory.
(ats-run-test): Always append to the test buffer.  Execute tests
within terminal-frame.
(ats-run-all-tests): Gracefully respond to errors.
(ats-cmd-error): New function.
(ats-execute-tests-batch): Accept a number of command line
arguments.

(cherry picked from commit a8988ce80004af57f3741dc059c5a97cb83dca64)

Enable kmacro-call-macro to function in some circumstances

* lisp/kmacro.el (kmacro-call-macro): Enable to function when
the selected frame's terminal is different from that most
recently consulted by the event loop.

(cherry picked from commit 7fcb01e76ba9b2c74019f3863975cfe32c8b0da0)

; (completion-preview--try-table): Propagate extra properties.

* lisp/completion-preview.el
(completion-preview--try-table): Let-bind
'completion-extra-properties' to completion properties
that the completion backend (capf) provides, so that these
properties take effect when querying the completion table.
* test/lisp/completion-preview-tests.el
(completion-preview-propagates-properties): Add test.

(cherry picked from commit 365a91622e093fe0fb74b7fee3ff7cc4a0025611)

; Skip commit 828e08a9961de7c3e5d149c0c53b6ff06b46d70f

; Add Maintainer header to loaddefs-gen.el

(cherry picked from commit 558e6792c0a920a691b6c70fd7eda6b5c6e85a80)

; Skip commit b7fdddc86ba1733633fa29a4dec6f76667d29aa5

; Skip commit 6f8c4581eaf8c45029171aa390f291faaa58d15f

; Skip commit 33222bd000043ad79cf7d472fadf7cda6d49e31d

Bump python.el requirement to Emacs 26.3

* lisp/progmodes/python.el: Require Emacs 26.3, flymake 1.0 and
project 0.1.  (Bug#75526)

(cherry picked from commit eff5a3e43ba886074c3a2e007a2bced9bcb85f17)

; Skip commit 7dcf9b71e6ffc0cc92d2d504b1428c3ab432a028

; Document spurious warnings on macOS 15

* etc/PROBLEMS: Document spurious warnings on macOS 15.  (Bug#73382)

(cherry picked from commit a5fd518d52418638813bdb1015ab0c63ac53ebfa)

Pass buffer as object in gnus-highlight-selected-tree

* lisp/gnus/gnus-salt.el (gnus-highlight-selected-tree): Correctly
pass buffer object instead of string.  (Bug#75557)

(cherry picked from commit d6dd9dd066e8db665b5c48a4b8fde4db1753e6ad)

Fix the use of xref-window-local-history together with Xref buffer

* lisp/progmodes/xref.el (xref--push-markers): Temporarily
restore the selected window as well, using the value from the
new argument (bug#76565).  Update both callers.

(cherry picked from commit 625ed68aeaadce4df7bdfd8c08ddfc8ed4f9b01a)

; Skip commit 735eace97b88c7e1a7864a0eb5caf2a6d263b60a

; Skip commit 8091772767666f2c671a8ba481d50859388152db

; Improve docstring of cl-check-type

* lisp/emacs-lisp/cl-macs.el (cl-check-type): Improve docstring.

(cherry picked from commit 38cc36a375344d2518eb8f9d3e0e6943199da529)

Improve use-package error message on wrong type

* lisp/use-package/use-package-core.el (use-package): Improve error
message when passed the wrong type.  (Bug#72160)

(cherry picked from commit 38782e684bf5f67e2d8f69daeeb17f37cf4b2c3f)

Simplify and speed up widget-get implementation

* lisp/wid-edit.el (widget-get): Simplify and speed up.
Ref: https://lists.gnu.org/r/emacs-devel/2025-03/msg00010.html

(cherry picked from commit be8a7c9c882540dd7267f9046166cb680f10fd9d)

; Add test for last change

* test/lisp/wid-edit-tests.el
(widget-test-editable-field-widget-get/put): Check return value of
widget-put.  (Bug#76664)

(cherry picked from commit 49e3ef343784adaf967d1ff02a8499eb4d7d1ddd)

Correctly return passed value from widget-put

* lisp/wid-edit.el (widget-get-indirect): Return passed value to stay
consistent with old C implementation.  (Bug#76664)

(cherry picked from commit 5b13541858707a5cbb857b257e00848430d87c47)

; * etc/symbol-releases.eld: Add missing symbols.

(cherry picked from commit 10f11d730e3347f34d873c005ae8e4f830cf166f)

Improve instructions for running with -fsanitize=address (bug#76393)

* etc/DEBUG (ASAN_OPTIONS): Add 'detect_stack_use_after_return=0'
requirement.  Remove obsolete unexec commentary.

(cherry picked from commit 1e84a8767692f9f3a3bc37eba8eeb8f9d537322d)

Make Emacs respond to NS activation clicks

* src/nsterm.m (acceptsFirstMouse): Opt into receiving mouse events that
activate the window. (bug#76629)

(cherry picked from commit 354598874061ab9ecb9362d7ac4233494b51252b)

Provide tool-tip display delays on TTY frames

* lisp/tooltip.el (tooltip-show, tooltip-hide)
(tooltip-show-help): Support delayed tool-tip display on TTY
frames as well.  (Bug#76653)

* etc/NEWS: Announce the behavior change.

(cherry picked from commit 6a2f6056c5a079a7f3db240171680560a3bd9710)

; Skip commit 503622a10151d2ec15e08d91b4f6aeec347fa855

; * lisp/progmodes/java-ts-mode.el (treesit-node-end): Declare.

(cherry picked from commit 0460177451d86460c0a028f07458e78087181f82)

Fix 'M-q' in 'makefile-mode'

* lisp/progmodes/make-mode.el (makefile-mode-map): Bind 'M-q' to
'fill-paragraph', as 'prog-mode's default binding is not
appropriate for Makefile's syntax.  (Bug#76641)

(cherry picked from commit 8481170eb296780b404caea587d17ab33a24aaeb)

; Improve documentation of 'rmail-movemail-program'

* lisp/mail/rmail.el (rmail-movemail-program):
* doc/emacs/rmail.texi (Movemail): Document how to change the
value of 'rmail-movemail-program' safely.  (Bug#76595)

(cherry picked from commit 44a770b87137c93f0c4af4d203bb071659a603a0)

doc-view: Fix error during revert in editing mode

When in editing mode in a doc-view buffer and then reverting (which can
happen automatically when editing OpenDocument contents), we errored in
the advide function doc-view--revert-buffer because the local
doc-view--buffer-file-name has been killed when switching to the editing
mode.

Also restore doc-view-minor-mode after reverting during being in the
editing mode.

* lisp/doc-view.el (doc-view--revert-buffer): Check that
'doc-view--buffer-file-name' is non-nil.
(doc-view-minor-mode): Add re-enabling function to
'revert-buffer-restore-functions'.

(cherry picked from commit 34362a2a1ccd229b486d87cbf4de2eed66e0010d)

Fix go-ts-mode const_spec highlighting (Bug#76330)

* lisp/progmodes/go-ts-mode.el (go-ts-mode--font-lock-settings):
Handle multiple const_spec identifiers.
* test/lisp/progmodes/go-ts-mode-resources/font-lock.go:
Add test case.

(cherry picked from commit b531bbf73ef91aca0a699ffc89e6b93dc49d0151)

Ignore dedicated windows in 'display-buffer-reuse-mode-window'

Ignore the dedicated windows unless the dedicated window is
already displaying the buffer-to-be-displayed.  In that case,
the window may be reused, according to the setting of
'inhibit-same-window'.
* lisp/window.el (display-buffer-reuse-mode-window): Check
'window-dedicated-p' before pushing the candidate window onto
the stack.  (Bug#76216)

(cherry picked from commit b6efedd66a08103e547266279419e646fc659339)

; Document what happens when 'display' and 'invisible' props clash

* doc/lispref/display.texi (Replacing Specs, Overlay Properties)
(Invisible Text): Document that 'invisible' is ignored when
'display' property covers the same text.  (Bug#76658)

(cherry picked from commit bd1d6761f4cd6548731dcb80e0ee8e1a53d929cc)

Save IELM input history on "C-c C-c"

* lisp/ielm.el (ielm--write-history-on-interrupt): New function.
(inferior-emacs-lisp-mode): Install it as buffer-local value of
the 'interrupt-process-functions' hook.  (Bug#76585)

* etc/NEWS: Announce the behavior change.

(cherry picked from commit cabbb36ae1d089e34c501c54a682ea7121899565)

; Skip commit 61320784ed2a8f5f3dcdeb401579d220e5dc05da

keymaps.texi: Move "Changing Key Bindings" section up

* doc/lispref/keymaps.texi (Changing Key Bindings): Move section
up.  (Bug#52821)

(cherry picked from commit 526eeedf88941daf2a77ac5a6c2ba8237ed4814d)

keymaps.texi: Move "Key Sequences" section down

* doc/lispref/keymaps.texi (Key Sequences): Move section
down.  (Bug#52821)

(cherry picked from commit 7ec6531c7bd99ff13e73b9cc2f00d49d2472565f)

Improve process-get/process-put docstrings

* lisp/subr.el (process-get, process-put): Explain the purpose of these
functions in the docstring.

(cherry picked from commit 8b804011275f9f7b5dda1f03e1d6118cae2846c5)

Fix handling of delta values with negative month field

* lisp/calendar/time-date.el (decoded-time-add): If the new
variable is less then zero, the year needs to be decremented
by quotient of new and 12 increased by one.
* test/lisp/calendar/time-date-tests.el (test-decoded-add):
Add applicable test cases.  (Bug#68969)

(cherry picked from commit bc33b70b280933470b252f2a877fd50e4aed42ba)

grep: Signal error if unable to access directory

* lisp/progmodes/grep.el (lgrep, rgrep): grep: Signal error if unable to
access directory, instead of just trying to use default-directory,
because that level of DWIMishness is confusing.  (Bug#71078)

(cherry picked from commit c0ca272bd7cbab5a2013e112f171e1d7fda65216)

; Fix an interactive spec (Bug#71373)

(cherry picked from commit 22c98747601dfdc7ac90b22168a6ec1ca13e0e59)

Make '(setf (process-get ...) VAL)' return VAL

* lisp/emacs-lisp/gv.el (process-get): Return only the last value
when set as a generalized variable.  (Bug#76643)

(cherry picked from commit 77f597ee3de04f6a8dee27b5a5f601911d74c6f5)

* test/src/editfns-tests.el (editfns--replace-region): New test

This test fails, sadly, because `replace-buffer-contents` is not
careful enough to something like `replace_range`.

(cherry picked from commit 1cfbbcfaf657e767ed5743565b62eeecde3a4ef5)

; Skip commit 5f165caf316f9da6f04f4d6c5a0fa786f6f197b9

; Grammar fixes for "native-compiled"

1. Prefer "native-compiled" to "native compiled".
The adjective "native-compiled" with the hyphen is generally more
consistent with the typical pattern in English, especially when the
compound modifies a noun (e.g., "native-compiled code").

2. Prefer "natively compiled" to "natively-compiled".
The adverb "natively" modifies "compiled", and it is standard not
to hyphenate an adverb + adjective combination when the adverb ends
in -ly (e.g., "code that is natively compiled").

For example, note that we say "high-speed internet" but "highly
performant code".

* Makefile.in (dest):
* configure.ac (HAVE_NATIVE_COMP):
* doc/emacs/building.texi (Lisp Libraries):
* doc/lispref/compile.texi (Native Compilation)
(Native-Compilation Functions, Native-Compilation Variables):
* doc/lispref/functions.texi (What Is a Function, Declare Form):
* doc/lispref/loading.texi (How Programs Do Loading, Library Search):
* etc/NEWS:
* etc/NEWS.28:
* etc/NEWS.29:
* etc/NEWS.30:
* lisp/emacs-lisp/comp-common.el (native-comp-never-optimize-functions)
(comp-function-type-spec):
* lisp/emacs-lisp/comp-cstr.el:
* lisp/subr.el (locate-eln-file):
* src/comp.c (SETJMP_NAME, syms_of_comp):
* src/data.c (Fsubrp, Fnative_comp_function_p, Fsubr_native_lambda_list):
* src/lread.c (Fload):
* src/pdumper.c (dump_do_dump_relocation):
* test/src/comp-tests.el (lambda-return2): Avoid grammatically incorrect
variations on "natively compiled" and "native-compiled".  (Bug#56727)

(cherry picked from commit 678fdcc16594aaedb319fe145d039aa118174f5d)

Update .gitattributes

(completion-preview-sort-function): Refine ':type'.

* lisp/completion-preview.el
(completion-preview-sort-function): Add some specific sort
functions as available choices for this user option.

Suggested by Robert Pluim <rpluim@gmail.com>.

(cherry picked from commit 0b0bf7c07f2ecaca1e9b25d72139af0dd7e49832)

; Silence byte-compiler during bootstrap

(cherry picked from commit 3a5cf24735809d79a8603f6b17079708fa0cce0a)