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

; * etc/NEWS: Announce new ls-lisp options.  (Bug#70721)

(cherry picked from commit 677bc276998de0a467803b35134925d833d1ab9d)

; Fix the test in last change.

(cherry picked from commit 93576969c2b53ff9d0d7b08768782e770f0cb0f4)

Support more long time options in 'ls-lisp'

* lisp/ls-lisp.el (ls-lisp--sanitize-switches): Support '--time'
and '--sort=time'.  (Bug#70271)

* test/lisp/ls-lisp-tests.el (ls-lisp-test-bug70271): New
test case.

(cherry picked from commit a4c766e057b9b05685433db010b6536148f29f1d)

Improve treatment of aborted touch events in Speedbar and elsewhere

* lisp/dframe.el (dframe-popup-kludge): Mark as a
mouse-1-menu-command.

* lisp/touch-screen.el (touch-screen-handle-point-up): New
argument CANCELED.  Implement specific responses to cancellation
for each tool state.
(touch-screen-handle-touch): Adjust to match.

(cherry picked from commit 64eb4ce0af80b840c7b1da137e4323a3d06062fa)

Disable tab-bar by default in Speedbar frames

* lisp/speedbar.el (speedbar-frame-parameters): Set
tab-bar-lines to 0.

(cherry picked from commit 9e22cd30ebd68326c26a6e511d3722bdb5b9164c)

(completion-hilit-commonality): Support `completion-lazy-hilit`

* lisp/minibuffer.el (completion-hilit-commonality): Support lazy
completion candidate highlighting via `completion-lazy-hilit`.

(cherry picked from commit f30801a20338cdc7716c3eff1443f1be603aa94e)

Improve documentation of Text Mode

* doc/emacs/text.texi (Text Mode): Improve indexing.  Document
'text-mode-ispell-word-completion'.

(cherry picked from commit 6c9855d3364b4e9b18d436aa1d6490e004d05d7b)

(cl--describe-class): Improve based on dicussion in bug#70077

* lisp/emacs-lisp/cl-extra.el (cl--describe-class): Move docstring
after the class' slots.
(cl--describe-class-slots): Buttonize the types.

(cherry picked from commit dc5fe95a48f5bff5dfac8841d05c66b300b09aab)

; * lisp/align.el: Remove unnecessary :group keywords. (bug#70262)

(cherry picked from commit 600ac35cc6597b63306786bffd0d762f70555322)

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

* lisp/emacs-lisp/easy-mmode.el (define-globalized-minor-mode):
When `after-change-major-mode-hook` runs, enable the mode only
in the current buffer and not in other pending buffers.

(cherry picked from commit 9506b9392e8c3548b769d9951a1c9d4abad9ee21)

Update INSTALL for native compilation of Lisp files

* INSTALL: Add section "Native compilation of Lisp files" under
ADDITIONAL DISTRIBUTION FILES and correspondingly augment item 6
of DETAILED BUILDING AND INSTALLATION.  In the latter also note
differences between in-source-tree and out-of-tree builds for
running 'src/emacs' uninstalled.

(cherry picked from commit b9b2bc7192e75e0208c064e44cb4afc418ec3d28)

* Make comp ignore EIEIO classes (bug#70141)

* lisp/emacs-lisp/comp-cstr.el (comp--all-classes): Ignore EIEIO classes.

(cherry picked from commit c9d7721db6eeda8efa7b5a49c9a4bcaacd078791)

* Fix out of date comp pass names in comp-tests.el

* test/src/comp-tests.el (comp-tests-tco, comp-tests-fw-prop-1)
(comp-tests-pure): Update out of date pass names.

(cherry picked from commit 4d486bd378b409c2a96b3e9af36534aa8eb5b3af)

Document tree-sitter things feature (bug#70016) (bug#68824)

* doc/lispref/parsing.texi (Retrieving Nodes): Mention new kinds of
predicate argument that the tree-traversing functions accept (which are
thing symbols and thing definitions).
(User-defined Things): New node dedicated to thing definition and
navigation functions.

(cherry picked from commit 4efe3b99a5d0d72b6a96bf339601f9390ca5c03a)

Make tree-sitter thing feature public and remove obsolete functions

* lisp/treesit.el (treesit--things-around): Remove function.
(treesit-forward-sexp):
(treesit-beginning-of-thing):
(treesit-end-of-thing):
(treesit-navigate-thing):
(treesit-thing-at-point):
(treesit-outline-search): Use public version of thing-functions.
(treesit--thing-prev):
(treesit--thing-next):
(treesit--thing-at):
(treesit--navigate-thing): Make public.

* test/src/treesit-tests.el (treesit--ert-test-defun-navigation): Use
public version of thing-functions.

(cherry picked from commit 64854869ae0cacddb16926670e2a67c03a3f9618)

Fix invisible erc-speedbar cursor in text terminals

* lisp/erc/erc-speedbar.el
(erc-speedbar--reset-last-ran-on-timer): Use `with-current-buffer'
instead of `setf' and `buffer-local-value'.
(erc-nickbar-mode, erc-nickbar-enable, erc-nickbar-disable)
(erc-speedbar-toggle-nicknames-window-lock): Revise doc string.
(erc-speedbar-toggle-nicknames-window-lock): Set `cursor-type' in
speedbar buffer.
(erc-nickbar-toggle-nicknames-window-lock): New function alias.  Note
that this name flouts traditional library namespacing conventions.
* lisp/erc/erc-status-sidebar.el (erc-status-sidebar-get-window): Use
`cursor-type' instead of `internal-show-cursor'.  (Bug#63595)

(cherry picked from commit ee377aaddf9d73116b93c3d54b1ffef9a3a8b925)

Allow updating of /IGNORE timeouts in ERC

* lisp/erc/erc.el (erc--read-time-period, erc--decode-time-period):
Move body of former, now a superficial wrapper, to latter, a new
function.
(erc--format-time-period): New function.
(erc--get-ignore-timer-args): New function.
(erc--find-ignore-timer): New function to search through `timer-list'
to find matching ignore timer.
(erc-cmd-IGNORE): Refactor and redo doc string.  Add new optional
`timespec' parameter, primarily to aid in testing.  Update an existing
timer instead of always creating one, and display time remaining in
"ignore list" output.  Pass server buffer instead of current buffer to
timer callbacks because `erc--unignore-user' displays its messages in
the `active' buffer, not necessarily the issuing one.  Note that doing
this does discard potentially useful information, so if ever reverting,
we can change the `cl-find' :test in `erc--find-ignore-timer' to
something that compares the `erc-server-process' of both buffers.
;;
;; Something like:
;;
;; (defun erc--ignore-timers-equal-p (a b)
;;   (and (equal (car a) (car b))
;;        (eq (buffer-local-value 'erc-server-process (cadr a))
;;            (buffer-local-value 'erc-server-process (cadr b)))))
;;
(erc-cmd-UNIGNORE): Pass `erc-ignore-list' member matching `user'
parameter to `erc--unignore-user' instead of original, raw parameter,
along with the server buffer.
(erc--unignore-user): Cancel existing timer and don't bother switching
to server buffer since we're already there.
(erc-message-english-ignore-list): New variable.
* test/lisp/erc/erc-scenarios-ignore.el: New file.
* test/lisp/erc/erc-tests.el (erc--read-time-period): New test.
(erc-cmd-UNIGNORE): New test.  (Bug#70127)

(cherry picked from commit e0df2841fb78251d5461a17e2d9be581c152bdc2)

; * lisp/erc/erc-nicks.el: Fix typo in Commentary.

(cherry picked from commit c1266d355a2801271f2f875a1f7d47030c6c0e7a)

(Freplace_match): Fix bug#65451

* src/search.c (Freplace_match): For ordering of *-change-functions.

* test/src/editfns-tests.el
(editfns-tests--before/after-change-functions): New test.
(sanity-check--message, sanity-check-change-functions-error)
(sanity-check-change-functions-check-size)
(sanity-check-change-functions-before)
(sanity-check-change-functions-after): New functions.
(sanity-check--verbose, sanity-check-change-functions-beg)
(sanity-check-change-functions-end)
(sanity-check-change-functions-buffer-size)
(sanity-check-change-functions-errors): New vars.

(cherry picked from commit 63588775fcb64e4fd88a97e0882aae38c9f5fb1c)

Support displaying refactor edits as diff

Allow refactor backends to invalidate replacements

(refactor-backends): Support local refactor-backend-functions

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

(cherry picked from commit 8f93cba324e4d4022a9422b8c56186213ba2de8d)

Fix tex-tabbing-separator alignment rule

* lisp/align.el (align-rules-list): Remove the check of
`latex-mode' with `eq' which doesn't work with newer AUCTeX mode
names and modes defined by user with `define-derived-mode'.
(bug#69187)

(cherry picked from commit 03b23302bd326f981e1328f0e9ea9f4a40a13ee1)

Resolve disagreements in accounting of tooltip positions on Android

* java/org/gnu/emacs/EmacsService.java (getLocationInWindow):
New function.

* java/org/gnu/emacs/EmacsWindow.java (translateCoordinates):
Derive "root window" position from the origin point of the
containing activity's window rather than that of the screen,
the two of which differ when "freeform mode" is enabled.

(cherry picked from commit 8ee1dc8f1f9aa47260f8151c9eea30fb1ccf878a)

* lisp/master.el (master-says): Check nil argument (bug#70230).

(cherry picked from commit c7a0e4faa2a584063e4ace0ac4da8fb0ae1c5e50)

Port new Android window management strategy to Android 5.0

* doc/emacs/android.texi (Android Windowing): Revise to match.

* java/org/gnu/emacs/EmacsWindowManager.java (registerWindow)
(removeWindowConsumer, pruneWindows): Decrease minimum API for
monitoring of tasks to Android 5.0.
(getTaskToken): Ignore misleading documentation and access
baseIntent by way of RecentTaskInfo.

(cherry picked from commit ae296d762bc7366879e74f9dca90bc7edd89e860)

; * etc/NEWS: Add entry about tab-bar-mode-map (bug#69578).

(cherry picked from commit ec25f5ad3d4323b56f239a06186f965c8d4cb695)

; Commit autogenerated files.

(cherry picked from commit e6535e41027662238e89591e6620e92b496c90b2)

; Minor fixes of doc strings referencing keymaps.

* lisp/edmacro.el (edmacro-mode):
* lisp/info.el (Info-mouse-follow-nearest-node): Move the
reference to mode keymap from the first line.  (Bug#70163)

(cherry picked from commit eaec6cc3d7cc247377524225f2a51407a4cb20c7)

; * INSTALL: Mention installation without root access (bug#70071).

(cherry picked from commit 73569eb957e47e99d8181950afd7977a1ffa1acc)

; * doc/lispref/commands.texi (Focus Events): Fix markup of last change.

(cherry picked from commit fab58ffc224de5e4e20ce7ea19f06ed33a036129)

Add documentation for 'switch-window' event

* doc/lispref/commands.texi (Focus Events): Add
documentation for the structure of 'switch-window' events.
Make sure to be clear when referring to window system windows
vs Emacs windows.
* doc/lispref/windows.texi (Mouse Window Auto-selection):
Adding cross-reference to "Focus Events".  (Bug#69915)

(cherry picked from commit 9260904072d01e4b0f585825bfbc077310c8a974)

Support 'mouse-autoselect-window' in xterm-mouse

Generate select-window events, so that 'mouse-autoselect-window'
takes effect on TTY frames, when 'xterm-mouse-mode' is enabled.
* lisp/xt-mouse.el (xterm-mouse-translate-1):
If 'mouse-autoselect-window' is non-nil, add select-window
events to 'unread-command-events'.  (Bug#69915)

(cherry picked from commit abe39d57889cf354add083681d438d79ab28b662)

; * etc/PROBLEMS: Entry about slow mouse-wheel with GTK3 (bug#70002).

(cherry picked from commit 3d87d74a23d13e853f202cc589eb750c40f9e2be)

; * doc/lispref/tips.texi (Documentation Tips): Improve (bug#70163).

(cherry picked from commit c6899603b9c2e5de590ecfd6397a7125d1dab08b)

; Update admin/make-tarball.txt

* admin/make-tarball.txt: Add text about preparing bundled
packages for an emergency release.  Suggested by Michael Albinus
<michael.albinus@gmx.de>.

(cherry picked from commit bd2c4d825db69eeb592102edff9e3afb69c5a231)

; * etc/PROBLEMS: Add an entry about WebKitGTK (bug#66068).

(cherry picked from commit f107dc26e37c7cc24b158b5dfd21b4fd8eb145f2)

; Skip commit 305e35b2d871fdf86e7a349443fc4507d540e11e

Fix warning-suppress for list type "warning type"

Per the documentation of 'warning-suppress-types' and the
implementation of 'warning-suppress-p', a warning type can
be either a symbol or a list of symbols.  The previous
implementation could generate wrong 'warning-suppress-types':

  old behavior:
  type              warning-suppress-types
  pkg           ->    '((pkg))                  Correct
  (pkg subtype) ->    '(((pkg subtype)))        Incorrect

Now we check whether type is a cons cell first.  (Should not
use listp here, as listp returns t for nil.)

  new behavior:
  type              warning-suppress-types
  pkg           ->    '((pkg))                Correct
  (pkg subtype) ->    '((pkg subtype))        Correct

* lisp/emacs-lisp/warnings.el (warnings-suppress): Fix saving
warning types in 'warning-suppress-types'.  (Bug#70063)

Copyright-paperwork-exempt: yes
(cherry picked from commit 46b8746b38e26ae3f216f57f231f5fc8aec22873)

Make object init more robust (bug#69571)

* lisp/progmodes/csharp-mode.el (csharp-guess-basic-syntax): Make the
regex same as before, but conditionally check other heuristics rather
than crazy regex shenanigans.

(cherry picked from commit 910ea5f1e55793fa29292730a59397867b4e868f)

Add refactor.el

Correct typos in and omissions from earlier Android port changes

* java/AndroidManifest.xml.in: Remove duplicate permissions.

* java/org/gnu/emacs/EmacsWindowManager.java
(removeWindowConsumer): Disregard isFinishing for non-initial
activities.

(cherry picked from commit 617bd85cd0bd1d0a73d405d623ee3dd41c7e8a37)

(help-fns-function-description-header): Fix last change (bug#70209)

* lisp/help-fns.el (help-fns-function-description-header): Don't make
a button for the type if it's not a type.

(cherry picked from commit 0286a11f3139dfd4bb9d3989ae860b8c128e12d0)

Make sh-script-tests.el more robust

* test/lisp/progmodes/sh-script-tests.el (test-sh-script-indentation)
(test-basic-sh-indentation, test-indent-after-continuation):
* test/lisp/progmodes/sh-script-resources/sh-indents.erts (Code):
Skip if `sh-indent-supported-here' is nil.  (Bug#70196)

(cherry picked from commit aa356d03aeb13942ae6688ce919e0aa9fb4f1689)

Mark display-comint-buffer-action as obsolete after adding a category.

* lisp/window.el (display-comint-buffer-action):
Append '(category . comint)' to the default value.  Mark as obsolete.
(display-tex-shell-buffer-action):
Append '(category . tex-shell)' to the default value.  Mark as obsolete.
(bug#69983)

(cherry picked from commit 4e22ad8cef0710bf5ce3bf99deb8dd6e30d4078c)

; Skip commit 6480de5ea74b6b2eeebdaa3bcf9fa8e384ffbab1

* lisp/tab-bar.el (tab-bar-mode-map): New keymap (bug#69578).

(tab-bar-select-tab-modifiers): Call tab-bar--undefine-keys
before set-default in :set of defcustom.
(tab-bar--define-keys, tab-bar--undefine-keys):
Change keybindings in tab-bar-mode-map instead of the global map.
Move checking of global-key-binding to tab-bar-mode--tab-key-bind.
(tab-bar-mode--tab-key-bind): New internal function.

(cherry picked from commit 50fab7062d9edf1a2698f3d468dcbcd1c9a3ee9b)

Only call set-text-conversion-style if it exists

* lisp/auth-source.el (read-passwd): Guard call, as it was before the
code was moved here.
`set-text-conversion-style` is not present in all configurations.

(cherry picked from commit 4fc84cb23b6d671b44f18b8462e94c3bcfc3ee09)

* lisp/help-fns.el (help-fns-function-description-header): Fix bug#70209

Replace the whimsical "" default by something actually useful.

(cherry picked from commit 200a0e5e7d589256d9aad79ff0e9b74b579e7f5e)

; Fix indentation in last change to windows.texi.

(cherry picked from commit 64e1cfb98cbad24fbc72502f6529725cbe202101)

Enable relinquishing access to Android content directories

* doc/emacs/android.texi (Android Document Providers): Document
new command.

* java/org/gnu/emacs/EmacsService.java (relinquishUriRights):
New function.

* src/Makefile.in (SOME_MACHINE_OBJECTS): Add androidvfs.c.

* src/android.c (android_init_emacs_service): Link to new
function.

* src/android.h (struct android_emacs_service)
<relinquish_uri_rights>: New field.

* src/androidfns.c:

* src/androidvfs.c (android_saf_tree_name)
(android_saf_tree_opendir): Minor adjustments to commentary.
(Fandroid_relinquish_directory_access): New function.
(syms_of_androidvfs): Define new subr.

(cherry picked from commit aad63f935f8737598835612b53bc3b53c124661f)

Print records inside data-debug

* lisp/cedet/data-debug.el
(data-debug-insert-stuff-record-button): New function.
(data-debug-thing-alist): Register new function.

(cherry picked from commit 7a13d012c8e17eb25fc8826cdd9ac3e96f912167)

Define missing type in semantic/db-find.el

* lisp/cedet/semantic/db-find.el
(semanticdb-find-result-with-nil): New deftype.

(cherry picked from commit c57b50569cca1b0d1cc85446ecf6be11326c2a4d)

* lisp/hexl.el (hexl-mode): Fix doc string (bug#70163).

(cherry picked from commit 3cf0bb174ef9e5d517f3052a5b8639dddeb249ea)

Fix Semantic tag discovery when loading of unloaded files is suppressed

* lisp/cedet/semantic/db-find.el
(semanticdb-find-tags-by-name-method)
(semanticdb-find-tags-by-name-regexp-method)
(semanticdb-find-tags-for-completion-method)
(semanticdb-find-tags-by-class-method)
(semanticdb-find-tags-external-children-of-type-method)
(semanticdb-find-tags-subclasses-of-type-method)
(semanticdb-deep-find-tags-by-name-method)
(semanticdb-deep-find-tags-by-name-regexp-method)
(semanticdb-deep-find-tags-for-completion-method): Verify that
tags is bound before accessing it; this slot is unbound in
tables created for unloaded files when the `unloaded' throttle
is disabled.

(cherry picked from commit 3968b36ae0641e929426991028b49ce66a15af5f)

(project-current): Fix the previous change

* lisp/progmodes/project.el (project-current):
Fix the previous change (bug#69584).

(cherry picked from commit 21f9be005318dcc58918884fc3c24d7d75562e96)

; * lisp/auth-source.el: add declarations to silence compiler

(cherry picked from commit b49765b516e921d7dc020f1038c1442b1bb420ef)

; * src/json.c: Comment correction

(cherry picked from commit 4a74999a735d9c0980d119dedf266ac2035e3ae9)

Adapt treesitter tests for EMBA

* test/infra/Makefile.in (TREE-SITTER-FILES): Add js-tests.el and
python-tests.el, which don't follow test file name convention.

* test/infra/test-jobs.yml: Regenerate.

(cherry picked from commit c2e0ebf752cef595de16140933f51e810e0d4061)

; * doc/misc/cl.texi (Function Bindings): Fix reference.

(cherry picked from commit 77022a0d7327d3a79de083997a11a727a371cade)

Move read-passwd* to auth-source.el, avoiding compilation warnings

* lisp/simple.el (read-passwd*):
* lisp/subr.el (read-passwd*): Move definitions ...

* lisp/auth-source.el: ... here.
(icons): Require.

(cherry picked from commit 44d83def4fa046986ac6919ca53f789d01840ffa)

* src/json.c (make_symset_table): Fix over-large allocation size.

We multiplied when we should have added.  Oops.

(cherry picked from commit a0d646fb9f3945d98586b15d157dbb909843f06c)

Use different *Completions* buffers in different minibuffers

Disobey display actions while using switch-to-buffer on the tab-line

* lisp/tab-line.el (tab-line-select-tab-buffer)
(tab-line-switch-to-prev-tab, tab-line-switch-to-next-tab): Let-bind
switch-to-buffer-obey-display-actions to nil around the call to
switch-to-buffer to restrain buffer switching in bounds of
the same window only (bug#69993).

(cherry picked from commit 57e78f2d49a5b1a2337a15254e7b8c87aa63c83a)