* etc/syncdoc-type-hierarchy.el (syncdoc-lispref-dir): Clean-up.

(cherry picked from commit 6a2b43c5692e7427be0ddc6b084052f283b77d65)

* etc/syncdoc-type-hierarchy.el: Update comment.

(cherry picked from commit afed7f959a39c077aba6dc585cdfc0edcf05ddc8)

Make type hierarchy textual representation a table

* etc/syncdoc-type-hierarchy.el (syncdoc-make-type-table): New function.
(syncdoc-update-type-hierarchy): Make use of.
* doc/lispref/type_hierarchy.txt: Regenerate.

(cherry picked from commit 0393bfdc912912e3368b786d062894f3069d210b)

Fix typo in 'cl--type-hierarchy'

* lisp/emacs-lisp/cl-preloaded.el (cl--type-hierarchy): Fix typo.
* doc/lispref/type_hierarchy.txt: Regenerate.
* doc/lispref/type_hierarchy.jpg: Likewise.

(cherry picked from commit 24e8fceb960e0b3b7e270211bd7f460c4c871008)

* lisp/emacs-lisp/cl-preloaded.el (cl--direct-subtypes-of-type): Remove.

(cherry picked from commit 80dce18a393a3267b72901328bf24e518d0a6fc9)

Update some native comp tests

* test/src/comp-tests.el (comp-tests-ret-type-spec-13)
(comp-tests-ret-type-spec-35): Update.
* test/lisp/emacs-lisp/comp-cstr-tests.el (comp-cstr-test-62)
(comp-cstr-test-75): Likewise.

(cherry picked from commit 4a0d430bdc3650ca3dfd8bdd14781764fbcbdc7e)

* make use of 'cl--direct-supertypes-of-type' in the native-compiler

* lisp/emacs-lisp/comp-cstr.el (comp--direct-supertypes): Use
cl--direct-supertypes-of-type.

(cherry picked from commit aa849984896ce393afe92dd4fb7fbce494e131a4)

* Add initial "Type Hierarchy" node to the elisp manual

* doc/lispref/objects.texi (Lisp Data Types, Type Hierarchy): Add
Type Hierarchy node.

(cherry picked from commit 74f060230f70ba986a1c78e4e0d1181492567597)

Generate automatically graphical and textual type hierarchy representation

* etc/syncdoc-type-hierarchy.el: New file.
* doc/lispref/type_hierarchy.txt: Likewise.
* doc/lispref/type_hierarchy.jpg: Likewise.

(cherry picked from commit 3211825fe7cab2c330d703a9e77090d551854d53)

* Define 'cl--type-hierarchy' and compute 'cl--typeof-types' from it

* lisp/emacs-lisp/cl-preloaded.el (cl--type-hierarchy)
(cl--direct-supertypes-of-type, cl--direct-subtypes-of-type): Define.
(cl--typeof-types): Compute automatically.
(cl--supertypes-for-typeof-types): New function.

(cherry picked from commit 8a63e50036f0d4284f21660efb5dd20b63748d1b)

; Fix and adjust some minibuffer tests

; Resurrect 'display-completion-list'

; Fix :type of text-mode-ispell-word-completion.

(cherry picked from commit bca3c9b466e24aacd561c818f2d19665af6efc11)

Pacify some docstring control char warnings

Other instances are discussed in the following thread:
https://lists.gnu.org/r/emacs-devel/2024-02/msg00797.html

* lisp/allout.el (allout-command-prefix): Declare :type as
key-sequence.  Mark up key sequences in docstring.
* lisp/auth-source.el (auth-source--decode-octal-string):
* lisp/ffap.el (ffap-search-backward-file-end):
* lisp/gnus/gnus-art.el (gnus-page-delimiter):
* lisp/gnus/nnheader.el (nnheader-strip-cr):
* lisp/proced.el (proced-log):
* lisp/progmodes/idlw-shell.el (idlwave-shell-prompt-pattern):
* lisp/url/url-http.el (url-http-clean-headers):
* lisp/vcursor.el (vcursor-interpret-input): Quote control
characters in docstrings.

(cherry picked from commit f7c2fe3337bb5e5721d17f40f79dbc1275e17b0d)

Revert change in tramp-adb-send-command

* lisp/net/tramp-adb.el (tramp-adb-send-command): Revert check for
`tramp-androidsu-method'.  There is no need to restrict the check.

(cherry picked from commit e490d2f8724c5e47d83c40c388f60e84f541dae5)

; * .mailmap: Fix GitHub address (bug#68559#170).

(cherry picked from commit 1ddd9c8e29f721fcf6fcb17ef7a07fac0421c4f7)

Fix Python shell completion test failures

* test/lisp/progmodes/python-tests.el
(python-tests-with-temp-buffer-with-shell): Set XDG_CACHE_HOME
to a temporary directory.
(python-tests--pythonstartup-file): New function.
(python-shell-completion-at-point-jedi-completer)
(python-shell-completion-at-point-ipython): Use Jedi as the
native completion backend when possible.  (bug#68559)

(cherry picked from commit 8a2d013be37d8c3d3a25cfe1da505cd2e27dda5c)

; Update Lisp_Obarray hash for CHECK_STRUCTS

This follows commit 462d8ba813 of 2024-02-23
"Add a proper type for obarrays".

(cherry picked from commit 3412b64ac8851a0fa8e55c6319d2e710ae27a74c)

; Fix last change

* lisp/net/tramp-androidsu.el
(tramp-androidsu-handle-write-region): Delete function.
(tramp-androidsu-sh-handle-write-region): New function.
(tramp-androidsu-file-name-handler-alist): Avoid infinite
recursion by replacing handle-write-region with the tramp-sh
implementation.

(cherry picked from commit 977a56d5c7d71b958767dbae05b75c5e5cb87571)

Lift restrictions on `tramp-androidsu's app data access

* lisp/net/tramp-adb.el (tramp-adb-handle-copy-file): Remove
code now unnecessary.

* lisp/net/tramp-androidsu.el
(tramp-androidsu-mount-global-namespace): New user option.
(tramp-androidsu-su-mm-supported): New variable.
(tramp-androidsu-maybe-open-connection): Detect whether su
supports the -mm option, and provide it if so.
(tramp-androidsu-adb-handle-copy-file)
(tramp-androidsu-adb-handle-rename-file): Delete functions.
(tramp-androidsu-sh-handle-copy-file)
(tramp-androidsu-sh-handle-rename-file): New functions.
(tramp-androidsu-file-name-handler-alist): Switch to tramp-sh's
copy and rename handlers.

(cherry picked from commit f1db8cf9a0595f7db29b548b38ce98196f36e09b)

vhdl-mode.el: Reduce use of `eval`

* lisp/progmodes/vhdl-mode.el (vhdl--re2-region): New function.
(vhdl--signal-regions-functions): New constant, extracted from
`vhdl-update-sensitivity-list`.
(vhdl-update-sensitivity-list): Use it.

(cherry picked from commit 6a77355527b2f7f1dca9c2296c2684033c9aa875)

Allow vc-git-clone to check-out arbitrary revisions

* lisp/vc/vc-git.el (vc-git-clone): If "git clone --branch"
fails, then clone the repository regularly and checkout the
requested revision.

(cherry picked from commit b59d7094b6cb1a09f46f933807e9cd00a8bd1547)

Disable process tracing before launching /system/bin/su

* lisp/net/tramp-androidsu.el
(tramp-androidsu-maybe-open-connection): Disable process tracing
around start-process, that the setuid su binary may be started
regardless of its status.

(cherry picked from commit 32b4f9d21b14190f1ed1611515751abe4b90fa68)

tex-mode.el: Increase depth of braces highlighted in $...$ blocks

* lisp/textmodes/tex-mode.el (tex-font-lock-keywords-1): Increase depth
of braces supported in $...$ blocks.
(tex-font-lock-keywords-2, tex-font-lock-syntactic-face-function):
Refer directly to font-lock faces.

(cherry picked from commit b3eb49a4661e31306555e82bdf24db6c36d67ad2)

Make tree-sitter tests work installed in .emacs.d/tree-sitter

* test/Makefile.in (ert_opts):
Set treesit-extra-load-path, because HOME is not valid when running
tests from the Makefile (bug#69405).

(cherry picked from commit a67b8d7f448804d34bce85d2b6ab8d022f14161f)

(edebug-tests-trivial-comma): Avoid interaction (bug#69406)

* test/lisp/emacs-lisp/edebug-tests.el (edebug-tests-trivial-backquote):
Don't use obsolete `edebug-eval-defun`.
(edebug-tests-trivial-comma): Use `inhibit-read-only`; don't use
obsolete `edebug-eval-defun`; and fix bug#69406 by binding
`eval-expression-debug-on-error`.

(cherry picked from commit 25cfccfb8b5bced05d5547f3eabb4d0508a575c8)

Fix display of reordered Arabic text

* src/xdisp.c (compute_stop_pos): Fix a year-old thinko in
handling auto-composed characters.  It was introduced as part
of solving bug#62780, which optimized the search for composable
characters.  (Bug#69384)

(cherry picked from commit 76fa7f1f2fb7fbc3dcbd0be7928d0ec112e532e7)

; Delete trailing whitespace

* lisp/net/tramp-androidsu.el
(tramp-androidsu-maybe-open-connection): Delete trailing
whitespace.

(cherry picked from commit 1687adcb5c93b490e2e7edcd14615af295e791ed)

Introduce a new TRAMP method `androidsu'

* doc/misc/tramp.texi (Quick Start Guide): Document the new
method.

* etc/NEWS (Tramp): Announce new method.

* lisp/net/tramp-adb.el (tramp-adb-handle-file-attributes)
(tramp-adb-handle-directory-files-and-attributes)
(tramp-adb-handle-file-name-all-completions): Properly print
ls's exit status in the presence of a pipe.
(tramp-adb-handle-copy-file): If the androidsu backend is in
use, call cp rather than adb push.
(tramp-adb-send-command): Disable ADB-specific code under
androidsu.
(tramp-adb-send-command-and-check): New argument
COMMAND-AUGMENTED-P.

* lisp/net/tramp-androidsu.el (tramp, tramp-adb, tramp-sh)
(tramp-androidsu-method, add-to-list)
(tramp-androidsu-maybe-open-connection)
(tramp-androidsu-generate-wrapper)
(tramp-androidsu-handle-access-file)
(tramp-androidsu-handle-add-name-to-file)
(tramp-androidsu-handle-copy-directory)
(tramp-androidsu-adb-handle-copy-file)
(tramp-androidsu-adb-handle-delete-directory)
(tramp-androidsu-adb-handle-delete-file)
(tramp-androidsu-handle-directory-file-name)
(tramp-androidsu-handle-directory-files)
(tramp-androidsu-adb-handle-directory-files-and-attributes)
(tramp-androidsu-handle-dired-uncache)
(tramp-androidsu-adb-handle-exec-path)
(tramp-androidsu-handle-expand-file-name)
(tramp-androidsu-handle-file-accessible-directory-p)
(tramp-androidsu-adb-handle-file-attributes)
(tramp-androidsu-handle-file-directory-p)
(tramp-androidsu-handle-file-equal-p)
(tramp-androidsu-adb-handle-file-executable-p)
(tramp-androidsu-adb-handle-file-exists-p)
(tramp-androidsu-handle-file-group-gid)
(tramp-androidsu-handle-file-in-directory-p)
(tramp-androidsu-sh-handle-file-local-copy)
(tramp-androidsu-handle-file-locked-p)
(tramp-androidsu-handle-file-modes)
(tramp-androidsu-adb-handle-file-name-all-completions)
(tramp-androidsu-handle-file-name-as-directory)
(tramp-androidsu-handle-file-name-case-insensitive-p)
(tramp-androidsu-handle-file-name-completion)
(tramp-androidsu-handle-file-name-directory)
(tramp-androidsu-handle-file-name-nondirectory)
(tramp-androidsu-handle-file-newer-than-file-p)
(tramp-androidsu-handle-file-notify-add-watch)
(tramp-androidsu-handle-file-notify-rm-watch)
(tramp-androidsu-handle-file-notify-valid-p)
(tramp-androidsu-adb-handle-file-readable-p)
(tramp-androidsu-handle-file-regular-p)
(tramp-androidsu-handle-file-remote-p)
(tramp-androidsu-handle-file-selinux-context)
(tramp-androidsu-handle-file-symlink-p)
(tramp-androidsu-adb-handle-file-system-info)
(tramp-androidsu-handle-file-truename)
(tramp-androidsu-handle-file-user-uid)
(tramp-androidsu-adb-handle-file-writable-p)
(tramp-androidsu-handle-find-backup-file-name)
(tramp-androidsu-handle-insert-directory)
(tramp-androidsu-handle-insert-file-contents)
(tramp-androidsu-handle-list-system-processes)
(tramp-androidsu-handle-load, tramp-androidsu-handle-lock-file)
(tramp-androidsu-handle-make-auto-save-file-name)
(tramp-androidsu-adb-handle-make-directory)
(tramp-androidsu-handle-make-lock-file-name)
(tramp-androidsu-handle-make-nearby-temp-file)
(tramp-androidsu-adb-handle-make-process)
(tramp-androidsu-sh-handle-make-symbolic-link)
(tramp-androidsu-handle-memory-info)
(tramp-androidsu-handle-process-attributes)
(tramp-androidsu-adb-handle-process-file)
(tramp-androidsu-adb-handle-rename-file)
(tramp-androidsu-adb-handle-set-file-modes)
(tramp-androidsu-adb-handle-set-file-times)
(tramp-androidsu-handle-set-visited-file-modtime)
(tramp-androidsu-handle-shell-command)
(tramp-androidsu-handle-start-file-process)
(tramp-androidsu-handle-substitute-in-file-name)
(tramp-androidsu-handle-temporary-file-directory)
(tramp-androidsu-adb-handle-get-remote-gid)
(tramp-androidsu-adb-handle-get-remote-groups)
(tramp-androidsu-adb-handle-get-remote-uid)
(tramp-androidsu-handle-unlock-file)
(tramp-androidsu-handle-verify-visited-file-modtime)
(tramp-androidsu-handle-write-region)
(tramp-androidsu-file-name-handler-alist)
(tramp-androidsu-file-name-p, tramp-androidsu-file-name-handler)
(tramp-register-foreign-file-name-handler)
(tramp-adb-connection-local-default-ps-profile, shell)
(tramp-unload-hook, tramp-androidsu): New file.

(cherry picked from commit babe6a5e948985f961ffd36f64323950abd98b7f)

* lisp/vc/vc-hooks.el (vc-mode): Give a body to the function (bug#69387)

(cherry picked from commit c6f2add964ce1ac69ba6705bc869ee2f447da3cb)

Modify last change acc to comments

* lisp/simple.el (read-passwd-mode): Change `text' entry of icons.
(read-passwd-toggle-visibility): Rename.
(read-passwd-mode):
* lisp/subr.el (read-passwd-map): Adapt callees.

(cherry picked from commit e02c4a864f02787f0e194c9e8a6d4ab0b18ca39f)

'read-passwd' can toggle the visibility of passwords

* doc/lispref/minibuf.texi (Reading a Password):
* etc/NEWS: 'read-passwd' can toggle the visibility of passwords.

* etc/images/README: Mention the new images below.
* etc/images/conceal.pbm:
* etc/images/conceal.svg:
* etc/images/reveal.pbm:
* etc/images/reveal.svg: New images.

* lisp/simple.el (read-passwd--mode-line-buffer)
(read-passwd--mode-line-icon): New defvars.
(read-passwd--toggle-visibility, read-passwd-mode): New defuns.

* lisp/subr.el (read-passwd-map): Add 'TAB' binding.
(read-passwd--hide-password): New defvar.
(read-passwd--hide-password): Rename function from
`read-password--hide-password'.  Adapt callees.  Implement both
hiding and showing the password.  (Bug#69237)
(read-passwd): Call `read-passwd-mode'.

(cherry picked from commit 39e3fce0d5e0f5db00e44905bcd2590170098d63)

; * lisp/subr.el (if-let, and-let*): Tweak doc strings.  (Bug#69108)

(cherry picked from commit 67ba629a91aee3db39f3c81744e88c02ee710bdc)

Don't warn about _ not left unused in if-let and alike

The macro expansions did not leave a variable _ unused; this triggered
an irritating compiler warning (bug#69108).

* lisp/subr.el (internal--build-binding): Handle bindings of the form
(_ EXPR) separately.

(cherry picked from commit e680827e814e155cf79175d87ff7c6ee3a08b69a)

* lisp/progmodes/project.el (project-any-command): Allow local keymaps.

Use overriding-terminal-local-map instead of overriding-local-map.
This allows using keys from local maps (bug#69242).

(cherry picked from commit 6b800f9adf3506bf113539cf22cd07c7cda9f7b8)

* nt/cmdproxy.c (_snprintf) [_UCRT]: Redirect to 'snprintf'.

(cherry picked from commit 782ff2f826e2fde75f6491f3a6cf0d7fcd5510b2)

Arrange for dialog boxes during emacsclient requests on Android

* lisp/server.el (server-execute): Bind use-dialog-box-override
if (featurep 'android).

* lisp/subr.el (use-dialog-box-override): New option.
(use-dialog-box-p): Always display dialog boxes if variable is
set.

(cherry picked from commit 05116eac0c199b0c8409a32b349a42a21b5a0fb0)

* lisp/progmodes/elisp-mode.el (eval-last-sexp, eval-defun): Fix thinko

(cherry picked from commit 9a801f0b4621a46149ccf650ed1dc27942157562)

* etc/NEWS.25: Add 'obarrayp' as well

(cherry picked from commit 0503657a9cffbe3a5fc4f0023ee9985073e62d2c)

* etc/NEWS.25: Add missing announcement of 'obarray' package

(cherry picked from commit 5fa6042c739b2b0abb320964d5391704c8fbb5a6)

Replace XSETSYMBOL with make_lisp_symbol

* src/lisp.h (XSETSYMBOL): Remove.  All callers changed to use
make_lisp_symbol.

(cherry picked from commit de6b1e1efb1a36c69e7a6e09297e1de5b1477121)

* src/editfns.c (Fget_pos_property): Fix thinko (bug#69358)

(cherry picked from commit 56beeff14365d8e802ab7b4888aa7e95b2cf9509)

(diff-refine-nonmodified): Complete the implementation

* lisp/vc/diff-mode.el (diff--refine-hunk): Implement
`diff-refine-nonmodified` for old-style-context and "normal" diffs.

(cherry picked from commit 68096a716bfe3c212a68b3d285a0386ea0867130)

; Fix a recent change in diff-mode.el

* lisp/vc/diff-mode.el (diff-refine-nonmodified): Doc fix.

* etc/NEWS: Improve wording.

(cherry picked from commit 3076e79a6a11f9df33c5bcaa7aa58955550aeef0)

Suppress docstring control char warning in macro-generated function

* lisp/progmodes/cc-defs.el (c-lang-defconst):
Make sure that `val` won't be treated as a docstring.

(cherry picked from commit eeb89a5cb292bffe40ba7d0b0cf81f82f8452bf8)

; Fix last change.

(cherry picked from commit 4eed2768b10d074612853b68248a4b255a5c7d58)

; * etc/NEWS: Recommend obarray-make as correct replacement.

(cherry picked from commit 1972beda6de3d6895cc197dc292721ca963b234c)

Add sml-mode entry to 'eglot-server-programs'

* lisp/progmodes/eglot.el (eglot-server-programs): Use the
"millet" LSP server (https://github.com/azdavis/millet).

(cherry picked from commit 477eb882b57b3defd43ea8dd9510cfdf5fd9ee79)

Fix 'help-quick-toggle'

* lisp/help.el (help-quick-sections): Fix "kill-region" command.
Add a doc string.  (Bug#69345)

(cherry picked from commit 01ebc95114fe89ef623bc7ebdd3c3e1b9ef06b4e)

; Fix last change in lisp.h.

(cherry picked from commit 03fce8401639a1d60bb66bf374d3d44b3331ac8a)

Check daemon is initialized before suppressing its init errors

Previously, the default error handler would correctly suppress
unhandled errors raised when IS_DAEMON and the initial frame
was current, since this is the normal state of operation for a
daemon-mode Emacs.  However, this also incorrectly suppressed
errors raised while a daemon-mode Emacs was starting up.

Now, errors raised while a daemon-mode Emacs is starting up will be
handled just like errors when a non-daemon Emacs is starting up.

This was previously the case before changes for bug#1310 and
bug#1836, which added the suppression of errors when IS_DAEMON.
DAEMON_RUNNING didn't exist at the time of those changes, but now
it does, so we can do better.

* src/keyboard.c (Fcommand_error_default_function): Check
!DAEMON_RUNNING in addition to IS_DAEMON.  (Bug#68799)
* src/lisp.h (DAEMON_RUNNING): Add a clarifying comment about
what this #define means.

(cherry picked from commit 526c262149839702b94253d5eff195054ac5cd9e)

Add context to errors thrown by server-start during startup

When server-start errors during startup, the error is printed to
the terminal without context.  To help the user understand
better what went wrong, that printed error now mentions that the
error came from starting up the daemon.

* lisp/startup.el (command-line): Catch and annotate errors
thrown by server-start.  (bug#68799)

(cherry picked from commit 0bdd2eb9af171fa9d825bc6d09e0ad5d114684c4)

; Fix compiler warning

* lisp/textmodes/reftex-vars.el (reftex-cite-format-builtin): Fix
character escaping in the docstring.  (bug#69341)

(cherry picked from commit d1fe392f93ce7e71cd378326814ec4e3a4143f0c)

; * admin/authors.el (authors-aliases): Fix last change.

(cherry picked from commit afe49c7e2a2340432418df264f93d8ac88bca95f)

; Normalize Morgan Smith's attributions.

(cherry picked from commit 8b1f10f8cf473cdc57e780845393d8681ee2ed4c)

; * etc/NEWS: How to fix old code that uses vectors as obarrays.

(cherry picked from commit 15b6d72599b961ebe23e820e44ba2ffc12e49c31)

* configure.ac: Detect renameat2 with gl_CHECK_FUNCS_ANDROID.

(cherry picked from commit c7a2b7d023dfef78f6cb6f00fc8194ce8eaaf8a4)

Make erc-cmd-AMSG session local; add /GMSG, /AME and /GME

* etc/ERC-NEWS: Mention new slash commands.
* lisp/erc/erc.el (erc-cmd-AMSG): Make it consistent with the doc
string by only affecting the current connection.
(erc-cmd-GMSG, erc-cmd-AME, erc-cmd-GME): New IRC slash commands.
* test/lisp/erc/erc-scenarios-misc-commands.el
(erc-scenarios-misc-commands--AMSG-GMSG-AME-GME): New test.
* test/lisp/erc/resources/commands/amsg-barnet.eld: New file.
* test/lisp/erc/resources/commands/amsg-foonet.eld: New file.
(Bug#68401)

(cherry picked from commit 15a140a24664e96620838136640d660f842dfa49)

; Don't mention erc-branded Compat macros in ERC-NEWS

* doc/misc/erc.texi: Change fancy SASL example to also demonstrate
`let'-binding a local module.
* etc/ERC-NEWS: Don't mention `erc-compat-call' and
`erc-compat-function' because Emacs now ships with a compat.el stub
library.
* lisp/erc/erc-backend.el (erc-decode-parsed-server-response): Add
comments.
* lisp/erc/erc.el (erc): Mention return value.

(cherry picked from commit 56706254a8ee09e651097fb5075cae75b3bd4e22)

Fix bug#69321

* java/org/gnu/emacs/EmacsWindow.java (onKeyDown, onKeyUp):
Provide Right Alt (Alt Gr) masks to system keymap routines.
(bug#69321)

(cherry picked from commit 8d5983aa78e36afa815325e7bce85a81d314e67b)

; * .dir-locals.el (java-mode): Transfer suitable c-mode options.

(cherry picked from commit 65d4bf711055dc8d23cea9b2ec8a57cdbfa6cf05)

diff-mode.el (diff-refine-nonmodified): New option

* lisp/vc/diff-mode.el (diff-font-lock-keywords): Refer directly to
font-lock faces.
(diff-apply-hunk): Use `user-error` for errors usually not due to bugs.
(diff--refine-propertize): New function.
(diff-refine-nonmodified): New custom var (bug#61396).
(diff--refine-hunk): Use them.

(cherry picked from commit 26290870b3505b8971c73fe3a82b69e3c4e86b88)

elisp-mode.el: Use `handler-bind` instead of `debug-on-error`

* lisp/progmodes/elisp-mode.el (elisp-enable-lexical-binding):
Don't get fooled by a global binding of `lexical-binding` to t.
(elisp--eval-last-sexp-fake-value): Delete var.
(elisp--eval-defun): Don't let-bind `debug-on-error` since it's
already arranged by the only caller.
(eval-last-sexp, eval-defun): Use `handler-bind` instead of
`debug-on-error`.

(cherry picked from commit 84f72f19e514db8f8f6e469340fb5fa0719d40b6)

* lisp/mail/rmail.el (rmail-resend): Use `with-syntax-table`

(cherry picked from commit 3599a9a1cf1f8bed7c7f00fd8f00b2bfc0c4271f)

rmail.el: Prefer #' to quote function names

* lisp/mail/rmail.el (rmail-pop-to-buffer, rmail-mode-map)
(rmail-mode-1, rmail-generate-viewer-buffer, rmail-variables)
(rmail-find-all-files, rmail-insert-inbox-text)
(rmail-set-message-counters, rmail-only-expunge, rmail-reply)
(rmail-resend, rmail-fontify-buffer-function)
(rmail-unfontify-buffer-function, rmail-install-speedbar-variables)
(after-save-hook): Use #' where applicable.

(cherry picked from commit 048eaadd8cc97faf0f3e70a8d81d06f915c52081)

(rmail-font-lock-keywords): Avoid old-style `font-lock*-face` variables

* lisp/mail/rmail.el (rmail-font-lock-keywords): Refer directly to the
font-lock faces.

(cherry picked from commit 0b855e1465b26f69156a35befebb4167145cdccf)

Fix Flymake lighter tool-tip from generating errors

Flymake tool-tip was generating errors on mouse over of
mode-line lighter on inactive windows and on the minor mode
indicator in the describe-mode Help page.
* lisp/progmodes/flymake.el (flymake--mode-line-title):
'help-echo' now uses buffer local state and makes null
check.  (Bug#69248)

Copyright-paperwork-exempt: yes
(cherry picked from commit 2b7dc7fef814753f1c6d4c352fe69bb6e167cd07)

Warn about docstrings with control characters

It is easy to include control chars in doc strings by mistake, and the
result is often an unreadable mess.

* lisp/emacs-lisp/bytecomp.el (byte-compile-warning-types)
(byte-compile-warnings, byte-compile--docstring-style-warn):
Add `docstrings-control-chars` warning.
* etc/NEWS: Announce.

(cherry picked from commit 90d3b3408e404aba383302c3147d3ca614619986)

Replace use of obsolete eshell-kill-output in test

* test/lisp/eshell/eshell-tests.el (eshell-test/flush-output):
Use eshell-delete-output instead of eshell-kill-output.

(cherry picked from commit a8f167547bc15eacaf5fbc07c1e75f603e70862d)

Update NEWS and manual after obarray changes

* doc/lispref/abbrevs.texi (Abbrev Tables):
* doc/lispref/symbols.texi (Creating Symbols):
* doc/lispref/objects.texi (Type Predicates): Update text for obarray
now being an opaque type.
* etc/NEWS: Announce.

(cherry picked from commit 6803b70c1972bc82f7dc1f1d6bbb2a60b6f40367)

Use the new obarray type for the initial obarray

This can improve performance a lot, especially after the obarray has
been fed many symbols.

* src/lread.c (OBARRAY_SIZE): Remove.
(load_path_check): Create an obarray object instead of a vector.

(cherry picked from commit 3ea77c735de975ebda707e0e1e8bb5e0adad2bf5)

Add a proper type for obarrays

The new opaque type replaces the previous use of vectors for obarrays.
`obarray-make` now returns objects of this type.  Functions that take
obarrays continue to accept vectors for compatibility, now just using
their first slot to store an actual obarray object.

obarray-size and obarray-default-size now obsolete.

* lisp/obarray.el (obarray-default-size, obarray-size):
Declare obsolete.
(obarray-make, obarrayp, obarray-clear): Remove from here.
* src/fns.c (reduce_emacs_uint_to_hash_hash): Remove from here.
* src/lisp.h (struct Lisp_Obarray, OBARRAYP, XOBARRAY, CHECK_OBARRAY)
(make_lisp_obarray, obarray_size, check_obarray)
(obarray_iter_t, make_obarray_iter, obarray_iter_at_end)
(obarray_iter_step, obarray_iter_symbol, DOOBARRAY, knuth_hash): New.
(reduce_emacs_uint_to_hash_hash): Moved here.
* src/lread.c (check_obarray): Renamed and reworked as...
(checked_obarray_slow): ...this.
(intern_sym, Funintern, oblookup, map_obarray)
(Finternal__obarray_buckets): Adapt to new type.
(obarray_index, allocate_obarray, make_obarray, grow_obarray)
(obarray_default_bits, Fobarray_make, Fobarrayp, Fobarray_clear): New.
* etc/emacs_lldb.py (Lisp_Object):
* lisp/emacs-lisp/cl-macs.el (`(,type . ,pred)):
* lisp/emacs-lisp/cl-preloaded.el (cl--typeof-types):
* lisp/emacs-lisp/comp-common.el (comp-known-type-specifiers):
* lisp/emacs-lisp/comp.el (comp-known-predicates):
* src/alloc.c (cleanup_vector, process_mark_stack):
* src/data.c (Ftype_of, syms_of_data):
* src/minibuf.c (Ftry_completion, Fall_completions, Ftest_completion):
* src/pdumper.c (dump_obarray_buckets, dump_obarray, dump_vectorlike):
* src/print.c (print_vectorlike_unreadable):
* test/lisp/abbrev-tests.el (abbrev-make-abbrev-table-test):
* test/lisp/obarray-tests.el (obarrayp-test)
(obarrayp-unchecked-content-test, obarray-make-default-test)
(obarray-make-with-size-test):
Adapt to new type.

(cherry picked from commit 462d8ba813e07a25b71f5c1b38810a29e21f784c)

Add obarray-clear and use it

* lisp/obarray.el (obarray-clear): New.
* lisp/abbrev.el (clear-abbrev-table):
* lisp/vc/vc.el (vc-clear-context): Use it instead of assuming the
obarray is a vector that can be 0-filled.
* test/lisp/obarray-tests.el (obarray-clear): New test.

(cherry picked from commit 6a182658a533acab94d8fa0aec3e2b7a4f7d6a93)

Use obarrayp, not vectorp, to detect obarrays

* lisp/abbrev.el (abbrev--active-tables):
* lisp/mail/mailabbrev.el (mail-abbrevs-setup, build-mail-abbrevs)
(define-mail-abbrev, mail-resolve-all-aliases)
(mail-abbrev-insert-alias):
* lisp/mail/rmail.el (rmail-resend):
* lisp/minibuffer.el (completion-table-with-context):
* lisp/progmodes/etags.el (etags-tags-apropos-additional):
(etags--xref-apropos-additional):
Use obarrayp as predicate for obarrays.

(cherry picked from commit 3beaa3131e78bea618cb93d03c5d8b0f8977fb94)

Use obarray-make instead of make-vector to create obarrays

This prepares for the introduction of an actual obarray type.

* lisp/cedet/semantic/lex-spp.el (semantic-lex-spp-dynamic-map)
(semantic-lex-spp-dynamic-map-stack, semantic-lex-make-spp-table):
* lisp/cedet/semantic/lex.el (semantic-lex-make-keyword-table)
(semantic-lex-make-type-table):
* lisp/completion.el (cmpl-prefix-obarray, cmpl-obarray)
(clear-all-completions):
* lisp/emacs-lisp/checkdoc.el (checkdoc-defun-info):
* lisp/emacs-lisp/eldoc.el (eldoc-message-commands)
(eldoc-edit-message-commands):
* lisp/mail/mail-extr.el (mail-extr-all-top-level-domains):
* lisp/mail/rmailkwd.el (rmail-label-obarray):
* lisp/net/dns.el (dns-cache):
* lisp/net/eww.el (eww-suggested-uris):
* lisp/net/imap.el (imap-open, imap-mailbox-select-1)
(imap-message-copyuid-1, imap-message-appenduid-1):
* lisp/obsolete/pgg.el (pgg-passphrase-cache, pgg-pending-timers):
* lisp/play/cookie1.el (cookie-cache):
* lisp/progmodes/cc-defs.el (c-lang-constants, c-define-lang-constant):
* lisp/progmodes/cc-langs.el (c-keywords-obarray):
* lisp/vc/vc-hooks.el (vc-file-prop-obarray):
* test/lisp/obarray-tests.el (obarrayp-test):
* test/src/minibuf-tests.el (minibuf-tests--strings-to-obarray):
Use obarray-make instead of obarray-make.

(cherry picked from commit aa82fe9931851e66aa335e96ae35fd967951b281)

* src/pdumper.c (dump_subr): Rename 'native_comp' -> 'non_primitive'.

(cherry picked from commit 32843c7b36b8bf3dc9ac82059a1c3cab03cd8c98)

* src/fns.c (sxhash_bignum): Include sign bit in hash.

(cherry picked from commit 6a53836a245a8154f1f176ce2a787c24aa7409cb)

* src/fns.c (hash_string): Suppress warning on 32-bit platforms

Remove a shift-too-wide complaint by GCC in code that is never reached
on platforms where that shift is too wide.

(cherry picked from commit 53e60fb004c0e8b40b01fcfcf7f406557e35aa3e)

Tone down python-mode warning to a simple message (bug#68559)

* lisp/progmodes/python.el
(python-shell-completion-native-turn-on-maybe):
There is no need for an alarming warning when using an inferior Python
without GNU readline; a calm message will do.

(cherry picked from commit f85280503a3a67e1618069b1c7d6810efa924fe8)

Fix bug#69140

* src/window.c (grow_mini_window): Don't adjust frame matrices
or force redisplay if the provided window cannot be
resized.  (bug#69140)

(cherry picked from commit b868690feff44c7242c942490d1d8bc6d2811fa2)

* Fix 'parse-colon-path' entry in 'comp-known-type-specifiers'

* lisp/emacs-lisp/comp-common.el (comp-known-type-specifiers): Fix
'parse-colon-path'.

(cherry picked from commit 58ca91fe0723c861d53375f52e5b6dd54a49a2e3)

* lisp/help-fns.el (describe-mode-outline): New user option (bug#64684).

(describe-mode, describe-mode--minor-modes): Use 'describe-mode-outline'.

* lisp/help-mode.el (help-setup-xref): After disabling outline-minor-mode
also kill all outline-related local variables.  So that they won't affect
the output of other help commands in the same help buffer.

(cherry picked from commit cc58626f643c1b19e66bab9c6a39026c7e419ab9)

; * etc/PROBLEMS: Describe input lags due to GTK IM (bug#69246).

(cherry picked from commit 70cf4b694b317b367a046b0b03746c56e23fcb91)

Recognize functions and macros as defuns in 'cmake-ts-mode'

* lisp/progmodes/cmake-ts-mode.el (cmake-ts-mode--function-name):
Renamed to 'cmake-ts-mode--defun-name' since the function handles
now functions and macros.
(cmake-ts-mode--defun-name): Return text of the first 'argument'
node below 'function_def' and 'macro_def' nodes.
(cmake-ts-mode): Set up treesit-defun-type-regexp and
'treesit-defun-name-function'.  Change the imenu setup to
recognize macros too.  Since we have set up
'treesit-defun-name-function', we don't have to
pass 'cmake-ts-mode--function-name' anymore.  (Bug#69186)

To make `treesit-defun-at-point' work properly, we have to recognize
function_def/macro_def nodes, not the lower-level *_command nodes.

(cherry picked from commit 6b6761d534259ab4d5409e72754e46af13623dda)

; Insert missing JNI prologues

* src/android.c (shouldForwardMultimediaButtons)
(shouldForwardCtrlSpace, notifyPixelsChanged, setupSystemThread):

* src/androidvfs.c (safSyncAndReadInput, safSync, safPostRequest)
(ftruncate): Insert absent JNI prologues.

(cherry picked from commit 8e0f134653b2951e80cd5659fba5c36e416931fa)

; * admin/CPP-DEFINES: Fix typos.

(cherry picked from commit ee6343556a53770cd2c7730b48ce1731423d8825)

; * admin/CPP-DEFINES: Update with Android defines.

(cherry picked from commit f024b63ecf8d4ebfd518beb4c2dfc853d725ec19)

Enable inotify on systems with inotify_init yet no init1 variant

* configure.ac (HAVE_INOTIFY): Check for the presence of
inotify_init in addition to inotify_init1.

* src/inotify.c (Finotify_add_watch): Implement with
inotify_init if inotify_init1 is absent.

(cherry picked from commit 39a84232700c40fa74305970dd16cd5cb8b8bea0)

; * lisp/emacs-lisp/comp-run.el: Fix typo.

(cherry picked from commit b214cb2843851c410d603e7fb487a462d5f7bee1)

* doc/lispref/modes.texi (Tabulated List Mode): Update.

In the description of 'tabulated-list-format' document
the missing value 'props' that was added long ago.

(cherry picked from commit f28a557c7d4b39f302630ed2b19a73fc375e7ff4)

* lisp/emacs-lisp/comp.el (comp--compute-function-types): Fix missing doc.

(cherry picked from commit 44d5c667d7775f881473c7c6f7d9bdef7594bd79)

; Skip commit e6882a5cc89d9375dfa73156db6836af19ef7b8a

; Update URL of the tree-sitter-lua grammar

* admin/notes/tree-sitter/build-module/build.sh:
* lisp/progmodes/lua-ts-mode.el:
* test/infra/Dockerfile.emba: Use the new URL.  (bug#69304)

(cherry picked from commit 35d99b1ec7c56d4a5c09af36e6bbd7f0f959cccc)

; Add two comments on comp-known-predicates cl-deftype-satisfies

* lisp/emacs-lisp/comp.el (comp-known-predicates): Add comment.
* lisp/emacs-lisp/cl-macs.el: Likewise.

(cherry picked from commit 88abbf00af69cf7e5f36e318e6935f7d1500af7f)

* Add few missing entries in 'comp-known-predicates'

* lisp/emacs-lisp/comp.el (comp-known-predicates): Add framep, markerp,
number-or-marker-p, overlayp, processp, subrp and windowp and sort it
alphabetically.

(cherry picked from commit c65a59a9e90524efa23d9151c31dad66a08ccb90)

* lisp/emacs-lisp/comp-cstr.el (comp-cstr): Rename constructors.

(cherry picked from commit 5aeea8dc2c0bdd01de3ad271723e9d1737d8a056)

; * lisp/emacs-lisp/comp.el (native-comp-debug): Fix spacing.

(cherry picked from commit 1e1d3f3acd8567addc0dab4bc34dc5c7f2405556)

* Make 'comp--compute-function-types' a pass

* lisp/emacs-lisp/comp.el (comp-passes): Add comp--compute-function-types.
(comp--compute-function-types): New function.
(comp--compute-function-type): Move it.
(comp--final): Update it.

(cherry picked from commit 7215c63fc0f9d7f48ac20578d310a8b3d86b0eae)

Remove redundant call to 'eln_load_path_final_clean_up'

* src/emacs.c (shut_down_emacs): Remove redundant call to
'eln_load_path_final_clean_up'.  We call it from 'kill-emacs'
right before the call to 'exit'.

(cherry picked from commit 8987e1b093b07756d18c861d1c7febb85fe88bef)

; * src/lisp.h: Add Lisp_Object tagging scheme overview

(cherry picked from commit a2eb123fb606af2a62ad6d0d0162255d7f0601e1)