; Fix last change to secrets-tests.el.

(cherry picked from commit 98b90fc853f05e3d94545c48851e59ace33b50cb)

(track-changes-fetch): Fix nested use case

* lisp/emacs-lisp/track-changes.el (track-changes-fetch):
Don't presume that if there's nothing to do we're on
`track-changes--clean-trackers`.

(cherry picked from commit 3ac1a7b6fe6d324339ca5c36ffdce3985f6c55a1)

(track-changes--before): Fix bug#70396

* lisp/emacs-lisp/track-changes.el (track-changes--before):
Widen the buffer before accessing it with positions
potentially outside the beg..end region.

(cherry picked from commit 5fda398fb3bbda43dab37a0c187c90ad4bc4d1b0)

Fix resetting the frame's 'frozen_window_starts' flag

* src/window.c (grow_mini_window, shrink_mini_window): Reimplement
how the frame's 'frozen_window_starts' flag is set and reset, to
make sure it is always reset when the mini-window gets to its
normal one-line height.  Patch by Martin Rudalics
<rudalics@gmx.at> (Bug#70038)

(cherry picked from commit 9b755244bf0b9cd5f820ae45a4db14913a587c7b)

Fix display of @xref documentation in Info

* lisp/info.el (Info--dont-hide-references): New variable.
(Info-fontify-node): Use 'Info--dont-hide-references' to disable
hiding "*Note" or showing "See" instead of it in select nodes.
(Bug#70382)

(cherry picked from commit a80a5d42d3a5f095c9d52ef5f5fe18d2e500d875)

Rewrite Android description of Android window management

* doc/emacs/android.texi (Android Environment): Rewrite several
paragraphs to better reflect recent changes and emphasize
behavior on modern OS releases.

(cherry picked from commit deef12c15d8c9444a583fffa9254cc4fc44ebfa3)

Make 'buffer-last-name' work better after 'find-alternate-file' (Bug#68235)

* lisp/files.el (find-alternate-file): Before killing the previous
buffer, try to restore its name and filenames (Bug#68235).

(cherry picked from commit 9a79db506e39c02daa81629f0b224a86fad2b3c6)

; Capitalize 'project' in project-name's docstring

(cherry picked from commit 55a200d7071320311365787b60f311c7c91922d8)

Fix bug#70385

* src/xdisp.c (note_fringe_highlight): Don't proceed if
popup_activated, window is outdated, or when row beneath pointer
does not display text.  (bug#70385)

(cherry picked from commit e8c6e3fa477e69b4cecfee354af313ccb60e8c97)

; (pp-display-expression): Enable undo in output buffer

* lisp/emacs-lisp/pp.el (pp-display-expression): Enable undo.

GC-mark temporary key values created when sorting (bug#69709)

Bug reported and fix proposed by Aris Spathis.

* src/sort.c (merge_markmem): Mark heap-allocated temporary key values.
(tim_sort): Delay key function calls to after marking function has been
registered.
* test/src/fns-tests.el (fns-tests-sort-gc): New test.

(cherry picked from commit 3d3602055264ca3095b7f28ca7e27a6f2782649a)

Add 'forward-sexp-default-function' to be used by 'treesit-forward-sexp'

* lisp/emacs-lisp/lisp.el (forward-sexp-default-function):
New function with body from 'forward-sexp' (bug#68993).
(forward-sexp-function): Change the default value from nil to
'forward-sexp-default-function'.
(forward-sexp): Use either 'forward-sexp-function' or
'forward-sexp-default-function'.

* lisp/treesit.el (treesit-forward-sexp): In nodes of type 'text'
fall back to 'forward-sexp-default-function'.  Improve docstring.

* doc/lispref/positions.texi (List Motion): Fix pxref.

(cherry picked from commit 568c1741352a4932508fbbd474b9fd9ebe90ddfb)

text.texi (Tracking changes): Fix warning

* doc/lispref/text.texi (Change Hooks): Add a menu to silence warnings.
(Tracking changes): Improve the title.

(cherry picked from commit cd113d8c45ccf3bfa8b687c06a5d03618adf7a2c)

; * src/eval.c (funcall_lambda): Sink specpdl load out of fast path.

(cherry picked from commit 85ece8b494429b5ae36e79d7b4ad85a993f73543)

; * lisp/emacs-lisp/macroexp.el (macroexp--expand-all): less consing

(cherry picked from commit 616af565796f8c690dd9c7d1b2fa7607f2e2fa1e)

Add command 'list-keyboard-macros' that works like 'list-buffers'.

The command 'list-keyboard-macros' allows editing and re-arranging
macros using 'tabulated-list-mode'.  Existing keyboard macros can be
duplicated or deleted.  Macro counters and counter formats can take new
values read from the minibuffer.  Macro keys can be edited using
'edit-kbd-macro'.

* doc/emacs/kmacro.texi (Kmacro Menu): Document the new command
and the menu's commands.
* etc/NEWS (Kmacro Menu Mode): Mention the new mode and command.
* lisp/kmacro.el (kmacro-menu-mark, kmacro-menu-marked)
(kmacro-menu-flagged): Add faces for marks and flags.
* lisp/kmacro.el (kmacro-menu-mode-map, kmacro-menu-mode): Add mode
and map.
* lisp/kmacro.el (list-keyboard-macros, kmacro-menu): Add command.
* lisp/kmacro.el (kmacro-menu--deletion-flags, kmacro-menu--marks)
(kmacro-menu--id-kmacro, kmacro-menu--id-position, kmacro-menu--kmacros)
(kmacro-menu--refresh, kmacro-menu--map-ids, kmacro-menu--replace-all)
(kmacro-menu--replace-at, kmacro-menu--query-revert, kmacro-menu--assert-row)
(kmacro-menu--propertize-keys, kmacro-menu--do-region)
(kmacro-menu--marks-exist-p): Add utility functions of mode
and commands.
* lisp/kmacro.el (kmacro-menu-mark, kmacro-menu-flag-for-deletion)
(kmacro-menu-unmark, kmacro-menu-unmark-backward)
(kmacro-menu-unmark-all): Add commands for marks and flags.
* lisp/kmacro.el (kmacro-menu-do-flagged-delete, kmacro-menu-do-copy)
(kmacro-menu-do-delete): Add commands that modify the ring.
* lisp/kmacro.el (kmacro-menu-edit-position, kmacro-menu-transpose)
(kmacro-menu-edit-format, kmacro-menu-edit-counter)
(kmacro-menu-edit-keys, kmacro-menu-edit-column): Add commands that
modify a keyboard macro.

(cherry picked from commit 7add47337b62064998a5b80f357acc39b1253e98)

CC Mode: Don't start fontifying in the middle of an identifier

This fixes bug#70367.

* lisp/progmodes/cc-mode.el (c-fl-decl-start): After searching
backwards for the end of the previous statement, check whether
or not we found it.

(cherry picked from commit b2842b25bf7fc934cf86b82d1053db55fd55c00b)

Remove leftover tasks from previous Emacs sessions on startup

* java/org/gnu/emacs/EmacsService.java (onCreate): Call
removeOldTasks.

* java/org/gnu/emacs/EmacsWindowManager.java (removeOldTasks):
New function.

* java/proguard.conf: Optimize optimizer configuration.

(cherry picked from commit 2823eae0b7cb3bd3f2472fde9e13016a8d406a9a)

Recognize multicite macros from biblatex

* lisp/textmodes/reftex-cite.el (reftex-all-used-citation-keys):
Match the citation keys used with multicite macros provided by
biblatex.  (bug#38249)

* test/lisp/textmodes/reftex-tests.el
(reftex-all-used-citation-keys): Adjust test accordingly.

(cherry picked from commit 845246093f8ae88db1061a9beaff04184685f8f4)

peg-tests.el: Fix test failures

* lisp/progmodes/peg.el (peg-parse): Refine heuristic since unknown
terminals are resolved at run-time rather than compile-time now.
(peg--macroexpand) <stack-action>: Avoid generating a `let` with an
empty body.
(peg--translate-rule-body): Adjust to name change of
`macroexp-warn-and-return` and the fact that it's always available.

* test/lisp/progmodes/peg-tests.el (peg-parse-string):
Add `indent` declaration.
(peg-test): Check that the compiler emits the warnings we expect.

(cherry picked from commit 7b94c6b00b287d2b69d466380a05de7e0ec21ee9)

(define-globalized-minor-mode): Require the use of `run-mode-hooks`

When `define-globalized-minor-mode` was introduced (Emacs-22),
`run-mode-hooks` was brand new, so we could not expect all major
modes to use it and we had to rely on brittle workarounds to try
and approximate `after-change-major-mode-hook`.

These workarounds have undesirable side effects, and (we hope)
they're not needed any more now that virtually all major modes
have been changed to use `run-mode-hooks` (or
`define-derived-mode`).

* lisp/emacs-lisp/easy-mmode.el (define-globalized-minor-mode):
Rely only on `after-change-major-mode-hook`, remove the "cmhh"
[typo for the intended "cmmh", BTW] workaround.

* doc/lispref/modes.texi (Mode Hooks): Clarify the importance of
`after-change-major-mode-hook` w.r.t `define-globalized-minor-mode`.
(Defining Minor Modes): Rewrite the explanation of which buffers
are affected, including adjusting it to the fact that
`fundamental-mode` has used run `run-mode-hooks` for last 10 years.

(cherry picked from commit 17e26cf57e18c5df2172a7049591d89fc53b3fb6)

(define-globalized-minor-mode): Fix bug#58888

* lisp/emacs-lisp/easy-mmode.el (define-globalized-minor-mode) <MODE-cmhh>:
Try and detect well-behaved modes so they're not affected by
those which require the cmhh hack.

(cherry picked from commit 3f7e26e2bed4ee7adab3a5d2bfa289517499e4c8)

lisp/emacs-lisp/track-changes.el: New file (bug#70077)

This new package provides an API that is easier to use right than
our `*-change-functions` hooks.

The patch includes changes to `diff-mode.el` and `eglot.el` to
make use of this new package.

* lisp/emacs-lisp/track-changes.el: New file.
* test/lisp/emacs-lisp/track-changes-tests.el: New file.
* doc/lispref/text.texi (Tracking changes): New subsection.

* lisp/progmodes/eglot.el: Require `track-changes`.
(eglot--virtual-pos-to-lsp-position): New function.
(eglot--track-changes): New var.
(eglot--managed-mode): Use `track-changes-register` i.s.o
`after/before-change-functions` when available.
(eglot--track-changes-signal): New function, partly extracted from
`eglot--after-change`.
(eglot--after-change): Use it.
(eglot--track-changes-fetch): New function.
(eglot--signal-textDocument/didChange): Use it.

* lisp/vc/diff-mode.el: Require `track-changes`.
Also require `easy-mmode` before the `eval-when-compile`s.
(diff-unhandled-changes): Delete variable.
(diff-after-change-function): Delete function.
(diff--track-changes-function): Rename from `diff-post-command-hook`
and adjust to new calling convention.
(diff--track-changes): New variable.
(diff--track-changes-signal): New function.
(diff-mode, diff-minor-mode): Use it with `track-changes-register`.

(cherry picked from commit d7a83e23d47ca9e3e6ca70078e956e31301e5e6d)

; Additional fixup for truncation of long lines in compilation buffers

* lisp/progmodes/compile.el
(compilation--insert-abbreviated-line): Handle long lines that end
in a newline.  (Bug#70236)

The fix in commit 8f93cba324e4d4022a9422b8c56186213ba2de8d resulted in
the previous "Don't hide the final newline" code causing an off-by-one
error.  With the new code the value of point is what is wanted in both
cases.

(cherry picked from commit f950621e6a177fc3110f3dec7c92b7d499fd25d6)

; Fix coding style of last change to xdisp.c

* src/xdisp.c (note_fringe_highlight): Stylistic edits.

(cherry picked from commit 66c44c3cd7b37712d5a923966f71a06bbf1fcdb8)

; * src/window.c (shrink_mini_window): Revert inadvertent change.

(cherry picked from commit 199351125a4b17081c5ae8056e61aeb3c33650d2)

Fix crash upon call to Fset_fontset_font after X server disconnect

* src/image.c (free_image):

* src/xfaces.c (free_realized_face): Handle scenarios where
free_frame_faces is called with the display connection cut.

* src/xterm.c (x_free_frame_resources): Call free_frame_faces
unconditionally, lest fontsets for this dead frame contaminate
Vfontset_list and produce crashes afterwards.  (bug#66151)

(cherry picked from commit 9fc698479feef6fa660ff13e21619ea50bd404df)

; Fix documentation of last change.

* etc/NEWS:
* doc/lispref/display.texi (Other Display Specs):
* doc/lispref/text.texi (Special Properties): Fix last changes.

(cherry picked from commit 952f20fabe76c087aa96645389cfd4786fc95380)

Support tooltips for fringe indicators

* src/xdisp.c (note_fringe_highlight): New function.
(note_mouse_highlight): Call it when the mouse is on the fringes.
* src/frame.c (syms_of_frame) <left-fringe-help>
<right-fringe-help>: DEFSYM them.

* etc/NEWS:
* doc/lispref/text.texi (Special Properties):
* doc/lispref/display.texi (Other Display Specs): Document the new
properties.
* etc/TODO: Remove the todo item about this.

(cherry picked from commit 5734047b812639c06c90eb3baf82ff502db59fb5)

; Improve documentation of tree-sitter "things"

* doc/lispref/parsing.texi (User-defined Things): Fix text,
punctuation, and markup.
(Tree-sitter Major Modes): Add the missing "things" reference.

* etc/NEWS: Fix "thing"-related entries.

(cherry picked from commit 8b210a636fe426f47bccdb111af61d6310755dde)

; Tweak "(emacs)Bug Reference" formatting/wording.

(cherry picked from commit f0300fb0597225762ac6e62eeec4e223a7ad1df9)

Allow 'help-quick' to use a non-global keymap

* lisp/help.el (help-quick-sections): Mention
'help-quick-use-map' in docstring.
(help-quick-use-map): Add new variable, defaulting to the
global-map.
(help-quick): Use new variable.

(cherry picked from commit 6c721af9c8ee2229af57491cc2833f6743c8ddab)

; Fix typo in 'help-quick-sections' docstring

(cherry picked from commit 5f6834ab9765943be07dfab6454c37375729f778)

; * src/alloc.c (process_mark_stack): Fix commentary.

(cherry picked from commit 02e795738b8877f6cf07f5ad2105449d7eb41000)

Mark Flymake regions more accurately in 'lua-ts-mode'

* lisp/progmodes/lua-ts-mode.el (lua-ts-flymake-luacheck): Use
the end position provided by Luacheck rather than relying on
'thing-at-point' to guess where the end should be.  (Bug#70167)

(cherry picked from commit d5d61618c89899bd082cd29fd81dfb7cd88ea8b8)

Fix Icalendar export with ISO dates

* lisp/calendar/icalendar.el (icalendar--datestring-to-isodate):
Accept dashes in ISO-style numeric dates.  Patch by Erwan Hingant
<erwan.hingant@mailo.com>. (Bug#69894)

* test/lisp/calendar/icalendar-tests.el
(icalendar--datestring-to-isodate): Add a test for dashes in
ISO-style numeric dates.

(cherry picked from commit 71f8b2c3242b9b9455e9c6f25ad99ea900a1422f)

Fix task-switching failures on Android 2.3

* java/org/gnu/emacs/EmacsWindowManager.java (registerWindow):
Don't specify F_A_MULTIPLE_TASK on Android 4.4 and earlier.

(cherry picked from commit 4fc37710788cdab9ebf4264636999ba999a59547)

(elisp-tests-syntax-propertize): New test for bug#24542

* test/lisp/progmodes/elisp-mode-tests.el (elisp-tests-syntax-propertize):
New test.

(cherry picked from commit e8adb8cf5a51ef172fb07786b71e3140b9358764)

rcs2log now groks add-log-time-zone rule

* lib-src/rcs2log (extractTZ): Adjust to renaming of
change-log-time-zone-rule to add-log-time-zone rule, by allowing
either spelling.

(cherry picked from commit c26261c027ef7594427d477208b8126d6e4982bd)

(emacs-lisp-mode-syntax-table): Fix bug#24542

* lisp/progmodes/elisp-mode.el (emacs-lisp-mode-syntax-table):
Remove `p` from the flags of `@`.

(cherry picked from commit 648b7bf7e22577c2f917e389694a76ce1f42dc0e)

* lisp/buff-menu.el: Improve 'Buffer-menu-group-by-mode' (bug#70150).

(Buffer-menu-group-by): Replace function-item with const
better suitable for Customization UI.
(Buffer-menu-group-by-mode): Use 'mouse-buffer-menu-mode-groups'
to group buffers by mode.

(cherry picked from commit 5bd4d458676c458d6b534ea1c74cf6f0c1899ea6)

New user option 'tab-line-tabs-buffer-group-function'

* lisp/tab-line.el (tab-line-tabs-buffer-group-function):
Turn defvar into defcustom with the default value
'tab-line-tabs-buffer-group-by-mode'.
(tab-line-tabs-buffer-group-by-mode): New function with body from
'tab-line-tabs-buffer-group-name'.
(tab-line-tabs-buffer-group-by-project): New function.
(tab-line-tabs-buffer-groups): Use fallback name "No group" instead of "All".

(cherry picked from commit 414f8d02c1a361fa780e55fcf0f260fe00a9a62d)

; * etc/NEWS: Fix typo.

(cherry picked from commit 2fc7e21f5e75ea6b00d6f7344335f44f5663d955)

; Fix documentation of a recent change in dbus.el (bug#70301)

* lisp/net/dbus.el (dbus-string-to-byte-array)
(dbus-byte-array-to-string):
* etc/NEWS:
* doc/misc/dbus.texi (Type Conversion): Fix documentation of these
two D-Bus functions.

(cherry picked from commit f93df59e8c9038a10992b71bfd6beeda70f806dd)

; Skip commit 4ff852a5582be8d0ba16e598371ce359ba3d3cc6

Improve D-Bus byte-array conversion

* doc/misc/dbus.texi (Type Conversion): Adapt dbus-byte-array-to-string.

* etc/NEWS: D-Bus byte array conversion works over raw UTF-8 bytes.
Fix typos.

* lisp/net/dbus.el (dbus-string-to-byte-array)
(dbus-byte-array-to-string): BYTE-ARRAY must be an UTF-8 raw bytes
sequence.  Make optional argument MULTIBYTE obsolete.  (Bug#70301)
(dbus-call-method-handler, dbus-register-signal)
(dbus-escape-as-identifier): Use `length=' and `length>'.

* test/lisp/net/dbus-tests.el (dbus--test-method-handler)
(dbus-test09-get-managed-objects): Use `length='.
(dbus-test01-type-conversion): Extend test.

* test/lisp/net/secrets-tests.el (secrets-test03-items): Extend test.

(cherry picked from commit a69890eea946beb0858273a20d260a170485b79a)

Display Info buffer after ensuring it contains text

* lisp/info.el (info-pop-to-buffer): Move display of Info buffer
to a later stage after its text contents is ready to display.
This helps to use fit-window-to-buffer in display-buffer-alist (bug#70213).

(cherry picked from commit 21775a936bd3838adaae38bd5c5ec776434736c1)

; Improve documentation of completion commands

* doc/emacs/mini.texi (Completion Commands): Mention that '?' also
shows a couple of commands.

(cherry picked from commit 0fab2649e288c7a350018293443e709eba6b0fe2)

minibuffer-completion-help: Fix regression when END < EOB

Which can happen with in-buffer completion (though this scenario
is preffed off by default).

* lisp/minibuffer.el (minibuffer-completion-help): Include the
buffer contents after END into BASE-SUFFIX (bug#48356).

(cherry picked from commit 0284b296f2ee469e0edeba8bd043b4a813cfd977)

etags-regen--tags-generate: Handle spaces in project root name

* lisp/progmodes/etags-regen.el (etags-regen--tags-generate):
Quote the tags file name (bug#70329).

(cherry picked from commit af57516ed8991ea6238f1ec4907f9ce751cadb27)

Fix file names with embedded whitespace in Ediff

* lisp/vc/ediff-ptch.el (ediff-patch-file-internal): Quote file
names that can include special characters.  (Bug#70329)

(cherry picked from commit bbe98eddf70200228dc50b58f26f53351604cf83)

; * lisp/bindings.el (mode-line-mode-menu): Add Completion Preview.

(cherry picked from commit c4a8976d59aa4c9a325a6331b52ce329cb5de248)

Fix display of vscrolled windows

* src/xdisp.c (redisplay_window): Fix condition for resetting the
window's vscroll.  (Bug#70038)

(cherry picked from commit ea62a14ea3b7f3f6feb0c7c803eeabe3c8499276)

Don't hide flymake diagnostics on empty first line (bug#70310)

A diagnostic first in the buffer, typically the lexical cookie warning,
got lost if that line was empty.

* lisp/progmodes/elisp-mode.el (elisp-flymake--byte-compile-done):
Make sure the location interval doesn't go beyond the buffer bounds.

(cherry picked from commit b436f430e3897e1aa6dcb5a39564a3553bbf631f)

; * etc/NEWS: Group JSON changes.

(cherry picked from commit fba8f3a6f1a8a099d93e70400d477ca6fe96007b)

; * lisp/minibuffer.el (completion-base-suffix): Doc fix (bug#48356).

(cherry picked from commit afc0aa3683568dc93469f636367f85e579ab2612)

; Fix whitespace in editfns-tests.el

* test/src/editfns-tests.el
(editfns-tests--before/after-change-functions): Fix whitespace.

(cherry picked from commit 5d35ef858a9a949f682ef7b5fc6c0eae9f415936)

Guarantee presence of emacs-module.h during cross-compilation

* cross/Makefile.in (src/emacs-module.h): New rule.
(src/libemacs.so): Depend on the same.

(cherry picked from commit ad428e39d7380f091a487d58ee47e7b1c094b5f9)

Guarantee presence of epaths.h during cross-compilation

* cross/Makefile.in (src/epaths.h): New rule.
(src/libemacs.so): Depend on the same.

(cherry picked from commit 3b6bc312f2383aaf275f1085621aaa593d18fc87)

Optimize R8 configuration

* java/org/gnu/emacs/EmacsWindowManager.java (WindowConsumer):
Mark as package-local.

* java/proguard.conf: List only symbols that must be preserved,
enabling R8 to optimize the remainder.

(cherry picked from commit b9acfd7c2b9d1fa5c49e7bd9f78a040f7485b29b)

Adjust priority of Emacs background service notification

* java/org/gnu/emacs/EmacsService.java (onStartCommand): Reword
lightly and set importance to IMPORTANCE_LOW.

(cherry picked from commit 7720c614afcf2b657c1edd1901cdc688e372a53c)

; * java/Makefile.in: Render config.status relative to builddir.

(cherry picked from commit 2733329b46a4687ef9e3d260cb776391ded47f52)

Generalize the file-name specific workaround in minibuffer-completion-help

* lisp/minibuffer.el (completion-base-suffix):
New function (bug#48356).
(minibuffer-completion-help): Use it here.
(minibuffer-completion-help): Cut off the double completion
boundary when it occurs inside
completion-list-insert-choice-function..

(cherry picked from commit 0288bc6c949e82f72790a60d067da31428ca433a)

Suppress bogus messages in the echo area

* lisp/textmodes/reftex-dcr.el (reftex-view-crossref-when-idle):
Check if point inside a mandatory argument where the cite/ref key
usually resides.  For example, with \cite[45]{emacs:30} and point
on 4, the following bogus message in the echo area is suppressed:
"cite: no such database entry: \cite[45]".  (bug#38258)
Fix docstring.

(cherry picked from commit ca528f7c6ac9b907564298bc96663579d09f9434)

; * doc/emacs/files.texi (Backup): Clarify "saving" (bug#70326).

(cherry picked from commit 4cefa3c0b1f7270ca5317caa02101a0257595b9c)

; Improve documentation of 'world-clock'

* lisp/time.el (zoneinfo-style-world-list)
(legacy-style-world-list): Doc fixes.

(cherry picked from commit db7b571aaaf4aa16fc6a88a53a8740c3a102ce60)

* doc/emacs/misc.texi (emacsclient Options): Suggest forwarding sockets.

(Bug#66667)

(cherry picked from commit 6a0bb7beae3ed4e3d2b420b73abcfaada38f53ee)

Update go-ts-mode to support latest tree-sitter-go grammar

tree-sitter-go changed method_spec to method_elem in
https://github.com/tree-sitter/tree-sitter-go/commit/b82ab803d887002a0af11f6ce63d72884580bf33

* lisp/progmodes/go-ts-mode.el:
(go-ts-mode--method-elem-supported-p): New function.
(go-ts-mode--font-lock-settings): Conditionally use method_elem or
method_spec in the query.

(cherry picked from commit 859b4227e3de9f8e7bc26367540aa315cefc37dc)

Fix c++-ts-mode defun navigation (bug#65885)

* lisp/progmodes/c-ts-mode.el (c-ts-base-mode): Add BOL and EOL marker
in the regexp.

(cherry picked from commit 407e85ce139c2f0ab8bc7f9643ee7506a4e561a1)

; Fix last change.

(cherry picked from commit aca5064f128e20a495e9ddf254248ab77b613754)

; * etc/PROBLEMS: An entry about focus issues with XFCE (bug#70046).

(cherry picked from commit 55aab2d471024bda1878897e81e3b5695e242f09)

; * doc/emacs/misc.texi (emacsclient Options): Fix typo.  (Bug#70238)

(cherry picked from commit 19cee16576ef09990ac14d1ec5f0ddcd4594f5ce)

; * src/filelock.c (Flock_file): Doc fix (bug#70216).

(cherry picked from commit 2a41b6ba51457448b3937fbb1d9e06f62c3d5a9f)

(completion-preview-prev-candidate): add numeric prefix argument

* lisp/completion-preview.el (completion-preview-prev-candidate):
Add numeric prefix argument N.
(completion-preview-next-candidate): Update documentation.

; Fix Completion Preview mode mouse-click bindings

* lisp/completion-preview.el (completion-preview--ignore): New
internal command.
(completion-preview--internal-commands): Add it.
(completion-preview--mouse-map): Use it to fix bindings.

New command 'completion-preview-complete'

This command completes the symbol at point up to the longest
common prefix of all completions candidates.  We also add an
indication of the longest common prefix in the completion
preview by highlighting that part of the preview with the
'completion-preview-exact' face.  To facilitate these features
we change the way we store the completion candidates while the
preview is visible, to explicitly keep the common prefix along
with a list of its suffixes.

* lisp/completion-preview.el (completion-preview--try-table):
Return longest common prefix and list of suffixes instead of
list of full candidates.  Add illustrative comment.
(completion-preview--capf-wrapper, completion-preview--update)
(completion-preview--show, completion-preview-insert)
(completion-preview-next-candidate): Adjust.
(completion-preview-common): New face.
(completion-preview-exact): Tweak to distinguish it from
'completion-preview-common'.
(completion-preview-complete): New command.
(completion-preview-active-mode-map): Bind it.
(completion-preview-mode): Mention it in docstring.
(completion-preview-commands): Add 'completion-preview-complete'.
(completion-preview--make-overlay): Simplify.
(completion-preview--internal-command-p): Remove.
(completion-preview-require-certain-commands): Update.
(completion-preview--inhibit-update): New inline function.
(completion-preview--inhibit-update-p): New local variable.
(completion-preview--post-command, completion-preview-hide):
Reset it to nil.

* test/lisp/completion-preview-tests.el
(completion-preview-tests--check-preview): Check the 'face'
property of both the first and last character.  Update callers.
(completion-preview-insert-calls-exit-function)
(completion-preview-complete): New tests.

; Optimize 'completion-preview--try-table'

* lisp/completion-preview.el (completion-preview-completion-styles):
New variable.  Default to only include the 'basic' completion style.
(completion-preview--try-table): Let-bind 'completion-styles' when
calling 'completion-all-completions'.  With the default value of
'completion-preview-completion-styles', this yields a significant
performance improvement (up to 4 times faster compared to the
'substring' style when tested with 'elisp-completion-at-point').

Suggested by Ergus <spacibba@aol.com>

; Remove obsolete 'mouse-wheel-up/down-event' bindings

Following commit e720ba62193 'mouse-wheel-up-event' and
'mouse-wheel-down-event' are translated to 'wheel-up/down'
events, so we only need to bind 'wheel-down/up' in
'completion-preview--mouse-map'.

* lisp/completion-preview.el: Don't require 'mwheel'.
(completion-preview--mouse-map): Remove bindings for
'mouse-wheel-up/down-event'.

(cherry picked from commit 3a91186ad3707c7e3754616f1c7a2735d40fc33d)

* doc/lispref/parsing.texi (Parsing Program Source): Fix menu.

Add the new node "User-defined Things" to the menu.

(cherry picked from commit 103a2fdf18d99c872e4adb01a15a8300164acd66)

* lisp/emacs-lisp/comp-cstr.el (comp-cstr-type-p): Improve last change.

(cherry picked from commit 3eb462405e541175df99974cc06395bf191d412a)

* lisp/emacs-lisp/comp-cstr.el (comp-cstr-type-p): New function.

(cherry picked from commit ee03a73375796feea94bb066cff7d7de680cae32)

* lisp/emacs-lisp/comp-cstr.el (comp-cstr-symbol-p): Simplify.

(cherry picked from commit d4d8575bf00bb722bbb913fa5aa5b68c6dbef4d3)

* lisp/emacs-lisp/comp-cstr.el (comp-cstr-fixnum-p): Fix.

(cherry picked from commit 219b98916bc498bf15bbef6577af648834d4727d)

(en/decode_coding_object): Fix `after-change-functions`

For `en/decode-coding-string/region`, `after-change-functions`
were either not run at all, or run only after deleting the text
but not after inserting it.

* src/coding.c (decode_coding_object, encode_coding_object): Run the
after-change-functions after inserting the result.

* test/src/editfns-tests.el (sanity-check-change-functions-with-op):
New macro.
(sanity-check-change-functions-errors): New function.
(editfns-tests--before/after-change-functions): Use them to add
cases for `en/decode-coding-string/region`.

(cherry picked from commit 36cb16556c60bf4e703764eefd4fb6668ccc37cc)

* java/Makefile.in (classes.dex): Make proguard.conf relative to srcdir.

(cherry picked from commit 15bafc04322e9c4e85a00fe593239935eb723b6e)

* java/proguard.conf: New file.

(cherry picked from commit 049bdfdaec4ee0c791fbf034b683e06ee84ce1db)

Optimize generated Android DEX bytecode

* configure.ac (D8): Attempt to locate the bundle where d8 is
installed, detect whether an installation of `r8' is similarly
present, and use this installation in place of d8 if so.

* java/Makefile.in (ANDROID_MIN_SDK, IS_D8_R8): New
substitutions.
(classes.dex): Provide --min-api, --debug or --release and
--pg-conf to d8 or r8.

(cherry picked from commit ed88bed3afbc9922f020cf3a8803e08f2811e89b)

Fix 'format-seconds' when all values are zero and %z is used

* lisp/calendar/time-date.el (format-seconds): Fix all-zero time.

* test/lisp/calendar/time-date-tests.el (test-format-seconds): Add
two new tests.  (Bug#70322)

(cherry picked from commit 33516970808a6c50709325edfc1af125c2b2c401)

* lisp/emacs-lisp/cl-macs.el (cl-typep): Add docstring.

(cherry picked from commit f4711811298b320ea6875e635a7346f3bc23a603)

Recognize Android TLS certificates by default

* lisp/net/gnutls.el (gnutls-trustfiles): Append directories
holding system and user-provided certificates on Android.

(cherry picked from commit f2f13fa630bd2658ea3f90c4362fe6201d32e67e)

(cl--describe-class-slots): Avoid cryptic `t` type

* lisp/emacs-lisp/cl-extra.el (cl--describe-class-slots): Use the empty
string for the trivial `t` type.

* lisp/emacs-lisp/cl-preloaded.el (cl-structure-class):
Fix non-existing `bool` => `boolean`.

(cherry picked from commit dd6b9c9426c5d7dde66974c5790815c3520a755b)

; Minor copy edits

(cherry picked from commit 73bd48de3cf45de02c0f1caf5bd5196f4d4b08f5)

Add Flymake backend to rust-ts-mode using Clippy

* lisp/progmodes/rust-ts-mode.el (rust-ts-flymake-command):
New option (bug#70260).
(rust-ts--flymake-proc): New variable.
(rust-ts-flymake--helper): New function.
(rust-ts-flymake): New function.
(rust-ts-mode): Add it to flymake-diagnostic-functions.

(cherry picked from commit ccced8c3e4323b9c3d24b2480fc7b8df946fce88)

(test-replace-match-modification-hooks): Delete test

* test/src/search-tests.el (test-replace-match-modification-hooks):
Delete, this is testing a functionality we can't really support.

(cherry picked from commit e3861aeb484c59c36b2448e17b54a37d779f6486)

(mouse-wheel-buttons): Map old-style wheel buttons to actual wheel events

Change the handling of the old X11 convention that uses mouse-4/5/6/7
events to represent wheel events: instead of asking downstream
packages to use the `mouse-wheel-*-event` variables to know which events
represent wheel events, use new var `mouse-wheel-buttons` to directly
convert those events into the standard `wheel-up/down/left/right` events
used everywhere else.

This will simplify the work of packages which can thus just bind their
commands to `wheel-up/down/left/right`.

* lisp/mouse.el (mouse-wheel-buttons): New custom variable.

* src/keyboard.c (make_lispy_event): Adjust for "wheel-clicks" on the tab-bar.
* src/xterm.c (x_construct_mouse_click): Add `xi2` argument and
obey `mouse-wheel-buttons` variable.
(handle_one_xevent): Adjust calls accordingly.
(syms_of_xterm): Define the `mouse-wheel-buttons` and the
`wheel-up/down/left/right`symbols.

* lisp/xt-mouse.el: Don't require `mwheel` any more.
(xterm-mouse--same-button-p): Delete function.
(xterm-mouse--read-event-sequence): Use `mouse-wheel-buttons`.

* lisp/mwheel.el (mouse-wheel-up-event, mouse-wheel-down-event)
(mouse-wheel-left-event, mouse-wheel-right-event): Make obsolete.
(mouse-wheel-obey-old-style-wheel-buttons): Delete variable.

* lisp/completion-preview.el (completion-preview--mouse-map):
* lisp/progmodes/flymake.el (flymake--mode-line-counter-map):
* lisp/edmacro.el (edmacro-fix-menu-commands): Silence warnings.

(cherry picked from commit e720ba6219394d275dd741c5f17feea1ee0bf9af)

Move over optional arguments in parentheses correctly

* lisp/textmodes/reftex-parse.el (reftex-move-to-previous-arg):
Recognize ')' as closing delimiter for optional argument.
Fix docstring.
(reftex-what-macro): Identify LaTeX macros with optional arguments
in parentheses correctly.  This is necessary to make
`reftex-view-crossref' work with biblatex on entries like:
\parencites(Glob.Pre)(Glob.Post)[Pre][Post]{key1}[Pre][Post]{key2}
(bug#31132)

(cherry picked from commit 7236010d2e1d3525943bb50598d29061a4c25b58)

Inhibit flymake lexical cookie warning in *scratch* (bug#70068)

Add a hack to prevent flymake from complaining about a missing lexical
cookie when enabled in *scratch*.

* lisp/emacs-lisp/bytecomp.el
(bytecomp--inhibit-lexical-cookie-warning): New variable.
(byte-compile-file): Use it to gate the warning.
* lisp/progmodes/elisp-mode.el (elisp-flymake-byte-compile):
Set the inhibitor when spawning a check in lisp-interaction-mode.

(cherry picked from commit cda5155c618d774810ce5e044efe1101846054ac)

; Avoid byte-compiler warnings in 'ls-lisp-test-bug70271'.

(cherry picked from commit 2c6eb49fa2d62fc07ccecdd1c074235064bf5375)

Fix misalignment of entries created by Dired file operations

* lisp/dired.el (dired-insert-directory): Insert leading space
if absent before calling dired-align-file.

(cherry picked from commit 22386c5634ba72d4f7b321524509c1e3549fe4d2)

Fix window-point-context-set and window-point-context-use (bug#33871)

* lisp/window.el (window-point-context-set)
(window-point-context-use): Add 'window-buffer' for 'buffer-name'.

(cherry picked from commit b31f7e67de52c276dd1bcb6fbd048ef12435a327)