; Skip commit 684adc07c28ce96b8da1fa2bea31dbf0c8833d92

Drop 'help-form' and associated cruft.

lisp/savehist.el: Save data, not code.

vc-do-async-command: Ellipse later lines in multiline arguments

* lisp/emacs-lisp/cl-print.el (cl-print-expand-ellipsis): Bind
inhibit-read-only to t.
* lisp/vc/vc-dispatcher.el (require): Require cl-print at
compile time.
(vc-do-async-command): When printing command arguments that
contain multiple lines, use cl-prin1 with cl-print-string-length
bound in order to ellipse lines other than the first.
Switch the outer quotation marks to single quotation marks.

(cherry picked from commit 3b841700a8bef1d5b16542679458ddfb588ea777)

; Skip commit cc232bd7a19dcd8b5c77320615a5e93ea0f589b6

Rename treesit-toggle-sexp-type to treesit-cycle-sexp-type.

* lisp/treesit.el (treesit-cycle-sexp-type):
Rename from 'treesit-toggle-sexp-type'.  Fix docstring.
https://lists.gnu.org/archive/html/emacs-devel/2025-04/msg00291.html

(cherry picked from commit 695edc5b55bec645fe2df8924513826b202022b6)

scope.el: Handle 'add-face-text-property'.

Improve elisp 'xref-backend-references'.

; Skip commit 53058e15c3313a262d5bc1f0873452779dd2821f

; Skip commit 1be9007c0ddec625810148fbee21643db38bad37

; Delete FIXME in vc-print-log

This isn't a state-changing operation, indeed, and passing t
here is relevant to dired-vc-deduce-fileset.

(cherry picked from commit 95675b4db0f4a72adfcde00fa24db6f3379f0f2e)

New buffer-local vc-buffer-overriding-fileset and vc-buffer-revision

* lisp/vc/vc.el (vc-buffer-overriding-fileset)
(vc-buffer-revision): New variables (bug#77529).
(vc-find-revision-save, vc-find-revision-no-save): Set them.
(vc-deduce-fileset): Respect vc-buffer-overriding-fileset.
(vc-print-log): Use vc-buffer-revision as a default working
revision.

* lisp/vc/vc-annotate.el (vc-annotate-parent-file)
(vc-annotate-parent-rev): Delete.
(vc-annotate): Respect vc-buffer-overriding-fileset and
vc-buffer-revision.  This makes 'C-x v g' work from buffers
generated by 'C-x v ~' (bug#5424).
Set the two variables in the newly prepared buffer.
(vc-annotate-working-revision)
(vc-annotate-extract-revision-at-line)
(vc-annotate-revision-at-line, vc-annotate-warp-revision)
(vc-annotate-goto-line):
* lisp/vc/vc-svn.el (vc-svn-annotate-current-time): Use
vc-buffer-overriding-fileset instead of vc-annotate-parent-file,
vc-buffer-revision instead of vc-annotate-parent-rev.
(vc-annotate-parent-rev): Delete declaration.

* etc/NEWS: Announce the new variables.

(cherry picked from commit 60530889c309746def95f32d3dfc117bc4f98444)

; Skip commit 37164032f690f8a2382f4216c0eb947ce48e2f1f

; Skip commit c0ea954d0f650227dc518f02a292daeb27cf0c37

Fix treesit-forward-sexp/list navigation in the middle of a node.

* lisp/treesit.el (treesit--forward-list-with-default):
Check the thing 'sexp-default' (bug#76791).

* lisp/progmodes/elixir-ts-mode.el (elixir-ts-mode):
* lisp/progmodes/go-ts-mode.el (go-ts-mode):
* lisp/progmodes/ruby-ts-mode.el (ruby-ts-mode):
* lisp/progmodes/sh-script.el (bash-ts-mode):
Add the thing 'sexp-default' to 'treesit-thing-settings'.

(cherry picked from commit ec62674cb959278240a56246cb6a958217dd17c0)

Rename treesit-toggle-sexp-mode to treesit-toggle-sexp-type.

* lisp/treesit.el (treesit-toggle-sexp-type):
Rename from 'treesit-toggle-sexp-mode'.  Fix docstring.
https://lists.gnu.org/archive/html/emacs-devel/2025-04/msg00273.html

(cherry picked from commit addcab68918a2dbbff997642e1287bd309a741bc)

; Skip commit cb9aded6d934a384e9281e43f943281bdca5d517

; Skip commit aa8a5090ec102a7e39d1cc7661c6dffd27dbea67

; Skip commit bb0f84bc0bf77892b05e3720ea623dcd3431325b

; Skip commit 50947fd51202dbdd86b1cc677722ab2031c5050b

; * test/infra/android/test-controller.el (ats-eval): Correct punctuation.

(cherry picked from commit 426a016d612a539178a913b68fd395d94919af64)

; Skip commit ddcc87514c72f86d5eac1cb9015e9b08160451b9

Respond to display configuration updates on Android

* java/org/gnu/emacs/EmacsNative.java
(sendConfigurationChanged): Declare function.

* java/org/gnu/emacs/EmacsSdk7FontDriver.java (Sdk7FontEntity)
(Sdk7FontObject): Do not access `metrics' field deleted from
`EmacsService'.

* java/org/gnu/emacs/EmacsService.java (EmacsService)
<metrics, resources>: Delete fields.
<dpiX, dpiY, dpiScaled>: New fields.
(onCreate): Adjust accordingly.  Record current display metrics
for subsequent comparison.
(onConfigurationChanged): New function.

* lisp/dynamic-setting.el (font-setting-change-default-font):
Enable on systems where font-get-system-font is not defined if
invoked with SET-FONT nil.

* src/android.c (sendConfigurationChanged): New function.

* src/androidgui.h (ANDROID_CONFIGURATION_CHANGED): New enumerator.
(struct android_configuration_changed): New structure.
(union android_event): Add `config' member.

* src/androidterm.c (handle_one_android_event): Handle
ANDROID_CONFIGURATION_CHANGED events.
(syms_of_androidterm): Define Qfont_render, and
Qdynamic_setting.  Provide the latter.

(cherry picked from commit 884ede7c959b1331e1ede0b1b80f01a06c048bf5)

; Skip commit cb339ad8f4e386505f1eae9e45c4162feea61f53

; Fix recently-added documentation

* etc/NEWS:
* lisp/treesit.el (treesit-toggle-sexp-mode): Fix wording of
recently-added documentation.

(cherry picked from commit b205d7b59d8bc97507fb6ffa766eedfcf13f8877)

New command 'treesit-toggle-sexp-mode' (bug#76676).

* lisp/treesit.el (treesit-forward-sexp): Don't use
'treesit-sexp-type-regexp' reserved for list commands
to override their default 'list' thing.
(treesit-down-list, treesit-up-list): Use
'treesit-sexp-type-regexp' instead of 'list'
when it's non-nil.
(treesit-toggle-sexp-mode): New command.

* lisp/progmodes/c-ts-mode.el (c-ts-mode--thing-settings):
Improve 'sexp' thing settings to exclude the top-level
"translation_unit" that just moves to EOF and also "comment".

* lisp/progmodes/elixir-ts-mode.el (elixir-ts--sexp-regexp): Remove.
(elixir-ts--forward-sexp): Remove to use the default 'sexp' navigation.
(elixir-ts--with-parens-0-p, elixir-ts--with-parens-1-p):
New internal functions.
(elixir-ts-mode): Add 'treesit-thing-settings'
instead of 'forward-sexp-function' (bug#76788).

* lisp/progmodes/heex-ts-mode.el (heex-ts--sexp-regexp): Remove.
(heex-ts--forward-sexp): Remove to use the default 'sexp' navigation.
(heex-ts--thing-settings): New variable.
(heex-ts-mode): Use 'heex-ts--thing-settings'
instead of 'forward-sexp-function'.

* lisp/progmodes/java-ts-mode.el (java-ts-mode):
Improve 'sexp' thing to use settings like in c-ts-mode.

* lisp/progmodes/php-ts-mode.el (php-ts-mode):
Improve 'sexp' thing settings to exclude the top-level
"program" that just moves to EOF and also "comment".

* lisp/progmodes/ruby-ts-mode.el (ruby-ts-mode):
Improve 'sexp' thing to use settings like in c-ts-mode.

* lisp/textmodes/css-mode.el (css--treesit-thing-settings):
Add 'sexp' thing.  Add "string_value" to 'text' thing.

* lisp/textmodes/html-ts-mode.el (html-ts-mode--treesit-things-settings):
Improve 'sexp' thing to use settings like in c-ts-mode.
Add "doctype" to the 'list' thing.

(cherry picked from commit 99a2cb05a41c66565d417e11e60f4324aaa5c5b5)

Improve 'treesit-outline-search'.

* lisp/treesit.el (treesit-outline-search): Remove
temporary arg 'recursive'.  Use iteration to visit
more ranges until the next outline heading is found.

* lisp/progmodes/php-ts-mode.el (php-ts-mode):
Set 'treesit-outline-predicate' explicitly.

(cherry picked from commit fa247a24a5ec9cf10865f0ac3711eddfd0ad3546)

* lisp/subr.el (defvar-local): Change 'indent' to 'defun' (bug#77256).

(cherry picked from commit 4b9d571a558fe75df67045ce5dd6d964d4956295)

; Skip commit 09887a2d41f61dff749860fe41a5e8382bb03bd9

VC-Dir: Offer to register files before checking in

* lisp/vc/vc.el (vc-only-files-state-and-model): Rewrite
checking that all files are in compatible VC states.  In
particular, consistently return 'edited' when all files are
either added, removed or edited, instead of allowing the return
value to depend on the order of the files in VC-Dir, and offer
to registered unregistered files if doing so would allow the
operation to proceed.
(vc-compatible-state): Delete.
(vc-next-action): Replace call to vc-compatible-state.
Document, in this command's docstring, the new feature
implemented in vc-only-files-state-and-model.
* etc/NEWS: Announce the new feature.

(cherry picked from commit 253364e2c71bfaaa3ca623ed23f1cae6548a16c7)

; vc-setup-buffer: Don't pass a string to buffer-live-p.

(cherry picked from commit 2310c12658c4b563f9860cb1196bab0d56c6f94d)

; Skip commit 686032ddaf31cacae9a6cd963d9fcbc85ba3905a

Eglot: announce support for diagnostic version checks (bug#77588)

* lisp/progmodes/eglot.el (eglot-client-capabilities): Mention versionSupport.

(cherry picked from commit 3e22c73fb612edb1879c83d24396dd8e7db40ffb)

Update lisp/ldefs-boot.el

kkc.el: Fix a couple of bugs.

Make scope.el symbol types a first class citizen.

; * lisp/files.el (hack-local-variables): Fix thinko.

Promote 'constantly' from 'cl-constantly'

recentf.el: Clean up.

; Update lisp/ldefs-boot.el

Fix ElDoc in minibuffer

scope.el: Handle derived-mode-p.

; Skip commit 40b0c83988267c891e7d0ecf241cc2c0135d5ce1

Preserve an explicit * in pcm-try-completion

An explicitly typed * has different semantics from automatically
inserted PCM wildcards, so it should be preserved on try-completion.  We
already do this in some cases, but now we do it more.

This is especially significant for filename completion: removing an
explicit * can take us from

~/src/emacs/trunk/*/minibuf

to

~/src/emacs/trunk//minibuf

The explicit double slash is interpreted by the file name completion
table to mean "start completing from the root directory", so deleting
the * here substantially changes semantics.

* lisp/minibuffer.el (completion-pcm--merge-completions): Don't drop
important wildcards. (bug#74420)
* test/lisp/minibuffer-tests.el (completion-pcm-test-7): Add tests.

(cherry picked from commit 0fbba16387513e7692b46885833e4a9c218251f0)

* lisp/treesit.el (treesit--after-change): New function.

(treesit-major-mode-setup): Set 'outline-minor-mode-hook'
to add 'treesit--after-change' with 'treesit-update-ranges'
to 'after-change-functions' (bug#77256).

(cherry picked from commit bec2de20469db0767d2bd7f60f0d4dfb20269614)

New function treesit-parsers-at for treesit-language-at (bug#77256).

* doc/lispref/parsing.texi (Multiple Languages): The variable
'treesit-language-at-point-function' is now optional for
multi-language major modes.  Add description of 'treesit-parsers-at'.

* lisp/treesit.el (treesit-language-at-point-function):
Change the the docstring to remove the dissuasion against
deriving the language from parser ranges.
(treesit-language-at): Use the first parser from
'treesit-parsers-at' as the default return value when
'treesit-language-at-point-function' is nil.  Adapt the docstring.
(treesit-node-at): Use 'treesit-parsers-at'.
(treesit-parsers-at): New function.
(treesit-local-parsers-at): Use 'treesit-parsers-at'
with the most part of the body moved to it.
(treesit-local-parsers-on): Replace the overlay property
'treesit-parser' with 'treesit-parser-local-p' in the docstring.
(treesit-up-list, treesit-simple-imenu, treesit-outline-level):
Use 'treesit-parsers-at'.

* lisp/progmodes/c-ts-mode.el (c-ts-mode): Don't set
'treesit-language-at-point-function'.

* lisp/progmodes/elixir-ts-mode.el (elixir-ts--treesit-language-at-point):
Remove.
(elixir-ts-mode): Don't set 'treesit-language-at-point-function'.

* lisp/progmodes/js.el (js--treesit-language-at-point): Remove.
(js-ts-mode): Don't set 'treesit-language-at-point-function'.

* lisp/progmodes/php-ts-mode.el (php-ts-mode--html-language-at-point)
(php-ts-mode--language-at-point): Remove.
(php-ts-mode): Don't set 'treesit-language-at-point-function'.

* lisp/textmodes/mhtml-ts-mode.el (mhtml-ts-mode--language-at-point):
Remove.
(mhtml-ts-mode): Don't set 'treesit-language-at-point-function'.
Use 'treesit-language-at' for mode-line lighter.

(cherry picked from commit 5e0daa1ef77d2a5fe5b65b8f0fa6c4eab83a2498)

(internal--get-default-lexical-binding): Be more failsafe

* lisp/files.el (internal--get-default-lexical-binding): Try and
avoid signaling an error.  Make it easier to suppress the
warning for a specific file.

(cherry picked from commit 7ff674d7125452b0ce6a8d39cb667eacb90f3df2)

Fix prettify-symbols-mode with composition rules

* lisp/progmodes/prog-mode.el
(prettify-symbols--composition-displayable-p): Fix a thinko.
Patch by Visuwesh <visuweshm@gmail.com>.  (Bug#77627)

(cherry picked from commit 646ccd5e67db701ed9f632492d1bfbe3f6110cb4)

Fix window selection after log-edit-show-diff, again

In October I installed a change to vc-diff-patch-string and
labelled it as "Fix window selection after log-edit-show-diff"
but that change only fixed the problem within
log-view-modify-change-comment.  This change should fix window
selection after C-c C-d in ordinary checkins.

* lisp/vc/log-edit.el (log-edit-diff-fileset): Use
save-selected-window in order to respect the documented
requirement that values of log-edit-diff-function leave the Log
Edit buffer's window selected when they return.

(cherry picked from commit d283db577339ee247826bfa1e8c1808dad823858)

Eglot: check textDocument/publishDiagnostics version (bug#77588)

* lisp/progmodes/eglot.el (eglot--versioned-identifier): Move up.
(eglot-handle-notification textDocument/publishDiagnostics): Check
eglot--versioned-identifier

(cherry picked from commit 13f439ce98c4cdd57bddfa671f071e31fa2badc6)

; Fix last change: ensure-list does not ensure a proper list

(cherry picked from commit 577ddbb9b79c067d296d50f3e8a04c193c1632b3)

Factor out vc-only-files-state-and-model

* lisp/dired-aux.el (vc-compatible-state): Delete declaration.
(vc-only-files-state-and-model): Declare.
(dired-vc-deduce-fileset): Factor out vc-only-files-state-and-model.
* lisp/vc/vc-dir.el (require): Require cl-lib at load time, too.
(vc-only-files-state-and-model): Declare.
(vc-dir-deduce-fileset): Factor out vc-only-files-state-and-model.
* lisp/vc/vc.el (vc-only-files-state-and-model): New function,
factored out of dired-vc-deduce-fileset and vc-dir-deduce-fileset.

(cherry picked from commit b784f194f8320d326c755dd49b31210977aae0e7)

Drop ido.el and icomplete.el

Drop refer.el and refbib.el

; Drop Mtn from comment now vc-mtn is obsolete

(cherry picked from commit 5f89eadb3f5a3794a6ee6acc7c5a3e6b26ab590d)

Update descriptions of VC's capabilities for Git and Mercurial

* doc/emacs/maintaining.texi (Version Control Systems): Update
descriptions of VC's capabilities for Git and Mercurial.

(cherry picked from commit ef8c4779dd4fd2a00d9ca4e572e42608628bce50)

lisp/files.el (internal--get-default-lexical-binding): Buttonize the M-x

(cherry picked from commit 19257efbf712dc026572a88b46d456d0c4b8c365)

lisp/files.el (internal--get-default-lexical-binding): Handle nested loads

(cherry picked from commit 9dc6177206a10efcc3a25894aa7aabaa54044adc)

Replace some calls to `intern' with DEFSYMs

* src/filelock.c (lock_file, unlock_file_handle_error): Call
constant symbols rather than interning them all the time.
(syms_of_filelock): New symbols Qask_user_about_lock,
Quserlock__handle_unlock_error, and
Quserlock__ask_user_about_supersession_threat.

(cherry picked from commit b392038560736d4413bc1b31671a9aa826ff873e)

; * src/lread.c (get_lexical_binding): Fix coding style.

(cherry picked from commit 9b7402c5fdbae1ec88c47101e9e8f74fcbffe5ec)

(Fload, Feval_buffer): Emit a warning when lexbind is unset (bug#74145)

This emits a warning at run-time rather than at compile time.

* src/lread.c (get_lexical_binding): New function.
(Fload, Feval_buffer): Use it.
(syms_of_lread): New var `internal--get-default-lexical-binding-function`.
* lisp/files.el: Set it.
(internal--get-default-lexical-binding): New function.

(cherry picked from commit 9f25d46568bf0a4d617145537db4c8aaf5e0219b)

eieio: Improve some obsolecence warnings and fix #<CLASS CLASS-XX> names

* lisp/emacs-lisp/eieio.el (eieio--constructor-macro): Improve message.
(eieio-object-name-string): Avoid repeated class name in the output of
`eieio-object-name`.
(make-instance, clone): Improve message.

* lisp/emacs-lisp/eieio-core.el (eieio-defclass-autoload): Use the same
obsolescence warning as elsewhere.

(cherry picked from commit 9663c959c73d6cca0c56f833d80ff1d9e9708b70)

(Freplace_region_contents): Fix point preservation (bug#77607)

* src/editfns.c (Freplace_region_contents): Save excursion around
temporary restriction (bug#77607) and remove
`record_unwind_protect_excursion` made redundant by commit 40d8650d5177.

(cherry picked from commit ae5c608eca636ad1c5c76294d81f16a16d2ec3b5)

test/eieio: Silence warnings about slots and obsolete name arg

* test/lisp/emacs-lisp/eieio-tests/eieio-test-methodinvoke.el
(eieio-test-method-order-list-3, eieio-test-method-order-list-6)
(eieio-test-method-order-list-7, eieio-test-method-order-list-8):
Delete obsolete name argument to constructors.
(eieio-test-method-order-list-4): Make sure backward compatibility is
active when testing the obsolete name arg.

* test/lisp/jsonrpc-tests.el (jsonrpc--call-with-emacsrpc-fixture):
Delete obsolete name argument to constructor.

* test/lisp/emacs-lisp/eieio-tests/eieio-tests.el (derived-value):
Silence unknown slot warning.

(cherry picked from commit 31c5fd3bfba31687de31e1e4c3d3501401f023bc)

lisp/emacs-lisp/eieio-custom.el: Require `eieio-base` to silence warning

(cherry picked from commit aca9f8c50aeea36f85e602272e97a6adfc93283a)

eieio: Emit compilation warnings a bit more thoroughly

We used to warn about unknown slots only in `oref`: add the same check
for `oset` and `slot-boundp`.
Similarly, we warned about obsolete name args only when calling the
constructors: add the same check to `make-instance`.

* lisp/emacs-lisp/eieio-core.el (eieio--check-slot-name): New function
extracted from the compiler-macro of `eieio-oref`.
(eieio-oref, eieio-oset): Use it.
* lisp/emacs-lisp/eieio.el (slot-boundp): Use it.
 (eieio--constructor-macro): Add category to warning.
(make-instance): Add compiler-macro to warn about obsolete name.

(cherry picked from commit 71afa12941ebbd6fa2c010064de01db681985279)

; Skip commit 308a5ff0f8997a287a496993d92f92c6a8a0f393

; Skip commit f0c1de75e128c3b35f8b6e9324a6bd58057af6cb

; Skip commit 48b41d595c37a7fd7b2a1e97fd0dcadc24e1a6bb

cedet: Delete obsolete object name arg to EIEIO constructors

For classes that don't inherit from `eieio-named`, this argument
is ignored anyway.

* lisp/auth-source-pass.el (auth-source-pass-backend): Delete obsolete
object-name argument to `auth-source-backend` constructor.

* lisp/cedet/ede/config.el (ede-config-get-configuration): Delete obsolete
object-name argument to ede-config constructor.

* lisp/cedet/ede/cpp-root.el (ede-find-target): Delete obsolete
object-name argument to `ede-cpp-root-target` constructor.

* lisp/cedet/ede/locate.el (ede-enable-locate-on-project): Delete obsolete
object-name argument to ede-locate constructor.

* lisp/cedet/ede/project-am.el (project-am-load-makefile): Delete obsolete
object-name argument to `project-am-makefile` constructor.

* lisp/cedet/semantic/complete.el (semantic-complete-read-tag-buffer-deep)
(semantic-complete-read-tag-local-members)
(semantic-complete-read-tag-project, semantic-complete-read-tag-analyzer):
Delete obsolete object-name argument to
`semantic-collector-buffer-deep`,
`semantic-collector-local-members`,
`semantic-collector-project-brutish`, and
`semantic-collector-analyze-completions` constructors.

* lisp/cedet/semantic/db-ebrowse.el (semanticdb-create-database):
Delete obsolete object-name argument to
`semanticdb-project-database-ebrowse` constructor.

* lisp/cedet/semantic/db-file.el (semanticdb-create-database): Delete
obsolete object-name argument to
`semanticdb-project-database-file` constructor.

* lisp/cedet/semantic/db-typecache.el (semanticdb-get-typecache):
Delete obsolete object-name argument to `semanticdb-typecache` constructor.

* lisp/cedet/semantic/db.el (semanticdb-get-table-index)
(semanticdb-create-table):
Delete obsolete object-name argument to
`semanticdb-default-find-index-class`, new-table-class, and
desired-class constructors.

* lisp/cedet/semantic/bovine/c.el (semantic-analyze-tag-references):
* lisp/cedet/semantic/analyze/refs.el
(semantic-analyze-tag-references-default): Delete obsolete
object-name argument to `semantic-analyze-references` constructor.

* lisp/cedet/srecode/compile.el (srecode-compile-templates):
Delete obsolete object-name argument to `srecode-compile-state` and
`srecode-dictionary-compound-variable` constructors.

* lisp/cedet/srecode/cpp.el (srecode-semantic-apply-tag-to-dict)
(srecode-c-apply-templates): Delete obsolete object-name argument to
`srecode-semantic-tag` constructors.

* lisp/cedet/srecode/dictionary.el (srecode-dictionary-add-entries)
(srecode-compound-toString): Delete obsolete object-name argument to
`srecode-dictionary-compound-variable` and `srecode-field` constructors.

* lisp/cedet/srecode/insert.el (srecode-insert-method-field):
Delete obsolete object-name argument to `srecode-field-value` constructor.

* lisp/cedet/srecode/semantic.el (srecode-semantic-handle-:tag)
(srecode-semantic-insert-tag, srecode-semantic-apply-tag-to-dict-default):
Delete obsolete object-name argument to `srecode-semantic-tag` constructors.

* lisp/cedet/srecode/table.el (srecode-mode-table-new): Delete
obsolete object-name argument to `srecode-template-table` constructor.

(cherry picked from commit 05680dc6c59be73ebe6c5cfa28d4c095edd661f4)

; Skip commit f75f8f3d6a09fe3dda3e747665187a0c34c19eaf

; Skip commit 94148549d782af3fb6677bc121fd5fc8dee3ea63

Add bindings for vc-git-stash-delete-at-point, vc-git-stash-delete

* lisp/vc/vc-git.el (vc-git-stash-map): Bind "D" to
vc-git-stash-delete-at-point.
(vc-dir-git-mode-map): Bind "z d" to vc-git-stash-delete.
* etc/NEWS: Announce the new bindings.

(cherry picked from commit e9e11f7281899aa206ff6f62a183fa83cde48e95)

; * lisp/vc/ediff-wind.el (ediff-with-live-window): Use cl-once-only

(cherry picked from commit 1e100f482c5f07fc6cd55f32065c62244856bff2)

* lisp/vc/vc-git.el (vc-git-checkin): Actually pass down TO-STASH.

(cherry picked from commit 3ccd25f6b01bcd2e103faa86b11c10017b64e69b)

vc-git-checkin: Don't relativize names of temporary files

* lisp/vc/vc-git.el (vc-git-checkin)
(vc-git--stash-staged-changes): Don't relativize names of
temporary files passed to 'git apply --cached'.  More generally,
these are not files managed by the underlying VCS, so they
shouldn't go in the FILE-OR-LIST argument to vc-git-command.

(cherry picked from commit 7f60aa45aab4191a44d6d83ec6c3004e4901469b)

; Skip commit ba13e7de32d08028ab7bffdd73dab271a95ea453

; Skip commit 819f92cb12b07938623e18384e86371ee101495a

; Skip commit 8ae7224b8fae59229b186853b300822bd70a8ec4

Teach VC-Dir to automatically add and remove marks on other lines

* lisp/vc/vc-dir.el (vc-dir-allow-mass-mark-changes): New option.
(vc-dir-parent-marked-p): Replace with ...
(vc-dir--parent): ... this.
(vc-dir-children-marked-p): Replace with ...
(vc-dir--children): ... this.
(vc-dir-mark-file): Unmark subitems before marking a directory.
Offer to unmark a directory before marking a subitem.
(vc-dir-unmark-file): For an implicitly marked item, offer to
unmark it by marking everything else that's implicitly marked.
For an unmarked directory with marked subitems, offer to unmark
them all.
* etc/NEWS: Document the changes.

(cherry picked from commit 936b2efdb389488d291086d5c2189fd1a7170aa6)

Fix dired-vc-next-action generating inconsistent marks

* lisp/vc/vc-dir.el (vc-dir-mark-files): Document that
directories passed to this function must have trailing slashes.
Don't mark both a directory and also items under it (bug#76769).
* lisp/dired-aux.el (dired-vc-next-action): Update docstring.

(cherry picked from commit c0b1b54d734a45698da9df0841700c4c15785b11)

vc-dir-mark-file: Consistently don't allow marking a subdirectory

* lisp/vc/vc-dir.el (vc-dir-mark-file): Don't allow marking a
subdirectory if its parent is already marked.  This fixes an
inconsistency whereby if a subdirectory was already marked then
its parent could not be marked, but not vice-versa (bug #76769).

(cherry picked from commit a5f574429db1f820cc4d25bfb0e700aae050dc07)

; Skip commit c418e454b3a9d103a5a59c76e1c36f3597de6798

Add tab-bar test for "effectively dedicated window" (bug#71386)

* test/lisp/tab-bar-tests.el (tab-bar-tests-quit-restore-window):
New test for 'delete-frame' for effectively-dedicated windows.

(cherry picked from commit 5fc1bd879e41e79601cff27db175d2ad22eafb66)

* lisp/gnus/nnfeed.el (nnfeed--write-server): Use default print settings.

Bug#77113

(cherry picked from commit 5987d77f40bf72a268d35d1f2a88f7cd00c17459)

Teach 'current-column' to account for images

* src/indent.c (check_display_width): Handle 'image' and 'slice'
display specs, instead of using the width of the underlying text.
Accept 2 additional arguments: WINDOW and SCAN_BYTE.  (Bug#76107)

(cherry picked from commit 52e7a71e3f90fede27864e366977e23bfc193891)

; Skip commit a4ee1e6709b57e6aed3ff6e800ab8fb83b706d65

Add input method for languages based on Burmese

This adds 4 new input methods:
 . Burmese
 . Burmese Visual
 . Shan
 . Mon
* lisp/leim/quail/burmese.el: New file.  (Bug#77026)

(cherry picked from commit 183ab3372e24c80217db8cc8ba22bf1ac48100a4)

; * src/xdisp.c (display_mode_line, display_mode_element): Fix comments.

(cherry picked from commit bf7b3c5ddd5f66cd0f4927c983789128b43056ba)

Fix mouse highlighting for compact mode lines (bug#77336)

When 'mode-line-compact' is non-nil, the mode line string is
displayed as a whole.  That confuses the computation of ranges
of mouse highlighting on the mode line because all the glyphs
have the same Lisp object source.  As such, in this commit we
instead split the mode line string by sources, and display those
elements one by one, so the boundaries of each element could be
correctly detected for the purpose of mouse highlighting.

* src/xdisp.c (display_mode_line): Display mode line elements
one by one when 'mode-line-compact' is non-nil.
(display_mode_element): Record source element number of the
stored string via a text property.
(Fformat_mode_line): Initialize 'mode_line_elt_no' to 0.
(syms_of_xdisp): New symbol for the text property.

(cherry picked from commit c94f0d3dc82a72baa0ba8d69beda220aaf0b2d91)

Restrict symbol prettification to displayable glyphs

* lisp/international/mule.el (char-displayable-on-frame-p): New
function used to determine whether a character can be
meaningfully displayed on a given frame.
* doc/lispref/display.texi (Fontsets): Document it.
* lisp/progmodes/prog-mode.el
(prettify-symbols--composition-displayable-p): New function used
to restrict to displayable prettification symbols.  This
prevents issues with missing characters appearing as boxes.
(prettify-symbols--make-keywords): Use it.  (Bug#77381)

(cherry picked from commit 2d0b5f34a008979d34f337c872bcf93a296c6ec2)

Extend prettify-symbols-alist in TeX mode

* lisp/textmodes/tex-mode.el (tex--prettify-symbols-alist): Add
further math symbols, quotes and fractions.  (Bug#77381)

(cherry picked from commit ef6203b64aaf53cd986caf17bd49b6ffe840c93a)

; Skip commit d6f1b25d2e5e83f472cf9cd35bea43c066fbd4f3

Optionally display function docstring in eldoc

Allow display (optionally) function docstring in eldoc. (Bug#77124)
* etc/NEWS: Document changes.
* lisp/progmodes/elisp-mode.el
(elisp-eldoc-funcall-with-docstring-length): New user option.
(elisp-eldoc-funcall-with-docstring): New function.

(cherry picked from commit 8fc18d0968a0f7ef610b6868a35e731c778991ac)

Improve formatting of 'setopt' suggestion in *Help* buffer

* lisp/help-fns.el (help--recommend-setopt): Remove function,
and...
(help-fns--customize-variable): ... move the relevant code here
to keep related code in the same place.  Change the formatting
to also include the :set function if it is set to a named
function.  (Bug#77173)

(cherry picked from commit c73e4cdece0d97f3f5793590fefa258923dca08b)

; Fix wording of recent documentation changes

* lisp/desktop.el (desktop-restore-frames):
* etc/NEWS:
* doc/emacs/misc.texi (Saving Emacs Sessions): Fix wording of the
recent changes.

(cherry picked from commit cffe5a02454f0d2201172c07a239bd9a3682ad68)

; Skip commit 3ee021dc19e314f6f456867ec43c25aed5cc41b8

perl-mode.el: Avoid obsolete font-lock face vars

* lisp/progmodes/perl-mode.el (perl-mode-abbrev-table): Merge defvar
into the definition.
(perl-font-lock-keywords-1, perl-font-lock-keywords-2): Avoid obsolete
font-lock face vars.

(cherry picked from commit cd41247dc18f4e478ffb296198229ee22d44668c)

Disable desktop-restore-frames by default on Android

* lisp/desktop.el (desktop-restore-frames): Default to nil when
\(featurep 'android).

* doc/emacs/misc.texi (Saving Emacs Sessions): Adjust to match.

(cherry picked from commit d582ed9dc9be516f17dc9a526c3f9615001a46a6)

ediff-current-file: New optional startup-hooks arg

* lisp/vc/ediff.el (ediff-current-file): Add optional
startup-hooks argument, so that the user can write wrapper
commands with more finely customized behavior (bug#77323).

(cherry picked from commit 2bced74aa9735d9a9a5cb00aedfcac72d54f5d50)