; Skip commit 079e5a03156f7461d1c8f008663404277cac9ade

Miscellaneous checkdoc fixes

* lisp/ansi-color.el (ansi-color--ensure-context):
* lisp/doc-view.el (doc-view-svg-face):
* lisp/external-completion.el (external-completion-table):
* lisp/ffap.el (ffap-ro-mode-hook, ffap-gnus-hook):
* lisp/find-file.el:
* lisp/flow-ctrl.el (flow-control-c-s-replacement)
(flow-control-c-q-replacement):
* lisp/forms.el (forms-multi-line):
* lisp/help.el (search-forward-help-for-help):
* lisp/hi-lock.el (hi-lock-use-overlays):
* lisp/image.el (find-image):
* lisp/isearch.el (isearch-forward, isearch-forward-regexp)
(isearch-lazy-count-format):
* lisp/jsonrpc.el (jsonrpc--continue, initialize-instance):
* lisp/mouse-copy.el (mouse-kill-preserving-secondary):
* lisp/pixel-scroll.el (pixel-bob-at-top-p)
(pixel-scroll-down-and-set-window-vscroll):
* lisp/printing.el (pr-gv-command, pr-gs-command)
(pr-gs-switches):
* lisp/register.el (register-use-preview):
* lisp/repeat.el (repeat-check-key):
* lisp/saveplace.el (save-place-abbreviate-file-names):
* lisp/select.el (gui--clipboard-selection-unchanged-p):
* lisp/ses.el (ses-header-row):
* lisp/simple.el (transpose-sexps-default-function)
(normal-erase-is-backspace, normal-erase-is-backspace-mode):
* lisp/sqlite-mode.el (sqlite-mode):
* lisp/tempo.el (tempo-insert-region):
* lisp/term.el (term-mode-map, term-mode, term-char-mode):
Checkdoc fixes.

(cherry picked from commit e4760109ac8e3b0d73dd37e11121a01362542364)

Work around GCC bug 58416 on 32-bit x86

* configure.ac (C_SWITCH_MATCHINE): On 32-bit x86 with GCC 4+,
append -mfpmath=sse (if SSE2 is known to work) or -fno-tree-sra
(otherwise) to work around GCC bug 58416.
* etc/NEWS: Mention this.

(cherry picked from commit 9f4fc6608212191e1a9e07bf89f38ba9e4ea786c)

In ‘INSTALL’ put configure vars in one section

* INSTALL: Move description of CFLAGS etc. into the section headed
“Here is a complete list of the variables you may want to set”
since they are also variables one might want to set.

(cherry picked from commit 524e9d50a78c019ab23ecf469787d5ff6c119025)

Don't set exit info in Eshell if the command is being piped elsewhere

Previously, the exit info in Eshell was that of the last command that
finished, rather than the last command in a pipeline.

* lisp/eshell/esh-cmd.el (eshell-exec-lisp)
(eshell-lisp-command): Check whether the command is being piped.

* lisp/eshell/esh-proc.el (eshell-gather-process-output): Record whether
the command is being piped...
(eshell-sentinel): ... and do the right thing with that info.

* test/lisp/eshell/esh-proc-tests.el
(esh-proc-test/sigpipe-exits-process): Check the exit status to ensure
we don't report the first process's SIGPIPE exit.

(cherry picked from commit b7893e73878df83043e05dc8cb811971c0e99f03)

Split out exit code parts of 'eshell-close-handles' into a new function

* lisp/eshell/esh-cmd.el (eshell-last-command-status)
(eshell-last-command-result): Move here from esh-io.el.
(eshell-set-exit-info): New function, extracted from
'eshell-close-handles'.

* lisp/eshell/esh-io.el (eshell-close-handles): Make old calling
convention obsolete.  Update callers to use 'eshell-set-exit-info' as
needed.

(cherry picked from commit 39c704e03de59a1cc46494fb71426e7a7fe8013d)

* lisp/progmodes/peg.el (peg-syntax-classes): Typo (bug#72131)

(cherry picked from commit a478423d19fe320972fc319dd2cf7fdbca914754)

* lisp/which-key.el: Bump version to 3.6.1

This is necessary to trigger a new ELPA release.

(cherry picked from commit 34b832fce1d01c22aa644196cd6e6b50b1d403ee)

; * test/lisp/net/dbus-tests.el: silence compilation warnings

(cherry picked from commit f591f477791aafbfe1086398fefdafed213b6ced)

Visualize ranking of last game when adding scores

* lisp/play/gamegrid.el (gamegrid-add-score-insecure): Move point to
the score just added, or end of buffer if the new score did not make
the list.  This makes it easier to see where the last game
ranked.  (Bug#72185)

(cherry picked from commit c330b97fe24088c32394fae7f52aa18315d123b0)

* lisp/transient.el (static-if): Remove duplicated definition.

(Bug#72182)

This should have been removed when the standalone version was merged
into Emacs.

(cherry picked from commit 951fb93956d3b90aa6d1fbc8c3dcd25c42fbe7dc)

Adapt file-remote-p doc

* doc/lispref/files.texi (Magic File Names): Adapt file-remote-p.

* lisp/files.el (file-remote-p): Adapt docstring.

(cherry picked from commit 0218fb214376555df52188be4afee16249e3639c)

; Fix typo in etc/ORG-NEWS (Bug#72186)

(cherry picked from commit 34c1094e607c7ec89d66702da7f298b454b7c192)

Allow specifying stdout/stderr separately in some Eshell commands

* lisp/eshell/eshell.el (eshell-command): Add ERROR-TARGET.
* lisp/eshell/em-script.el (eshell-execute-file): Make interactive, and
add ERROR-TARGET.

* doc/misc/eshell.texi (One-Off Commands, Scripts): Update
documentation.

* etc/NEWS: Announce this change.

(cherry picked from commit 99b360bb5aabf324cf038c27ac76ac1513319754)

; * doc/misc/eshell.texi (Bugs and ideas): Remove now-implemented idea.

(cherry picked from commit 965be7bc461b3f56d68f07f3f13fe4e3f2d7e259)

Improve implementation of built-in Eshell "kill" command

* lisp/eshell/esh-proc.el (eshell/kill): Fix handling of commands like
"kill 123".  Use REMOTE when signalling PIDs in remote directories.
Signal using process objects when possible.  Report errors when failing
to signal.

* test/lisp/eshell/esh-proc-tests.el (esh-proc-test/kill/process-id)
(esh-proc-test/kill/process-object): New tests (bug#72013).

(cherry picked from commit 259f4613bdea27abf330b58a9683ca4a9e936777)

Handle broken pipes in a better way in Eshell

* lisp/eshell/esh-proc.el (eshell-insertion-filter): Send SIGPIPE
delaying for Tramp and falling back to SIGTERM for MS-Windows
(bug#72117).

(cherry picked from commit c7a498260ce3c016611da6e5e0aa5edeca58cd80)

Improve handling of deferrable Eshell commands

Now, we use the 'eshell-deferrable' wrapper to wrap a form that returns
a process (or list thereof).  This improves upon the old method, which
failed to handle 'eshell-replace-command' correctly.  In that case,
Eshell would fail to unmark commands as deferrable when necessary
(e.g. for commands in pipelines).

* lisp/eshell/esh-cmd.el (eshell-deferrable-commands): Make into a
defvar.
(eshell-deferrable): New function...
(eshell-structure-basic-command): ... use it.
(eshell-trap-errors): Rename to...
(eshell-do-command): ... this, and use 'eshell-deferrable'.  Update
callers.
(eshell--unmark-deferrable): Remove.  Update callers.
(eshell-execute-pipeline): Remove 'eshell-process-identity'.
(eshell-process-identity, eshell-named-command*, eshell-lisp-command*):
Make obsolete.

* test/lisp/eshell/esh-cmd-tests.el (eshell-test-replace-command): New
function.
(esh-cmd-test/pipeline/replace-command): New test.

(cherry picked from commit 1550213613b397da6e879cc0d00ede916f6c62cc)

Fix minor code style issue in pgtkfns.c

* src/pgtkfns.c (pgtk_get_defaults_value)
(pgtk_set_defaults_value): Fix code style.

(cherry picked from commit 76874df05f7758deb4f47b7df278e54a66456fc9)

Avoid overflow in pgtk_is_numeric_char

* src/pgtkfns.c (PATH_MAX_LEN): New macro.
(parse_resource_key): Avoid overflow if a key is RESOURCE_KEY_MAX_LEN
long by making the array larger.

(cherry picked from commit 87facc9e3da3ca70a5a75eec57e3fa22c0636c92)

Use strnlen to avoid unnecessary work in pgtkfns.c

* src/pgtkfns.c (pgtk_get_defaults_value, pgtk_set_defaults_value):
Factor out new function...
(pgtk_check_resource_key_length): ...to here.  Avoid unnecessary work by
using strnlen.

(cherry picked from commit d00a10333f06d30fee93ba3ee033e74dc4ff85bc)

Minor cleanup of code in insdel.c

* src/insdel.c (del_range_2): Update *_BYTE variables _after_
updating the corresponding character values.  This follows what we
do everywhere else, and allows to put a watchpoint on, say, Z_BYTE
to check consistency between the character and byte counts.  See
bug#72165 for one situation where it is useful.

(cherry picked from commit a90a1ed527e89cf26737b6a123070c55c3118923)

* etc/TODO: Delete item about merging Magit.

Change requested by Jonas Bernoulli <jonas@bernoul.li>.

(cherry picked from commit 5916b172bdcdeb96b058c2ae18455f66dd6326fb)

; Fix typos

(cherry picked from commit a6cab228d4d1a82a80eac81b057857a230eef0b5)

* doc/man/emacs.1.in: Add "No warranty" notice.

(cherry picked from commit 41dc28244f238739ce5c8f0c25a3d6d66992dd54)

; * doc/man/emacs.1.in: Improve wording.

(cherry picked from commit b2ac343586709063edb2a3bdfb2cdc1ac484cda1)

Improve emacs man page description of --user flag

* doc/man/emacs.1.in: Improve --user flag description.
(Bug#72169)

(cherry picked from commit 110b3d08d73b01c84ee7160c656c66eb206a7d90)

Checkdoc fixes in allout-widgets.el

* lisp/allout-widgets.el (allout-widgets-setup)
(allout-widgets-tally-string, allout-widgets-mode-inhibit):
(allout-widgets-hook-error-handler): Checkdoc fixes.

(cherry picked from commit 4911f08912a55702db1fc17373e98eec8771c4b7)

Checkdoc fixes in subr.el

* lisp/subr.el (ctl-x-4-map, ctl-x-map)
(touch-screen-events-received): Checkdoc fixes.

(cherry picked from commit 109b592d77b41b474a6d61e5a73de66b99d54ce6)

Checkdoc fixes in touch-screen.el

* lisp/touch-screen.el (touch-screen-handle-touch): Checkdoc fixes.

(cherry picked from commit 46436720787821d55589188290442fd5ef559705)

Checkdoc fixes in treesit.el

* lisp/treesit.el (treesit-add-font-lock-rules)
(treesit--font-lock-mark-ranges-to-fontify): Checkdoc fixes.

(cherry picked from commit 9889774c62e7430bce7f9a241ebe529ea00f2362)

; Skip commit c9d28a05d98a2c3c0fe89ac37bc143a41b60ea96

; Skip commit da97096fdbb50bf69348813c960eb8d10b2bdc44

(read-extended-command): Add alternative minibuffer action

* lisp/net/kubed.el: Develop some more

tabulated-list.el: Improve handling of disappearing sort column

Evolve kubed.el

(minibuffer-message): Cease waiting when not in minibuffer

kubed.el: New file.

Add 'regexp' completion style

; * src/emacs.c (syms_of_emacs) <Vsystem_type>: Fix doc string indentation.

(cherry picked from commit 4c35382e98308843dce79438844fb5a796b7032b)

Port better to Android 3.0

* java/org/gnu/emacs/EmacsNoninteractive.java (main): Use the
old getPackageInfo calling convention if it exists rather than
on Android 2.3.3 and earlier.

(cherry picked from commit 34882d524328638e2198952578638e0ffe0697c5)

; * doc/emacs/anti.texi (Antinews): Fix typos (bug#72167).

(cherry picked from commit 765cfaed775567afde3607b87f2657f0c0179f28)

; Fix typos (bug#72167)

* lisp/progmodes/peg.el (peg--actions): Correct spelling
of "post-processing".
* lisp/progmodes/php-ts-mode.el: Correct spelling of
"taken".

(cherry picked from commit 7093504da2d7267cec1f6530b3cb234a5301012d)

New Tramp tests

* test/lisp/net/tramp-tests.el
(tramp-test41-special-characters-direct-async)
(tramp-test42-utf8-direct-async): New tests.

(cherry picked from commit 8c7c4f4baaa1cb9f6d5d355c03dddc3dd1e0a747)

Update Tramp manual

* doc/misc/tramp.texi (Remote processes): Add another reason why a
direct asynchronous process could fail.

(cherry picked from commit 85d2d7982d41d7c8ea31dd7150c78428a968944a)

; Fix last change

* doc/lispref/windows.texi (Dedicated Windows):
* doc/emacs/windows.texi (Displaying Buffers): Mention keybinding.

(cherry picked from commit 504bdd560affd9173f0b406bcc830afca8648e20)

Fix 'toggle-window-dedicated' documentation

* doc/emacs/windows.texi (Displaying Buffers): Fix the cross reference
to the elisp manual.  Add missing 'toggle-window-dedicated'.
* doc/lispref/windows.texi (Dedicated Windows): Mention
'toggle-window-dedicated'.

(cherry picked from commit 3ccebbe17b73488d2d0ba73fda3b70cb6034cc7d)

; * doc/lispref/help.texi (Keys in Documentation): Add cross-reference.

(cherry picked from commit 719d5753ca661d5ab264383a2a3ca5932c595b41)

Checkdoc fixes in transient.el

* lisp/transient.el (transient-format-description): Checkdoc fixes.

(cherry picked from commit e3bba63ecb9302d5a30c7ec55fa564aa9aba2b11)

Go back to preferring -isystem to -I

* configure.ac: Go back to preferring -isystem to -I,
as headers like <gobject/gparam.h> still need it.  This
reverts almost all of 2024-07-16T02:25:44!eggert@cs.ucla.edu,
except that the ‘nw="$nw -Wsystem-headers"’ line continues to
be removed as it is no longer needed due to recent Gnulib changes.
Problem reported by Eli Zaretskii in:
https://lists.gnu.org/r/emacs-devel/2024-07/msg00756.html

(cherry picked from commit 3a790abd869ddadc343710deb0c4368227ba6611)

; Skip commit a1f29998bf49c85c2eddc1201657639fdd494ef2

Handle an edge case in c-ts-mode filling (bug#72116)

* lisp/progmodes/c-ts-common.el:
(c-ts-common-comment-setup): Add a new regexp branch.

(cherry picked from commit 5684fc5207e15adc2647a08bb9e6205fde112fa6)

Eglot: supported nested {} patterns in globs

The tailwindcss-language server issues patterns like this:

   **/{tailwind,tailwind.config,tailwind.*.config,\
   tailwind.config.*}.{js,cjs,ts,mjs}

Notive the nested "*" blob inside the the {} group.

Eglot used to reject them in 'workspace/didChangeWatchedFiles' requests,
responding with "Internal Error".  This could confuse some servers.  Now
I've done some changes to the state machine generation and it supports
them.

* lisp/progmodes/eglot.el (eglot--glob-parse): Relax parser.
(eglot--glob-fsm): New helper.
(eglot--glob-compile, eglot--glob-emit-{}): Use it.

* test/lisp/progmodes/eglot-tests.el (eglot-test-glob-test):
Uncomment some test cases.

Github-reference: https://github.com/joaotavora/eglot/issues/1403
(cherry picked from commit d7b93f63f6923f13fe999d12c4f0ba1dbf7160a8)

Check for more ‘find’ failures and port ‘find’

* Makefile.in (install-eln), configure.ac (emacs_cv_find_delete):
* make-dist: Use ‘find ... -exec CMD {} +’ rather than ‘find
... -exec CMD {} \;’ so that if CMD fails, ‘find’ fails too.
* Makefile.in (install-eln): Port to ‘find’ implementations that
behave differently from GNU ‘find’ when given an argument
that contains ‘{}’ within a longer string.  POSIX allows
this behavior.

(cherry picked from commit 7cda30602fcaeecd0072d980a99156812fc7f086)

Quote BIN_DESTDIR better

* Makefile.in (BIN_DESTDIR, install-eln, uninstall):
* src/Makefile.in ($(pdmp)):
Be more consistent about quoting BIN_DESTDIR and ELN_DESTDIR,
avoiding double-quoting ''like this'' which does not work as
expected.

(cherry picked from commit a826296cff6ac1c636db83ff66199c60b69cdeb3)

Prefer -I to -isystem

* configure.ac: Simplify configuration by using -I instead of
-isystem, as -isystem is no longer helpful for suppressing
diagnostics (and likely has not been helpful for years).
Do not suppress -Wsystem-headers, as Gnulib no longer enables it.

(cherry picked from commit a86c25c91f39a25a93d18c9267e024822c1bc43e)

Simplify time form analysis

This does not change behavior; it merely refactors the code
for simplicity.
* src/timefns.c (enum timeform, struct form_time):
Remove.  All uses removed.
(decode_time_components): Accept HZ instead of FORM.
This saves a switch.  All uses changed.
(decode_lisp_time): Return union c_time instead of struct form_time.
All uses changed.
(lisp_time_cform): Remove.  All uses changed to just use
decode_lisp_time.
(time_arith, Ftime_convert): Check (TICKS . HZ) form directly
using CONSP, instead of using the old struct form_time.
That's fast enough here.

(cherry picked from commit e1089cc9b6d7abfe468175eb92b146c884e00374)

Test !FASTER_TIMEFNS with builtin resolutions

* src/timefns.c (timespec_hz, trillion, ztrillion):
If !FASTER_TIMEFNS, do not optimize the calculations of
these variables.  This gives better test coverage of the
slow-path code, when compiling with -DFASTER_TIMEFNS=0.
(NEED_ZTRILLION_INIT): Move up, to simplify #ifdefery.
Now defined or not defined, instead of being 1 or not defined,
since it is used only via #ifdef.

(cherry picked from commit d10c1796c99637d847fa78e3fcb438d03774a00b)

Make ztrillion static

* src/timefns.c (ztrillion): Now static, when it is a variable,
since no other module uses it.

(cherry picked from commit 51d096ec07dc3bc053965096cd768847020c240d)

Fix buffer size problem in print_bool_vector

* src/print.c (print_bool_vector): Don’t assume SIZE fits
into ptrdiff_t, since it is an EMACS_INT.  This
pacifies gcc -Wformat-overflow on i686 --with-wide-int.

(cherry picked from commit a53fd69fe21ea057cd257e663219a33399545949)

alloc.c: ckd_add, not by-hand checks

* src/alloc.c (lmalloc, lrealloc): Prefer ckd_add to
by-hand checks for integer addition overflow.

(cherry picked from commit b77abd2bfeb13ae046b1f8c6157bd5a497665657)

Fix get_conversion_field --with-wide-wint overflow

* src/textconv.c (get_conversion_field): Set max value to
PTRDIFF_MAX, not MOST_POSITIVE_FIXNUM, since the variable is
ptrdiff_t, not EMACS_INT.  Problem caught by gcc -Woverflow on a
32-bit platform with --with-wide-int.

(cherry picked from commit b4050ab75e896dd0df51624c956e0dd412dde2cc)

Pacify -Wmissing-variable-declarations for lisp_malloc_user

* src/alloc.c (lisp_malloc_user) [!USE_LSB_TAG]:
Provide extern decl.

(cherry picked from commit a4bafce01e605ddcfff7a4de018b50ad96ea6f8a)

Pacify 32-bit GCC 14.1.1 in timer_check_2

* src/keyboard.c (timer_check_2): Refactor to make flow control
more obvious, to pacify -Wanalyzer-use-of-uninitialized-value with
gcc 14.1.1 20240607 (Red Hat 14.1.1-5) on i686.

(cherry picked from commit 31517e81d0d8562e222d4b0de399915df956099f)

Use Gnulib workaround for Android strnlen bug

The workaround for the Android 5.0 (API 21) strnlen bug
is now done in m4/strnlen.m4, taken from Gnulib, so
there is no need for Emacs to have its own workaround.
* configure.ac (ORIGINAL_AC_FUNC_STRNLEN, AC_FUNC_STRNLEN):
Remove.

(cherry picked from commit 2067c255e677f77eaf27dc992400111d8ac59bfd)

Update from Gnulib by running admin/merge-gnulib

(cherry picked from commit f5dbdedcc53d2c57b9ddecbe9248c90ef0fa08d6)

; Skip commit 7d8ff5a56c52ed8917d9f45f2b113cfd3de7d497

Make error messages adhere to our standards

* src/cygw32.c (chdir_to_default_directory):
* src/fns.c (secure_hash):
* src/keyboard.c (Finternal_handle_focus_in):
* src/keymap.c (store_in_keymap):
* src/pgtkfns.c (pgtk_set_scroll_bar_foreground)
(pgtk_set_scroll_bar_background, Fx_export_frames)
(Fpgtk_set_monitor_scale_factor, pgtk_get_defaults_value)
(pgtk_set_defaults_value, Fpgtk_print_frames_dialog)
(pgtk_get_monitor_scale_factor):
* src/pgtkterm.c (pgtk_set_parent_frame):
* src/process.c (network_interface_info, send_process):
* src/w32.c (w32_read_registry):
* src/w32fns.c (Fw32_read_registry):
* src/window.c (Frecenter):
* src/xfns.c (Fx_export_frames, Fx_print_frames_dialog)
(x_set_mouse_color): Make 'error' message strings follow our guidelines.
More specifically, they should not end in a period, and normally also be
capitalized.  See '(elisp) Programming Tips'.

(cherry picked from commit 970409916e0dff9cd4d542f16f7d570149bdeeb1)

Delete commented out code from `signal_or_quit`

* src/eval.c (signal_or_quit): Delete code commented out since 2001.

(cherry picked from commit 72c8e0df87b0776451f9065f3432a8ebecee974d)

Prefer `memcpy` to `strcpy` in image.c

* src/image.c (lookup_image, xpm_cache_color)
(imagemagick_create_cache): Prefer 'memcpy' to 'strcpy'.

(cherry picked from commit fcb4d89aaa7bf3ed77aaa4d6d5047a0ec2ed9225)

Restrict loop variable scope in `xpm_str_to_color_key`

* src/image.c (xpm_str_to_color_key): Restrict scope of
loop variable.

(cherry picked from commit 72ba45e2749df8561fe93bafdefbdc8eca56571f)

Add project argument to project-kill-buffers

Previously, project-kill-buffers always called (project-current t).  A
Lisp program could change what project project-kill-buffers operated
on by binding project-current-directory-override.  However, in some
edge cases (for example, if the project was deleted between looking it
up and calling project-kill-buffers) this might fail to detect a
project, and so (project-current t) would prompt the user.

To avoid this, accept the project to kill buffers for as an argument.

* lisp/progmodes/project.el (project-kill-buffers): Take project as an
optional argument (bug#72019).

(cherry picked from commit 6b2f51633e0f508d393516d6624e1a4ddaca31d1)

Fix intermittent failure of dired-test-bug27243-02

* test/lisp/dired-tests.el (dired-test-bug27243-02): Exclude free disk
space from dired listing in this test, in case it changes while it's
running and confuses the result.  (Bug#72120)

(cherry picked from commit a7b68c25640de8214bc759d20180373c2dbcfa16)

* etc/TODO: Refer to Bug#72127 for Magit assignments.

(cherry picked from commit fc25b4d8370a7c3d24b4c1335babfa1a66fe45dd)

Rename treesitter test

* test/lisp/align-tests.el (align-ts-lua): Rename test in order to
fit to treesitter tests on EMBA.

(cherry picked from commit 17c62c1242faeab030d4b0d05dc00cc8c3d8ae5f)

Adapt tressitter tests on EMBA

* test/infra/Makefile.in (TREE-SITTER-FILES): Simplify.

* test/infra/test-jobs.yml: Regenerate.

(cherry picked from commit 684e96a30d95b2ed5f2be6b85cfba3f8481707d1)

Support passing signals like 'SIGCODE' to 'tramp-signal-process'

POSIX specifies that "kill" should take signal names without the "SIG"
prefix.

* lisp/net/tramp.el (tramp-signal-process): Strip the "SIG" prefix when
present.

(cherry picked from commit 68b7806c319f282c0882fa9167752d1ac385163d)

; Replace quotes with @code{...} in texinfo files

* doc/misc/cc-mode.texi:
* doc/misc/cl.texi: Replace quotes with @code{...}

(cherry picked from commit fe28ba5d55b5a2f8b2d1cfb9109a68c1df2b88ed)

; Replace (non-)nil with (non-)@code{nil} in texinfo files

* doc/lispref/functions.texi:
* doc/lispref/keymaps.texi:
* doc/lispref/strings.texi:
* doc/misc/cl.texi:
* doc/misc/dbus.texi:
* doc/misc/eshell.texi:
* doc/misc/message.texi:
* doc/misc/ses.texi:
* doc/misc/vtable.texi: Replace (non-)nil with (non-)@code{nil}.

(cherry picked from commit ecc8516d9ca17c70b4407296fa1140bb5e2b822c)

Don't save to history from 'eshell-command' when aborting

* lisp/eshell/eshell.el (eshell-add-input-to-history)
(eshell--save-history): Declare.
(eshell-command-mode-exit): New function...
(eshell-command-mode): ... use it.

* lisp/eshell/em-hist.el (eshell-hist-initialize): Don't handle
minibuffer logic here.  Always read history file (this ensures that
'eshell-command' can see the history, too).
(eshell-add-command-to-history): Remove.

(cherry picked from commit 3407e274999ce80582932332b108d84fba69d107)

Improve support for Tifinagh

* lisp/international/fontset.el (script-representative-chars)
(setup-default-fontset): Add support for Tifinagh.

(cherry picked from commit 1fea9adf52019cb3f5ba89a402cf791164a94cbb)

Update to Org 9.7.7-2-gf308d3

(cherry picked from commit 5ec73eca57c09ad1a33c56dc4cd5b965cfaef063)

Further time decoding tidying

* src/timefns.c (enum timeform): Reorder.
(decode_time_components, decode_lisp_time): Simplify and clean up.

(cherry picked from commit a44376432de78374017c2009163a9242acbf6355)

Minor improvement in 'rmail-redecode-body'

* lisp/mail/rmail.el (rmail-redecode-body): Signal user-error if
'rmail-enable-mime' is non-nil; doc fix.

(cherry picked from commit 159f3f59b1d6ca57cff6f0628458908b62639e30)

Fix decoding 'display' properties with SVG images in Enriched mode

* lisp/textmodes/enriched.el (enriched-next-annotation): Reject
matches of 'enriched-annotation-regexp' inside strings.  Reported
by Christopher Howard <christopher@librehacker.com> in
https://lists.gnu.org/archive/html/help-gnu-emacs/2024-06/msg00178.html.

(cherry picked from commit 33ba72f52fd2138a7c2d6c065236fd459b8c659d)

* configure.ac (D8): Fix typo.

(cherry picked from commit 174a0b7642bd2d8bc397a73afc647a799e873e20)

Minor renaming in timefns.c

* src/timefns.c (current_time_in_cform): Rename this static
function from current_time_in_form, since this is about enum cform
not enum timeform.  Use changed.

(cherry picked from commit 62fdcfd4842693f436acd5b729d20934d12ca708)

; * src/android.c (setEmacsParams): Delete unused variable.

(cherry picked from commit c56e837a10eb34cbe04da8f2c16ebcae7f70704b)

Do not set LD_LIBRARY_PATH during Android initialization

* doc/emacs/android.texi (Android Environment): Adjust
documentation to match.

* java/org/gnu/emacs/EmacsNoninteractive.java (main1): New
function.  Remove initialization of EmacsNative hither.
(main): Acquire an ApplicationInfo or LoadedApk, as the case may
be on the host system, derive a ClassLoader from the result, and
load and call `main1' from within this class loader.

* src/android-emacs.c (main):

* src/android.c (setEmacsParams): Do not override
LD_LIBRARY_PATH or set EMACS_LD_LIBRARY_PATH.  This enables
Emacs to execute subprocesses in certain "fortified" Android
systems, amongst other things.

(cherry picked from commit b00fc31dd1d4543f8b017e8d7fef7686cd430bcc)

; Set Transient's version

(cherry picked from commit 04bf3172f03497eef6985311c90fd6557ace42b2)

; Fix typos in 'which-key-mode' (bug#72093)

* lisp/which-key.el (which-key-preserve-window-configuration):
Correct spelling of "taken".
(which-key--create-pages): Correct spelling of "widths".
(which-key--start-paging-timer): Correct spelling of
"secondary".

(cherry picked from commit e6f78485aa66ff762376702fc97a14a4dfe9b258)

Fix 'customize-group' minibuffer action

refactor.el: Fix typos

Fix some minibuffer bindings

Add minibuffer alternative actions for 'C-h f' and 'C-h v'

New function 'completing-read-case-insensitive'

Cease copying 'completion-ignore-case' buffer-local value

Remove 'completion-tab-width'

Manually align annotations in only place this variable is used.

Simplify 'xref-etags-mode'