; Skip commit 85ef06392a07e2405dd03c7a1efe76348e001d19

; Skip commit 2435749efa5b082b520bb1e40db3d3c839023c04

Lift widget functions from C to Lisp

In the mid-1990s, these functions were moved from Lisp to C to
"improve performance".  However, Moore's Law, and perhaps other
improvements too, has made this rationale irrelevant.

On this machine, with --native-compilation=no, I observed only a
slight ~4% performance difference.  For example, displaying a buffer
full of widgets (e.g., 'M-x customize RET browse-url RET') takes 4ms
here, meaning the performance gap is under 0.1ms.  Even on less
powerful machines, this difference would remain imperceptible.  Given
this, let's lift these functions back to to Lisp, which offers the
usual benefits.

We already have solid test coverage, but let's add a more focused test
for 'widget-get' and 'widget-put' to be thorough.

* lisp/wid-edit.el (widget-put, widget-get, widget-apply): Move to
Lisp from...
* src/fns.c (Fwidget_put, Fwidget_get, Fwidget_apply): ...here.
(syms_of_fns): Remove defsubrs for the above functions.
* test/lisp/wid-edit-tests.el
(widget-test-editable-field-widget-get/put): New test.

(cherry picked from commit 8b659313b83c82cfe09af1638289fccdfc9af23d)

Fix recent change in diff-no-select

* lisp/vc/diff.el (diff-no-select): Keep initial default directory
in *Diff* buffer.

(cherry picked from commit 0af5c5749988180c6a2f7c50b7e1c8163b4c5bf1)

; Adapt last change

(cherry picked from commit 92a8d24e4948dd9e7fa8bdbadac48f9eed19fa49)

; Skip commit c8cec840d7972d5cca0c255a19fd521703c7628c

* lisp/proced.el (proced-<): Check, that NUM1 and NUM2 are numbers.

(Bug#76549)

(cherry picked from commit 5247da2e3cd2705278bb68e0c5313a6972a6d43c)

Fix the values and documentation of 'printable-chars' table

* src/character.c (syms_of_character) <printable-chars>: Doc fix.

* lisp/international/characters.el (printable-chars): Fix values
for non-ASCII characters.

* doc/lispref/nonascii.texi (Character Properties): Add
cross-reference for what is a printable character.
* doc/lispref/display.texi (Usual Display):
* doc/lispref/searching.texi (Char Classes): Add indexing.
(Bug#76611)

(cherry picked from commit 68a37760dec83a8126b03bcacc60a96644a6831f)

Adapt process-tests to Android

* src/android.c (android_init_thread_events)
(android_run_select_thread): Guarantee that the select thread is
initialized before returning.

* test/src/process-tests.el
(process-tests/fd-setsize-no-crash/make-process)
(process-tests/fd-setsize-no-crash/make-pipe-process)
(process-tests/fd-setsize-no-crash/make-network-process)
(process-tests/fd-setsize-no-crash/make-serial-process): Skip on
Android.

(cherry picked from commit 18c8c44bef9b85adf3cff65f08b7f6a8c59687db)

Fix 'internal--c-header-file-path'

* lisp/subr.el (internal--c-header-file-path): Fix for MS-Windows:
don't prepend the (usually non-existent) "/usr/include", and run
each directory through 'expand-file-name' to remove the many ".."
elements and mirror any backslashes.  Invoke "clang" if "gcc" is
not available or is actually clang.

* test/lisp/subr-tests.el
(subr-tests-internal--c-header-file-path): Fix for MS-Windows:
test the path by looking for stdio.h, and expand all directory
names to compare to expected results.

(cherry picked from commit a04e8812ee0dfb7f2984d0b57b380cf15c73567c)

; Skip commit 387dcb1be88168f2683af52041b4f5a6e3bde146

Fully support Lisp threads on Android

* src/android.c (struct android_thread_event_queue): New
structure.  Move global pselect arguments, mutexes, and
semaphores, and pipes here.
(struct android_event_queue) <select_mutex, select_thread>:
Remove to the above-named struct.
(android_init_thread_events, android_finalize_thread_events)
(android_get_poll_thread): New functions.
(android_run_select_thread): Accept a set of mutexes and
thread-local data as the first argument, and operate with them
rather than globals.
(android_handle_sigusr1): Rename to
`android_handle_poll_signal'.  Set thread-specific cancellation
indicator.
(android_init_events): Properly abort after a fatal condition.
Enable interruptible polling on Android 5.1 and later, not 4.2.
(android_select): Never check for queries here, but in
thread_select, if threads are enabled.  Adapt to per-thread
polling threads and only enable interruptible polling on Android
5.1 and later.
(android_before_select): New function.

* src/android.h (android_before_select): New declaration.

* src/thread.c (thread_select): Call `android_before_select'
before the global lock is released.

(cherry picked from commit 8df582a46836e312ef3bfc36c8038b5f4a2c0d9b)

Recommend secure-hash in md5 docstring

* src/fns.c (Fmd5): Repeat explanation from manual about md5 being
"semi-obsolete", and recommend using secure-hash instead.

(cherry picked from commit 6f5c322f5974786290b1b3e68b5a0685ddec3410)

Improve docstring of add-hook and remove-hook

* lisp/subr.el (add-hook, remove-hook): Remove detail about setting to
nil and talk about functions instead of hooks.  (Bug#72915)

(cherry picked from commit 1352b184f3f7bd1e31ee71ee4b60491dacaf347b)

Fix fns-tests-collate-strings failure with musl

* test/src/fns-tests.el (fns-tests-collate-strings):
Don’t assume "en_XY.UTF-8", or any particular string,
is an invalid locale, as they all seem to be valid in musl.
Instead, simply test that a non-string is invalid.
(Bug#76550)

(cherry picked from commit 62b3d3136fae8830d63f69143b09e99b5173c537)

; (completion-preview-complete): Fix bug#76606

* lisp/completion-preview.el (completion-preview-complete):
Dismiss completion preview before calling ':exit-function'.
This eliminates potential flicker with slow exit functions
and avoids the broken preview update reported in bug#76606.

(cherry picked from commit 840c6824589c9a82deedc5112891d8014d134746)

; Fix indentation in cl.texi example

(cherry picked from commit fa42626a6a8d60c9ab313f39b64c12be32054442)

; Fix my last commit

(cherry picked from commit 7ff806da496619f9109b2075c3ff5b803506d258)

; Fix documentation of 'buffer-text-pixel-size'

* doc/lispref/display.texi (Size of Displayed Text): Fix arguments
of 'buffer-text-pixel-size'.  (Bug#76519)

(cherry picked from commit f88dc0f2f9d28d0988cca54c5b9fc1ba85ce3d7e)

; Minor Android documentation improvements

* doc/emacs/android.texi (Android Startup, Android File System)
(Android Document Providers): Improve phrasing.

(cherry picked from commit 734986349fd460e5c1f65f315e16817320026444)

; Fix up emacs-lisp-mode docstring

* lisp/progmodes/elisp-mode.el (emacs-lisp-mode, lisp-interaction-mode):
Fix up docstring slightly by removing redundant and misplaced word
"Commands", and prefix list with dashes.

(cherry picked from commit a90da8990342c7fc0aa51ae92a0849de346a8d8b)

; Skip commit 58c7acb55543bddf4280e90c219ee5023d4898f9

Fix ert-font-lock macro signatures

* doc/misc/ert.texi (Syntax Highlighting Tests):
* test/lisp/emacs-lisp/ert-font-lock-tests.el
(test-line-comment-p--emacs-lisp, test-line-comment-p--shell-script)
(test-line-comment-p--javascript, test-line-comment-p--python)
(test-line-comment-p--c, test-macro-test--correct-highlighting)
(test-macro-test--docstring, test-macro-test--failing)
(test-macro-test--file, test-macro-test--file-no-asserts)
(test-macro-test--file-failing): Reindent macro calls.
(with-temp-buffer-str-mode): Evaluate macro arguments left-to-right.
(ert-font-lock--wrap-begin-end): Use rx for more robust composition.
(test-line-comment-p--php): Require that php-mode is callable, not
already loaded.

* lisp/emacs-lisp/ert-font-lock.el (ert-font-lock-deftest)
(ert-font-lock-deftest-file): NAME is not followed by an empty list
like in ert-deftest, so the optional DOCSTRING is actually the
second argument.  Adapt calling convention in docstring, and debug,
doc-string, and indent properties accordingly (bug#76372).  Fix
docstring grammar, document MAJOR-MODE, and avoid referring to a
file name as a path.

(cherry picked from commit 02c830ba22b0564f6725cd403beba4accb836061)

Fix a typo in 'window_text_pixel_size'

This typo caused strange mis-behaviors in buffers
with non-ASCII characters.
* src/xdisp.c (window_text_pixel_size): Fix typo.  (Bug#76519)

(cherry picked from commit 0c6b8643aec24935f82c63d43219f26378e3e578)

; Add Rudolf Schlatte to authors.el

* admin/authors.el (authors-aliases): Add Rudolf Schlatte.

(cherry picked from commit 8a8c25eaccd7adee45a291ba97e828528083f4d9)

* doc/misc/efaq.texi (New in Emacs 30): Fix typo.  (Bug#76518)

(cherry picked from commit 94c0ea39a5af6f0979e769fc8a053ac60b561367)

; * etc/images/README (Files): Add an entry for last-page.xpm

(cherry picked from commit 0be5f9115ec8828bcc50389ca30f76fa1ad5f364)

; Reflow some cl-lib docstrings

* lisp/emacs-lisp/cl-macs.el (cl-flet, cl-labels): Reflow docstrings.

(cherry picked from commit 63adf9dcf53ac64585803fe5f9ad0acb107a9f9f)

; Skip commit d63b27a416b1677bfb1e96194ce009f1609b2e10

; * etc/TODO: New section "Make it easier to contribute".

(cherry picked from commit 99253f79703535ab7bd500fc39b33dc0a966333d)

Constant highlighting no longer captures Java annotations

* lisp/progmodes/java-ts-mode.el
(java-ts-mode--fontify-constant): New function.
(java-ts-mode--font-lock-settings): Use it.

(cherry picked from commit 563b6f94511b76266984bc6764ec2a9391448138)

Minor refactoring in admin/admin.el

* admin/admin.el (admin--read-root-directory):
(admin--read-version): New functions.
(add-release-logs, set-version, set-copyright, make-manuals)
(make-manuals-dist, make-news-html-file): Use above new function.

(cherry picked from commit e9c9ed1f46853793cb4b064718c990cc2cd17f59)

Improve wording of lsh docstring

* lisp/subr.el (lsh): Improve wording of docstring.

(cherry picked from commit e15dcb2db5c40e90ea2a21391af5addb9e778779)

; Skip commit ac7f2054b52d5105007b004dd229674e58472f7c

; * admin/make-tarball.txt: Copy edits.

(cherry picked from commit a8b1726487b85aa6822431af1a213e1d15713d93)

; * admin/check-doc-strings: Add note for future development.

(cherry picked from commit 0cc651acddb87180357ab8ff4adcbac8d6174e50)

Don't document deleted xwidget functions

* doc/lispref/display.texi (Xwidgets): Don't document deleted function
xwidget-webkit-execute-script-rv.  Fix name of deleted and then re-added
function xwidget-webkit-title.

(cherry picked from commit 3c9b1c3cd18f42dd0cced43b0f1d4c2df9e5cc2d)

; Improve lsh and ash documented argument names

* doc/lispref/numbers.texi (Bitwise Operations): Improve lsh and
ash argument names.

(cherry picked from commit 9e9b78dda94fb1fe0b68f23fc004f87a94e633b5)

; Skip commit 2db182ce0bd1c4fca0344c81eaebc442c98d3caf

Release Emacs 30.1

* ChangeLog.5: New file.
* Makefile.in (CHANGELOG_HISTORY_INDEX_MAX): Bump.
* etc/HISTORY: Add Emacs 30.1.

(cherry picked from commit 8ac894e2246f25d2a2a97d866b10e6e0b0fede5a)

; Skip commit bcba098505e4f80eef41e4be9726f1f9868223f3

; Skip commit 1cda0967b4d3c815fc610794ad6a8fc2b913a3c5

Use character position for ranges in treesit_sync_visible_region

* src/treesit.c (treesit_sync_visible_region): Use character position
instead of byte position when comparing to ranges, because the
ranges are in character position.

(cherry picked from commit 2dbf7d0b1b26a9676fbdb56a5955f3f24f521cc4)

Add minibuffer action for 'shortdoc'

Improve elisp CAPF sorting

Fix 'lisp-kill-line'

* lisp/emacs-lisp/scope.el: Recognize 'add-to-history'

Make 'completion-preview-sort-function' a defcustom

* lisp/completion-preview.el
(completion-preview-sort-function): Define and document it
as a user option.
* etc/NEWS: Announce.

(cherry picked from commit 8b9194ae03214dd5169bd84f7d83bbe660dd9f90)

* lisp/net/tramp.el (tramp-mode): Set to nil on MS-DOS.

(cherry picked from commit 5447b015a44d411606687999a7a5803d19899f23)

; Recommend not to use -O3 in production builds

* nt/INSTALL:
* INSTALL: Recommend not to use -O3 and -Os in ordinary production
builds.  (Bug#76559)

(cherry picked from commit 75a314dc8a9d82449630631f9c41b26d512bdb87)

; Fix documentation of recent treesit changes

* src/treesit.c (Ftreesit_query_capture)
(Ftreesit_parser_embed_level, Ftreesit_parser_set_embed_level)
(Ftreesit_parser_set_parent_node):
* lisp/treesit.el (treesit-query-range)
(treesit-query-range-by-language, treesit-range-settings)
(treesit-range-rules, treesit--parser-at-level)
(treesit--update-ranges-non-local, treesit--update-ranges-local)
(treesit--update-range-1): Fix wording and typos in doc strings.

* doc/lispref/parsing.texi (Pattern Matching): Fix wording.

(cherry picked from commit 6ed119d3052ffebd20450ec0c7fb3abf863b3a49)

Remove Emacs 23 compat code from ox-publish.el

* lisp/org/ox-publish.el (org-publish-timestamp-filename): Remove
Emacs 23 compat code.

(cherry picked from commit becdfb11a5b13bc773729236763e99e513806451)

Don't use incf/decf in eldoc.el

* lisp/emacs-lisp/eldoc.el (eldoc--invoke-strategy): Don't use incf or
decf.  This is a :core package and supports Emacs 26.3.  (Bug#76604)

(cherry picked from commit 64edd5a5eb832c2ca9f4495c17e880a86179f826)

Add test for apply-partially

* test/lisp/subr-tests.el (subr-test-apply-partially): New test.

(cherry picked from commit 4ea2197f726835951ea55e04b88d212778676da1)

Support alternative range function for tree-sitter range settings

Some embedded parser needs to exclude child nodes from the
range, like markdown-inline.  So I added this keyword that
allows users to customize the range for the embedded parser.
This can also be potentially useful for markdown comments in
rust, for example, because we want to exclude the comment
starters (//) from the embedded markdown parser.

* lisp/treesit.el (treesit-query-range):
(treesit-query-range-by-language): Add new parameter RANGE-FN.
(treesit-range-settings): Add new field RANGE-FN.
(treesit-range-rules): Add new keyword RANGE-FN.
(treesit-range-fn-exclude-children): New function.
(treesit--update-ranges-non-local):
(treesit--update-ranges-local):
(treesit--update-range-1): Support the RANGE-FN field.

(cherry picked from commit 8a3e19f4b39be68c22e056d56adb86397e25a673)

Make treesit-node-at take advantage of the embed-level property

* lisp/treesit.el (treesit-node-at): Select the local parser
with the highest embed-level.

(cherry picked from commit 8a45c2da226e188420956fd6269f72db3f437e38)

Rework range facility in treesit.el to support arbitrary nesting

Make use of the newly added embed-level parser property, we now
iterativeLy create/update embedded parsers at each embed level,
allowing arbitrary levels of nesting.

At the beginning, we start with the primary parser.  We query it
with each range settings, gets some ranges and their
corresponding language. Then we create the first level of
embedded parsers using the ranges and language we got.  This is
one iteration. For the next iteration/level, we start with the
embedded parsers we create/updated in the previous
iteration/level, and query each of them with each of the range
settings, creating/updating the next level of embedded parsers.
And we keep doing this until we don't get more matches from the
queries.

We now also support the :embed keyword in 'treesit-range-rules'
to be a function that returns a language.  This allows major
modes like markdown and org mode to support code blocks of which
the language isn't known ahead of time.

* lisp/treesit.el (treesit-primary-parser): Move to front.
(treesit-query-range-by-language): New function.
(treesit-range-rules): Allow :embed to be a function, update docstring.
(treesit-local-parsers-on): Update docstring.
(treesit--parser-at-level):
(treesit--update-ranges-non-local): New functions.
(treesit--update-ranges-local): Use the new logic, support
:embed being a function.
(treesit--update-range-1): New function, has the meat of
original treesit-update-ranges.
(treesit-update-ranges): Implements the iteration logic using
treesit--update-range-1 to do the actual work.

(cherry picked from commit 1314272bf398e068385572ca16d4dfcd55a48828)

Enable treesit-query-capture to return grouped captures

This is needed for creating embedded parsers for embedded code
blocks of which language cannot be known ahead of time.  E.g.,
markdown and org mode's code block.

* src/treesit.c (Ftreesit_query_capture): Add parameter GROUPED.

(cherry picked from commit 625b2b02a3c9bad6d7abf57ea7f95ece29855906)

Add tree-sitter-parser-embed-level and parent-node

Add parser properties embed-level and parent-node. They'll be
help us implement arbitrarily nested embeded parser, and
navigation across embedded and host parsers, respectively.

* src/treesit.c:
(Ftreesit_parser_embed_level):
(Ftreesit_parser_set_embed_level):
(Ftreesit_parser_parent_node):
(Ftreesit_parser_set_parent_node): New functions.

(cherry picked from commit 30e1508ef2d40e221736cea2c50c64941d7d2f0d)

Don't overwrite non-local exit symbol and data (Bug#65796).

The previous approach would incorrectly invalidate the returned module
values if another non-local exit occurred while dealing with a non-local
exit.  See Bug#65796.  Instead, allocate the values from the usual
environment storage, and return statically-allocated objects if that
fails.

* src/emacs-module.c (struct emacs_env_private): Turn non-local exit
symbol and data into normal Lisp objects.
(initialize_environment): Initialize them.
(mark_module_environment): Prevent them from being garbage-collected.
(module_signal_or_throw, module_non_local_exit_signal_1)
(module_non_local_exit_throw_1): Adapt uses.
(value_to_lisp): No longer scan for them with module assertions enabled.
(module_out_of_memory_signal, module_out_of_memory_data): New
statically-allocated module values to return in case of allocation
failure.
(syms_of_module): Initialize them.
(module_non_local_exit_get): Allocate module values normally.  If that
fails, return statically-allocated values.

* doc/lispref/internals.texi (Module Nonlocal): Document new behavior.

(cherry picked from commit 32da093e524d5e28945557701f7c50d7c4a898cd)

Recommend 'tab-bar-history-mode' over 'winner-mode'

* lisp/winner.el (winner-mode):
* lisp/tab-bar.el (tab-bar-mode): Update the docstring to
suggest 'tab-bar-history-mode' instead of 'winner-mode' when
using 'tab-bar-mode' instead.  (Bug#76439)

(cherry picked from commit ea715b0183f6a19d491cad36eb18c2c9cf0f0dd3)

Fix CSS indentation, added support for CSS 'color_value'.

* lisp/textmodes/mhtml-ts-mode.el
(mhtml-ts-mode--colorize-css-value): Added 'color_value' node, refactoring.
(mhtml-ts-mode--treesit-font-lock-settings): Added 'color_value' node.
(mhtml-ts-mode--treesit-indent-rules): Removed the old comment and
fixed the CSS indentation rule (bug#76597).

(cherry picked from commit 5f1a019d26f475f35fe8efc583749321affb6060)

Document :continue-only in use-package Info manual

* doc/misc/use-package.texi (Binding to repeat-maps): Document
:continue-only (bug#74140).

(cherry picked from commit 3e1d7e0334d884a17887bd1b9ee6a9b9e3026a30)

Improve 'treesit-outline-search'

* lisp/treesit.el (treesit-outline-search): Add optional arg
'recursive' to avoid infinite recursion when it gets stuck.

* lisp/textmodes/markdown-ts-mode.el (markdown-ts-mode):
Set buffer-local 'treesit-outline-predicate' to "section".

(cherry picked from commit dc1637fef7c658b6d865f3e71f3b95686e56542d)

Prevent a todo-mode test from running with 'make check'

* test/lisp/calendar/todo-mode-tests.el
(todo-test-add-and-delete-file): Tag this test as unstable, since
it has been reported to fail unreproducibly (bug#58473) or
reproducibly only on the ZFS filesystem (bug#76381) and the causes
are still unknown.

(cherry picked from commit 4cc5e4ec0bc6c11a19ca0244f60813619acd718d)

Prevent a todo-mode test from running with 'make check'

* test/lisp/calendar/todo-mode-tests.el
(todo-test-add-and-delete-file): Tag this test as unstable, since
it has been reported to fail unreproducibly (bug#58473) or
reproducibly only on the ZFS filesystem (bug#76381) and the causes
are still unknown.

(cherry picked from commit 13423cd0197fa69bd6246f0720471b265c328596)

Prevent a todo-mode test from running with 'make check'

* test/lisp/calendar/todo-mode-tests.el
(todo-test-add-and-delete-file): Tag this test as unstable, since
it has been reported to fail unreproducibly (bug#58473) or
reproducibly only on the ZFS filesystem (bug#76381) and the causes
are still unknown.

(cherry picked from commit f5f0ba38e0e22c9017d1c8482fbe4432a87ed8af)

Fix drag-and-drop treatment of reused tooltip frames

* src/androidfns.c (Fx_show_tip): Set `tip_window' to that of
any reused tooltip frame.

* src/haikufns.c (unwind_create_frame): Return whether the frame
was destroyed, as on X.
(unwind_create_tip_frame, haiku_create_frame, Fx_show_tip):
Synchronize with X.
(do_unwind_create_frame): New function.
(tip_window): Remove unused variable.

* src/nsfns.m (tip_window, unwind_create_tip_frame): Remove
unused variable `tip_window'.

* src/pgtkfns.c (pgtk_create_tip_frame): Rename to
pgtk_create_tip_frame.
(Fx_show_tip): Adjust accordingly.  Set `tip_window' to that of
any reused tooltip frame.

* src/w32fns.c (Fx_show_tip):

* src/xfns.c (Fx_show_tip): Set `tip_window' to that of any
reused tooltip frame.

(cherry picked from commit a4a458ffa4aaeb988ff4b6e6087c44dfdaf40a0b)

Add :continue-only directive to bind-keys and use-package

* lisp/bind-key.el (bind-keys-form): Add :continue-only binding.
Fix indentation.

* lisp/use-package/use-package-bind-key.el
(use-package-normalize-binder): Add check for :continue-only.

* test/lisp/repeat-tests.el (repeat-tests-bind-keys):
Enable (and correct) test for :continue-only (bug#74140).

(cherry picked from commit 85a9b916db126add5a5e2bf4b2b9531ab998cad4)

* src/dispnew.c (rect_intersect): Fix a typo (bug#76592)

(cherry picked from commit 3de9994b9e7acf2a05e6b661a7cd440b7cb0365b)

; Whitespace fixes to silence git hooks

(cherry picked from commit 8c165834913bb0dca214acc4b82ba1d9d4ac0a82)

(define-ibuffer-op): Minor tweak to Shipmints's patch

* lisp/ibuf-macs.el (define-ibuffer-op): Evaluate `(active-)opstring`
args when defining the operation rather than every time the operation
is used.  Move the `:autoload-end` marker back to the level of `progn`.

(cherry picked from commit 5815bd52279fdedc752f9f92ace86f8243fbd604)

Improve 'define-ibuffer-op' macro (bug#76222)

* lisp/ibuf-macs.el (define-ibuffer-op):
Change defun to defalias and place it before the macro-local lets.
* lisp/ibuffer.el:
(ibuffer-do-toggle-lock): Remove declare-function.
(ibuffer-do-toggle-read-only): Remove declare-function.
(ibuffer-do-save): Remove declare-function.
(ibuffer-do-delete): Remove declare-function.
(ibuffer-do-toggle-modified): Remove declare-function.
(ibuffer-do-kill-on-deletion-marks): Remove declare-function.

(cherry picked from commit 5d75c6e44da9f27d28ff60d5dee308f2247a1cf5)

; * test/infra/android/test-controller.el: Fix typos.

(cherry picked from commit 7ae069b676a19d9a477d629403e2ff236a5303af)

; New function for executing Android tests in batch mode

* test/infra/android/test-controller.el
(ats-execute-tests-batch): New function.

(cherry picked from commit 67b444e2907da1a27fc2db64aae9b4dcf299f2d9)

Port Eshell tests to Android

* test/infra/android/test-controller.el (ats-run-test): Run
tests in a temp buffer.

* test/lisp/eshell/em-alias-tests.el (ert, em-alias)
(eshell-tests-helpers):

* test/lisp/eshell/em-basic-tests.el (em-basic)
(eshell-tests-helpers):

* test/lisp/eshell/em-cmpl-tests.el (em-unix)
(eshell-tests-helpers):

* test/lisp/eshell/em-dirs-tests.el (em-dirs)
(eshell-tests-helpers):

* test/lisp/eshell/em-extpipe-tests.el (ert-x)
(eshell-tests-helpers):

* test/lisp/eshell/em-glob-tests.el (ert, eshell-tests-helpers):

* test/lisp/eshell/em-hist-tests.el (eshell)
(eshell-tests-helpers):

* test/lisp/eshell/em-pred-tests.el (em-pred)
(eshell-tests-helpers):

* test/lisp/eshell/em-prompt-tests.el (em-prompt)
(eshell-tests-helpers):

* test/lisp/eshell/em-script-tests.el (em-script)
(eshell-tests-helpers):

* test/lisp/eshell/em-unix-tests.el (ert-x)
(eshell-tests-helpers):

* test/lisp/eshell/esh-arg-tests.el (eshell)
(eshell-tests-helpers):

* test/lisp/eshell/esh-cmd-tests.el (eshell)
(eshell-tests-helpers):

* test/lisp/eshell/esh-ext-tests.el (eshell)
(eshell-tests-helpers):

* test/lisp/eshell/esh-io-tests.el (eshell)
(eshell-tests-helpers):

* test/lisp/eshell/esh-mode-tests.el (em-prompt)
(eshell-tests-helpers):

* test/lisp/eshell/esh-proc-tests.el (em-prompt)
(eshell-tests-helpers):

* test/lisp/eshell/esh-util-tests.el (esh-util)
(eshell-tests-helpers):

* test/lisp/eshell/esh-var-tests.el (eshell)
(eshell-tests-helpers):

* test/lisp/eshell/eshell-tests.el (esh-mode)
(eshell-tests-helpers): Load `eshell-tests-helpers' from the
resource directory.

* test/lisp/eshell/resources/eshell-tests-helpers.el: Move from
`test/lisp/eshell'.

(cherry picked from commit 3e496fc31746517440285c2cd9f2b4a09c227d7b)

Avoid display bugs after editable-field widgets

* lisp/wid-edit.el (widget-specify-button): Don't add an
invisible space before the button to avoid bugs that surface
with the widget-field face.  The Widget library is not
the one that puts a :box attribute for the button face, and we
can't control what library users put after editable-field
widgets.

(widget-specify-field): Rather, add the invisible space here,
after the newline.  That way, we protect whatever comes after
the editable-field widget.  (Bug#51550)

(cherry picked from commit 86dd455e9c7402737e2c0c45190fabbf1d3ee8c1)

New macro 'case'

; * lisp/completion-preview.el: Add some commentary.

Clarify the relation of Completion Preview mode with
'completion-at-point' and in-buffer completion interfaces.

(lisp-delete-backward): Fix handling of closing string quote

Add 'help-echo' hint to completion preview

* lisp/completion-preview.el
(completion-preview--propertize-for-mouse): New function.
* lisp/completion-preview.el (completion-preview--update)
(completion-preview--show)
(completion-preview-partial-insert)
(completion-preview-complete)
(completion-preview-next-candidate): Use it to propertize
completion preview text with mouse-related properties,
including a new 'help-echo' hint.

Simplify 'completion-preview-active-mode' command tagging

* lisp/completion-preview.el (completion-preview-insert)
(completion-preview-insert-word)
(completion-preview-insert-sexp)
(completion-preview-complete)
(completion-preview-prev-candidate)
(completion-preview-next-candidate): Use 'interactive' to
associate command with 'completion-preview-active-mode'
instead of using a bespoke 'completion-predicate' property.
(completion-preview-active-p): Declare obsolete.

scope.el: Improve cl-loop analysis

Avoid format-mode-line in eglot-mode-line-format

; Skip commit ea12982ebedd89529c0265dec117db88e7e9ca40

Make define-global-minor-mode alias obsolete

* lisp/emacs-lisp/easy-mmode.el (define-global-minor-mode): Make alias
for old name obsolete, just in time for its 20th anniversary.
* test/lisp/emacs-lisp/lisp-mode-tests.el (test-font-lock-keywords):
* lisp/progmodes/subword.el (global-subword-mode)
(global-superword-mode): Don't use above obsolete name.
* lisp/emacs-lisp/lisp-mode.el (lisp-imenu-generic-expression)
(lisp-fdefs): Remove syntax highlighting for obsolete name.
* lisp/emacs-lisp/loaddefs-gen.el (loaddefs-generate--make-autoload):
Add comment mentioning the obsolete status of above alias.
* doc/lispref/loading.texi (Autoload): Don't document obsolete name.

(cherry picked from commit b4d1061b82a6accedc14770669f701945b209813)

; Cleanup sexp things in 'lua-ts-mode'

* lisp/progmodes/lua-ts-mode.el (lua-ts-mode): Remove some
nonsensical entries from 'treesit-thing-settings'.
* test/lisp/progmodes/lua-ts-mode-resources/movement.erts:
Add missing tests for 'backward-sexp'.  (Bug#76534)

(cherry picked from commit 8bc933b64e0582def4c19b4cc633eaabdff625ce)

Don't enable minor modes in diff-add-log-current-defuns

* lisp/vc/diff-mode.el (diff-add-log-current-defuns): Don't run mode
hooks when enabling major mode hooks.  That fails if, for example,
paredit-mode is on emacs-lisp-mode-hook and it signaled due to
unbalanced parens.

(cherry picked from commit 539772135222755255a3c8ca0cdda73dc4d742b2)

Adapt a number of regression tests to Android

* test/infra/android/test-controller.el (ats-run-test): Strip
text properties from value string.  Inhibit text conversion.

* test/lisp/emacs-lisp/find-func-tests.el
(find-func-tests--locate-symbols):

* test/lisp/emacs-lisp/rmc-tests.el
(test-rmc--add-key-description)
(test-rmc--add-key-description/with-attributes)
(test-rmc--add-key-description/non-graphical-display)
(test-read-multiple-choice, test-read-multiple-choice-help):
Skip on Android in some wise or another.

(cherry picked from commit 2938afab3685f29c80d67f179ce8a935f6c27921)

; Skip commit ecde11a83cfcfbb7c5ff1a7244464f53a7c68687

; Improve Android testing facilities

* test/infra/android/test-controller.el (ats-eval): Don't block
other processes.
(ats-run-test): Bind ert-remote-temporary-file-directory to nil
and always print messages into the output buffer.
(ats-upload-all-tests): New function.
(ats-run-all-tests): New argument SELECTOR.  Only execute
already uploaded tests.

(cherry picked from commit c2804f928097ddea4826b232e310417320bb5ce0)

Enable auto-revert-tests to pass on Android

* lisp/emacs-lisp/ert-x.el
(ert-remote-temporary-file-directory): Define to null-device on
Android.

* test/lisp/autorevert-tests.el
(auto-revert-test02-auto-revert-deleted-file): Provide for
situations where the watch descriptor is recreated by the
polling timer after a file notification is received.

(cherry picked from commit c5853892c58be8e1c543177967850dceb1f4bcbc)

Guarantee delivery of inotify special events

* src/inotify.c (inotifyevent_to_event): Always match events
that are not encompassed by IN_ALL_EVENTS and which the
documentation implies are always delivered to callbacks.

* test/src/inotify-tests.el (inotify-file-watch-stop-delivery):
New test.

(cherry picked from commit 928dc34e05fc04a9b8394df477beca2ef6d9fd1b)

; Prefer incf/decf in image-dired

* lisp/image/image-dired-dired.el (image-dired-mark-tagged-files):
* lisp/image/image-dired.el (image-dired-gallery-generate):
Prefer incf/decf.

(cherry picked from commit 68f9a7aac1f5b9606ca6245e1dd74d09087752d4)

; Skip commit 7fe90ca77d0c21165cb9d98d5c42d6b6c6275ef3

; Add missing require to wdired.el

(cherry picked from commit dfcfb9792cfa9dacb890ab7e5b63e3adbe1cc6c0)

Prefer incf to cl-incf in remaining files

* admin/syncdoc-type-hierarchy.el (syncdoc-make-type-table):
* admin/unidata/unidata-gen.el (unidata-gen-table-word-list):
* lisp/arc-mode.el (archive--summarize-descs):
* lisp/auth-source.el (auth-source-forget+):
* lisp/battery.el (battery-linux-proc-acpi, battery-linux-sysfs):
* lisp/calendar/parse-time.el (parse-time-tokenize):
* lisp/calendar/time-date.el (decoded-time-add)
(decoded-time--alter-month, decoded-time--alter-day):
* lisp/cedet/semantic/ede-grammar.el (project-compile-target):
* lisp/dired.el (dired-insert-set-properties):
* lisp/edmacro.el (edmacro-format-keys):
* lisp/epa-file.el (epa-file--replace-text):
* lisp/eshell/esh-cmd.el (eshell-for-iterate):
* lisp/eshell/esh-io.el (eshell-create-handles)
(eshell-duplicate-handles, eshell-protect-handles)
(eshell-copy-output-handle, eshell-buffered-print):
* lisp/font-lock.el (font-lock-fontify-keywords-region):
* lisp/help-fns.el:
* lisp/ibuf-ext.el (ibuffer-generate-filter-groups)
(ibuffer-insert-filter-group-before):
* lisp/ibuffer.el (ibuffer-confirm-operation-on, ibuffer-map-lines):
* lisp/image/image-dired-external.el (image-dired-thumb-queue-run):
* lisp/image/image-dired.el (image-dired-display-thumbs)
(image-dired-line-up):
* lisp/imenu.el (imenu--split):
* lisp/info-xref.el (info-xref-check-node, info-xref-check-all-custom):
* lisp/international/quail.el (quail-insert-decode-map):
* lisp/international/rfc1843.el (rfc1843-decode):
* lisp/mail/ietf-drums-date.el (ietf-drums-date--tokenize-string):
* lisp/mail/ietf-drums.el (ietf-drums-token-to-list):
* lisp/mail/rfc2047.el (rfc2047-qp-or-base64):
* lisp/mail/rfc2231.el (rfc2231-encode-string):
* lisp/mail/yenc.el (yenc-decode-region):
* lisp/mh-e/mh-e.el (mh-xargs):
* lisp/mh-e/mh-folder.el (mh-recenter):
* lisp/mh-e/mh-mime.el (mh-mime-part-index):
* lisp/mh-e/mh-search.el (mh-search):
* lisp/mh-e/mh-thread.el (mh-thread-current-indentation-level):
* lisp/mh-e/mh-utils.el (mh-sub-folders-parse):
* lisp/minibuffer.el (minibuffer--sort-by-position)
(completion-pcm--pattern-point-idx):
* lisp/mpc.el (mpc-cmd-find, mpc-cmd-move, mpc-select-extend)
(mpc-songs-refresh, mpc-songpointer-score)
(mpc-songpointer-refresh-hairy):
* lisp/msb.el (msb--mode-menu-cond, msb--most-recently-used-menu)
(msb--split-menus-2, msb--make-keymap-menu):
* lisp/net/pop3.el (pop3-send-streaming-command):
* lisp/net/puny.el
(puny-encode-complex, puny-decode-string-internal):
* lisp/net/shr-color.el (shr-color-hue-to-rgb):
* lisp/net/soap-client.el (soap-encode-xs-complex-type)
(soap-decode-xs-complex-type, soap-resolve-references-for-operation)
(soap-wsdl-resolve-references):
* lisp/play/5x5.el (5x5-made-move, 5x5-down, 5x5-right):
* lisp/play/decipher.el (key, decipher-mode-syntax-table)
(decipher-add-undo, decipher-complete-alphabet, decipher--analyze)
(decipher--digram-counts, decipher--digram-total):
* lisp/play/hanoi.el (hanoi-move-ring):
* lisp/play/snake.el (snake-reset-game, snake-update-game):
* lisp/profiler.el (profiler-calltree-depth, profiler-calltree-build-1)
(profiler-calltree-build-unified)
(profiler-calltree-compute-percentages):
* lisp/registry.el (registry-reindex):
* lisp/simple.el (completion-list-candidate-at-point):
* lisp/strokes.el (strokes-xpm-to-compressed-string):
* lisp/term.el (term-emulate-terminal, term--handle-colors-list):
* lisp/treesit.el (treesit-node-index, treesit-indent-region):
* lisp/url/url-cookie.el (url-cookie-parse-file-netscape):
* lisp/url/url-dav.el (url-dav-file-name-completion):
* lisp/url/url-queue.el (url-queue-setup-runners)
(url-queue-run-queue):
* lisp/wdired.el (wdired-finish-edit):
* lisp/wid-edit.el (widget-move):
* lisp/window-tool-bar.el (window-tool-bar-string):
* lisp/winner.el (winner-undo):
* lisp/xwidget.el (xwidget-webkit-isearch-forward)
(xwidget-webkit-isearch-backward): Prefer incf to cl-incf.

(cherry picked from commit fa0131723c3d59240c3bf9b6cd6c0d8abc4ef63f)

Prefer incf to cl-incf in vc/*.el

* lisp/vc/diff-mode.el (diff-count-matches):
(diff-fixup-modifs, diff-add-log-current-defuns):
* lisp/vc/vc-hg.el (vc-hg--glob-to-pcre):
* lisp/vc/vc-hooks.el (vc-insert-file):
* lisp/vc/vc.el (vc-print-log-setup-buttons, vc-prepare-patch):
Prefer incf to cl-incf.

(cherry picked from commit e60103f130916a4632a108352360cb620c02e9f0)

Handle multibyte mode line spec chars (bug#76517)

* src/xdisp.c (display_mode_element): Make 'c' an 'int'.  Use
'string_char_and_length' to fetch the character from a multibyte
string, not 'SREF'.

(cherry picked from commit 1f891898d490380ea59f21fa8ea4e7f7364a1a79)

Improve 'send-mail-function' defcustom.

* lisp/mail/sendmail.el (send-mail-function): Provide better
:doc for the available values.

(cherry picked from commit 6f3067324aa83c0e6a44193c81a443d2c98e43d8)