; Update lisp/ldefs-boot.el

trust.el: New file with improved trust API.

Fix thai-pattachote input method

* lisp/leim/quail/thai.el (thai-pattachote): Add missing
characters instead of duplicate ones.  Suggested by Robert
Nikander <robert.nikander@icloud.com>.  (Bug#77998)

(cherry picked from commit 98776ebd391e8cd617b78bfd849222ad07c9642a)

csharp-mode.el: Improve fontification of string-interpolation exprs

* lisp/progmodes/csharp-mode.el
(csharp-ts-mode--font-lock-settings): Remove too wide selector,
causing non-string content to be fonitified as strings.  Add
additional eselectors to highlight variables inside
interpolation-expressions too.  (Bug#78008)

(cherry picked from commit 67e8351bdb78eadaf07a5b308806ec3c00c9e979)

Add "forward history" support for some debuggers

* lisp/progmodes/gud.el (gud-query-cmdline): Add an optional
default-list parameter to allow passing a list of "forward
history" suggestions to the minibuffer.
(perldb, pdb, guiler): Use buffer file name to suggest a default
debugging command via "forward history".

* doc/emacs/building.texi (Starting GUD): Document the new
feature.

(Bug#77989)

(cherry picked from commit f808f637f57eb0fe87fdc2ea7c2a1fd9e2f9d912)

Don't consider "Grep finished" lines as matches for file names

* lisp/progmodes/grep.el
(grep-compilation-transform-finished-rules): New variable
containing rules to prevent "Grep finished" lines from being
misinterpreted as matches for file names.
(grep-mode): Add these rules to
'compilation-transform-file-match-alist' (bug#77732).

(cherry picked from commit dd3429526aacef0aa98171a598a535a72b9cde39)

log-edit-insert-message-template: Reorder headers

* lisp/vc/log-edit.el (log-edit-insert-message-template): Put
Author before Summary when both are to be inserted.

(cherry picked from commit 19b6c94566c6003cb7a056fce565ced2896acd4b)

; comment-indent: Leave point where we used to.

(cherry picked from commit 30b7318a8f6c593fc6553a45445e84e4e50cd119)

Fix filename completion in Python shell (bug#77853)

'comint-filename-completion' may complete the filename at
wrong locations.  Users who want proper filename completion
should use specialized completion backends (e.g. Jedi).
* lisp/progmodes/python.el (inferior-python-mode): Remove
'comint-filename-completion' in 'comint-dynamic-complete-functions'.

(cherry picked from commit 46776cae052b9bb106ce322d700abbc7cccc4c77)

Improve help-fns-edit-variable for Lisp editing

Before d50c82f3e98e ("Simplify
'help-enable-variable-value-editing' using 'string-edit'"),
'help-fns-edit-variable' would open a buffer in 'emacs-lisp-mode'
and would not allow exiting that buffer with an invalid Lisp
expression.  Restore that functionality by enhancing 'string-edit'
to allow choosing a major mode and allow passing a function to
validate the buffer contents before returning.
* lisp/help-fns.el (help-fns-edit-variable): Call 'string-edit',
passing 'emacs-lisp-mode' and 'read'.
* lisp/textmodes/string-edit.el (string-edit--read): Add.
(string-edit): Add :major-mode and :read arguments and avoid
passive voice.
(read-string-from-buffer): Avoid passive voice in docs.
(string-edit-mode-map, string-edit-minor-mode-map)
(string-edit-mode, string-edit-minor-mode): Move 'string-edit'
keybindings to a minor mode.
(string-edit-done): Call 'string-edit--read' before exiting.
(Bug#77834)

(cherry picked from commit 8f58f55551341001119034f2e9f5fdc87d3abd54)

; Skip commit 5b635d8bd6b7b3353e103b2a20c502d700597082

; Skip commit 643ebbcac929ee8b2a30843250cddf112cab471f

nnfeed: Pass through list request failure reports

* lisp/gnus/nnfeed.el (nnfeed-request-list): Report the same
message reported by the inheriting backend on failure.
(Bug#74857)

(cherry picked from commit 0e2fd0e441b2cc7686450d8784707ebc6fbe4917)

Fix 'yaml-ts-mode' filling of comments (Bug#77095)

* lisp/textmodes/yaml-ts-mode.el (yaml-ts-mode--fill-paragraph):
Handle comment filling differently than block_scalars.
(yaml-ts-mode): Set 'comment-start-skip'.

(cherry picked from commit 417ee3a7f7c66f6c23c9bab7228bfb64014573dd)

Add cache to Python block navigation functions

* lisp/progmodes/python.el (python-nav-cache)
(python-nav-cache-tick): New variables.
(python-nav-cache-get, python-nav-cache-set)
(python-nav-with-cache): New functions.
(python-nav-beginning-of-block, python-nav-end-of-block): New
wrapper functions.
(python-nav--beginning-of-block): Renamed from
'python-nav-beginning-of-block'.
(python-nav--end-of-block): Renamed from
'python-nav-end-of-block'.  (Bug#77620)

(cherry picked from commit 9ae82726d8ea4530f26f2baa16b705ba3cd71834)

Performance optimization of 'python-info-statement-ends-block-p'

* lisp/progmodes/python.el (python-info-statement-ends-block-p):
Add a comparison of the indentation of the next statement with
the indentation of the current statement.  (Bug#77620)

(cherry picked from commit d753c884948499c0c557d01fefe5914f7d57573c)

Fix Python block end predicates (bug#77941)

* lisp/progmodes/python.el (python-info-statement-ends-block-p)
(python-info-end-of-block-p): Add consideration of comments.
* test/lisp/progmodes/python-tests.el
(python-info-statement-ends-block-p-3)
(python-info-end-of-block-p-3): New tests.

(cherry picked from commit 55cf15e163b407878921b4428e5436f01cf1fd90)

; Skip commit 7bb648eb804c6420cd0f76cd8075a0faa30a4bfd

; Skip commit a4bff5755120aebe6c240271b93e0f0cd8972c2a

; Skip commit 52b68f60544a0430265ae4cbbf7fdd16b457bf46

; typescript-ts-mode-multivar-indent-style: Add missing group.

(cherry picked from commit bacde21fde4794744eaaaf2f7f136ef0fdfbe0c8)

; typescript-ts-mode-multivar-indent-style: Use different example.

This prevents it becoming a hyperlink in *Help* buffers.

(cherry picked from commit 94d8f5b94fb6fa281f5ea3bb8a8d945628f3a188)

; typescript-ts-mode-multivar-indent-style: Fix use of apostrophes.

(cherry picked from commit 5a043bf3dfa42a6d9b8376687a2dc9e5fb71fe4a)

Add multivar indent style in typescript-ts-mode (bug#77803)

* lisp/progmodes/typescript-ts-mode.el:
(typescript-ts-mode-multivar-indent-style): New option.
(typescript-ts-mode--indent-rules): Support both styles.

(cherry picked from commit 3393644b715a4b5a1b438b556478cc9e45f3e0ad)

* Fix missing lexical-binding cookie warning on async compilation (bug#77918)

* lisp/emacs-lisp/comp-run.el (comp--run-async-workers): Fix missing
lexical-binding cookie warning on async compilation.

(cherry picked from commit 3098d34bfd13c4f06d90ee002fe00ca0de1b46cc)

lisp/auth-source.el (authinfo--keywords): Avoid obsolete font-lock face vars

(cherry picked from commit 48940a5d485649bfd6840ddaaf91c17fbe90dbc0)

; Change let* to just let in last change.

(cherry picked from commit 648453c04d9b91d96452b930c0c948b0b39b5dc0)

comment-indent: Handle BOL already within a multiline comment

* lisp/newcomment.el (comment-indent): Newly handle the case
that BOL is already within a multiline comment (bug#78003).
Thanks to Stefan Monnier for review and reworking the control
flow.

(cherry picked from commit a6829a0c35326361b2b04bd4a010a30fe99802b1)

; * test/lisp/arc-mode-tests.el ("7z"): Fix 7z entry.

(cherry picked from commit e38401e71bddaa16b6de4783fb90e75955faba38)

Detect more types of split zip archives

* lisp/arc-mode.el (archive-find-type): Detect more types of
split zip archives.
* test/lisp/arc-mode-tests.el (arc-mode-test-make-file)
(arc-mode-test-make-archive): Factor out functions from ...
(arc-mode-test-zip-ensure-ext): ... this test.
(define-arc-mode-test-on-type): Add macro to test function
`archive-find-type' and use the macro to test detection of
various archive types.  (Bug 77898)

(cherry picked from commit d74cbf0519edff34f334b62b4f163e98d51336e0)

Allow to disable 'lexical-binding'

* lisp/progmodes/elisp-mode.el (elisp-enable-lexical-binding):
Optionally, allow to disable 'lexical-binding'.

(cherry picked from commit eb6531ba942042a426390835ebddc83b7936d60f)

; Skip commit 3a95e1ede8269f9ba0c223383bc2e8b28e6f7413

; Improve documentation of last change

* etc/NEWS: Add entry about 'Custom-dirlocals-mode'.

* lisp/cus-edit.el (Custom-dirlocals-mode): Doc fix.  (Bug#77228)

(cherry picked from commit ccfb40a13d3d1d43990b9b659502a6ba2046059a)

Create major mode for `customize-dirlocals` (bug#77228)

* lisp/cus-edit.el (Custom-dirlocals-mode): New major mode.
(custom-dirlocals-with-buffer): Move settings to
`Custom-dirlocals-mode'.

(cherry picked from commit 6414ed0d1166b0f24515ce92bb6db2c3d718a96a)

New variable 'startup-echo-area-message-function'

; Simplify 'inhibit-startup-echo-area-message'.

; * src/w32dwrite.c: Minor coding style adjustments.

(cherry picked from commit 4b7816fc804813287e75544f8d016be6eca08873)

Add the keyword ':copy-queries' to 'treesit-language-source-alist'.

* lisp/treesit-x.el (define-treesit-generic-mode): Add keyword
':copy-queries t' to the end of 'source'.

* lisp/treesit.el (treesit-language-source-alist):
Document the keyword ':copy-queries'.
(treesit--install-language-grammar-1): Add &rest args.
Process the keyword args.  Call 'treesit--copy-queries'
when :copy-queries is non-nil.
(treesit--copy-queries): Add arg 'source-dir'.  Copy queries
from source-dir as well.  Copy only the file "highlights.scm".

(cherry picked from commit 261a965ff1a423c9dc0ee7c89974e4fc3c16b863)

; * src/w32dwrite.c (text_extents_internal): Fix typos in comments.

(cherry picked from commit d3f1f4923f73db617a69ac5d26d08809f814a811)

w32: change the way text is measured when using DirectWrite

Now the glyph outline is inspected directly to get its real size,
as the direct measuring functions give generic values for some
fonts.
* src/w32dwrite.c (data structures): Added data structures from
header files that are not present in the 32bit MinGW build
environment.
(text_extents_internal): Call GetGlyphRunOutline to get exact
glyph vertical bounds.  Add new parameter to make this optional
if case that information is not required.
(w32_dwrite_text_extents, w32_initialize_direct_write)
(w32_dwrite_draw): New parameter for 'text_extents_internal'.
(Bug#77171)

(cherry picked from commit 05480592898a2a33e7e683280456ada0d663bfd4)

; Skip commit 01f97fabfe1bde122cc64590523cf5499b1b6d8d

; Skip commit 79cef45a1204a2a9e4999ed6dd0db68db6ab7c41

Flymake: fix flymake-make-diagnostic for numeric code (bug#77856)

* lisp/progmodes/flymake.el (flymake-make-diagnostic): Tighten up
type requirements.
(Version): Bump to 1.4.1

(cherry picked from commit a25fc9a518dc1c4bf1ef86bb949ed2f3c995adea)

* lisp/desktop.el: Fix the recent cleanup.

(desktop-read): Use 'file-name-directory' on the file name
returned by 'locate-file'.

(cherry picked from commit 89b7e726f12f34c94c5f05f8972fa8a6a3ea56b5)

Eglot: (re)define 'eglot-mode-map'

Better support for Elisp icon names.

Replace some 'treesit-query-compile' with 'treesit-query-valid-p'.

* admin/tree-sitter/treesit-admin.el
(treesit-admin--verify-major-mode-queries)
(treesit-admin--validate-mode-lang):
* lisp/progmodes/csharp-mode.el
(csharp-ts-mode--test-this-expression)
(csharp-ts-mode--test-interpolated-string-text)
(csharp-ts-mode--test-string-content)
(csharp-ts-mode--test-type-constraint)
(csharp-ts-mode--test-type-of-expression)
(csharp-ts-mode--test-typeof-expression)
(csharp-ts-mode--test-name-equals)
(csharp-ts-mode--test-if-directive)
(csharp-ts-mode--test-method-declaration-type-field):
* lisp/progmodes/php-ts-mode.el
(php-ts-mode--test-namespace-name-as-prefix-p)
(php-ts-mode--test-namespace-aliasing-clause-p)
(php-ts-mode--test-namespace-use-group-clause-p)
(php-ts-mode--test-visibility-modifier-operation-clause-p)
(php-ts-mode--test-property-hook-clause-p):
* lisp/progmodes/typescript-ts-mode.el
(tsx-ts-mode--font-lock-compatibility-bb1f97b):
Use the newer equivalent 'treesit-query-valid-p'
instead of 'treesit-query-compile' with 'ignore-errors'.

(cherry picked from commit add8bf000aee39e40feacff7e0df7248fa4ef9c5)

* lisp/treesit.el (treesit-show-paren-data--categorize): Add docstring.

(bug#77906)

(cherry picked from commit 573a2c09b991df5442ab3b9984c2885011153333)

* lisp/treesit-x.el: Quote :parent in define-treesit-generic-mode.

(define-treesit-generic-mode): Support quoted symbol for parent.
(liquid-generic-ts-mode): Quote :parent like quoted all other properties.

(cherry picked from commit a7f35dc1770266ec7661c5af58611540489c5256)

* lisp/treesit-x.el: Use 'treesit-ensure-installed'.

(define-treesit-generic-mode): Append new item
to 'treesit-language-source-alist' instead of prepending.
(treesit-generic-mode-setup): Remove 'source' arg.
Use 'treesit-ensure-installed'.
(liquid-generic-ts-mode): Use 'treesit-ensure-installed'.
(alpinejs-generic-ts-setup): Run setup hook.
(treesit-generic-mode-font-lock-map): Add more mappings.

(cherry picked from commit 426c98bd96f6ab79f6f72f89cfde9759560ad64b)

Fix all issues for the case when tree-sitter is disabled.

* lisp/treesit.el (treesit-declare-unavailable-functions):
Declare 'treesit-language-abi-version' and 'treesit-library-abi-version'.

* lisp/progmodes/elixir-ts-mode.el (elixir-ts--range-rules):
* lisp/progmodes/heex-ts-mode.el (heex-ts--range-rules):
* lisp/progmodes/rust-ts-mode.el (treesit-language-source-alist):
Guard with 'treesit-available-p'.

(cherry picked from commit 8fb45fcaedbe1b89bab54406c8739404d0ad35bc)

desktop.el: Janitorial cleanup

* lisp/desktop.el: Remove redundant `:group` arguments.
Prefer #' to quote function names.
(desktop-var-serdes-funs): Improve docstring markup.
(desktop-clear, desktop-create-buffer): Use lexical-binding.
(desktop--v2s): Avoid (ab)use of ,@ which doesn't splice a list.
(desktop-outvar): Strength-reduce `eval` => `symbol-value`.
(desktop-create-buffer): Don't assume point-min==1.
(desktop-buffer): Belatedly mark as obsolete.
(desktop-read): Use `locate-file`.

(cherry picked from commit 2bf3790f374e0a162e05a470940f57b43a244ad7)

* src/androidfns.c (Fx_display_grayscale_p): Fix value on color displays.

(cherry picked from commit 057e990fba0975dae06bc365157dd4ff95bfd7a7)

Delete unused block-comment-start and block-comment-end

* lisp/newcomment.el (block-comment-start)
(block-comment-end): Delete.
(comment-indent):
* lisp/cedet/semantic/doc.el
(semantic-doc-snarf-comment-for-tag):
Remove use of the now-deleted variables.

(cherry picked from commit b2a77b6e01ba190d7b8e0943d8e64c97ed55947d)

Revert addition of electric-block-comment-mode & follow-up commits

As presently under discussion in bug#77823, the intended new
functionality is not really about comments at all.
Remove it for now to allow us to redesign from a clean slate,
and to deal with the regression reported in bug#77823.

This reverts the following three changesets:

Author:     Elías Gabriel Pérez <eg642616@gmail.com>
AuthorDate: Mon Mar 17 12:56:52 2025 -0600

  New minor mode: `electric-block-comment-mode'

Author:     Elías Gabriel Pérez <eg642616@gmail.com>
AuthorDate: Mon Mar 31 17:58:16 2025 -0600

  Add block-comment-start and block-comment-end to supported modes

Author:     Elías Gabriel Pérez <eg642616@gmail.com>
AuthorDate: Sun Apr 13 12:26:08 2025 -0600

  Add block-comment variables to cc-mode

(cherry picked from commit 4808f785ccb0166a87983405c6317ab2a4d6dfde)

Realloc less often in adjust_glyph_matrix (bug#77961)

* src/dispnew.c (adjust_glyph_matrix): Only xnrealloc when the
glyph matrix got wider or taller.

(cherry picked from commit 871ec9615a949e967bf7d19466eb9c56ed80ff7e)

Fix tree-sitter ABI version incompatibility in rust-ts-mode

* lisp/progmodes/rust-ts-mode.el (treesit-language-source-alist):
For ABI version 15 add the recommended version "v0.24.0".

(cherry picked from commit 6f30b9584f7feec395e4b6806ec2eda542639e98)

Make `man' more portable

* lisp/man.el (Man-init-defvars): Use [:cntrl:].  Character ranges
with octal numbers aren't portable enough.  (Bug#77944)

(cherry picked from commit fc5e905dc90e21b1a381bde42e22c06f45c17e16)

; Fix thinko in recent commit

(cherry picked from commit 45e849bddc1c7777628d3f42557ddbd8a6ba96b7)

Fix Flymake breakage following recent changes

; Skip commit 649bb9dcd9518a273f99fd56e40d921f6191cb69

; Skip commit 23583bb3a140883edda4ca8958f0447da75e0eea

Render lib/getloadavg.c patches more permanent

* admin/gnulib-patches/lib/getloadavg.c.diff: New file.

* admin/merge-gnulib (GNULIB_TOOL_FLAGS): Set --local-dir to
admin/gnulib-patches.

* lib/gnulib.mk.in: Update from Gnulib.

(cherry picked from commit a84a934a4481d35ab2200f8dedc9ed3af6a5571d)

Eglot: use richer diagnostic-making capability of Flymake 1.4.0

* lisp/progmodes/eglot.el (Package-Requires): Require Flymake
1.4.0.
(eglot-handle-notification): Tweak.

(cherry picked from commit 7ac6b33560a0449eb4b69664790f97124bfc2933)

; Skip commit 64f4fbde8ae84c10f9e86ad1293c67ff78e867f0

; Skip commit 3001d50d9ae6e41b3f1d8e576b13a85198f60da9

; Skip commit 77cd3a406b500f4106dde4b925fe4fec30b4a2fb

; Skip commit 53d732d775fb416f6a412c2a87f12beed682c96c

Flymake: new flymake-diagnostic-format-alist (bug#77439, bug#77480)

* lisp/progmodes/flymake.el (flymake-diagnostic-text): Overhaul.
(flymake-diagnostic-format-alist): New defcustom.
(flymake--diagnostic-format): New util.
(flymake--eol-overlay-summary)
(flymake--highlight-line)
(flymake-eldoc-function): Use flymake--diagnostic-format.
(flymake--tabulated-diagnostic-origin): New helper.
(flymake--tabulated-entries-1): Use flymake--tabulated-diagnostic-origin.
(flymake--diagnostics-base-tabulated-list-format): "Backend" -> "Origin"

* doc/misc/flymake.texi (Customizable variable): Mention new variable.

(cherry picked from commit ed1311a62a4e02817e548b0873ab21114047c076)

Flymake: more powerful flymake-make-diagnostic and rework manual

Flymake backends may now explicitly specify an origin and a code for a
diagnostic in addition to the textual description.  This change lays
groundwork for richer diagnostic listings and user options for
summarizing diagnostics, addressing bug#77439 and bug#77480.

* doc/misc/flymake.texi (Flymake API): Rename from "Extending
Flymake".  Rework.
(Inspecting diagnostics): New section.

* lisp/progmodes/flymake.el (flymake--diag): Add origin, code and
message.  Remove text.
(flymake-make-diagnostic): Support new origin, code and message.
(flymake-diagnostic-text): Rework.

(cherry picked from commit 0fe05a920adc457d6f4adca71979059b8e2d0253)

* lisp/treesit.el (treesit-show-paren-data--categorize): Fix off-by-one error.

(bug#77906)

(cherry picked from commit b38fd553eb3291f140801ca158f6ab245496fa69)

* lisp/treesit.el (treesit-cycle-sexp-type): Add optional arg 'interactive'.

Display the message only for interactive usage.

(cherry picked from commit d7b56fc2ee9d32f6fd9f3b6e8d3772fb714f0f32)

; * test/infra/Dockerfile.emba: Add cmake/markdown/php/phpdoc/toml/yaml.

(cherry picked from commit 4151a44f605631d8d4028e1c2458a0a8c206a64d)

Fix indentation test failure for elixir-ts--indent-rules

* lisp/progmodes/elixir-ts-mode.el (elixir-ts--indent-rules):
Add query for Elixir embedded in Heex (bug#76788).

* lisp/progmodes/heex-ts-mode.el (heex-ts-mode): Append
treesit-simple-indent-rules to elixir-ts--indent-rules.

(cherry picked from commit 25854625332b0f751e0cea3e4d598023cbfc2781)

Fix emerge.el for remote files

* lisp/vc/emerge.el (emerge-make-diff-list)
(emerge-make-diff3-list): Set proper `default-directory' in order
to support remote files.  (Bug#6850, Bug#74352)

* test/lisp/vc/emerge-tests.el: New file.

(cherry picked from commit 8c04396b198e81c1467314e44b720e3322ca8643)

; Skip commit 2f2fbae88280a460d2750ee685351475145e9d55

; Pacify free variable warning in vc-git.el

* lisp/vc/vc-git.el (log-edit-font-lock-keywords): Defvar.

(cherry picked from commit 6fb2a4691f4d53473c0a326d3a6c23df9008b6e8)

Temporary fix for compilation on Android API levels <= 13

* lib/getloadavg.c (getloadavg): Don't use sysinfo on Android
API levels <= 13.  This will be resolved in Gnulib shortly, with
any luck.

(cherry picked from commit 57966a3350e17b449697638d6adb1ed1d63bf8d5)

Fix indentation of "{" on a new line of a function declaration

* lisp/progmodes/js.el (js--treesit-switch-body-helper): New
anchor helper function for the switch_body.
(js--treesit-member-chained-expression-helper): New anchor
helper function for chained calls in member_expression.
(js--treesit-arrow-function-helper): New anchor helper
function for arrow_function.
(js--treesit-indent-rules): Fix rule for the indentation of
"{" when of a new line of a function declaration.  (Bug#76704)
Fix the indentation of the parent of arrow_function, member_expression,
switch_body, ternary_expression and sequence_expression.

(cherry picked from commit 4428077c2bea73570cfe9f9d6b40809aeda7f5c9)

Omit trailing white space in one line

* oldXMenu/Recomp.c: Omit trailing spaces in C source code line.
This was the only such line found by this command:
grep '[  ]$' $(git ls-files | grep '\.[chmy]$')

(cherry picked from commit 372ce97180930b63fdd15d1d89fb1a519d4cf85f)

Use -Wtrailing-whitespace when warning

* configure.ac: When enabling GCC warnings, enable GCC 15’s new
-Wtrailing-whitespace option if available, as that’s the Emacs style.

(cherry picked from commit 589f596c96964ecf5e736a4b3b674ede4b193910)

Pacify GCC 15 -Wunterminated-string-initialization

* src/fns.c (hexbuf_digest):
* src/json.c (json_out_string):
Add ATTRIBUTE_NONSTRING to character arrays that are not strings.

(cherry picked from commit e2fb12a40ca2b90dfedbfe916ed8a87345ca89f1)

Pacify GCC 15 -Wanalyzer-null-dereference

* src/emacs.c (find_emacs_executable): Add an eassume.
This pacifies -Wanalyzer-null-dereference with gcc (GCC) 15.0.1
20250329 (Red Hat 15.0.1-0).

(cherry picked from commit 67ae1790088616777b352acffc63aeeb7ee50cb6)

Avoid name clashes with static GnuTLS

Work around a bug in GnuTLS 3.7.11 and earlier: when built
statically, its mistakenly exports symbols hash_lookup and
hash_string, which collide with Emacs symbols of the same name,
preventing temacs from linking statically.  Problem reported by
Greg A. Woods (Bug#77476).

Because GnuTLS never uses hash_lookup or hash_string this issue
ordinarily doesn’t seem to prevent temacs from linking to GnuTLS
on GNU/Linux, as it’s linked dynamically and the dynamic linker
never needs to resolve references to either symbol.  However, I
suppose a clash or bug could occur even with dynamic linking if
Emacs later loads a module that uses either symbol.

Although GnuTLS should be fixed, Emacs should link statically to
current and older GnuTLS versions in the meantime, and it should
avoid potential problems with dynamic linking.  Renaming the two
clashing names is an easy way to do this.  For consistency with
the new name for hash_lookup, also rename hash_lookup_with_hash
and hash_lookup_get_hash.

* src/fns.c (hash_find_with_hash): Rename from hash_lookup_with_hash.
(hash_find): Rename from hash_lookup.
(hash_find_get_hash): Rename from hash_lookup_get_hash.
(hash_char_array): Rename from hash_string.
All uses changed.

(cherry picked from commit c8eed90eb4d0583dc3463edfad176b9d3f98d11f)

Update from Gnulib by running admin/merge-gnulib

(cherry picked from commit 71ee484cac3e0e5b68f006b4cca81c13ca6ce11e)

Don’t use Gnulib’s locale-h module

* admin/merge-gnulib (AVOIDED_MODULES):
Add locale-h, as Emacs should’t need this Gnulib module.
This change is needed for when we next run admin/merge-gnulib,
as some Gnulib dependencies changed recently.

(cherry picked from commit 30335bb73483fce9d4204f1e18618fe777d0f45e)

Pacify "statement not reached" in value_cmp

Problem found by Oracle Developer Studio 12.6.
* src/fns.c (value_cmp): Omit unnecessary goto.

(cherry picked from commit 4fa10b5760c7ded3cc18d0da614a5f0cd38edfef)

Fix libsrc assumption in src/Makefile.in

* src/Makefile.in (ETAGS): Don’t assume $(libsrc) = ../lib-src.

(cherry picked from commit 03a1df37990049c2ad9491b150a8983355a213f8)

vc-user-edit-command: Add trailing space to initial input

* lisp/vc/vc-dispatcher.el (vc-user-edit-command): Add trailing
space to initial input to ease adding additional flags.

(cherry picked from commit 45232485aef3e44e9106f605ecf155de8f707edb)

Fix seccomp-filter for newer Linux kernels

* lib-src/seccomp-filter.c (MAP_DROPPABLE): Define if undefined.
(main): Use MAP_DROPPABLE flag.  Allow `tcgetattr' call of glibc
on physical terminal devices.  (Bug#77232)

(cherry picked from commit 8abd2ee0526ba576aefefa51870443ef01a4b2dd)

Fix 'rfc6068-parse-mailto-url' with 'inhibit-eol-conversion'

* lisp/mail/rfc6068.el (rfc6068-parse-mailto-url): Fix EOL type to
CRLF and never inhibit EOL conversion in decoding.  (Bug#77776)

(cherry picked from commit 2cf545f47dc945b8ebff641af7e15798ddd419c2)

; Skip commit 6b901a8e85987940738b21032b035ba4e8f7379b

; Skip commit fe8e88a1df593ec1cb0b96cbeb9f0ca832686258

Tweak AppStream metadata to satisfy `appstream-util validate'

* etc/emacs.metainfo.xml: `appstream-util validate' suggests that
screenshot height and width attributes should match the actual size of
the image, and that captions be no longer than 50 chars and do not end
in `.'.  Follow those rules.

(cherry picked from commit b3fb93e0e88bb06c1bfdfa6a0c35ec5e146d94e5)

Add AppStream metadata about supported and recommended hardware

* etc/emacs.metainfo.xml: Note that Emacs is best with a keyboard, but
other forms of input are possible.  Also note that Emacs can access the
Internet.  A modestly sized display is sufficient.

(cherry picked from commit 4f3188a88c04602d151585dce3e93a5cff38a967)

; Fix failing diff-mode tests

* test/lisp/vc/diff-mode-resources/git.patch: Delete file, moving
its contents to...
* test/lisp/vc/diff-mode-tests.el (diff-mode-tests--git-patch):
...this new variable.  Git merges kept deleting a trailing
whitespace in the patch signature, so let's do this instead.
(diff-mode-test-git-patch)
(diff-mode-test-git-patch/before-first-hunk)
(diff-mode-test-git-patch/signature): Use above new variable.

(cherry picked from commit 87d615e26cc565cd49be79d08116354341d1af93)

; Delete superfluous comments explaining config.h

* src/pgtkfns.c:
* src/pgtkim.c:
* src/pgtkmenu.c:
* src/pgtkselect.c:
* src/pgtkterm.c:
* src/termcap.c:
* src/tparam.c: Delete superfluous comments explaining config.h.

(cherry picked from commit fa4e686148de22cee0b1671fd6b3241212c110a6)

xterm.c: Move GTK3-specific variables into narrower scopes

Avoid declaring GTK3-specific variables in larger-than-necessary scopes,
especially under #ifdefs.  Instead, declare them where used.  This improves
readability and reduces #ifdef clutter without changing behavior.

* src/xterm.c: [HAVE_GTK3] (x_update_opaque_region):
(XTframe_up_to_date, x_new_focus_frame, handle_one_xevent)
(x_ignore_errors_for_next_request, x_stop_ignoring_errors): Clean up
variable declarations.

(cherry picked from commit 177accc53d7ed2afc5768ae117fc6a19749e8fb6)

* lisp/progmodes/heex-ts-mode.el (heex-ts): Fix :group name.

(cherry picked from commit 2a45f0bceba4f39fdc354e46ad686040f474e0e4)

; Improve the documentation of a recent commit

* etc/NEWS:
* doc/lispref/frames.texi (Deleting Frames): Improve documentation
of 'frame-deletable-p'.

(cherry picked from commit 37b2c2fcdd9344f33f843d3fd5f9129babdf172f)