; Skip commit 9bb2fe22dba96e800d1882bdebb904160c5a00fb

; Skip commit c82495dea767334c4b4423cf0358c76ca1edc4b4

; Skip commit 0972a54a5ac52f731c0ea7c8538c8f3b7b6b36b4

Eglot: the margin code action indicator is interactive

* doc/misc/eglot.texi (Customization Variables): Fix.

(cherry picked from commit 1c313f8dce0ac9e0520f885420cd696703736baf)

Revert "Eglot: tests must work on 26.3"

This reverts commit 331492a148588991af5ce9a24a2020b3d380e03f.

My bad: gensym wasn't the problem, it's available from 26.1.  Incf
was the problem, in the main program file.

* test/lisp/progmodes/eglot-tests.el (eglot--with-timeout): Back to gensym

(cherry picked from commit 02f9b525fc2188a57ff36ec38a60fa0032e2e547)

Eglot: unbreak from Emacs 26.3 (two-arg setq-local)

* lisp/progmodes/eglot.el (eglot--hierarchy-1): Use two-arg setq-local

(cherry picked from commit d81cdf9fd23910d38f13a65ccb4909af2c2bdfd9)

Eglot: tests must work on 26.3

;; IMPORTANT: Since Eglot is a :core ELPA package, these tests are
;; supposed to run on Emacsen down to 26.3.  Do not use bleeding-edge
;; functionality not compatible with that Emacs version.

* test/lisp/progmodes/eglot-tests.el (eglot--call-with-timeout):
Back to cl-gensym.

(cherry picked from commit 331492a148588991af5ce9a24a2020b3d380e03f)

; Skip commit 1efcd32cda6450f1db435c33ce73bb28c9dcf2ac

; Skip commit ce43d6732ba967edc85c88647f50b7df0e580624

Stop term-erase-in-line disturbing markers

* lisp/term.el (term-erase-in-line): do nothing if there's nothing to
do; insert new newlines before deleting old ones.

(cherry picked from commit 062c6ab3dd5a1ce85fb7cb0fc84b65aa2cf60369)

; Skip commit a48659e57c8f89c3182274c9faac87ff17e0ab64

; Add Maintainer header to checkdoc.el

* lisp/emacs-lisp/checkdoc.el: Add Maintainer header.

(cherry picked from commit ebb94d712e21a3985fd90ea7011f14b420ff590b)

Fix tty underline capability check (bug#75024)

* src/dispextern.h (TTY_CAP_UNDERLINE_STYLED): Fix. Also make this an
enum.

(cherry picked from commit 9277b037938b79e13a26c30ec0d2be30cfafd32b)

Revert "Stop moving markers during erase-in-line"

This reverts commit 6f19715937bbeaec5fb80ee9dad0d14b7712a989.

(cherry picked from commit ae4671a7abb279aa9f3a9600028bdc85aff27c93)

Stop moving markers during erase-in-line

We shouldn't move a line marker just because we cleared a line next to
it.  clear-in-line is defined not to affect line structure.

* lisp/term.el (term-erase-in-line): use insert-before-markers

(cherry picked from commit 6f19715937bbeaec5fb80ee9dad0d14b7712a989)

Make erase-in-line conform to ANSI spec in term

When handling \e[<N>K escape sequences, we're supposed to erase both to
the left _and_ to the right of the cursor when N is two.

* lisp/term.el (term-erase-in-line): make condition check more correct

(cherry picked from commit 4ea07cc4b4a676a5f8094d565cd3cea89e6ec77d)

; Skip commit af828499c6a280e3efe017898aab15fba3fae0aa

Clean up ert-font-lock error messages

* lisp/emacs-lisp/ert-font-lock.el: Remove redundant requires.
(ert-font-lock--parse-macro-args): First return value 'doc' being
nil already indicates omission of a docstring, so remove redundant
second return value doc-p.  All users updated.  Fix error
messages (bug#76372).
(ert-font-lock--check-faces): Simplify with ensure-list.

(cherry picked from commit e62e7aa8990fd6c0b3a8742c8283efd20a2b10b7)

view-search: Start search from beginning or end of line

* lisp/view.el (view-search): Go to beginning-of-line or end-of-line
instead of previous or next line before the search.  (Bug#76167)

(cherry picked from commit e35435daf392462440bbc51a5b82d93eea7757c6)

Fix using log-edit-mode with git-commit-mode

* lisp/vc/log-edit.el (log-edit-font-lock-keywords): Avoid incorrect
fontification when used with the third-party git-commit-mode (part of
Magit).

(cherry picked from commit c6fe5b779564001e40d5779976968850aa2a166a)

; Fix file headers in tty-tip.el

* lisp/tty-tip.el: Fix file headers.

(cherry picked from commit 646b3f8c5c206b0005020311f382206219f15e64)

; Skip commit 53b84f7fddbcde969f44318ffcdab889c767352c

(python-base-mode-map): Use it!

Rather than use `copy-keymap` between `python-mode-map` and
`python-ts-mode-map`, move the shared bindings to `python-base-mode-map`.

* lisp/progmodes/python.el (python-base-mode-map): Define it explicitly.
Move all the bindings of `python-mode-map` to it.
(python-mode-map, python-ts-mode-map): Inherit from it.

(cherry picked from commit 2dea3a0d34859852d3577f6054acb49f6e515eb2)

* src/eval.c (signal_or_quit): Reduce scope of `debugger_called`

(cherry picked from commit 06af71fbde9378384672a99048bb56ed4ac9a834)

(debug--early): Avoid re-entering the debugger for the same error

Fixes bug#76787.

* lisp/emacs-lisp/debug.el (debugger--last-error): Move ...
* lisp/emacs-lisp/debug-early.el (debugger--last-error): ... here.
(debug--early): Use it.

(cherry picked from commit fb33e3b4c79f8d922d9fe6e593dcc12c3c4b24eb)

Prepare cond-start for addition to GNU ELPA

(cherry picked from commit 4719df9f42c157e2683ac641883cff5efaa480bc)

mouse-face properties on tab-bar tab captions (bug#76394)

* etc/NEWS: Announce 'tab-bar' 'mouse-face' support.

* src/xdisp.c (note_tab_bar_highlight): Handle mouse-face property.

* lisp/tab-bar.el
(tab-bar-tab-highlight): New face.
(tab-bar-tab-name-format-mouse-face): New function adds the 'mouse-face'
'tab-bar-tab-highlight' to the tab name.
(tab-bar-tab-name-format-functions): Add
'tab-bar-tab-name-format-mouse-face'.

(cherry picked from commit efd483cf0ecde3b0545a9eb39cc3fa9483fad76c)

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

* lisp/progmodes/js.el (js--treesit-list-nodes):
* lisp/progmodes/typescript-ts-mode.el (typescript-ts-mode--list-nodes):
Replace leaf "string" with "template_string" and "template_substitution"
that can contain more nodes.

* lisp/progmodes/ruby-ts-mode.el (ruby-ts-mode):
Add the 'sentence' thing to treesit-thing-settings.

(cherry picked from commit 63cc542b9402ad0a794f4e05790366bd580b8bd1)

(debug): Don't `kill-emacs` upon exit when in batch mode

AFAICT this is a left over code from many years ago before
the `debug` special case was added to `condition-case` and
at a time where exiting from `debug` did not proceed to handle
remaining handlers.

In the usual case where we indeed want to kill Emacs,
`signal_or_quit` does it for us.

* lisp/emacs-lisp/debug.el (debug): Don't `kill-emacs` upon exit
when in batch mode (bug#76786)

(cherry picked from commit 82affcaeff8b7a0ed1f30adbf5905f934c4cebaf)

(replace_range): Delete argument `markers`

* src/lisp.h (replace_range):
* src/insdel.c (replace_range): Delete argument `markers`, always true.
* src/editfns.c (Ftranslate_region_internal):
* src/cmds.c (internal_self_insert):
* src/search.c (Freplace_match): Adjust callers accordingly.

(cherry picked from commit 1133c081d6787fdc9634388b33e04382182be5b0)

Fix images on the mode line under 'mode-line-compact'

* src/xdisp.c (display_mode_line): When 'mode-line-compact'
is in effect, don't remove spaces that have a 'display'
property on them.  (Bug#76761)

(cherry picked from commit cd051ef78e465bd70f9d89ba251288204cbb0383)

Avoid defining unneeded variables on Cygw32

lisp/term/w32-win.el contained definitions of variables which
were not used on Cygw32.  It is now to split into two files,
common part and Windows native build specific part. The latter
is a new file, lisp/term/w32-nt.el.
* src/image.c (Qlibpng_version, Qlibgif_version)
(Qlibjpeg_version): Don't define on Cygw32 build.
* src/treesit.c (Qtree_sitter__library_abi): Ditto.

* lisp/term/w32-win.el (dynamic-library-alist, libpng-version)
(libgif-version, libjpeg-version, libgnutls-version)
(tree-sitter--library-abi, gui-backend-set-selection)
(gui-backend-get-selection, gui-backend-selection-owner-p)
(gui-selection-exists-p): Moved to lisp/term/w32-nt.el.
* lisp/term/w32-nt.el: New file, separated Windows native build
specific part from lisp/term/w32-win.el.
* lisp/loadup.el: Load term/w32-nt.el on Windows native build.
(Bug#75926)

(cherry picked from commit 64b3ad5c763ed3d2a9978fce06c0ccbdd085fe35)

; Skip commit c3c27e50a51208df384463aed2aa3d26dea6c319

; Skip commit 3b59b8fa9706f8e6b0d3cf194bcf9b310bf11ac0

; Skip commit d707688f33966a6f6e221192dec37a2a844d0549

; Skip commit c1ddf612d592fcaa3fae66b24933e2aab78406f1

; Improve documentation of 2 symbol-related functions

* src/data.c (Fremove_pos_from_symbol, Fbare_symbol): Doc fixes.
(Bug#75290)

(cherry picked from commit 9065423e709de50509f45d08cc6697d9bb95fc93)

; Skip commit 41fd823d95292d9927325af50673f60bd6d5402d

Fix redisplay of tab bar when its text properties change

* src/xdisp.c (update_tab_bar): Use 'equal-including-properties'
to compare previous with the current tab-bar items.  (Bug#76760)

(cherry picked from commit bf027eb6ff267162c116006703698668794d37cc)

Fix some widgets in customize-dirlocals

* lisp/cus-edit.el (custom-dynamic-cons-value-create): Make sure
to eval the keymap property.  (Bug#76756)

(cherry picked from commit 93ac2cb742f6fb90a36d758617cecb36c3d33e46)

; * doc/emacs/maintaining.texi (Managing Projects): Fix wording.

(cherry picked from commit 2a8cf3ca5f91036c9731ab3b062426a56b1d8195)

Add new user option to exclude projects from being remembered

* lisp/progmodes/project.el (project-list-exclude): Add new user
option to exclude projects from being remembered.
(project-remember-project): Consider the user option above.
(project-switch-project): Use 'project-remember-project' instead.
* doc/emacs/maintaining.texi (Managing Projects): Mention the new user option.
* etc/NEWS: Announce the change.  (Bug#76587)

(cherry picked from commit 6aa60038ee999d25184a639ce0ac76b614e3afb6)

Rewrite cl--parsing-keywords using backtick

* lisp/emacs-lisp/cl-seq.el (cl--parsing-keywords): Rewrite using
backtick.

(cherry picked from commit 4b5cc0bfc6d25ff4b7cd16c840e325e9fada4593)

Remove more redundant 'cl-' prefixes

* lisp/emacs-lisp/cl-seq.el (cl-substitute-if, cl-substitute-if-not)
(cl-count, cl-sort): Remove more redundant 'cl-' prefixes from
arguments and let-bound variables.

(cherry picked from commit af44c7630cafba832a8b7c3b302dd0b16c4f271c)

New user option checkdoc-arguments-missing-flag

* lisp/emacs-lisp/checkdoc.el
(checkdoc-arguments-missing-flag): New user option.
(checkdoc-this-string-valid-engine): Use above new option.
(checkdoc--argument-missing-flag): Make into obsolete variable alias for
above new option.

(cherry picked from commit 679966b5a091106d37a2e2e769d9e87f3fb92a63)

Add more tests for cl-seq.el

* test/lisp/emacs-lisp/cl-seq-tests.el (cl--oddp-safe)
(cl-subst-if-test, cl-subst-if-not-test, cl-nsubst-test)
(cl-nsubst-if-test, cl-nsubst-if-not-test, cl-sublis-test)
(cl-nsublis-test, cl-tree-equal-test): New tests.

(cherry picked from commit fac9097b16310cf7af058ef5ff26c86697b24a32)

(pp-fill): Fix bug#76715

* lisp/emacs-lisp/pp.el (pp-fill): Don't break before `.` within symbols.
* test/lisp/emacs-lisp/pp-tests.el (pp-tests--bug76715): New test.

(cherry picked from commit 25de262bd95b587beb757e1a82828ad4fffbf168)

Improve treesit settings for java-ts-mode (bug#73404, bug#76493)

* lisp/progmodes/java-ts-mode.el (java-ts-mode):
Add the 'list' thing to 'treesit-thing-settings'.
Set 'treesit-outline-predicate'.

(cherry picked from commit 70d0da3fe0b73f7a8757a155feb5efa52e2a1c3a)

Improve treesit settings for typescript/tsx-ts-mode (bug#73404)

* lisp/progmodes/typescript-ts-mode.el
(typescript-ts-mode--font-lock-settings): Add @font-lock-type-face
for 'internal_module' with 'identifier'.
(typescript-ts-mode--defun-type-regexp): New variable with
"internal_module" and "interface_declaration".
(typescript-ts-mode--defun-name): New function that uses
'js--treesit-defun-name' and adds "internal_module" and
"interface_declaration".
(typescript-ts-mode--simple-imenu-settings): New variable
like in 'js-ts-mode' with "Namespace" and "Interface" sections.
(typescript-ts-mode--outline-predicate): New variable.
(typescript-ts-base-mode): Set treesit-defun-type-regexp to
typescript-ts-mode--defun-type-regexp, treesit-defun-name-function
to typescript-ts-mode--defun-name, treesit-simple-imenu-settings
to typescript-ts-mode--simple-imenu-settings,
treesit-outline-predicate to typescript-ts-mode--outline-predicate.
Use js--regexp-opt-symbol for treesit-thing-settings.
(tsx-ts-mode): For 'sentence' thing use the same nodes as
js--treesit-sentence-nodes.  Use js--regexp-opt-symbol for
treesit-thing-settings.

* lisp/progmodes/js.el (js--treesit-sentence-nodes): Add
"jsx_opening_element" and "jsx_closing_element" like in html.

* lisp/progmodes/c-ts-mode.el (c-ts-mode--outline-predicate): Add
outline headings for C++ "namespace_definition" and "class_specifier".

(cherry picked from commit 68def672e61a5b25ec5bdee69493c09d79632ce2)

; Skip commit 42a4c847e286957bef579390e9cb9854699dacfd

; * java/AndroidManifest.xml.in (Version-code): Update for Emacs 31.

(cherry picked from commit 98ca8b46e692998c13dac19c3806d9d4cf501409)

Permit executing programs with >1024 args on Android

* src/android.c (MAXARGS): Delete enumerator.
(android_rewrite_spawn_argv): Don't mandate a maximum number of
arguments.

(cherry picked from commit 3d7cc22d25cef88464f18e5cc69eb696f8c8a4a2)

; * src/nsterm.m (syms_of_nsterm): Fix typo in comment.

(cherry picked from commit 336cc32f2aa83a06dbbde42463a99e2f5c94f8ff)

Move java/incrementing-version-code to AndroidManifest.xml.in

* admin/admin.el (admin-android-version-code-regexp): New
variable.
(set-version): Modify AndroidManifest.xml.in instead.

* java/AndroidManifest.xml.in (Version-code): Define version
code.

* java/incrementing-version-code: Delete file.

(cherry picked from commit 121371a706491fde8c06d95b13c16703d53f6fa3)

Provide an Android version code derived from the Emacs version

The version code is intended to be an integer that increments
for each Android package release
(https://developer.android.com/studio/publish/versioning#versioningsettings).

If we keep this updated under version control, then F-Droid (a
third-party Android package repository), can watch for that, and
use it to automatically build Emacs packages for Android each
time a new Emacs release is tagged
(https://f-droid.org/en/docs/Build_Metadata_Reference/#UpdateCheckData).

* admin/admin.el (set-version): Update version code in
java/incrementing-version-code
* java/incrementing-version-code: New file containing an Android
version code corresponding to the current Emacs version.
(bug#75809)

(cherry picked from commit 8099dc6e3aeae5bfd8a4115deed88022500362e1)

Make byte-compile-cond-use-jump-table obsolete

This user option was introduced in 2017, with the rationale:

    "This is a workaround for when `byte-compile-cond-jump-table'
    accidentally generates wrong code (hasn't happened so far in my
    tests), and should be removed once we're sure there are no issues
    with it."  https://lists.gnu.org/r/emacs-devel/2017-02/msg00223.html

There hasn't been any bugs in this area within the last 6 years, and the
few we did see before that were quickly resolved.  Let's declare this
variable obsolete now, while keeping its behavior when set to nil.  We
can always revert the obsoletion if it turns out to be needed after all.

* lisp/emacs-lisp/bytecomp.el
(byte-compile-cond-use-jump-table): Declare obsolete.

(cherry picked from commit 7ba62284137ba162df16f55c75bda4d56da7dfe7)

Clean up 'cl-' prefixes for local variables

The 'cl-' prefixes used for let-bound variables and argument names is a
holdover from the dynbind days.  They are no longer necessary, and make
the code hard to read.  This was partially cleaned up in the past; let's
finish the job now.

* lisp/emacs-lisp/cl-extra.el (cl--mapcar-many, cl-map, cl-maplist)
(cl-mapc, cl-mapl, cl-mapcan, cl-mapcon, cl-some, cl-every, cl-notany)
(cl-notevery, cl--map-keymap-recursively, cl--map-intervals)
(cl--map-overlays):
* lisp/emacs-lisp/cl-lib.el (cl-mapcar, cl-adjoin, cl-subst)
(cl--do-subst):
* lisp/emacs-lisp/cl-macs.el (cl--parse-loop-clause):
* lisp/emacs-lisp/cl-seq.el (cl-reduce, cl-fill, cl-replace, cl-remove)
(cl-remove-if, cl-remove-if-not, cl-delete, cl-delete-if)
(cl-delete-if-not, cl-remove-duplicates, cl-delete-duplicates)
(cl--delete-duplicates, cl-substitute, cl-substitute-if)
(cl-substitute-if-not, cl-nsubstitute, cl-nsubstitute-if)
(cl-nsubstitute-if-not, cl-find, cl-find-if, cl-find-if-not)
(cl-position, cl--position, cl-position-if, cl-position-if-not)
(cl-count, cl-count-if, cl-count-if-not, cl-mismatch, cl-search)
(cl-sort, cl-stable-sort, cl-merge, cl-member, cl-member-if)
(cl-member-if-not, cl--adjoin, cl-assoc, cl-assoc-if, cl-assoc-if-not)
(cl-rassoc, cl-rassoc-if, cl-rassoc-if-not, cl-union, cl-nunion)
(cl-intersection, cl-nintersection, cl-set-difference)
(cl-nset-difference, cl-set-exclusive-or, cl-nset-exclusive-or)
(cl-subsetp, cl-subst-if, cl-subst-if-not, cl-nsubst, cl-nsubst-if)
(cl-nsubst-if-not, cl-sublis, cl--sublis-rec, cl-nsublis)
(cl--nsublis-rec, cl-tree-equal, cl--tree-equal-rec): Clean up 'cl-'
prefixes for let-bound variables and arguments.

(cherry picked from commit 8c8ff13e7bdaab1446873d3401fe1a53a827198d)

; * etc/symbol-releases.eld: Add cl-defun.

(cherry picked from commit 22308762658b3dae69731d1f9a30e97c24d75f89)

; Skip commit 7678047a8ad4e6fbf84a64b1cf56b504f1cdaa38

Avoid rare warning when byte-compiling cl-loaddefs.el

* lisp/emacs-lisp/cl-extra.el: Add autoloaded declare-function to avoid
rare byte-compilation warning.
Problem reported by Eli Zaretskii <eliz@gnu.org>.

(cherry picked from commit c18089a6585b319786894262ae0a9034dfbcbcd4)

Make Emacs buildable with -std=c11.

With -std=c11, GCC doesn't recognize 'asm' as a keyword, see
https://gcc.gnu.org/onlinedocs/gcc/Extended-Asm.html and
https://gcc.gnu.org/onlinedocs/gcc/Alternate-Keywords.html.  Use __asm__
instead.

* src/lisp.h (flush_stack_call_func): Use __asm__ instead of asm.

(cherry picked from commit e978737f57ef8447bba5796dd945ac185fcadffa)

; Skip commit 4be2574851b96f6adff6b621a159c1afa710b1ee

Add ns-click-through option to control activation click handling

* src/nsterm.m (acceptsFirstMouse):
Use ns_click_through variable instead of always returning YES.
(syms_of_nsterm): Define ns-click-through variable.

* lisp/cus-start.el: Add customization definition for ns-click-through.

* etc/NEWS: Document the new option.

(cherry picked from commit 3a8ce5ac9c4652eb87bf0bce835d82083061a28b)

; Skip commit 59fcb2aa1b2a827f1822b3bc2c9024f5a47338e7

; Improve documentation of 'shortdoc'

* lisp/emacs-lisp/shortdoc.el (shortdoc-display-group): Fix doc
string and wording of prompt.  (Bug#76723)

(cherry picked from commit 0383937a7014934e7a9b3cf0c33c2d1f46e83901)

; * lisp/dabbrev.el (dabbrev-expansions): Fix infloop.

sh-script.el: Fix fixing Flymake diagnostics from other buffer

* lisp/progmodes/sh-script.el (sh-shellcheck-fix):

dabbrev: limit work, not results

Drop 'help-window-keep-selected'

Fix 'etc/DOC' for a few functions/variables

* src/term.c (Ftty_frame_at):
* src/menu.c (syms_of_menu) <x-popup-menu-function>:
* src/dispnew.c (Fredisplay): Fix "doc:".  The extra blank was
preventing 'make-docfile' from recognizing the functions and
variables and extracting their documentation to 'etc/DOC'.
(Bug#76722)

(cherry picked from commit a382bfdfa4b8692bcb971eec1516e37a58b3fc2f)

; * src/nsterm.m (ns_draw_stretch_glyph_string): One more spelling fix.

(cherry picked from commit 25e2656dd9246672353c5f635b365005cb0e0546)

; Fix style and language in src/nsterm.m

* src/nsterm.m (ns_maybe_dumpglyphs_background)
(ns_draw_stretch_glyph_string): Fix coding style.  Use American
English spelling.

(cherry picked from commit cd0a8c00a7dbb5a3bff653404a9f970b37c7db78)

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)