; 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)

Set tty mode to raw when setting up Inferior Python

* lisp/progmodes/python.el (python-shell-setup-code): New constant.
(python-shell-comint-watch-for-first-prompt-output-filter): Send
`python-shell-setup-code' to the Inferior Python process.
* test/lisp/progmodes/python-tests.el (python-ffap-module-path-1):
Eliminate skipping on Mac. (Bug#68559)

(cherry picked from commit d5757178464ca51f79c7fc1ab199a1582e92ab32)

* java/org/gnu/emacs/EmacsContextMenu.java (display): Reduce timeout.

(cherry picked from commit 0a4d4781ddc079509cb256edf803d663439dcf92)

* lisp/emacs-lisp/map.el (map--make-pcase-bindings): Fix use in Emacs<30

(cherry picked from commit 3b34c5e4a583dd88f476570cbd58655a18e9a6b4)

* lisp/net/tramp.el (tramp-methods): Fix typo in docstring.  (Bug#69294)

(cherry picked from commit d6131b5902a70339305285f9861bdfd24c567eab)

Work around premature dismissals of submenus under Android

* java/org/gnu/emacs/EmacsContextMenu.java (display): If between
HONEYCOMB and N, set wasSubmenuSelected.

(cherry picked from commit 7b0d75018885d8d34ff7c4427a83a21a4808282c)

Do not attempt to check declarations in lock files

* lisp/emacs-lisp/check-declare.el (check-declare-directory): Do
not attempt to check declarations in lock files.  (Bug#69084)

(cherry picked from commit 1acc7cb851417b83ae90fe4d0ee9f01af2e03722)

Allow trivially autoloading uses of transient's define macros

Since 49e41991b2f transient-define-prefix itself was autoloaded, but
that meant that when ever an autoload file was loaded, which contained
an autoload for a command defined using that macro, transient itself
had to be loaded.

That shouldn't be necessary.  For commands using these macros, an
autoload that is identical to what would have been generated if it
had been defined using defun, works just fine.

* lisp/emacs-lisp/loaddefs-gen.el
(loaddefs-generate--make-autoload): Allow uses of
transient-define-prefix, transient-define-suffix,
transient-define-infix and transient-define-argument
to be autoloaded using just ";;;autoload".

* lisp/transient.el (transient-define-prefix): No longer autoload.

(cherry picked from commit 167d9b9040333a5bff64325423750243c60edfa1)

* Fix missing entry in 'cl--typeof-types'

* lisp/emacs-lisp/cl-preloaded.el (cl--typeof-types): Add
'native-comp-unit'.

(cherry picked from commit bbf0b7d0407883ea0a59c09b501c6e550bb8e10c)

; * lisp/emacs-lisp/pcase.el (pcase-let*, pcase-let): Another doc fix.

(cherry picked from commit 2eb85a9de1a5068d09b21464601dbd3263e55c85)

; * lisp/emacs-lisp/pcase.el (pcase-let*, pcase-let): Doc fix.

(cherry picked from commit 4c6653f23aef097e3a6ed687e21decea6c790b5e)

Make find-function-regexp also find transient-define-*

* lisp/emacs-lisp/find-func.el (find-function-regexp): Also find
transient-define-prefix, transient-define-suffix,
transient-define-infix and transient-define-argument.

(cherry picked from commit d9afa1f30fdf9d00b447fea0a8343397333e172f)

; Copyedits

(cherry picked from commit d5775ae4d3ac8a1a4d2625e05307c9296df28d6f)

Add Tramp methods dockercp and podmancp

* doc/misc/tramp.texi (External methods):  Add dockercp and podmancp.

* etc/NEWS: Add Tramp methods "dockercp" and "podmancp".

* lisp/net/tramp.el (tramp-handle-make-process):
* lisp/net/tramp-adb.el (tramp-adb-maybe-open-connection):
* lisp/net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band)
(tramp-maybe-open-connection):
* lisp/net/tramp-sshfs.el (tramp-sshfs-handle-process-file)
(tramp-sshfs-maybe-open-connection):
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-send-command): Adapt
`tramp-expand-args' calls.

* lisp/net/tramp-container.el (tramp-dockercp-method)
(tramp-podmancp-method): New defconst.
(tramp-methods) <dockercp, podmancp>: Add new methods.
(tramp-container--completion-function): Adapt docstring.  Use it
for "dockercp" and "podmancp" completion.

* lisp/net/tramp.el (tramp-get-remote-tmpdir):
* lisp/net/tramp-gvfs.el (tramp-gvfs-maybe-open-connection):
* lisp/net/tramp-sh.el (tramp-maybe-open-connection): Use a default
value with `tramp-get-method-parameter'.

* lisp/net/tramp-sh.el (tramp-methods) <nc>: Add `tramp-copy-file-name'.
(tramp-default-copy-file-name): New defconst.
(tramp-make-copy-file-name): Rename from
`tramp-make-copy-program-file-name'.  Use method parameter
`tramp-copy-file-name'.  (Bug#69085)
(tramp-do-copy-or-rename-file-out-of-band): Adapt callees.

* lisp/net/tramp.el (tramp-methods): Adapt docstring.
(tramp-get-method-parameter, tramp-expand-args): New optional
argument DEFAULT.

* test/lisp/net/tramp-tests.el (tramp--test-container-p): Adapt.
(tramp--test-container-oob-p): New defun.
(tramp-test17-dired-with-wildcards, tramp-test35-remote-path)
(tramp-test41-special-characters): Use it.
(tramp--test-set-ert-test-documentation): Use `split-string'.

(cherry picked from commit 4e9993cada32a866a75b458092de0028db2f5f41)

; * doc/misc/gnus.texi (Other modes): Fix last change.

(cherry picked from commit a1cbc4d810bc1b525fa46b23249b414c1ad6b031)

Allow attaching files at point using 'gnus-dired-attach'

* lisp/gnus/gnus-dired.el (gnus-dired-attach-at-end): Add option.
(gnus-dired-attach): Respect it.
* doc/misc/gnus.texi (Other modes): Document it.  (Bug#69141)

(cherry picked from commit 6893106fe9302b1be68dd04034441799e6d29b68)

Slight switch byte op speedup

* src/bytecode.c (exec_byte_code): Hoist symbols_with_pos_enabled check
from fast loop, and eliminate the initial index check.

(cherry picked from commit 23793600778c4efe5615b646f2d3895624c23ef0)

Replace XSET_HASH_TABLE with make_lisp_hash_table

* src/lisp.h (XSET_HASH_TABLE): Remove, replace with...
(make_lisp_hash_table): ...this.  All callers adapted.

(cherry picked from commit 188fe6bffa69e08b60a7d65709998bd803b7ada5)

Check shortdoc keywords and fix one mistake

* lisp/emacs-lisp/shortdoc.el (shortdoc--check)
(define-short-documentation-group): Check that used keywords exist.
* lisp/emacs-lisp/shortdoc.el (list): Fix a typo.

(cherry picked from commit ddfba511c190e5bb44e44a50aef5ab8c08e3d798)

; Further copyedits of doc/translations/README.

(cherry picked from commit 70dc1700562309c2612a71be35f9c71e9e1641b8)

; Proofreading changes in doc/translations/README.

(cherry picked from commit 5d3ecd7358252349dd26e6015a83054893af4474)

* test/src/eval-tests.el (eval-tests/default-value): Add new test case.

Bug#66117

(cherry picked from commit be8f3e68a88a00bc12f1cc405a8a341666c41858)

Don't update ranges for the whole buffer in treesit--pre-redisplay

* lisp/treesit.el (treesit--pre-redisplay): Only update two
screen-full of text around point.

(cherry picked from commit 8f260bb93f534b24d9a93d3315804ffe0c1fec4f)

Back out part of commit db5e84af202

* lisp/gnus/gnus-agent.el (gnus-category-make-function-1): This code is
untested and was not meant to be part of the earlier commit.

(cherry picked from commit f6743099cc907f1f2847f028ff8f3712288c559f)

Use -Wanalyzer-deref-before-check in GCC 14

* src/marker.c: Work around GCC bug 113253 only if GCC 13.
The GCC bug reportedly will be fixed in GCC 14.

(cherry picked from commit 4a8d3c5b75b28167300d2df061d053935809d43e)

Do not ignore -Wanalyzer-allocation-size in GCC 14

* src/lisp.h (SAFE_ALLOCA_LISP_EXTRA): Use pragma to ignore the
warning only in GCC 13, as the GCC developers say GCC bug 109577
is fixed in GCC 14.

(cherry picked from commit 659770fdf535ca683a97d965d2e4ed0f9f321145)

Remove no-longer-needed pdumper_load workaround

* src/pdumper.c (pdumper_load): Revert my commit "Pacify GCC
12.1.1 in default developer build" dated 2022-06-13 13:21:18 -07,
as GCC bug 105961 is fixed, and this workaround is not needed for
unfixed GCC as these builds should not use --enable-gcc-warnings.

(cherry picked from commit 42c6cf4e5804312defa9d9caac8882500bd38179)

Ignore fewer GCC -fanalyzer diagnostics in ccl.c

* src/ccl.c: Do not ignore -Wanalyzer-use-of-uninitialized-value,
as that bug has been fixed in GCC.  Ignore
-Wanalyzer-out-of-bounds only if GCC 13, as the bug will
reportedly be fixed when GCC 14 comes out.

(cherry picked from commit f8d27a8a1fd5bdc8e25569cc05a9298e186a8c63)

; Fix punctuation and encoding of doc/translations/README

* doc/translations/README: Fix non-ASCII characters and
punctuation.  Add local variables section.

(cherry picked from commit d80f1352d80938bb4ef61c5d74aa056902abd9b4)

Move translations-related files to do/translations/.

(cherry picked from commit 42179750c5f3f722b1ce2f82d2b2e73bba8e4de8)

java-ts-mode: Indentation for opening brace on a separate line

* lisp/progmodes/java-ts-mode.el (java-ts-mode--indent-rules):
Support putting the opening brace on a separate line (bug#67556).

* test/lisp/progmodes/java-ts-mode-resources/indent.erts:
Add a test.

(cherry picked from commit 5a64d2c7595dc393504c6eee9321d74dbd8ae9e2)

Removed decommissioned PGP keyservers

* lisp/epa-ks.el (epa-keyserver): Update the user option type of
`epa-keyserver'.

See https://mail.gnu.org/archive/html/emacs-devel/2023-11/msg00857.html.

(cherry picked from commit 9e56bd5ed8775f53c3025b114525cee7c578e2d0)

org: Fix security prompt for downloading remote resource

* lisp/org.el (org--confirm-resource-safe): Do not assume that
resource is safe when user replies "n" (do not download).

Reported-by: Max Nikulin <manikulin@gmail.com>
Link: https://orgmode.org/list/upj6uk$b7o$1@ciao.gmane.io
(cherry picked from commit e56f0ef51bfdd0e03e817670754bc813fb3702a2)

Revert "Update to Org 9.6.19"

This reverts commit 07a392f445eb21c5e4681027eee9d981300a4309.
It was installed by mistake.

(cherry picked from commit 65ba3274652a4dac37f41f872330e391cd511ae1)

Update to Org 9.6.19

(cherry picked from commit 07a392f445eb21c5e4681027eee9d981300a4309)

More multi-commands

; Autoload text property search functions

Unify 'cycle-' and 'display-sort-function' to just 'sort-function'

Rework *Completions* display

; Refine dictionary definition display in *Help* buffers

* lisp/net/dictionary.el (dictionary-display-definition-in-help-buffer):
Add one-line description and normalize whitespace in references.

New command 'minibuffer-apply'

* lisp/minibuffer.el (completions-used-input): New face.
(minibuffer-completion-action): New variable and function.
(minibuffer-completion-command): New variable.
(completing-read-default): Set it to 'this-command'.
(minibuffer-current-input): New function.
(minibuffer-apply): New command.
(minibuffer-local-completion-map): Bind it to 'C-j'.
(minibuffer-local-must-match-map): Unbind 'C-j'.

* lisp/cus-edit.el (customize-toggle-option): Set
'minibuffer-action' property to non-nil.

* etc/NEWS: Announce it.

; Reposition cursor after refreshing *Completions*

* lisp/minibuffer.el (minibuffer-completion-help): If *Completions* is
already visible and some candidate is highlighted, try to highlight it
again after populating the buffer anew.

Move French translations to the top-level doc/ directory.

(cherry picked from commit a58bcb96ac898d218b3169e76db798f192107d52)

Add README file about translations of Emacs manuals

* doc/README: New file.

(cherry picked from commit aa8baf77b47e3de114f5dc5e9aaa987bb96ed248)

Implement tooltip_reuse_hidden_frame for Android

* java/org/gnu/emacs/EmacsWindow.java
(findSuitableActivityContext): Return Activity rather than
Context.
(mapWindow): Provide window token manually.

* src/androidfns.c (Fx_show_tip, Fx_hide_tip): Respect
tooltip_reuse_hidden_frame.

(cherry picked from commit c2d714886ef139f601d89463675b0d5b49d18ff9)

Update from Gnulib by running admin/merge-gnulib

(cherry picked from commit bd0e281a6a27c048b12847811bc0385acbaa1eec)

Adjust to yesterday’s Gnulib nstrftime changes

Bruno Haible fixed Gnulib so that nstrftime no longer requires
locking code, which means we no longer need to avoid localename.
However, nstrftime now requires localename-unsafe-limited which
pulls in some Gnulib-specific locale code, and it’s likely this
needs to be replaced with Emacs-specific locale code.  In the
meantime let’s continue to finess this by avoiding
localename-unsafe-limited.
* admin/merge-gnulib (AVOIDED_MODULES):
Avoid localename-unsafe-limited instead of localename.

(cherry picked from commit 37bb33dae791e5f59f1d0d27c0221db3b3b4c16d)

; Fix typo from commit 32c5bdfa971

* lisp/gnus/gnus-util.el (gnus-not-ignore): Quote the argument
to defalias.

(cherry picked from commit 20997aa20728a6fc2a3de736e9fc718b97dcef99)

Provide better default value for date in Gnus scoring

Bug#61002, thanks to Kamil Jońca for reporting

* lisp/gnus/gnus-score.el (gnus-summary-score-entry): When scoring on
Date header, the default value for the prompt should be number of days
between the date of the article under point, and "now".

(cherry picked from commit 32c5bdfa971220bae37991a298628605c82f866c)

Alias some gnus-specific do-nothing functions

Replace with #'always and #'ignore

* lisp/gnus/gnus-agent.el: `gnus-agent-true' and `gnus-agent-false'
* lisp/gnus/gnus-util.el: `gnus-not-ignore'

(cherry picked from commit db5e84af202532b138918295ea6dd1b0ea910d78)

; Skip commit c14a67a80f4263c13db55b6a79fb545b82a8b5b7

; Skip commit 52d554d5d8964943c65ecf140fdcc4bd6bccf855

; Use the ':prefix' argument of 'defvar-keymap'

* lisp/minibuffer.el (minibuffer-narrow-completions-map): Use ':prefix'.