Add command to clear erc-track's mode-line indicator

* etc/ERC-NEWS: Mention new command `erc-track-clear'.
* lisp/erc/erc-track.el (erc-track-clear): New command to reset buffer
activity indicator in ERC's mode-line construct.  (Bug#75014)

(cherry picked from commit 63cc335a524ab5b6fb8e9bc93041382baf1321db)

Reuse process in erc-server-delayed-check-reconnect

* doc/misc/erc.texi (Integrations): Set `erc-server-reconnect-function'
to `erc-server-delayed-check-reconnect' in SOCKS example, and add
definition for `erc-open-socks-tls-stream'.  Mention possible
inaccuracies related to error detection with certain reconnect
strategies.
* lisp/erc/erc-backend.el (erc-server--reconnect-opened): New function.
(erc-server-delayed-check-reconnect): Attempt to reuse process if server
sends a complete PONG, and attempt to accommodate connectors that set
:nowait to nil.
(erc--server-delayed-check-connectors): Remove variable.
(erc-server-prefer-check-reconnect): Inline what was the internal
variable `erc--server-delayed-check-connectors' because it's no longer
used in unit tests.  Add `erc-open-socks-tls-stream' to the set of
connector functions thought to be compatible with the "check" reconnect
strategy.
* test/lisp/erc/erc-scenarios-base-auto-recon.el
(erc-scenarios-base-auto-recon-no-proto): Adapt to expect "reuse" behavior.
* test/lisp/erc/resources/base/reconnect/ping-pong.eld: Delete unused file.
* test/lisp/erc/resources/base/reconnect/unexpected-disconnect.eld:
Capture PING cookie to send back to client.
* test/lisp/erc/resources/erc-d/resources/proxy-solo.eld: Delete unused
file.  (Bug#62044)

(cherry picked from commit f5ebe47ba7723919f09adf8f28d896cfa8757842)

(package--download-and-read-archives): Fix bug#75065

* lisp/emacs-lisp/package.el (package--download-and-read-archives):
Include the error info in the error message.
Suggested by Konstantin Kharlamov <Hi-Angel@yandex.ru>.
(package-refresh-contents, package-menu--perform-transaction):
Use `error-message-string`.

(cherry picked from commit a99e1cc745047977b0b7cbd25fe9df66e9c86a39)

Don't start docstrings with "This function" or similar

* lisp/calculator.el (calculator-add-operators):
* lisp/erc/erc-backend.el (erc-server-ping-handler):
* lisp/erc/erc-log.el (erc-generate-log-file-name-with-date):
(erc-generate-log-file-name-short):
* lisp/erc/erc-track.el (erc-track-shorten-function):
* lisp/eshell/em-smart.el (eshell-where-to-jump):
* lisp/eshell/esh-mode.el (eshell-begin-on-new-line):
* lisp/gnus/gnus-art.el (gnus-prompt-before-saving):
* lisp/mail/supercite.el (sc-cite-region-limit):
* lisp/net/nsm.el (network-security-protocol-checks):
* lisp/org/org-element.el
(org-element--cache-avoid-synchronous-headline-re-parsing):
* lisp/progmodes/hideif.el (hif-merge-ifdef-region):
* lisp/progmodes/modula2.el (m2-indent):
* lisp/progmodes/xscheme.el (xscheme-running-p):
(xscheme-control-g-disabled-p):
* lisp/tab-bar.el (tab-bar--event-to-item):
* lisp/which-key.el (which-key--hide-popup): Don't start docstrings with
"This function" or "This variable".

(cherry picked from commit 186ea407326166ee4669ce6fe84871c1e16c657c)

Enable indent-tabs-mode in obj-c-mode

* .dir-locals.el (obj-c-mode): Enable indent-tabs-mode.

(cherry picked from commit cb8ce2e68bb68844971695e139ae93bd320bc0d8)

Fix comment indent in 'lua-ts-mode' and old grammar

* lisp/progmodes/lua-ts-mode.el (lua-ts--simple-indent-rules):
Improve multi-line comment indention for pre-0.0.19 grammars that
used a different structure for comment start/end markers.
(Bug#75107)

(cherry picked from commit 54f35137096c8120df13653f287a92755d5036b6)

* admin/nt/dist-build/build-dep-zips.py: (deps src) handle zst

This patch fixes various problems preventing this script from
working. The job of this script is to collect Emacs' dependanicies and
the (MSYS2/MinGW64) source archives for dependancies (including 2nd
etc. order dependancies) into zip archives.  GPL requires distributing such
archives (along with Emacs' own sources) when distributing GPL binaries.

Most principle of the changes is support for MSYS2 "w64" source archives
in zst format; previously this script assumed all sources were available
as tar.gz files.   Additionaly several DLLs are added to list of
required, including sqllite3 and tree-sitter.

In general this is a maintaince fix to ensure others have access to the
code used to create pretest (and, presumably release) version of Emacs
30.  Additional changes are required to progmatically identify changes
in Emacs' dependancies (e.g. after building a new Emacs binary for
distribution).  There is commented out code to this effect in the
changes I've installed which did work, for a brief period in time; I
suspect some changes in MSYS2 made it more difficult (or impossible?) to
invoke the MSYS2 shell (under which this python script must run) from
the MINGW64 (under which Emacs is built).  I may resort to a powershell
script as a way to orchistrate/invoke both MSYS2 and MING64 but I'm
currently still messing with a Makefile based approach (which would run
under MINGW64), in any event I believe we're all agreed this script
must interigate Emacs to create the "starting list" of dependancies to
include as a way to resolve this issue (missing/incorrect deps are
frequent source of broken binary releases).  (bug#65206)

(cherry picked from commit 8b95549e9087fc54be3d849470652d38ec64cbff)

; Skip commit 8064b2a67988e815c52e289fe2a235ce1008776f

; etc/w32-feature.el (harfbuzz): improve test

This enable the tests to be used with batch (Bug#68919), e.g.

emacs.exe -l etc/w32-feature.el --batch -eval \
  '(ert-run-tests-batch-and-exit)'

(cherry picked from commit c29b798537eb9573b8f34fa2e91c0e136a095fb4)

* admin/nt/dist-build/emacs.nsi: (Uninstall) delete only one Emacs

Previously, the uninstaller would recursively, unconditionally, remove
the parent folder in which Emacs was installed (the folder selected by
when running the installer), into which the installer places a folder
named for the given release (e.g. emacs-30.1).  This was a problem
during uinstalation when the selected folder contained other versions of
Emacs the user did not wish to remove.  Additionally, deleting Start Menu
short-cuts did not work (bug#68756).

Some installer language now better reflects that users are not
required to "Accept" the GNU Public License in order to use (etc.)
Emacs (bug#67667).

Users selections related to where to create (or not create) Start Menu
shortcuts are no longer ignored. (bug#75013)

Emacs (as installed by the installer) can now be uninstalled via
Windows' Add/Remove Progrms Control Panel.

The uninstaller will now remove (empty) parent folders, both under
Program Files and (when creation of shortcuts is enabled) under the
select Start Menu location.

(cherry picked from commit 0e43e35f96e5c3c10a200ebe8fe77c60e0db7c4a)

; * etc/tutorials/TUTORIAL.ko: Fix the beginning.

(cherry picked from commit b83cd8a8fb0e24057d6ab66afa53b25699e34bf1)

; * etc/publicsuffix.txt: Update from upstream.

(cherry picked from commit 41caccc488b6fa23220e8dc41e0818fea705ae04)

; Fix refcards

* etc/refcards/sk-survival.tex (section{Značky (tags)}):
* etc/refcards/sk-refcard.tex (section{Tagy}):
* etc/refcards/ru-refcard.tex (section{Теги}):
* etc/refcards/pt-br-refcard.tex (section{Tags}):
* etc/refcards/pl-refcard.tex (section{Tags}):
* etc/refcards/fr-survival.tex (section{Marqueurs}):
* etc/refcards/fr-refcard.tex (section{Tags}):
* etc/refcards/de-refcard.tex (section{Tags}):
* etc/refcards/cs-survival.tex (section{Značky (tags)}):
* etc/refcards/cs-refcard.tex (section{Tagy}):
* etc/refcards/survival.tex (section{Tags}):
* etc/refcards/refcard.tex (section{Tags}): Fix 'M-,' and 'M-*'.

(cherry picked from commit e6fb18406ee732cae7ba354fde40f6c88645e66e)

; Update acknowledgments for Emacs 30

* admin/release-process: Suggest a command to compare source
trees.

* doc/emacs/emacs.texi (Acknowledgments):
* doc/emacs/ack.texi (Acknowledgments): Add authors of new stuff
in Emacs 30.

(cherry picked from commit 14e791f9ba2c67a4613800aad2e9938207ac10ca)

; Fix node name in emacs-lisp-intro.texi

* doc/lispintro/emacs-lisp-intro.texi
(Lexical vs Dynamic Binding Example): Renamed from "... vs. ...",
to avoid using period in node names.

(cherry picked from commit 861b7864fc4b8319a8f8756f02e9a4cfcc25bbfe)

; Update version tags of defcustoms

* admin/release-process: Expand on 'cusver-check'.

* lisp/editorconfig.el (editorconfig-indentation-alist)
(editorconfig-trim-whitespaces-mode):
* lisp/eshell/em-cmpl.el (eshell-cmpl-remote-file-ignore):
* lisp/eshell/esh-ext.el (eshell-explicit-remote-commands):
* lisp/gnus/nnfeed.el (nnfeed-date-format):
* lisp/net/newst-ticker.el (newsticker-ticker-period):
* lisp/progmodes/cc-vars.el (c-warn-ids-with-dollar):
* lisp/progmodes/cperl-mode.el (cperl-fontify-trailer):
* lisp/progmodes/eglot.el (customize-package-emacs-version-alist)
(eglot-events-buffer-config, eglot-confirm-server-edits)
(eglot-prefer-plaintext):
* lisp/progmodes/flymake.el (customize-package-emacs-version-alist):
* lisp/progmodes/ruby-mode.el (ruby-rubocop-use-bundler):
* lisp/progmodes/verilog-mode.el
(verilog-indent-ignore-multiline-defines)
(verilog-indent-ignore-regexp, verilog-indent-class-inside-pkg)
(verilog-align-decl-expr-comments)
(verilog-align-comment-distance, verilog-align-assign-expr)
(verilog-align-typedef-regexp, verilog-align-typedef-words)
(verilog-fontify-variables):
* lisp/register.el (register-preview-display-buffer-alist):
* lisp/vc/vc-annotate.el (vc-annotate-use-short-revision): Add
missing :version tags and additions to
'customize-package-emacs-version-alist' as appropriate.

(cherry picked from commit 77243ba5be8c8e5319c4b07fabed6fee66e6ac7f)

;* doc/misc/efaq.texi (New in Emacs 30): Mention 'trusted-contents'.

(cherry picked from commit fe2ac33bae817d1ae48dde81233b41a7ff6bcf53)

; Skip commit 8fb884f0dc0d33cc6515f4d5c19c733c51df8441

Improve D-Bus and Tramp manual

* doc/misc/dbus.texi (Overview):
* doc/misc/tramp.texi (GVFS-based methods): Describe, how the
feature can be checked at runtime.  (Bug#75004)

(cherry picked from commit e281355a5e88771b66afe35f425ce09064ef5147)

Use 'alist-set' in a few more places

Fix typo

Don’t include stdlib.h from conf_post.h

This is brittle, as evinced by the recent problem with lib/stdlib.c.
* src/conf_post.h: Move potential inclusion of stdlib.h and
redefinitions of malloc, free, realloc, aligned_alloc, and calloc
from here ...
* src/lisp.h: ... to here.  Do not redefine the symbols
if UNEXMACOS_C is defined.
* src/unexmacosx.c: Do not undef malloc, realloc, free.
(UNEXMACOS_C): New symbol, to prevent lisp.h from defining them.

(cherry picked from commit 577714e3fe722625236ce060f53b5d76f7933454)

Add scheme-mode indentation rules for SRFI 227 and 253

* lisp/progmodes/scheme.el: Add properties for SRFI 227 and SRFI 253
identifiers.  (Bug#75126)

(cherry picked from commit 099e439ea99d794502f403b6de53b8589d7b6d6e)

Improve cherry.el

makeinfo-run-command: Use texi2any when makeinfo doesn't exist

* lisp/textmodes/makeinfo.el (makeinfo-run-command): Use texi2any when
makeinfo does't exist.  (Bug#75123)

(cherry picked from commit 76170ea5a0dff45d3feedf523c4c6809f1a56a59)

Prefer defvar-keymap in two-column.el

* lisp/textmodes/two-column.el (2C-mode-map, 2C-minor-mode-map):
Convert to defvar-keymap.

(cherry picked from commit 43b81b7ecaf465eef268dd2cd94f00a0c4da87ea)

Use with-environment-variables in more places

* lisp/gnus/gnus-search.el (gnus-search-run-search):
* lisp/man.el (Man-completion-table):
* lisp/progmodes/cperl-mode.el (cperl-pod-to-manpage):
* test/src/fileio-tests.el (fileio-tests--relative-HOME):
Prefer 'with-environment-variables'.

(cherry picked from commit 4f942b4994df82b9ba7ee10a75008b2338e38fc3)

Let Gnulib deal with MB_CUR_MAX

Recent Gnulib should work around the Android NDK 16
MB_CUR_MAX bug, so Emacs no longer needs to worry about it.
* configure.ac (gl_STDLIB_H):
Remove, to stop overriding Gnulib.
* configure.ac (__ctype_get_mb_cur_max)
(emacs_cv_broken_mb_cur_max, REPLACEMENT_MB_CUR_MAX):
* src/conf_post.h (MB_CUR_MAX):
Remove, as Gnulib does this now.

(cherry picked from commit a51642ba5fad891239552fe7e746fa160e3f88ea)

Update from Gnulib by running admin/merge-gnulib

(cherry picked from commit cf5e58a14dedabd65dee297ee2a2abb05cd4449d)

Drop support form gnome-moz-remote from browse-url

* lisp/net/browse-url.el (browse-url-gnome-moz-program)
(browse-url-gnome-moz-arguments, browse-url-gnome-moz): Delete
functions and variables obsolete since Emacs 25.1.

(cherry picked from commit 85ca91ff912da7c3a672e4bfe6ce103a23ddec73)

Improve flag variable names in uniquify

* lisp/uniquify.el (uniquify-after-kill-buffer-flag)
(uniquify-trailing-separator-flag): Rename from
'uniquify-after-kill-buffer-p' and 'uniquify-trailing-separator-p', to
better adhere to our conventions.  Update all users and leave old names
as obsolete variable aliases.

(cherry picked from commit 85f5be491e001d30b80e853ee028b80812577071)

Fix format specifier warnings in nsterm.m

Resolve warnings caused by mismatched format specifiers in `NSLog` and
`fprintf` calls.

This was observed when compiled with Clang version
19.1.6 (arm64-apple-darwin).

Warnings fixed:
- "format specifies type 'unsigned int' but the argument has type
  'IOReturn' (aka 'int')"

* src/nsterm.m: Cast `IOReturn` (aka `int`) to `unsigned int` for `%x`
format specifiers in `NSLog`.  (Bug#74971)

(cherry picked from commit ab3888515694f89a24f64e94292c578af86eeaee)

Ensure Dired window is selected when reverting buffer

* lisp/dired.el (dired--make-directory-clickable): Ensure the
Dired window is selected.  This prevents erroneously reverting a
non-Dired buffer.  (Bug#74700)

(cherry picked from commit bdc21b246cdb6fe3d977222ab7566cfdf889a38c)

Set marker insertion type for Imenu markers

* lisp/imenu.el (imenu-default-create-index-function)
(imenu--generic-function): Configure Imenu markers to advance
their position when characters are inserted at the marker
position.  (Bug#75072)

(cherry picked from commit dc4b8d198bab5363e139853f656ff553dcdeeeb5)

; Skip commit 6412a5503c404bbe177879d113c2299288c76ccd

Show the keybinding next to command in calc's x

* lisp/calc/calc-ext.el (calc-execute-extended-command): Use
M-x's ':affixation-function' to show the keybinding of the calc
command next to its name.  (Bug#74829)

(cherry picked from commit aaacd5806c75019b052a69764ef4d193d243573c)

ruby-ts--s-p-query: Put '_' syntax on ?! method definitions

* lisp/progmodes/ruby-ts-mode.el (ruby-ts--s-p-query):
Put 'symbol' syntax on method definitions ending with [?!].
Reported in https://github.com/dgutov/robe/issues/149.

(cherry picked from commit b561f896b5e52d3e4571901fd5d545354ba29bac)

ruby-ts-mode: Refine the forward-sexp improvement

* lisp/progmodes/ruby-ts-mode.el (ruby-ts--sexp-list-p):
New function (bug#73404).
(ruby-ts-mode): Use it in sexp-list thing definition.

(cherry picked from commit 704aa2b6ebaa0e19f72dcc2e8c0f1a02aa6eadbb)

; Fix documentation of recent additions to treesit.el

* lisp/treesit.el (treesit-language-display-name-alist)
(treesit-language-display-name): Doc fixes.

* etc/NEWS: Fix wording of entry announcing the above.

(cherry picked from commit e96727f0ea0986bffe7ff235e5abc5354e63a64d)

; * doc/lispref/modes.texi (Imenu): Fix wording and markup.

(cherry picked from commit d70ef80868996b9119f032cd13911c600436e29f)

* lisp/treesit.el: Improvements for treesit-explore-mode (bug#75079)

(treesit-explorer-switch-parser): Don't use completing-read
on the single parser.
(treesit-explore-mode): Don't save treesit-explore-mode to the desktop.

(cherry picked from commit c09e056c43e344c5adda08ef819252824cff0ef0)

Improve dictionary-switch-tooltip-mode docstring

* lisp/net/dictionary.el (dictionary-switch-tooltip-mode): Fix
docstring and argument name.

(cherry picked from commit 1e40be0ab830852ff5e2330c50f8b047d9ebe338)

Fix checkdoc warnings in dictionary.el

* lisp/net/dictionary.el (dictionary-tool-bar-map): Add missing period.
(dictionary-process-popup-replies)
(dictionary-read-definition)
(dictionary-display-tooltip): Rename ignored parameters.
(dictionary-tooltip-track-mouse): Describe what function does, not just
when.
(dictionary-switch-tooltip-mode): Reword docstring in terms of ON
parameter.  (Bug#68684)

(cherry picked from commit 7cda5e7f0272d766bd2090a274faeb7776303f46)

; * etc/NEWS: Update tree-sitter NEWS.

(cherry picked from commit 8c7db480ead8ef623a382fcd990dd91486616dca)

Add treesit-aggregated-simple-imenu-settings

Now we support setting up Imenu for multiple languages

* doc/lispref/modes.texi: Update manual.
* lisp/treesit.el:
(treesit-aggregated-simple-imenu-settings): New variable.
(treesit--imenu-merge-entries): New function.
(treesit--generate-simple-imenu): This was previously
treesit-simple-imenu.
(treesit-simple-imenu): Support
treesit-aggregated-simple-imenu-settings.
(treesit-major-mode-setup): Recognize
treesit-aggregated-simple-imenu-settings.
* test/src/treesit-tests.el (treesit-imenu): New test.

(cherry picked from commit e2a9af431191d5c71e2ca7a4347ce9e435e8cca0)

; Add some shortdoc examples for treesit entry

* lisp/treesit.el: Add some shortdoc examples.

(cherry picked from commit 833494d4b00a837be8ceaa09b37f54ce17d0a062)

Add treesit-language-display-name

* lisp/treesit.el:
(treesit-language-display-name-alist): New variable.
(treesit-language-display-name): New function.
* doc/lispref/parsing.texi (Language Grammar): Add to manual.
* etc/NEWS: Add to NEWS.

(cherry picked from commit 251b4c8c39535fee9f6da89420483304274ac03e)

Add treesit thing 'sexp-list' to c++-ts-mode (bug#73404)

* lisp/progmodes/c-ts-mode.el (c-ts-mode--thing-settings):
Add C++ 'sexp-list' nodes for 'treesit-thing-settings'.

(cherry picked from commit 563e5868f6dbab59937ad247b45b488f5523ad3c)

Add treesit thing 'sexp-list' to tsx-ts-mode (bug#73404, bug#73978)

* lisp/progmodes/typescript-ts-mode.el (tsx-ts-mode):
Add 'sexp-list' to 'treesit-thing-settings' with "jsx" things.
(typescript-ts-mode--sexp-list-nodes): Remove "jsx" things.

(cherry picked from commit b061c01607aa43b8ffa1b5c4a90c3602497cf823)

* lisp/progmodes/typescript-ts-mode.el: Fix regexp-opt of treesit-thing.

(typescript-ts-base-mode): Add arg 'symbols' to regexp-opt of 'sexp',
'sexp-list', 'sentence', 'text' (bug#73404, bug#74366, bug#74963).
(tsx-ts-mode): Add arg 'symbols' to regexp-opt of 'sexp', 'sentence'.
This avoids such mismatches as "string_fragment" by "string".

(cherry picked from commit f0afebb99158be3db1d9623758321622a1026c8d)

; Update c-ts-mode and c++-ts-mode's verified revision

* lisp/progmodes/c-ts-mode.el: Update revision.

(cherry picked from commit 7ac7ebef6cde9942905c45126cc6ef2bab01dc10)

Include lightweight tags in treesit-admin--verify-major-mode-queries

* lisp/treesit.el (treesit--language-git-revision): Include
lightweight tags as well.

(cherry picked from commit 32ad7342893833058ca2f7f8eca667bd32d42ea0)

Fix cmake-ts-mode font-lock queries

This commit in tree-sitter-cmake removed angle brackets:

https://github.com/uyha/tree-sitter-cmake/commit/a414a4c83d54388f596269639c175a5b84bfa929

* lisp/progmodes/cmake-ts-mode.el
(cmake-ts-mode--font-lock-settings): Remove angle brackets.

(cherry picked from commit 4def541bbfe67b1a492e8a3b6041a1d8f76d680b)

Create a blobless clone in treesit-admin--verify-major-mode-queries

* admin/treesit-admin.el (treesit-admin--verify-major-mode-queries):
Create a blobless clone.
* lisp/treesit.el (treesit--install-language-grammar-blobless):
New variable.
(treesit--git-clone-repo): Support blobless clone.

(cherry picked from commit 93755ea1a6113e115ac3349b67e58e2f3fd03894)

; Minor comment improvement in c-ts-common--adaptive-fill-prefix

* lisp/progmodes/c-ts-common.el (c-ts-common--adaptive-fill-prefix):
Improve comment.

(cherry picked from commit 8d7cba7bbf8fe83bbf9a9d8cae963983f3bca8cf)

; * .mailmap: Fix UTF-8 issue.

(cherry picked from commit 6ac38396898e6324d4c6dddb2ad05d1ad0dc5e7c)

Avoid U+FFFD in commit messages

* build-aux/git-hooks/commit-msg:
Also check against U+FFFD REPLACEMENT CHARACTER in commit messages.

(cherry picked from commit 28c420afab6a0944a192c30ff2d5d9e40c88f14f)

New commands 'elisp-next/prev-occurrence'

Trust nothing by default

scope.el: Minor cleanup

New hook 'read-shell-command-minibuffer-setup-hook'

scope.el: Disregard symbol shorthands

* configure.ac (dbus): Default to ifavailable.  (Bug#75004)

(cherry picked from commit b1de495eeae9afc8abccd908e5c53c463afdb7dc)

Make 'fit-frame-to-buffer' work around size hints (Bug#74866)

* lisp/window.el (fit-frame-to-buffer-1): When
'frame-resize-pixelwise' is nil, round up requested sizes to avoid
that lines get wrapped (Bug#74866).
* doc/lispref/windows.texi (Resizing Windows): Mention that with
size hints one may have to set 'frame-resize-pixelwise' to make
'fit-frame-to-buffer' fit the buffer exactly.

(cherry picked from commit 6017c6a986fd958732facb1bb6ea2c040981b023)

Java Mode: introduce the keyword `assert'.

* lisp/progmodes/cc-langs.el (c-simple-stmt-kwds): Put `assert'
into the java value.

(cherry picked from commit 39380e1bd3bfc26e355445590e243fcfa940fc9f)

Add treesit thing 'sexp-list' to typescript-ts-mode (bug#73404)

* lisp/progmodes/typescript-ts-mode.el (typescript-ts-base-mode):
Add 'sexp-list' to 'treesit-thing-settings'.
(typescript-ts-mode--sexp-list-nodes): New variable.

(cherry picked from commit 423e1ee7d6d6f34c0bc249a8dfb14a4a25eae08a)

Handle ':noquery' in 'open-gnutls-stream'

* lisp/net/gnutls.el (open-gnutls-stream): Extract and use
':noquery' keyword.  (Bug#74193).

(cherry picked from commit ec39f669f902143a68a99fb42dd05716a27736be)

* test/lisp/files-tests.el (sh-shell): Move down declaration.

(cherry picked from commit fb7bf20a9c129a97ceeabad00523ecafaa58697c)

Allow viewing .dcm images via image-convert

* lisp/files.el (auto-mode-alist): Support the DICOM .dcm image
format.  (Bug#63531)

(cherry picked from commit 78eb102bc3d25aafb9a2d6756b956f7a2321a715)

Allow viewing .six images via image-convert

* lisp/files.el (auto-mode-alist): Support the Sixel .six image
format.  (Bug#63531)
* lisp/image.el (imagemagick-enabled-types): Add SIX.

(cherry picked from commit 7d41a23ad3b4c03ea1dea91eb70474f074dc05a4)

* lisp/vc/smerge-mode.el (smerge-extend): New command (bug#74509)

(cherry picked from commit 961cff855a9eccb9c2de31edc7d90ce697ebb65d)

Match more gdbinit files in auto-mode-alist

* lisp/files.el (auto-mode-alist): Match more gdbinit files,
including XDG, and MS-Windows.  Avoid false positives.
(set-auto-mode--find-matching-alist-entry): Break out function...
(set-auto-mode--apply-alist): ...from here.  (Bug#74946)
* test/lisp/files-tests.el (files-tests--check-mode): New function.
(files-tests-auto-mode-alist): New test.

(cherry picked from commit 86a8b24bdea52a7aab45abcc51db2dd47308c11f)

Prefer defvar-keymap in gud.el

* lisp/progmodes/gud.el (gud-gdb-repeat-map, gud-sdb-repeat-map)
(gud-dbx-repeat-map, gud-xdb-repeat-map, gud-perldb-repeat-map)
(gud-pdb-repeat-map, gud-guiler-repeat-map, gud-jdb-repeat-map):
Convert to defvar-keymap.

(cherry picked from commit d89d8715eeae775305d4c5790b60793e3e57a474)

* lisp/net/tramp-gvfs.el (tramp-gvfs-local-file-name): New defun.

(cherry picked from commit e59e7278924cd0dca49d4333dba188530721f5a3)

(cl-flet, cl-labels): Fix bug#74870

* lisp/emacs-lisp/cl-macs.el (cl-flet, cl-labels): Wrap function
bodies in `cl-block`.

* test/lisp/emacs-lisp/cl-macs-tests.el (cl-macs--test-flet-block): New test.

(cherry picked from commit 476426168106dbcee67d8ea667e11ebe80c7aaed)

; Fix call to 'decode_string_utf_8' in  #ifdef'ed-away code

* src/coding.c (Finternal_decode_string_utf_8): Fix calling
sequence of 'decode_string_utf_8' to adapt to changes in the
latter's signature.

(cherry picked from commit 5e97079cc7587ce338679ed237efb911723e4367)

; Improve commentary in calendar.el

* lisp/calendar/calendar.el: Expand the commentary.  Suggested by
Richard Lawrence <rwl@recursewithless.net>.  (Bug#74965)

(cherry picked from commit 6902673b5b9c641fd2df3881533d6fc343124371)

Add 'lua-ts-mode' to 'interpreter-mode-alist'

* lisp/progmodes/lua-ts-mode.el: Enable 'lua-ts-mode' for Lua
scripts based on their interpreter line.  (Bug#74951)

(cherry picked from commit 08b62132ddee01f0c84bc478b718370b51fade6a)

Document representation of dates in calendar.el

* lisp/calendar/calendar.el: Add a comment in file header
explaining how dates are represented.

(cherry picked from commit d8ffcf2fbaca158f3eed3b35cc181756a4c4878f)

Add support for the ':data' keyword for play-sound in MS-Windows.

* src/sound.c (parse_sound) [WINDOWSNT]: Check that either :file
or :data is present.
(do_play_sound): Added parameter to select file or data, and code to
play from data.
(Fplay_sound_internal): Fixed volume format, and send file or data
to 'do_play_sound'.  (Bug#74863)
* etc/NEWS: Add entry for this change.
* etc/PROBLEMS: Remove entry about missing support for :data.

(cherry picked from commit fd529bbd076d14087d70c50d94bc9ef231cf1997)

; Fix last change

* doc/lispref/os.texi (Time Calculations): Extend documentation of
'seconds-to-string'; add missing @end defun.  (Bug#71572)

(cherry picked from commit b6852b67b0d462c7ba0012e5ac3b79a245f4b7e5)

'seconds-to-string': new optional arguments for readable strings

* lisp/calendar/time-date.el (seconds-to-string): Accept new
optional arguments READABLE, ABBREV, and PRECISION, and format the
output string accordingly.  (Bug#71572)

* doc/lispref/os.texi (Time Calculations):
* etc/NEWS: Document the new arguments of 'seconds-to-string'.

(cherry picked from commit 308d5d54737917d449bfc0bf80815537eef69446)

; * lisp/net/browse-url.el (browse-url-with-browser-kind): Doc fix.

(cherry picked from commit bf41ff24b9ab9c7426b3b3f1c1902b301e9f08a4)

browse-url-with-browser-kind: Improve browser function selection

In order to find an appropriate browser function for the given
kind, first the browser handler lists are consulted.  If no
handler is found, the `browse-url-browser-function',
`browse-url-secondary-browser-function`,
`browse-url-default-browser' and `eww' are tried in that order
until a browser function with a matching kind is found.  This
way the user customization of `browse-url-browser-function' and
`browse-url-secondary-browser-function` is respected by
`browse-url-with-browser-kind'.
* lisp/net/browse-url.el (browse-url-with-browser-kind): Try the
browser functions in the aforementioned order.  (Bug#74820)

(cherry picked from commit 0f645b92ed3e82f149de468df7ebe0eda5104aca)

; Skip commit 40145ba971942eb8b2b9db1e28b513b1f3fdda6f

; Skip commit 31f3a760c504e76ae06805e5cc5c325b06e4a9ad

Use smarter default for erc-server-reconnect-function

* doc/misc/erc.texi (Sample Configuration): Remove customization in
`use-package' declaration for `erc-server-reconnect-function' as well as
related language in the customization walk-through.  Do this because the
new default incorporates `erc-server-delayed-check-reconnect' behavior
for compatible connect functions.
* etc/ERC-NEWS: Announce new default for `erc-server-reconnect-function'.
* lisp/erc/erc-backend.el (erc-server-reconnect-function): Change
default to `erc-server-prefer-check-reconnect'.
(erc-server-delayed-check-reconnect): Use `process-send-string' instead
of `send-string'.
(erc--server-delayed-check-connectors): New variable.
(erc-server-prefer-check-reconnect): New function.
* test/lisp/erc/erc-scenarios-base-auto-recon.el
(erc-scenarios-base-auto-recon-unavailable)
(erc-scenarios-base-auto-recon-no-proto): Remove unnecessary
`erc-server-reconnect-function' binding because the new default
incorporates the behavior being tested for.
* test/lisp/erc/erc-scenarios-base-buffer-display.el
(erc-scenarios-base-buffer-display--reconnect-common):
* test/lisp/erc/erc-scenarios-base-compat-rename-bouncer.el
(erc-scenarios-common--base-compat-no-rename-bouncer):
* test/lisp/erc/erc-scenarios-base-netid-bouncer-recon-base.el
(erc-scenarios-base-netid-bouncer--recon-base):
* test/lisp/erc/erc-scenarios-base-netid-bouncer-recon-both.el
(erc-scenarios-base-netid-bouncer--recon-both):
* test/lisp/erc/erc-scenarios-base-netid-bouncer-recon-id.el
(erc-scenarios-base-netid-bouncer--reconnect-id-foo)
(erc-scenarios-base-netid-bouncer--reconnect-id-bar):
* test/lisp/erc/erc-scenarios-base-reconnect.el
(erc-scenarios-base-reconnect-timer)
(erc-scenarios-base-cancel-reconnect):
* test/lisp/erc/erc-scenarios-services-misc.el
(erc-scenarios-services-misc--reconnect-retry-nick):
* test/lisp/erc/erc-scenarios-stamp.el
(erc-scenarios-stamp--date-mode/reconnect): Explicitly bind
`erc-server-reconnect-function' to `erc-server-delayed-reconnect', the
former default, which does not do any probing.  (Bug#62044)

(cherry picked from commit 1c960bda91237c92f9f602bcb8538ad500c0bc49)

Add command for teaching Imenu about ERC macros

* lisp/erc/erc-backend.el (define-erc-response-handler): Add
`doc-string' to `declare' specification.
* test/lisp/erc/resources/erc-tests-common.el
(erc-tests-common-add-imenu-expressions): New function for defining and
undefining Imenu patterns useful to ERC developers.

(cherry picked from commit e9591fae5e7ba772b63c6cc548bb5ebe68f583e6)

Disable which-func-mode in erc-imenu buffers

* lisp/erc/erc-imenu.el (erc-imenu-setup): Move after module definition
so the variable `erc-imenu-mode' is defined.  Run teardown code when
module is deactivated.  Set `which-func-mode' to nil locally.
(erc-imenu-mode, erc-imenu-enable, erc-imenu-disable): Manage membership
of `erc-imenu--disable-which-func' in `which-function-mode-hook'.
(erc-imenu--disable-which-func): New function.  (Bug#74934)

(cherry picked from commit d1c670f0cbf9c66d59b24797f38203ea698813c3)

Fix a number of Android compilation warnings

* src/dispnew.c (frame_rect_abs, frame_pos_abs, rect_intersect)
(copy_child_glyphs, abs_cursor_pos, is_in_matrix)
(is_cursor_obscured) [HAVE_ANDROID]: Delete functions.

(cherry picked from commit 2d173aa3d34e60206f4889eb0220aa2269b3ed4d)

Eglot: ensure quick typing doesn't undermine completion exit

Some completion resolution requests in
eglot-completion-at-point, specifically those that might be
triggered from the :exit function, can't be cancellable, else
the completion edit or snippet will never be obtained and the
user is left with the nonsensical completion label in the
buffer.

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

Autoload 'shortdoc-help-fns-examples-function'

* lisp/help-fns.el (shortdoc-help-fns-examples-function):
Autoload, to allow adding it to
'help-fns-describe-function-functions' as advertised.  (Bug#74995)

(cherry picked from commit faaa13ec762ddd762725d7f0eed0aced8428354a)

Move admin scripts to admin/treesit-admin.el

* admin/treesit-admin.el: New file.
* lisp/treesit.el (treesit--check-manual-coverage):
(treesit--builtin-language-sources):
(treesit--verify-major-mode-queries):
(treesit-verify-major-mode-queries): Move out.

(cherry picked from commit 8aad208e002a8c7512df77de7a16b67303e964ec)

On GTK do not inhibit implied resizing until tool bar was drawn (Bug#74750)

* src/frame.c (frame_inhibit_resize): Under GTK do not inhibit
implied resizing as long as the tool bar has not been drawn yet
so the frame gets its intended initial height (Bug#74750).
* src/gtkutil.c (update_frame_tool_bar): Set tool_bar_resized
slot of frame f to true regardless of whether a tool bar was
made or not.  This will make inhibiting implied resizes work
again from now on.

(cherry picked from commit dbf22fd0d050423e5ed727923399099bba7d3dc2)

Add known-to-work version for c/c++-ts-mode

This is done by

    (treesit--verify-major-mode-queries
     '(c-ts-mode c++-ts-mode)
     '(c cpp)
     "/tmp/tree-sitter-grammars")

* lisp/progmodes/c-ts-mode.el: Add comments.

(cherry picked from commit 07cc8abca75e9c0180e993ad10f162c5218c9e5e)

Add automated process to verify tree-sitter queries

This allows us to inform packagers of the grammar version they
want to use when packaging tree-sitter grammars with Emacs.

* lisp/treesit.el (treesit--builtin-language-sources):
New variable.
(treesit--verify-major-mode-queries):
(treesit-verify-major-mode-queries): New functions.

(cherry picked from commit fe06a2baac291b2eceadd12db3623436ab8e2395)

Add keyword :reversed to treesit-font-lock-rules

This keyword will be useful for implementing
string-interpolation feature.

* doc/lispref/modes.texi (Parser-based Font Lock): Document the
new keyword.
* lisp/treesit.el (treesit-font-lock-settings): Document.
(treesit-font-lock-setting-reversed): New function.
(treesit-font-lock-rules): Add new keyword.
(treesit-font-lock-recompute-features): Handle new keyword.

(cherry picked from commit 05ab13ebc7237bcf23bc84a6a345d0b563404c2d)

Fix the MS-Windows build broken by recent changes

* src/w32font.c (memq_no_quit):
* src/w32uniscribe.c (memq_no_quit): Remove; use the function from
fns.c instead.  All callers changed.

(cherry picked from commit 926a9c864adc29f056644f5e23cf59fb90e2613c)

Allow xt-mouse-tests to run

This is basically a workaround for running a test in batch mode
which should have a tty frame available but doesn't.

* src/frame.c (check_tty): Relax check if noninteractive.
* lisp/xt-mouse.el (xterm-mouse-event): Don't use frame-at if
noninteractive.

(cherry picked from commit 82c3fcd17e3eb3756bd3533c39d89c21ec7fdce5)

Fix tty root frame collection in redisplay_internal

* src/fns.c (memq_no_quit): New function.
* src/lisp.h: Declare it.
* src/xdisp.c (redisplay_internal): Use memq_no_quit instead of
assq_no_quit.

(cherry picked from commit 42ab0f162cb37eeddae53675fba310b8a22ff934)