config

commit 898d11f4015e7963175728abf981cdc048291c87
parent 139046e40d438324d3efbd2c8b7c7e610dc5f4bb
Author: dwrz <dwrz@dwrz.net>
Date:   Thu,  3 Oct 2024 12:45:08 +0000

Update Emacs packages

Diffstat:
M
emacs/elpa/archives/gnu/archive-contents
 | 
8
++++----
M
emacs/elpa/archives/gnu/archive-contents.signed
 | 
4
++--
M
emacs/elpa/archives/melpa/archive-contents
 | 
118
++++++++++++++++++++++++++++++++++++++++----------------------------------------
M
emacs/elpa/archives/nongnu/archive-contents
 | 
18
+++++++++---------
M
emacs/elpa/archives/nongnu/archive-contents.signed
 | 
4
++--
D
emacs/elpa/consult-20240930.1012/consult-pkg.el
 | 
10
----------
D
emacs/elpa/consult-20240930.1012/consult.el
 | 
5246
-------------------------------------------------------------------------------
D
emacs/elpa/consult-20240930.1012/consult.elc
 | 
0

R
emacs/elpa/consult-20240930.1012/consult-autoloads.el -> emacs/elpa/consult-20241001.2057/consult-autoloads.el
 | 
0

R
emacs/elpa/consult-20240930.1012/consult-compile.el -> emacs/elpa/consult-20241001.2057/consult-compile.el
 | 
0

R
emacs/elpa/consult-20240930.1012/consult-compile.elc -> emacs/elpa/consult-20241001.2057/consult-compile.elc
 | 
0

R
emacs/elpa/consult-20240930.1012/consult-flymake.el -> emacs/elpa/consult-20241001.2057/consult-flymake.el
 | 
0

R
emacs/elpa/consult-20240930.1012/consult-flymake.elc -> emacs/elpa/consult-20241001.2057/consult-flymake.elc
 | 
0

R
emacs/elpa/consult-20240930.1012/consult-imenu.el -> emacs/elpa/consult-20241001.2057/consult-imenu.el
 | 
0

R
emacs/elpa/consult-20240930.1012/consult-imenu.elc -> emacs/elpa/consult-20241001.2057/consult-imenu.elc
 | 
0

R
emacs/elpa/consult-20240930.1012/consult-info.el -> emacs/elpa/consult-20241001.2057/consult-info.el
 | 
0

R
emacs/elpa/consult-20240930.1012/consult-info.elc -> emacs/elpa/consult-20241001.2057/consult-info.elc
 | 
0

R
emacs/elpa/consult-20240930.1012/consult-kmacro.el -> emacs/elpa/consult-20241001.2057/consult-kmacro.el
 | 
0

R
emacs/elpa/consult-20240930.1012/consult-kmacro.elc -> emacs/elpa/consult-20241001.2057/consult-kmacro.elc
 | 
0

R
emacs/elpa/consult-20240930.1012/consult-org.el -> emacs/elpa/consult-20241001.2057/consult-org.el
 | 
0

R
emacs/elpa/consult-20240930.1012/consult-org.elc -> emacs/elpa/consult-20241001.2057/consult-org.elc
 | 
0

A
emacs/elpa/consult-20241001.2057/consult-pkg.el
 | 
10
++++++++++
R
emacs/elpa/consult-20240930.1012/consult-register.el -> emacs/elpa/consult-20241001.2057/consult-register.el
 | 
0

R
emacs/elpa/consult-20240930.1012/consult-register.elc -> emacs/elpa/consult-20241001.2057/consult-register.elc
 | 
0

R
emacs/elpa/consult-20240930.1012/consult-xref.el -> emacs/elpa/consult-20241001.2057/consult-xref.el
 | 
0

R
emacs/elpa/consult-20240930.1012/consult-xref.elc -> emacs/elpa/consult-20241001.2057/consult-xref.elc
 | 
0

A
emacs/elpa/consult-20241001.2057/consult.el
 | 
5246
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
A
emacs/elpa/consult-20241001.2057/consult.elc
 | 
0

D
emacs/elpa/doom-modeline-20240923.140/doom-modeline-pkg.el
 | 
13
-------------
D
emacs/elpa/doom-modeline-20240923.140/doom-modeline-segments.el
 | 
3234
-------------------------------------------------------------------------------
D
emacs/elpa/doom-modeline-20240923.140/doom-modeline-segments.elc
 | 
0

D
emacs/elpa/doom-modeline-20240923.140/doom-modeline.el
 | 
263
-------------------------------------------------------------------------------
R
emacs/elpa/doom-modeline-20240923.140/doom-modeline-autoloads.el -> emacs/elpa/doom-modeline-20241002.1003/doom-modeline-autoloads.el
 | 
0

R
emacs/elpa/doom-modeline-20240923.140/doom-modeline-core.el -> emacs/elpa/doom-modeline-20241002.1003/doom-modeline-core.el
 | 
0

R
emacs/elpa/doom-modeline-20240923.140/doom-modeline-core.elc -> emacs/elpa/doom-modeline-20241002.1003/doom-modeline-core.elc
 | 
0

R
emacs/elpa/doom-modeline-20240923.140/doom-modeline-env.el -> emacs/elpa/doom-modeline-20241002.1003/doom-modeline-env.el
 | 
0

R
emacs/elpa/doom-modeline-20240923.140/doom-modeline-env.elc -> emacs/elpa/doom-modeline-20241002.1003/doom-modeline-env.elc
 | 
0

A
emacs/elpa/doom-modeline-20241002.1003/doom-modeline-pkg.el
 | 
13
+++++++++++++
A
emacs/elpa/doom-modeline-20241002.1003/doom-modeline-segments.el
 | 
3235
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
A
emacs/elpa/doom-modeline-20241002.1003/doom-modeline-segments.elc
 | 
0

A
emacs/elpa/doom-modeline-20241002.1003/doom-modeline.el
 | 
263
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
R
emacs/elpa/doom-modeline-20240923.140/doom-modeline.elc -> emacs/elpa/doom-modeline-20241002.1003/doom-modeline.elc
 | 
0

D
emacs/elpa/f-20240308.906/f-pkg.el
 | 
16
----------------
D
emacs/elpa/f-20240308.906/f-shortdoc.el
 | 
438
-------------------------------------------------------------------------------
D
emacs/elpa/f-20240308.906/f.el
 | 
799
-------------------------------------------------------------------------------
D
emacs/elpa/f-20240308.906/f.elc
 | 
0

R
emacs/elpa/f-20240308.906/f-autoloads.el -> emacs/elpa/f-20241003.1131/f-autoloads.el
 | 
0

A
emacs/elpa/f-20241003.1131/f-pkg.el
 | 
12
++++++++++++
A
emacs/elpa/f-20241003.1131/f-shortdoc.el
 | 
437
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
A
emacs/elpa/f-20241003.1131/f.el
 | 
800
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
A
emacs/elpa/f-20241003.1131/f.elc
 | 
0

D
emacs/elpa/lsp-mode-20240930.1803/lsp-go.el
 | 
360
-------------------------------------------------------------------------------
D
emacs/elpa/lsp-mode-20240930.1803/lsp-go.elc
 | 
0

D
emacs/elpa/lsp-mode-20240930.1803/lsp-graphql.el
 | 
74
--------------------------------------------------------------------------
D
emacs/elpa/lsp-mode-20240930.1803/lsp-graphql.elc
 | 
0

D
emacs/elpa/lsp-mode-20240930.1803/lsp-mode-pkg.el
 | 
15
---------------
D
emacs/elpa/lsp-mode-20240930.1803/lsp-mode.el
 | 
9917
-------------------------------------------------------------------------------
R
emacs/elpa/lsp-mode-20240930.1803/lsp-actionscript.el -> emacs/elpa/lsp-mode-20241003.636/lsp-actionscript.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-actionscript.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-actionscript.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-ada.el -> emacs/elpa/lsp-mode-20241003.636/lsp-ada.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-ada.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-ada.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-angular.el -> emacs/elpa/lsp-mode-20241003.636/lsp-angular.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-angular.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-angular.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-ansible.el -> emacs/elpa/lsp-mode-20241003.636/lsp-ansible.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-ansible.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-ansible.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-asm.el -> emacs/elpa/lsp-mode-20241003.636/lsp-asm.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-asm.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-asm.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-astro.el -> emacs/elpa/lsp-mode-20241003.636/lsp-astro.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-astro.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-astro.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-autotools.el -> emacs/elpa/lsp-mode-20241003.636/lsp-autotools.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-autotools.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-autotools.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-awk.el -> emacs/elpa/lsp-mode-20241003.636/lsp-awk.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-awk.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-awk.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-bash.el -> emacs/elpa/lsp-mode-20241003.636/lsp-bash.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-bash.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-bash.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-beancount.el -> emacs/elpa/lsp-mode-20241003.636/lsp-beancount.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-beancount.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-beancount.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-bufls.el -> emacs/elpa/lsp-mode-20241003.636/lsp-bufls.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-bufls.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-bufls.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-camel.el -> emacs/elpa/lsp-mode-20241003.636/lsp-camel.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-camel.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-camel.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-clangd.el -> emacs/elpa/lsp-mode-20241003.636/lsp-clangd.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-clangd.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-clangd.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-clojure.el -> emacs/elpa/lsp-mode-20241003.636/lsp-clojure.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-clojure.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-clojure.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-cmake.el -> emacs/elpa/lsp-mode-20241003.636/lsp-cmake.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-cmake.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-cmake.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-cobol.el -> emacs/elpa/lsp-mode-20241003.636/lsp-cobol.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-cobol.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-cobol.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-completion.el -> emacs/elpa/lsp-mode-20241003.636/lsp-completion.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-completion.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-completion.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-credo.el -> emacs/elpa/lsp-mode-20241003.636/lsp-credo.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-credo.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-credo.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-crystal.el -> emacs/elpa/lsp-mode-20241003.636/lsp-crystal.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-crystal.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-crystal.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-csharp.el -> emacs/elpa/lsp-mode-20241003.636/lsp-csharp.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-csharp.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-csharp.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-css.el -> emacs/elpa/lsp-mode-20241003.636/lsp-css.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-css.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-css.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-cucumber.el -> emacs/elpa/lsp-mode-20241003.636/lsp-cucumber.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-cucumber.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-cucumber.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-cypher.el -> emacs/elpa/lsp-mode-20241003.636/lsp-cypher.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-cypher.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-cypher.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-d.el -> emacs/elpa/lsp-mode-20241003.636/lsp-d.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-d.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-d.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-dhall.el -> emacs/elpa/lsp-mode-20241003.636/lsp-dhall.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-dhall.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-dhall.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-diagnostics.el -> emacs/elpa/lsp-mode-20241003.636/lsp-diagnostics.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-diagnostics.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-diagnostics.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-dired.el -> emacs/elpa/lsp-mode-20241003.636/lsp-dired.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-dired.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-dired.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-dockerfile.el -> emacs/elpa/lsp-mode-20241003.636/lsp-dockerfile.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-dockerfile.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-dockerfile.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-dot.el -> emacs/elpa/lsp-mode-20241003.636/lsp-dot.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-dot.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-dot.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-earthly.el -> emacs/elpa/lsp-mode-20241003.636/lsp-earthly.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-earthly.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-earthly.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-elixir.el -> emacs/elpa/lsp-mode-20241003.636/lsp-elixir.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-elixir.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-elixir.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-elm.el -> emacs/elpa/lsp-mode-20241003.636/lsp-elm.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-elm.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-elm.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-emmet.el -> emacs/elpa/lsp-mode-20241003.636/lsp-emmet.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-emmet.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-emmet.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-erlang.el -> emacs/elpa/lsp-mode-20241003.636/lsp-erlang.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-erlang.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-erlang.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-eslint.el -> emacs/elpa/lsp-mode-20241003.636/lsp-eslint.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-eslint.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-eslint.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-fortran.el -> emacs/elpa/lsp-mode-20241003.636/lsp-fortran.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-fortran.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-fortran.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-fsharp.el -> emacs/elpa/lsp-mode-20241003.636/lsp-fsharp.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-fsharp.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-fsharp.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-futhark.el -> emacs/elpa/lsp-mode-20241003.636/lsp-futhark.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-futhark.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-futhark.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-gdscript.el -> emacs/elpa/lsp-mode-20241003.636/lsp-gdscript.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-gdscript.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-gdscript.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-gleam.el -> emacs/elpa/lsp-mode-20241003.636/lsp-gleam.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-gleam.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-gleam.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-glsl.el -> emacs/elpa/lsp-mode-20241003.636/lsp-glsl.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-glsl.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-glsl.elc
 | 
0

A
emacs/elpa/lsp-mode-20241003.636/lsp-go.el
 | 
446
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
A
emacs/elpa/lsp-mode-20241003.636/lsp-go.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-golangci-lint.el -> emacs/elpa/lsp-mode-20241003.636/lsp-golangci-lint.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-golangci-lint.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-golangci-lint.elc
 | 
0

A
emacs/elpa/lsp-mode-20241003.636/lsp-graphql.el
 | 
79
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
A
emacs/elpa/lsp-mode-20241003.636/lsp-graphql.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-groovy.el -> emacs/elpa/lsp-mode-20241003.636/lsp-groovy.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-groovy.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-groovy.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-hack.el -> emacs/elpa/lsp-mode-20241003.636/lsp-hack.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-hack.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-hack.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-haxe.el -> emacs/elpa/lsp-mode-20241003.636/lsp-haxe.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-haxe.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-haxe.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-headerline.el -> emacs/elpa/lsp-mode-20241003.636/lsp-headerline.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-headerline.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-headerline.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-html.el -> emacs/elpa/lsp-mode-20241003.636/lsp-html.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-html.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-html.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-hy.el -> emacs/elpa/lsp-mode-20241003.636/lsp-hy.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-hy.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-hy.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-icons.el -> emacs/elpa/lsp-mode-20241003.636/lsp-icons.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-icons.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-icons.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-ido.el -> emacs/elpa/lsp-mode-20241003.636/lsp-ido.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-ido.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-ido.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-idris.el -> emacs/elpa/lsp-mode-20241003.636/lsp-idris.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-idris.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-idris.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-iedit.el -> emacs/elpa/lsp-mode-20241003.636/lsp-iedit.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-iedit.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-iedit.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-javascript.el -> emacs/elpa/lsp-mode-20241003.636/lsp-javascript.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-javascript.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-javascript.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-jq.el -> emacs/elpa/lsp-mode-20241003.636/lsp-jq.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-jq.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-jq.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-json.el -> emacs/elpa/lsp-mode-20241003.636/lsp-json.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-json.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-json.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-jsonnet.el -> emacs/elpa/lsp-mode-20241003.636/lsp-jsonnet.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-jsonnet.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-jsonnet.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-kotlin.el -> emacs/elpa/lsp-mode-20241003.636/lsp-kotlin.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-kotlin.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-kotlin.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-lens.el -> emacs/elpa/lsp-mode-20241003.636/lsp-lens.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-lens.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-lens.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-lisp.el -> emacs/elpa/lsp-mode-20241003.636/lsp-lisp.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-lisp.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-lisp.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-lua.el -> emacs/elpa/lsp-mode-20241003.636/lsp-lua.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-lua.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-lua.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-magik.el -> emacs/elpa/lsp-mode-20241003.636/lsp-magik.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-magik.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-magik.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-markdown.el -> emacs/elpa/lsp-mode-20241003.636/lsp-markdown.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-markdown.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-markdown.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-marksman.el -> emacs/elpa/lsp-mode-20241003.636/lsp-marksman.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-marksman.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-marksman.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-mdx.el -> emacs/elpa/lsp-mode-20241003.636/lsp-mdx.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-mdx.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-mdx.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-meson.el -> emacs/elpa/lsp-mode-20241003.636/lsp-meson.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-meson.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-meson.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-mint.el -> emacs/elpa/lsp-mode-20241003.636/lsp-mint.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-mint.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-mint.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-mode-autoloads.el -> emacs/elpa/lsp-mode-20241003.636/lsp-mode-autoloads.el
 | 
0

A
emacs/elpa/lsp-mode-20241003.636/lsp-mode-pkg.el
 | 
15
+++++++++++++++
A
emacs/elpa/lsp-mode-20241003.636/lsp-mode.el
 | 
9917
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
R
emacs/elpa/lsp-mode-20240930.1803/lsp-mode.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-mode.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-modeline.el -> emacs/elpa/lsp-mode-20241003.636/lsp-modeline.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-modeline.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-modeline.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-mojo.el -> emacs/elpa/lsp-mode-20241003.636/lsp-mojo.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-mojo.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-mojo.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-move.el -> emacs/elpa/lsp-mode-20241003.636/lsp-move.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-move.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-move.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-nginx.el -> emacs/elpa/lsp-mode-20241003.636/lsp-nginx.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-nginx.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-nginx.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-nim.el -> emacs/elpa/lsp-mode-20241003.636/lsp-nim.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-nim.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-nim.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-nix.el -> emacs/elpa/lsp-mode-20241003.636/lsp-nix.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-nix.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-nix.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-nushell.el -> emacs/elpa/lsp-mode-20241003.636/lsp-nushell.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-nushell.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-nushell.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-ocaml.el -> emacs/elpa/lsp-mode-20241003.636/lsp-ocaml.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-ocaml.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-ocaml.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-openscad.el -> emacs/elpa/lsp-mode-20241003.636/lsp-openscad.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-openscad.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-openscad.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-perl.el -> emacs/elpa/lsp-mode-20241003.636/lsp-perl.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-perl.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-perl.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-perlnavigator.el -> emacs/elpa/lsp-mode-20241003.636/lsp-perlnavigator.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-perlnavigator.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-perlnavigator.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-php.el -> emacs/elpa/lsp-mode-20241003.636/lsp-php.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-php.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-php.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-pls.el -> emacs/elpa/lsp-mode-20241003.636/lsp-pls.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-pls.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-pls.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-prolog.el -> emacs/elpa/lsp-mode-20241003.636/lsp-prolog.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-prolog.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-prolog.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-protocol.el -> emacs/elpa/lsp-mode-20241003.636/lsp-protocol.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-protocol.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-protocol.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-purescript.el -> emacs/elpa/lsp-mode-20241003.636/lsp-purescript.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-purescript.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-purescript.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-pwsh.el -> emacs/elpa/lsp-mode-20241003.636/lsp-pwsh.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-pwsh.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-pwsh.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-pyls.el -> emacs/elpa/lsp-mode-20241003.636/lsp-pyls.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-pyls.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-pyls.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-pylsp.el -> emacs/elpa/lsp-mode-20241003.636/lsp-pylsp.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-pylsp.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-pylsp.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-qml.el -> emacs/elpa/lsp-mode-20241003.636/lsp-qml.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-qml.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-qml.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-r.el -> emacs/elpa/lsp-mode-20241003.636/lsp-r.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-r.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-r.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-racket.el -> emacs/elpa/lsp-mode-20241003.636/lsp-racket.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-racket.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-racket.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-remark.el -> emacs/elpa/lsp-mode-20241003.636/lsp-remark.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-remark.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-remark.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-rf.el -> emacs/elpa/lsp-mode-20241003.636/lsp-rf.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-rf.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-rf.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-roslyn.el -> emacs/elpa/lsp-mode-20241003.636/lsp-roslyn.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-roslyn.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-roslyn.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-rpm-spec.el -> emacs/elpa/lsp-mode-20241003.636/lsp-rpm-spec.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-rpm-spec.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-rpm-spec.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-rubocop.el -> emacs/elpa/lsp-mode-20241003.636/lsp-rubocop.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-rubocop.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-rubocop.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-ruby-lsp.el -> emacs/elpa/lsp-mode-20241003.636/lsp-ruby-lsp.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-ruby-lsp.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-ruby-lsp.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-ruby-syntax-tree.el -> emacs/elpa/lsp-mode-20241003.636/lsp-ruby-syntax-tree.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-ruby-syntax-tree.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-ruby-syntax-tree.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-ruff.el -> emacs/elpa/lsp-mode-20241003.636/lsp-ruff.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-ruff.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-ruff.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-rust.el -> emacs/elpa/lsp-mode-20241003.636/lsp-rust.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-rust.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-rust.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-semantic-tokens.el -> emacs/elpa/lsp-mode-20241003.636/lsp-semantic-tokens.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-semantic-tokens.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-semantic-tokens.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-semgrep.el -> emacs/elpa/lsp-mode-20241003.636/lsp-semgrep.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-semgrep.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-semgrep.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-sml.el -> emacs/elpa/lsp-mode-20241003.636/lsp-sml.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-sml.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-sml.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-solargraph.el -> emacs/elpa/lsp-mode-20241003.636/lsp-solargraph.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-solargraph.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-solargraph.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-solidity.el -> emacs/elpa/lsp-mode-20241003.636/lsp-solidity.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-solidity.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-solidity.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-sorbet.el -> emacs/elpa/lsp-mode-20241003.636/lsp-sorbet.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-sorbet.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-sorbet.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-sql.el -> emacs/elpa/lsp-mode-20241003.636/lsp-sql.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-sql.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-sql.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-sqls.el -> emacs/elpa/lsp-mode-20241003.636/lsp-sqls.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-sqls.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-sqls.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-steep.el -> emacs/elpa/lsp-mode-20241003.636/lsp-steep.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-steep.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-steep.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-svelte.el -> emacs/elpa/lsp-mode-20241003.636/lsp-svelte.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-svelte.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-svelte.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-terraform.el -> emacs/elpa/lsp-mode-20241003.636/lsp-terraform.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-terraform.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-terraform.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-tex.el -> emacs/elpa/lsp-mode-20241003.636/lsp-tex.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-tex.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-tex.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-tilt.el -> emacs/elpa/lsp-mode-20241003.636/lsp-tilt.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-tilt.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-tilt.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-toml.el -> emacs/elpa/lsp-mode-20241003.636/lsp-toml.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-toml.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-toml.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-trunk.el -> emacs/elpa/lsp-mode-20241003.636/lsp-trunk.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-trunk.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-trunk.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-ttcn3.el -> emacs/elpa/lsp-mode-20241003.636/lsp-ttcn3.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-ttcn3.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-ttcn3.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-typeprof.el -> emacs/elpa/lsp-mode-20241003.636/lsp-typeprof.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-typeprof.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-typeprof.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-v.el -> emacs/elpa/lsp-mode-20241003.636/lsp-v.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-v.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-v.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-vala.el -> emacs/elpa/lsp-mode-20241003.636/lsp-vala.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-vala.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-vala.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-verilog.el -> emacs/elpa/lsp-mode-20241003.636/lsp-verilog.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-verilog.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-verilog.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-vetur.el -> emacs/elpa/lsp-mode-20241003.636/lsp-vetur.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-vetur.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-vetur.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-vhdl.el -> emacs/elpa/lsp-mode-20241003.636/lsp-vhdl.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-vhdl.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-vhdl.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-vimscript.el -> emacs/elpa/lsp-mode-20241003.636/lsp-vimscript.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-vimscript.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-vimscript.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-volar.el -> emacs/elpa/lsp-mode-20241003.636/lsp-volar.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-volar.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-volar.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-wgsl.el -> emacs/elpa/lsp-mode-20241003.636/lsp-wgsl.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-wgsl.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-wgsl.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-xml.el -> emacs/elpa/lsp-mode-20241003.636/lsp-xml.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-xml.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-xml.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-yaml.el -> emacs/elpa/lsp-mode-20241003.636/lsp-yaml.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-yaml.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-yaml.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-yang.el -> emacs/elpa/lsp-mode-20241003.636/lsp-yang.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-yang.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-yang.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-zig.el -> emacs/elpa/lsp-mode-20241003.636/lsp-zig.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp-zig.elc -> emacs/elpa/lsp-mode-20241003.636/lsp-zig.elc
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp.el -> emacs/elpa/lsp-mode-20241003.636/lsp.el
 | 
0

R
emacs/elpa/lsp-mode-20240930.1803/lsp.elc -> emacs/elpa/lsp-mode-20241003.636/lsp.elc
 | 
0

D
emacs/elpa/magit-20240930.1805/git-commit.elc
 | 
0

D
emacs/elpa/magit-20240930.1805/magit-blame.el
 | 
989
-------------------------------------------------------------------------------
D
emacs/elpa/magit-20240930.1805/magit-blame.elc
 | 
0

D
emacs/elpa/magit-20240930.1805/magit-diff.elc
 | 
0

D
emacs/elpa/magit-20240930.1805/magit-git.el
 | 
2879
-------------------------------------------------------------------------------
D
emacs/elpa/magit-20240930.1805/magit-git.elc
 | 
0

D
emacs/elpa/magit-20240930.1805/magit-log.elc
 | 
0

D
emacs/elpa/magit-20240930.1805/magit-pkg.el
 | 
18
------------------
D
emacs/elpa/magit-20240930.1805/magit.el
 | 
789
-------------------------------------------------------------------------------
D
emacs/elpa/magit-20240930.1805/magit.info
 | 
11592
-------------------------------------------------------------------------------
R
emacs/elpa/magit-20240930.1805/AUTHORS.md -> emacs/elpa/magit-20241001.2052/AUTHORS.md
 | 
0

R
emacs/elpa/magit-20240930.1805/LICENSE -> emacs/elpa/magit-20241001.2052/LICENSE
 | 
0

R
emacs/elpa/magit-20240930.1805/dir -> emacs/elpa/magit-20241001.2052/dir
 | 
0

R
emacs/elpa/magit-20240930.1805/git-commit.el -> emacs/elpa/magit-20241001.2052/git-commit.el
 | 
0

A
emacs/elpa/magit-20241001.2052/git-commit.elc
 | 
0

R
emacs/elpa/magit-20240930.1805/git-rebase.el -> emacs/elpa/magit-20241001.2052/git-rebase.el
 | 
0

R
emacs/elpa/magit-20240930.1805/git-rebase.elc -> emacs/elpa/magit-20241001.2052/git-rebase.elc
 | 
0

R
emacs/elpa/magit-20240930.1805/magit-apply.el -> emacs/elpa/magit-20241001.2052/magit-apply.el
 | 
0

R
emacs/elpa/magit-20240930.1805/magit-apply.elc -> emacs/elpa/magit-20241001.2052/magit-apply.elc
 | 
0

R
emacs/elpa/magit-20240930.1805/magit-autoloads.el -> emacs/elpa/magit-20241001.2052/magit-autoloads.el
 | 
0

R
emacs/elpa/magit-20240930.1805/magit-autorevert.el -> emacs/elpa/magit-20241001.2052/magit-autorevert.el
 | 
0

R
emacs/elpa/magit-20240930.1805/magit-autorevert.elc -> emacs/elpa/magit-20241001.2052/magit-autorevert.elc
 | 
0

R
emacs/elpa/magit-20240930.1805/magit-base.el -> emacs/elpa/magit-20241001.2052/magit-base.el
 | 
0

R
emacs/elpa/magit-20240930.1805/magit-base.elc -> emacs/elpa/magit-20241001.2052/magit-base.elc
 | 
0

R
emacs/elpa/magit-20240930.1805/magit-bisect.el -> emacs/elpa/magit-20241001.2052/magit-bisect.el
 | 
0

R
emacs/elpa/magit-20240930.1805/magit-bisect.elc -> emacs/elpa/magit-20241001.2052/magit-bisect.elc
 | 
0

A
emacs/elpa/magit-20241001.2052/magit-blame.el
 | 
988
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
A
emacs/elpa/magit-20241001.2052/magit-blame.elc
 | 
0

R
emacs/elpa/magit-20240930.1805/magit-bookmark.el -> emacs/elpa/magit-20241001.2052/magit-bookmark.el
 | 
0

R
emacs/elpa/magit-20240930.1805/magit-bookmark.elc -> emacs/elpa/magit-20241001.2052/magit-bookmark.elc
 | 
0

R
emacs/elpa/magit-20240930.1805/magit-branch.el -> emacs/elpa/magit-20241001.2052/magit-branch.el
 | 
0

R
emacs/elpa/magit-20240930.1805/magit-branch.elc -> emacs/elpa/magit-20241001.2052/magit-branch.elc
 | 
0

R
emacs/elpa/magit-20240930.1805/magit-bundle.el -> emacs/elpa/magit-20241001.2052/magit-bundle.el
 | 
0

R
emacs/elpa/magit-20240930.1805/magit-bundle.elc -> emacs/elpa/magit-20241001.2052/magit-bundle.elc
 | 
0

R
emacs/elpa/magit-20240930.1805/magit-clone.el -> emacs/elpa/magit-20241001.2052/magit-clone.el
 | 
0

R
emacs/elpa/magit-20240930.1805/magit-clone.elc -> emacs/elpa/magit-20241001.2052/magit-clone.elc
 | 
0

R
emacs/elpa/magit-20240930.1805/magit-commit.el -> emacs/elpa/magit-20241001.2052/magit-commit.el
 | 
0

R
emacs/elpa/magit-20240930.1805/magit-commit.elc -> emacs/elpa/magit-20241001.2052/magit-commit.elc
 | 
0

R
emacs/elpa/magit-20240930.1805/magit-core.el -> emacs/elpa/magit-20241001.2052/magit-core.el
 | 
0

R
emacs/elpa/magit-20240930.1805/magit-core.elc -> emacs/elpa/magit-20241001.2052/magit-core.elc
 | 
0

R
emacs/elpa/magit-20240930.1805/magit-diff.el -> emacs/elpa/magit-20241001.2052/magit-diff.el
 | 
0

A
emacs/elpa/magit-20241001.2052/magit-diff.elc
 | 
0

R
emacs/elpa/magit-20240930.1805/magit-ediff.el -> emacs/elpa/magit-20241001.2052/magit-ediff.el
 | 
0

R
emacs/elpa/magit-20240930.1805/magit-ediff.elc -> emacs/elpa/magit-20241001.2052/magit-ediff.elc
 | 
0

R
emacs/elpa/magit-20240930.1805/magit-extras.el -> emacs/elpa/magit-20241001.2052/magit-extras.el
 | 
0

R
emacs/elpa/magit-20240930.1805/magit-extras.elc -> emacs/elpa/magit-20241001.2052/magit-extras.elc
 | 
0

R
emacs/elpa/magit-20240930.1805/magit-fetch.el -> emacs/elpa/magit-20241001.2052/magit-fetch.el
 | 
0

R
emacs/elpa/magit-20240930.1805/magit-fetch.elc -> emacs/elpa/magit-20241001.2052/magit-fetch.elc
 | 
0

R
emacs/elpa/magit-20240930.1805/magit-files.el -> emacs/elpa/magit-20241001.2052/magit-files.el
 | 
0

R
emacs/elpa/magit-20240930.1805/magit-files.elc -> emacs/elpa/magit-20241001.2052/magit-files.elc
 | 
0

A
emacs/elpa/magit-20241001.2052/magit-git.el
 | 
2889
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
A
emacs/elpa/magit-20241001.2052/magit-git.elc
 | 
0

R
emacs/elpa/magit-20240930.1805/magit-gitignore.el -> emacs/elpa/magit-20241001.2052/magit-gitignore.el
 | 
0

R
emacs/elpa/magit-20240930.1805/magit-gitignore.elc -> emacs/elpa/magit-20241001.2052/magit-gitignore.elc
 | 
0

R
emacs/elpa/magit-20240930.1805/magit-log.el -> emacs/elpa/magit-20241001.2052/magit-log.el
 | 
0

A
emacs/elpa/magit-20241001.2052/magit-log.elc
 | 
0

R
emacs/elpa/magit-20240930.1805/magit-margin.el -> emacs/elpa/magit-20241001.2052/magit-margin.el
 | 
0

R
emacs/elpa/magit-20240930.1805/magit-margin.elc -> emacs/elpa/magit-20241001.2052/magit-margin.elc
 | 
0

R
emacs/elpa/magit-20240930.1805/magit-merge.el -> emacs/elpa/magit-20241001.2052/magit-merge.el
 | 
0

R
emacs/elpa/magit-20240930.1805/magit-merge.elc -> emacs/elpa/magit-20241001.2052/magit-merge.elc
 | 
0

R
emacs/elpa/magit-20240930.1805/magit-mode.el -> emacs/elpa/magit-20241001.2052/magit-mode.el
 | 
0

R
emacs/elpa/magit-20240930.1805/magit-mode.elc -> emacs/elpa/magit-20241001.2052/magit-mode.elc
 | 
0

R
emacs/elpa/magit-20240930.1805/magit-notes.el -> emacs/elpa/magit-20241001.2052/magit-notes.el
 | 
0

R
emacs/elpa/magit-20240930.1805/magit-notes.elc -> emacs/elpa/magit-20241001.2052/magit-notes.elc
 | 
0

R
emacs/elpa/magit-20240930.1805/magit-patch.el -> emacs/elpa/magit-20241001.2052/magit-patch.el
 | 
0

R
emacs/elpa/magit-20240930.1805/magit-patch.elc -> emacs/elpa/magit-20241001.2052/magit-patch.elc
 | 
0

A
emacs/elpa/magit-20241001.2052/magit-pkg.el
 | 
18
++++++++++++++++++
R
emacs/elpa/magit-20240930.1805/magit-process.el -> emacs/elpa/magit-20241001.2052/magit-process.el
 | 
0

R
emacs/elpa/magit-20240930.1805/magit-process.elc -> emacs/elpa/magit-20241001.2052/magit-process.elc
 | 
0

R
emacs/elpa/magit-20240930.1805/magit-pull.el -> emacs/elpa/magit-20241001.2052/magit-pull.el
 | 
0

R
emacs/elpa/magit-20240930.1805/magit-pull.elc -> emacs/elpa/magit-20241001.2052/magit-pull.elc
 | 
0

R
emacs/elpa/magit-20240930.1805/magit-push.el -> emacs/elpa/magit-20241001.2052/magit-push.el
 | 
0

R
emacs/elpa/magit-20240930.1805/magit-push.elc -> emacs/elpa/magit-20241001.2052/magit-push.elc
 | 
0

R
emacs/elpa/magit-20240930.1805/magit-reflog.el -> emacs/elpa/magit-20241001.2052/magit-reflog.el
 | 
0

R
emacs/elpa/magit-20240930.1805/magit-reflog.elc -> emacs/elpa/magit-20241001.2052/magit-reflog.elc
 | 
0

R
emacs/elpa/magit-20240930.1805/magit-refs.el -> emacs/elpa/magit-20241001.2052/magit-refs.el
 | 
0

R
emacs/elpa/magit-20240930.1805/magit-refs.elc -> emacs/elpa/magit-20241001.2052/magit-refs.elc
 | 
0

R
emacs/elpa/magit-20240930.1805/magit-remote.el -> emacs/elpa/magit-20241001.2052/magit-remote.el
 | 
0

R
emacs/elpa/magit-20240930.1805/magit-remote.elc -> emacs/elpa/magit-20241001.2052/magit-remote.elc
 | 
0

R
emacs/elpa/magit-20240930.1805/magit-repos.el -> emacs/elpa/magit-20241001.2052/magit-repos.el
 | 
0

R
emacs/elpa/magit-20240930.1805/magit-repos.elc -> emacs/elpa/magit-20241001.2052/magit-repos.elc
 | 
0

R
emacs/elpa/magit-20240930.1805/magit-reset.el -> emacs/elpa/magit-20241001.2052/magit-reset.el
 | 
0

R
emacs/elpa/magit-20240930.1805/magit-reset.elc -> emacs/elpa/magit-20241001.2052/magit-reset.elc
 | 
0

R
emacs/elpa/magit-20240930.1805/magit-sequence.el -> emacs/elpa/magit-20241001.2052/magit-sequence.el
 | 
0

R
emacs/elpa/magit-20240930.1805/magit-sequence.elc -> emacs/elpa/magit-20241001.2052/magit-sequence.elc
 | 
0

R
emacs/elpa/magit-20240930.1805/magit-sparse-checkout.el -> emacs/elpa/magit-20241001.2052/magit-sparse-checkout.el
 | 
0

R
emacs/elpa/magit-20240930.1805/magit-sparse-checkout.elc -> emacs/elpa/magit-20241001.2052/magit-sparse-checkout.elc
 | 
0

R
emacs/elpa/magit-20240930.1805/magit-stash.el -> emacs/elpa/magit-20241001.2052/magit-stash.el
 | 
0

R
emacs/elpa/magit-20240930.1805/magit-stash.elc -> emacs/elpa/magit-20241001.2052/magit-stash.elc
 | 
0

R
emacs/elpa/magit-20240930.1805/magit-status.el -> emacs/elpa/magit-20241001.2052/magit-status.el
 | 
0

R
emacs/elpa/magit-20240930.1805/magit-status.elc -> emacs/elpa/magit-20241001.2052/magit-status.elc
 | 
0

R
emacs/elpa/magit-20240930.1805/magit-submodule.el -> emacs/elpa/magit-20241001.2052/magit-submodule.el
 | 
0

R
emacs/elpa/magit-20240930.1805/magit-submodule.elc -> emacs/elpa/magit-20241001.2052/magit-submodule.elc
 | 
0

R
emacs/elpa/magit-20240930.1805/magit-subtree.el -> emacs/elpa/magit-20241001.2052/magit-subtree.el
 | 
0

R
emacs/elpa/magit-20240930.1805/magit-subtree.elc -> emacs/elpa/magit-20241001.2052/magit-subtree.elc
 | 
0

R
emacs/elpa/magit-20240930.1805/magit-tag.el -> emacs/elpa/magit-20241001.2052/magit-tag.el
 | 
0

R
emacs/elpa/magit-20240930.1805/magit-tag.elc -> emacs/elpa/magit-20241001.2052/magit-tag.elc
 | 
0

R
emacs/elpa/magit-20240930.1805/magit-transient.el -> emacs/elpa/magit-20241001.2052/magit-transient.el
 | 
0

R
emacs/elpa/magit-20240930.1805/magit-transient.elc -> emacs/elpa/magit-20241001.2052/magit-transient.elc
 | 
0

R
emacs/elpa/magit-20240930.1805/magit-wip.el -> emacs/elpa/magit-20241001.2052/magit-wip.el
 | 
0

R
emacs/elpa/magit-20240930.1805/magit-wip.elc -> emacs/elpa/magit-20241001.2052/magit-wip.elc
 | 
0

R
emacs/elpa/magit-20240930.1805/magit-worktree.el -> emacs/elpa/magit-20241001.2052/magit-worktree.el
 | 
0

R
emacs/elpa/magit-20240930.1805/magit-worktree.elc -> emacs/elpa/magit-20241001.2052/magit-worktree.elc
 | 
0

A
emacs/elpa/magit-20241001.2052/magit.el
 | 
789
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
R
emacs/elpa/magit-20240930.1805/magit.elc -> emacs/elpa/magit-20241001.2052/magit.elc
 | 
0

A
emacs/elpa/magit-20241001.2052/magit.info
 | 
11592
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D
emacs/elpa/magit-section-20240913.1455/magit-section-pkg.el
 | 
17
-----------------
D
emacs/elpa/magit-section-20240913.1455/magit-section.el
 | 
2509
-------------------------------------------------------------------------------
D
emacs/elpa/magit-section-20240913.1455/magit-section.elc
 | 
0

D
emacs/elpa/magit-section-20240913.1455/magit-section.info
 | 
317
-------------------------------------------------------------------------------
R
emacs/elpa/magit-section-20240913.1455/dir -> emacs/elpa/magit-section-20241001.2052/dir
 | 
0

R
emacs/elpa/magit-section-20240913.1455/magit-section-autoloads.el -> emacs/elpa/magit-section-20241001.2052/magit-section-autoloads.el
 | 
0

A
emacs/elpa/magit-section-20241001.2052/magit-section-pkg.el
 | 
13
+++++++++++++
A
emacs/elpa/magit-section-20241001.2052/magit-section.el
 | 
2514
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
A
emacs/elpa/magit-section-20241001.2052/magit-section.elc
 | 
0

A
emacs/elpa/magit-section-20241001.2052/magit-section.info
 | 
317
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D
emacs/elpa/transient-20240929.1847/transient-pkg.el
 | 
12
------------
D
emacs/elpa/transient-20240929.1847/transient.el
 | 
4599
-------------------------------------------------------------------------------
D
emacs/elpa/transient-20240929.1847/transient.elc
 | 
0

D
emacs/elpa/transient-20240929.1847/transient.info
 | 
3331
-------------------------------------------------------------------------------
R
emacs/elpa/transient-20240929.1847/dir -> emacs/elpa/transient-20241001.1031/dir
 | 
0

R
emacs/elpa/transient-20240929.1847/gpl.info -> emacs/elpa/transient-20241001.1031/gpl.info
 | 
0

R
emacs/elpa/transient-20240929.1847/transient-autoloads.el -> emacs/elpa/transient-20241001.1031/transient-autoloads.el
 | 
0

A
emacs/elpa/transient-20241001.1031/transient-pkg.el
 | 
12
++++++++++++
A
emacs/elpa/transient-20241001.1031/transient.el
 | 
4599
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
A
emacs/elpa/transient-20241001.1031/transient.elc
 | 
0

A
emacs/elpa/transient-20241001.1031/transient.info
 | 
3331
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D
emacs/elpa/yaml-mode-20240317.1602/yaml-mode-pkg.el
 | 
15
---------------
D
emacs/elpa/yaml-mode-20240317.1602/yaml-mode.el
 | 
491
-------------------------------------------------------------------------------
D
emacs/elpa/yaml-mode-20240317.1602/yaml-mode.elc
 | 
0

R
emacs/elpa/yaml-mode-20240317.1602/yaml-mode-autoloads.el -> emacs/elpa/yaml-mode-20241003.153/yaml-mode-autoloads.el
 | 
0

A
emacs/elpa/yaml-mode-20241003.153/yaml-mode-pkg.el
 | 
11
+++++++++++
A
emacs/elpa/yaml-mode-20241003.153/yaml-mode.el
 | 
492
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
A
emacs/elpa/yaml-mode-20241003.153/yaml-mode.elc
 | 
0

453 files changed, 48114 insertions(+), 48019 deletions(-)
diff --git a/emacs/elpa/archives/gnu/archive-contents b/emacs/elpa/archives/gnu/archive-contents
@@ -1288,7 +1288,7 @@
 	       ("Markus Triska" . "triska@metalevel.at"))
 	      (:commit . "cfcdf9e42821d246b7fbc84877aa4ecacc184a1c"))])
  (eev .
-      [(20240925)
+      [(20241002)
        ((emacs
 	 (25 1)))
        "Support for e-scripts (eepitch blocks, elisp hyperlinks, etc)" tar
@@ -1297,7 +1297,7 @@
 	(:maintainer "Eduardo Ochs" . "eduardoochs@gmail.com")
 	(:authors
 	 ("Eduardo Ochs" . "eduardoochs@gmail.com"))
-	(:commit . "43131f4af5f5a01b86731049202d2dd31e0ba25f"))])
+	(:commit . "d2d846f31d2a204f33b001c43c0a42aced8d0f9e"))])
  (ef-themes .
 	    [(1 8 0)
 	     ((emacs
@@ -4472,7 +4472,7 @@
 	       (:url . "https://elpa.gnu.org/packages/transcribe.html")
 	       (:commit . "89832e4cdc1e6d8262a4a2c9d1ff70f398b8faf0"))])
  (transient .
-	    [(0 7 5)
+	    [(0 7 6)
 	     ((emacs
 	       (26 1))
 	      (compat
@@ -4485,7 +4485,7 @@
 	      (:maintainer "Jonas Bernoulli" . "emacs.transient@jonas.bernoulli.dev")
 	      (:authors
 	       ("Jonas Bernoulli" . "emacs.transient@jonas.bernoulli.dev"))
-	      (:commit . "3430943eaa3222cd2a487d4c102ec51e10e7e3c9"))])
+	      (:commit . "c06015cd6750f8625081f4184c68c94350eb0217"))])
  (transient-cycles .
 		   [(1 0)
 		    ((emacs
diff --git a/emacs/elpa/archives/gnu/archive-contents.signed b/emacs/elpa/archives/gnu/archive-contents.signed
@@ -1 +1 @@
-Good signature from 645357D2883A0966 GNU ELPA Signing Agent (2023) <elpasign@elpa.gnu.org> (trust undefined) created at 2024-09-30T21:05:02+0000 using EDDSA
-\ No newline at end of file
+Good signature from 645357D2883A0966 GNU ELPA Signing Agent (2023) <elpasign@elpa.gnu.org> (trust undefined) created at 2024-10-03T09:05:02+0000 using EDDSA
+\ No newline at end of file
diff --git a/emacs/elpa/archives/melpa/archive-contents b/emacs/elpa/archives/melpa/archive-contents
@@ -346,7 +346,7 @@
  (bind-chord . [(20221117 1610) ((emacs (24 3)) (bind-key (1 0)) (key-chord (0 6))) "Key-chord binding helper for use-package-chords" tar ((:url . "https://github.com/jwiegley/use-package") (:commit . "9090080b15486c3e337be254226efe7e5fde4c99") (:revdesc . "9090080b1548") (:keywords "convenience" "tools" "extensions") (:authors ("Justin Talbott" . "justin@waymondo.com")) (:maintainers ("Justin Talbott" . "justin@waymondo.com")) (:maintainer "Justin Talbott" . "justin@waymondo.com"))])
  (bind-key . [(20230203 2004) ((emacs (24 3))) "A simple way to manage personal keybindings" tar ((:url . "https://github.com/jwiegley/use-package") (:commit . "77945e002f11440eae72d8730d3de218163d551e") (:revdesc . "77945e002f11") (:keywords "keys" "keybinding" "config" "dotemacs" "extensions") (:authors ("John Wiegley" . "johnw@newartisans.com")) (:maintainers ("John Wiegley" . "johnw@newartisans.com")) (:maintainer "John Wiegley" . "johnw@newartisans.com"))])
  (bind-map . [(20240308 2050) ((emacs (24 3))) "Bind personal keymaps in multiple locations" tar ((:url . "https://github.com/justbur/emacs-bind-map") (:commit . "d7b0e42b78f708669ec368ebbd1f503094ceee22") (:revdesc . "d7b0e42b78f7") (:authors ("Justin Burkett" . "justin@burkett.cc")) (:maintainers ("Justin Burkett" . "justin@burkett.cc")) (:maintainer "Justin Burkett" . "justin@burkett.cc"))])
- (binder . [(20240630 725) ((emacs (24 4)) (seq (2 20))) "Global minor mode to facilitate multi-file writing projects" tar ((:url . "https://github.com/rnkn/binder") (:commit . "a17eb5089bbab05372c018e67b3da9aa25217d81") (:revdesc . "a17eb5089bba") (:keywords "files" "outlines" "wp" "text") (:authors ("Paul W. Rankin" . "rnkn@rnkn.xyz")) (:maintainers ("Paul W. Rankin" . "rnkn@rnkn.xyz")) (:maintainer "Paul W. Rankin" . "rnkn@rnkn.xyz"))])
+ (binder . [(20241003 51) ((emacs (24 4)) (seq (2 20))) "Global minor mode to facilitate multi-file writing projects" tar ((:url . "https://github.com/rnkn/binder") (:commit . "5c668cba1dc768aa25e5b2a2b446a2ad4babf8bb") (:revdesc . "5c668cba1dc7") (:keywords "files" "outlines" "wp" "text") (:authors ("Paul W. Rankin" . "rnkn@rnkn.xyz")) (:maintainers ("Divya Ranjan" . "divya@subvertising.org")) (:maintainer "Divya Ranjan" . "divya@subvertising.org"))])
  (bing-dict . [(20200216 110) nil "Minimalists' English-Chinese Bing dictionary" tar ((:url . "https://github.com/cute-jumper/bing-dict.el") (:commit . "1d581aaa9622b34f8fb83af5579fa252aa24cfef") (:revdesc . "1d581aaa9622") (:keywords "extensions") (:authors ("Junpeng Qiu" . "qjpchmail@gmail.com")) (:maintainers ("Junpeng Qiu" . "qjpchmail@gmail.com")) (:maintainer "Junpeng Qiu" . "qjpchmail@gmail.com"))])
  (binky . [(20240525 715) ((emacs (29 1)) (dash (2 19 1))) "Jump between points like a rabbit" tar ((:url . "https://github.com/liuyinz/binky.el") (:commit . "39c1a1e78aea36f79104fdc256949901e3d3d2c0") (:revdesc . "39c1a1e78aea") (:keywords "convenience") (:authors ("liuyinz" . "liuyinz95@gmail.com")) (:maintainers ("liuyinz" . "liuyinz95@gmail.com")) (:maintainer "liuyinz" . "liuyinz95@gmail.com"))])
  (biome . [(20240519 1037) ((emacs (27 1)) (transient (0 3 7)) (ct (0 2)) (request (0 3 3)) (compat (29 1 4 1))) "Bountiful Interface to Open Meteo for Emacs" tar ((:url . "https://github.com/SqrtMinusOne/biome") (:commit . "6c5d786219741e10332304566d4a18db3eddae2b") (:revdesc . "6c5d78621974") (:authors ("Korytov Pavel" . "thexcloud@gmail.com")) (:maintainers ("Korytov Pavel" . "thexcloud@gmail.com")) (:maintainer "Korytov Pavel" . "thexcloud@gmail.com"))])
@@ -392,7 +392,7 @@
  (borg . [(20240831 2310) ((emacs (27 1)) (epkg (4 0 1)) (magit (4 1 0))) "Assimilate Emacs packages as Git submodules" tar ((:url . "https://github.com/emacscollective/borg") (:commit . "cdae2c905ea5f819dec3b183214f5e19670d35f4") (:revdesc . "cdae2c905ea5") (:keywords "tools") (:authors ("Jonas Bernoulli" . "emacs.borg@jonas.bernoulli.dev")) (:maintainers ("Jonas Bernoulli" . "emacs.borg@jonas.bernoulli.dev")) (:maintainer "Jonas Bernoulli" . "emacs.borg@jonas.bernoulli.dev"))])
  (borland-blue-theme . [(20160117 1321) ((emacs (24 1))) "Blue/yellow theme based on old DOS Borland/Turbo C IDE" tar ((:url . "https://codeberg.org/fourier/borland-blue-theme") (:commit . "db74eefebbc89d3c62575f8f50b319e87b4a3470") (:revdesc . "db74eefebbc8") (:keywords "themes") (:authors ("Alexey Veretennikov" . "alexeydotveretennikovatgmaildotcom")) (:maintainers ("Alexey Veretennikov" . "alexeydotveretennikovatgmaildotcom")) (:maintainer "Alexey Veretennikov" . "alexeydotveretennikovatgmaildotcom"))])
  (boron-theme . [(20170808 1308) ((emacs (24 0))) "An Emacs 24 theme based on Boron (tmTheme)" tar ((:url . "https://github.com/emacsfodder/emacs-boron-theme") (:commit . "87ae1a765e07429fec25d2f29b004f84b52d2e0a") (:revdesc . "87ae1a765e07"))])
- (boxes . [(20240217 1143) ((emacs (24 3))) "ASCII boxes unlimited!" tar ((:url . "https://github.com/ascii-boxes/boxes") (:commit . "75dfd61801b3ec23ec30c88640ea31bbca5b36b9") (:revdesc . "75dfd61801b3") (:keywords "extensions") (:authors ("Jason L. Shiffer" . "jshiffer@zerotao.com")) (:maintainers ("Jason L. Shiffer" . "jshiffer@zerotao.com")) (:maintainer "Jason L. Shiffer" . "jshiffer@zerotao.com"))])
+ (boxes . [(20241003 847) ((emacs (24 3))) "ASCII boxes unlimited!" tar ((:url . "https://github.com/ascii-boxes/boxes") (:commit . "bae35281d0f814c704ef4a174a5f734541e1f457") (:revdesc . "bae35281d0f8") (:keywords "extensions") (:authors ("Jason L. Shiffer" . "jshiffer@zerotao.com")) (:maintainers ("Jason L. Shiffer" . "jshiffer@zerotao.com")) (:maintainer "Jason L. Shiffer" . "jshiffer@zerotao.com"))])
  (boxquote . [(20231216 852) ((cl-lib (0 5))) "Quote text with a semi-box" tar ((:url . "https://github.com/davep/boxquote.el") (:commit . "8d6c307ab3b783c5042065d0ae54961adb506484") (:revdesc . "8d6c307ab3b7") (:keywords "quoting") (:authors ("Dave Pearson" . "davep@davep.org")) (:maintainers ("Dave Pearson" . "davep@davep.org")) (:maintainer "Dave Pearson" . "davep@davep.org"))])
  (bpe . [(20141228 2205) ((emacs (24 1))) "Blog from Org mode to Blogger" tar ((:url . "https://github.com/yuutayamada/bpe") (:commit . "7b5b25f83506e6c9f4075d3803fa32404943a189") (:revdesc . "7b5b25f83506") (:keywords "blogger" "blog") (:authors ("Yuta Yamada" . "cokesboy\"at\"gmail.com")) (:maintainers ("Yuta Yamada" . "cokesboy\"at\"gmail.com")) (:maintainer "Yuta Yamada" . "cokesboy\"at\"gmail.com"))])
  (bpftrace-mode . [(20190608 2201) ((emacs (24 0))) "Major mode for editing bpftrace script files" tar ((:url . "https://gitlab.com/jgkamat/bpftrace-mode") (:commit . "587b39ea7a1d786df5c04796d51bf2a5a4eda0d7") (:revdesc . "587b39ea7a1d") (:keywords "highlight" "c") (:authors ("Jay Kamat" . "jaygkamat@gmail.com")) (:maintainers ("Jay Kamat" . "jaygkamat@gmail.com")) (:maintainer "Jay Kamat" . "jaygkamat@gmail.com"))])
@@ -486,23 +486,23 @@
  (caroline-theme . [(20160318 520) ((emacs (24))) "A trip down to New Orleans.." tar ((:url . "https://github.com/xjackk/caroline-theme") (:commit . "222fd483db304509f9e422dc82883d808e023ceb") (:revdesc . "222fd483db30") (:authors ("Jack Killilea" . "jaaacckz1@gmail.com")) (:maintainers ("Jack Killilea" . "jaaacckz1@gmail.com")) (:maintainer "Jack Killilea" . "jaaacckz1@gmail.com"))])
  (cascading-dir-locals . [(20211013 1955) ((emacs (26 1))) "Apply all (!) .dir-locals.el from root to current directory" tar ((:url . "https://github.com/fritzgrabo/cascading-dir-locals") (:commit . "345d4b70e837d45ee84014684127e7399932d5e6") (:revdesc . "345d4b70e837") (:keywords "convenience") (:authors ("Fritz Grabo" . "hello@fritzgrabo.com")) (:maintainers ("Fritz Grabo" . "hello@fritzgrabo.com")) (:maintainer "Fritz Grabo" . "hello@fritzgrabo.com"))])
  (caseformat . [(20160115 1615) ((emacs (24)) (cl-lib (0 5)) (dash (2 12 1)) (s (1 10 0))) "Format based letter case converter" tar ((:url . "https://github.com/HKey/caseformat") (:commit . "e4961889309408b3425da9b69c16ddfadd17a674") (:revdesc . "e49618893094") (:keywords "convenience") (:authors ("Hiroki YAMAKAWA" . "s06139@gmail.com")) (:maintainers ("Hiroki YAMAKAWA" . "s06139@gmail.com")) (:maintainer "Hiroki YAMAKAWA" . "s06139@gmail.com"))])
- (caser . [(20240928 2256) ((emacs (29 1))) "Change text casing from camelCase to dash-case to snake_case" tar ((:url . "https://hg.sr.ht/~zck/caser.el") (:commit . "46923efc3735b999ced77b013cbd220b8624ddd2") (:revdesc . "46923efc3735b999ced77b013cbd220b8624ddd2"))])
+ (caser . [(20241003 131) ((emacs (29 1))) "Change text casing from camelCase to UpperCamelCase to dash-case to snake_case" tar ((:url . "https://hg.sr.ht/~zck/caser.el") (:commit . "6ed8fe13ff6a4c39a831cf51b031a9e9fdcba5ff") (:revdesc . "6ed8fe13ff6a4c39a831cf51b031a9e9fdcba5ff"))])
  (cask-mode . [(20160410 1449) ((emacs (24 3))) "Major mode for editing Cask files" tar ((:url . "https://github.com/Wilfred/cask-mode") (:commit . "c97755267b7215f02df7b0c16b4210c04aee6566") (:revdesc . "c97755267b72") (:authors ("Wilfred Hughes" . "me@wilfred.me.uk")) (:maintainers ("Wilfred Hughes" . "me@wilfred.me.uk")) (:maintainer "Wilfred Hughes" . "me@wilfred.me.uk"))])
  (cask-package-toolset . [(20170921 2256) ((emacs (24)) (cl-lib (0 3)) (s (1 6 1)) (dash (1 8 0)) (f (0 10 0)) (commander (0 2 0)) (ansi (0 1 0)) (shut-up (0 1 0))) "Toolsettize your package" tar ((:url . "https://github.com/AdrieanKhisbe/cask-package-toolset.el") (:commit . "2c74cd827e88c7f8360581a841e45f0b794510e7") (:revdesc . "2c74cd827e88") (:keywords "convenience" "tools") (:authors ("Adrien Becchis" . "adriean.khisbe@live.fr")) (:maintainers ("Adrien Becchis" . "adriean.khisbe@live.fr")) (:maintainer "Adrien Becchis" . "adriean.khisbe@live.fr"))])
  (caskxy . [(20140513 1539) ((log4e (0 2 0)) (yaxception (0 1))) "Control Cask in Emacs" tar ((:url . "https://github.com/aki2o/caskxy") (:commit . "279f3ab79bd77fe69cb3148a79896b9bf118a9b3") (:revdesc . "279f3ab79bd7") (:keywords "convenience") (:authors ("Hiroaki Otsu" . "ootsuhiroaki@gmail.com")) (:maintainers ("Hiroaki Otsu" . "ootsuhiroaki@gmail.com")) (:maintainer "Hiroaki Otsu" . "ootsuhiroaki@gmail.com"))])
- (casual-agenda . [(20240903 2335) ((emacs (29 1)) (casual-lib (1 1 0)) (org (9 7 1))) "Transient UI for Agenda" tar ((:url . "https://github.com/kickingvegas/casual-agenda") (:commit . "49f577d33cd342b07b51b6ae3e64f66be97cc892") (:revdesc . "49f577d33cd3") (:keywords "tools") (:authors ("Charles Choi" . "kickingvegas@gmail.com")) (:maintainers ("Charles Choi" . "kickingvegas@gmail.com")) (:maintainer "Charles Choi" . "kickingvegas@gmail.com"))])
- (casual-avy . [(20240828 223) ((emacs (29 1)) (avy (0 5 0)) (casual-lib (1 1 0))) "Transient UI for Avy" tar ((:url . "https://github.com/kickingvegas/casual-avy") (:commit . "618a39cda76f8061b93e38bc0dda0cab92f61151") (:revdesc . "618a39cda76f") (:keywords "tools") (:authors ("Charles Choi" . "kickingvegas@gmail.com")) (:maintainers ("Charles Choi" . "kickingvegas@gmail.com")) (:maintainer "Charles Choi" . "kickingvegas@gmail.com"))])
- (casual-bookmarks . [(20240828 319) ((emacs (29 1)) (casual-lib (1 1 0))) "Transient UI for Bookmarks" tar ((:url . "https://github.com/kickingvegas/casual-bookmarks") (:commit . "6ff2146a6e4afa00d2479a8bcc75fa57c24a391b") (:revdesc . "6ff2146a6e4a") (:keywords "tools") (:authors ("Charles Choi" . "kickingvegas@gmail.com")) (:maintainers ("Charles Choi" . "kickingvegas@gmail.com")) (:maintainer "Charles Choi" . "kickingvegas@gmail.com"))])
- (casual-calc . [(20240828 437) ((emacs (29 1)) (casual-lib (1 1 0))) "Transient UI for Calc" tar ((:url . "https://github.com/kickingvegas/casual-calc") (:commit . "3966fdd42686d234f69382ceb2e83a5b82ad60e7") (:revdesc . "3966fdd42686") (:keywords "tools") (:authors ("Charles Choi" . "kickingvegas@gmail.com")) (:maintainers ("Charles Choi" . "kickingvegas@gmail.com")) (:maintainer "Charles Choi" . "kickingvegas@gmail.com"))])
- (casual-dired . [(20240917 401) ((emacs (29 1)) (casual-lib (1 1 0))) "Transient UI for Dired" tar ((:url . "https://github.com/kickingvegas/casual-dired") (:commit . "75e8e00fa6fd8d0b4d50635f20f3f7cd471e1170") (:revdesc . "75e8e00fa6fd") (:keywords "tools") (:authors ("Charles Choi" . "kickingvegas@gmail.com")) (:maintainers ("Charles Choi" . "kickingvegas@gmail.com")) (:maintainer "Charles Choi" . "kickingvegas@gmail.com"))])
+ (casual-agenda . [(20241001 714) ((emacs (29 1)) (casual-lib (1 1 0)) (org (9 7 1))) "Transient UI for Agenda" tar ((:url . "https://github.com/kickingvegas/casual-agenda") (:commit . "ca0433e257297d0adcd96238f64a1116d25b4372") (:revdesc . "ca0433e25729") (:keywords "tools") (:authors ("Charles Choi" . "kickingvegas@gmail.com")) (:maintainers ("Charles Choi" . "kickingvegas@gmail.com")) (:maintainer "Charles Choi" . "kickingvegas@gmail.com"))])
+ (casual-avy . [(20241001 649) ((emacs (29 1)) (avy (0 5 0)) (casual-lib (1 1 0))) "Transient UI for Avy" tar ((:url . "https://github.com/kickingvegas/casual-avy") (:commit . "9aa3e63326d65590c22d42c3ed9f37626c2a2c31") (:revdesc . "9aa3e63326d6") (:keywords "tools") (:authors ("Charles Choi" . "kickingvegas@gmail.com")) (:maintainers ("Charles Choi" . "kickingvegas@gmail.com")) (:maintainer "Charles Choi" . "kickingvegas@gmail.com"))])
+ (casual-bookmarks . [(20241001 635) ((emacs (29 1)) (casual-lib (1 1 0))) "Transient UI for Bookmarks" tar ((:url . "https://github.com/kickingvegas/casual-bookmarks") (:commit . "99aea407da07aef1a87d67b12648280347bdeed8") (:revdesc . "99aea407da07") (:keywords "tools") (:authors ("Charles Choi" . "kickingvegas@gmail.com")) (:maintainers ("Charles Choi" . "kickingvegas@gmail.com")) (:maintainer "Charles Choi" . "kickingvegas@gmail.com"))])
+ (casual-calc . [(20241001 611) ((emacs (29 1)) (casual-lib (1 1 0))) "Transient UI for Calc" tar ((:url . "https://github.com/kickingvegas/casual-calc") (:commit . "fa4a1bf695025908245651ee641262bce6de0369") (:revdesc . "fa4a1bf69502") (:keywords "tools") (:authors ("Charles Choi" . "kickingvegas@gmail.com")) (:maintainers ("Charles Choi" . "kickingvegas@gmail.com")) (:maintainer "Charles Choi" . "kickingvegas@gmail.com"))])
+ (casual-dired . [(20241001 709) ((emacs (29 1)) (casual-lib (1 1 0))) "Transient UI for Dired" tar ((:url . "https://github.com/kickingvegas/casual-dired") (:commit . "9b42c976dcaeb3ea3baacfd67c850b82ef9d164c") (:revdesc . "9b42c976dcae") (:keywords "tools") (:authors ("Charles Choi" . "kickingvegas@gmail.com")) (:maintainers ("Charles Choi" . "kickingvegas@gmail.com")) (:maintainer "Charles Choi" . "kickingvegas@gmail.com"))])
  (casual-editkit . [(20240930 2305) ((emacs (29 1)) (casual-lib (1 1 0)) (casual-symbol-overlay (1 0 1)) (magit (4 0 0)) (transpose-frame (0 2 1))) "Transient user interface library for editing commands" tar ((:url . "https://github.com/kickingvegas/casual-editkit") (:commit . "b84ba70335862975efa55d2a69fa560727b010e9") (:revdesc . "b84ba7033586") (:keywords "tools" "wp") (:authors ("Charles Choi" . "kickingvegas@gmail.com")) (:maintainers ("Charles Choi" . "kickingvegas@gmail.com")) (:maintainer "Charles Choi" . "kickingvegas@gmail.com"))])
- (casual-ibuffer . [(20240828 507) ((emacs (29 1)) (casual-lib (1 1 0))) "Transient UI for IBuffer" tar ((:url . "https://github.com/kickingvegas/casual-ibuffer") (:commit . "db35b7033ab0a1cc65992c1587d109cb1722283b") (:revdesc . "db35b7033ab0") (:keywords "tools") (:authors ("Charles Choi" . "kickingvegas@gmail.com")) (:maintainers ("Charles Choi" . "kickingvegas@gmail.com")) (:maintainer "Charles Choi" . "kickingvegas@gmail.com"))])
- (casual-info . [(20240828 1725) ((emacs (29 1)) (casual-lib (1 1 0))) "Transient UI for Info" tar ((:url . "https://github.com/kickingvegas/casual-info") (:commit . "b7455700d86adb5baf411bafd7116ffe29d29f3c") (:revdesc . "b7455700d86a") (:keywords "tools") (:authors ("Charles Choi" . "kickingvegas@gmail.com")) (:maintainers ("Charles Choi" . "kickingvegas@gmail.com")) (:maintainer "Charles Choi" . "kickingvegas@gmail.com"))])
- (casual-isearch . [(20240904 1704) ((emacs (29 1)) (casual-lib (1 1 0))) "Transient UI for I-Search" tar ((:url . "https://github.com/kickingvegas/casual-isearch") (:commit . "bac5501144bfb37d07a6a7e3e744af6b5474b0a2") (:revdesc . "bac5501144bf") (:keywords "wp") (:authors ("Charles Choi" . "kickingvegas@gmail.com")) (:maintainers ("Charles Choi" . "kickingvegas@gmail.com")) (:maintainer "Charles Choi" . "kickingvegas@gmail.com"))])
- (casual-lib . [(20240827 2223) ((emacs (29 1)) (transient (0 6 0))) "Library routines for Casual user interfaces" tar ((:url . "https://github.com/kickingvegas/casual-lib") (:commit . "66bf8342eee76710df8075158d1e69c633bbd970") (:revdesc . "66bf8342eee7") (:keywords "tools") (:authors ("Charles Choi" . "kickingvegas@gmail.com")) (:maintainers ("Charles Choi" . "kickingvegas@gmail.com")) (:maintainer "Charles Choi" . "kickingvegas@gmail.com"))])
- (casual-re-builder . [(20240828 1905) ((emacs (29 1)) (casual-lib (1 1 0))) "Transient UI for RE-Builder" tar ((:url . "https://github.com/kickingvegas/casual-re-builder") (:commit . "0f67ecf7e39483a3e325f42cb83e8d6af3d36131") (:revdesc . "0f67ecf7e394") (:keywords "tools") (:authors ("Charles Choi" . "kickingvegas@gmail.com")) (:maintainers ("Charles Choi" . "kickingvegas@gmail.com")) (:maintainer "Charles Choi" . "kickingvegas@gmail.com"))])
- (casual-suite . [(20240930 1844) ((emacs (29 1)) (casual-calc (1 9 0)) (casual-isearch (1 7 0)) (casual-dired (1 4 0)) (casual-ibuffer (1 0 1)) (casual-avy (1 2 0)) (casual-info (1 2 0)) (casual-re-builder (1 0 2)) (casual-bookmarks (1 0 0)) (casual-agenda (1 0 1)) (casual-symbol-overlay (1 0 1)) (casual-editkit (1 0 5))) "A suite of opinionated Transient UIs" tar ((:url . "https://github.com/kickingvegas/casual-suite") (:commit . "d10dfea67dfe7c7c2de7f6711066be7e5b9e25d0") (:revdesc . "d10dfea67dfe") (:keywords "tools") (:authors ("Charles Choi" . "kickingvegas@gmail.com")) (:maintainers ("Charles Choi" . "kickingvegas@gmail.com")) (:maintainer "Charles Choi" . "kickingvegas@gmail.com"))])
- (casual-symbol-overlay . [(20240905 129) ((emacs (29 1)) (casual-lib (1 1 0)) (symbol-overlay (4 2))) "Transient UI for Symbol Overlay" tar ((:url . "https://github.com/kickingvegas/casual-symbol-overlay") (:commit . "293a0bbfca22d6d811816fd77113d942e6b3bbd9") (:revdesc . "293a0bbfca22") (:keywords "tools") (:authors ("Charles Choi" . "kickingvegas@gmail.com")) (:maintainers ("Charles Choi" . "kickingvegas@gmail.com")) (:maintainer "Charles Choi" . "kickingvegas@gmail.com"))])
+ (casual-ibuffer . [(20241001 622) ((emacs (29 1)) (casual-lib (1 1 0))) "Transient UI for IBuffer" tar ((:url . "https://github.com/kickingvegas/casual-ibuffer") (:commit . "6d58d18d42e5433d5eac271a7b987ee9756c9c89") (:revdesc . "6d58d18d42e5") (:keywords "tools") (:authors ("Charles Choi" . "kickingvegas@gmail.com")) (:maintainers ("Charles Choi" . "kickingvegas@gmail.com")) (:maintainer "Charles Choi" . "kickingvegas@gmail.com"))])
+ (casual-info . [(20241001 706) ((emacs (29 1)) (casual-lib (1 1 0))) "Transient UI for Info" tar ((:url . "https://github.com/kickingvegas/casual-info") (:commit . "79d9bae486e92c0eabf82cc566d5578cf05015b3") (:revdesc . "79d9bae486e9") (:keywords "tools") (:authors ("Charles Choi" . "kickingvegas@gmail.com")) (:maintainers ("Charles Choi" . "kickingvegas@gmail.com")) (:maintainer "Charles Choi" . "kickingvegas@gmail.com"))])
+ (casual-isearch . [(20241001 700) ((emacs (29 1)) (casual-lib (1 1 0))) "Transient UI for I-Search" tar ((:url . "https://github.com/kickingvegas/casual-isearch") (:commit . "1568edca4aeb280a10e943f38cff8d744d5822f4") (:revdesc . "1568edca4aeb") (:keywords "wp") (:authors ("Charles Choi" . "kickingvegas@gmail.com")) (:maintainers ("Charles Choi" . "kickingvegas@gmail.com")) (:maintainer "Charles Choi" . "kickingvegas@gmail.com"))])
+ (casual-lib . [(20241001 704) ((emacs (29 1)) (transient (0 6 0))) "Library routines for Casual user interfaces" tar ((:url . "https://github.com/kickingvegas/casual-lib") (:commit . "212313b1cd80e2757224d34ab34a098ff1cb37ee") (:revdesc . "212313b1cd80") (:keywords "tools") (:authors ("Charles Choi" . "kickingvegas@gmail.com")) (:maintainers ("Charles Choi" . "kickingvegas@gmail.com")) (:maintainer "Charles Choi" . "kickingvegas@gmail.com"))])
+ (casual-re-builder . [(20241001 655) ((emacs (29 1)) (casual-lib (1 1 0))) "Transient UI for RE-Builder" tar ((:url . "https://github.com/kickingvegas/casual-re-builder") (:commit . "5b4af74b7e7a82cc15122035e4e6286d843f1ef0") (:revdesc . "5b4af74b7e7a") (:keywords "tools") (:authors ("Charles Choi" . "kickingvegas@gmail.com")) (:maintainers ("Charles Choi" . "kickingvegas@gmail.com")) (:maintainer "Charles Choi" . "kickingvegas@gmail.com"))])
+ (casual-suite . [(20241001 607) ((emacs (29 1)) (casual-calc (1 9 0)) (casual-isearch (1 7 0)) (casual-dired (1 4 0)) (casual-ibuffer (1 0 1)) (casual-avy (1 2 0)) (casual-info (1 2 0)) (casual-re-builder (1 0 2)) (casual-bookmarks (1 0 0)) (casual-agenda (1 0 1)) (casual-symbol-overlay (1 0 1)) (casual-editkit (1 0 5))) "A suite of opinionated Transient UIs" tar ((:url . "https://github.com/kickingvegas/casual-suite") (:commit . "fbab88e8390085079df60b2295979d73205bc64f") (:revdesc . "fbab88e83900") (:keywords "tools") (:authors ("Charles Choi" . "kickingvegas@gmail.com")) (:maintainers ("Charles Choi" . "kickingvegas@gmail.com")) (:maintainer "Charles Choi" . "kickingvegas@gmail.com"))])
+ (casual-symbol-overlay . [(20241001 711) ((emacs (29 1)) (casual-lib (1 1 0)) (symbol-overlay (4 2))) "Transient UI for Symbol Overlay" tar ((:url . "https://github.com/kickingvegas/casual-symbol-overlay") (:commit . "1a4bcb1d64755122d5dadaad56e6b36aeb6b991b") (:revdesc . "1a4bcb1d6475") (:keywords "tools") (:authors ("Charles Choi" . "kickingvegas@gmail.com")) (:maintainers ("Charles Choi" . "kickingvegas@gmail.com")) (:maintainer "Charles Choi" . "kickingvegas@gmail.com"))])
  (catmacs . [(20170826 1157) ((emacs (24))) "Simple CAT interface for Yaesu Transceivers" tar ((:url . "https://bitbucket.org/pymaximus/catmacs") (:commit . "6ea9ee195661fe95355413856476c45dcc8e24e8") (:revdesc . "6ea9ee195661") (:keywords "comm" "hardware") (:authors ("Frank Singleton" . "b17flyboy@gmail.com")) (:maintainers ("Frank Singleton" . "b17flyboy@gmail.com")) (:maintainer "Frank Singleton" . "b17flyboy@gmail.com"))])
  (catppuccin-theme . [(20240829 2151) ((emacs (25 1))) "Catppuccin for Emacs - 🍄 Soothing pastel theme for Emacs" tar ((:url . "https://github.com/catppuccin/emacs") (:commit . "b7bc1170917499deb76f4d2d1116252ed30c629d") (:revdesc . "b7bc11709174") (:maintainers ("Jeremy Baxter" . "jeremy@baxters.nz")) (:maintainer "Jeremy Baxter" . "jeremy@baxters.nz"))])
  (cats . [(20230407 1316) ((emacs (26 1))) "Monads for Elisp" tar ((:url . "https://github.com/Fuco1/emacs-cats") (:commit . "7fc70db0eeb2c33ffba5c13c4cdc0f31c7b95537") (:revdesc . "7fc70db0eeb2") (:authors ("Matúš Goljer" . "matus.goljer@gmail.com")) (:maintainers ("Matúš Goljer" . "matus.goljer@gmail.com")) (:maintainer "Matúš Goljer" . "matus.goljer@gmail.com"))])
@@ -651,7 +651,7 @@
  (cobra-mode . [(20140116 2116) nil "Major mode for .NET-based Cobra language" tar ((:url . "https://github.com/Nekroze/cobra-mode") (:commit . "acd6e53f6286af5176471d01f25257e5ddb6dd01") (:revdesc . "acd6e53f6286") (:keywords "languages"))])
  (codcut . [(20190915 1009) nil "Share pieces of code to Codcut" tar ((:url . "https://github.com/codcut/codcut-emacs") (:commit . "bf07c3db3900e36b0b87423f3b715d6378f86393") (:revdesc . "bf07c3db3900") (:keywords "comm" "tools" "codcut" "share") (:authors ("Diego Pasquali" . "hello@dgopsq.space")) (:maintainers ("Diego Pasquali" . "hello@dgopsq.space")) (:maintainer "Diego Pasquali" . "hello@dgopsq.space"))])
  (code-archive . [(20190612 308) ((emacs (24 3))) "Git supported code archive and reference for org-mode" tar ((:url . "https://github.com/mschuldt/code-archive") (:commit . "1ad9af6679d0294c3056eab9cad673f29c562721") (:revdesc . "1ad9af6679d0") (:authors ("Michael Schuldt" . "mbschuldt@gmail.com")) (:maintainers ("Michael Schuldt" . "mbschuldt@gmail.com")) (:maintainer "Michael Schuldt" . "mbschuldt@gmail.com"))])
- (code-cells . [(20240929 1123) ((emacs (27 1))) "Lightweight notebooks with support for ipynb files" tar ((:url . "https://github.com/astoff/code-cells.el") (:commit . "c2ce7ca2e29bc9354bf8b97c2dce46b28b9af692") (:revdesc . "c2ce7ca2e29b") (:keywords "convenience" "outlines") (:authors ("Augusto Stoffel" . "arstoffel@gmail.com")) (:maintainers ("Augusto Stoffel" . "arstoffel@gmail.com")) (:maintainer "Augusto Stoffel" . "arstoffel@gmail.com"))])
+ (code-cells . [(20241003 1036) ((emacs (27 1)) (compat (29 1))) "Lightweight notebooks with support for ipynb files" tar ((:url . "https://github.com/astoff/code-cells.el") (:commit . "6511793ce9092c3f68f7cd5340267472a4b1b7dc") (:revdesc . "6511793ce909") (:keywords "convenience" "outlines") (:authors ("Augusto Stoffel" . "arstoffel@gmail.com")) (:maintainers ("Augusto Stoffel" . "arstoffel@gmail.com")) (:maintainer "Augusto Stoffel" . "arstoffel@gmail.com"))])
  (code-compass . [(20231108 1618) ((emacs (26 1)) (s (1 12 0)) (dash (2 13)) (async (1 9 7)) (simple-httpd (1 5 1))) "Navigate software aided by metrics and visualization" tar ((:url . "https://github.com/ag91/code-compass") (:commit . "67ec53f9ca43bea941ec5ba6fccba8565c1d937f") (:revdesc . "67ec53f9ca43") (:keywords "tools" "extensions" "help") (:authors ("Andrea" . "andrea-dev@hotmail.com")) (:maintainers ("Andrea" . "andrea-dev@hotmail.com")) (:maintainer "Andrea" . "andrea-dev@hotmail.com"))])
  (code-library . [(20160426 1218) ((gist (1 3 1))) "Use org-mode to collect code snippets" tar ((:url . "https://github.com/lujun9972/code-library") (:commit . "3c79338eae5c892bfb4e4882298422d9fd65d2d7") (:revdesc . "3c79338eae5c") (:keywords "lisp" "code") (:authors ("DarkSun" . "lujun9972@gmail.com")) (:maintainers ("DarkSun" . "lujun9972@gmail.com")) (:maintainer "DarkSun" . "lujun9972@gmail.com"))])
  (code-review . [(20221206 113) ((emacs (25 1)) (closql (1 2 0)) (magit (3 0 0)) (transient (0 3 7)) (a (1 0 0)) (ghub (3 5 1)) (uuidgen (1 2)) (deferred (0 5 1)) (markdown-mode (2 4)) (forge (0 3 0)) (emojify (1 2))) "Perform code review from Github, Gitlab, and Bitbucket Cloud" tar ((:url . "https://github.com/wandersoncferreira/code-review") (:commit . "a8bb63b53f2a1fd31302c110e668ad7b5c871b34") (:revdesc . "a8bb63b53f2a") (:keywords "git" "tools" "vc") (:authors ("Wanderson Ferreira" . "https://github.com/wandersoncferreira")) (:maintainers ("Wanderson Ferreira" . "wand@hey.com")) (:maintainer "Wanderson Ferreira" . "wand@hey.com"))])
@@ -785,7 +785,7 @@
  (connection . [(20191111 446) nil "TCP-based client connection" tar ((:url . "https://github.com/myrkr/dictionary-el") (:commit . "c9cad101100975e88873636bfd426b7a19304ebd") (:revdesc . "c9cad1011009") (:keywords "network") (:authors ("Torsten Hilbrich" . "torsten.hilbrich@gmx.net")) (:maintainers ("Torsten Hilbrich" . "torsten.hilbrich@gmx.net")) (:maintainer "Torsten Hilbrich" . "torsten.hilbrich@gmx.net"))])
  (conner . [(20240828 123) ((emacs (29 1))) "Define and run project specific commands" tar ((:url . "https://github.com/tralph3/conner") (:commit . "93caf208e8e7f6b0627e5eb162f1488311d16b4c") (:revdesc . "93caf208e8e7") (:keywords "tools"))])
  (constant-theme . [(20180921 1012) ((emacs (24 1))) "A calm, dark, almost monochrome color theme" tar ((:url . "https://github.com/Jannis/emacs-constant-theme") (:commit . "0feb9f99d708633d62fa548c953ebbe68fd70de0") (:revdesc . "0feb9f99d708") (:keywords "themes") (:authors ("Jannis Pohlmann" . "contact@jannispohlmann.de")) (:maintainers ("Jannis Pohlmann" . "contact@jannispohlmann.de")) (:maintainer "Jannis Pohlmann" . "contact@jannispohlmann.de"))])
- (consult . [(20240930 1012) ((emacs (28 1)) (compat (30))) "Consulting completing-read" tar ((:url . "https://github.com/minad/consult") (:commit . "5a02663b46f3ecc3d2f853c2c73923e35a288925") (:revdesc . "5a02663b46f3") (:keywords "matching" "files" "completion") (:maintainers ("Daniel Mendler" . "mail@daniel-mendler.de")) (:maintainer "Daniel Mendler" . "mail@daniel-mendler.de"))])
+ (consult . [(20241001 2057) ((emacs (28 1)) (compat (30))) "Consulting completing-read" tar ((:url . "https://github.com/minad/consult") (:commit . "07ea5421fbcb65b2207a43a0941124a95a47abc7") (:revdesc . "07ea5421fbcb") (:keywords "matching" "files" "completion") (:maintainers ("Daniel Mendler" . "mail@daniel-mendler.de")) (:maintainer "Daniel Mendler" . "mail@daniel-mendler.de"))])
  (consult-ag . [(20230227 406) ((emacs (27 1)) (consult (0 32))) "The silver searcher integration using Consult" tar ((:url . "https://github.com/yadex205/consult-ag") (:commit . "9eb4df265aedf2628a714610c2ade6d2f21de053") (:revdesc . "9eb4df265aed") (:authors ("Kanon Kakuno and contributors" . "yadex205@outlook.jp")) (:maintainers ("Kanon Kakuno and contributors" . "yadex205@outlook.jp")) (:maintainer "Kanon Kakuno and contributors" . "yadex205@outlook.jp"))])
  (consult-codesearch . [(20230315 1424) ((emacs (27 1)) (consult (0 20))) "Consult interface for codesearch" tar ((:url . "https://github.com/youngker/consult-codesearch.el") (:commit . "51df545bb57b468058245950322ae15f6c3a0ce2") (:revdesc . "51df545bb57b") (:keywords "tools") (:authors ("Youngjoo Lee" . "youngker@gmail.com")) (:maintainers ("Youngjoo Lee" . "youngker@gmail.com")) (:maintainer "Youngjoo Lee" . "youngker@gmail.com"))])
  (consult-company . [(20230606 1824) ((emacs (27 1)) (company (0 9)) (consult (0 9))) "Consult frontend for company" tar ((:url . "https://github.com/mohkale/consult-company") (:commit . "6e309fa9115c9ecd29aa27bff4e3b733979e5dbc") (:revdesc . "6e309fa9115c") (:authors ("mohsin kaleem" . "mohkale@kisara.moe")) (:maintainers ("mohsin kaleem" . "mohkale@kisara.moe")) (:maintainer "mohsin kaleem" . "mohkale@kisara.moe"))])
@@ -1150,7 +1150,7 @@
  (dokuwiki-mode . [(20170223 1301) nil "Major mode for DokuWiki document" tar ((:url . "https://github.com/kai2nenobu/emacs-dokuwiki-mode") (:commit . "e4e116f6fcc373e3f5937c1a7daa5c2c9c6d3fa1") (:revdesc . "e4e116f6fcc3") (:keywords "hypermedia" "text" "dokuwiki") (:authors ("Tsunenobu Kai" . "kai2nenobu@gmail.com")) (:maintainers ("Tsunenobu Kai" . "kai2nenobu@gmail.com")) (:maintainer "Tsunenobu Kai" . "kai2nenobu@gmail.com"))])
  (dollaro . [(20151123 1302) ((s (1 6 0))) "Simple text templates" tar ((:url . "https://github.com/laynor/dollaro") (:commit . "500127f0172ac7a1eec627e026b59136580a74ac") (:revdesc . "500127f0172a") (:keywords "tools" "convenience") (:authors ("Alessandro Piras" . "laynor@gmail.com")) (:maintainers ("Alessandro Piras" . "laynor@gmail.com")) (:maintainer "Alessandro Piras" . "laynor@gmail.com"))])
  (doom . [(20180301 2308) ((cl-lib (0 5))) "DOM implementation and manipulation library" tar ((:url . "https://github.com/kensanata/doom") (:commit . "e59040aefc92dd9b3134eb623624307fb9e4327b") (:revdesc . "e59040aefc92") (:keywords "xml" "dom") (:authors ("Alex Schroeder" . "alex@gnu.org") ("Henrik.Motakef" . "elisp@henrik-motakef.de") ("Katherine Whitlock" . "toroidal-code@gmail.com") ("Syohei YOSHIDA" . "syohex@gmail.com")))])
- (doom-modeline . [(20240923 140) ((emacs (25 1)) (compat (29 1 4 5)) (nerd-icons (0 1 0)) (shrink-path (0 3 1))) "A minimal and modern mode-line" tar ((:url . "https://github.com/seagle0128/doom-modeline") (:commit . "84a53e0f8c9d77a4634e7d07ea9aac9ac1fc1aee") (:revdesc . "84a53e0f8c9d") (:keywords "faces" "mode-line") (:authors ("Vincent Zhang" . "seagle0128@gmail.com")) (:maintainers ("Vincent Zhang" . "seagle0128@gmail.com")) (:maintainer "Vincent Zhang" . "seagle0128@gmail.com"))])
+ (doom-modeline . [(20241002 1003) ((emacs (25 1)) (compat (29 1 4 5)) (nerd-icons (0 1 0)) (shrink-path (0 3 1))) "A minimal and modern mode-line" tar ((:url . "https://github.com/seagle0128/doom-modeline") (:commit . "ec6bc00ac035e75ad10b52e516ea5d95cc9e0bd9") (:revdesc . "ec6bc00ac035") (:keywords "faces" "mode-line") (:authors ("Vincent Zhang" . "seagle0128@gmail.com")) (:maintainers ("Vincent Zhang" . "seagle0128@gmail.com")) (:maintainer "Vincent Zhang" . "seagle0128@gmail.com"))])
  (doom-modeline-now-playing . [(20240522 1704) ((emacs (24 4)) (doom-modeline (3 0 0)) (async (1 9 3))) "Segment for Doom Modeline to show playerctl information" tar ((:url . "https://github.com/elken/doom-modeline-now-playing") (:commit . "1532f324f98a234aa14e12ebdfd17cebba978d6a") (:revdesc . "1532f324f98a") (:authors ("Ellis Kenyő" . "me@elken.dev")) (:maintainers ("Ellis Kenyő" . "me@elken.dev")) (:maintainer "Ellis Kenyő" . "me@elken.dev"))])
  (doom-themes . [(20240909 2117) ((emacs (25 1)) (cl-lib (0 5))) "An opinionated pack of modern color-themes" tar ((:url . "https://github.com/doomemacs/themes") (:commit . "1cac71a4b2434036496a49b4440fdba3d0b5b387") (:revdesc . "1cac71a4b243") (:keywords "themes" "faces") (:authors ("Henrik Lissner" . "contact@henrik.io")) (:maintainers ("Henrik Lissner" . "contact@henrik.io")) (:maintainer "Henrik Lissner" . "contact@henrik.io"))])
  (dot-env . [(20230820 2014) ((emacs (24 4)) (s (1 13 0))) "Dotenv functionality" tar ((:url . "https://github.com/amodelbello/dot-env.el") (:commit . "83ce690e8ef9175fc621c85d5fbef4f7ace7b7a8") (:revdesc . "83ce690e8ef9") (:keywords "convenience" "dotenv" "environment" "configuration"))])
@@ -1449,7 +1449,7 @@
  (epc . [(20140610 534) ((concurrent (0 3 1)) (ctable (0 1 2))) "A RPC stack for the Emacs Lisp" tar ((:url . "https://github.com/kiwanami/emacs-epc") (:commit . "94cd36a3bec752263ac9b1b3a9dd2def329d2af7") (:revdesc . "94cd36a3bec7") (:keywords "lisp" "rpc") (:authors ("SAKURAI Masashi" . "m.sakuraiatkiwanami.net")) (:maintainers ("SAKURAI Masashi" . "m.sakuraiatkiwanami.net")) (:maintainer "SAKURAI Masashi" . "m.sakuraiatkiwanami.net"))])
  (epic . [(20170210 23) ((htmlize (1 47))) "Evernote Picker for Cocoa Emacs" tar ((:url . "https://github.com/yoshinari-nomura/epic") (:commit . "a41826c330eb0ea061d58a08cc861b0c4ac8ec4e") (:revdesc . "a41826c330eb") (:keywords "evernote" "applescript") (:authors ("Yoshinari Nomura" . "nom@quickhack.net")) (:maintainers ("Yoshinari Nomura" . "nom@quickhack.net")) (:maintainer "Yoshinari Nomura" . "nom@quickhack.net"))])
  (eping . [(20201027 2149) ((emacs (25 1))) "Ping websites to check internet connectivity" tar ((:url . "https://github.com/sean-hut/eping") (:commit . "004496ee06c0b8ead4a4f49e17109e8eb32eb49d") (:revdesc . "004496ee06c0") (:keywords "comm" "processes" "terminals" "unix") (:authors ("Sean Hutchings" . "seanhut@yandex.com")) (:maintainers ("Sean Hutchings" . "seanhut@yandex.com")) (:maintainer "Sean Hutchings" . "seanhut@yandex.com"))])
- (epkg . [(20240916 2231) ((emacs (26 1)) (compat (30 0 0 0)) (closql (2 0 0)) (emacsql (4 0 2)) (llama (0 3 1))) "Browse the Emacsmirror package database" tar ((:url . "https://github.com/emacscollective/epkg") (:commit . "67657c6b6457bf59388a6b3d179d379b34d476ae") (:revdesc . "67657c6b6457") (:keywords "tools") (:authors ("Jonas Bernoulli" . "emacs.epkg@jonas.bernoulli.dev")) (:maintainers ("Jonas Bernoulli" . "emacs.epkg@jonas.bernoulli.dev")) (:maintainer "Jonas Bernoulli" . "emacs.epkg@jonas.bernoulli.dev"))])
+ (epkg . [(20241001 1037) ((emacs (26 1)) (compat (30 0 0 0)) (closql (2 0 0)) (emacsql (4 0 2)) (llama (0 3 1))) "Browse the Emacsmirror package database" tar ((:url . "https://github.com/emacscollective/epkg") (:commit . "f568083014664cc63eb942ee04a925634527793e") (:revdesc . "f56808301466") (:keywords "tools") (:authors ("Jonas Bernoulli" . "emacs.epkg@jonas.bernoulli.dev")) (:maintainers ("Jonas Bernoulli" . "emacs.epkg@jonas.bernoulli.dev")) (:maintainer "Jonas Bernoulli" . "emacs.epkg@jonas.bernoulli.dev"))])
  (epkg-marginalia . [(20240821 2319) ((emacs (27 1)) (compat (30 0 0 0)) (epkg (4 0 0)) (marginalia (1 7))) "Show Epkg information in completion annotations" tar ((:url . "https://github.com/emacscollective/epkg-marginalia") (:commit . "58d5f2b6b6f68a22510cf4301dadf2ec4b5ffcaa") (:revdesc . "58d5f2b6b6f6") (:keywords "tools") (:authors ("Jonas Bernoulli" . "emacs.epkg-marginalia@jonas.bernoulli.dev")) (:maintainers ("Jonas Bernoulli" . "emacs.epkg-marginalia@jonas.bernoulli.dev")) (:maintainer "Jonas Bernoulli" . "emacs.epkg-marginalia@jonas.bernoulli.dev"))])
  (epl . [(20180205 2049) ((cl-lib (0 3))) "Emacs Package Library" tar ((:url . "https://github.com/cask/epl") (:commit . "78ab7a85c08222cd15582a298a364774e3282ce6") (:revdesc . "78ab7a85c082") (:keywords "convenience") (:authors ("Sebastian Wiesner" . "swiesner@lunaryorn.com")) (:maintainers ("Johan Andersson" . "johan.rejeep@gmail.com") ("Sebastian Wiesner" . "swiesner@lunaryorn.com")) (:maintainer "Johan Andersson" . "johan.rejeep@gmail.com"))])
  (epm . [(20190509 443) ((emacs (24 3)) (epl (0 8))) "Emacs Package Manager" tar ((:url . "https://github.com/xuchunyang/epm") (:commit . "6375ddbf93c5f25647f6ebb25b54045b3c93a5be") (:revdesc . "6375ddbf93c5") (:authors ("Chunyang Xu" . "xuchunyang.me@gmail.com")) (:maintainers ("Chunyang Xu" . "xuchunyang.me@gmail.com")) (:maintainer "Chunyang Xu" . "xuchunyang.me@gmail.com"))])
@@ -1495,7 +1495,7 @@
  (es-mode . [(20221026 1103) ((dash (2 11 0)) (cl-lib (0 5)) (spark (1 0)) (s (1 11 0)) (request (0 3 0))) "A major mode for editing and executing Elasticsearch queries" tar ((:url . "https://github.com/dakrone/es-mode") (:commit . "e82465fd785688bb58918ea62ca4de06a2a23a1e") (:revdesc . "e82465fd7856") (:keywords "elasticsearch") (:authors ("Lee Hinman" . "lee@writequit.org")) (:maintainers ("Lee Hinman" . "lee@writequit.org")) (:maintainer "Lee Hinman" . "lee@writequit.org"))])
  (es-windows . [(20140211 904) ((cl-lib (0 3)) (emacs (24))) "Window-management utilities" tar ((:url . "https://github.com/sabof/es-windows") (:commit . "7ebe6c6e0831373847d7adbedeaa2e506b54b2af") (:revdesc . "7ebe6c6e0831"))])
  (esa . [(20180403 1525) ((cl-lib (0 5))) "Interface to esa.io" tar ((:url . "https://github.com/nabinno/esa.el") (:commit . "417e0ac55abe9b17e0b7165d0df26bc018aff42e") (:revdesc . "417e0ac55abe") (:keywords "tools" "esa") (:authors ("Nab Inno" . "nab@blahfe.com")) (:maintainers ("Nab Inno" . "nab@blahfe.com")) (:maintainer "Nab Inno" . "nab@blahfe.com"))])
- (esh-autosuggest . [(20210906 1446) ((emacs (24 4)) (company (0 9 4))) "History autosuggestions for eshell" tar ((:url . "https://github.com/dieggsy/esh-autosuggest") (:commit . "bf676b137d35553debe32ff134dbec25f3978ae7") (:revdesc . "bf676b137d35") (:keywords "completion" "company" "matching" "convenience" "abbrev") (:authors ("Diego A. Mundo" . "dieggsy@pm.me")) (:maintainers ("Diego A. Mundo" . "dieggsy@pm.me")) (:maintainer "Diego A. Mundo" . "dieggsy@pm.me"))])
+ (esh-autosuggest . [(20241002 1820) ((emacs (24 4)) (company (0 9 4))) "History autosuggestions for eshell" tar ((:url . "https://github.com/dieggsy/esh-autosuggest") (:commit . "b3ae8eb2d6f8da1dc59f61a589003d741514d6f6") (:revdesc . "b3ae8eb2d6f8") (:keywords "completion" "company" "matching" "convenience" "abbrev") (:authors ("Diego A. Mundo" . "dieggsy@pm.me")) (:maintainers ("Diego A. Mundo" . "dieggsy@pm.me")) (:maintainer "Diego A. Mundo" . "dieggsy@pm.me"))])
  (esh-buf-stack . [(20140107 1018) nil "Add a buffer stack feature to Eshell" tar ((:url . "https://github.com/tom-tan/esh-buf-stack") (:commit . "ea5da9ce8566ffe2e013f0e588701cb0825258b6") (:revdesc . "ea5da9ce8566") (:keywords "eshell" "extensions") (:authors ("Tomoya Tanjo" . "ttanjo@gmail.com")) (:maintainers ("Tomoya Tanjo" . "ttanjo@gmail.com")) (:maintainer "Tomoya Tanjo" . "ttanjo@gmail.com"))])
  (esh-help . [(20190905 22) ((dash (1 4 0))) "Add some help functions and support for Eshell" tar ((:url . "https://github.com/tom-tan/esh-help") (:commit . "417673ed18a983930a66a6692dbfb288a995cb80") (:revdesc . "417673ed18a9") (:keywords "eshell" "extensions") (:authors ("Tomoya Tanjo" . "ttanjo@gmail.com")) (:maintainers ("Tomoya Tanjo" . "ttanjo@gmail.com")) (:maintainer "Tomoya Tanjo" . "ttanjo@gmail.com"))])
  (eshell-atuin . [(20240519 2200) ((emacs (27 1)) (compat (29 1 4 1))) "Integrate eshell with atuin, a shell history tool" tar ((:url . "https://github.com/SqrtMinusOne/eshell-atuin") (:commit . "b8bff27bbd7d4e7c28770d6f88d8ebcb1b965a9e") (:revdesc . "b8bff27bbd7d") (:authors ("Korytov Pavel" . "thexcloud@gmail.com")) (:maintainers ("Korytov Pavel" . "thexcloud@gmail.com")) (:maintainer "Korytov Pavel" . "thexcloud@gmail.com"))])
@@ -1671,7 +1671,7 @@
  (eyuml . [(20141028 2227) ((request (0 2 0)) (s (1 8 0))) "Write textual uml diagram from emacs using yuml.me" tar ((:url . "https://github.com/antham/eyuml") (:commit . "2f259c201c6cc63ee608f75cd85c1ae27f9d2532") (:revdesc . "2f259c201c6c") (:keywords "uml") (:authors ("Anthony HAMON" . "hamon.anth@gmail.com")) (:maintainers ("Anthony HAMON" . "hamon.anth@gmail.com")) (:maintainer "Anthony HAMON" . "hamon.anth@gmail.com"))])
  (ez-query-replace . [(20210724 2247) ((dash (1 2 0)) (s (1 11 0))) "A smarter context-sensitive query-replace that can be reapplied" tar ((:url . "https://github.com/Wilfred/ez-query-replace") (:commit . "2b68472f4007a73908c3b242e83ac5a7587967ff") (:revdesc . "2b68472f4007") (:authors ("Wilfred Hughes" . "me@wilfred.me.uk")) (:maintainers ("Wilfred Hughes" . "me@wilfred.me.uk")) (:maintainer "Wilfred Hughes" . "me@wilfred.me.uk"))])
  (eziam-themes . [(20230820 917) nil "The mostly monochrome Eziam theme family" tar ((:url . "https://github.com/thblt/eziam-theme-emacs") (:commit . "8223acc0218130ad2493c1476ad3736ee4fdbb8f") (:revdesc . "8223acc02181") (:keywords "faces") (:authors ("Thibault Polge" . "thibault@thb.lt")) (:maintainers ("Thibault Polge" . "thibault@thb.lt")) (:maintainer "Thibault Polge" . "thibault@thb.lt"))])
- (f . [(20240308 906) ((emacs (24 1)) (s (1 7 0)) (dash (2 2 0))) "Modern API for working with files and directories" tar ((:url . "https://github.com/rejeep/f.el") (:commit . "1e7020dc0d4c52d3da9bd610d431cab13aa02d8c") (:revdesc . "1e7020dc0d4c") (:keywords "files" "directories") (:authors ("Johan Andersson" . "johan.rejeep@gmail.com")) (:maintainers ("Lucien Cartier-Tilet" . "lucien@phundrak.com")) (:maintainer "Lucien Cartier-Tilet" . "lucien@phundrak.com"))])
+ (f . [(20241003 1131) ((emacs (24 1)) (s (1 7 0)) (dash (2 2 0))) "Modern API for working with files and directories" tar ((:url . "https://github.com/rejeep/f.el") (:commit . "931b6d0667fe03e7bf1c6c282d6d8d7006143c52") (:revdesc . "931b6d0667fe") (:keywords "files" "directories") (:authors ("Johan Andersson" . "johan.rejeep@gmail.com")) (:maintainers ("Lucien Cartier-Tilet" . "lucien@phundrak.com")) (:maintainer "Lucien Cartier-Tilet" . "lucien@phundrak.com"))])
  (f3 . [(20180130 1158) ((emacs (24 3)) (helm (2 8 8)) (cl-lib (0 5))) "A helm interface to find" tar ((:url . "https://github.com/cosmicexplorer/f3") (:commit . "000009ce4adf7a57eae80512f29c4ec2a1391ce5") (:revdesc . "000009ce4adf") (:keywords "find" "file" "files" "helm" "fast" "finder"))])
  (fabric . [(20171116 656) nil "Launch Fabric using Emacs" tar ((:url . "https://github.com/nlamirault/fabric.el") (:commit . "df79be341d0b34ed23850f9894136092fa5fea8c") (:revdesc . "df79be341d0b") (:keywords "python" "fabric") (:authors ("Nicolas Lamirault" . "nicolas.lamirault@chmouel.com")) (:maintainers ("Nicolas Lamirault" . "nicolas.lamirault@chmouel.com")) (:maintainer "Nicolas Lamirault" . "nicolas.lamirault@chmouel.com"))])
  (face-explorer . [(20190517 1857) nil "Library and tools for faces and text properties" tar ((:url . "https://github.com/Lindydancer/face-explorer") (:commit . "ad1300e13e5643e4c246cabfd91f833d39113052") (:revdesc . "ad1300e13e56") (:keywords "faces"))])
@@ -1981,10 +1981,10 @@
  (foreign-regexp . [(20200325 50) nil "Search and replace by foreign regexp" tar ((:url . "https://github.com/k-talo/foreign-regexp.el") (:commit . "e2dd47f2160cadc194eb156e7c76c3c869e6706e") (:revdesc . "e2dd47f2160c") (:keywords "convenience" "emulations" "matching" "tools" "unix" "wp") (:authors ("K-talo Miyazaki" . "KeitarodotMiyazakiatgmaildotcom")) (:maintainers ("K-talo Miyazaki" . "KeitarodotMiyazakiatgmaildotcom")) (:maintainer "K-talo Miyazaki" . "KeitarodotMiyazakiatgmaildotcom"))])
  (foreman-mode . [(20170725 1422) ((s (1 9 0)) (dash (2 10 0)) (dash-functional (1 2 0)) (f (0 17 2)) (emacs (24))) "View and manage Procfile-based applications" tar ((:url . "https://github.com/zweifisch/foreman-mode") (:commit . "22b3bb13134b617870ed1e888af739f4818be929") (:revdesc . "22b3bb13134b") (:keywords "foreman") (:authors ("ZHOU Feng" . "zf.pascal@gmail.com")) (:maintainers ("ZHOU Feng" . "zf.pascal@gmail.com")) (:maintainer "ZHOU Feng" . "zf.pascal@gmail.com"))])
  (forest-blue-theme . [(20160627 842) ((emacs (24))) "Emacs theme with a dark background" tar ((:url . "https://github.com/olkinn/forest-blue-emacs") (:commit . "58096ce1a25615d2bae806c3775bae3e2775019d") (:revdesc . "58096ce1a256"))])
- (forge . [(20240920 1417) ((emacs (27 1)) (compat (30 0 0 0)) (closql (2 0 0)) (dash (2 19 1)) (emacsql (4 0 2)) (ghub (4 1 0)) (let-alist (1 0 6)) (magit (4 1 0)) (markdown-mode (2 6)) (seq (2 24)) (transient (0 7 5)) (yaml (0 5 5))) "Access Git forges from Magit" tar ((:url . "https://github.com/magit/forge") (:commit . "84e3e1cec2fe2ed39645e16c41bfbd9c5b8fd4c0") (:revdesc . "84e3e1cec2fe") (:keywords "git" "tools" "vc") (:authors ("Jonas Bernoulli" . "emacs.forge@jonas.bernoulli.dev")) (:maintainers ("Jonas Bernoulli" . "emacs.forge@jonas.bernoulli.dev")) (:maintainer "Jonas Bernoulli" . "emacs.forge@jonas.bernoulli.dev"))])
+ (forge . [(20241001 2058) ((emacs (27 1)) (compat (30 0 0 0)) (closql (2 0 0)) (dash (2 19 1)) (emacsql (4 0 3)) (ghub (4 1 1)) (let-alist (1 0 6)) (magit (4 1 1)) (markdown-mode (2 6)) (seq (2 24)) (transient (0 7 6)) (yaml (0 5 5))) "Access Git forges from Magit" tar ((:url . "https://github.com/magit/forge") (:commit . "a63685b921f25e861bf1e172e46beb771e56b924") (:revdesc . "a63685b921f2") (:keywords "git" "tools" "vc") (:authors ("Jonas Bernoulli" . "emacs.forge@jonas.bernoulli.dev")) (:maintainers ("Jonas Bernoulli" . "emacs.forge@jonas.bernoulli.dev")) (:maintainer "Jonas Bernoulli" . "emacs.forge@jonas.bernoulli.dev"))])
  (form-feed . [(20210508 1627) ((emacs (24 1))) "Display ^L glyphs as horizontal lines" tar ((:url . "https://depp.brause.cc/form-feed.git") (:commit . "ac1f0ef30a11979f5dfe12d8c05a666739e486ff") (:revdesc . "ac1f0ef30a11") (:keywords "faces") (:authors ("Vasilij Schneidermann" . "mail@vasilij.de")) (:maintainers ("Vasilij Schneidermann" . "mail@vasilij.de")) (:maintainer "Vasilij Schneidermann" . "mail@vasilij.de"))])
  (form-feed-st . [(20231002 2211) ((emacs (25 1))) "Display ^L glyphs as full-width horizontal lines" tar ((:url . "https://github.com/leodag/form-feed-st") (:commit . "f91c8daf35b7588e0aa24c8716c8cfd8ff0067c8") (:revdesc . "f91c8daf35b7") (:keywords "faces"))])
- (format-all . [(20240511 1811) ((emacs (24 4)) (inheritenv (0 1)) (language-id (0 20))) "Auto-format C, C++, JS, Python, Ruby and 50 other languages" tar ((:url . "https://github.com/lassik/emacs-format-all-the-code") (:commit . "c5ddfc5f3317eaa2a7541a818a0fce961e5e61dd") (:revdesc . "c5ddfc5f3317") (:keywords "languages" "util") (:authors ("Lassi Kortela" . "lassi@lassi.io")) (:maintainers ("Lassi Kortela" . "lassi@lassi.io")) (:maintainer "Lassi Kortela" . "lassi@lassi.io"))])
+ (format-all . [(20241001 839) ((emacs (24 4)) (inheritenv (0 1)) (language-id (0 20))) "Auto-format C, C++, JS, Python, Ruby and 50 other languages" tar ((:url . "https://github.com/lassik/emacs-format-all-the-code") (:commit . "9ae47456dad2925e4d41f58bd2c864b87f82aa8b") (:revdesc . "9ae47456dad2") (:keywords "languages" "util") (:authors ("Lassi Kortela" . "lassi@lassi.io")) (:maintainers ("Lassi Kortela" . "lassi@lassi.io")) (:maintainer "Lassi Kortela" . "lassi@lassi.io"))])
  (format-sql . [(20150422 1333) nil "Use format-sql to make your SQL readable in directly Emacs" tar ((:url . "https://github.com/paetzke/format-sql.el") (:commit . "97f475c245cd6c81a72a265678e2087cee66ac7b") (:revdesc . "97f475c245cd") (:authors ("Friedrich Paetzke" . "paetzke@fastmail.fm")) (:maintainers ("Friedrich Paetzke" . "paetzke@fastmail.fm")) (:maintainer "Friedrich Paetzke" . "paetzke@fastmail.fm"))])
  (format-table . [(20181223 1616) ((emacs (25)) (dash (2 14 1))) "Parse and reformat tabular data" tar ((:url . "https://github.com/functionreturnfunction/format-table") (:commit . "dfcae3a867e574577fc09a43b045889ff155b58f") (:revdesc . "dfcae3a867e5") (:keywords "data") (:authors ("Jason Duncan" . "jasond496@msn.com")) (:maintainers ("Jason Duncan" . "jasond496@msn.com")) (:maintainer "Jason Duncan" . "jasond496@msn.com"))])
  (forth-mode . [(20231206 1127) ((cl-lib (0 2))) "Programming language mode for Forth" tar ((:url . "https://github.com/larsbrinkhoff/forth-mode") (:commit . "59c5ea89ca7593bd49cdde6caefa0893a8780105") (:revdesc . "59c5ea89ca75") (:keywords "languages" "forth") (:authors ("Lars Brinkhoff" . "lars@nocrew.org")) (:maintainers ("Lars Brinkhoff" . "lars@nocrew.org")) (:maintainer "Lars Brinkhoff" . "lars@nocrew.org"))])
@@ -2081,7 +2081,7 @@
  (gherkin-mode . [(20171224 1353) nil "An emacs major mode for editing gherkin files" tar ((:url . "https://github.com/candera/gherkin-mode") (:commit . "0313492e7da152f0aa73ddf96c0287ded8f51253") (:revdesc . "0313492e7da1") (:keywords "languages"))])
  (ghost-blog . [(20171023 742) ((markdown-mode (1 0))) "A package to manage Ghost blog" tar ((:url . "https://github.com/javaguirre/ghost-blog-emacs") (:commit . "71b358643cc9a2db1bf752281ff94aba9b59e4cc") (:revdesc . "71b358643cc9") (:keywords "ghost" "blog") (:authors ("Javier Aguirre" . "hello@javaguirre.net")) (:maintainers ("Javier Aguirre" . "hello@javaguirre.net")) (:maintainer "Javier Aguirre" . "hello@javaguirre.net"))])
  (ghq . [(20230510 332) ((emacs (26 1)) (dash (2 18 0)) (s (1 7 0))) "Ghq interface for emacs" tar ((:url . "https://github.com/lafrenierejm/emacs-ghq") (:commit . "eb197c14e53ac57a136ea8d34eec7528487c3301") (:revdesc . "eb197c14e53a") (:keywords "convenience") (:authors ("Roman Coedo" . "romancoedo@gmail.com")) (:maintainers ("Joseph LaFreniere" . "joseph@lafreniere.xyz")) (:maintainer "Joseph LaFreniere" . "joseph@lafreniere.xyz"))])
- (ghub . [(20240929 2025) ((emacs (26 3)) (compat (30 0 0 0)) (let-alist (1 0 6)) (treepy (0 1 2))) "Client libraries for Git forge APIs" tar ((:url . "https://github.com/magit/ghub") (:commit . "6f21dd4865d15b8ef45bc29473a5101eb52595af") (:revdesc . "6f21dd4865d1") (:keywords "tools") (:authors ("Jonas Bernoulli" . "emacs.ghub@jonas.bernoulli.dev")) (:maintainers ("Jonas Bernoulli" . "emacs.ghub@jonas.bernoulli.dev")) (:maintainer "Jonas Bernoulli" . "emacs.ghub@jonas.bernoulli.dev"))])
+ (ghub . [(20241001 1025) ((emacs (26 3)) (compat (30 0 0 0)) (let-alist (1 0 6)) (treepy (0 1 2))) "Client libraries for Git forge APIs" tar ((:url . "https://github.com/magit/ghub") (:commit . "23d1cd6b089db6619d02d66957c6a274311abd60") (:revdesc . "23d1cd6b089d") (:keywords "tools") (:authors ("Jonas Bernoulli" . "emacs.ghub@jonas.bernoulli.dev")) (:maintainers ("Jonas Bernoulli" . "emacs.ghub@jonas.bernoulli.dev")) (:maintainer "Jonas Bernoulli" . "emacs.ghub@jonas.bernoulli.dev"))])
  (ghub+ . [(20191229 1748) ((emacs (25)) (ghub (2 0)) (apiwrap (0 5))) "A thick GitHub API client built on ghub" tar ((:url . "https://github.com/vermiculus/ghub-plus") (:commit . "b1adef2402d7599911d4dd447a987a0cea04e6fe") (:revdesc . "b1adef2402d7") (:keywords "extensions" "multimedia" "tools") (:authors ("Sean Allred" . "code@seanallred.com")) (:maintainers ("Sean Allred" . "code@seanallred.com")) (:maintainer "Sean Allred" . "code@seanallred.com"))])
  (gif-screencast . [(20230728 1144) ((emacs (25 1))) "One-frame-per-action GIF recording" tar ((:url . "https://gitlab.com/Ambrevar/emacs-gif-screencast") (:commit . "6798656d3d3107d16e30cc26bc3928b00e50c1ca") (:revdesc . "6798656d3d31") (:keywords "multimedia" "screencast") (:authors ("Pierre Neidhardt" . "mail@ambrevar.xyz")) (:maintainers ("Pierre Neidhardt" . "mail@ambrevar.xyz")) (:maintainer "Pierre Neidhardt" . "mail@ambrevar.xyz"))])
  (gift-mode . [(20210528 1459) nil "Major mode for editing GIFT format quizzes" tar ((:url . "https://github.com/csrhodes/gift-mode") (:commit . "c93354e8fe1173b22f398f17b127875807f15b87") (:revdesc . "c93354e8fe11") (:authors ("Christophe Rhodes" . "christophe@rhodes.io")) (:maintainers ("Christophe Rhodes" . "christophe@rhodes.io")) (:maintainer "Christophe Rhodes" . "christophe@rhodes.io"))])
@@ -2100,7 +2100,7 @@
  (git-command . [(20191028 333) ((term-run (0 1 4)) (with-editor (2 3 1))) "A Git Command-Line interface" tar ((:url . "https://github.com/10sr/git-command-el") (:commit . "a773d40da39dfb1c6ecf2b0758aa370ddea8f06d") (:revdesc . "a773d40da39d") (:keywords "utility" "git") (:authors ("10sr" . "8slashes+el[at]gmail[dot]com")) (:maintainers ("10sr" . "8slashes+el[at]gmail[dot]com")) (:maintainer "10sr" . "8slashes+el[at]gmail[dot]com"))])
  (git-commit . [(20240831 2335) nil "This package has been merged into magit" tar ((:url . "https://github.com/magit/magit") (:commit . "9be8a4ab7a7dc6f34615f1011e8da263651c8f87") (:revdesc . "9be8a4ab7a7d") (:keywords "git" "tools" "vc") (:authors ("Jonas Bernoulli" . "emacs.magit@jonas.bernoulli.dev") ("Sebastian Wiesner" . "lunaryorn@gmail.com") ("Florian Ragwitz" . "rafl@debian.org") ("Marius Vollmer" . "marius.vollmer@gmail.com")) (:maintainers ("Jonas Bernoulli" . "emacs.magit@jonas.bernoulli.dev")) (:maintainer "Jonas Bernoulli" . "emacs.magit@jonas.bernoulli.dev"))])
  (git-commit-insert-issue . [(20230512 1416) ((emacs (25)) (projectile (0)) (s (0)) (ghub (0)) (bitbucket (0))) "Get issues list when typing \"Fixes #\"" tar ((:url . "https://gitlab.com/emacs-stuff/git-commit-insert-issue") (:commit . "df7ce0549d1db7bab27d401a351ea0d187c4a673") (:revdesc . "df7ce0549d1d") (:keywords "tools" "vc" "github" "gitlab" "bitbucket" "commit" "issues"))])
- (git-commit-ts-mode . [(20240722 1815) ((emacs (29 1))) "Tree-sitter support for Git commit messages" tar ((:url . "https://github.com/danilshvalov/git-commit-ts-mode") (:commit . "ba722ba44964e87b2acf48cb7b6154ad4c99bc26") (:revdesc . "ba722ba44964") (:keywords "tree-sitter" "git" "faces") (:authors ("Daniil Shvalov" . "daniil.shvalov@gmail.com")) (:maintainers ("Daniil Shvalov" . "daniil.shvalov@gmail.com")) (:maintainer "Daniil Shvalov" . "daniil.shvalov@gmail.com"))])
+ (git-commit-ts-mode . [(20241003 612) ((emacs (29 1))) "Tree-sitter support for Git commit messages" tar ((:url . "https://github.com/danilshvalov/git-commit-ts-mode") (:commit . "6eb42a3c08c5c6a1a610d433b93590b88a71f63e") (:revdesc . "6eb42a3c08c5") (:keywords "tree-sitter" "git" "faces") (:authors ("Daniil Shvalov" . "daniil.shvalov@gmail.com")) (:maintainers ("Daniil Shvalov" . "daniil.shvalov@gmail.com")) (:maintainer "Daniil Shvalov" . "daniil.shvalov@gmail.com"))])
  (git-dwim . [(20170126 1214) nil "Context-aware git commands such as branch handling" tar ((:url . "https://github.com/rubikitch/emacs-git-dwim") (:commit . "485c732130686c2f28a026e385366006435394b9") (:revdesc . "485c73213068") (:keywords "git" "tools" "convenience") (:authors ("rubikitch" . "rubikitch@ruby-lang.org")) (:maintainers ("rubikitch" . "rubikitch@ruby-lang.org")) (:maintainer "rubikitch" . "rubikitch@ruby-lang.org"))])
  (git-grep . [(20200920 1751) ((projectile (0 10 0))) "Search tools using git grep" tar ((:url . "https://github.com/tychoish/git-grep.el") (:commit . "12ff6045e9b6aa42f98abd4ddc44d670268a0849") (:revdesc . "12ff6045e9b6") (:keywords "matching" "files" "grep" "search" "using" "git-grep") (:maintainers ("tychoish" . "garen@tychoish.com")) (:maintainer "tychoish" . "garen@tychoish.com"))])
  (git-grep-transient . [(20240521 648) ((emacs (27 1)) (magit (3 3 0)) (transient (0 6 0)) (symbol-overlay (4 2))) "Search for text using git grep command" tar ((:url . "https://github.com/adelplanque/git-grep-transient") (:commit . "c9eb6d76e6b0600d2f90d009fdc28a171f69dd80") (:revdesc . "c9eb6d76e6b0") (:keywords "git" "tools" "vc") (:authors ("Alain Delplanque" . "alaindelplanque@mailoo.org")) (:maintainers ("Alain Delplanque" . "alaindelplanque@mailoo.org")) (:maintainer "Alain Delplanque" . "alaindelplanque@mailoo.org"))])
@@ -2235,7 +2235,7 @@
  (gpt . [(20240721 1747) ((emacs (24 4))) "Run instruction-following language models" tar ((:url . "https://github.com/stuhlmueller/gpt.el") (:commit . "06afbecccac8bf0d7a47b4c1b768a74ed66c5e84") (:revdesc . "06afbecccac8") (:keywords "openai" "anthropic" "claude" "language" "copilot" "convenience" "tools") (:authors ("Andreas Stuhlmueller" . "andreas@ought.org")) (:maintainers ("Andreas Stuhlmueller" . "andreas@ought.org")) (:maintainer "Andreas Stuhlmueller" . "andreas@ought.org"))])
  (gpt-commit . [(20230716 331) ((emacs (27 1)) (magit (2 90)) (request (0 3 2))) "Commit messages with GPT in Emacs" tar ((:url . "https://github.com/ywkim/gpt-commit") (:commit . "8a8883be2051eed499c5bc3035a75ff56d64d5ff") (:revdesc . "8a8883be2051") (:authors ("Youngwook Kim" . "youngwook.kim@gmail.com")) (:maintainers ("Youngwook Kim" . "youngwook.kim@gmail.com")) (:maintainer "Youngwook Kim" . "youngwook.kim@gmail.com"))])
  (gptai . [(20230530 1853) ((emacs (24 1))) "Integrate with the OpenAI API" tar ((:url . "https://github.com/antonhibl/gptai") (:commit . "e7b8b91b425986868e8bc0edcac384ba47d4d4b7") (:revdesc . "e7b8b91b4259") (:keywords "comm" "convenience") (:authors ("Anton Hibl" . "antonhibl11@gmail.com")) (:maintainers ("Anton Hibl" . "antonhibl11@gmail.com")) (:maintainer "Anton Hibl" . "antonhibl11@gmail.com"))])
- (gptel . [(20240927 1518) ((emacs (27 1)) (transient (0 4 0)) (compat (29 1 4 1))) "Interact with ChatGPT or other LLMs" tar ((:url . "https://github.com/karthink/gptel") (:commit . "2b9398a7b3bb2a66f52a8d0b1fdc3f311b2c1a3d") (:revdesc . "2b9398a7b3bb") (:keywords "convenience") (:authors ("Karthik Chikmagalur" . "karthik.chikmagalur@gmail.com")) (:maintainers ("Karthik Chikmagalur" . "karthik.chikmagalur@gmail.com")) (:maintainer "Karthik Chikmagalur" . "karthik.chikmagalur@gmail.com"))])
+ (gptel . [(20241003 304) ((emacs (27 1)) (transient (0 4 0)) (compat (29 1 4 1))) "Interact with ChatGPT or other LLMs" tar ((:url . "https://github.com/karthink/gptel") (:commit . "a5eace21fd59c2d3c85061b214f406b361f4790e") (:revdesc . "a5eace21fd59") (:keywords "convenience") (:authors ("Karthik Chikmagalur" . "karthik.chikmagalur@gmail.com")) (:maintainers ("Karthik Chikmagalur" . "karthik.chikmagalur@gmail.com")) (:maintainer "Karthik Chikmagalur" . "karthik.chikmagalur@gmail.com"))])
  (gpx . [(20240609 2200) ((emacs (27 1))) "Major mode for GPX files" tar ((:url . "https://github.com/mkcms/gpx-mode") (:commit . "88aa5fed1b0987d90f442eb002ab0f2e4731e223") (:revdesc . "88aa5fed1b09") (:keywords "data" "tools") (:authors ("Michał Krzywkowski" . "k.michal@zoho.com")) (:maintainers ("Michał Krzywkowski" . "k.michal@zoho.com")) (:maintainer "Michał Krzywkowski" . "k.michal@zoho.com"))])
  (grab-mac-link . [(20210511 1303) ((emacs (24))) "Grab link from Mac Apps and insert it into Emacs" tar ((:url . "https://github.com/xuchunyang/grab-mac-link.el") (:commit . "5fdb03bf57bc4a530374b896e0f8b5139dc794e3") (:revdesc . "5fdb03bf57bc") (:keywords "mac" "hyperlink"))])
  (grab-x-link . [(20191113 848) ((emacs (24)) (cl-lib (0 5))) "Grab links from X11 apps and insert into Emacs" tar ((:url . "https://github.com/xuchunyang/grab-x-link") (:commit . "d898db46e4864118359fdedfe915e180de3fe290") (:revdesc . "d898db46e486") (:keywords "hyperlink") (:authors ("Xu Chunyang" . "mail@xuchunyang.me")) (:maintainers ("Xu Chunyang" . "mail@xuchunyang.me")) (:maintainer "Xu Chunyang" . "mail@xuchunyang.me"))])
@@ -2553,7 +2553,7 @@
  (highlight-thing . [(20230217 728) nil "Minimalistic minor mode to highlight current thing under point" tar ((:url . "https://github.com/fgeller/highlight-thing.el") (:commit . "ad788d7a7ee9eb287a8cca3adb21510b89270dca") (:revdesc . "ad788d7a7ee9") (:keywords "highlight" "thing" "symbol") (:authors ("Felix Geller" . "fgeller@gmail.com")) (:maintainers ("Felix Geller" . "fgeller@gmail.com")) (:maintainer "Felix Geller" . "fgeller@gmail.com"))])
  (highlight-unique-symbol . [(20130612 542) ((deferred (0 3 2))) "Highlight symbols which not appear in the repository" tar ((:url . "https://github.com/hitode909/emacs-highlight-unique-symbol") (:commit . "d760015b4a5ce31d6da5a30890b599a8e1312be5") (:revdesc . "d760015b4a5c") (:authors ("hitode909" . "hitode909@gmail.com")) (:maintainers ("hitode909" . "hitode909@gmail.com")) (:maintainer "hitode909" . "hitode909@gmail.com"))])
  (highlight2clipboard . [(20240516 1942) ((htmlize (1 47))) "Copy text to clipboard with highlighting" tar ((:url . "https://github.com/Lindydancer/highlight2clipboard") (:commit . "6564fafd09a9c676b4d393f2260a0c73daac7257") (:revdesc . "6564fafd09a9") (:keywords "tools"))])
- (hima-theme . [(20240116 404) ((emacs (25 1))) "A minimal theme with pretty colors" tar ((:url . "https://github.com/meain/hima-theme") (:commit . "e928d62558ffaa9b2cca6d891069858d33535d59") (:revdesc . "e928d62558ff") (:keywords "faces"))])
+ (hima-theme . [(20241001 1341) ((emacs (25 1))) "A minimal theme with pretty colors" tar ((:url . "https://github.com/meain/hima-theme") (:commit . "f136e283feb413d4bda4904edf7a5a58a3a0749b") (:revdesc . "f136e283feb4") (:keywords "faces"))])
  (himalaya . [(20240321 1324) ((emacs (27 1))) "Interface for the email client Himalaya CLI" tar ((:url . "https://github.com/dantecatalfamo/himalaya-emacs") (:commit . "6c2c7f354a0bed95b2199e1814342620119bf13e") (:revdesc . "6c2c7f354a0b") (:keywords "mail" "comm") (:authors ("soywod" . "clement.douin@posteo.net")) (:maintainers ("soywod" . "clement.douin@posteo.net")) (:maintainer "soywod" . "clement.douin@posteo.net"))])
  (hindent . [(20240907 1847) ((cl-lib (0 5))) "Indent haskell code using the \"hindent\" program" tar ((:url . "https://github.com/mihaimaruseac/hindent") (:commit . "3295a2f0b6d3b98255a82c11c329c5f5275a6ae1") (:revdesc . "3295a2f0b6d3") (:authors ("Chris Done" . "chrisdone@gmail.com")) (:maintainers ("Chris Done" . "chrisdone@gmail.com")) (:maintainer "Chris Done" . "chrisdone@gmail.com"))])
  (hippie-exp-ext . [(20160502 2326) nil "Extension of hippie-expand" tar ((:url . "https://github.com/rubikitch/hippie-exp-ext") (:commit . "4eda13f90da51ab217d024701f4c30f91ffcb90e") (:revdesc . "4eda13f90da5") (:keywords "abbrev" "convenience" "completions" "hippie-expand") (:authors ("rubikitch" . "rubikitch@ruby-lang.org")) (:maintainers ("rubikitch" . "rubikitch@ruby-lang.org")) (:maintainer "rubikitch" . "rubikitch@ruby-lang.org"))])
@@ -2679,7 +2679,7 @@
  (image-archive . [(20150621 132) ((emacs (24)) (cl-lib (0 5))) "Image thumbnails in archive file with non-blocking" tar ((:url . "https://github.com/mhayashi1120/Emacs-image-archive") (:commit . "4cf0edabfd6a4da2ffb920ff1e5009a002fc1e53") (:revdesc . "4cf0edabfd6a") (:keywords "multimedia") (:authors ("Masahiro Hayashi" . "mhayashi1120@gmail.com")) (:maintainers ("Masahiro Hayashi" . "mhayashi1120@gmail.com")) (:maintainer "Masahiro Hayashi" . "mhayashi1120@gmail.com"))])
  (image-dired+ . [(20150430 544) ((cl-lib (0 3))) "Image-dired extensions" tar ((:url . "https://github.com/mhayashi1120/Emacs-image-diredx") (:commit . "b68094625d963056ad64e0e44af0e2266b2eadc7") (:revdesc . "b68094625d96") (:keywords "extensions" "multimedia") (:authors ("Masahiro Hayashi" . "mhayashi1120@gmail.com")) (:maintainers ("Masahiro Hayashi" . "mhayashi1120@gmail.com")) (:maintainer "Masahiro Hayashi" . "mhayashi1120@gmail.com"))])
  (imakado . [(20141024 923) nil "Imakado's usefull macros and functions" tar ((:url . "https://github.com/imakado/emacs-imakado") (:commit . "00a1e7eea2cb9e9066343a23927d6c747707902f") (:revdesc . "00a1e7eea2cb") (:keywords "convenience") (:authors ("imakado" . "ken.imakado_at_gmail.com")))])
- (imake . [(20240917 1327) ((emacs (26 1)) (compat (30 0 0 0))) "Simple, opinionated make target runner" tar ((:url . "https://github.com/tarsius/imake") (:commit . "e34b6cd5bddc3cf98fa4648ca30dae6fc05feba8") (:revdesc . "e34b6cd5bddc") (:keywords "convenience") (:authors ("Jonas Bernoulli" . "emacs.imake@jonas.bernoulli.dev")) (:maintainers ("Jonas Bernoulli" . "emacs.imake@jonas.bernoulli.dev")) (:maintainer "Jonas Bernoulli" . "emacs.imake@jonas.bernoulli.dev"))])
+ (imake . [(20241001 1019) ((emacs (26 1)) (compat (30 0 0 0))) "Simple, opinionated make target runner" tar ((:url . "https://github.com/tarsius/imake") (:commit . "21951b7081e4b36641bf87793b064e06670943d1") (:revdesc . "21951b7081e4") (:keywords "convenience") (:authors ("Jonas Bernoulli" . "emacs.imake@jonas.bernoulli.dev")) (:maintainers ("Jonas Bernoulli" . "emacs.imake@jonas.bernoulli.dev")) (:maintainer "Jonas Bernoulli" . "emacs.imake@jonas.bernoulli.dev"))])
  (imapfilter . [(20180318 2222) nil "Run the imapfilter executable" tar ((:url . "https://github.com/tarsius/imapfilter") (:commit . "79bbbe918319bc1e8f42a0bef53dc7c77fe868ea") (:revdesc . "79bbbe918319") (:keywords "mail") (:authors ("Jonas Bernoulli" . "jonas@bernoul.li")) (:maintainers ("Jonas Bernoulli" . "jonas@bernoul.li")) (:maintainer "Jonas Bernoulli" . "jonas@bernoul.li"))])
  (imbot . [(20240120 1331) ((emacs (25 1))) "Automatic system input method switcher" tar ((:url . "https://github.com/QiangF/imbot") (:commit . "32be46c7a8bd759945ae34f19c0c6f09935a7e64") (:revdesc . "32be46c7a8bd") (:keywords "convenience"))])
  (imenu-anywhere . [(20210201 1704) ((cl-lib (0 5)) (emacs (25))) "Ido/ivy/helm imenu across same mode/project/etc buffers" tar ((:url . "https://github.com/vspinu/imenu-anywhere") (:commit . "06ec33d79e33edf01b9118aead1eabeae8ee08b1") (:revdesc . "06ec33d79e33") (:keywords "ido" "imenu" "tags") (:authors ("Vitalie Spinu" . "spinuvit.list[aaattt]gmail[dot]com")) (:maintainers ("Vitalie Spinu" . "spinuvit.list[aaattt]gmail[dot]com")) (:maintainer "Vitalie Spinu" . "spinuvit.list[aaattt]gmail[dot]com"))])
@@ -3011,7 +3011,7 @@
  (kv . [(20140108 1534) nil "Key/value data structure functions" tar ((:url . "https://github.com/nicferrier/emacs-kv") (:commit . "721148475bce38a70e0b678ba8aa923652e8900e") (:revdesc . "721148475bce") (:keywords "lisp") (:authors ("Nic Ferrier" . "nferrier@ferrier.me.uk")) (:maintainers ("Nic Ferrier" . "nferrier@ferrier.me.uk")) (:maintainer "Nic Ferrier" . "nferrier@ferrier.me.uk"))])
  (kwin . [(20220120 2125) nil "Communicatewith the KWin window manager" tar ((:url . "https://github.com/reactormonk/kwin-minor-mode") (:commit . "20fac6508e5535a26df783ba05f04d1800b7382c") (:revdesc . "20fac6508e55"))])
  (laas . [(20230331 1806) ((emacs (26 3)) (auctex (11 88)) (aas (1 1))) "A bundle of as-you-type LaTeX snippets" tar ((:url . "https://github.com/tecosaur/LaTeX-auto-activating-snippets") (:commit . "a00f0aba237b85b3e5fd60cf84de5759d1bf5d48") (:revdesc . "a00f0aba237b") (:keywords "tools" "tex") (:maintainers ("Yoav Marco" . "yoavm448@gmail.com")) (:maintainer "Yoav Marco" . "yoavm448@gmail.com"))])
- (lab . [(20240912 2025) ((emacs (27 1)) (memoize (1 1)) (request (0 3 2)) (s (1 10 0)) (f (0 20 0)) (compat (29 1 4 4)) (promise (1 1)) (async-await (1 1))) "An interface for GitLab" tar ((:url . "https://github.com/isamert/lab.el") (:commit . "aa5e322d8e4f5922628e68cd870c6e5b90531c68") (:revdesc . "aa5e322d8e4f") (:authors ("Isa Mert Gurbuz" . "isamertgurbuz@gmail.com")) (:maintainers ("Isa Mert Gurbuz" . "isamertgurbuz@gmail.com")) (:maintainer "Isa Mert Gurbuz" . "isamertgurbuz@gmail.com"))])
+ (lab . [(20240930 1525) ((emacs (27 1)) (memoize (1 1)) (request (0 3 2)) (s (1 10 0)) (f (0 20 0)) (compat (29 1 4 4)) (promise (1 1)) (async-await (1 1))) "An interface for GitLab" tar ((:url . "https://github.com/isamert/lab.el") (:commit . "9bf5740dc95e8f4ae952f4d16b2edb1f315036d4") (:revdesc . "9bf5740dc95e") (:authors ("Isa Mert Gurbuz" . "isamertgurbuz@gmail.com")) (:maintainers ("Isa Mert Gurbuz" . "isamertgurbuz@gmail.com")) (:maintainer "Isa Mert Gurbuz" . "isamertgurbuz@gmail.com"))])
  (lab-themes . [(20200815 2104) ((emacs (24))) "A custom theme carefully constructed in the LAB space" tar ((:url . "https://github.com/MetroWind/lab-theme") (:commit . "9d7deb9635959d3a50ccb1082eb1207275f4b3e8") (:revdesc . "9d7deb963595") (:keywords "lisp") (:authors ("MetroWind" . "chris.corsair@gmail.com")) (:maintainers ("MetroWind" . "chris.corsair@gmail.com")) (:maintainer "MetroWind" . "chris.corsair@gmail.com"))])
  (labburn-theme . [(20221208 1611) nil "A lab color space zenburn theme" tar ((:url . "https://github.com/ksjogo/labburn-theme") (:commit . "bd0de2fdcf285d981f32e3e5ebc56fe3c9b589a5") (:revdesc . "bd0de2fdcf28") (:keywords "theme" "zenburn"))])
  (lacquer . [(20230824 725) ((emacs (25 2))) "Switch theme/font by selecting from a cache" tar ((:url . "https://github.com/zakudriver/lacquer") (:commit . "c8a0fb81f18001b3d510f545ba253ed4f9a50f5b") (:revdesc . "c8a0fb81f180") (:keywords "tools") (:authors ("zakudriver" . "zy.hua1122@gmail.com")) (:maintainers ("zakudriver" . "zy.hua1122@gmail.com")) (:maintainer "zakudriver" . "zy.hua1122@gmail.com"))])
@@ -3186,13 +3186,13 @@
  (lsp-latex . [(20240803 1436) ((emacs (27 1)) (lsp-mode (6 0)) (consult (0 35))) "LSP-mode client for LaTeX, on texlab" tar ((:url . "https://github.com/ROCKTAKEY/lsp-latex") (:commit . "2f45606dce911ebc45a42cbbaa01973b8caff4ec") (:revdesc . "2f45606dce91") (:keywords "languages" "tex") (:authors ("ROCKTAKEY" . "rocktakey@gmail.com")) (:maintainers ("ROCKTAKEY" . "rocktakey@gmail.com")) (:maintainer "ROCKTAKEY" . "rocktakey@gmail.com"))])
  (lsp-ltex . [(20240425 2049) ((emacs (27 1)) (lsp-mode (6 1))) "LSP Clients for LTEX" tar ((:url . "https://github.com/emacs-languagetool/lsp-ltex") (:commit . "c473ed37aa0f2769bb0b4c344cc28f95975dbc17") (:revdesc . "c473ed37aa0f") (:keywords "convenience" "lsp" "languagetool" "checker") (:authors ("Jen-Chieh" . "jcs090218@gmail.com")) (:maintainers ("Jen-Chieh" . "jcs090218@gmail.com")) (:maintainer "Jen-Chieh" . "jcs090218@gmail.com"))])
  (lsp-metals . [(20240821 1959) ((emacs (27 1)) (scala-mode (0 23)) (lsp-mode (7 0)) (lsp-treemacs (0 2)) (dap-mode (0 3)) (dash (2 18 0)) (f (0 20 0)) (ht (2 0)) (treemacs (3 1)) (posframe (1 4 1))) "Scala Client settings" tar ((:url . "https://github.com/emacs-lsp/lsp-metals") (:commit . "0dc938be1190d147e7013e3dce08ac8bff5d1662") (:revdesc . "0dc938be1190") (:keywords "languages" "extensions") (:authors ("Ross A. Baker" . "ross@rossabaker.com") ("Evgeny Kurnevsky" . "kurnevsky@gmail.com")) (:maintainers ("Ross A. Baker" . "ross@rossabaker.com") ("Evgeny Kurnevsky" . "kurnevsky@gmail.com")) (:maintainer "Ross A. Baker" . "ross@rossabaker.com"))])
- (lsp-mode . [(20240930 1803) ((emacs (27 1)) (dash (2 18 0)) (f (0 20 0)) (ht (2 3)) (spinner (1 7 3)) (markdown-mode (2 3)) (lv (0)) (eldoc (1 11))) "LSP mode" tar ((:url . "https://github.com/emacs-lsp/lsp-mode") (:commit . "532d38b3472c8b229c7c50f30f0dda1121768ca5") (:revdesc . "532d38b3472c") (:keywords "languages"))])
+ (lsp-mode . [(20241003 636) ((emacs (27 1)) (dash (2 18 0)) (f (0 20 0)) (ht (2 3)) (spinner (1 7 3)) (markdown-mode (2 3)) (lv (0)) (eldoc (1 11))) "LSP mode" tar ((:url . "https://github.com/emacs-lsp/lsp-mode") (:commit . "52de586352de237951ee4cdd4a1351fa97e10c63") (:revdesc . "52de586352de") (:keywords "languages"))])
  (lsp-mssql . [(20230510 1124) ((emacs (25 1)) (lsp-mode (6 2)) (dash (2 14 1)) (f (0 20 0)) (ht (2 0)) (lsp-treemacs (0 1))) "MSSQL LSP bindings" tar ((:url . "https://github.com/emacs-lsp/lsp-mssql") (:commit . "a0dba8f86a2ace7e800a9dc8f814767625a509af") (:revdesc . "a0dba8f86a2a") (:keywords "data" "languages") (:authors ("Ivan Yonchovski" . "yyoncho@gmail.com")) (:maintainers ("Ivan Yonchovski" . "yyoncho@gmail.com")) (:maintainer "Ivan Yonchovski" . "yyoncho@gmail.com"))])
  (lsp-origami . [(20230815 704) ((emacs (27 1)) (origami (1 0)) (lsp-mode (6 1))) "Origami.el support for lsp-mode" tar ((:url . "https://github.com/emacs-lsp/lsp-origami") (:commit . "86aa06517910141c3d5054eea5f7723461fce6a6") (:revdesc . "86aa06517910") (:keywords "languages" "lsp-mode"))])
  (lsp-p4 . [(20190127 1049) ((lsp-mode (3 0))) "P4 support for lsp-mode" tar ((:url . "https://github.com/dmakarov/p4ls") (:commit . "084e33a5782f9153502d9b03e63d9cbbe81cdaeb") (:revdesc . "084e33a5782f") (:keywords "lsp" "p4"))])
  (lsp-pascal . [(20200422 1610) ((emacs (24 4)) (lsp-mode (6 3))) "LSP client for Pascal" tar ((:url . "https://github.com/arjanadriaanse/lsp-pascal") (:commit . "9b65bf9e923b1459d1feb1d7528e5855e7bd4ef2") (:revdesc . "9b65bf9e923b") (:keywords "languages" "tools") (:authors ("Arjan Adriaanse" . "arjan@adriaan.se")) (:maintainers ("Arjan Adriaanse" . "arjan@adriaan.se")) (:maintainer "Arjan Adriaanse" . "arjan@adriaan.se"))])
  (lsp-pyre . [(20190406 335) ((lsp-mode (6 0))) "Lsp-mode client for python using pyre" tar ((:url . "https://github.com/jra3/lsp-pyre") (:commit . "e177b8f5efd1a955b5753aeb5d1894e6d21be35a") (:revdesc . "e177b8f5efd1") (:authors ("John Allen" . "oss@porcnick.com")) (:maintainers ("John Allen" . "oss@porcnick.com")) (:maintainer "John Allen" . "oss@porcnick.com"))])
- (lsp-pyright . [(20240929 307) ((emacs (26 1)) (lsp-mode (7 0)) (dash (2 18 0)) (ht (2 0))) "Python LSP client using Pyright" tar ((:url . "https://github.com/emacs-lsp/lsp-pyright") (:commit . "4e2a5eac006020efecb3c252d525054af44cd00d") (:revdesc . "4e2a5eac0060") (:keywords "languages" "tools" "lsp"))])
+ (lsp-pyright . [(20241001 1424) ((emacs (26 1)) (lsp-mode (7 0)) (dash (2 18 0)) (ht (2 0))) "Python LSP client using Pyright" tar ((:url . "https://github.com/emacs-lsp/lsp-pyright") (:commit . "bf27f1959460661648ecaaee4b5701bc003e3003") (:revdesc . "bf27f1959460") (:keywords "languages" "tools" "lsp"))])
  (lsp-python-ms . [(20230731 1458) ((emacs (25 1)) (lsp-mode (6 1))) "The lsp-mode client for Microsoft python-language-server" tar ((:url . "https://github.com/emacs-lsp/lsp-python-ms") (:commit . "7bda327bec7b219d140c34dab4b1e1fbd41bc516") (:revdesc . "7bda327bec7b") (:keywords "languages" "tools"))])
  (lsp-rescript . [(20220314 1957) ((lsp-mode (7 0 1)) (emacs (25 1)) (rescript-mode (0 1))) "LSP client configuration for lsp-mode and rescript-vscode" tar ((:url . "https://github.com/jjlee/lsp-rescript") (:commit . "7baf9adf10234cf964feefae99050268e9bc5681") (:revdesc . "7baf9adf1023") (:keywords "languages"))])
  (lsp-scheme . [(20230606 1722) ((emacs (26 1)) (f (0 20 0)) (lsp-mode (8 0 0))) "Scheme support for lsp-mode" tar ((:url . "https://codeberg.org/rgherdt/emacs-lsp-scheme") (:commit . "99251252005650d6f39cead8b2b9698c83251f01") (:revdesc . "992512520056") (:keywords "languages" "lisp" "tools") (:authors ("Ricardo G. Herdt" . "r.herdt@posteo.de")) (:maintainers ("Ricardo G. Herdt" . "r.herdt@posteo.de")) (:maintainer "Ricardo G. Herdt" . "r.herdt@posteo.de"))])
@@ -3226,7 +3226,7 @@
  (magic-filetype . [(20240130 1805) ((emacs (24 3)) (s (1 9 0))) "Enhance filetype major mode" tar ((:url . "https://github.com/emacs-php/magic-filetype.el") (:commit . "3979ddbd8066d7390e31bde2b35f997c5f5f4516") (:revdesc . "3979ddbd8066") (:keywords "emulations" "vim" "ft" "file" "magic-mode") (:authors ("USAMI Kenta" . "tadsan@zonu.me")) (:maintainers ("USAMI Kenta" . "tadsan@zonu.me")) (:maintainer "USAMI Kenta" . "tadsan@zonu.me"))])
  (magic-latex-buffer . [(20210306 422) ((cl-lib (0 5)) (emacs (25 1))) "Magically enhance LaTeX-mode font-locking for semi-WYSIWYG editing" tar ((:url . "https://github.com/zk-phi/magic-latex-buffer") (:commit . "903ec91872760e47c0e5715795f8465173615098") (:revdesc . "903ec9187276"))])
  (magik-mode . [(20240930 1146) ((emacs (24 4)) (compat (28 1))) "Emacs major mode for Smallworld Magik files" tar ((:url . "https://github.com/roadrunner1776/magik") (:commit . "abcf2c75c9843aa815ec77572b45d14a2069d572") (:revdesc . "abcf2c75c984") (:keywords "languages"))])
- (magit . [(20240930 1805) ((emacs (26 1)) (compat (30 0 0 0)) (dash (2 19 1)) (magit-section (4 1 0)) (seq (2 24)) (transient (0 7 5)) (with-editor (3 4 2))) "A Git porcelain inside Emacs" tar ((:url . "https://github.com/magit/magit") (:commit . "155b5364caf3dd317723a1b47f355fe4ef96e5c1") (:revdesc . "155b5364caf3") (:keywords "git" "tools" "vc") (:authors ("Marius Vollmer" . "marius.vollmer@gmail.com") ("Jonas Bernoulli" . "emacs.magit@jonas.bernoulli.dev")) (:maintainers ("Jonas Bernoulli" . "emacs.magit@jonas.bernoulli.dev") ("Kyle Meyer" . "kyle@kyleam.com")) (:maintainer "Jonas Bernoulli" . "emacs.magit@jonas.bernoulli.dev"))])
+ (magit . [(20241001 2052) ((emacs (26 1)) (compat (30 0 0 0)) (dash (2 19 1)) (magit-section (4 1 1)) (seq (2 24)) (transient (0 7 6)) (with-editor (3 4 2))) "A Git porcelain inside Emacs" tar ((:url . "https://github.com/magit/magit") (:commit . "93e86ceca7bf5b0ff9023d7f138e5f06990fc276") (:revdesc . "93e86ceca7bf") (:keywords "git" "tools" "vc") (:authors ("Marius Vollmer" . "marius.vollmer@gmail.com") ("Jonas Bernoulli" . "emacs.magit@jonas.bernoulli.dev")) (:maintainers ("Jonas Bernoulli" . "emacs.magit@jonas.bernoulli.dev") ("Kyle Meyer" . "kyle@kyleam.com")) (:maintainer "Jonas Bernoulli" . "emacs.magit@jonas.bernoulli.dev"))])
  (magit-annex . [(20240811 1850) ((emacs (26 1)) (magit (4 0 0))) "Control git-annex from Magit" tar ((:url . "https://github.com/magit/magit-annex") (:commit . "9db0bc61461f222106c7ae3d8cd6d3de1f1b143f") (:revdesc . "9db0bc61461f") (:keywords "vc" "tools") (:authors ("Kyle Meyer" . "kyle@kyleam.com") ("Rémi Vanicat" . "vanicat@debian.org")) (:maintainers ("Kyle Meyer" . "kyle@kyleam.com") ("Rémi Vanicat" . "vanicat@debian.org")) (:maintainer "Kyle Meyer" . "kyle@kyleam.com"))])
  (magit-commit-mark . [(20240421 931) ((emacs (29 1)) (magit (3 3 0))) "Support marking commits as read" tar ((:url . "https://codeberg.org/ideasman42/emacs-magit-commit-mark") (:commit . "d09d0df6f8a697446e9fac77428b32997b94c59e") (:revdesc . "d09d0df6f8a6") (:authors ("Campbell Barton" . "ideasman42@gmail.com")) (:maintainers ("Campbell Barton" . "ideasman42@gmail.com")) (:maintainer "Campbell Barton" . "ideasman42@gmail.com"))])
  (magit-delta . [(20220125 50) ((emacs (25 1)) (magit (20200426)) (xterm-color (2 0))) "Use Delta when displaying diffs in Magit" tar ((:url . "https://github.com/dandavison/magit-delta") (:commit . "5fc7dbddcfacfe46d3fd876172ad02a9ab6ac616") (:revdesc . "5fc7dbddcfac") (:authors ("Dan Davison" . "dandavison7@gmail.com")) (:maintainers ("Dan Davison" . "dandavison7@gmail.com")) (:maintainer "Dan Davison" . "dandavison7@gmail.com"))])
@@ -3247,7 +3247,7 @@
  (magit-popup . [(20200719 1015) ((emacs (24 4)) (dash (2 13 0))) "Define prefix-infix-suffix command combos" tar ((:url . "https://github.com/magit/magit-popup") (:commit . "d8585fa39f88956963d877b921322530257ba9f5") (:revdesc . "d8585fa39f88") (:keywords "bindings") (:authors ("Jonas Bernoulli" . "jonas@bernoul.li")) (:maintainers ("Jonas Bernoulli" . "jonas@bernoul.li")) (:maintainer "Jonas Bernoulli" . "jonas@bernoul.li"))])
  (magit-rbr . [(20181009 2016) ((magit (2 13 0)) (emacs (24 3))) "Support for git rbr in Magit" tar ((:url . "https://github.com/fanatoly/magit-rbr") (:commit . "029203b3e48537205052a058e964f058cd802c3c") (:revdesc . "029203b3e485") (:keywords "git" "magit" "rbr" "tools") (:authors ("Anatoly Fayngelerin" . "fanatoly+magitrbr@gmail.com")) (:maintainers ("Anatoly Fayngelerin" . "fanatoly+magitrbr@gmail.com")) (:maintainer "Anatoly Fayngelerin" . "fanatoly+magitrbr@gmail.com"))])
  (magit-reviewboard . [(20200727 1748) ((emacs (25 2)) (magit (2 13 0)) (s (1 12 0)) (request (0 3 0))) "Show open Reviewboard reviews in Magit" tar ((:url . "https://github.com/jtamagnan/magit-reviewboard") (:commit . "aceedff88921f1dfef8a6b2fb18fe316fb7223a8") (:revdesc . "aceedff88921") (:keywords "magit" "vc") (:authors ("Jules Tamagnan" . "jtamagnan@gmail.com")) (:maintainers ("Jules Tamagnan" . "jtamagnan@gmail.com")) (:maintainer "Jules Tamagnan" . "jtamagnan@gmail.com"))])
- (magit-section . [(20240913 1455) ((emacs (26 1)) (compat (30 0 0 0)) (dash (2 19 1)) (seq (2 24))) "Sections for read-only buffers" tar ((:url . "https://github.com/magit/magit") (:commit . "9395de2c94cc430ca865f497046c16f66deccf16") (:revdesc . "9395de2c94cc") (:keywords "tools") (:authors ("Jonas Bernoulli" . "emacs.magit@jonas.bernoulli.dev")) (:maintainers ("Jonas Bernoulli" . "emacs.magit@jonas.bernoulli.dev")) (:maintainer "Jonas Bernoulli" . "emacs.magit@jonas.bernoulli.dev"))])
+ (magit-section . [(20241001 2052) ((emacs (26 1)) (compat (30 0 0 0)) (dash (2 19 1)) (seq (2 24))) "Sections for read-only buffers" tar ((:url . "https://github.com/magit/magit") (:commit . "93e86ceca7bf5b0ff9023d7f138e5f06990fc276") (:revdesc . "93e86ceca7bf") (:keywords "tools") (:authors ("Jonas Bernoulli" . "emacs.magit@jonas.bernoulli.dev")) (:maintainers ("Jonas Bernoulli" . "emacs.magit@jonas.bernoulli.dev")) (:maintainer "Jonas Bernoulli" . "emacs.magit@jonas.bernoulli.dev"))])
  (magit-stats . [(20230223 1819) ((emacs (25 1))) "Generates GIT Repo Statistics Report" tar ((:url . "https://github.com/LionyxML/magit-stats") (:commit . "41b18e5fc664dba93981a7931f476632c5b54a7d") (:revdesc . "41b18e5fc664") (:keywords "vc" "convenience"))])
  (magit-stgit . [(20231226 1514) ((emacs (24 4)) (magit (2 12 0)) (magit-popup (2 12 0))) "StGit extension for Magit" tar ((:url . "https://github.com/stacked-git/magit-stgit") (:commit . "59d1eb355caf4adbbdf1e351f5861de61b0b5efa") (:revdesc . "59d1eb355caf") (:keywords "git" "tools" "vc") (:authors ("Lluís Vilanova" . "vilanova@ac.upc.edu")) (:maintainers ("Peter Grayson" . "pete@jpgrayson.net")) (:maintainer "Peter Grayson" . "pete@jpgrayson.net"))])
  (magit-svn . [(20220314 1451) ((emacs (25 1)) (magit (2 90 1)) (transient (0 3 2))) "Git-Svn extension for Magit" tar ((:url . "https://github.com/emacsorphanage/magit-svn") (:commit . "b8277081db90977247ae3900ea6afeb0ca644d36") (:revdesc . "b8277081db90") (:keywords "vc" "tools") (:authors ("Phil Jackson" . "phil@shellarchive.co.uk")) (:maintainers ("Phil Jackson" . "phil@shellarchive.co.uk")) (:maintainer "Phil Jackson" . "phil@shellarchive.co.uk"))])
@@ -3333,7 +3333,7 @@
  (memoize . [(20200103 2036) nil "Memoization functions" tar ((:url . "https://github.com/skeeto/emacs-memoize") (:commit . "51b075935ca7070f62fae1d69fe0ff7d8fa56fdd") (:revdesc . "51b075935ca7") (:authors ("Christopher Wellons" . "mosquitopsu@gmail.com")) (:maintainers ("Christopher Wellons" . "mosquitopsu@gmail.com")) (:maintainer "Christopher Wellons" . "mosquitopsu@gmail.com"))])
  (memolist . [(20150804 1721) ((markdown-mode (22 0)) (ag (0 45))) "Memolist.el is Emacs port of memolist.vim" tar ((:url . "https://github.com/mikanfactory/memolist.el") (:commit . "60c296e202a71e9dcf1c3936d47b5c4b95c5839f") (:revdesc . "60c296e202a7") (:keywords "markdown" "memo") (:authors ("mikanfactory" . "k952i4j14x17_at_gmail.com")))])
  (mentor . [(20230103 1146) ((emacs (25 1)) (xml-rpc (1 6 15)) (seq (1 11)) (async (1 9 3)) (url-scgi (0 8))) "Frontend for the rTorrent bittorrent client" tar ((:url . "https://github.com/skangas/mentor") (:commit . "f51dd4f3f87c54b7cc92189924b9d873a53f5a75") (:revdesc . "f51dd4f3f87c") (:keywords "comm" "processes" "bittorrent") (:authors ("Stefan Kangas" . "stefankangas@gmail.com")) (:maintainers ("Stefan Kangas" . "stefankangas@gmail.com")) (:maintainer "Stefan Kangas" . "stefankangas@gmail.com"))])
- (meow . [(20240920 522) ((emacs (27 1))) "Yet Another modal editing" tar ((:url . "https://github.com/meow-edit/meow") (:commit . "bba7aa9504f85ecd310e71ca74b53207e5eb037b") (:revdesc . "bba7aa9504f8") (:keywords "convenience" "modal-editing"))])
+ (meow . [(20241002 1728) ((emacs (27 1))) "Yet Another modal editing" tar ((:url . "https://github.com/meow-edit/meow") (:commit . "99fe8318a8edcd7cbd349d125b8a32ec273223b0") (:revdesc . "99fe8318a8ed") (:keywords "convenience" "modal-editing"))])
  (meow-tree-sitter . [(20240701 1422) ((emacs (29 1)) (meow (1 2 0))) "Tree-sitter powered motions for Meow" tar ((:url . "https://github.com/skissue/meow-tree-sitter") (:commit . "d8dce964fac631a6d44b650a733075e14854159c") (:revdesc . "d8dce964fac6") (:keywords "convenience" "files" "languages" "tools") (:authors ("Ad" . "me@skissue.xyz")) (:maintainers ("Ad" . "me@skissue.xyz")) (:maintainer "Ad" . "me@skissue.xyz"))])
  (merlin . [(20240925 900) ((emacs (25 1))) "Mode for Merlin, an assistant for OCaml" tar ((:url . "https://github.com/ocaml/merlin") (:commit . "80e919cf32a62acdaee95a5dab9b4bc18a8b4034") (:revdesc . "80e919cf32a6") (:keywords "ocaml" "languages") (:authors ("Frédéric Bour" . "frederic.bourlakaban.net")) (:maintainers ("Frédéric Bour" . "frederic.bourlakaban.net")) (:maintainer "Frédéric Bour" . "frederic.bourlakaban.net"))])
  (merlin-ac . [(20221123 1408) ((emacs (25 1)) (merlin (3)) (auto-complete (1 5))) "Merlin and auto-complete integration" tar ((:url . "https://github.com/ocaml/merlin") (:commit . "8bcab034a680f57ddf58092fda6288dc4caddd2a") (:revdesc . "8bcab034a680") (:keywords "ocaml" "languages") (:authors ("Simon Castellan" . "simon.castellaniuwt.fr") ("Frédéric Bour" . "frederic.bourlakaban.net") ("Thomas Refis" . "thomas.refisgmail.com")) (:maintainers ("Simon Castellan" . "simon.castellaniuwt.fr") ("Frédéric Bour" . "frederic.bourlakaban.net") ("Thomas Refis" . "thomas.refisgmail.com")) (:maintainer "Simon Castellan" . "simon.castellaniuwt.fr"))])
@@ -3373,7 +3373,7 @@
  (mindstream . [(20240908 2036) ((emacs (25 1)) (magit (3 3 0))) "Start writing, stay focused, don't worry" tar ((:url . "https://github.com/countvajhula/mindstream") (:commit . "cdcd2d234dec2c143c4e5a302c8ffde59a864f72") (:revdesc . "cdcd2d234dec") (:keywords "convenience" "files" "languages" "outlines" "tools" "vc" "wp") (:authors ("Siddhartha Kasivajhula" . "sid@countvajhula.com")) (:maintainers ("Siddhartha Kasivajhula" . "sid@countvajhula.com")) (:maintainer "Siddhartha Kasivajhula" . "sid@countvajhula.com"))])
  (minesweeper . [(20200416 2342) nil "Play minesweeper in Emacs" tar ((:url . "https://hg.sr.ht/~zck/minesweeper") (:commit . "d4248e3c9b3e9e7277cb9e6d081330611898f334") (:revdesc . "d4248e3c9b3e9e7277cb9e6d081330611898f334") (:keywords "game" "fun" "minesweeper" "inane" "diversion") (:authors ("Zachary Kanfer" . "zkanfer@gmail.com")) (:maintainers ("Zachary Kanfer" . "zkanfer@gmail.com")) (:maintainer "Zachary Kanfer" . "zkanfer@gmail.com"))])
  (mingus . [(20230518 1726) ((libmpdee (2 2))) "MPD Interface" tar ((:url . "https://github.com/pft/mingus") (:commit . "3fa9b95552eb062eb245321abb7f442c458618dc") (:revdesc . "3fa9b95552eb") (:keywords "multimedia" "elisp" "music" "mpd") (:authors ("Niels Giesen" . "pfton#emacs")) (:maintainers ("Niels Giesen" . "pfton#emacs")) (:maintainer "Niels Giesen" . "pfton#emacs"))])
- (mini-echo . [(20240927 947) ((emacs (29 1)) (dash (2 19 1)) (hide-mode-line (1 0 3))) "Echo buffer status in minibuffer window" tar ((:url . "https://github.com/liuyinz/mini-echo.el") (:commit . "48ba208a022adf970b563fe5d05bdf1e6af5c189") (:revdesc . "48ba208a022a") (:keywords "frames") (:authors ("liuyinz" . "liuyinz95@gmail.com")) (:maintainers ("liuyinz" . "liuyinz95@gmail.com")) (:maintainer "liuyinz" . "liuyinz95@gmail.com"))])
+ (mini-echo . [(20241002 2128) ((emacs (29 1)) (dash (2 19 1)) (hide-mode-line (1 0 3))) "Echo buffer status in minibuffer window" tar ((:url . "https://github.com/liuyinz/mini-echo.el") (:commit . "0c1977d90522accfb21b89a42c6ce7c7bc83b9ed") (:revdesc . "0c1977d90522") (:keywords "frames") (:authors ("liuyinz" . "liuyinz95@gmail.com")) (:maintainers ("liuyinz" . "liuyinz95@gmail.com")) (:maintainer "liuyinz" . "liuyinz95@gmail.com"))])
  (mini-frame . [(20220627 2041) ((emacs (26 1))) "Show minibuffer in child frame on read-from-minibuffer" tar ((:url . "https://github.com/muffinmad/emacs-mini-frame") (:commit . "60838f3cab438dcbda8eaa15ab3e5d1af88910e9") (:revdesc . "60838f3cab43") (:keywords "frames") (:authors ("Andrii Kolomoiets" . "andreyk.mad@gmail.com")) (:maintainers ("Andrii Kolomoiets" . "andreyk.mad@gmail.com")) (:maintainer "Andrii Kolomoiets" . "andreyk.mad@gmail.com"))])
  (mini-header-line . [(20170621 1221) ((emacs (24 4))) "A minimal header-line" tar ((:url . "https://github.com/ksjogo/mini-header-line") (:commit . "73b6724e0a26c4528d93768191c8aa59e6bce2e5") (:revdesc . "73b6724e0a26") (:keywords "header-line" "mode-line"))])
  (mini-modeline . [(20230306 1521) ((emacs (25 1)) (dash (2 12 0))) "Display modeline in minibuffer" tar ((:url . "https://github.com/kiennq/emacs-mini-modeline") (:commit . "86e753b6c38a06b0fc80d7560aa6a25245fd4d38") (:revdesc . "86e753b6c38a") (:keywords "convenience" "tools") (:authors ("Kien Nguyen" . "kien.n.quang@gmail.com")) (:maintainers ("Kien Nguyen" . "kien.n.quang@gmail.com")) (:maintainer "Kien Nguyen" . "kien.n.quang@gmail.com"))])
@@ -3393,7 +3393,7 @@
  (mip-mode . [(20151127 617) nil "Virtual projects for emacs" tar ((:url . "https://gitlab.com/gaudecker/mip-mode") (:commit . "7c88c383b4c7ed0a4c1dc397735f365c1fcb461c") (:revdesc . "7c88c383b4c7") (:keywords "workspaces" "workspace" "project" "projects" "mip-mode") (:authors ("Eeli Reilin" . "gaudecker@fea.st")) (:maintainers ("Eeli Reilin" . "gaudecker@fea.st")) (:maintainer "Eeli Reilin" . "gaudecker@fea.st"))])
  (mips-mode . [(20220608 1204) ((emacs (25 1))) "Major-mode for MIPS assembly" tar ((:url . "https://github.com/hlissner/emacs-mips-mode") (:commit . "98795cdc81979821ac35d9f94ce354cd99780c67") (:revdesc . "98795cdc8197") (:keywords "languages" "mips" "assembly") (:authors ("Henrik Lissner" . "http://github/hlissner")) (:maintainers ("Henrik Lissner" . "contact@henrik.io")) (:maintainer "Henrik Lissner" . "contact@henrik.io"))])
  (mise . [(20240707 1428) ((emacs (29 1)) (inheritenv (0 2)) (dash (2 19 1))) "Support for `mise' cli" tar ((:url . "https://github.com/liuyinz/mise.el") (:commit . "20179a58132e5518a0868eac01dcd1d72db2e254") (:revdesc . "20179a58132e") (:keywords "tools" "processes") (:authors ("liuyinz" . "liuyinz95@gmail.com")) (:maintainers ("Liuyinz" . "liuyinz95@gmail.com")) (:maintainer "Liuyinz" . "liuyinz95@gmail.com"))])
- (mistty . [(20240930 1245) ((emacs (29 1))) "Shell/Comint alternative based on term.el" tar ((:url . "https://github.com/szermatt/mistty") (:commit . "144b6518b0c36692198092c047325f37e8eb99f3") (:revdesc . "144b6518b0c3") (:keywords "convenience" "unix") (:authors ("Stephane Zermatten" . "szermatt@gmx.net")) (:maintainers ("Stephane Zermatten" . "szermatt@gmx.net")) (:maintainer "Stephane Zermatten" . "szermatt@gmx.net"))])
+ (mistty . [(20241001 747) ((emacs (29 1))) "Shell/Comint alternative based on term.el" tar ((:url . "https://github.com/szermatt/mistty") (:commit . "df18ebd3aaebae61cf4de767d75a7bc60be585b8") (:revdesc . "df18ebd3aaeb") (:keywords "convenience" "unix") (:authors ("Stephane Zermatten" . "szermatt@gmx.net")) (:maintainers ("Stephane Zermatten" . "szermatt@gmx.net")) (:maintainer "Stephane Zermatten" . "szermatt@gmx.net"))])
  (mix . [(20240122 720) ((emacs (25 1))) "Mix Major Mode. Build Elixir using Mix" tar ((:url . "https://github.com/ayrat555/mix.el") (:commit . "16cc69cbf919769c191b1c49c1cab324fd0682a9") (:revdesc . "16cc69cbf919") (:keywords "tools") (:authors ("Ayrat Badykov" . "ayratin555@gmail.com")) (:maintainers ("Ayrat Badykov" . "ayratin555@gmail.com")) (:maintainer "Ayrat Badykov" . "ayratin555@gmail.com"))])
  (mixed-pitch . [(20210304 1900) ((emacs (24 3))) "Use a variable pitch, keeping fixed pitch where it's sensible" tar ((:url . "https://gitlab.com/jabranham/mixed-pitch") (:commit . "519e05f74825abf04b7d2e0e38ec040d013a125a") (:revdesc . "519e05f74825") (:authors ("J. Alexander Branham" . "branham@utexas.edu")) (:maintainers ("J. Alexander Branham" . "branham@utexas.edu")) (:maintainer "J. Alexander Branham" . "branham@utexas.edu"))])
  (mkdown . [(20140517 1418) ((markdown-mode (2 0))) "Pretty Markdown previews based on mkdown.com" tar ((:url . "https://github.com/ajtulloch/mkdown.el") (:commit . "8e23de82719af6c5b53b52b3308a02b3a1fb872e") (:revdesc . "8e23de82719a") (:keywords "markdown"))])
@@ -3419,7 +3419,7 @@
  (modern-sh . [(20211101 1001) ((emacs (25 1)) (hydra (0 15 0)) (eval-in-repl (0 9 7))) "Minor mode for editing shell script" tar ((:url . "https://github.com/damon-kwok/modern-sh") (:commit . "8ebebe77304aa8170f7af809e7564c79d3bd45da") (:revdesc . "8ebebe77304a") (:keywords "languages" "programming"))])
  (modtime-skip-mode . [(20140128 2201) nil "Minor mode for disabling modtime and supersession checks on files" tar ((:url . "https://github.com/jordonbiondo/modtime-skip-mode") (:commit . "c0e49523aa26b2263a8693691ac775988015f592") (:revdesc . "c0e49523aa26") (:authors ("Jordon Biondo" . "biondoj@mail.gvsu.edu")) (:maintainers ("Jordon Biondo" . "biondoj@mail.gvsu.edu")) (:maintainer "Jordon Biondo" . "biondoj@mail.gvsu.edu"))])
  (modular-config . [(20210726 1614) ((emacs (25 1))) "Organize your config into small and loadable modules" tar ((:url . "https://github.com/SidharthArya/modular-config.el") (:commit . "043907d96efff70dfaea1e721de90bd35970e8bd") (:revdesc . "043907d96eff") (:keywords "startup" "lisp" "tools") (:authors ("Sidharth Arya" . "sidhartharya10@gmail.com")) (:maintainers ("Sidharth Arya" . "sidhartharya10@gmail.com")) (:maintainer "Sidharth Arya" . "sidhartharya10@gmail.com"))])
- (modus-themes . [(20240921 616) ((emacs (27 1))) "Elegant, highly legible and customizable themes" tar ((:url . "https://github.com/protesilaos/modus-themes") (:commit . "95be7968f3ff91740e2079c7736e5bfe8623e301") (:revdesc . "95be7968f3ff") (:keywords "faces" "theme" "accessibility") (:authors ("Protesilaos Stavrou" . "info@protesilaos.com")) (:maintainers ("Protesilaos Stavrou" . "info@protesilaos.com")) (:maintainer "Protesilaos Stavrou" . "info@protesilaos.com"))])
+ (modus-themes . [(20241002 1231) ((emacs (27 1))) "Elegant, highly legible and customizable themes" tar ((:url . "https://github.com/protesilaos/modus-themes") (:commit . "0c4a9973e0f26cbbb54e9e323e1b284289d9364f") (:revdesc . "0c4a9973e0f2") (:keywords "faces" "theme" "accessibility") (:authors ("Protesilaos Stavrou" . "info@protesilaos.com")) (:maintainers ("Protesilaos Stavrou" . "info@protesilaos.com")) (:maintainer "Protesilaos Stavrou" . "info@protesilaos.com"))])
  (moe-theme . [(20240716 854) nil "A colorful eye-candy theme. Moe, moe, kyun!" tar ((:url . "https://github.com/kuanyui/moe-theme.el") (:commit . "4b3642157bfe9a9268310d321cfe67c8c236b5e1") (:revdesc . "4b3642157bfe") (:keywords "themes") (:authors ("kuanyui" . "azazabc123@gmail.com")) (:maintainers ("kuanyui" . "azazabc123@gmail.com")) (:maintainer "kuanyui" . "azazabc123@gmail.com"))])
  (molar-mass . [(20220922 1752) ((emacs (24 3))) "Calculates molar mass of a molecule" tar ((:url . "https://github.com/sergiruiztrepat/molar-mass") (:commit . "c3b686c4b621b45fa4b17857b4934eb4487d74f5") (:revdesc . "c3b686c4b621") (:keywords "convenience" "chemistry"))])
  (molecule . [(20180527 743) ((emacs (25 1))) "Simple wrapper for molecule" tar ((:url . "https://gitlab.com/drymerisnothere/molecule-el") (:commit . "2ef72b81d9aa24ea782b71a061a3abdad6cae162") (:revdesc . "2ef72b81d9aa") (:keywords ":" "languages" "terminals") (:authors ("drymer" . "drymer[AT]autistici.org")) (:maintainers ("drymer" . "drymer[AT]autistici.org")) (:maintainer "drymer" . "drymer[AT]autistici.org"))])
@@ -3443,7 +3443,7 @@
  (moonshot . [(20210627 2244) ((emacs (25 1)) (cl-lib (0 5)) (f (0 18)) (s (1 11 0)) (projectile (2 0 0)) (counsel (0 11 0)) (realgud (1 5 1)) (seq (2 20)) (levenshtein (1 0))) "Run executable file, debug and build commands on project" tar ((:url . "https://github.com/ageldama/moonshot") (:commit . "ec37a12825888047a90d9ee8131aa4bea348edf7") (:revdesc . "ec37a1282588") (:keywords "convenience" "files" "processes" "tools" "unix") (:authors ("Jong-Hyouk Yun" . "ageldama@gmail.com")) (:maintainers ("Jong-Hyouk Yun" . "ageldama@gmail.com")) (:maintainer "Jong-Hyouk Yun" . "ageldama@gmail.com"))])
  (morganey-mode . [(20170118 934) ((emacs (24 4))) "Major mode for editing Morganey files" tar ((:url . "https://github.com/morganey-lang/morganey-mode") (:commit . "7e33f1be486f58dfcf02adcbf82ccac47f69bd9b") (:revdesc . "7e33f1be486f") (:authors ("Alexey Kutepov" . "reximkut@gmail.com")) (:maintainers ("Alexey Kutepov" . "reximkut@gmail.com")) (:maintainer "Alexey Kutepov" . "reximkut@gmail.com"))])
  (morgentau-theme . [(20220319 1049) ((emacs (24))) "Tango-based custom theme" tar ((:url . "https://github.com/Melchizedek6809/morgentau-theme") (:commit . "a8da5640b4a9b72a3136901d0a1a03071d9fcb00") (:revdesc . "a8da5640b4a9") (:keywords "theme" "dark" "faces"))])
- (morlock . [(20240913 1817) ((emacs (26 1)) (compat (30 0 0 0))) "More font-lock keywords for elisp" tar ((:url . "https://github.com/tarsius/morlock") (:commit . "f9d2c0c37b1261fe4ce0649bc68be3f3778239f3") (:revdesc . "f9d2c0c37b12") (:keywords "convenience") (:authors ("Jonas Bernoulli" . "emacs.morlock@jonas.bernoulli.dev")) (:maintainers ("Jonas Bernoulli" . "emacs.morlock@jonas.bernoulli.dev")) (:maintainer "Jonas Bernoulli" . "emacs.morlock@jonas.bernoulli.dev"))])
+ (morlock . [(20241001 1022) ((emacs (26 1)) (compat (30 0 0 0))) "More font-lock keywords for elisp" tar ((:url . "https://github.com/tarsius/morlock") (:commit . "cd349e401fd55ce2eab21fb02474ae8aeee39252") (:revdesc . "cd349e401fd5") (:keywords "convenience") (:authors ("Jonas Bernoulli" . "emacs.morlock@jonas.bernoulli.dev")) (:maintainers ("Jonas Bernoulli" . "emacs.morlock@jonas.bernoulli.dev")) (:maintainer "Jonas Bernoulli" . "emacs.morlock@jonas.bernoulli.dev"))])
  (morrowind-theme . [(20230912 406) ((emacs (24 1))) "Theme" tar ((:url . "https://github.com/SamuelBanya/morrowind-theme") (:commit . "f197ef02e96fa3b8a38eca25ba750df7b843e564") (:revdesc . "f197ef02e96f"))])
  (mos-mode . [(20221209 1353) ((emacs (24 4)) (lsp-mode (8 0 0)) (dap-mode (0 7)) (dash (2 19 1)) (ht (2 3))) "MOS toolkit usage" tar ((:url . "https://github.com/themkat/mos-mode") (:commit . "770f49417e8ad7dbf382c8691f6f689d793b9314") (:revdesc . "770f49417e8a"))])
  (mosey . [(20180614 1649) ((emacs (24 4))) "Mosey around your buffers" tar ((:url . "https://github.com/alphapapa/mosey.el") (:commit . "2e3ac9d334fa2937ed5267193dfd25d8e1f14dc2") (:revdesc . "2e3ac9d334fa") (:keywords "convenience") (:authors ("Adam Porter" . "adam@alphapapa.net")) (:maintainers ("Adam Porter" . "adam@alphapapa.net")) (:maintainer "Adam Porter" . "adam@alphapapa.net"))])
@@ -3604,7 +3604,7 @@
  (nntwitter . [(20230705 1110) ((emacs (25 1)) (dash (20190401)) (anaphora (20180618)) (request (20190819))) "Gnus Backend For Twitter" tar ((:url . "https://github.com/dickmao/nntwitter") (:commit . "e27acca9beeb6645dd13545d42f6d4d97d59d82c") (:revdesc . "e27acca9beeb") (:keywords "news"))])
  (no-clown-fiesta-theme . [(20240725 2030) ((emacs (26 1)) (autothemer (0 2))) "Not-so-colorful-theme" tar ((:url . "https://codeberg.org/ranmaru22/no-clown-fiesta-theme.el") (:commit . "d97f521d4e29181af59412ac32de34ca487345d8") (:revdesc . "d97f521d4e29"))])
  (no-emoji . [(20180515 1837) ((emacs (24))) "Show :emoji-name: instead of emoji characters" tar ((:url . "https://github.com/ecraven/no-emoji") (:commit . "ebceeab50dbfe4d60235180a57633745dbc18c77") (:revdesc . "ebceeab50dbf") (:keywords "extensions") (:authors ("Peter" . "craven@gmx.net")) (:maintainers ("Peter" . "craven@gmx.net")) (:maintainer "Peter" . "craven@gmx.net"))])
- (no-littering . [(20240831 2204) ((emacs (26 1)) (compat (30 0 0 0))) "Help keeping ~/.config/emacs clean" tar ((:url . "https://github.com/emacscollective/no-littering") (:commit . "35021384cdc1a126b8a6d5fedfd087b5030a993f") (:revdesc . "35021384cdc1") (:keywords "convenience") (:authors ("Jonas Bernoulli" . "emacs.no-littering@jonas.bernoulli.dev")) (:maintainers ("Jonas Bernoulli" . "emacs.no-littering@jonas.bernoulli.dev")) (:maintainer "Jonas Bernoulli" . "emacs.no-littering@jonas.bernoulli.dev"))])
+ (no-littering . [(20241001 1020) ((emacs (26 1)) (compat (30 0 0 0))) "Help keeping ~/.config/emacs clean" tar ((:url . "https://github.com/emacscollective/no-littering") (:commit . "7474c55122f568212103efe325f347ee05878f70") (:revdesc . "7474c55122f5") (:keywords "convenience") (:authors ("Jonas Bernoulli" . "emacs.no-littering@jonas.bernoulli.dev")) (:maintainers ("Jonas Bernoulli" . "emacs.no-littering@jonas.bernoulli.dev")) (:maintainer "Jonas Bernoulli" . "emacs.no-littering@jonas.bernoulli.dev"))])
  (no-spam . [(20190724 1854) ((emacs (25 1))) "Add repeat delays to commands" tar ((:url . "https://github.com/mamapanda/no-spam") (:commit . "860860e4a0d59bd15c8e092dc42f5f7f769a428e") (:revdesc . "860860e4a0d5") (:keywords "keyboard" "tools") (:authors ("Daniel Phan" . "daniel.phan36@gmail.com")) (:maintainers ("Daniel Phan" . "daniel.phan36@gmail.com")) (:maintainer "Daniel Phan" . "daniel.phan36@gmail.com"))])
  (noaa . [(20240317 2321) ((emacs (27 1)) (kv (0 0 19)) (request (0 2 0)) (s (1 12 0))) "Get NOAA weather data" tar ((:url . "https://codeberg.org/thomp/noaa") (:commit . "7d68b5a580c64123f3bbd75f795a891dfdeb1746") (:revdesc . "7d68b5a580c6") (:keywords "calendar"))])
  (noccur . [(20191015 719) nil "Run multi-occur on project/dired files" tar ((:url . "https://github.com/NicolasPetton/noccur.el") (:commit . "fa91647a305e89561d3dbe53da002fff49abe0bb") (:revdesc . "fa91647a305e") (:keywords "convenience") (:authors ("Nicolas Petton" . "petton.nicolas@gmail.com")) (:maintainers ("Nicolas Petton" . "petton.nicolas@gmail.com")) (:maintainer "Nicolas Petton" . "petton.nicolas@gmail.com"))])
@@ -3891,7 +3891,7 @@
  (org-listcruncher . [(20210706 1741) ((seq (2 3)) (emacs (26 1))) "Planning tool - Parse Org mode lists into table" tar ((:url . "https://github.com/dfeich/org-listcruncher") (:commit . "075e0e6d36eb50406a608bc8a2f0dd359ec63938") (:revdesc . "075e0e6d36eb") (:keywords "convenience") (:authors ("Derek Feichtinger" . "dfeich@gmail.com")) (:maintainers ("Derek Feichtinger" . "dfeich@gmail.com")) (:maintainer "Derek Feichtinger" . "dfeich@gmail.com"))])
  (org-mac-link . [(20231016 2047) ((emacs (27 1))) "Insert org-mode links to items selected in various Mac apps" tar ((:url . "https://gitlab.com/aimebertrand/org-mac-link") (:commit . "e30171a6e98db90787ab8a23b3a7dc4fd13b10f9") (:revdesc . "e30171a6e98d") (:keywords "files" "wp" "url" "org") (:authors ("Anthony Lander" . "anthony.lander@gmail.com") ("John Wiegley" . "johnw@gnu.org") ("Christopher Suckling" . "sucklingatgmaildotcom") ("Daniil Frumin" . "difrumin@gmail.com") ("Alan Schmitt" . "alan.schmitt@polytechnique.org") ("Mike McLean" . "mike.mclean@pobox.com")) (:maintainers ("Aimé Bertrand" . "aime.bertrand@macowners.club")) (:maintainer "Aimé Bertrand" . "aime.bertrand@macowners.club"))])
  (org-make-toc . [(20240830 2046) ((emacs (26 1)) (dash (2 12)) (s (1 10 0)) (org (9 3)) (compat (29 1))) "Automatic tables of contents for Org files" tar ((:url . "https://github.com/alphapapa/org-make-toc") (:commit . "5f0f39b11c091a5abf49ddf78a6f740252920f78") (:revdesc . "5f0f39b11c09") (:keywords "org" "convenience") (:authors ("Adam Porter" . "adam@alphapapa.net")) (:maintainers ("Adam Porter" . "adam@alphapapa.net")) (:maintainer "Adam Porter" . "adam@alphapapa.net"))])
- (org-mime . [(20240818 243) ((emacs (27 1))) "Org html export for text/html MIME emails" tar ((:url . "https://github.com/org-mime/org-mime") (:commit . "468604b8404d3c7d6148be83a4cf308ee95d2cfb") (:revdesc . "468604b8404d") (:keywords "mime" "mail" "email" "html") (:maintainers ("Chen Bin" . "chenbin.sh@gmail.com")) (:maintainer "Chen Bin" . "chenbin.sh@gmail.com"))])
+ (org-mime . [(20241001 415) ((emacs (27 1))) "Org html export for text/html MIME emails" tar ((:url . "https://github.com/org-mime/org-mime") (:commit . "90aa9081ec00a1705552434cb45ff223aa9f8711") (:revdesc . "90aa9081ec00") (:keywords "mime" "mail" "email" "html") (:maintainers ("Chen Bin" . "chenbin.sh@gmail.com")) (:maintainer "Chen Bin" . "chenbin.sh@gmail.com"))])
  (org-mind-map . [(20180826 2340) ((emacs (24)) (dash (1 8 0)) (org (8 2 10))) "Creates a directed graph from org-mode files" tar ((:url . "https://github.com/the-ted/org-mind-map") (:commit . "41df4b2e30455494f1848b4e06cc9208aa9e902b") (:revdesc . "41df4b2e3045") (:keywords "orgmode" "extensions" "graphviz" "dot") (:authors ("Ted Wiles" . "theodore.wiles@gmail.com")) (:maintainers ("Ted Wiles" . "theodore.wiles@gmail.com")) (:maintainer "Ted Wiles" . "theodore.wiles@gmail.com"))])
  (org-ml . [(20230410 30) ((emacs (27 1)) (org (9 3)) (dash (2 17)) (s (1 12))) "Functional Org Mode API" tar ((:url . "https://github.com/ndwarshuis/org-ml") (:commit . "f57336a9126a168ad32ccce017c072474555395a") (:revdesc . "f57336a9126a") (:keywords "org-mode" "outlines") (:authors ("Nathan Dwarshuis" . "ndwar@yavin4.ch")) (:maintainers ("Nathan Dwarshuis" . "ndwar@yavin4.ch")) (:maintainer "Nathan Dwarshuis" . "ndwar@yavin4.ch"))])
  (org-mobile-sync . [(20180606 524) ((emacs (24 3 50)) (org (8 0))) "Automatically sync org-mobile on changes" tar ((:url . "https://framagit.org/steckerhalter/org-mobile-sync.git") (:commit . "06764b943a528827df1e2acc6bc7806cc2c1351f") (:revdesc . "06764b943a52") (:keywords "org-mode" "org" "mobile" "sync" "todo"))])
@@ -3904,8 +3904,8 @@
  (org-multiple-keymap . [(20191017 1920) ((org (8 2 4)) (emacs (24)) (cl-lib (0 5))) "Set keymap to elements, such as timestamp and priority" tar ((:url . "https://github.com/emacsattic/org-multiple-keymap") (:commit . "4eb8aa0aada012b2346cc7f0c55e07783141a2c3") (:revdesc . "4eb8aa0aada0") (:keywords "convenience" "org-mode") (:authors ("myuhe" . "yuhei.maeda_at_gmail.com")))])
  (org-newtab . [(20240227 155) ((emacs (27 1)) (websocket (1 14)) (async (1 9 7))) "Supercharge your browser's new tab page" tar ((:url . "https://github.com/Zweihander-Main/org-newtab") (:commit . "eca494a43e242558bd8db24d321ad62a8ec86c02") (:revdesc . "eca494a43e24") (:keywords "outlines") (:authors ("Zweihänder" . "zweidev@zweihander.me")) (:maintainers ("Zweihänder" . "zweidev@zweihander.me")) (:maintainer "Zweihänder" . "zweidev@zweihander.me"))])
  (org-nix-shell . [(20240603 859) ((emacs (27 1)) (org (9 4))) "Org local nix-shell" tar ((:url . "https://github.com/AntonHakansson/org-nix-shell") (:commit . "f359d9e1053fadee86dd668f4789ae2e700d8e8a") (:revdesc . "f359d9e1053f") (:keywords "processes" "outlines") (:maintainers ("Anton Hakansson" . "anton@hakanssn.com")) (:maintainer "Anton Hakansson" . "anton@hakanssn.com"))])
- (org-node . [(20240930 1359) ((emacs (28 1)) (compat (30)) (llama (0))) "Link org-id entries into a network" tar ((:url . "https://github.com/meedstrom/org-node") (:commit . "53f9c1c8ed33e9292136b088ea2dde2919ee0a20") (:revdesc . "53f9c1c8ed33") (:keywords "org" "hypermedia") (:authors ("Martin Edström" . "meedstrom91@gmail.com")) (:maintainers ("Martin Edström" . "meedstrom91@gmail.com")) (:maintainer "Martin Edström" . "meedstrom91@gmail.com"))])
- (org-node-fakeroam . [(20240930 1353) ((emacs (28 1)) (compat (30)) (org-node (1 3 0)) (org-roam (2 2 2)) (emacsql (4 0 3)) (persist (0 6 1))) "Stand-ins for org-roam-autosync-mode" tar ((:url . "https://github.com/meedstrom/org-node-fakeroam") (:commit . "008da31767d0351143a954e48f92e38dbd27f5d5") (:revdesc . "008da31767d0") (:keywords "org" "hypermedia") (:authors ("Martin Edström" . "meedstrom91@gmail.com")) (:maintainers ("Martin Edström" . "meedstrom91@gmail.com")) (:maintainer "Martin Edström" . "meedstrom91@gmail.com"))])
+ (org-node . [(20241003 956) ((emacs (28 1)) (compat (30)) (llama (0))) "Link org-id entries into a network" tar ((:url . "https://github.com/meedstrom/org-node") (:commit . "665d0b5116eba1604f0bb57bbae3f442eb500011") (:revdesc . "665d0b5116eb") (:keywords "org" "hypermedia") (:authors ("Martin Edström" . "meedstrom91@gmail.com")) (:maintainers ("Martin Edström" . "meedstrom91@gmail.com")) (:maintainer "Martin Edström" . "meedstrom91@gmail.com"))])
+ (org-node-fakeroam . [(20241003 942) ((emacs (28 1)) (compat (30)) (org-node (1 3 7)) (org-roam (2 2 2)) (emacsql (4 0 3))) "Stand-ins for org-roam-autosync-mode" tar ((:url . "https://github.com/meedstrom/org-node-fakeroam") (:commit . "167ef6b2c284816c28ef42e2aea7ec93a3d3c85f") (:revdesc . "167ef6b2c284") (:keywords "org" "hypermedia") (:authors ("Martin Edström" . "meedstrom91@gmail.com")) (:maintainers ("Martin Edström" . "meedstrom91@gmail.com")) (:maintainer "Martin Edström" . "meedstrom91@gmail.com"))])
  (org-notebook . [(20170322 452) ((emacs (24)) (org (8)) (cl-lib (0 5))) "Ease the use of org-mode as a notebook" tar ((:url . "https://github.com/Rahi374/org-notebook") (:commit . "d90c4aeca2442161e6dd89de175561af85aace03") (:revdesc . "d90c4aeca244") (:keywords "convenience" "tools") (:authors ("Paul Elder" . "paul.elder@amanokami.net")) (:maintainers ("Paul Elder" . "paul.elder@amanokami.net")) (:maintainer "Paul Elder" . "paul.elder@amanokami.net"))])
  (org-noter . [(20240918 1703) ((emacs (24 4)) (cl-lib (0 6)) (org (9 4))) "A synchronized, Org-mode, document annotator" tar ((:url . "https://github.com/org-noter/org-noter") (:commit . "691efc3ed4a2828d791a148e53851365c2eb380f") (:revdesc . "691efc3ed4a2") (:keywords "lisp" "pdf" "interleave" "annotate" "external" "sync" "notes" "documents" "org-mode") (:authors ("Gonçalo Santos" . "in@bsentia") ("Maintainer Dmitry M" . "dmitrym@gmail.com")) (:maintainers ("Peter Mao" . "peter.mao@gmail.com") ("Dmitry M" . "dmitrym@gmail.com")) (:maintainer "Peter Mao" . "peter.mao@gmail.com"))])
  (org-noter-pdftools . [(20230725 1433) ((emacs (26 1)) (org (9 4)) (pdf-tools (0 8)) (org-pdftools (1 0)) (org-noter (1 4 1))) "Integration between org-pdftools and org-noter" tar ((:url . "https://github.com/fuxialexander/org-pdftools") (:commit . "4e420233a153a9c4ab3d1a7e1d7d3211c836f0ac") (:revdesc . "4e420233a153") (:keywords "convenience") (:authors ("Alexander Fu Xi" . "fuxialexander@gmail.com")) (:maintainers ("Alexander Fu Xi" . "fuxialexnader@gmail.com")) (:maintainer "Alexander Fu Xi" . "fuxialexnader@gmail.com"))])
@@ -3973,7 +3973,7 @@
  (org-table-color . [(20220311 1927) ((emacs (26 1))) "Add color to your org-mode table cells" tar ((:url . "https://github.com/fosskers/org-table-color") (:commit . "2022f301ef323953c3a0e087a1b601da85e06da1") (:revdesc . "2022f301ef32") (:keywords "data" "faces" "lisp") (:authors ("Colin Woodbury" . "colin@fosskers.ca")) (:maintainers ("Colin Woodbury" . "colin@fosskers.ca")) (:maintainer "Colin Woodbury" . "colin@fosskers.ca"))])
  (org-table-comment . [(20120209 1851) nil "Org table comment modes" tar ((:url . "https://github.com/mattfidler/org-table-comment.el") (:commit . "33b9966c33ecbc3e27cca67c2f2cdea04364d74e") (:revdesc . "33b9966c33ec") (:keywords "org-mode" "orgtbl") (:authors ("Matthew L. Fidler" . "matthewdotfidleratgmail.com")))])
  (org-table-sticky-header . [(20190924 506) ((org (8 2 10)) (emacs (24 4))) "Sticky header for org-mode tables" tar ((:url . "https://github.com/cute-jumper/org-table-sticky-header") (:commit . "b65442857128ab04724aaa301e60aa874a31a798") (:revdesc . "b65442857128") (:keywords "extensions") (:authors ("Junpeng Qiu" . "qjpchmail@gmail.com")) (:maintainers ("Junpeng Qiu" . "qjpchmail@gmail.com")) (:maintainer "Junpeng Qiu" . "qjpchmail@gmail.com"))])
- (org-tag-beautify . [(20240925 1023) ((emacs (26 1)) (nerd-icons (0 0 1))) "Beautify Org mode tags" tar ((:url . "https://repo.or.cz/org-tag-beautify.git") (:commit . "14ea0cf7dc8d259a3b4df079fe7509ce14cd1cf4") (:revdesc . "14ea0cf7dc8d") (:keywords "hypermedia"))])
+ (org-tag-beautify . [(20241003 221) ((emacs (26 1)) (nerd-icons (0 0 1))) "Beautify Org mode tags" tar ((:url . "https://repo.or.cz/org-tag-beautify.git") (:commit . "3b3f95b41c97abc9de3075419b9b30c754f749fc") (:revdesc . "3b3f95b41c97") (:keywords "hypermedia"))])
  (org-tagged . [(20220926 2048) ((s (1 13 0)) (dash (2 19 1)) (emacs (28 1)) (org (9 5 2))) "Dynamic block for tagged org-mode todos" tar ((:url . "https://github.com/gizmomogwai/org-tagged") (:commit . "4b0174473772fca976426e982bb3f4a3037c1e37") (:revdesc . "4b0174473772") (:keywords "org-mode" "org" "gtd" "tools") (:authors ("Christian Köstlin" . "christian.koestlin@gmail.com")) (:maintainers ("Christian Köstlin" . "christian.koestlin@gmail.com")) (:maintainer "Christian Köstlin" . "christian.koestlin@gmail.com"))])
  (org-tanglesync . [(20200127 1616) ((emacs (24 4))) "Syncing org src blocks with tangled external files" tar ((:url . "https://gitlab.com/mtekman/org-tanglesync.el") (:commit . "31aa5502d1d4f8b032807949908c016b00556684") (:revdesc . "31aa5502d1d4") (:keywords "outlines"))])
  (org-tfl . [(20170923 1218) ((org (0 16 2)) (cl-lib (0 5)) (emacs (24 1))) "Transport for London meets Orgmode" tar ((:url . "https://github.com/storax/org-tfl") (:commit . "f0d7d39106a1de5457f5160cddd98ab892b61066") (:revdesc . "f0d7d39106a1") (:keywords "org" "tfl") (:authors (nil . "zuber[dot]david[at]gmx[dot]de")) (:maintainers (nil . "zuber[dot]david[at]gmx[dot]de")) (:maintainer nil . "zuber[dot]david[at]gmx[dot]de"))])
@@ -4021,10 +4021,10 @@
  (orgnav . [(20170608 1713) ((helm (2 7 0)) (s (1 11 0)) (dash (1 11 0)) (emacs (24))) "Org tree navigation using helm" tar ((:url . "https://github.com/facetframer/orgnav") (:commit . "9e2cac9c1a67af5f0080e60022e821bf7b70312d") (:revdesc . "9e2cac9c1a67") (:keywords "convenience" "outlines") (:authors ("Facet Framer" . "(facet@facetframer.com)")) (:maintainers ("Facet Framer" . "(facet@facetframer.com)")) (:maintainer "Facet Framer" . "(facet@facetframer.com)"))])
  (orgnote . [(20240814 2021) ((emacs (27 1))) "Sync org-roam notes with OrgNote app" tar ((:url . "https://github.com/Artawower/orgnote.el") (:commit . "d2d0c8d16ea2dbcc29b79f9d4a48e03e90c3f57d") (:revdesc . "d2d0c8d16ea2") (:authors ("Artur Yaroshenko" . "artawower@protonmail.com")) (:maintainers ("Artur Yaroshenko" . "artawower@protonmail.com")) (:maintainer "Artur Yaroshenko" . "artawower@protonmail.com"))])
  (orgstrap . [(20230408 2232) ((emacs (24 4))) "Bootstrap an Org file using file local variables" tar ((:url . "https://github.com/tgbugs/orgstrap") (:commit . "f35bccde556b0f82515e79ee69f4379469276356") (:revdesc . "f35bccde556b") (:keywords "lisp" "org" "org-mode" "bootstrap"))])
- (orgtbl-aggregate . [(20240616 506) ((emacs (26 1))) "Create an aggregated Org table from another one" tar ((:url . "https://github.com/tbanel/orgaggregate") (:commit . "f343b6009d87630588d39dc3d92651008c1bad13") (:revdesc . "f343b6009d87") (:keywords "data" "extensions"))])
+ (orgtbl-aggregate . [(20241002 2020) ((emacs (26 1))) "Create an aggregated Org table from another one" tar ((:url . "https://github.com/tbanel/orgaggregate") (:commit . "fec29053dc6ed97e6b1cae60bc97cb9b8700f3cf") (:revdesc . "fec29053dc6e") (:keywords "data" "extensions"))])
  (orgtbl-ascii-plot . [(20230122 816) nil "Ascii-art bar plots in org-mode tables" tar ((:url . "https://github.com/tbanel/orgtblasciiplot") (:commit . "4160128045b271bc1aef3d14dbf0c5b53ae58bd2") (:revdesc . "4160128045b2") (:keywords "org" "table" "ascii" "plot"))])
  (orgtbl-fit . [(20240228 716) ((emacs (24 4))) "Regression-fit a column in an Org Mode table" tar ((:url . "https://github.com/tbanel/orgtblfit") (:commit . "a22f3a137f3590d7f13c3be38bbd1e55d39cb2ad") (:revdesc . "a22f3a137f35") (:keywords "data" "extensions"))])
- (orgtbl-join . [(20240930 1502) ((emacs (24 3))) "Join columns from another Org Mode table" tar ((:url . "https://github.com/tbanel/orgtbljoin") (:commit . "5a4be04bd307e32a07c2f1466c89a43d6489dd0b") (:revdesc . "5a4be04bd307") (:keywords "data" "extensions"))])
+ (orgtbl-join . [(20241002 2012) ((emacs (24 3))) "Join columns from another Org Mode table" tar ((:url . "https://github.com/tbanel/orgtbljoin") (:commit . "30cd50e2e913d41d8ee74ed3c0ca0b1fd8c2e264") (:revdesc . "30cd50e2e913") (:keywords "data" "extensions"))])
  (orgtbl-show-header . [(20230903 903) nil "Show the header of the current column in the minibuffer" tar ((:url . "https://github.com/DamienCassou/orgtbl-show-header") (:commit . "1ab18f5afa2b01e67618ada0d40e6b7a65d9d14c") (:revdesc . "1ab18f5afa2b") (:authors ("Damien Cassou" . "damien.cassou@gmail.com")) (:maintainers ("Damien Cassou" . "damien.cassou@gmail.com")) (:maintainer "Damien Cassou" . "damien.cassou@gmail.com"))])
  (origami . [(20200331 1019) ((s (1 9 0)) (dash (2 5 0)) (emacs (24)) (cl-lib (0 5))) "Flexible text folding" tar ((:url . "https://github.com/gregsexton/origami.el") (:commit . "e558710a975e8511b9386edc81cd6bdd0a5bda74") (:revdesc . "e558710a975e") (:keywords "folding") (:authors ("Greg Sexton" . "gregsexton@gmail.com")) (:maintainers ("Greg Sexton" . "gregsexton@gmail.com")) (:maintainer "Greg Sexton" . "gregsexton@gmail.com"))])
  (origami-predef . [(20200615 1044) ((emacs (24 3)) (origami (1 0))) "Apply folding when finding (opening) files" tar ((:url . "https://github.com/alvarogonzalezsotillo/origami-predef") (:commit . "edcba971ba52a14f69a436ad47888827d7927982") (:revdesc . "edcba971ba52") (:keywords "convenience" "folding") (:authors ("lvaro González Sotillo" . "alvarogonzalezsotillo@gmail.com")) (:maintainers ("lvaro González Sotillo" . "alvarogonzalezsotillo@gmail.com")) (:maintainer "lvaro González Sotillo" . "alvarogonzalezsotillo@gmail.com"))])
@@ -4434,7 +4434,7 @@
  (pumpkin-spice-theme . [(20231011 1253) ((emacs (27 1)) (autothemer (0 2))) "Spice up your day with a delightful pumpkin colored theme" tar ((:url . "https://cicadas.surf/cgit/pumpkin-spice-theme.git") (:commit . "8d38276f6b2d16325ca372dd3630653b21e6e7ed") (:revdesc . "8d38276f6b2d") (:keywords "faces" "theme" "halloween" "pumpkin") (:authors ("Grant Shangreaux" . "shoshin@cicadas.surf")) (:maintainers ("Grant Shangreaux" . "shoshin@cicadas.surf")) (:maintainer "Grant Shangreaux" . "shoshin@cicadas.surf"))])
  (punctuality-logger . [(20141120 2031) nil "Punctuality logger for Emacs" tar ((:url . "https://gitlab.com/elzair/punctuality-logger") (:commit . "d76c5d5589a4f8a94cc5537686d9a3b46ea7cc59") (:revdesc . "d76c5d5589a4") (:keywords "reminder" "calendar") (:authors ("Philip Woods" . "elzairthesorcerer@gmail.com")) (:maintainers ("Philip Woods" . "elzairthesorcerer@gmail.com")) (:maintainer "Philip Woods" . "elzairthesorcerer@gmail.com"))])
  (pungi . [(20150222 1246) ((jedi (0 2 0 -3 2)) (pyvenv (1 5))) "Integrates jedi with virtualenv and buildout python environments" tar ((:url . "https://github.com/mgrbyte/pungi") (:commit . "41c9f8b7795e083bfd63ba0d06c789c250998723") (:revdesc . "41c9f8b7795e") (:keywords "convenience") (:authors ("Matthew Russell" . "matthew.russell@horizon5.org")) (:maintainers ("Matthew Russell" . "matthew.russell@horizon5.org")) (:maintainer "Matthew Russell" . "matthew.russell@horizon5.org"))])
- (puni . [(20231231 1415) ((emacs (26 1))) "Parentheses Universalistic" tar ((:url . "https://github.com/AmaiKinono/puni") (:commit . "72e091ef30e0c9299dbcd0bc4669ab9bb8fb6e47") (:revdesc . "72e091ef30e0") (:keywords "convenience" "lisp" "tools") (:authors ("Hao Wang" . "amaikinono@gmail.com")) (:maintainers ("Hao Wang" . "amaikinono@gmail.com")) (:maintainer "Hao Wang" . "amaikinono@gmail.com"))])
+ (puni . [(20241003 256) ((emacs (26 1))) "Parentheses Universalistic" tar ((:url . "https://github.com/AmaiKinono/puni") (:commit . "85e3c36141e6a94885cc798d34b745c18ab31828") (:revdesc . "85e3c36141e6") (:keywords "convenience" "lisp" "tools") (:authors ("Hao Wang" . "amaikinono@gmail.com")) (:maintainers ("Hao Wang" . "amaikinono@gmail.com")) (:maintainer "Hao Wang" . "amaikinono@gmail.com"))])
  (punpun-themes . [(20240929 2238) ((emacs (24 1))) "A set of bleak themes" tar ((:url . "https://depp.brause.cc/punpun-themes.git") (:commit . "a0b26442293e7afc6fd2ba9be199fc7b4f5138e3") (:revdesc . "a0b26442293e") (:authors ("Vasilij Schneidermann" . "mail@vasilij.de")) (:maintainers ("Vasilij Schneidermann" . "mail@vasilij.de")) (:maintainer "Vasilij Schneidermann" . "mail@vasilij.de"))])
  (puppet-mode . [(20210305 645) ((emacs (24 1)) (pkg-info (0 4))) "Major mode for Puppet manifests" tar ((:url . "https://github.com/voxpupuli/puppet-mode") (:commit . "ab25cf379236f4e1bd4bc9c1d77a93c95800e9bf") (:revdesc . "ab25cf379236") (:keywords "languages") (:authors ("Vox Pupuli" . "voxpupuli@groups.io") ("Bozhidar Batsov" . "bozhidar@batsov.com") ("Sebastian Wiesner" . "swiesner@lunaryorn.com") ("Russ Allbery" . "rra@stanford.edu")) (:maintainers ("Vox Pupuli" . "voxpupuli@groups.io") ("Bozhidar Batsov" . "bozhidar@batsov.com") ("Sebastian Wiesner" . "swiesner@lunaryorn.com") ("Tim Meusel" . "tim@bastelfreak.de")) (:maintainer "Vox Pupuli" . "voxpupuli@groups.io"))])
  (puppet-ts-mode . [(20240626 646) ((emacs (29 1))) "Major mode for Puppet using Tree-sitter" tar ((:url . "https://github.com/smoeding/puppet-ts-mode") (:commit . "9622188612f3be347bd92f5a195999b36f95f988") (:revdesc . "9622188612f3") (:keywords "languages") (:authors ("Stefan Möding" . "stm@kill-9.net")) (:maintainers ("Stefan Möding" . "stm@kill-9.net")) (:maintainer "Stefan Möding" . "stm@kill-9.net"))])
@@ -4517,7 +4517,7 @@
  (qwen-chat-shell . [(20240612 343) ((emacs (27 1)) (shell-maker (0 50 1))) "Qwen-chat shell + buffer insert commands" tar ((:url . "https://github.com/Pavinberg/qwen-chat-shell") (:commit . "2d6562c8a75aebf7a59e554011571ba5883cf4fd") (:revdesc . "2d6562c8a75a") (:authors ("Pavinberg" . "pavin0702@gmail.com")) (:maintainers ("Pavinberg" . "pavin0702@gmail.com")) (:maintainer "Pavinberg" . "pavin0702@gmail.com"))])
  (r-autoyas . [(20140101 1510) ((ess (0)) (yasnippet (0 8 0))) "Provides automatically created yasnippets for R function argument lists" tar ((:url . "https://github.com/mattfidler/r-autoyas.el") (:commit . "d321a7da0ef2e94668d53e0807277da7b70ea678") (:revdesc . "d321a7da0ef2") (:keywords "r" "yasnippet"))])
  (racer . [(20210307 243) ((emacs (25 1)) (rust-mode (0 2 0)) (dash (2 13 0)) (s (1 10 0)) (f (0 18 2)) (pos-tip (0 4 6))) "Code completion, goto-definition and docs browsing for Rust via racer" tar ((:url . "https://github.com/racer-rust/emacs-racer") (:commit . "1e63e98626737ea9b662d4a9b1ffd6842b1c648c") (:revdesc . "1e63e9862673") (:keywords "abbrev" "convenience" "matching" "rust" "tools"))])
- (racket-mode . [(20240929 1857) ((emacs (25 1))) "Racket editing, REPL, and more" tar ((:url . "https://github.com/greghendershott/racket-mode") (:commit . "325c14d79b64a2088b29d2cd7db12eef1c7081f5") (:revdesc . "325c14d79b64") (:authors ("Greg Hendershott" . "racket-mode-author@greghendershott.com")))])
+ (racket-mode . [(20241001 1458) ((emacs (25 1))) "Racket editing, REPL, and more" tar ((:url . "https://github.com/greghendershott/racket-mode") (:commit . "ec8b5142abaaef8335c23b98c18dee1f960b6e0b") (:revdesc . "ec8b5142abaa") (:authors ("Greg Hendershott" . "racket-mode-author@greghendershott.com")))])
  (rails-i18n . [(20220126 1643) ((emacs (27 2)) (yaml (0 1 0)) (dash (2 19 1))) "Seach and insert i18n on ruby code" tar ((:url . "https://github.com/otavioschwanck/rails-i18n.el") (:commit . "8e87e4e48e31902b8259ded28a208c2e7efea6e9") (:revdesc . "8e87e4e48e31") (:keywords "tools" "languages") (:authors ("Otávio Schwanck dos Santos" . "otavioschwanck@gmail.com")) (:maintainers ("Otávio Schwanck dos Santos" . "otavioschwanck@gmail.com")) (:maintainer "Otávio Schwanck dos Santos" . "otavioschwanck@gmail.com"))])
  (rails-log-mode . [(20140408 425) nil "Major mode for viewing Rails log files" tar ((:url . "https://github.com/ananthakumaran/rails-log-mode") (:commit . "ff440003ad7d47cb0ac3300f2a632f4cfd36a446") (:revdesc . "ff440003ad7d") (:keywords "rails" "log") (:authors ("Anantha kumaran" . "ananthakumaran@gmail.com")) (:maintainers ("Anantha kumaran" . "ananthakumaran@gmail.com")) (:maintainer "Anantha kumaran" . "ananthakumaran@gmail.com"))])
  (rails-routes . [(20220126 1631) ((emacs (27 2)) (inflections (1 1))) "Search for and insert rails routes" tar ((:url . "https://github.com/otavioschwanck/rails-routes.el") (:commit . "eab995a9297ca5bd9bd4f4c2737f2fecfc36def0") (:revdesc . "eab995a9297c") (:keywords "tools" "languages") (:authors ("Otávio Schwanck" . "otavioschwanck@gmail.com")) (:maintainers ("Otávio Schwanck" . "otavioschwanck@gmail.com")) (:maintainer "Otávio Schwanck" . "otavioschwanck@gmail.com"))])
@@ -4553,7 +4553,7 @@
  (read-only-cfg . [(20210717 205) ((emacs (24 3))) "Make files read-only based on user config" tar ((:url . "https://github.com/pfchen/read-only-cfg") (:commit . "fa16d6018a5a29f26adf6007b6b76ea1b3c0bfce") (:revdesc . "fa16d6018a5a") (:keywords "tools" "convenience") (:authors ("pfchen" . "pfchen31@gmail.com")) (:maintainers ("pfchen" . "pfchen31@gmail.com")) (:maintainer "pfchen" . "pfchen31@gmail.com"))])
  (readable-numbers . [(20220711 911) ((emacs (24 1))) "Visually separate long integers" tar ((:url . "https://github.com/Titan-C/cardano.el") (:commit . "a3ebdcdd91d32f044b68541a00e162396e4acb38") (:revdesc . "a3ebdcdd91d3") (:authors ("Oscar Najera" . "https://oscarnajera.com")) (:maintainers ("Oscar Najera" . "hi@oscarnajera.com")) (:maintainer "Oscar Najera" . "hi@oscarnajera.com"))])
  (readline-complete . [(20150708 1437) nil "Offers completions in shell mode" tar ((:url . "https://github.com/monsanto/readline-complete.el") (:commit . "30c020c37b2741160cc37e656e13c85d826a0ebf") (:revdesc . "30c020c37b27") (:authors ("Christopher Monsanto" . "chris@monsan.to")) (:maintainers ("Christopher Monsanto" . "chris@monsan.to")) (:maintainer "Christopher Monsanto" . "chris@monsan.to"))])
- (ready-player . [(20240928 2143) ((emacs (28 1))) "Open media files in ready-player major mode" tar ((:url . "https://github.com/xenodium/ready-player") (:commit . "ea1bd7a81488e147a5c24bdf377b5263246f516c") (:revdesc . "ea1bd7a81488"))])
+ (ready-player . [(20241003 727) ((emacs (28 1))) "Open media files in ready-player major mode" tar ((:url . "https://github.com/xenodium/ready-player") (:commit . "62a44bde9744fee43c050de3e4c0cab2686cf1f9") (:revdesc . "62a44bde9744"))])
  (real-auto-save . [(20200505 1537) ((emacs (24 4))) "Automatically save your buffers/files at regular intervals" tar ((:url . "https://github.com/ChillarAnand/real-auto-save") (:commit . "8e51241e5ba7b07b91d8188c14cf193017640292") (:revdesc . "8e51241e5ba7") (:authors ("Chaoji Li" . "lichaojiATgmailDOTcom") ("Anand Reddy Pandikunta" . "anand21nandaATgmailDOTcom")) (:maintainers ("Chaoji Li" . "lichaojiATgmailDOTcom") ("Anand Reddy Pandikunta" . "anand21nandaATgmailDOTcom")) (:maintainer "Chaoji Li" . "lichaojiATgmailDOTcom"))])
  (realgud . [(20231113 1910) ((load-relative (1 3 1)) (loc-changes (1 2)) (test-simple (1 3 0)) (emacs (25))) "A modular front-end for interacting with external debuggers" tar ((:url . "https://github.com/realgud/realgud") (:commit . "365063ea8ce8ec6a852cb388088d84147421c3c2") (:revdesc . "365063ea8ce8") (:keywords "debugger" "gdb" "python" "perl" "go" "bash" "zsh" "bashdb" "zshdb" "remake" "trepan" "perldb" "pdb") (:authors ("Rocky Bernstein" . "rocky@gnu.org")) (:maintainers ("Rocky Bernstein" . "rocky@gnu.org")) (:maintainer "Rocky Bernstein" . "rocky@gnu.org"))])
  (realgud-byebug . [(20190520 1140) ((realgud (1 4 5)) (load-relative (1 2)) (cl-lib (0 5)) (emacs (24))) "Realgud front-end to the Ruby byebug debugger" tar ((:url . "https://github.com/realgud/realgud-byebug") (:commit . "f8f20b92c6b13f75cc9797921c0e28d3def48b1c") (:revdesc . "f8f20b92c6b1"))])
@@ -4644,7 +4644,7 @@
  (rewriting-pcase . [(20230419 23) ((emacs (27 1))) "Support for rewriting sexps in source code" tar ((:url . "https://github.com/owinebar/emacs-rewriting-pcase") (:commit . "3a2efb79bfc68629bd20a8bc1770c8f6d24575fa") (:revdesc . "3a2efb79bfc6") (:keywords "extensions" "lisp"))])
  (reykjavik-theme . [(20201219 947) ((emacs (24))) "Theme with a dark background" tar ((:url . "https://github.com/mswift42/reykjavik-theme") (:commit . "f6d8e83946633603234cd1dac725e17447f40bce") (:revdesc . "f6d8e8394663"))])
  (rfc-mode . [(20231013 1353) ((emacs (25 1))) "RFC document browser and viewer" tar ((:url . "https://github.com/galdor/rfc-mode") (:commit . "ab09db78d9d1baa4da4f926930833598e1e978ce") (:revdesc . "ab09db78d9d1") (:authors ("Nicolas Martyanoff" . "nicolas@n16f.net")) (:maintainers ("Nicolas Martyanoff" . "nicolas@n16f.net")) (:maintainer "Nicolas Martyanoff" . "nicolas@n16f.net"))])
- (rg . [(20240919 1628) ((emacs (26 1)) (transient (0 3 0)) (wgrep (2 1 10))) "A search tool based on ripgrep" tar ((:url . "https://github.com/dajva/rg.el") (:commit . "e9ca15dd113fc9690a56bef06b67c69ead414efd") (:revdesc . "e9ca15dd113f") (:keywords "matching" "tools") (:authors ("David Landell" . "david.landell@sunnyhill.email") ("Roland McGrath" . "roland@gnu.org")) (:maintainers ("David Landell" . "david.landell@sunnyhill.email") ("Roland McGrath" . "roland@gnu.org")) (:maintainer "David Landell" . "david.landell@sunnyhill.email"))])
+ (rg . [(20241002 2036) ((emacs (26 1)) (transient (0 3 0)) (wgrep (2 1 10))) "A search tool based on ripgrep" tar ((:url . "https://github.com/dajva/rg.el") (:commit . "d727fe8466502e29975067adf6f2ca3e0618279c") (:revdesc . "d727fe846650") (:keywords "matching" "tools") (:authors ("David Landell" . "david.landell@sunnyhill.email") ("Roland McGrath" . "roland@gnu.org")) (:maintainers ("David Landell" . "david.landell@sunnyhill.email") ("Roland McGrath" . "roland@gnu.org")) (:maintainer "David Landell" . "david.landell@sunnyhill.email"))])
  (rgb . [(20220717 1940) ((emacs (24 3))) "RGB control via OpenRGB" tar ((:url . "https://gitlab.com/cwpitts/rgb.el") (:commit . "4aab5a5be16b69b47ef5e67d02782df5e41dbd7b") (:revdesc . "4aab5a5be16b"))])
  (rhq . [(20230731 1544) ((emacs (24 4))) "Client for rhq" tar ((:url . "https://github.com/ROCKTAKEY/rhq") (:commit . "9f571787bf0781c78c277db82394fb9a692ec21e") (:revdesc . "9f571787bf07") (:keywords "tools" "extensions") (:authors ("ROCKTAKEY" . "rocktakey@gmail.com")) (:maintainers ("ROCKTAKEY" . "rocktakey@gmail.com")) (:maintainer "ROCKTAKEY" . "rocktakey@gmail.com"))])
  (rhtml-mode . [(20130422 1311) nil "Major mode for editing RHTML files" tar ((:url . "https://github.com/eschulte/rhtml") (:commit . "a6d71b38a3db867ccf82999c99805db1a3a33c33") (:revdesc . "a6d71b38a3db"))])
@@ -5030,7 +5030,7 @@
  (spice-mode . [(20220210 1414) ((emacs (24 3))) "Major mode for SPICE" tar ((:url . "https://repo.or.cz/spice-mode.git") (:commit . "f55c2b6dd35caace0ec7250b5c7b5d119235a23d") (:revdesc . "f55c2b6dd35c") (:keywords "spice" "spice2g6" "spice3" "eldo" "hspice" "layla" "mondriaan" "fasthenry" "cdl" "spectre compatibility" "netlist editing") (:authors ("Geert A. M. Van der Plas 1999-" . "geert_vanderplas@email.com") ("Emmanuel Rouat 1997-" . "emmanuel.rouat@wanadoo.fr") ("MIT AI Lab 1994" . "cvieri@ai.mit.edu")) (:maintainers ("Geert A. M. Van der Plas" . "geert_vanderplas@email.com")) (:maintainer "Geert A. M. Van der Plas" . "geert_vanderplas@email.com"))])
  (splitjoin . [(20150505 1432) ((cl-lib (0 5))) "Transition between multiline and single-line code" tar ((:url . "https://github.com/emacsorphanage/splitjoin") (:commit . "39a77f1c6c7406e79095eb0385667097172a770c") (:revdesc . "39a77f1c6c74") (:authors ("Syohei YOSHIDA" . "syohex@gmail.com")) (:maintainers ("Syohei YOSHIDA" . "syohex@gmail.com")) (:maintainer "Syohei YOSHIDA" . "syohex@gmail.com"))])
  (splitter . [(20170809 2208) nil "Manage window splits" tar ((:url . "https://github.com/chumpage/chumpy-windows") (:commit . "6bdb51e9a346907d60a9625f6180bddd06be6674") (:revdesc . "6bdb51e9a346") (:keywords "frames" "convenience"))])
- (splunk-mode . [(20240422 828) ((emacs (27 1))) "Major Mode for editing Splunk SPL source code" tar ((:url . "https://github.com/jakewilliami/splunk-mode") (:commit . "3a9b114fdbabb6e7d6206b1863c54de438bf506b") (:revdesc . "3a9b114fdbab") (:keywords "languages" "splunk" "mode") (:authors ("Jake Ireland" . "jakewilliami@icloud.com")) (:maintainers ("Jake Ireland" . "jakewilliami@icloud.com")) (:maintainer "Jake Ireland" . "jakewilliami@icloud.com"))])
+ (splunk-mode . [(20241002 1040) ((emacs (27 1))) "Major Mode for editing Splunk SPL source code" tar ((:url . "https://github.com/jakewilliami/splunk-mode") (:commit . "bc0ad3ed26e2f6d46c430a3f1ab86c93c4483403") (:revdesc . "bc0ad3ed26e2") (:keywords "languages" "splunk" "mode" "query") (:authors ("Jake Ireland" . "jakewilliami@icloud.com")) (:maintainers ("Jake Ireland" . "jakewilliami@icloud.com")) (:maintainer "Jake Ireland" . "jakewilliami@icloud.com"))])
  (spotify . [(20200615 1418) ((cl-lib (0 5))) "Control the spotify application from emacs" tar ((:url . "https://github.com/remvee/spotify-el") (:commit . "7e28ef0b4519c6a46fce6a89c0ff1ed775eda71a") (:revdesc . "7e28ef0b4519") (:keywords "convenience"))])
  (spotlight . [(20200109 2137) ((emacs (24 1)) (swiper (0 6 0)) (counsel (0 6 0))) "Search files with Mac OS X spotlight" tar ((:url . "https://github.com/benmaughan/spotlight.el") (:commit . "ea71f4fd380c51e50c47bb25855af4f40e4d8da0") (:revdesc . "ea71f4fd380c") (:keywords "search" "external") (:authors ("Ben Maughan" . "benmaughan@gmail.com")) (:maintainers ("Ben Maughan" . "benmaughan@gmail.com")) (:maintainer "Ben Maughan" . "benmaughan@gmail.com"))])
  (spray . [(20160304 2220) nil "A speed reading mode" tar ((:url . "https://git.sr.ht/~iank/spray") (:commit . "69fe48e7bb079e3011476b9f4eb6ac9ae94d6d9b") (:revdesc . "69fe48e7bb07") (:keywords "convenience") (:authors ("Ian Kelling" . "ian@iankelling.org")) (:maintainers ("Ian Kelling" . "ian@iankelling.org")) (:maintainer "Ian Kelling" . "ian@iankelling.org"))])
@@ -5192,7 +5192,7 @@
  (tangotango-theme . [(20220714 2034) nil "Tango Palette color theme for Emacs 24" tar ((:url . "https://github.com/juba/color-theme-tangotango") (:commit . "9036c4978965149ae9837bc0ad691b2ba9269052") (:revdesc . "9036c4978965") (:keywords "tango" "palette" "color" "theme" "emacs") (:authors ("Julien Barnier" . "julien@nozav.org")) (:maintainers ("Julien Barnier" . "julien@nozav.org")) (:maintainer "Julien Barnier" . "julien@nozav.org"))])
  (tao-theme . [(20240615 517) nil "This package provides two parametrized uncoloured color themes for Emacs: tao-yin and tao-yang" tar ((:url . "https://github.com/11111000000/tao-theme-emacs") (:commit . "cd8ac4aee9fff55bc092ce78d93bd40517fa2c2a") (:revdesc . "cd8ac4aee9ff") (:authors ("Peter Kosov" . "11111000000@email.com")) (:maintainers ("Peter Kosov" . "11111000000@email.com")) (:maintainer "Peter Kosov" . "11111000000@email.com"))])
  (tardis-theme . [(20230212 2152) ((emacs (25 1))) "Quantum Country Theme" tar ((:url . "https://github.com/antonhibl/tardis-theme") (:commit . "352b1579d13e99cff9367b08208c1e241d76c89e") (:revdesc . "352b1579d13e") (:keywords "convenience") (:authors ("Anton Hibl" . "antonhibl11@gmail.com")) (:maintainers ("Anton Hibl" . "antonhibl11@gmail.com")) (:maintainer "Anton Hibl" . "antonhibl11@gmail.com"))])
- (taskpaper-mode . [(20240710 1449) ((emacs (25 1))) "Major mode for working with TaskPaper files" tar ((:url . "https://github.com/saf-dmitry/taskpaper-mode") (:commit . "db698431a55bb68b8d756de3be7fe4a235ccf55c") (:revdesc . "db698431a55b") (:keywords "outlines" "notetaking" "task management" "productivity" "taskpaper") (:authors ("Dmitry Safronov" . "saf.dmitry@gmail.com")) (:maintainers ("Dmitry Safronov" . "saf.dmitry@gmail.com")) (:maintainer "Dmitry Safronov" . "saf.dmitry@gmail.com"))])
+ (taskpaper-mode . [(20241002 1219) ((emacs (25 1))) "Major mode for working with TaskPaper files" tar ((:url . "https://github.com/saf-dmitry/taskpaper-mode") (:commit . "e3f3ee512d44caacd4a6c4be9d081b014119e774") (:revdesc . "e3f3ee512d44") (:keywords "outlines" "notetaking" "task management" "productivity" "taskpaper") (:authors ("Dmitry Safronov" . "saf.dmitry@gmail.com")) (:maintainers ("Dmitry Safronov" . "saf.dmitry@gmail.com")) (:maintainer "Dmitry Safronov" . "saf.dmitry@gmail.com"))])
  (taskrunner . [(20190916 1608) ((emacs (25 1)) (projectile (2 0 0)) (async (1 9 3))) "Retrieve build system/taskrunner tasks" tar ((:url . "https://github.com/emacs-taskrunner/emacs-taskrunner") (:commit . "716323aff410b4d864d137c9ebe4bbb5b8587f5e") (:revdesc . "716323aff410") (:keywords "build-system" "taskrunner" "build" "task-runner" "tasks" "convenience") (:authors ("Yavor Konstantinov" . "ykonstantinov1ATgmailDOTcom")) (:maintainers ("Yavor Konstantinov" . "ykonstantinov1ATgmailDOTcom")) (:maintainer "Yavor Konstantinov" . "ykonstantinov1ATgmailDOTcom"))])
  (tawny-mode . [(20231117 1644) ((cider (0 12)) (emacs (25))) "Ontology Editing with Tawny-OWL" tar ((:url . "https://github.com/phillord/tawny-owl") (:commit . "b2708d693400a2010370df040d7571bc30fa4d75") (:revdesc . "b2708d693400") (:authors ("Phillip Lord" . "phillip.lord@newcastle.ac.uk")) (:maintainers ("Phillip Lord" . "phillip.lord@newcastle.ac.uk")) (:maintainer "Phillip Lord" . "phillip.lord@newcastle.ac.uk"))])
  (tblui . [(20231201 1100) ((dash (2 12 1)) (magit-popup (2 6 0)) (tablist (0 70)) (cl-lib (0 5))) "Define tabulated list UI easily" tar ((:url . "https://github.com/Yuki-Inoue/tblui.el") (:commit . "62ab5f62982c061a902fd3e54d94a68a4706572c") (:revdesc . "62ab5f62982c") (:authors ("Yuki Inoue" . "inouetakahiroki_at_gmail.com")) (:maintainers ("Yuki Inoue" . "inouetakahiroki_at_gmail.com")) (:maintainer "Yuki Inoue" . "inouetakahiroki_at_gmail.com"))])
@@ -5276,11 +5276,11 @@
  (timesheet . [(20221004 1702) ((s (1)) (org (9))) "Timesheet management add-on for org-mode" tar ((:url . "https://github.com/tmarble/timesheet.el") (:commit . "511751b239c84d7619ec1c61d7f108b732b64442") (:revdesc . "511751b239c8") (:keywords "org" "timesheet"))])
  (timonier . [(20170411 800) ((emacs (24 4)) (s (1 11 0)) (f (0 19 0)) (dash (2 12 0)) (pkg-info (0 5 0)) (hydra (0 13 6)) (request (0 2 0)) (all-the-icons (2 0 0))) "Manage Kubernetes Applications" tar ((:url . "https://github.com/nlamirault/timonier") (:commit . "3460a878269424c8d19b7d5d8e04749d0a8bf203") (:revdesc . "3460a8782694") (:keywords "kubernetes" "docker") (:authors ("Nicolas Lamirault" . "nicolas.lamirault@gmail.com")) (:maintainers ("Nicolas Lamirault" . "nicolas.lamirault@gmail.com")) (:maintainer "Nicolas Lamirault" . "nicolas.lamirault@gmail.com"))])
  (timp . [(20160618 803) ((emacs (24 4)) (cl-lib (0 5)) (fifo-class (1 0)) (signal (1 0))) "Multithreading library" tar ((:url . "https://github.com/mola-T/timp") (:commit . "59657bf603904635d88c3fe4ff1ce45ee6572428") (:revdesc . "59657bf60390") (:keywords "internal" "lisp" "processes" "tools") (:authors ("Mola-T" . "Mola@molamola.xyz")) (:maintainers ("Mola-T" . "Mola@molamola.xyz")) (:maintainer "Mola-T" . "Mola@molamola.xyz"))])
- (timu-caribbean-theme . [(20240224 2028) ((emacs (27 1))) "Color theme with cyan as a dominant color" tar ((:url . "https://gitlab.com/aimebertrand/timu-caribbean-theme") (:commit . "ec83fc030ad7c098637df6f3a56d844f8526c571") (:revdesc . "ec83fc030ad7") (:keywords "faces" "themes") (:authors ("Aimé Bertrand" . "aime.bertrand@macowners.club")) (:maintainers ("Aimé Bertrand" . "aime.bertrand@macowners.club")) (:maintainer "Aimé Bertrand" . "aime.bertrand@macowners.club"))])
+ (timu-caribbean-theme . [(20240227 2103) ((emacs (27 1))) "Color theme with cyan as a dominant color" tar ((:url . "https://gitlab.com/aimebertrand/timu-caribbean-theme") (:commit . "9c6ea9dd33dffd939a8f4a67097329d72c381b11") (:revdesc . "9c6ea9dd33df") (:keywords "faces" "themes") (:authors ("Aimé Bertrand" . "aime.bertrand@macowners.club")) (:maintainers ("Aimé Bertrand" . "aime.bertrand@macowners.club")) (:maintainer "Aimé Bertrand" . "aime.bertrand@macowners.club"))])
  (timu-line . [(20240405 2022) ((emacs (28 1))) "Custom and simple mode line" tar ((:url . "https://gitlab.com/aimebertrand/timu-line") (:commit . "3957234a4a7618376dc9ef40272f6aeabdf48843") (:revdesc . "3957234a4a76") (:keywords "modeline" "frames" "ui") (:authors ("Aimé Bertrand" . "aime.bertrand@macowners.club")) (:maintainers ("Aimé Bertrand" . "aime.bertrand@macowners.club")) (:maintainer "Aimé Bertrand" . "aime.bertrand@macowners.club"))])
- (timu-macos-theme . [(20240401 1346) ((emacs (27 1))) "Color theme inspired by the macOS UI" tar ((:url . "https://gitlab.com/aimebertrand/timu-macos-theme") (:commit . "7734bd7287fa18cad8c146beabd52b52444e9da3") (:revdesc . "7734bd7287fa") (:keywords "faces" "themes") (:authors ("Aimé Bertrand" . "aime.bertrand@macowners.club")) (:maintainers ("Aimé Bertrand" . "aime.bertrand@macowners.club")) (:maintainer "Aimé Bertrand" . "aime.bertrand@macowners.club"))])
- (timu-rouge-theme . [(20240224 2040) ((emacs (27 1))) "Color theme inspired by the Rouge Theme for VSCode" tar ((:url . "https://gitlab.com/aimebertrand/timu-rouge-theme") (:commit . "2095a2bedb2682145407e149d1c2b1c0aa02a6f8") (:revdesc . "2095a2bedb26") (:keywords "faces" "themes") (:authors ("Aimé Bertrand" . "aime.bertrand@macowners.club")) (:maintainers ("Aimé Bertrand" . "aime.bertrand@macowners.club")) (:maintainer "Aimé Bertrand" . "aime.bertrand@macowners.club"))])
- (timu-spacegrey-theme . [(20240224 2010) ((emacs (26 1))) "Color theme inspired by the Spacegray theme in Sublime Text" tar ((:url . "https://gitlab.com/aimebertrand/timu-spacegrey-theme") (:commit . "1cca501c9640a9f1d6bf717dc36df96d35deeeba") (:revdesc . "1cca501c9640") (:keywords "faces" "themes") (:authors ("Aimé Bertrand" . "aime.bertrand@macowners.club")) (:maintainers ("Aimé Bertrand" . "aime.bertrand@macowners.club")) (:maintainer "Aimé Bertrand" . "aime.bertrand@macowners.club"))])
+ (timu-macos-theme . [(20240404 1614) ((emacs (27 1))) "Color theme inspired by the macOS UI" tar ((:url . "https://gitlab.com/aimebertrand/timu-macos-theme") (:commit . "ed50e3b01f832f60aa183643c8223ce9787c729f") (:revdesc . "ed50e3b01f83") (:keywords "faces" "themes") (:authors ("Aimé Bertrand" . "aime.bertrand@macowners.club")) (:maintainers ("Aimé Bertrand" . "aime.bertrand@macowners.club")) (:maintainer "Aimé Bertrand" . "aime.bertrand@macowners.club"))])
+ (timu-rouge-theme . [(20241002 1205) ((emacs (27 1))) "Color theme inspired by the Rouge Theme for VSCode" tar ((:url . "https://gitlab.com/aimebertrand/timu-rouge-theme") (:commit . "5ad5e1c35ef9228938598aac7b0f3aef51c9d257") (:revdesc . "5ad5e1c35ef9") (:keywords "faces" "themes") (:authors ("Aimé Bertrand" . "aime.bertrand@macowners.club")) (:maintainers ("Aimé Bertrand" . "aime.bertrand@macowners.club")) (:maintainer "Aimé Bertrand" . "aime.bertrand@macowners.club"))])
+ (timu-spacegrey-theme . [(20241002 1256) ((emacs (26 1))) "Color theme inspired by the Spacegray theme in Sublime Text" tar ((:url . "https://gitlab.com/aimebertrand/timu-spacegrey-theme") (:commit . "720168572c48ec0c527db89c7bf2699b5f87d477") (:revdesc . "720168572c48") (:keywords "faces" "themes") (:authors ("Aimé Bertrand" . "aime.bertrand@macowners.club")) (:maintainers ("Aimé Bertrand" . "aime.bertrand@macowners.club")) (:maintainer "Aimé Bertrand" . "aime.bertrand@macowners.club"))])
  (tinkerer . [(20200914 1756) ((s (1 2 0))) "Elisp wrapper for Tinkerer Blogging Engine" tar ((:url . "https://github.com/yyr/tinkerer.el") (:commit . "7cedeb264a44cd62bcd9c778dca52316d09e07e5") (:revdesc . "7cedeb264a44") (:keywords "tinkerer" "blog" "wrapper") (:authors ("Yagnesh Raghava Yakkala" . "hi@yagnesh.org")) (:maintainers ("Yagnesh Raghava Yakkala" . "hi@yagnesh.org")) (:maintainer "Yagnesh Raghava Yakkala" . "hi@yagnesh.org"))])
  (tiny . [(20220910 1929) nil "Quickly generate linear ranges in Emacs" tar ((:url . "https://github.com/abo-abo/tiny") (:commit . "c107480fca7e42737c51b2afaa33ac31e92a7290") (:revdesc . "c107480fca7e") (:keywords "convenience") (:authors ("Oleh Krehel" . "ohwoeowho@gmail.com")) (:maintainers ("Oleh Krehel" . "ohwoeowho@gmail.com")) (:maintainer "Oleh Krehel" . "ohwoeowho@gmail.com"))])
  (tiny-menu . [(20220725 1748) ((emacs (24 4))) "Display tiny menus" tar ((:url . "https://github.com/aaronbieber/tiny-menu.el") (:commit . "17eacfd1d44cd4d5482d32eac63229230c3cd3fc") (:revdesc . "17eacfd1d44c") (:keywords "menu" "tools") (:authors ("Aaron Bieber" . "aaron@aaronbieber.com")) (:maintainers ("Aaron Bieber" . "aaron@aaronbieber.com")) (:maintainer "Aaron Bieber" . "aaron@aaronbieber.com"))])
@@ -5332,7 +5332,7 @@
  (tramp-term . [(20220725 1441) nil "Automatic setup of directory tracking in ssh sessions" tar ((:url . "https://github.com/cuspymd/tramp-term.el") (:commit . "ed75189122737d301f716a30a8013205aa3736f1") (:revdesc . "ed7518912273") (:keywords "comm" "terminals") (:authors ("Randy Morris" . "randy.morris@archlinux.us")) (:maintainers ("Randy Morris" . "randy.morris@archlinux.us")) (:maintainer "Randy Morris" . "randy.morris@archlinux.us"))])
  (transducers . [(20240308 843) ((emacs (28 1))) "Ergonomic, efficient data processing" tar ((:url . "https://github.com/fosskers/transducers.el") (:commit . "2d452e4cdc3b5cfa29ee3d7a645ff53d4e993384") (:revdesc . "2d452e4cdc3b") (:keywords "lisp") (:authors ("Colin Woodbury" . "colin@fosskers.ca")) (:maintainers ("Colin Woodbury" . "colin@fosskers.ca")) (:maintainer "Colin Woodbury" . "colin@fosskers.ca"))])
  (transfer-sh . [(20200601 1708) ((emacs (24 3)) (async (1 0))) "Simple interface for sending buffer contents to transfer.sh" tar ((:url . "https://gitlab.com/tuedachu/transfer-sh.el") (:commit . "0621a66d00ec91a209a542c10b158095088bd44d") (:revdesc . "0621a66d00ec") (:keywords "comm" "convenience" "files"))])
- (transient . [(20240929 1847) ((emacs (26 1)) (compat (30 0 0 0)) (seq (2 24))) "Transient commands" tar ((:url . "https://github.com/magit/transient") (:commit . "5fcd713873001724c8b21d3689c77cb7a6dc9cd7") (:revdesc . "5fcd71387300") (:keywords "extensions") (:authors ("Jonas Bernoulli" . "emacs.transient@jonas.bernoulli.dev")) (:maintainers ("Jonas Bernoulli" . "emacs.transient@jonas.bernoulli.dev")) (:maintainer "Jonas Bernoulli" . "emacs.transient@jonas.bernoulli.dev"))])
+ (transient . [(20241001 1031) ((emacs (26 1)) (compat (30 0 0 0)) (seq (2 24))) "Transient commands" tar ((:url . "https://github.com/magit/transient") (:commit . "c06015cd6750f8625081f4184c68c94350eb0217") (:revdesc . "c06015cd6750") (:keywords "extensions") (:authors ("Jonas Bernoulli" . "emacs.transient@jonas.bernoulli.dev")) (:maintainers ("Jonas Bernoulli" . "emacs.transient@jonas.bernoulli.dev")) (:maintainer "Jonas Bernoulli" . "emacs.transient@jonas.bernoulli.dev"))])
  (transient-dwim . [(20221225 1630) ((emacs (26 1)) (transient (0 1))) "Useful preset transient commands" tar ((:url . "https://github.com/conao3/transient-dwim.el") (:commit . "cb5e0d35729fc6448553b7a17fc5c843f00e8c1d") (:revdesc . "cb5e0d35729f") (:keywords "tools") (:authors ("Naoya Yamashita" . "conao3@gmail.com")) (:maintainers ("Naoya Yamashita" . "conao3@gmail.com")) (:maintainer "Naoya Yamashita" . "conao3@gmail.com"))])
  (transient-extras . [(20230721 839) ((emacs (28 1))) "Extra features for transient" tar ((:url . "https://github.com/haji-ali/transient-extras") (:commit . "ca0d5c597382615f0ee8300ff8718f54f8214359") (:revdesc . "ca0d5c597382") (:keywords "convenience") (:authors ("Al Haji-Ali" . "abdo.haji.ali@gmail.com") ("Samuel W. Flint" . "swflint@flintfam.org")) (:maintainers ("Al Haji-Ali" . "abdo.haji.ali@gmail.com") ("Samuel W. Flint" . "swflint@flintfam.org")) (:maintainer "Al Haji-Ali" . "abdo.haji.ali@gmail.com"))])
  (transient-extras-a2ps . [(20230303 1511) ((emacs (28 1)) (transient-extras (1 0 0))) "A transient interface to a2ps" tar ((:url . "https://github.com/haji-ali/transient-extras") (:commit . "e91a1cddb1f0cb8b99d2bd30db64d467e5fa7ea8") (:revdesc . "e91a1cddb1f0") (:keywords "convenience") (:authors ("Samuel W. Flint" . "swflint@flintfam.org")) (:maintainers ("Samuel W. Flint" . "swflint@flintfam.org")) (:maintainer "Samuel W. Flint" . "swflint@flintfam.org"))])
@@ -5352,7 +5352,7 @@
  (tree-sitter-ess-r . [(20221012 855) ((emacs (26 1)) (ess (18 10 1)) (tree-sitter (0 12 1)) (tree-sitter-langs (0 12 0))) "R with tree-sitter" tar ((:url . "https://github.com/ShuguangSun/tree-sitter-ess-r") (:commit . "9669c00f3d3463e6769725af74c392891e269eed") (:revdesc . "9669c00f3d34") (:keywords "tools") (:authors ("Shuguang Sun" . "shuguang79@qq.com")) (:maintainers ("Shuguang Sun" . "shuguang79@qq.com")) (:maintainer "Shuguang Sun" . "shuguang79@qq.com"))])
  (tree-sitter-indent . [(20220411 1439) ((emacs (26 1)) (tree-sitter (0 12 1)) (seq (2 20))) "Provide indentation with a Tree-sitter backend" tar ((:url . "https://codeberg.org/FelipeLema/tree-sitter-indent.el") (:commit . "4ef246db3e4ff99f672fe5e4b416c890f885c09e") (:revdesc . "4ef246db3e4f") (:keywords "convenience" "internal") (:authors ("Felipe Lema" . "felipelema@mortemale.org")) (:maintainers ("Felipe Lema" . "felipelema@mortemale.org")) (:maintainer "Felipe Lema" . "felipelema@mortemale.org"))])
  (tree-sitter-ispell . [(20240610 2252) ((emacs (26 1)) (tree-sitter (0 15 0))) "Run ispell on tree-sitter text nodes" tar ((:url . "https://github.com/erickgnavar/tree-sitter-ispell.el") (:commit . "a06eff00affff85992d2a8ad0019034747ffeb70") (:revdesc . "a06eff00afff") (:authors ("Erick Navarro" . "erick@navarro.io")) (:maintainers ("Erick Navarro" . "erick@navarro.io")) (:maintainer "Erick Navarro" . "erick@navarro.io"))])
- (tree-sitter-langs . [(20240930 1727) ((emacs (25 1)) (tree-sitter (0 15 0))) "Grammar bundle for tree-sitter" tar ((:url . "https://github.com/emacs-tree-sitter/tree-sitter-langs") (:commit . "45bafd30ab00a8bb8bcd8b34a6490d73cca8e4b2") (:revdesc . "45bafd30ab00") (:keywords "languages" "tools" "parsers" "tree-sitter") (:authors ("Tuấn-Anh Nguyễn" . "ubolonton@gmail.com")) (:maintainers ("Tuấn-Anh Nguyễn" . "ubolonton@gmail.com")) (:maintainer "Tuấn-Anh Nguyễn" . "ubolonton@gmail.com"))])
+ (tree-sitter-langs . [(20241002 346) ((emacs (25 1)) (tree-sitter (0 15 0))) "Grammar bundle for tree-sitter" tar ((:url . "https://github.com/emacs-tree-sitter/tree-sitter-langs") (:commit . "c1b972988706bdc7159bca5239239cf44ea54927") (:revdesc . "c1b972988706") (:keywords "languages" "tools" "parsers" "tree-sitter") (:authors ("Tuấn-Anh Nguyễn" . "ubolonton@gmail.com")) (:maintainers ("Tuấn-Anh Nguyễn" . "ubolonton@gmail.com")) (:maintainer "Tuấn-Anh Nguyễn" . "ubolonton@gmail.com"))])
  (treebundel . [(20240531 2321) ((emacs (27 1)) (compat (29 1 4 2))) "Bundle related git-worktrees together" tar ((:url . "https://github.com/purplg/treebundel") (:commit . "b0a5d1bf924d8cadde5bae50b8d9ac131279b828") (:revdesc . "b0a5d1bf924d") (:keywords "convenience" "vc"))])
  (treefactor . [(20200516 1631) ((emacs (26 1)) (dash (2 16 0)) (f (0 20 0)) (org (9 2 6)) (avy (0 5 0))) "Restructure your messy Org documents" tar ((:url . "https://github.com/cyberthal/treefactor") (:commit . "75357757022a4399ab772ff0d92065bd114dabe9") (:revdesc . "75357757022a") (:keywords "outlines" "files" "convenience") (:authors ("Leo Littlebook" . "Leo.Littlebook@gmail.com")) (:maintainers ("Leo Littlebook" . "Leo.Littlebook@gmail.com")) (:maintainer "Leo Littlebook" . "Leo.Littlebook@gmail.com"))])
  (treemacs . [(20240815 1227) ((emacs (26 1)) (cl-lib (0 5)) (dash (2 11 0)) (s (1 12 0)) (ace-window (0 9 0)) (pfuture (1 7)) (hydra (0 13 2)) (ht (2 2)) (cfrs (1 3 2))) "A tree style file explorer package" tar ((:url . "https://github.com/Alexander-Miller/treemacs") (:commit . "488dfc0a3aa7c1d35802d4f89be058e761578663") (:revdesc . "488dfc0a3aa7") (:authors ("Alexander Miller" . "alexanderm@web.de")) (:maintainers ("Alexander Miller" . "alexanderm@web.de")) (:maintainer "Alexander Miller" . "alexanderm@web.de"))])
@@ -5605,7 +5605,7 @@
  (weblio . [(20240514 1005) ((request (0 3 3)) (emacs (25 1))) "Look up Japanese words on Weblio.jp" tar ((:url . "https://github.com/pzel/weblio") (:commit . "952d085fd814b139562ef947c7dcabc31f92341d") (:revdesc . "952d085fd814") (:keywords "langauges" "i18n"))])
  (weblogger . [(20110926 1618) ((xml-rpc (1 6 8))) "Weblog maintenance via XML-RPC APIs" tar ((:url . "https://github.com/hexmode/weblogger-el") (:commit . "40cfbfc69be6a619173804441db2f407e3fa1731") (:revdesc . "40cfbfc69be6") (:keywords "weblog" "blogger" "cms" "movable" "type" "openweblog" "blog"))])
  (weblorg . [(20240711 940) ((templatel (0 1 6)) (emacs (26 1))) "Static Site Generator for org-mode" tar ((:url . "https://github.com/emacs-love/weblorg") (:commit . "0db218bd6b2e083546d3a69a022dfb1a08900acd") (:revdesc . "0db218bd6b2e") (:authors ("Lincoln Clarete" . "lincoln@clarete.li")) (:maintainers ("Lincoln Clarete" . "lincoln@clarete.li")) (:maintainer "Lincoln Clarete" . "lincoln@clarete.li"))])
- (webpaste . [(20220524 1745) ((emacs (24 4)) (request (0 2 0)) (cl-lib (0 5))) "Paste to pastebin-like services" tar ((:url . "https://github.com/etu/webpaste.el") (:commit . "d96da58fe42988d5c433c71ee9f8e6fb75d595a9") (:revdesc . "d96da58fe429") (:keywords "convenience" "comm" "paste") (:authors ("Elis etu Hirwing" . "elis@hirwing.se")) (:maintainers ("Elis etu Hirwing" . "elis@hirwing.se")) (:maintainer "Elis etu Hirwing" . "elis@hirwing.se"))])
+ (webpaste . [(20241002 536) ((emacs (24 4)) (request (0 2 0)) (cl-lib (0 5))) "Paste to pastebin-like services" tar ((:url . "https://github.com/etu/webpaste.el") (:commit . "5653e0994a10536db13b142b074e45894959d134") (:revdesc . "5653e0994a10") (:keywords "convenience" "comm" "paste") (:authors ("Elis etu Hirwing" . "elis@hirwing.se")) (:maintainers ("Elis etu Hirwing" . "elis@hirwing.se")) (:maintainer "Elis etu Hirwing" . "elis@hirwing.se"))])
  (websearch . [(20230705 1639) ((emacs (24 4))) "Query search engines" tar ((:url . "https://gitlab.com/xgqt/emacs-websearch") (:commit . "5120cec3c36ddcdaceb5235c0b52eecbc3b37fcb") (:revdesc . "5120cec3c36d") (:keywords "convenience" "hypermedia") (:authors ("Maciej Barć" . "xgqt@riseup.net")) (:maintainers ("Maciej Barć" . "xgqt@riseup.net")) (:maintainer "Maciej Barć" . "xgqt@riseup.net"))])
  (websocket . [(20230809 305) ((cl-lib (0 5))) "Emacs WebSocket client and server" tar ((:url . "https://github.com/ahyatt/emacs-websocket") (:commit . "40c208eaab99999d7c1e4bea883648da24c03be3") (:revdesc . "40c208eaab99") (:keywords "communication" "websocket" "server") (:authors ("Andrew Hyatt" . "ahyatt@gmail.com")) (:maintainers ("Andrew Hyatt" . "ahyatt@gmail.com")) (:maintainer "Andrew Hyatt" . "ahyatt@gmail.com"))])
  (wedge-ws . [(20140714 2149) nil "Wedge whitespace between columns in text" tar ((:url . "https://github.com/aes/wedge-ws") (:commit . "4669115f02d9c6fee067cc5369bb38c0f9db88b2") (:revdesc . "4669115f02d9") (:keywords "formatting" "indentation") (:authors ("Anders Eurenius" . "aes@spotify.com")) (:maintainers ("Anders Eurenius" . "aes@spotify.com")) (:maintainer "Anders Eurenius" . "aes@spotify.com"))])
@@ -5739,7 +5739,7 @@
  (yalinum . [(20130217 1043) nil "Yet another display line numbers" tar ((:url . "https://github.com/tm8st/emacs-yalinum") (:commit . "d3e0cbe3f4f5ca311e3298e684901d6fea3ad973") (:revdesc . "d3e0cbe3f4f5") (:keywords "convenience" "tools") (:authors ("tm8st" . "tm8st@hotmail.co.jp")) (:maintainers ("tm8st" . "tm8st@hotmail.co.jp")) (:maintainer "tm8st" . "tm8st@hotmail.co.jp"))])
  (yaml . [(20231211 1501) ((emacs (25 1))) "YAML parser for Elisp" tar ((:url . "https://github.com/zkry/yaml.el") (:commit . "70c4fcead97e9bd6594e418c922ae769818f4245") (:revdesc . "70c4fcead97e") (:keywords "tools") (:authors ("Zachary Romero" . "zkry@posteo.org")) (:maintainers ("Zachary Romero" . "zkry@posteo.org")) (:maintainer "Zachary Romero" . "zkry@posteo.org"))])
  (yaml-imenu . [(20220406 1703) ((emacs (24 4)) (yaml-mode (0))) "Enhancement of the imenu support in yaml-mode" tar ((:url . "https://github.com/knu/yaml-imenu.el") (:commit . "c1fbba8b03a7bef4fc2b87404914fa9c6eb67b55") (:revdesc . "c1fbba8b03a7") (:keywords "outlining" "convenience" "imenu") (:authors ("Akinori MUSHA" . "knu@iDaemons.org")) (:maintainers ("Akinori MUSHA" . "knu@iDaemons.org")) (:maintainer "Akinori MUSHA" . "knu@iDaemons.org"))])
- (yaml-mode . [(20240317 1602) ((emacs (24 1))) "Major mode for editing YAML files" tar ((:url . "https://github.com/yoshiki/yaml-mode") (:commit . "7b5ce294fb15c2c8926fa476d7218aa415550a2a") (:revdesc . "7b5ce294fb15") (:keywords "data" "yaml") (:authors ("Yoshiki Kurihara" . "clouder@gmail.com") ("Marshall T. Vandegrift" . "llasram@gmail.com")) (:maintainers ("Vasilij Schneidermann" . "mail@vasilij.de")) (:maintainer "Vasilij Schneidermann" . "mail@vasilij.de"))])
+ (yaml-mode . [(20241003 153) ((emacs (24 1))) "Major mode for editing YAML files" tar ((:url . "https://github.com/yoshiki/yaml-mode") (:commit . "d91f878729312a6beed77e6637c60497c5786efa") (:revdesc . "d91f87872931") (:keywords "data" "yaml") (:authors ("Yoshiki Kurihara" . "clouder@gmail.com") ("Marshall T. Vandegrift" . "llasram@gmail.com")) (:maintainers ("Vasilij Schneidermann" . "mail@vasilij.de")) (:maintainer "Vasilij Schneidermann" . "mail@vasilij.de"))])
  (yaml-pro . [(20240623 1904) ((emacs (26 1)) (yaml (0 5 1))) "Parser-aided YAML editing features" tar ((:url . "https://github.com/zkry/yaml-pro") (:commit . "5f06949e92dc19dcc48dc31662b2aa958fe33726") (:revdesc . "5f06949e92dc") (:keywords "tools"))])
  (yaml-tomato . [(20151123 753) ((s (1 9))) "Copy or show the yaml path currently under cursor" tar ((:url . "https://github.com/RadekMolenda/yaml-tomato") (:commit . "1272c502fac6ce6b0f8b7f8a9beb353f0b35e13c") (:revdesc . "1272c502fac6") (:keywords "yaml"))])
  (yang-mode . [(20190507 724) nil "Major mode for editing YANG files" tar ((:url . "https://github.com/mbj4668/yang-mode") (:commit . "4b4ab4d4a79d37d6c31c6ea7cccbc425e0b1eded") (:revdesc . "4b4ab4d4a79d") (:authors ("Martin Bjorklund" . "mbj4668@gmail.com")) (:maintainers ("Martin Bjorklund" . "mbj4668@gmail.com")) (:maintainer "Martin Bjorklund" . "mbj4668@gmail.com"))])
diff --git a/emacs/elpa/archives/nongnu/archive-contents b/emacs/elpa/archives/nongnu/archive-contents
@@ -1498,7 +1498,7 @@
 	       ("Jon Oddie" . "j.j.oddie@gmail.com"))
 	      (:commit . "31d4adcca4f08cfd7a45f85e691aaa7a9316b355"))])
  (magit .
-	[(4 1 0)
+	[(4 1 1)
 	 ((emacs
 	   (26 1))
 	  (compat
@@ -1506,11 +1506,11 @@
 	  (dash
 	   (2 19 1))
 	  (magit-section
-	   (4 1 0))
+	   (4 1 1))
 	  (seq
 	   (2 24))
 	  (transient
-	   (0 7 5))
+	   (0 7 6))
 	  (with-editor
 	   (3 4 2)))
 	 "A Git porcelain inside Emacs" tar
@@ -1522,9 +1522,9 @@
 	  (:authors
 	   ("Marius Vollmer" . "marius.vollmer@gmail.com")
 	   ("Jonas Bernoulli" . "emacs.magit@jonas.bernoulli.dev"))
-	  (:commit . "0aa26864e3fc4e6949711a4821caf6819e7ab171"))])
+	  (:commit . "93e86ceca7bf5b0ff9023d7f138e5f06990fc276"))])
  (magit-section .
-		[(4 1 0)
+		[(4 1 1)
 		 ((emacs
 		   (26 1))
 		  (compat
@@ -1539,7 +1539,7 @@
 		  (:maintainer "Jonas Bernoulli" . "emacs.magit@jonas.bernoulli.dev")
 		  (:authors
 		   ("Jonas Bernoulli" . "emacs.magit@jonas.bernoulli.dev"))
-		  (:commit . "0aa26864e3fc4e6949711a4821caf6819e7ab171"))])
+		  (:commit . "93e86ceca7bf5b0ff9023d7f138e5f06990fc276"))])
  (markdown-mode .
 		[(2 6)
 		 ((emacs
@@ -1761,14 +1761,14 @@
 	       ((:url . "http://github.com/bastibe/org-journal")
 		(:commit . "18df4d5ae5e15580df42562c143d007c6d28d75f"))])
  (org-mime .
-	   [(0 3 3)
+	   [(0 3 4)
 	    ((emacs
 	      (27 1)))
 	    "org html export for text/html MIME emails" tar
 	    ((:url . "http://github.com/org-mime/org-mime")
 	     (:keywords "mime" "mail" "email" "html")
 	     (:maintainer "Chen Bin" . "chenbin.sh@gmail.com")
-	     (:commit . "468604b8404d3c7d6148be83a4cf308ee95d2cfb"))])
+	     (:commit . "90aa9081ec00a1705552434cb45ff223aa9f8711"))])
  (org-present .
 	      [(0 1)
 	       ((org
@@ -2013,7 +2013,7 @@
 	       ("David Christiansen" . "david@davidchristiansen.dk"))
 	      (:commit . "1edda80e2e32b72e77f4f16ae5b83c312c68ee95"))])
  (racket-mode .
-	      [(1 0 20240929 145735)
+	      [(1 0 20241001 105847)
 	       ((emacs
 		 (25 1)))
 	       "Racket editing, REPL, and more" tar
diff --git a/emacs/elpa/archives/nongnu/archive-contents.signed b/emacs/elpa/archives/nongnu/archive-contents.signed
@@ -1 +1 @@
-Good signature from 645357D2883A0966 GNU ELPA Signing Agent (2023) <elpasign@elpa.gnu.org> (trust undefined) created at 2024-09-30T21:10:05+0000 using EDDSA
-\ No newline at end of file
+Good signature from 645357D2883A0966 GNU ELPA Signing Agent (2023) <elpasign@elpa.gnu.org> (trust undefined) created at 2024-10-03T09:05:04+0000 using EDDSA
+\ No newline at end of file
diff --git a/emacs/elpa/consult-20240930.1012/consult-pkg.el b/emacs/elpa/consult-20240930.1012/consult-pkg.el
@@ -1,10 +0,0 @@
-;; -*- no-byte-compile: t; lexical-binding: nil -*-
-(define-package "consult" "20240930.1012"
-  "Consulting completing-read."
-  '((emacs  "28.1")
-    (compat "30"))
-  :url "https://github.com/minad/consult"
-  :commit "5a02663b46f3ecc3d2f853c2c73923e35a288925"
-  :revdesc "5a02663b46f3"
-  :keywords '("matching" "files" "completion")
-  :maintainers '(("Daniel Mendler" . "mail@daniel-mendler.de")))
diff --git a/emacs/elpa/consult-20240930.1012/consult.el b/emacs/elpa/consult-20240930.1012/consult.el
@@ -1,5246 +0,0 @@
-;;; consult.el --- Consulting completing-read -*- lexical-binding: t -*-
-
-;; Copyright (C) 2021-2024 Free Software Foundation, Inc.
-
-;; Author: Daniel Mendler and Consult contributors
-;; Maintainer: Daniel Mendler <mail@daniel-mendler.de>
-;; Created: 2020
-;; Package-Version: 20240930.1012
-;; Package-Revision: 5a02663b46f3
-;; Package-Requires: ((emacs "28.1") (compat "30"))
-;; URL: https://github.com/minad/consult
-;; Keywords: matching, files, completion
-
-;; This file is part of GNU Emacs.
-
-;; This program is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; Consult implements a set of `consult-<thing>' commands, which aim to
-;; improve the way you use Emacs.  The commands are founded on
-;; `completing-read', which selects from a list of candidate strings.
-;; Consult provides an enhanced buffer switcher `consult-buffer' and
-;; search and navigation commands like `consult-imenu' and
-;; `consult-line'.  Searching through multiple files is supported by the
-;; asynchronous `consult-grep' command.  Many Consult commands support
-;; previewing candidates.  If a candidate is selected in the completion
-;; view, the buffer shows the candidate immediately.
-
-;; The Consult commands are compatible with multiple completion systems
-;; based on the Emacs `completing-read' API, including the default
-;; completion system, Vertico, Mct and Icomplete.
-
-;; See the README for an overview of the available Consult commands and
-;; the documentation of the configuration and installation of the
-;; package.
-
-;; The full list of contributors can be found in the acknowledgments
-;; section of the README.
-
-;;; Code:
-
-(eval-when-compile
-  (require 'cl-lib)
-  (require 'subr-x))
-(require 'compat)
-(require 'bookmark)
-
-(defgroup consult nil
-  "Consulting `completing-read'."
-  :link '(info-link :tag "Info Manual" "(consult)")
-  :link '(url-link :tag "Website" "https://github.com/minad/consult")
-  :link '(emacs-library-link :tag "Library Source" "consult.el")
-  :group 'files
-  :group 'outlines
-  :group 'minibuffer
-  :prefix "consult-")
-
-;;;; Customization
-
-(defcustom consult-narrow-key nil
-  "Prefix key for narrowing during completion.
-
-Good choices for this key are \"<\" and \"C-+\" for example. The
-key must be a string accepted by `key-valid-p'."
-  :type '(choice key (const :tag "None" nil)))
-
-(defcustom consult-widen-key nil
-  "Key used for widening during completion.
-
-If this key is unset, defaults to twice the `consult-narrow-key'.
-The key must be a string accepted by `key-valid-p'."
-  :type '(choice key (const :tag "None" nil)))
-
-(defcustom consult-project-function
-  #'consult--default-project-function
-  "Function which returns project root directory.
-The function takes one boolean argument MAY-PROMPT.  If
-MAY-PROMPT is non-nil, the function may ask the prompt the user
-for a project directory.  The root directory is used by
-`consult-buffer' and `consult-grep'."
-  :type `(choice
-          (const :tag "Default project function" ,#'consult--default-project-function)
-          (function :tag "Custom function")
-          (const :tag "No project integration" nil)))
-
-(defcustom consult-async-refresh-delay 0.2
-  "Refreshing delay of the completion UI for asynchronous commands.
-
-The completion UI is only updated every
-`consult-async-refresh-delay' seconds.  This applies to
-asynchronous commands like for example `consult-grep'."
-  :type '(float :tag "Delay in seconds"))
-
-(defcustom consult-async-input-throttle 0.5
-  "Input throttle for asynchronous commands.
-
-The asynchronous process is started only every
-`consult-async-input-throttle' seconds.  This applies to asynchronous
-commands, e.g., `consult-grep'."
-  :type '(float :tag "Delay in seconds"))
-
-(defcustom consult-async-input-debounce 0.2
-  "Input debounce for asynchronous commands.
-
-The asynchronous process is started only when there has not been new
-input for `consult-async-input-debounce' seconds.  This applies to
-asynchronous commands, e.g., `consult-grep'."
-  :type '(float :tag "Delay in seconds"))
-
-(defcustom consult-async-min-input 3
-  "Minimum number of characters needed, before asynchronous process is called.
-
-This applies to asynchronous commands, e.g., `consult-grep'."
-  :type '(natnum :tag "Number of characters"))
-
-(defcustom consult-async-split-style 'perl
-  "Async splitting style, see `consult-async-split-styles-alist'."
-  :type '(choice (const :tag "No splitting" nil)
-                 (const :tag "Comma" comma)
-                 (const :tag "Semicolon" semicolon)
-                 (const :tag "Perl" perl)))
-
-(defcustom consult-async-split-styles-alist
-  `((nil :function ,#'consult--split-nil)
-    (comma :separator ?, :function ,#'consult--split-separator)
-    (semicolon :separator ?\; :function ,#'consult--split-separator)
-    (perl :initial "#" :function ,#'consult--split-perl))
-  "Async splitting styles."
-  :type '(alist :key-type symbol :value-type plist))
-
-(defcustom consult-mode-histories
-  '((eshell-mode eshell-history-ring eshell-history-index    eshell-bol)
-    (comint-mode comint-input-ring   comint-input-ring-index comint-bol)
-    (term-mode   term-input-ring     term-input-ring-index   term-bol))
-  "Alist of mode histories (mode history index bol).
-The histories can be rings or lists.  Index, if provided, is a
-variable to set to the index of the selection within the ring or
-list.  Bol, if provided is a function which jumps to the beginning
-of the line after the prompt."
-  :type '(alist :key-type symbol
-                :value-type (group :tag "Include Index"
-                                   (symbol :tag "List/Ring")
-                                   (symbol :tag "Index Variable")
-                                   (symbol :tag "Bol Function"))))
-
-(defcustom consult-themes nil
-  "List of themes (symbols or regexps) to be presented for selection.
-nil shows all `custom-available-themes'."
-  :type '(repeat (choice symbol regexp)))
-
-(defcustom consult-after-jump-hook (list #'recenter)
-  "Function called after jumping to a location.
-
-Commonly used functions for this hook are `recenter' and
-`reposition-window'.  You may want to add a function which pulses the
-current line, e.g., `pulse-momentary-highlight-one-line'.  The hook
-called during preview and for the jump after selection."
-  :type 'hook)
-
-(defcustom consult-line-start-from-top nil
-  "Start search from the top if non-nil.
-Otherwise start the search at the current line and wrap around."
-  :type 'boolean)
-
-(defcustom consult-point-placement 'match-beginning
-  "Where to leave point when jumping to a match.
-This setting affects the command `consult-line' and the `consult-grep' variants."
-  :type '(choice (const :tag "Beginning of the line" line-beginning)
-                 (const :tag "Beginning of the match" match-beginning)
-                 (const :tag "End of the match" match-end)))
-
-(defcustom consult-line-numbers-widen t
-  "Show absolute line numbers when narrowing is active.
-
-See also `display-line-numbers-widen'."
-  :type 'boolean)
-
-(defcustom consult-goto-line-numbers t
-  "Show line numbers for `consult-goto-line'."
-  :type 'boolean)
-
-(defcustom consult-fontify-preserve t
-  "Preserve fontification for line-based commands."
-  :type 'boolean)
-
-(defcustom consult-fontify-max-size 1048576
-  "Buffers larger than this byte limit are not fontified.
-
-This is necessary in order to prevent a large startup time
-for navigation commands like `consult-line'."
-  :type '(natnum :tag "Buffer size in bytes"))
-
-(defcustom consult-buffer-filter
-  '("\\` "
-    "\\`\\*Completions\\*\\'"
-    "\\`\\*Flymake log\\*\\'"
-    "\\`\\*Semantic SymRef\\*\\'"
-    "\\`\\*vc\\*\\'"
-    "\\`newsrc-dribble\\'" ;; Gnus
-    "\\`\\*tramp/.*\\*\\'")
-  "Filter regexps for `consult-buffer'.
-
-The default setting is to filter ephemeral buffer names beginning
-with a space character, the *Completions* buffer and a few log
-buffers.  The regular expressions are matched case sensitively."
-  :type '(repeat regexp))
-
-(defcustom consult-buffer-sources
-  '(consult--source-hidden-buffer
-    consult--source-modified-buffer
-    consult--source-buffer
-    consult--source-recent-file
-    consult--source-file-register
-    consult--source-bookmark
-    consult--source-project-buffer-hidden
-    consult--source-project-recent-file-hidden)
-  "Sources used by `consult-buffer'.
-See also `consult-project-buffer-sources'.
-See `consult--multi' for a description of the source data structure."
-  :type '(repeat symbol))
-
-(defcustom consult-project-buffer-sources
-  '(consult--source-project-buffer
-    consult--source-project-recent-file)
-  "Sources used by `consult-project-buffer'.
-See also `consult-buffer-sources'.
-See `consult--multi' for a description of the source data structure."
-  :type '(repeat symbol))
-
-(defcustom consult-mode-command-filter
-  '(;; Filter commands
-    "-mode\\'" "--"
-    ;; Filter whole features
-    simple mwheel time so-long recentf tab-bar tab-line)
-  "Filter commands for `consult-mode-command'."
-  :type '(repeat (choice symbol regexp)))
-
-(defcustom consult-grep-max-columns 300
-  "Maximal number of columns of grep output.
-If set to nil, do not truncate candidates.  This can have negative
-performance implications but helps if you want to export long lines via
-`embark-export'."
-  :type '(choice natnum (const nil)))
-
-(defconst consult--grep-match-regexp
-  "\\`\\(?:\\./\\)?\\([^\n\0]+\\)\0\\([0-9]+\\)\\([-:\0]\\)"
-  "Regexp used to match file and line of grep output.")
-
-(defcustom consult-grep-args
-  '("grep" (consult--grep-exclude-args)
-    "--null --line-buffered --color=never --ignore-case\
-     --with-filename --line-number -I -r")
-  "Command line arguments for grep, see `consult-grep'.
-The dynamically computed arguments are appended.
-Can be either a string, or a list of strings or expressions."
-  :type '(choice string (repeat (choice string sexp))))
-
-(defcustom consult-git-grep-args
-  "git --no-pager grep --null --color=never --ignore-case\
-   --extended-regexp --line-number -I"
-  "Command line arguments for git-grep, see `consult-git-grep'.
-The dynamically computed arguments are appended.
-Can be either a string, or a list of strings or expressions."
-  :type '(choice string (repeat (choice string sexp))))
-
-(defcustom consult-ripgrep-args
-  "rg --null --line-buffered --color=never --max-columns=1000 --path-separator /\
-   --smart-case --no-heading --with-filename --line-number --search-zip"
-  "Command line arguments for ripgrep, see `consult-ripgrep'.
-The dynamically computed arguments are appended.
-Can be either a string, or a list of strings or expressions."
-  :type '(choice string (repeat (choice string sexp))))
-
-(defcustom consult-find-args
-  "find . -not ( -path */.[A-Za-z]* -prune )"
-  "Command line arguments for find, see `consult-find'.
-The dynamically computed arguments are appended.
-Can be either a string, or a list of strings or expressions."
-  :type '(choice string (repeat (choice string sexp))))
-
-(defcustom consult-fd-args
-  '((if (executable-find "fdfind" 'remote) "fdfind" "fd")
-    "--full-path --color=never")
-  "Command line arguments for fd, see `consult-fd'.
-The dynamically computed arguments are appended.
-Can be either a string, or a list of strings or expressions."
-  :type '(choice string (repeat (choice string sexp))))
-
-(defcustom consult-locate-args
-  "locate --ignore-case" ;; --existing not supported by Debian plocate
-  "Command line arguments for locate, see `consult-locate'.
-The dynamically computed arguments are appended.
-Can be either a string, or a list of strings or expressions."
-  :type '(choice string (repeat (choice string sexp))))
-
-(defcustom consult-man-args
-  "man -k"
-  "Command line arguments for man, see `consult-man'.
-The dynamically computed arguments are appended.
-Can be either a string, or a list of strings or expressions."
-  :type '(choice string (repeat (choice string sexp))))
-
-(defcustom consult-preview-key 'any
-  "Preview trigger keys, can be nil, `any', a single key or a list of keys.
-Debouncing can be specified via the `:debounce' attribute.  The
-individual keys must be strings accepted by `key-valid-p'."
-  :type '(choice (const :tag "Any key" any)
-                 (list :tag "Debounced"
-                       (const :debounce)
-                       (float :tag "Seconds" 0.1)
-                       (const any))
-                 (const :tag "No preview" nil)
-                 (key :tag "Key")
-                 (repeat :tag "List of keys" key)))
-
-(defcustom consult-preview-partial-size 1048576
-  "Files larger than this byte limit are previewed partially."
-  :type '(natnum :tag "File size in bytes"))
-
-(defcustom consult-preview-partial-chunk 102400
-  "Partial preview chunk size in bytes.
-If a file is larger than `consult-preview-partial-size' only the
-chunk from the beginning of the file is previewed."
-  :type '(natnum :tag "Chunk size in bytes"))
-
-(defcustom consult-preview-max-count 10
-  "Number of file buffers to keep open temporarily during preview."
-  :type '(natnum :tag "Number of buffers"))
-
-(defcustom consult-preview-excluded-buffers nil
-  "Buffers excluded from preview.
-The value should conform to the predicate format demanded by the
-function `buffer-match-p'."
-  :type 'sexp)
-
-(defcustom consult-preview-excluded-files
-  '("\\`/[^/|:]+:") ;; Do not preview remote files
-  "List of regexps matched against names of files, which are not previewed."
-  :type '(repeat regexp))
-
-(defcustom consult-preview-allowed-hooks
-  '(global-font-lock-mode
-    save-place-find-file-hook)
-  "List of hooks, which should be executed during file preview.
-This variable applies to `find-file-hook', `change-major-mode-hook' and
-mode hooks, e.g., `prog-mode-hook'."
-  :type '(repeat symbol))
-
-(defcustom consult-preview-variables
-  '((inhibit-message . t)
-    (enable-dir-local-variables . nil)
-    (enable-local-variables . :safe)
-    (non-essential . t)
-    (delay-mode-hooks . t))
-  "Variables which are bound for file preview."
-  :type '(alist :key-type symbol))
-
-(defcustom consult-bookmark-narrow
-  `((?f "File" bookmark-default-handler)
-    (?h "Help" help-bookmark-jump Info-bookmark-jump
-               Man-bookmark-jump woman-bookmark-jump)
-    (?p "Picture" image-bookmark-jump)
-    (?d "Docview" doc-view-bookmark-jump)
-    (?m "Mail" gnus-summary-bookmark-jump)
-    (?s "Eshell" eshell-bookmark-jump)
-    (?w "Web" eww-bookmark-jump xwidget-webkit-bookmark-jump-handler)
-    (?v "VC Directory" vc-dir-bookmark-jump)
-    (nil "Other"))
-  "Bookmark narrowing configuration.
-
-Each element of the list must have the form (char name handlers...)."
-  :type '(alist :key-type character :value-type (cons string (repeat function))))
-
-(define-obsolete-variable-alias
-  'consult-yank-rotate 'yank-from-kill-ring-rotate "1.8")
-
-;;;; Faces
-
-(defgroup consult-faces nil
-  "Faces used by Consult."
-  :group 'consult
-  :group 'faces)
-
-(defface consult-preview-line
-  '((t :inherit consult-preview-insertion :extend t))
-  "Face used for line previews.")
-
-(defface consult-highlight-match
-  '((t :inherit match))
-  "Face used to highlight matches in the completion candidates.
-Used for example by `consult-grep'.")
-
-(defface consult-highlight-mark
-  '((t :inherit consult-highlight-match))
-  "Face used for mark positions in completion candidates.
-Used for example by `consult-mark'.  The face should be different
-than the `cursor' face to avoid confusion.")
-
-(defface consult-preview-match
-  '((t :inherit isearch))
-  "Face used for match previews, e.g., in `consult-line'.")
-
-(defface consult-preview-insertion
-  '((t :inherit region))
-  "Face used for previews of text to be inserted.
-Used by `consult-completion-in-region', `consult-yank' and `consult-history'.")
-
-(defface consult-narrow-indicator
-  '((t :inherit warning))
-  "Face used for the narrowing indicator.")
-
-(defface consult-async-running
-  '((t :inherit consult-narrow-indicator))
-  "Face used if asynchronous process is running.")
-
-(defface consult-async-finished
-  '((t :inherit success))
-  "Face used if asynchronous process has finished.")
-
-(defface consult-async-failed
-  '((t :inherit error))
-  "Face used if asynchronous process has failed.")
-
-(defface consult-async-split
-  '((t :inherit font-lock-negation-char-face))
-  "Face used to highlight punctuation character.")
-
-(defface consult-help
-  '((t :inherit shadow))
-  "Face used to highlight help, e.g., in `consult-register-store'.")
-
-(defface consult-key
-  '((t :inherit font-lock-keyword-face))
-  "Face used to highlight keys, e.g., in `consult-register'.")
-
-(defface consult-line-number
-  '((t :inherit consult-key))
-  "Face used to highlight location line in `consult-global-mark'.")
-
-(defface consult-file
-  '((t :inherit font-lock-function-name-face))
-  "Face used to highlight files in `consult-buffer'.")
-
-(defface consult-grep-context
-  '((t :inherit shadow))
-  "Face used to highlight grep context in `consult-grep'.")
-
-(defface consult-bookmark
-  '((t :inherit font-lock-constant-face))
-  "Face used to highlight bookmarks in `consult-buffer'.")
-
-(defface consult-buffer
-  '((t))
-  "Face used to highlight buffers in `consult-buffer'.")
-
-(defface consult-line-number-prefix
-  '((t :inherit line-number))
-  "Face used to highlight line number prefixes.")
-
-(defface consult-line-number-wrapped
-  '((t :inherit consult-line-number-prefix :inherit font-lock-warning-face))
-  "Face used to highlight line number prefixes after wrap around.")
-
-(defface consult-separator
-  '((((class color) (min-colors 88) (background light))
-     :foreground "#ccc")
-    (((class color) (min-colors 88) (background dark))
-     :foreground "#333"))
-  "Face used for thin line separators in `consult-register-window'.")
-
-;;;; Input history variables
-
-(defvar consult--path-history nil)
-(defvar consult--grep-history nil)
-(defvar consult--find-history nil)
-(defvar consult--man-history nil)
-(defvar consult--line-history nil)
-(defvar consult--line-multi-history nil)
-(defvar consult--theme-history nil)
-(defvar consult--minor-mode-menu-history nil)
-(defvar consult--buffer-history nil)
-
-;;;; Internal variables
-
-(defvar consult--regexp-compiler
-  #'consult--default-regexp-compiler
-  "Regular expression compiler used by `consult-grep' and other commands.
-The function must return a list of regular expressions and a highlighter
-function.")
-
-(defvar consult--customize-alist
-  ;; Disable preview in frames, since `consult--jump-preview' does not properly
-  ;; clean up.  See gh:minad/consult#593. This issue should better be fixed in
-  ;; `consult--jump-preview'.
-  `((,#'consult-buffer-other-frame :preview-key nil)
-    (,#'consult-buffer-other-tab :preview-key nil))
-  "Command configuration alist for fine-grained configuration.
-
-Each element of the list must have the form (command-name plist...).  The
-options set here will be evaluated and passed to `consult--read', when
-called from the corresponding command.  Note that the options depend on
-the private `consult--read' API and should not be considered as stable
-as the public API.")
-
-(defvar consult--buffer-display #'switch-to-buffer
-  "Buffer display function.")
-
-(defvar consult--completion-candidate-hook
-  (list #'consult--default-completion-minibuffer-candidate
-        #'consult--default-completion-list-candidate)
-  "Get candidate from completion system.")
-
-(defvar consult--completion-refresh-hook nil
-  "Refresh completion system.")
-
-(defvar-local consult--preview-function nil
-  "Minibuffer-local variable which exposes the current preview function.
-This function can be called by custom completion systems from
-outside the minibuffer.")
-
-(defvar consult--annotate-align-step 10
-  "Round candidate width.")
-
-(defvar consult--annotate-align-width 0
-  "Maximum candidate width used for annotation alignment.")
-
-(defconst consult--tofu-char #x200000
-  "Special character used to encode line prefixes for disambiguation.
-We use invalid characters outside the Unicode range.")
-
-(defconst consult--tofu-range #x100000
-  "Special character range.")
-
-(defvar-local consult--narrow nil
-  "Current narrowing key.")
-
-(defvar-local consult--narrow-keys nil
-  "Narrowing prefixes of the current completion.")
-
-(defvar-local consult--narrow-predicate nil
-  "Narrowing predicate of the current completion.")
-
-(defvar-local consult--narrow-overlay nil
-  "Narrowing indicator overlay.")
-
-(defvar consult--gc-threshold (* 64 1024 1024)
-  "Large GC threshold for temporary increase.")
-
-(defvar consult--gc-percentage 0.5
-  "Large GC percentage for temporary increase.")
-
-(defvar consult--process-chunk (* 1024 1024)
-  "Increase process output chunk size.")
-
-(defvar consult--async-log
-  " *consult-async*"
-  "Buffer for async logging output used by `consult--async-process'.")
-
-(defvar-local consult--focus-lines-overlays nil
-  "Overlays used by `consult-focus-lines'.")
-
-(defvar-local consult--org-fold-regions nil
-  "Stored regions for the org-fold API.")
-
-;;;; Miscellaneous helper functions
-
-(defun consult--key-parse (key)
-  "Parse KEY or signal error if invalid."
-  (unless (key-valid-p key)
-    (error "%S is not a valid key definition; see `key-valid-p'" key))
-  (key-parse key))
-
-(defun consult--in-buffer (fun &optional buffer)
-  "Ensure that FUN is executed inside BUFFER."
-  (unless buffer (setq buffer (current-buffer)))
-  (lambda (&rest args)
-    (with-current-buffer buffer
-      (apply fun args))))
-
-(defun consult--completion-table-in-buffer (table &optional buffer)
-  "Ensure that completion TABLE is executed inside BUFFER."
-  (if (functionp table)
-      (consult--in-buffer
-       (lambda (str pred action)
-         (let ((result (funcall table str pred action)))
-           (pcase action
-             ('metadata
-              (setq result
-                    (mapcar
-                     (lambda (x)
-                       (if (and (string-suffix-p "-function" (symbol-name (car-safe x))) (cdr x))
-                           (cons (car x) (consult--in-buffer (cdr x)))
-                         x))
-                     result)))
-             ((and 'completion--unquote (guard (functionp (cadr result))))
-              (cl-callf consult--in-buffer (cadr result) buffer)
-              (cl-callf consult--in-buffer (cadddr result) buffer)))
-           result))
-       buffer)
-    table))
-
-(defun consult--build-args (arg)
-  "Return ARG as a flat list of split strings.
-
-Turn ARG into a list, and for each element either:
-- split it if it a string.
-- eval it if it is an expression."
-  (seq-mapcat (lambda (x)
-                (if (stringp x)
-                    (split-string-and-unquote x)
-                  (ensure-list (eval x 'lexical))))
-              (ensure-list arg)))
-
-(defun consult--command-split (str)
-  "Return command argument and options list given input STR."
-  (save-match-data
-    (let ((opts (when (string-match " +--\\( +\\|\\'\\)" str)
-                  (prog1 (substring str (match-end 0))
-                    (setq str (substring str 0 (match-beginning 0)))))))
-      ;; split-string-and-unquote fails if the quotes are invalid.  Ignore it.
-      (cons str (and opts (ignore-errors (split-string-and-unquote opts)))))))
-
-(defmacro consult--keep! (list form)
-  "Evaluate FORM for every element of LIST and keep the non-nil results."
-  (declare (indent 1))
-  (cl-with-gensyms (head prev result)
-    `(let* ((,head (cons nil ,list))
-            (,prev ,head))
-       (while (cdr ,prev)
-         (if-let (,result (let ((it (cadr ,prev))) ,form))
-             (progn
-               (pop ,prev)
-               (setcar ,prev ,result))
-           (setcdr ,prev (cddr ,prev))))
-       (setq ,list (cdr ,head))
-       nil)))
-
-(defun consult--completion-filter (pattern cands category _highlight)
-  "Filter CANDS with PATTERN.
-
-CATEGORY is the completion category, used to find the completion style via
-`completion-category-defaults' and `completion-category-overrides'.
-HIGHLIGHT must be non-nil if the resulting strings should be highlighted."
-  ;; completion-all-completions returns an improper list
-  ;; where the last link is not necessarily nil.
-  (nconc (completion-all-completions pattern cands nil (length pattern)
-                                     `(metadata (category . ,category)))
-         nil))
-
-(defun consult--completion-filter-complement (pattern cands category _highlight)
-  "Filter CANDS with complement of PATTERN.
-See `consult--completion-filter' for the arguments CATEGORY and HIGHLIGHT."
-  (let ((ht (consult--string-hash (consult--completion-filter pattern cands category nil))))
-    (seq-remove (lambda (x) (gethash x ht)) cands)))
-
-(defun consult--completion-filter-dispatch (pattern cands category highlight)
-  "Filter CANDS with PATTERN with optional complement.
-Either using `consult--completion-filter' or
-`consult--completion-filter-complement', depending on if the pattern starts
-with a bang.  See `consult--completion-filter' for the arguments CATEGORY and
-HIGHLIGHT."
-  (cond
-   ((string-match-p "\\`!? ?\\'" pattern) cands) ;; empty pattern
-   ((string-prefix-p "! " pattern) (consult--completion-filter-complement
-                                    (substring pattern 2) cands category nil))
-   (t (consult--completion-filter pattern cands category highlight))))
-
-(defmacro consult--each-line (beg end &rest body)
-  "Iterate over each line.
-
-The line beginning/ending BEG/END is bound in BODY."
-  (declare (indent 2))
-  (cl-with-gensyms (max)
-    `(save-excursion
-       (let ((,beg (point-min)) (,max (point-max)) ,end)
-         (while (< ,beg ,max)
-           (goto-char ,beg)
-           (setq ,end (pos-eol))
-           ,@body
-           (setq ,beg (1+ ,end)))))))
-
-(defun consult--display-width (string)
-  "Compute width of STRING taking display and invisible properties into account."
-  (let ((pos 0) (width 0) (end (length string)))
-    (while (< pos end)
-      (let ((nextd (next-single-property-change pos 'display string end))
-            (display (get-text-property pos 'display string)))
-        (if (stringp display)
-            (setq width (+ width (string-width display))
-                  pos nextd)
-          (while (< pos nextd)
-            (let ((nexti (next-single-property-change pos 'invisible string nextd)))
-              (unless (get-text-property pos 'invisible string)
-                (setq width (+ width (string-width string pos nexti))))
-              (setq pos nexti))))))
-    width))
-
-(defun consult--string-hash (strings)
-  "Create hash table from STRINGS."
-  (let ((ht (make-hash-table :test #'equal :size (length strings))))
-    (dolist (str strings)
-      (puthash str t ht))
-    ht))
-
-(defmacro consult--local-let (binds &rest body)
-  "Buffer local let BINDS of dynamic variables in BODY."
-  (declare (indent 1))
-  (let ((buffer (gensym "buffer"))
-        (local (mapcar (lambda (x) (cons (gensym "local") (car x))) binds)))
-    `(let ((,buffer (current-buffer))
-           ,@(mapcar (lambda (x) `(,(car x) (local-variable-p ',(cdr x)))) local))
-       (unwind-protect
-           (progn
-             ,@(mapcar (lambda (x) `(make-local-variable ',(car x))) binds)
-             (let (,@binds)
-               ,@body))
-         (when (buffer-live-p ,buffer)
-           (with-current-buffer ,buffer
-             ,@(mapcar (lambda (x)
-                         `(unless ,(car x)
-                            (kill-local-variable ',(cdr x))))
-                       local)))))))
-
-(defvar consult--fast-abbreviate-file-name nil)
-(defun consult--fast-abbreviate-file-name (name)
-  "Return abbreviate file NAME.
-This function is a pure variant of `abbreviate-file-name', which
-does not access the file system.  This is important if we require
-that the operation is fast, even for remote paths or paths on
-network file systems."
-  (save-match-data
-    (let (case-fold-search) ;; Assume that file system is case sensitive.
-      (setq name (directory-abbrev-apply name))
-      (if (string-match (with-memoization consult--fast-abbreviate-file-name
-                          (directory-abbrev-make-regexp (expand-file-name "~")))
-                        name)
-          (concat "~" (substring name (match-beginning 1)))
-        name))))
-
-(defun consult--left-truncate-file (file)
-  "Return abbreviated file name of FILE for use in `completing-read' prompt."
-  (save-match-data
-    (let ((file (directory-file-name (abbreviate-file-name file)))
-          (prefix nil))
-      (when (string-match "\\`/\\([^/|:]+:\\)" file)
-        (setq prefix (propertize (match-string 1 file) 'face 'error)
-              file (substring file (match-end 0))))
-      (when (and (string-match "/\\([^/]+\\)/\\([^/]+\\)\\'" file)
-                 (< (- (match-end 0) (match-beginning 0) -3) (length file)))
-        (setq file (format "…/%s/%s" (match-string 1 file) (match-string 2 file))))
-      (concat prefix file))))
-
-(defun consult--directory-prompt (prompt dir)
-  "Return prompt, paths and default directory.
-
-PROMPT is the prompt prefix.  The directory is appended to the
-prompt prefix.  For projects only the project name is shown.  The
-`default-directory' is not shown.  Other directories are
-abbreviated and only the last two path components are shown.
-
-If DIR is a string, it is returned as default directory.  If DIR
-is a list of strings, the list is returned as search paths.  If
-DIR is nil the `consult-project-function' is tried to retrieve
-the default directory.  If no project is found the
-`default-directory' is returned as is.  Otherwise the user is
-asked for the directories or files to search via
-`completing-read-multiple'."
-  (let* ((paths nil)
-         (dir
-          (pcase dir
-            ((pred stringp) dir)
-            ((or 'nil '(16)) (or (consult--project-root dir) default-directory))
-            (_
-               (pcase (if (stringp (car-safe dir))
-                          dir
-                        ;; Preserve this-command across `completing-read-multiple' call,
-                        ;; such that `consult-customize' continues to work.
-                        (let ((this-command this-command)
-                              (def (abbreviate-file-name default-directory))
-                              ;; TODO: `minibuffer-completing-file-name' is
-                              ;; mostly deprecated, but still in use. Packages
-                              ;; should instead use the completion metadata.
-                              (minibuffer-completing-file-name t)
-                              (ignore-case read-file-name-completion-ignore-case))
-                          (minibuffer-with-setup-hook
-                              (lambda ()
-                                (setq-local completion-ignore-case ignore-case)
-                                (set-syntax-table minibuffer-local-filename-syntax))
-                            (completing-read-multiple "Directories or files: "
-                                                      #'completion-file-name-table
-                                                      nil t def 'consult--path-history def))))
-                 ((and `(,p) (guard (file-directory-p p))) p)
-                 (ps (setq paths (mapcar (lambda (p)
-                                           (file-relative-name (expand-file-name p)))
-                                         ps))
-                     default-directory)))))
-         (edir (file-name-as-directory (expand-file-name dir)))
-         (pdir (let ((default-directory edir))
-                 ;; Bind default-directory in order to find the project
-                 (consult--project-root))))
-    (list
-     (format "%s (%s): " prompt
-             (pcase paths
-               ((guard (<= 1 (length paths) 2))
-                (string-join (mapcar #'consult--left-truncate-file paths) ", "))
-               (`(,p . ,_)
-                (format "%d paths, %s, …" (length paths) (consult--left-truncate-file p)))
-               ((guard (equal edir pdir)) (concat "Project " (consult--project-name pdir)))
-               (_ (consult--left-truncate-file edir))))
-     (or paths '("."))
-     edir)))
-
-(declare-function project-current "project")
-(declare-function project-root "project")
-
-(defun consult--default-project-function (may-prompt)
-  "Return project root directory.
-When no project is found and MAY-PROMPT is non-nil ask the user."
-  (when-let (proj (project-current may-prompt))
-    (project-root proj)))
-
-(defun consult--project-root (&optional may-prompt)
-  "Return project root as absolute path.
-When no project is found and MAY-PROMPT is non-nil ask the user."
-  ;; Preserve this-command across project selection,
-  ;; such that `consult-customize' continues to work.
-  (let ((this-command this-command))
-    (when-let (root (and consult-project-function
-                         (funcall consult-project-function may-prompt)))
-      (expand-file-name root))))
-
-(defun consult--project-name (dir)
-  "Return the project name for DIR."
-  (if (string-match "/\\([^/]+\\)/\\'" dir)
-      (propertize (match-string 1 dir) 'help-echo (abbreviate-file-name dir))
-    dir))
-
-(defun consult--format-file-line-match (file line match)
-  "Format string FILE:LINE:MATCH with faces."
-  (setq line (number-to-string line)
-        match (concat file ":" line ":" match)
-        file (length file))
-  (put-text-property 0 file 'face 'consult-file match)
-  (put-text-property (1+ file) (+ 1 file (length line)) 'face 'consult-line-number match)
-  match)
-
-(defun consult--make-overlay (beg end &rest props)
-  "Make consult overlay between BEG and END with PROPS."
-  (let ((ov (make-overlay beg end)))
-    (while props
-      (overlay-put ov (car props) (cadr props))
-      (setq props (cddr props)))
-    ov))
-
-(defun consult--remove-dups (list)
-  "Remove duplicate strings from LIST."
-  (delete-dups (copy-sequence list)))
-
-(defsubst consult--in-range-p (pos)
-  "Return t if position POS lies in range `point-min' to `point-max'."
-  (<= (point-min) pos (point-max)))
-
-(defun consult--completion-window-p ()
-  "Return non-nil if the selected window belongs to the completion UI."
-  (or (eq (selected-window) (active-minibuffer-window))
-      (eq #'completion-list-mode (buffer-local-value 'major-mode (window-buffer)))))
-
-(defun consult--original-window ()
-  "Return window which was just selected just before the minibuffer was entered.
-In contrast to `minibuffer-selected-window' never return nil and
-always return an appropriate non-minibuffer window."
-  (or (minibuffer-selected-window)
-      (if (window-minibuffer-p (selected-window))
-          (next-window)
-        (selected-window))))
-
-(defun consult--forbid-minibuffer ()
-  "Raise an error if executed from the minibuffer."
-  (when (minibufferp)
-    (user-error "`%s' called inside the minibuffer" this-command)))
-
-(defun consult--require-minibuffer ()
-  "Raise an error if executed outside the minibuffer."
-  (unless (minibufferp)
-    (user-error "`%s' must be called inside the minibuffer" this-command)))
-
-(defun consult--fontify-all ()
-  "Ensure that the whole buffer is fontified."
-  ;; Font-locking is lazy, i.e., if a line has not been looked at yet, the line
-  ;; is not font-locked.  We would observe this if consulting an unfontified
-  ;; line.  Therefore we have to enforce font-locking now, which is slow.  In
-  ;; order to prevent is hang-up we check the buffer size against
-  ;; `consult-fontify-max-size'.
-  (when (and consult-fontify-preserve jit-lock-mode
-             (< (buffer-size) consult-fontify-max-size))
-    (jit-lock-fontify-now)))
-
-(defun consult--fontify-region (start end)
-  "Ensure that region between START and END is fontified."
-  (when (and consult-fontify-preserve jit-lock-mode)
-    (jit-lock-fontify-now start end)))
-
-(defmacro consult--with-increased-gc (&rest body)
-  "Temporarily increase the GC limit in BODY to optimize for throughput."
-  (cl-with-gensyms (overwrite)
-    `(let* ((,overwrite (> consult--gc-threshold gc-cons-threshold))
-            (gc-cons-threshold (if ,overwrite consult--gc-threshold gc-cons-threshold))
-            (gc-cons-percentage (if ,overwrite consult--gc-percentage gc-cons-percentage)))
-       ,@body)))
-
-(defmacro consult--slow-operation (message &rest body)
-  "Show delayed MESSAGE if BODY takes too long.
-Also temporarily increase the GC limit via `consult--with-increased-gc'."
-  (declare (indent 1))
-  `(with-delayed-message (1 ,message)
-     (consult--with-increased-gc ,@body)))
-
-(defun consult--count-lines (pos)
-  "Move to position POS and return number of lines."
-  (let ((line 1))
-    (while (< (point) pos)
-      (forward-line)
-      (when (<= (point) pos)
-        (cl-incf line)))
-    (goto-char pos)
-    line))
-
-(defun consult--marker-from-line-column (buffer line column)
-  "Get marker in BUFFER from LINE and COLUMN."
-  (when (buffer-live-p buffer)
-    (with-current-buffer buffer
-      (save-excursion
-        (without-restriction
-          (goto-char (point-min))
-          ;; Location data might be invalid by now!
-          (ignore-errors
-            (forward-line (1- line))
-            (goto-char (min (+ (point) column) (pos-eol))))
-          (point-marker))))))
-
-(defun consult--line-prefix (&optional curr-line)
-  "Annotate `consult-location' candidates with line numbers.
-CURR-LINE is the current line number."
-  (setq curr-line (or curr-line -1))
-  (let* ((width (length (number-to-string (line-number-at-pos
-                                           (point-max)
-                                           consult-line-numbers-widen))))
-         (before (format #("%%%dd " 0 6 (face consult-line-number-wrapped)) width))
-         (after (format #("%%%dd " 0 6 (face consult-line-number-prefix)) width)))
-    (lambda (cand)
-      (let ((line (cdr (get-text-property 0 'consult-location cand))))
-        (list cand (format (if (< line curr-line) before after) line) "")))))
-
-(defsubst consult--location-candidate (cand marker line tofu &rest props)
-  "Add MARKER and LINE as `consult-location' text property to CAND.
-Furthermore add the additional text properties PROPS, and append
-TOFU suffix for disambiguation."
-  (setq cand (concat cand (consult--tofu-encode tofu)))
-  (add-text-properties 0 1 `(consult-location (,marker . ,line) ,@props) cand)
-  cand)
-
-;; There is a similar variable `yank-excluded-properties'.  Unfortunately
-;; we cannot use it here since it excludes too much (e.g., invisible)
-;; and at the same time not enough (e.g., cursor-sensor-functions).
-(defconst consult--remove-text-properties
-  '(category cursor cursor-intangible cursor-sensor-functions field follow-link
-    fontified front-sticky help-echo insert-behind-hooks insert-in-front-hooks
-    intangible keymap local-map modification-hooks mouse-face pointer read-only
-    rear-nonsticky yank-handler)
-  "List of text properties to remove from buffer strings.")
-
-(defsubst consult--buffer-substring (beg end &optional fontify)
-  "Return buffer substring between BEG and END.
-If FONTIFY and `consult-fontify-preserve' are non-nil, first ensure that the
-region has been fontified."
-  (if consult-fontify-preserve
-      (let (str)
-        (when fontify (consult--fontify-region beg end))
-        (setq str (buffer-substring beg end))
-        ;; TODO Propose the upstream addition of a function
-        ;; `preserve-list-of-text-properties', which should be as efficient as
-        ;; `remove-list-of-text-properties'.
-        (remove-list-of-text-properties
-         0 (- end beg) consult--remove-text-properties str)
-        str)
-    (buffer-substring-no-properties beg end)))
-
-(defun consult--line-with-mark (marker)
-  "Current line string where the MARKER position is highlighted."
-  (let* ((beg (pos-bol))
-         (end (pos-eol))
-         (str (consult--buffer-substring beg end 'fontify)))
-    (if (>= marker end)
-        (concat str #(" " 0 1 (face consult-highlight-mark)))
-      (put-text-property (- marker beg) (- (1+ marker) beg)
-                         'face 'consult-highlight-mark str)
-      str)))
-
-;;;; Tofu cooks
-
-(defsubst consult--tofu-p (char)
-  "Return non-nil if CHAR is a tofu."
-  (<= consult--tofu-char char (+ consult--tofu-char consult--tofu-range -1)))
-
-(defun consult--tofu-hide (str)
-  "Hide the tofus in STR."
-  (let* ((max (length str))
-         (end max))
-    (while (and (> end 0) (consult--tofu-p (aref str (1- end))))
-      (cl-decf end))
-    (when (< end max)
-      (setq str (copy-sequence str))
-      (put-text-property end max 'invisible t str))
-    str))
-
-(defsubst consult--tofu-append (cand id)
-  "Append tofu-encoded ID to CAND.
-The ID must fit within a single character.  It must be smaller
-than `consult--tofu-range'."
-  (setq id (char-to-string (+ consult--tofu-char id)))
-  (add-text-properties 0 1 '(invisible t consult-strip t) id)
-  (concat cand id))
-
-(defsubst consult--tofu-get (cand)
-  "Extract tofu-encoded ID from CAND.
-See `consult--tofu-append'."
-  (- (aref cand (1- (length cand))) consult--tofu-char))
-
-;; We must disambiguate the lines by adding a prefix such that two lines with
-;; the same text can be distinguished.  In order to avoid matching the line
-;; number, such that the user can search for numbers with `consult-line', we
-;; encode the line number as characters outside the Unicode range.  By doing
-;; that, no accidental matching can occur.
-(defun consult--tofu-encode (n)
-  "Return tofu-encoded number N as a string.
-Large numbers are encoded as multiple tofu characters."
-  (let (str tofu)
-    (while (progn
-             (setq tofu (char-to-string
-                         (+ consult--tofu-char (% n consult--tofu-range)))
-                   str (if str (concat tofu str) tofu))
-             (and (>= n consult--tofu-range)
-                  (setq n (/ n consult--tofu-range)))))
-    (add-text-properties 0 (length str) '(invisible t consult-strip t) str)
-    str))
-
-;;;; Regexp utilities
-
-(defun consult--find-highlights (str start &rest ignored-faces)
-  "Find highlighted regions in STR from position START.
-Highlighted regions have a non-nil face property.
-IGNORED-FACES are ignored when searching for matches."
-  (let (highlights
-        (end (length str))
-        (beg start))
-    (while (< beg end)
-      (let ((next (next-single-property-change beg 'face str end))
-            (val (get-text-property beg 'face str)))
-        (when (and val
-                   (not (memq val ignored-faces))
-                   (not (and (consp val)
-                             (seq-some (lambda (x) (memq x ignored-faces)) val))))
-          (push (cons (- beg start) (- next start)) highlights))
-        (setq beg next)))
-    (nreverse highlights)))
-
-(defun consult--point-placement (str start &rest ignored-faces)
-  "Compute point placement from STR with START offset.
-IGNORED-FACES are ignored when searching for matches.
-Return cons of point position and a list of match begin/end pairs."
-  (let* ((matches (apply #'consult--find-highlights str start ignored-faces))
-         (pos (pcase-exhaustive consult-point-placement
-                ('match-beginning (or (caar matches) 0))
-                ('match-end (or (cdar (last matches)) 0))
-                ('line-beginning 0))))
-    (dolist (match matches)
-      (cl-decf (car match) pos)
-      (cl-decf (cdr match) pos))
-    (cons pos matches)))
-
-(defun consult--highlight-regexps (regexps ignore-case str)
-  "Highlight REGEXPS in STR.
-If a regular expression contains capturing groups, only these are highlighted.
-If no capturing groups are used highlight the whole match.  Case is ignored
-if IGNORE-CASE is non-nil."
-  (dolist (re regexps)
-    (let ((i 0))
-      (while (and (let ((case-fold-search ignore-case))
-                    (string-match re str i))
-                  ;; Ensure that regexp search made progress (edge case for .*)
-                  (> (match-end 0) i))
-        ;; Unfortunately there is no way to avoid the allocation of the match
-        ;; data, since the number of capturing groups is unknown.
-        (let ((m (match-data)))
-          (setq i (cadr m) m (or (cddr m) m))
-          (while m
-            (when (car m)
-              (add-face-text-property (car m) (cadr m)
-                                      'consult-highlight-match nil str))
-            (setq m (cddr m)))))))
-  str)
-
-(defconst consult--convert-regexp-table
-  (append
-   ;; For simplicity, treat word beginning/end as word boundaries,
-   ;; since PCRE does not make this distinction.  Usually the
-   ;; context determines if \b is the beginning or the end.
-   '(("\\<" . "\\b") ("\\>" . "\\b")
-     ("\\_<" . "\\b") ("\\_>" . "\\b"))
-   ;; Treat \` and \' as beginning and end of line.  This is more
-   ;; widely supported and makes sense for line-based commands.
-   '(("\\`" . "^") ("\\'" . "$"))
-   ;; Historical: Unescaped *, +, ? are supported at the beginning
-   (mapcan (lambda (x)
-             (mapcar (lambda (y)
-                       (cons (concat x y)
-                             (concat (string-remove-prefix "\\" x) "\\" y)))
-                     '("*" "+" "?")))
-           '("" "\\(" "\\(?:" "\\|" "^"))
-   ;; Different escaping
-   (mapcan (lambda (x) `(,x (,(cdr x) . ,(car x))))
-           '(("\\|" . "|")
-             ("\\(" . "(") ("\\)" . ")")
-             ("\\{" . "{") ("\\}" . "}"))))
-  "Regexp conversion table.")
-
-(defun consult--convert-regexp (regexp type)
-  "Convert Emacs REGEXP to regexp syntax TYPE."
-  (if (memq type '(emacs basic))
-      regexp
-    ;; Support for Emacs regular expressions is fairly complete for basic
-    ;; usage.  There are a few unsupported Emacs regexp features:
-    ;; - \= point matching
-    ;; - Syntax classes \sx \Sx
-    ;; - Character classes \cx \Cx
-    ;; - Explicitly numbered groups (?3:group)
-    (replace-regexp-in-string
-     (rx (or "\\\\" "\\^"                         ;; Pass through
-             (seq (or "\\(?:" "\\|") (any "*+?")) ;; Historical: \|+ or \(?:* etc
-             (seq "\\(" (any "*+"))               ;; Historical: \(* or \(+
-             (seq (or bos "^") (any "*+?"))       ;; Historical: + or * at the beginning
-             (seq (opt "\\") (any "(){|}"))       ;; Escape parens/braces/pipe
-             (seq "\\" (any "'<>`"))              ;; Special escapes
-             (seq "\\_" (any "<>"))))             ;; Beginning or end of symbol
-     (lambda (x) (or (cdr (assoc x consult--convert-regexp-table)) x))
-     regexp 'fixedcase 'literal)))
-
-(defun consult--default-regexp-compiler (input type ignore-case)
-  "Compile the INPUT string to a list of regular expressions.
-The function should return a pair, the list of regular expressions and a
-highlight function.  The highlight function should take a single
-argument, the string to highlight given the INPUT.  TYPE is the desired
-type of regular expression, which can be `basic', `extended', `emacs' or
-`pcre'.  If IGNORE-CASE is non-nil return a highlight function which
-matches case insensitively."
-  (setq input (consult--split-escaped input))
-  (cons (mapcar (lambda (x) (consult--convert-regexp x type)) input)
-        (when-let (regexps (seq-filter #'consult--valid-regexp-p input))
-          (apply-partially #'consult--highlight-regexps regexps ignore-case))))
-
-(defun consult--split-escaped (str)
-  "Split STR at spaces, which can be escaped with backslash."
-  (mapcar
-   (lambda (x) (string-replace "\0" " " x))
-   (split-string (replace-regexp-in-string
-                  "\\\\\\\\\\|\\\\ "
-                  (lambda (x) (if (equal x "\\ ") "\0" x))
-                  str 'fixedcase 'literal)
-                 " +" t)))
-
-(defun consult--join-regexps (regexps type)
-  "Join REGEXPS of TYPE."
-  ;; Add look-ahead wrapper only if there is more than one regular expression
-  (cond
-   ((and (eq type 'pcre) (cdr regexps))
-    (concat "^" (mapconcat (lambda (x) (format "(?=.*%s)" x))
-                           regexps "")))
-   ((eq type 'basic)
-    (string-join regexps ".*"))
-   (t
-    (when (length> regexps 3)
-      (message "Too many regexps, %S ignored. Use post-filtering!"
-               (string-join (seq-drop regexps 3) " "))
-      (setq regexps (seq-take regexps 3)))
-    (consult--join-regexps-permutations regexps (and (eq type 'emacs) "\\")))))
-
-(defun consult--join-regexps-permutations (regexps esc)
-  "Join all permutations of REGEXPS.
-ESC is the escaping string for choice and groups."
-  (pcase regexps
-    ('nil "")
-    (`(,r) r)
-    (_ (mapconcat
-        (lambda (r)
-          (concat esc "(" r esc ").*" esc "("
-                  (consult--join-regexps-permutations (remove r regexps) esc)
-                  esc ")"))
-        regexps (concat esc "|")))))
-
-(defun consult--valid-regexp-p (re)
-  "Return t if regexp RE is valid."
-  (condition-case nil
-      (progn (string-match-p re "") t)
-    (invalid-regexp nil)))
-
-(defun consult--regexp-filter (regexps)
-  "Create filter regexp from REGEXPS."
-  (if (stringp regexps)
-      regexps
-    (mapconcat (lambda (x) (concat "\\(?:" x "\\)")) regexps "\\|")))
-
-;;;; Lookup functions
-
-(defun consult--lookup-member (selected candidates &rest _)
-  "Lookup SELECTED in CANDIDATES list, return original element."
-  (car (member selected candidates)))
-
-(defun consult--lookup-cons (selected candidates &rest _)
-  "Lookup SELECTED in CANDIDATES alist, return cons."
-  (assoc selected candidates))
-
-(defun consult--lookup-cdr (selected candidates &rest _)
-  "Lookup SELECTED in CANDIDATES alist, return `cdr' of element."
-  (cdr (assoc selected candidates)))
-
-(defun consult--lookup-location (selected candidates &rest _)
-  "Lookup SELECTED in CANDIDATES list of `consult-location' category.
-Return the location marker."
-  (when-let (found (member selected candidates))
-    (setq found (car (consult--get-location (car found))))
-    ;; Check that marker is alive
-    (and (or (not (markerp found)) (marker-buffer found)) found)))
-
-(defun consult--lookup-prop (prop selected candidates &rest _)
-  "Lookup SELECTED in CANDIDATES list and return PROP value."
-  (when-let (found (member selected candidates))
-    (get-text-property 0 prop (car found))))
-
-(defun consult--lookup-candidate (selected candidates &rest _)
-  "Lookup SELECTED in CANDIDATES list and return property `consult--candidate'."
-  (consult--lookup-prop 'consult--candidate selected candidates))
-
-;;;; Preview support
-
-(defun consult--preview-allowed-p (fun)
-  "Return non-nil if FUN is an allowed preview mode hook."
-  (or (memq fun consult-preview-allowed-hooks)
-      (when-let (((symbolp fun))
-                 (name (symbol-name fun))
-                 ;; Global modes in Emacs 29 are activated via a
-                 ;; `find-file-hook' ending with `-check-buffers'. This has been
-                 ;; changed in Emacs 30. Now a `change-major-mode-hook' is used
-                 ;; instead with the suffix `-check-buffers'.
-                 (suffix (static-if (>= emacs-major-version 30)
-                             "-enable-in-buffer"
-                           "-check-buffers"))
-                 ((string-suffix-p suffix name)))
-        (memq (intern (string-remove-suffix suffix name))
-              consult-preview-allowed-hooks))))
-
-(defun consult--filter-find-file-hook (orig &rest hooks)
-  "Filter `find-file-hook' by `consult-preview-allowed-hooks'.
-This function is an advice for `run-hooks'.
-ORIG is the original function, HOOKS the arguments."
-  (if (memq 'find-file-hook hooks)
-      (cl-letf* (((default-value 'find-file-hook)
-                  (seq-filter #'consult--preview-allowed-p
-                              (default-value 'find-file-hook)))
-                 (find-file-hook (default-value 'find-file-hook)))
-        (apply orig hooks))
-    (apply orig hooks)))
-
-(defun consult--find-file-temporarily-1 (name)
-  "Open file NAME, helper function for `consult--find-file-temporarily'."
-  (when-let (((not (seq-find (lambda (x) (string-match-p x name))
-                             consult-preview-excluded-files)))
-             ;; file-attributes may throw permission denied error
-             (attrs (ignore-errors (file-attributes name)))
-             (size (file-attribute-size attrs)))
-    (let* ((partial (>= size consult-preview-partial-size))
-           (buffer (if partial
-                       (generate-new-buffer (format "consult-partial-preview-%s" name))
-                     (find-file-noselect name 'nowarn)))
-           (success nil))
-      (unwind-protect
-          (with-current-buffer buffer
-            (if (not partial)
-                (when (or (eq major-mode 'hexl-mode)
-                        (and (eq major-mode 'fundamental-mode)
-                             (save-excursion (search-forward "\0" nil 'noerror))))
-                  (error "No preview of binary file `%s'"
-                         (file-name-nondirectory name)))
-              (with-silent-modifications
-                (setq buffer-read-only t)
-                (insert-file-contents name nil 0 consult-preview-partial-chunk)
-                (goto-char (point-max))
-                (insert "\nFile truncated. End of partial preview.\n")
-                (goto-char (point-min)))
-              (when (save-excursion (search-forward "\0" nil 'noerror))
-                (error "No partial preview of binary file `%s'"
-                       (file-name-nondirectory name)))
-              ;; Auto detect major mode and hope for the best, given that the
-              ;; file is only previewed partially.  If an error is thrown the
-              ;; buffer will be killed and preview is aborted.
-              (set-auto-mode)
-              (font-lock-mode 1))
-            (when (bound-and-true-p so-long-detected-p)
-              (error "No preview of file `%s' with long lines"
-                     (file-name-nondirectory name)))
-            ;; Run delayed hooks listed in `consult-preview-allowed-hooks'.
-            (dolist (hook (reverse (cons 'after-change-major-mode-hook delayed-mode-hooks)))
-              (run-hook-wrapped hook (lambda (fun)
-                                       (when (consult--preview-allowed-p fun)
-                                         (funcall fun))
-                                       nil)))
-            (setq success (current-buffer)))
-        (unless success
-          (kill-buffer buffer))))))
-
-(defun consult--find-file-temporarily (name)
-  "Open file NAME temporarily for preview."
-  (let ((vars (delq nil
-                    (mapcar
-                     (pcase-lambda (`(,k . ,v))
-                       (if (boundp k)
-                           (list k v (default-value k) (symbol-value k))
-                         (message "consult-preview-variables: The variable `%s' is not bound" k)
-                         nil))
-                     consult-preview-variables))))
-    (condition-case err
-        (unwind-protect
-            (progn
-              (advice-add #'run-hooks :around #'consult--filter-find-file-hook)
-              (pcase-dolist (`(,k ,v . ,_) vars)
-                (set-default k v)
-                (set k v))
-              (consult--find-file-temporarily-1 name))
-          (advice-remove #'run-hooks #'consult--filter-find-file-hook)
-          (pcase-dolist (`(,k ,_ ,d ,v) vars)
-            (set-default k d)
-            (set k v)))
-      (error
-       (message "%s" (error-message-string err))
-       nil))))
-
-(defun consult--temporary-files ()
-  "Return a function to open files temporarily for preview."
-  (let ((dir default-directory)
-        (hook (make-symbol "consult--temporary-files-upgrade-hook"))
-        (orig-buffers (buffer-list))
-        temporary-buffers)
-    (fset hook
-          (lambda (_)
-            ;; Fully initialize previewed files and keep them alive.
-            (unless (consult--completion-window-p)
-              (let (live-files)
-                (pcase-dolist (`(,file . ,buf) temporary-buffers)
-                  (when-let (wins (and (buffer-live-p buf)
-                                       (get-buffer-window-list buf)))
-                    (push (cons file (mapcar
-                                      (lambda (win)
-                                        (cons win (window-state-get win t)))
-                                      wins))
-                          live-files)))
-                (pcase-dolist (`(,_ . ,buf) temporary-buffers)
-                  (kill-buffer buf))
-                (setq temporary-buffers nil)
-                (pcase-dolist (`(,file . ,wins) live-files)
-                  (when-let (buf (consult--file-action file))
-                    (push buf orig-buffers)
-                    (pcase-dolist (`(,win . ,state) wins)
-                      (setf (car (alist-get 'buffer state)) buf)
-                      (window-state-put state win))))))))
-    (lambda (&optional name)
-      (if name
-          (let ((default-directory dir))
-            (setq name (abbreviate-file-name (expand-file-name name)))
-            (or
-             ;; Find existing fully initialized buffer (non-previewed).  We have
-             ;; to check for fully initialized buffer before accessing the
-             ;; previewed buffers, since `embark-act' can open a buffer which is
-             ;; currently previewed, such that we end up with two buffers for
-             ;; the same file - one previewed and only partially initialized and
-             ;; one fully initialized.  In this case we prefer the fully
-             ;; initialized buffer.  For directories `get-file-buffer' returns nil,
-             ;; therefore we have to special case Dired.
-             (if (and (fboundp 'dired-find-buffer-nocreate) (file-directory-p name))
-                 (dired-find-buffer-nocreate name)
-               (get-file-buffer name))
-             ;; Find existing previewed buffer.  Previewed buffers are not fully
-             ;; initialized (hooks are delayed) in order to ensure fast preview.
-             (cdr (assoc name temporary-buffers))
-             ;; Finally, if no existing buffer has been found, open the file for
-             ;; preview.
-             (when-let (buf (consult--find-file-temporarily name))
-               ;; Only add new buffer if not already in the list
-               (unless (or (rassq buf temporary-buffers) (memq buf orig-buffers))
-                 (add-hook 'window-selection-change-functions hook)
-                 (push (cons name buf) temporary-buffers)
-                 ;; Disassociate buffer from file by setting `buffer-file-name'
-                 ;; and `dired-directory' to nil and rename the buffer.  This
-                 ;; lets us open an already previewed buffer with the Embark
-                 ;; default action C-. RET.
-                 (with-current-buffer buf
-                   (rename-buffer
-                    (format " Preview:%s"
-                            (file-name-nondirectory (directory-file-name name)))
-                    'unique))
-                 ;; The buffer disassociation is delayed to avoid breaking modes
-                 ;; like `pdf-view-mode' or `doc-view-mode' which rely on
-                 ;; `buffer-file-name'.  Executing (set-visited-file-name nil)
-                 ;; early also prevents the major mode initialization.
-                 (let ((hook (make-symbol "consult--temporary-files-disassociate-hook")))
-                   (fset hook (lambda ()
-                                (when (buffer-live-p buf)
-                                  (with-current-buffer buf
-                                    (remove-hook 'pre-command-hook hook)
-                                    (setq-local buffer-read-only t
-                                                dired-directory nil
-                                                buffer-file-name nil)))))
-                   (add-hook 'pre-command-hook hook))
-                 ;; Only keep a few buffers alive
-                 (while (length> temporary-buffers consult-preview-max-count)
-                   (kill-buffer (cdar (last temporary-buffers)))
-                   (setq temporary-buffers (nbutlast temporary-buffers))))
-               buf)))
-        (remove-hook 'window-selection-change-functions hook)
-        (pcase-dolist (`(,_ . ,buf) temporary-buffers)
-          (kill-buffer buf))
-        (setq temporary-buffers nil)))))
-
-(defun consult--invisible-open-permanently ()
-  "Open overlays which hide the current line.
-See `isearch-open-necessary-overlays' and `isearch-open-overlay-temporary'."
-  (if (and (derived-mode-p 'org-mode) (fboundp 'org-fold-show-set-visibility))
-      ;; New Org 9.6 fold-core API
-      (let ((inhibit-redisplay t)) ;; HACK: Prevent flicker due to premature redisplay
-        (org-fold-show-set-visibility 'canonical))
-    (dolist (ov (overlays-in (pos-bol) (pos-eol)))
-      (when-let (fun (overlay-get ov 'isearch-open-invisible))
-        (when (invisible-p (overlay-get ov 'invisible))
-          (funcall fun ov))))))
-
-(defun consult--invisible-open-temporarily ()
-  "Temporarily open overlays which hide the current line.
-See `isearch-open-necessary-overlays' and `isearch-open-overlay-temporary'."
-  (if (and (derived-mode-p 'org-mode)
-           (fboundp 'org-fold-show-set-visibility)
-           (fboundp 'org-fold-core-get-regions)
-           (fboundp 'org-fold-core-region))
-      ;; New Org 9.6 fold-core API
-      ;; TODO The provided Org API `org-fold-show-set-visibility' cannot be used
-      ;; efficiently.  We obtain all regions in the whole buffer in order to
-      ;; restore them.  A better show API would return all the applied
-      ;; modifications such that we can restore the ones which got modified.
-      (progn
-        (unless consult--org-fold-regions
-          (setq consult--org-fold-regions
-                (delq nil (org-fold-core-get-regions
-                           :with-markers t :from (point-min) :to (point-max))))
-          (when consult--org-fold-regions
-            (let ((hook (make-symbol "consult--invisible-open-temporarily-cleanup-hook"))
-                  (buffer (current-buffer))
-                  (depth (recursion-depth)))
-              (fset hook
-                    (lambda ()
-                      (when (= (recursion-depth) depth)
-                        (remove-hook 'minibuffer-exit-hook hook)
-                        (run-at-time
-                         0 nil
-                         (lambda ()
-                           (when (buffer-live-p buffer)
-                             (with-current-buffer buffer
-                               (pcase-dolist (`(,beg ,end ,_) consult--org-fold-regions)
-                                 (when (markerp beg) (set-marker beg nil))
-                                 (when (markerp end) (set-marker end nil)))
-                               (kill-local-variable 'consult--org-fold-regions))))))))
-              (add-hook 'minibuffer-exit-hook hook))))
-        (let ((inhibit-redisplay t)) ;; HACK: Prevent flicker due to premature redisplay
-          (org-fold-show-set-visibility 'canonical))
-        (list (lambda ()
-                (pcase-dolist (`(,beg ,end ,spec) consult--org-fold-regions)
-                  (org-fold-core-region beg end t spec)))))
-    (let (restore)
-      (dolist (ov (overlays-in (pos-bol) (pos-eol)))
-        (let ((inv (overlay-get ov 'invisible)))
-          (when (and (invisible-p inv) (overlay-get ov 'isearch-open-invisible))
-            (push (if-let (fun (overlay-get ov 'isearch-open-invisible-temporary))
-                      (progn
-                        (funcall fun ov nil)
-                        (lambda () (funcall fun ov t)))
-                    (overlay-put ov 'invisible nil)
-                    (lambda () (overlay-put ov 'invisible inv)))
-                  restore))))
-      restore)))
-
-(defun consult--jump-ensure-buffer (pos)
-  "Ensure that buffer of marker POS is displayed, return t if successful."
-  (or (not (markerp pos))
-      ;; Switch to buffer if it is not visible
-      (when-let ((buf (marker-buffer pos)))
-        (or (and (eq (current-buffer) buf) (eq (window-buffer) buf))
-            (consult--buffer-action buf 'norecord)
-            t))))
-
-(defun consult--jump (pos)
-  "Jump to POS.
-First push current position to mark ring, then move to new
-position and run `consult-after-jump-hook'."
-  (when pos
-    ;; Extract marker from list with with overlay positions, see `consult--line-match'
-    (when (consp pos) (setq pos (car pos)))
-    ;; When the marker is in the same buffer, record previous location
-    ;; such that the user can jump back quickly.
-    (when (or (not (markerp pos)) (eq (current-buffer) (marker-buffer pos)))
-      ;; push-mark mutates markers in the mark-ring and the mark-marker.
-      ;; Therefore we transform the marker to a number to be safe.
-      ;; We all love side effects!
-      (setq pos (+ pos 0))
-      (push-mark (point) t))
-    (when (consult--jump-ensure-buffer pos)
-      (unless (= (goto-char pos) (point)) ;; Widen if jump failed
-        (widen)
-        (goto-char pos))
-      (consult--invisible-open-permanently)
-      (run-hooks 'consult-after-jump-hook)))
-  nil)
-
-(defun consult--jump-preview ()
-  "The preview function used if selecting from a list of candidate positions.
-The function can be used as the `:state' argument of `consult--read'."
-  (let (restore)
-    (lambda (action cand)
-      (when (eq action 'preview)
-        (mapc #'funcall restore)
-        (setq restore nil)
-        ;; TODO Better buffer preview support
-        ;; 1. Use consult--buffer-preview instead of consult--jump-ensure-buffer
-        ;; 2. Remove function consult--jump-ensure-buffer
-        ;; 3. Remove consult-buffer-other-* from consult-customize-alist
-        (when-let ((pos (or (car-safe cand) cand)) ;; Candidate can be previewed
-                   ((consult--jump-ensure-buffer pos)))
-          (let ((saved-min (point-min-marker))
-                (saved-max (point-max-marker))
-                (saved-pos (point-marker)))
-            (set-marker-insertion-type saved-max t) ;; Grow when text is inserted
-            (push (lambda ()
-                    (when-let ((buf (marker-buffer saved-pos)))
-                      (with-current-buffer buf
-                        (narrow-to-region saved-min saved-max)
-                        (goto-char saved-pos)
-                        (set-marker saved-pos nil)
-                        (set-marker saved-min nil)
-                        (set-marker saved-max nil))))
-                  restore))
-          (unless (= (goto-char pos) (point)) ;; Widen if jump failed
-            (widen)
-            (goto-char pos))
-          (setq restore (nconc (consult--invisible-open-temporarily) restore))
-          ;; Ensure that cursor is properly previewed (gh:minad/consult#764)
-          (unless (eq cursor-in-non-selected-windows 'box)
-            (let ((orig cursor-in-non-selected-windows)
-                  (buf (current-buffer)))
-              (push
-               (if (local-variable-p 'cursor-in-non-selected-windows)
-                   (lambda ()
-                     (when (buffer-live-p buf)
-                       (with-current-buffer buf
-                         (setq-local cursor-in-non-selected-windows orig))))
-                 (lambda ()
-                   (when (buffer-live-p buf)
-                     (with-current-buffer buf
-                       (kill-local-variable 'cursor-in-non-selected-windows)))))
-               restore)
-              (setq-local cursor-in-non-selected-windows 'box)))
-          ;; Match previews
-          (let ((overlays
-                 (list (save-excursion
-                         (let ((vbeg (progn (beginning-of-visual-line) (point)))
-                               (vend (progn (end-of-visual-line) (point)))
-                               (end (pos-eol)))
-                           (consult--make-overlay vbeg (if (= vend end) (1+ end) vend)
-                                                  'face 'consult-preview-line
-                                                  'window (selected-window)
-                                                  'priority 1))))))
-            (dolist (match (cdr-safe cand))
-              (push (consult--make-overlay (+ (point) (car match))
-                                           (+ (point) (cdr match))
-                                           'face 'consult-preview-match
-                                           'window (selected-window)
-                                           'priority 2)
-                    overlays))
-            (push (lambda () (mapc #'delete-overlay overlays)) restore))
-          (run-hooks 'consult-after-jump-hook))))))
-
-(defun consult--jump-state ()
-  "The state function used if selecting from a list of candidate positions."
-  (consult--state-with-return (consult--jump-preview) #'consult--jump))
-
-(defun consult--get-location (cand)
-  "Return location from CAND."
-  (let ((loc (get-text-property 0 'consult-location cand)))
-    (when (consp (car loc))
-      ;; Transform cheap marker to real marker
-      (setcar loc (set-marker (make-marker) (cdar loc) (caar loc))))
-    loc))
-
-(defun consult--location-state (candidates)
-  "Location state function.
-The cheap location markers from CANDIDATES are upgraded on window
-selection change to full Emacs markers."
-  (let ((jump (consult--jump-state))
-        (hook (make-symbol "consult--location-upgrade-hook")))
-    (fset hook
-          (lambda (_)
-            (unless (consult--completion-window-p)
-              (remove-hook 'window-selection-change-functions hook)
-              (mapc #'consult--get-location
-                    (if (functionp candidates) (funcall candidates) candidates)))))
-    (lambda (action cand)
-      (pcase action
-        ('setup (add-hook 'window-selection-change-functions hook))
-        ('exit (remove-hook 'window-selection-change-functions hook)))
-      (funcall jump action cand))))
-
-(defun consult--state-with-return (state return)
-  "Compose STATE function with RETURN function."
-  (lambda (action cand)
-    (funcall state action cand)
-    (when (and cand (eq action 'return))
-      (funcall return cand))))
-
-(defmacro consult--define-state (type)
-  "Define state function for TYPE."
-  `(defun ,(intern (format "consult--%s-state" type)) ()
-     ,(format "State function for %ss with preview.
-The result can be passed as :state argument to `consult--read'." type)
-     (consult--state-with-return (,(intern (format "consult--%s-preview" type)))
-                                 #',(intern (format "consult--%s-action" type)))))
-
-(defun consult--preview-key-normalize (preview-key)
-  "Normalize PREVIEW-KEY, return alist of keys and debounce times."
-  (let ((keys)
-        (debounce 0))
-    (setq preview-key (ensure-list preview-key))
-    (while preview-key
-      (if (eq (car preview-key) :debounce)
-          (setq debounce (cadr preview-key)
-                preview-key (cddr preview-key))
-        (let ((key (car preview-key)))
-          (unless (eq key 'any)
-            (setq key (consult--key-parse key)))
-          (push (cons key debounce) keys))
-        (pop preview-key)))
-    keys))
-
-(defun consult--preview-key-debounce (preview-key cand)
-  "Return debounce value of PREVIEW-KEY given the current candidate CAND."
-  (when (and (consp preview-key) (memq :keys preview-key))
-    (setq preview-key (funcall (plist-get preview-key :predicate) cand)))
-  (let ((map (make-sparse-keymap))
-        (keys (this-single-command-keys))
-        any)
-    (pcase-dolist (`(,k . ,d) (consult--preview-key-normalize preview-key))
-      (if (eq k 'any)
-          (setq any d)
-        (define-key map k `(lambda () ,d))))
-    (setq keys (lookup-key map keys))
-    (if (functionp keys) (funcall keys) any)))
-
-(defun consult--preview-append-local-pch (fun)
-  "Append FUN to local `post-command-hook' list."
-  ;; Symbol indirection because of bug#46407.
-  (let ((hook (make-symbol "consult--preview-post-command-hook")))
-    (fset hook fun)
-    ;; TODO Emacs 28 has a bug, where the hook--depth-alist is not cleaned up properly
-    ;; Do not use the broken add-hook here.
-    ;;(add-hook 'post-command-hook hook 'append 'local)
-    (setq-local post-command-hook
-                (append
-                 (remove t post-command-hook)
-                 (list hook)
-                 (and (memq t post-command-hook) '(t))))))
-
-(defun consult--with-preview-1 (preview-key state transform candidate save-input fun)
-  "Add preview support for FUN.
-See `consult--with-preview' for the arguments
-PREVIEW-KEY, STATE, TRANSFORM, CANDIDATE and SAVE-INPUT."
-  (let ((mb-input "") mb-narrow selected timer previewed)
-    (minibuffer-with-setup-hook
-        (if (and state preview-key)
-            (lambda ()
-              (let ((hook (make-symbol "consult--preview-minibuffer-exit-hook"))
-                    (depth (recursion-depth)))
-                (fset hook
-                      (lambda ()
-                        (when (= (recursion-depth) depth)
-                          (remove-hook 'minibuffer-exit-hook hook)
-                          (when timer
-                            (cancel-timer timer)
-                            (setq timer nil))
-                          (with-selected-window (consult--original-window)
-                            ;; STEP 3: Reset preview
-                            (when previewed
-                              (funcall state 'preview nil))
-                            ;; STEP 4: Notify the preview function of the minibuffer exit
-                            (funcall state 'exit nil)))))
-                (add-hook 'minibuffer-exit-hook hook))
-              ;; STEP 1: Setup the preview function
-              (with-selected-window (consult--original-window)
-                (funcall state 'setup nil))
-              (setq consult--preview-function
-                    (lambda ()
-                      (when-let ((cand (funcall candidate)))
-                        ;; Drop properties to prevent bugs regarding candidate
-                        ;; lookup, which must handle candidates without
-                        ;; properties.  Otherwise the arguments passed to the
-                        ;; lookup function are confusing, since during preview
-                        ;; the candidate has properties but for the final lookup
-                        ;; after completion it does not.
-                        (setq cand (substring-no-properties cand))
-                        (with-selected-window (active-minibuffer-window)
-                          (let ((input (minibuffer-contents-no-properties))
-                                (narrow consult--narrow)
-                                (win (consult--original-window)))
-                            (with-selected-window win
-                              (when-let ((transformed (funcall transform narrow input cand))
-                                         (debounce (consult--preview-key-debounce preview-key transformed)))
-                                (when timer
-                                  (cancel-timer timer)
-                                  (setq timer nil))
-                                ;; The transformed candidate may have text
-                                ;; properties, which change the preview display.
-                                ;; This matters for example for `consult-grep',
-                                ;; where the current candidate and input may
-                                ;; stay equal, but the highlighting of the
-                                ;; candidate changes while the candidates list
-                                ;; is lagging a bit behind and updates
-                                ;; asynchronously.
-                                ;;
-                                ;; In older Consult versions we instead compared
-                                ;; the input without properties, since I worried
-                                ;; that comparing the transformed candidates
-                                ;; could be potentially expensive. However
-                                ;; comparing the transformed candidates is more
-                                ;; correct. The transformed candidate is the
-                                ;; thing which is actually previewed.
-                                (unless (equal-including-properties previewed transformed)
-                                  (if (> debounce 0)
-                                      (setq timer
-                                            (run-at-time
-                                             debounce nil
-                                             (lambda ()
-                                               ;; Preview only when a completion
-                                               ;; window is selected and when
-                                               ;; the preview window is alive.
-                                               (when (and (consult--completion-window-p)
-                                                          (window-live-p win))
-                                                 (with-selected-window win
-                                                   ;; STEP 2: Preview candidate
-                                                   (funcall state 'preview (setq previewed transformed)))))))
-                                    ;; STEP 2: Preview candidate
-                                    (funcall state 'preview (setq previewed transformed)))))))))))
-              (consult--preview-append-local-pch
-               (lambda ()
-                 (setq mb-input (minibuffer-contents-no-properties)
-                       mb-narrow consult--narrow)
-                 (funcall consult--preview-function))))
-          (lambda ()
-            (consult--preview-append-local-pch
-             (lambda ()
-               (setq mb-input (minibuffer-contents-no-properties)
-                     mb-narrow consult--narrow)))))
-      (unwind-protect
-          (setq selected (when-let (result (funcall fun))
-                           (when-let ((save-input)
-                                      (list (symbol-value save-input))
-                                      ((equal (car list) result)))
-                             (set save-input (cdr list)))
-                           (funcall transform mb-narrow mb-input result)))
-        (when save-input
-          (add-to-history save-input mb-input))
-        (when state
-          ;; STEP 5: The preview function should perform its final action
-          (funcall state 'return selected))))))
-
-(defmacro consult--with-preview (preview-key state transform candidate save-input &rest body)
-  "Add preview support to BODY.
-
-STATE is the state function.
-TRANSFORM is the transformation function.
-CANDIDATE is the function returning the current candidate.
-PREVIEW-KEY are the keys which triggers the preview.
-SAVE-INPUT can be a history variable symbol to save the input.
-
-The state function takes two arguments, an action argument and the
-selected candidate.  The candidate argument can be nil if no candidate is
-selected or if the selection was aborted.  The function is called in
-sequence with the following arguments:
-
-  1. \\='setup nil         After entering the mb (minibuffer-setup-hook).
-⎧ 2. \\='preview CAND/nil  Preview candidate CAND or reset if CAND is nil.
-⎪    \\='preview CAND/nil
-⎪    \\='preview CAND/nil
-⎪    ...
-⎩ 3. \\='preview nil       Reset preview.
-  4. \\='exit nil          Before exiting the mb (minibuffer-exit-hook).
-  5. \\='return CAND/nil   After leaving the mb, CAND has been selected.
-
-The state function is always executed with the original window selected,
-see `consult--original-window'.  The state function is called once in
-the beginning of the minibuffer setup with the `setup' argument.  This is
-useful in order to perform certain setup operations which require that
-the minibuffer is initialized.  During completion candidates are
-previewed.  Then the function is called with the `preview' argument and a
-candidate CAND or nil if no candidate is selected.  Furthermore if nil is
-passed for CAND, then the preview must be undone and the original state
-must be restored.  The call with the `exit' argument happens once at the
-end of the completion process, just before exiting the minibuffer.  The
-minibuffer is still alive at that point.  Both `setup' and `exit' are
-only useful for setup and cleanup operations.  They don't receive a
-candidate as argument.  After leaving the minibuffer, the selected
-candidate or nil is passed to the state function with the action
-argument `return'.  At this point the state function can perform the
-actual action on the candidate.  The state function with the `return'
-argument is the continuation of `consult--read'.  Via `unwind-protect' it
-is guaranteed, that if the `setup' action of a state function is
-invoked, the state function will also be called with `exit' and
-`return'."
-  (declare (indent 5))
-  `(consult--with-preview-1 ,preview-key ,state ,transform ,candidate ,save-input (lambda () ,@body)))
-
-;;;; Narrowing and grouping
-
-(defun consult--prefix-group (cand transform)
-  "Return title for CAND or TRANSFORM the candidate.
-The candidate must have a `consult--prefix-group' property."
-  (if transform
-      (substring cand (1+ (length (get-text-property 0 'consult--prefix-group cand))))
-    (get-text-property 0 'consult--prefix-group cand)))
-
-(defun consult--type-group (types)
-  "Return group function for TYPES."
-  (lambda (cand transform)
-    (if transform cand
-      (alist-get (get-text-property 0 'consult--type cand) types))))
-
-(defun consult--type-narrow (types)
-  "Return narrowing configuration from TYPES."
-  (list :predicate
-        (lambda (cand) (eq (get-text-property 0 'consult--type cand) consult--narrow))
-        :keys types))
-
-(defun consult--widen-key ()
-  "Return widening key, if `consult-widen-key' is not set.
-The default is twice the `consult-narrow-key'."
-  (cond
-   (consult-widen-key
-    (consult--key-parse consult-widen-key))
-   (consult-narrow-key
-    (let ((key (consult--key-parse consult-narrow-key)))
-      (vconcat key key)))))
-
-(defun consult-narrow (key)
-  "Narrow current completion with KEY.
-
-This command is used internally by the narrowing system of `consult--read'."
-  (declare (completion ignore))
-  (interactive
-   (list (unless (equal (this-single-command-keys) (consult--widen-key))
-           last-command-event)))
-  (consult--require-minibuffer)
-  (setq consult--narrow key)
-  (when consult--narrow-predicate
-    (setq minibuffer-completion-predicate (and consult--narrow consult--narrow-predicate)))
-  (when consult--narrow-overlay
-    (delete-overlay consult--narrow-overlay))
-  (when consult--narrow
-    (setq consult--narrow-overlay
-          (consult--make-overlay
-           (1- (minibuffer-prompt-end)) (minibuffer-prompt-end)
-           'before-string
-           (propertize (format " [%s]" (alist-get consult--narrow
-                                                  consult--narrow-keys))
-                       'face 'consult-narrow-indicator))))
-  (run-hooks 'consult--completion-refresh-hook))
-
-(defconst consult--narrow-delete
-  `(menu-item
-    "" nil :filter
-    ,(lambda (&optional _)
-       (when (equal (minibuffer-contents-no-properties) "")
-         (lambda ()
-           (interactive)
-           (consult-narrow nil))))))
-
-(defconst consult--narrow-space
-  `(menu-item
-    "" nil :filter
-    ,(lambda (&optional _)
-       (let ((str (minibuffer-contents-no-properties)))
-         (when-let (pair (or (and (length= str 1)
-                                  (assoc (aref str 0) consult--narrow-keys))
-                             (and (equal str "")
-                                  (assoc ?\s consult--narrow-keys))))
-           (lambda ()
-             (interactive)
-             (delete-minibuffer-contents)
-             (consult-narrow (car pair))))))))
-
-(defun consult-narrow-help ()
-  "Print narrowing help as a `minibuffer-message'.
-
-This command can be bound to a key in `consult-narrow-map',
-to make it available for commands with narrowing."
-  (declare (completion ignore))
-  (interactive)
-  (consult--require-minibuffer)
-  (let ((minibuffer-message-timeout 1000000))
-    (minibuffer-message
-     (mapconcat (lambda (x)
-                  (concat
-                   (propertize (key-description (list (car x))) 'face 'consult-key)
-                   " "
-                   (propertize (cdr x) 'face 'consult-help)))
-                consult--narrow-keys
-                " "))))
-
-(defun consult--narrow-setup (settings map)
-  "Setup narrowing with SETTINGS and keymap MAP."
-  (if (memq :keys settings)
-      (setq consult--narrow-predicate (plist-get settings :predicate)
-            consult--narrow-keys (plist-get settings :keys))
-    (setq consult--narrow-predicate nil
-          consult--narrow-keys settings))
-  (when-let ((key consult-narrow-key))
-    (setq key (consult--key-parse key))
-    (dolist (pair consult--narrow-keys)
-      (define-key map (vconcat key (vector (car pair)))
-                  (cons (cdr pair) #'consult-narrow))))
-  (when-let ((widen (consult--widen-key)))
-    (define-key map widen (cons "All" #'consult-narrow)))
-  (when-let ((init (and (memq :keys settings) (plist-get settings :initial))))
-    (consult-narrow init)))
-
-;;;; Splitting completion style
-
-(defun consult--split-perl (str &optional _plist)
-  "Split input STR in async input and filtering part.
-
-The function returns a list with three elements: The async
-string, the start position of the completion filter string and a
-force flag.  If the first character is a punctuation character it
-determines the separator.  Examples: \"/async/filter\",
-\"#async#filter\"."
-  (if (string-match-p "^[[:punct:]]" str)
-      (save-match-data
-        (let ((q (regexp-quote (substring str 0 1))))
-          (string-match (concat "^" q "\\([^" q "]*\\)\\(" q "\\)?") str)
-          `(,(match-string 1 str)
-            ,(match-end 0)
-            ;; Force update it two punctuation characters are entered.
-            ,(match-end 2)
-            ;; List of highlights
-            (0 . ,(match-beginning 1))
-            ,@(and (match-end 2) `((,(match-beginning 2) . ,(match-end 2)))))))
-    `(,str ,(length str))))
-
-(defun consult--split-nil (str &optional _plist)
-  "Treat the complete input STR as async input."
-  `(,str ,(length str)))
-
-(defun consult--split-separator (str plist)
-  "Split input STR in async input and filtering part at first separator.
-PLIST is the splitter configuration, including the separator."
-  (let ((sep (regexp-quote (char-to-string (plist-get plist :separator)))))
-    (save-match-data
-      (if (string-match (format "^\\([^%s]+\\)\\(%s\\)?" sep sep) str)
-          `(,(match-string 1 str)
-            ,(match-end 0)
-            ;; Force update it space is entered.
-            ,(match-end 2)
-            ;; List of highlights
-            ,@(and (match-end 2) `((,(match-beginning 2) . ,(match-end 2)))))
-        `(,str ,(length str))))))
-
-(defun consult--split-setup (split)
-  "Setup splitting completion style with splitter function SPLIT."
-  (let* ((styles completion-styles)
-         (catdef completion-category-defaults)
-         (catovr completion-category-overrides)
-         (try (lambda (str table pred point)
-                (let ((completion-styles styles)
-                      (completion-category-defaults catdef)
-                      (completion-category-overrides catovr)
-                      (pos (cadr (funcall split str))))
-                  (pcase (completion-try-completion (substring str pos) table pred
-                                                    (max 0 (- point pos)))
-                    ('t t)
-                    (`(,newstr . ,newpt)
-                     (cons (concat (substring str 0 pos) newstr)
-                           (+ pos newpt)))))))
-         (all (lambda (str table pred point)
-                (let ((completion-styles styles)
-                      (completion-category-defaults catdef)
-                      (completion-category-overrides catovr)
-                      (pos (cadr (funcall split str))))
-                  (completion-all-completions (substring str pos) table pred
-                                              (max 0 (- point pos)))))))
-    (setq-local completion-styles-alist (cons `(consult--split ,try ,all "")
-                                              completion-styles-alist)
-                completion-styles '(consult--split)
-                completion-category-defaults nil
-                completion-category-overrides nil)))
-
-;;;; Asynchronous filtering functions
-
-(defun consult--async-p (fun)
-  "Return t if FUN is an asynchronous completion function."
-  (and (functionp fun)
-       (condition-case nil
-           (progn (funcall fun "" nil 'metadata) nil)
-         (wrong-number-of-arguments t))))
-
-(defmacro consult--with-async (bind &rest body)
-  "Setup asynchronous completion in BODY.
-
-BIND is the asynchronous function binding."
-  (declare (indent 1))
-  (let ((async (car bind)))
-    `(let ((,async ,@(cdr bind))
-           (new-chunk (max read-process-output-max consult--process-chunk))
-           orig-chunk)
-       (minibuffer-with-setup-hook
-           ;; Append such that we overwrite the completion style setting of
-           ;; `fido-mode'.  See `consult--async-split' and
-           ;; `consult--split-setup'.
-           (:append
-            (lambda ()
-              (when (consult--async-p ,async)
-                (setq orig-chunk read-process-output-max
-                      read-process-output-max new-chunk)
-                (funcall ,async 'setup)
-                (let* ((mb (current-buffer))
-                       (fun (lambda ()
-                              (when-let (win (active-minibuffer-window))
-                                (when (eq (window-buffer win) mb)
-                                  (with-current-buffer mb
-                                    (let ((inhibit-modification-hooks t))
-                                      ;; Push input string to request refresh.
-                                      (funcall ,async (minibuffer-contents-no-properties))))))))
-                       ;; We use a symbol in order to avoid adding lambdas to
-                       ;; the hook variable.  Symbol indirection because of
-                       ;; bug#46407.
-                       (hook (make-symbol "consult--async-after-change-hook")))
-                  ;; Delay modification hook to ensure that minibuffer is still
-                  ;; alive after the change, such that we don't restart a new
-                  ;; asynchronous search right before exiting the minibuffer.
-                  (fset hook (lambda (&rest _) (run-at-time 0 nil fun)))
-                  (add-hook 'after-change-functions hook nil 'local)
-                  (funcall hook)))))
-         (let ((,async (if (consult--async-p ,async) ,async (lambda (_) ,async))))
-           (unwind-protect
-               ,(macroexp-progn body)
-             (funcall ,async 'destroy)
-             (when (and orig-chunk (eq read-process-output-max new-chunk))
-               (setq read-process-output-max orig-chunk))))))))
-
-(defun consult--async-sink ()
-  "Create ASYNC sink function.
-
-An async function must accept a single action argument.  For the
-\\='setup action it is guaranteed that the call originates from
-the minibuffer.  For the other actions no assumption about the
-context can be made.
-
-\\='setup   Setup the internal closure state.  Return nil.
-\\='destroy Destroy the internal closure state.  Return nil.
-\\='flush   Flush the list of candidates.  Return nil.
-\\='refresh Request UI refresh.  Return nil.
-nil      Return the list of candidates.
-list     Append the list to the already existing candidates list and return it.
-string   Update with the current user input string.  Return nil."
-  (let (candidates last buffer)
-    (lambda (action)
-      (pcase-exhaustive action
-        ('setup
-         (setq buffer (current-buffer))
-         nil)
-        ((or (pred stringp) 'destroy) nil)
-        ('flush (setq candidates nil last nil))
-        ('refresh
-         ;; Refresh the UI when the current minibuffer window belongs
-         ;; to the current asynchronous completion session.
-         (when-let (win (active-minibuffer-window))
-           (when (eq (window-buffer win) buffer)
-             (with-selected-window win
-               (run-hooks 'consult--completion-refresh-hook)
-               ;; Interaction between asynchronous completion functions and
-               ;; preview: We have to trigger preview immediately when
-               ;; candidates arrive (gh:minad/consult#436).
-               (when (and consult--preview-function candidates)
-                 (funcall consult--preview-function)))))
-         nil)
-        ('nil candidates)
-        ((pred consp)
-         (setq last (last (if last (setcdr last action) (setq candidates action))))
-         candidates)))))
-
-(defun consult--async-split-style ()
-  "Return the async splitting style function and initial string."
-  (or (alist-get consult-async-split-style consult-async-split-styles-alist)
-      (user-error "Splitting style `%s' not found" consult-async-split-style)))
-
-(defun consult--async-split-initial (initial)
-  "Return initial string for async command.
-INITIAL is the additional initial string."
-  (concat (plist-get (consult--async-split-style) :initial) initial))
-
-(defun consult--async-split-thingatpt (thing)
-  "Return THING at point with async initial prefix."
-  (when-let (str (thing-at-point thing))
-    (consult--async-split-initial str)))
-
-(defun consult--async-split (async &optional split)
-  "Create async function, which splits the input string.
-ASYNC is the async sink.
-SPLIT is the splitting function."
-  (unless split
-    (let* ((style (consult--async-split-style))
-           (fn (plist-get style :function)))
-      (setq split (lambda (str) (funcall fn str style)))))
-  (lambda (action)
-    (pcase action
-      ('setup
-       (consult--split-setup split)
-       (funcall async 'setup))
-      ((pred stringp)
-       (pcase-let* ((`(,async-str ,_ ,force . ,highlights)
-                     (funcall split action))
-                    (async-len (length async-str))
-                    (input-len (length action))
-                    (end (minibuffer-prompt-end)))
-         ;; Highlight punctuation characters
-         (remove-list-of-text-properties end (+ end input-len) '(face))
-         (dolist (hl highlights)
-           (put-text-property (+ end (car hl)) (+ end (cdr hl))
-                              'face 'consult-async-split))
-         (funcall async
-                  ;; Pass through if the input is long enough!
-                  (if (or force (>= async-len consult-async-min-input))
-                      async-str
-                    ;; Pretend that there is no input
-                    ""))))
-      (_ (funcall async action)))))
-
-(defun consult--async-indicator (async)
-  "Create async function with a state indicator overlay.
-ASYNC is the async sink."
-  (let (ov)
-    (lambda (action &optional state)
-      (pcase action
-        ('indicator
-         (overlay-put ov 'display
-                      (pcase-exhaustive state
-                        ('running  #("*" 0 1 (face consult-async-running)))
-                        ('finished #(":" 0 1 (face consult-async-finished)))
-                        ('killed   #(";" 0 1 (face consult-async-failed)))
-                        ('failed   #("!" 0 1 (face consult-async-failed))))))
-        ('setup
-         (setq ov (make-overlay (- (minibuffer-prompt-end) 2)
-                                (- (minibuffer-prompt-end) 1)))
-         (funcall async 'setup))
-        ('destroy
-         (delete-overlay ov)
-         (funcall async 'destroy))
-        (_ (funcall async action))))))
-
-(defun consult--async-log (formatted &rest args)
-  "Log FORMATTED ARGS to variable `consult--async-log'."
-  (with-current-buffer (get-buffer-create consult--async-log)
-    (goto-char (point-max))
-    (insert (apply #'format formatted args))))
-
-(defun consult--async-process (async builder &rest props)
-  "Create process source async function.
-
-ASYNC is the async function which receives the candidates.
-BUILDER is the command line builder function.
-PROPS are optional properties passed to `make-process'."
-  (setq async (consult--async-indicator async))
-  (let (proc proc-buf last-args count)
-    (lambda (action)
-      (pcase action
-        ("" ;; If no input is provided kill current process
-         (when proc
-           (delete-process proc)
-           (kill-buffer proc-buf)
-           (setq proc nil proc-buf nil))
-         (setq last-args nil))
-        ((pred stringp)
-         (funcall async action)
-         (let* ((args (funcall builder action)))
-           (unless (stringp (car args))
-             (setq args (car args)))
-           (unless (equal args last-args)
-             (setq last-args args)
-             (when proc
-               (delete-process proc)
-               (kill-buffer proc-buf)
-               (setq proc nil proc-buf nil))
-             (when args
-               (let* ((flush t)
-                      (rest "")
-                      (proc-filter
-                       (lambda (_ out)
-                         (when flush
-                           (setq flush nil)
-                           (funcall async 'flush))
-                         (let ((lines (split-string out "[\r\n]+")))
-                           (if (not (cdr lines))
-                               (setq rest (concat rest (car lines)))
-                             (setcar lines (concat rest (car lines)))
-                             (let* ((len (length lines))
-                                    (last (nthcdr (- len 2) lines)))
-                               (setq rest (cadr last)
-                                     count (+ count len -1))
-                               (setcdr last nil)
-                               (funcall async lines))))))
-                      (proc-sentinel
-                       (lambda (_ event)
-                         (when flush
-                           (setq flush nil)
-                           (funcall async 'flush))
-                         (funcall async 'indicator
-                                  (cond
-                                   ((string-prefix-p "killed" event)   'killed)
-                                   ((string-prefix-p "finished" event) 'finished)
-                                   (t 'failed)))
-                         (when (and (string-prefix-p "finished" event) (not (equal rest "")))
-                           (cl-incf count)
-                           (funcall async (list rest)))
-                         (consult--async-log
-                          "consult--async-process sentinel: event=%s lines=%d\n"
-                          (string-trim event) count)
-                         (when (> (buffer-size proc-buf) 0)
-                           (with-current-buffer (get-buffer-create consult--async-log)
-                             (goto-char (point-max))
-                             (insert ">>>>> stderr >>>>>\n")
-                             (let ((beg (point)))
-                               (insert-buffer-substring proc-buf)
-                               (save-excursion
-                                 (goto-char beg)
-                                 (message #("%s" 0 2 (face error))
-                                          (buffer-substring-no-properties (pos-bol) (pos-eol)))))
-                             (insert "<<<<< stderr <<<<<\n")))))
-                      (process-adaptive-read-buffering nil))
-                 (funcall async 'indicator 'running)
-                 (consult--async-log "consult--async-process started: args=%S default-directory=%S\n"
-                                     args default-directory)
-                 (setq count 0
-                       proc-buf (generate-new-buffer " *consult-async-stderr*")
-                       proc (apply #'make-process
-                                   `(,@props
-                                     :connection-type pipe
-                                     :name ,(car args)
-                                     ;;; XXX tramp bug, the stderr buffer must be empty
-                                     :stderr ,proc-buf
-                                     :noquery t
-                                     :command ,args
-                                     :filter ,proc-filter
-                                     :sentinel ,proc-sentinel)))))))
-         nil)
-        ('destroy
-         (when proc
-           (delete-process proc)
-           (kill-buffer proc-buf)
-           (setq proc nil proc-buf nil))
-         (funcall async 'destroy))
-        (_ (funcall async action))))))
-
-(defun consult--async-highlight (async builder)
-  "Return a new ASYNC function with candidate highlighting.
-BUILDER is the command line builder function."
-  (let (highlight)
-    (lambda (action)
-      (cond
-       ((stringp action)
-        (setq highlight (cdr (funcall builder action)))
-        (funcall async action))
-       ((and (consp action) highlight)
-        (dolist (str action)
-          (funcall highlight str))
-        (funcall async action))
-       (t (funcall async action))))))
-
-(defun consult--async-throttle (async &optional throttle debounce)
-  "Create async function from ASYNC which throttles input.
-
-The THROTTLE delay defaults to `consult-async-input-throttle'.
-The DEBOUNCE delay defaults to `consult-async-input-debounce'."
-  (setq throttle (or throttle consult-async-input-throttle)
-        debounce (or debounce consult-async-input-debounce))
-  (let* ((input "") (timer (timer-create)) (last 0))
-    (lambda (action)
-      (pcase action
-        ((pred stringp)
-         (unless (equal action input)
-           (cancel-timer timer)
-           (funcall async "") ;; cancel running process
-           (setq input action)
-           (unless (equal action "")
-             (timer-set-function timer (lambda ()
-                                         (setq last (float-time))
-                                         (funcall async action)))
-             (timer-set-time
-              timer
-              (timer-relative-time
-               nil (max debounce (- (+ last throttle) (float-time)))))
-             (timer-activate timer)))
-         nil)
-        ('destroy
-         (cancel-timer timer)
-         (funcall async 'destroy))
-        (_ (funcall async action))))))
-
-(defun consult--async-refresh-immediate (async)
-  "Create async function from ASYNC, which refreshes the display.
-
-The refresh happens immediately when candidates are pushed."
-  (lambda (action)
-    (pcase action
-      ((or (pred consp) 'flush)
-       (prog1 (funcall async action)
-         (funcall async 'refresh)))
-      (_ (funcall async action)))))
-
-(defun consult--async-refresh-timer (async &optional delay)
-  "Create async function from ASYNC, which refreshes the display.
-
-The refresh happens after a DELAY, defaulting to `consult-async-refresh-delay'."
-  (let ((delay (or delay consult-async-refresh-delay))
-        (timer (timer-create)))
-    (timer-set-function timer async '(refresh))
-    (lambda (action)
-      (prog1 (funcall async action)
-        (pcase action
-          ((or (pred consp) 'flush)
-           (unless (memq timer timer-list)
-             (timer-set-time timer (timer-relative-time nil delay))
-             (timer-activate timer)))
-          ('destroy
-           (cancel-timer timer)))))))
-
-(defmacro consult--async-command (builder &rest args)
-  "Asynchronous command pipeline.
-ARGS is a list of `make-process' properties and transforms.
-BUILDER is the command line builder function, which takes the
-input string and must either return a list of command line
-arguments or a pair of the command line argument list and a
-highlighting function."
-  (declare (indent 1))
-  `(thread-first
-     (consult--async-sink)
-     (consult--async-refresh-timer)
-     ,@(seq-take-while (lambda (x) (not (keywordp x))) args)
-     (consult--async-process
-      ,builder
-      ,@(seq-drop-while (lambda (x) (not (keywordp x))) args))
-     (consult--async-throttle)
-     (consult--async-split)))
-
-(defmacro consult--async-transform (async &rest transform)
-  "Use FUN to TRANSFORM candidates of ASYNC."
-  (cl-with-gensyms (async-var action-var)
-    `(let ((,async-var ,async))
-       (lambda (,action-var)
-         (funcall ,async-var (if (consp ,action-var) (,@transform ,action-var) ,action-var))))))
-
-(defun consult--async-map (async fun)
-  "Map candidates of ASYNC by FUN."
-  (consult--async-transform async mapcar fun))
-
-(defun consult--async-filter (async fun)
-  "Filter candidates of ASYNC by FUN."
-  (consult--async-transform async seq-filter fun))
-
-;;;; Dynamic collections based
-
-(defun consult--dynamic-compute (async fun &optional debounce)
-  "Dynamic computation of candidates.
-ASYNC is the sink.
-FUN computes the candidates given the input.
-DEBOUNCE is the time after which an interrupted computation
-should be restarted."
-  (setq debounce (or debounce consult-async-input-debounce))
-  (setq async (consult--async-indicator async))
-  (let* ((request) (current) (timer)
-         (cancel (lambda () (when timer (cancel-timer timer) (setq timer nil))))
-         (start (lambda (req) (setq request req) (funcall async 'refresh))))
-    (lambda (action)
-      (pcase action
-        ((and 'nil (guard (not request)))
-         (funcall async nil))
-        ('nil
-         (funcall cancel)
-         (let ((state 'killed))
-           (unwind-protect
-               (progn
-                 (funcall async 'indicator 'running)
-                 (redisplay)
-                 ;; Run computation
-                 (let ((response (funcall fun request)))
-                   ;; Flush and update candidate list
-                   (funcall async 'flush)
-                   (setq state 'finished current request)
-                   (funcall async response)))
-             (funcall async 'indicator state)
-             ;; If the computation was killed, restart it after some time.
-             (when (eq state 'killed)
-               (setq timer (run-at-time debounce nil start request)))
-             (setq request nil))))
-        ((pred stringp)
-         (funcall cancel)
-         (if (or (equal action "") (equal action current))
-             (funcall async 'indicator 'finished)
-           (funcall start action)))
-        ('destroy
-         (funcall cancel)
-         (funcall async 'destroy))
-        (_ (funcall async action))))))
-
-(defun consult--dynamic-collection (fun)
-  "Dynamic collection with input splitting.
-FUN computes the candidates given the input."
-  (thread-first
-    (consult--async-sink)
-    (consult--dynamic-compute fun)
-    (consult--async-throttle)
-    (consult--async-split)))
-
-;;;; Special keymaps
-
-(defvar-keymap consult-async-map
-  :doc "Keymap added for commands with asynchronous candidates."
-  ;; Overwriting some unusable defaults of default minibuffer completion.
-  "<remap> <minibuffer-complete-word>" #'self-insert-command
-  ;; Remap Emacs 29 history and default completion for now
-  ;; (gh:minad/consult#613).
-  "<remap> <minibuffer-complete-defaults>" #'ignore
-  "<remap> <minibuffer-complete-history>" #'consult-history)
-
-(defvar-keymap consult-narrow-map
-  :doc "Narrowing keymap which is added to the local minibuffer map.
-Note that `consult-narrow-key' and `consult-widen-key' are bound dynamically."
-  "SPC" consult--narrow-space
-  "DEL" consult--narrow-delete)
-
-;;;; Internal API: consult--read
-
-(defun consult--annotate-align (cand ann)
-  "Align annotation ANN by computing the maximum CAND width."
-  (setq consult--annotate-align-width
-        (max consult--annotate-align-width
-             (* (ceiling (consult--display-width cand)
-                         consult--annotate-align-step)
-                consult--annotate-align-step)))
-  (when ann
-    (concat
-     #("   " 0 1 (display (space :align-to (+ left consult--annotate-align-width))))
-     ann)))
-
-(defun consult--add-history (async items)
-  "Add ITEMS to the minibuffer future history.
-ASYNC must be non-nil for async completion functions."
-  (delete-dups
-   (append
-    ;; the defaults are at the beginning of the future history
-    (ensure-list minibuffer-default)
-    ;; then our custom items
-    (remove "" (remq nil (ensure-list items)))
-    ;; Add all the completions for non-async commands.  For async commands this
-    ;; feature is not useful, since if one selects a completion candidate, the
-    ;; async search is restarted using that candidate string.  This usually does
-    ;; not yield a desired result since the async input uses a special format,
-    ;; e.g., `#grep#filter'.
-    (unless async
-      (all-completions ""
-                       minibuffer-completion-table
-                       minibuffer-completion-predicate)))))
-
-(defun consult--setup-keymap (keymap async narrow preview-key)
-  "Setup minibuffer keymap.
-
-KEYMAP is a command-specific keymap.
-ASYNC must be non-nil for async completion functions.
-NARROW are the narrow settings.
-PREVIEW-KEY are the preview keys."
-  (let ((old-map (current-local-map))
-        (map (make-sparse-keymap)))
-
-    ;; Add narrow keys
-    (when narrow
-      (consult--narrow-setup narrow map))
-
-    ;; Preview trigger keys
-    (when (and (consp preview-key) (memq :keys preview-key))
-      (setq preview-key (plist-get preview-key :keys)))
-    (setq preview-key (mapcar #'car (consult--preview-key-normalize preview-key)))
-    (when preview-key
-      (dolist (key preview-key)
-        (unless (or (eq key 'any) (lookup-key old-map key))
-          (define-key map key #'ignore))))
-
-    ;; Put the keymap together
-    (use-local-map
-     (make-composed-keymap
-      (delq nil (list keymap
-                      (and async consult-async-map)
-                      (and narrow consult-narrow-map)
-                      map))
-      old-map))))
-
-(defun consult--tofu-hide-in-minibuffer (&rest _)
-  "Hide the tofus in the minibuffer."
-  (let* ((min (minibuffer-prompt-end))
-         (max (point-max))
-         (pos max))
-    (while (and (> pos min) (consult--tofu-p (char-before pos)))
-      (cl-decf pos))
-    (when (< pos max)
-      (add-text-properties pos max '(invisible t rear-nonsticky t cursor-intangible t)))))
-
-(defun consult--read-annotate (fun cand)
-  "Annotate CAND with annotation function FUN."
-  (pcase (funcall fun cand)
-    (`(,_ ,_ ,suffix) suffix)
-    (ann ann)))
-
-(defun consult--read-affixate (fun cands)
-  "Affixate CANDS with annotation function FUN."
-  (mapcar (lambda (cand)
-            (let ((ann (funcall fun cand)))
-              (if (consp ann)
-                  ann
-                (setq ann (or ann ""))
-                (list cand ""
-                      ;; The default completion UI adds the
-                      ;; `completions-annotations' face if no other faces are
-                      ;; present.
-                      (if (text-property-not-all 0 (length ann) 'face nil ann)
-                          ann
-                        (propertize ann 'face 'completions-annotations))))))
-          cands))
-
-(cl-defun consult--read-1 (table &key
-                                 prompt predicate require-match history default
-                                 keymap category initial narrow add-history annotate
-                                 state preview-key sort lookup group inherit-input-method)
-  "See `consult--read' for the documentation of the arguments."
-  (minibuffer-with-setup-hook
-      (:append (lambda ()
-                 (add-hook 'after-change-functions #'consult--tofu-hide-in-minibuffer nil 'local)
-                 (consult--setup-keymap keymap (consult--async-p table) narrow preview-key)
-                 (setq-local minibuffer-default-add-function
-                             (apply-partially #'consult--add-history (consult--async-p table) add-history))))
-    (consult--with-async (async table)
-      (consult--with-preview
-          preview-key state
-          (lambda (narrow input cand)
-            (funcall lookup cand (funcall async nil) input narrow))
-          (apply-partially #'run-hook-with-args-until-success
-                           'consult--completion-candidate-hook)
-          (pcase-exhaustive history
-            (`(:input ,var) var)
-            ((pred symbolp)))
-        ;; Do not unnecessarily let-bind the lambdas to avoid over-capturing in
-        ;; the interpreter.  This will make closures and the lambda string
-        ;; representation larger, which makes debugging much worse.  Fortunately
-        ;; the over-capturing problem does not affect the bytecode interpreter
-        ;; which does a proper scope analysis.
-        (let* ((metadata `(metadata
-                           ,@(when category `((category . ,category)))
-                           ,@(when group `((group-function . ,group)))
-                           ,@(when annotate
-                               `((affixation-function
-                                  . ,(apply-partially #'consult--read-affixate annotate))
-                                 (annotation-function
-                                  . ,(apply-partially #'consult--read-annotate annotate))))
-                           ,@(unless sort '((cycle-sort-function . identity)
-                                            (display-sort-function . identity)))))
-               (consult--annotate-align-width 0)
-               (selected
-                (completing-read
-                 prompt
-                 (lambda (str pred action)
-                   (let ((result (complete-with-action action (funcall async nil) str pred)))
-                     (if (eq action 'metadata)
-                         (if (and (eq (car result) 'metadata) (cdr result))
-                             ;; Merge metadata
-                             `(metadata ,@(cdr metadata) ,@(cdr result))
-                           metadata)
-                       result)))
-                 predicate require-match initial
-                 (if (symbolp history) history (cadr history))
-                 default
-                 inherit-input-method)))
-          ;; Repair the null completion semantics. `completing-read' may return
-          ;; an empty string even if REQUIRE-MATCH is non-nil. One can always
-          ;; opt-in to null completion by passing the empty string for DEFAULT.
-          (when (and (eq require-match t) (not default) (equal selected ""))
-            (user-error "No selection"))
-          selected)))))
-
-(cl-defun consult--read (table &rest options &key
-                               prompt predicate require-match history default
-                               keymap category initial narrow add-history annotate
-                               state preview-key sort lookup group inherit-input-method)
-  "Enhanced completing read function to select from TABLE.
-
-The function is a thin wrapper around `completing-read'.  Keyword
-arguments are used instead of positional arguments for code
-clarity.  On top of `completing-read' it additionally supports
-computing the candidate list asynchronously, candidate preview
-and narrowing.  You should use `completing-read' instead of
-`consult--read' if you don't use asynchronous candidate
-computation or candidate preview.
-
-Keyword OPTIONS:
-
-PROMPT is the string which is shown as prompt in the minibuffer.
-PREDICATE is a filter function called for each candidate, returns
-nil or t.
-REQUIRE-MATCH equals t means that an exact match is required.
-HISTORY is the symbol of the history variable.
-DEFAULT is the default selected value.
-ADD-HISTORY is a list of items to add to the history.
-CATEGORY is the completion category symbol.
-SORT should be set to nil if the candidates are already sorted.
-This will disable sorting in the completion UI.
-LOOKUP is a lookup function passed the selected candidate string,
-the list of candidates, the current input string and the current
-narrowing value.
-ANNOTATE is a function passed a candidate string.  The function
-should either return an annotation string or a list of three
-strings (candidate prefix postfix).
-INITIAL is the initial input string.
-STATE is the state function, see `consult--with-preview'.
-GROUP is a completion metadata `group-function' as documented in
-the Elisp manual.
-PREVIEW-KEY are the preview keys.  Can be nil, `any', a single
-key or a list of keys.
-NARROW is an alist of narrowing prefix strings and description.
-KEYMAP is a command-specific keymap.
-INHERIT-INPUT-METHOD, if non-nil the minibuffer inherits the
-input method."
-  ;; supported types
-  (cl-assert (or (functionp table)     ;; dynamic table or asynchronous function
-                 (obarrayp table)      ;; obarray
-                 (hash-table-p table)  ;; hash table
-                 (not table)           ;; empty list
-                 (stringp (car table)) ;; string list
-                 (and (consp (car table)) (stringp (caar table)))   ;; string alist
-                 (and (consp (car table)) (symbolp (caar table))))) ;; symbol alist
-  (ignore prompt predicate require-match history default
-          keymap category initial narrow add-history annotate
-          state preview-key sort lookup group inherit-input-method)
-  (apply #'consult--read-1 table
-         (append
-          (consult--customize-get)
-          options
-          (list :prompt "Select: "
-                :preview-key consult-preview-key
-                :sort t
-                :lookup (lambda (selected &rest _) selected)))))
-
-;;;; Internal API: consult--prompt
-
-(cl-defun consult--prompt-1 (&key prompt history add-history initial default
-                                  keymap state preview-key transform inherit-input-method)
-  "See `consult--prompt' for documentation."
-  (minibuffer-with-setup-hook
-      (:append (lambda ()
-                 (consult--setup-keymap keymap nil nil preview-key)
-                 (setq-local minibuffer-default-add-function
-                             (apply-partially #'consult--add-history nil add-history))))
-    (consult--with-preview
-        preview-key state
-        (lambda (_narrow inp _cand) (funcall transform inp))
-        (lambda () "")
-        history
-        (read-from-minibuffer prompt initial nil nil history default inherit-input-method))))
-
-(cl-defun consult--prompt (&rest options &key prompt history add-history initial default
-                                 keymap state preview-key transform inherit-input-method)
-  "Read from minibuffer.
-
-Keyword OPTIONS:
-
-PROMPT is the string to prompt with.
-TRANSFORM is a function which is applied to the current input string.
-HISTORY is the symbol of the history variable.
-INITIAL is initial input.
-DEFAULT is the default selected value.
-ADD-HISTORY is a list of items to add to the history.
-STATE is the state function, see `consult--with-preview'.
-PREVIEW-KEY are the preview keys (nil, `any', a single key or a list of keys).
-KEYMAP is a command-specific keymap."
-  (ignore prompt history add-history initial default
-          keymap state preview-key transform inherit-input-method)
-  (apply #'consult--prompt-1
-         (append
-          (consult--customize-get)
-          options
-          (list :prompt "Input: "
-                :preview-key consult-preview-key
-                :transform #'identity))))
-
-;;;; Internal API: consult--multi
-
-(defsubst consult--multi-source (sources cand)
-  "Lookup source for CAND in SOURCES list."
-  (aref sources (consult--tofu-get cand)))
-
-(defun consult--multi-predicate (sources cand)
-  "Predicate function called for each candidate CAND given SOURCES."
-  (let* ((src (consult--multi-source sources cand))
-         (narrow (plist-get src :narrow))
-         (type (or (car-safe narrow) narrow -1)))
-    (or (eq consult--narrow type)
-        (not (or consult--narrow (plist-get src :hidden))))))
-
-(defun consult--multi-narrow (sources)
-  "Return narrow list from SOURCES."
-  (thread-last sources
-    (mapcar (lambda (src)
-              (when-let (narrow (plist-get src :narrow))
-                (if (consp narrow)
-                    narrow
-                  (when-let (name (plist-get src :name))
-                    (cons narrow name))))))
-    (delq nil)
-    (delete-dups)))
-
-(defun consult--multi-annotate (sources cand)
-  "Annotate candidate CAND from multi SOURCES."
-  (consult--annotate-align
-   cand
-   (let ((src (consult--multi-source sources cand)))
-     (if-let ((fun (plist-get src :annotate)))
-         (funcall fun (cdr (get-text-property 0 'multi-category cand)))
-       (plist-get src :name)))))
-
-(defun consult--multi-group (sources cand transform)
-  "Return title of candidate CAND or TRANSFORM the candidate given SOURCES."
-  (if transform cand
-    (plist-get (consult--multi-source sources cand) :name)))
-
-(defun consult--multi-preview-key (sources)
-  "Return preview keys from SOURCES."
-  (list :predicate
-        (lambda (cand)
-          (if (plist-member (cdr cand) :preview-key)
-              (plist-get (cdr cand) :preview-key)
-            consult-preview-key))
-        :keys
-        (delete-dups
-         (seq-mapcat (lambda (src)
-                       (let ((key (if (plist-member src :preview-key)
-                                      (plist-get src :preview-key)
-                                    consult-preview-key)))
-                         (ensure-list key)))
-                     sources))))
-
-(defun consult--multi-lookup (sources selected candidates _input narrow &rest _)
-  "Lookup SELECTED in CANDIDATES given SOURCES, with potential NARROW."
-  (if (or (string-blank-p selected)
-          (not (consult--tofu-p (aref selected (1- (length selected))))))
-      ;; Non-existing candidate without Tofu or default submitted (empty string)
-      (let* ((src (cond
-                   (narrow (seq-find (lambda (src)
-                                       (let ((n (plist-get src :narrow)))
-                                         (eq (or (car-safe n) n -1) narrow)))
-                                     sources))
-                   ((seq-find (lambda (src) (plist-get src :default)) sources))
-                   ((seq-find (lambda (src) (not (plist-get src :hidden))) sources))
-                   ((aref sources 0))))
-             (idx (seq-position sources src))
-             (def (and (string-blank-p selected) ;; default candidate
-                       (seq-find (lambda (cand) (eq idx (consult--tofu-get cand))) candidates))))
-        (if def
-            (cons (cdr (get-text-property 0 'multi-category def)) src)
-          `(,selected :match nil ,@src)))
-    (if-let (found (member selected candidates))
-        ;; Existing candidate submitted
-        (cons (cdr (get-text-property 0 'multi-category (car found)))
-              (consult--multi-source sources selected))
-      ;; Non-existing Tofu'ed candidate submitted, e.g., via Embark
-      `(,(substring selected 0 -1) :match nil ,@(consult--multi-source sources selected)))))
-
-(defun consult--multi-candidates (sources)
-  "Return `consult--multi' candidates from SOURCES."
-  (let ((idx 0) candidates)
-    (seq-doseq (src sources)
-      (let* ((face (and (plist-member src :face) `(face ,(plist-get src :face))))
-             (cat (plist-get src :category))
-             (items (plist-get src :items))
-             (items (if (functionp items) (funcall items) items)))
-        (dolist (item items)
-          (let* ((str (or (car-safe item) item))
-                 (cand (consult--tofu-append str idx)))
-            ;; Preserve existing `multi-category' datum of the candidate.
-            (if (and (eq str item) (get-text-property 0 'multi-category str))
-                (when face (add-text-properties 0 (length str) face cand))
-              ;; Attach `multi-category' datum and face.
-              (add-text-properties
-               0 (length str)
-               `(multi-category (,cat . ,(or (cdr-safe item) item)) ,@face) cand))
-            (push cand candidates))))
-      (cl-incf idx))
-    (nreverse candidates)))
-
-(defun consult--multi-enabled-sources (sources)
-  "Return vector of enabled SOURCES."
-  (vconcat
-   (seq-filter (lambda (src)
-                 (if-let (pred (plist-get src :enabled))
-                     (funcall pred)
-                   t))
-               (mapcar (lambda (src)
-                         (if (symbolp src) (symbol-value src) src))
-                       sources))))
-
-(defun consult--multi-state (sources)
-  "State function given SOURCES."
-  (when-let (states (delq nil (mapcar (lambda (src)
-                                        (when-let (fun (plist-get src :state))
-                                          (cons src (funcall fun))))
-                                      sources)))
-    (let (last-fun)
-      (pcase-lambda (action `(,cand . ,src))
-        (pcase action
-          ('setup
-           (pcase-dolist (`(,_ . ,fun) states)
-             (funcall fun 'setup nil)))
-          ('exit
-           (pcase-dolist (`(,_ . ,fun) states)
-             (funcall fun 'exit nil)))
-          ('preview
-           (let ((selected-fun (cdr (assq src states))))
-             ;; If the candidate source changed during preview communicate to
-             ;; the last source, that none of its candidates is previewed anymore.
-             (when (and last-fun (not (eq last-fun selected-fun)))
-               (funcall last-fun 'preview nil))
-             (setq last-fun selected-fun)
-             (when selected-fun
-               (funcall selected-fun 'preview cand))))
-          ('return
-           (let ((selected-fun (cdr (assq src states))))
-             ;; Finish all the sources, except the selected one.
-             (pcase-dolist (`(,_ . ,fun) states)
-               (unless (eq fun selected-fun)
-                 (funcall fun 'return nil)))
-             ;; Finish the source with the selected candidate
-             (when selected-fun
-               (funcall selected-fun 'return cand)))))))))
-
-(defun consult--multi (sources &rest options)
-  "Select from candidates taken from a list of SOURCES.
-
-OPTIONS is the plist of options passed to `consult--read'.  The following
-options are supported: :require-match, :history, :keymap, :initial,
-:add-history, :sort and :inherit-input-method.  The other options of
-`consult--read' are used by the implementation of `consult--multi' and
-should not be overwritten, except in in special scenarios.
-
-The function returns the selected candidate in the form (cons candidate
-source-plist).  The plist has the key :match with a value nil if the
-candidate does not exist, t if the candidate exists and `new' if the
-candidate has been created.  The sources of the source list can either be
-symbols of source variables or source values.  Source values must be
-plists with fields from the following list.
-
-Required source fields:
-* :category - Completion category symbol.
-* :items - List of strings to select from or function returning
-  list of strings.  Note that the strings can use text properties
-  to carry metadata, which is then available to the :annotate,
-  :action and :state functions.
-
-Optional source fields:
-* :name - Name of the source as a string, used for narrowing,
-  group titles and annotations.
-* :narrow - Narrowing character or (character . string) pair.
-* :enabled - Function which must return t if the source is enabled.
-* :hidden - When t candidates of this source are hidden by default.
-* :face - Face used for highlighting the candidates.
-* :annotate - Annotation function called for each candidate, returns string.
-* :history - Name of history variable to add selected candidate.
-* :default - Must be t if the first item of the source is the default value.
-* :action - Function called with the selected candidate.
-* :new - Function called with new candidate name, only if :require-match is nil.
-* :state - State constructor for the source, must return the
-  state function.  The state function is informed about state
-  changes of the UI and can be used to implement preview.
-* Other custom source fields can be added depending on the use
-  case.  Note that the source is returned by `consult--multi'
-  together with the selected candidate."
-  (let* ((sources (consult--multi-enabled-sources sources))
-         (candidates (consult--with-increased-gc
-                      (consult--multi-candidates sources)))
-         (selected
-          (apply #'consult--read
-                 candidates
-                 (append
-                  options
-                  (list
-                   :category    'multi-category
-                   :predicate   (apply-partially #'consult--multi-predicate sources)
-                   :annotate    (apply-partially #'consult--multi-annotate sources)
-                   :group       (apply-partially #'consult--multi-group sources)
-                   :lookup      (apply-partially #'consult--multi-lookup sources)
-                   :preview-key (consult--multi-preview-key sources)
-                   :narrow      (consult--multi-narrow sources)
-                   :state       (consult--multi-state sources))))))
-    (when-let (history (plist-get (cdr selected) :history))
-      (add-to-history history (car selected)))
-    (if (plist-member (cdr selected) :match)
-        (when-let (fun (plist-get (cdr selected) :new))
-          (funcall fun (car selected))
-          (plist-put (cdr selected) :match 'new))
-      (when-let (fun (plist-get (cdr selected) :action))
-        (funcall fun (car selected)))
-      (setq selected `(,(car selected) :match t ,@(cdr selected))))
-    selected))
-
-;;;; Customization macro
-
-(defun consult--customize-put (cmds prop form)
-  "Set property PROP to FORM of commands CMDS."
-  (dolist (cmd cmds)
-    (cond
-     ((and (boundp cmd) (consp (symbol-value cmd)))
-      (setf (plist-get (symbol-value cmd) prop) (eval form 'lexical)))
-     ((functionp cmd)
-      (setf (plist-get (alist-get cmd consult--customize-alist) prop) form))
-     (t (user-error "%s is neither a Command command nor a source" cmd))))
-  nil)
-
-(defmacro consult-customize (&rest args)
-  "Set properties of commands or sources.
-ARGS is a list of commands or sources followed by the list of
-keyword-value pairs.  For `consult-customize' to succeed, the
-customized sources and commands must exist.  When a command is
-invoked, the value of `this-command' is used to lookup the
-corresponding customization options."
-  (let (setter)
-    (while args
-      (let ((cmds (seq-take-while (lambda (x) (not (keywordp x))) args)))
-        (setq args (seq-drop-while (lambda (x) (not (keywordp x))) args))
-        (while (keywordp (car args))
-          (push `(consult--customize-put ',cmds ,(car args) ',(cadr args)) setter)
-          (setq args (cddr args)))))
-    (macroexp-progn setter)))
-
-(defun consult--customize-get ()
-  "Get configuration from `consult--customize-alist' for `this-command'."
-  (mapcar (lambda (x) (eval x 'lexical))
-          (alist-get this-command consult--customize-alist)))
-
-;;;; Commands
-
-;;;;; Command: consult-completion-in-region
-
-(defun consult--insertion-preview (start end)
-  "State function for previewing a candidate in a specific region.
-The candidates are previewed in the region from START to END.  This function is
-used as the `:state' argument for `consult--read' in the `consult-yank' family
-of functions and in `consult-completion-in-region'."
-  (unless (or (minibufferp)
-              ;; Disable preview if anything odd is going on with the markers.
-              ;; Otherwise we get "Marker points into wrong buffer errors".  See
-              ;; gh:minad/consult#375, where Org mode source blocks are
-              ;; completed in a different buffer than the original buffer.  This
-              ;; completion is probably also problematic in my Corfu completion
-              ;; package.
-              (not (eq (window-buffer) (current-buffer)))
-              (and (markerp start) (not (eq (marker-buffer start) (current-buffer))))
-              (and (markerp end) (not (eq (marker-buffer end) (current-buffer)))))
-    (let (ov)
-      (lambda (action cand)
-        (cond
-         ((and (not cand) ov)
-          (delete-overlay ov)
-          (setq ov nil))
-         ((and (eq action 'preview) cand)
-          (unless ov
-            (setq ov (consult--make-overlay start end
-                                            'invisible t
-                                            'window (selected-window))))
-          ;; Use `add-face-text-property' on a copy of "cand in order to merge face properties
-          (setq cand (copy-sequence cand))
-          (add-face-text-property 0 (length cand) 'consult-preview-insertion t cand)
-          ;; Use the `before-string' property since the overlay might be empty.
-          (overlay-put ov 'before-string cand)))))))
-
-;;;###autoload
-(defun consult-completion-in-region (start end collection &optional predicate)
-  "Use minibuffer completion as the UI for `completion-at-point'.
-
-The function is called with 4 arguments: START END COLLECTION
-PREDICATE.  The arguments and expected return value are as
-specified for `completion-in-region'.  Use this function as a
-value for `completion-in-region-function'."
-  (barf-if-buffer-read-only)
-  (let* ((initial (buffer-substring-no-properties start end))
-         (metadata (completion-metadata initial collection predicate))
-         ;; TODO: `minibuffer-completing-file-name' is mostly deprecated, but
-         ;; still in use. Packages should instead use the completion metadata.
-         (minibuffer-completing-file-name
-          (eq 'file (completion-metadata-get metadata 'category)))
-         (threshold (completion--cycle-threshold metadata))
-         (all (completion-all-completions initial collection predicate (length initial)))
-         ;; Wrap all annotation functions to ensure that they are executed
-         ;; in the original buffer.
-         (exit-fun (plist-get completion-extra-properties :exit-function))
-         (ann-fun (plist-get completion-extra-properties :annotation-function))
-         (aff-fun (plist-get completion-extra-properties :affixation-function))
-         (docsig-fun (plist-get completion-extra-properties :company-docsig))
-         (completion-extra-properties
-          `(,@(and ann-fun (list :annotation-function (consult--in-buffer ann-fun)))
-            ,@(and aff-fun (list :affixation-function (consult--in-buffer aff-fun)))
-            ;; Provide `:annotation-function' if `:company-docsig' is specified.
-            ,@(and docsig-fun (not ann-fun) (not aff-fun)
-                   (list :annotation-function
-                         (consult--in-buffer
-                          (lambda (cand)
-                            (concat (propertize " " 'display '(space :align-to center))
-                                    (funcall docsig-fun cand)))))))))
-    ;; error if `threshold' is t or the improper list `all' is too short
-    (if (and threshold
-             (or (not (consp (ignore-errors (nthcdr threshold all))))
-                 (and completion-cycling completion-all-sorted-completions)))
-        (completion--in-region start end collection predicate)
-      (let* ((limit (car (completion-boundaries initial collection predicate "")))
-             (this-command #'consult-completion-in-region)
-             (completion
-              (cond
-               ((atom all) nil)
-               ((and (consp all) (atom (cdr all)))
-                (concat (substring initial 0 limit) (car all)))
-               (t
-                (consult--local-let ((enable-recursive-minibuffers t))
-                  ;; Evaluate completion table in the original buffer.
-                  ;; This is a reasonable thing to do and required by
-                  ;; some completion tables in particular by lsp-mode.
-                  ;; See gh:minad/vertico#61.
-                  (consult--read (consult--completion-table-in-buffer collection)
-                                 :prompt "Completion: "
-                                 :state (consult--insertion-preview start end)
-                                 :predicate predicate
-                                 :initial initial))))))
-        (if completion
-            (progn
-              ;; bug#55205: completion--replace removes properties!
-              (completion--replace start end (setq completion (concat completion)))
-              (when exit-fun
-                (funcall exit-fun completion
-                         ;; If completion is finished and cannot be further
-                         ;; completed, return `finished'.  Otherwise return
-                         ;; `exact'.
-                         (if (eq (try-completion completion collection predicate) t)
-                             'finished 'exact)))
-              t)
-          (message "No completion")
-          nil)))))
-
-;;;;; Command: consult-outline
-
-(defun consult--outline-candidates ()
-  "Return alist of outline headings and positions."
-  (consult--forbid-minibuffer)
-  (let* ((line (line-number-at-pos (point-min) consult-line-numbers-widen))
-         (heading-regexp (concat "^\\(?:"
-                                 ;; default definition from outline.el
-                                 (or (bound-and-true-p outline-regexp) "[*\^L]+")
-                                 "\\)"))
-         (heading-alist (bound-and-true-p outline-heading-alist))
-         (level-fun (or (bound-and-true-p outline-level)
-                        (lambda () ;; as in the default from outline.el
-                          (or (cdr (assoc (match-string 0) heading-alist))
-                              (- (match-end 0) (match-beginning 0))))))
-         (buffer (current-buffer))
-         candidates)
-    (save-excursion
-      (goto-char (point-min))
-      (while (save-excursion
-               (if-let (fun (bound-and-true-p outline-search-function))
-                   (funcall fun)
-                 (re-search-forward heading-regexp nil t)))
-        (cl-incf line (consult--count-lines (match-beginning 0)))
-        (push (consult--location-candidate
-               (consult--buffer-substring (pos-bol) (pos-eol) 'fontify)
-               (cons buffer (point)) (1- line) (1- line)
-               'consult--outline-level (funcall level-fun))
-              candidates)
-        (goto-char (1+ (pos-eol)))))
-    (unless candidates
-      (user-error "No headings"))
-    (nreverse candidates)))
-
-;;;###autoload
-(defun consult-outline (&optional level)
-  "Jump to an outline heading, obtained by matching against `outline-regexp'.
-
-This command supports narrowing to a heading level and candidate
-preview.  The initial narrowing LEVEL can be given as prefix
-argument.  The symbol at point is added to the future history."
-  (interactive
-   (list (and current-prefix-arg (prefix-numeric-value current-prefix-arg))))
-  (let* ((candidates (consult--slow-operation
-                         "Collecting headings..."
-                       (consult--outline-candidates)))
-         (min-level (- (cl-loop for cand in candidates minimize
-                                (get-text-property 0 'consult--outline-level cand))
-                       ?1))
-         (narrow-pred (lambda (cand)
-                        (<= (get-text-property 0 'consult--outline-level cand)
-                            (+ consult--narrow min-level))))
-         (narrow-keys (mapcar (lambda (c) (cons c (format "Level %c" c)))
-                              (number-sequence ?1 ?9)))
-         (narrow-init (and level (max ?1 (min ?9 (+ level ?0))))))
-    (consult--read
-     candidates
-     :prompt "Go to heading: "
-     :annotate (consult--line-prefix)
-     :category 'consult-location
-     :sort nil
-     :require-match t
-     :lookup #'consult--line-match
-     :narrow `(:predicate ,narrow-pred :keys ,narrow-keys :initial ,narrow-init)
-     :history '(:input consult--line-history)
-     :add-history (thing-at-point 'symbol)
-     :state (consult--location-state candidates))))
-
-;;;;; Command: consult-mark
-
-(defun consult--mark-candidates (markers)
-  "Return list of candidates strings for MARKERS."
-  (consult--forbid-minibuffer)
-  (let ((candidates)
-        (current-buf (current-buffer)))
-    (save-excursion
-      (dolist (marker markers)
-        (when-let ((pos (marker-position marker))
-                   (buf (marker-buffer marker)))
-          (when (and (eq buf current-buf)
-                     (consult--in-range-p pos))
-            (goto-char pos)
-            ;; `line-number-at-pos' is a very slow function, which should be
-            ;; replaced everywhere.  However in this case the slow
-            ;; line-number-at-pos does not hurt much, since the mark ring is
-            ;; usually small since it is limited by `mark-ring-max'.
-            (push (consult--location-candidate
-                   (consult--line-with-mark marker) marker
-                   (line-number-at-pos pos consult-line-numbers-widen)
-                   marker)
-                  candidates)))))
-    (unless candidates
-      (user-error "No marks"))
-    (nreverse (delete-dups candidates))))
-
-;;;###autoload
-(defun consult-mark (&optional markers)
-  "Jump to a marker in MARKERS list (defaults to buffer-local `mark-ring').
-
-The command supports preview of the currently selected marker position.
-The symbol at point is added to the future history."
-  (interactive)
-  (consult--read
-   (consult--mark-candidates
-    (or markers (cons (mark-marker) mark-ring)))
-   :prompt "Go to mark: "
-   :annotate (consult--line-prefix)
-   :category 'consult-location
-   :sort nil
-   :require-match t
-   :lookup #'consult--lookup-location
-   :history '(:input consult--line-history)
-   :add-history (thing-at-point 'symbol)
-   :state (consult--jump-state)))
-
-;;;;; Command: consult-global-mark
-
-(defun consult--global-mark-candidates (markers)
-  "Return list of candidates strings for MARKERS."
-  (consult--forbid-minibuffer)
-  (let ((candidates))
-    (save-excursion
-      (dolist (marker markers)
-        (when-let ((pos (marker-position marker))
-                   (buf (marker-buffer marker)))
-          (unless (minibufferp buf)
-            (with-current-buffer buf
-              (when (consult--in-range-p pos)
-                (goto-char pos)
-                ;; `line-number-at-pos' is slow, see comment in `consult--mark-candidates'.
-                (let* ((line (line-number-at-pos pos consult-line-numbers-widen))
-                       (prefix (consult--format-file-line-match (buffer-name buf) line ""))
-                       (cand (concat prefix (consult--line-with-mark marker) (consult--tofu-encode marker))))
-                  (put-text-property 0 (length prefix) 'consult-strip t cand)
-                  (put-text-property 0 (length cand) 'consult-location (cons marker line) cand)
-                  (push cand candidates))))))))
-    (unless candidates
-      (user-error "No global marks"))
-    (nreverse (delete-dups candidates))))
-
-;;;###autoload
-(defun consult-global-mark (&optional markers)
-  "Jump to a marker in MARKERS list (defaults to `global-mark-ring').
-
-The command supports preview of the currently selected marker position.
-The symbol at point is added to the future history."
-  (interactive)
-  (consult--read
-   (consult--global-mark-candidates
-    (or markers global-mark-ring))
-   :prompt "Go to global mark: "
-   ;; Despite `consult-global-mark' formatting the candidates in grep-like
-   ;; style, we are not using the `consult-grep' category, since the candidates
-   ;; have location markers attached.
-   :category 'consult-location
-   :sort nil
-   :require-match t
-   :lookup #'consult--lookup-location
-   :history '(:input consult--line-history)
-   :add-history (thing-at-point 'symbol)
-   :state (consult--jump-state)))
-
-;;;;; Command: consult-line
-
-(defun consult--line-candidates (top curr-line)
-  "Return list of line candidates.
-Start from top if TOP non-nil.
-CURR-LINE is the current line number."
-  (consult--forbid-minibuffer)
-  (consult--fontify-all)
-  (let* ((buffer (current-buffer))
-         (line (line-number-at-pos (point-min) consult-line-numbers-widen))
-         default-cand candidates)
-    (consult--each-line beg end
-      (unless (looking-at-p "^\\s-*$")
-        (push (consult--location-candidate
-               (consult--buffer-substring beg end)
-               (cons buffer beg) line line)
-              candidates)
-        (when (and (not default-cand) (>= line curr-line))
-          (setq default-cand candidates)))
-      (cl-incf line))
-    (unless candidates
-      (user-error "No lines"))
-    (nreverse
-     (if (or top (not default-cand))
-         candidates
-       (let ((before (cdr default-cand)))
-         (setcdr default-cand nil)
-         (nconc before candidates))))))
-
-(defun consult--line-point-placement (selected candidates highlighted &rest ignored-faces)
-  "Find point position on matching line.
-SELECTED is the currently selected candidate.
-CANDIDATES is the list of candidates.
-HIGHLIGHTED is the highlighted string to determine the match position.
-IGNORED-FACES are ignored when determining the match position."
-  (when-let (pos (consult--lookup-location selected candidates))
-    (if highlighted
-        (let* ((matches (apply #'consult--point-placement highlighted 0 ignored-faces))
-               (dest (+ pos (car matches))))
-          ;; Only create a new marker when jumping across buffers (for example
-          ;; `consult-line-multi').  Avoid creating unnecessary markers, when
-          ;; scrolling through candidates, since creating markers is not free.
-          (when (and (markerp pos) (not (eq (marker-buffer pos) (current-buffer))))
-            (setq dest (move-marker (make-marker) dest (marker-buffer pos))))
-          (cons dest (cdr matches)))
-      pos)))
-
-(defun consult--line-match (selected candidates input &rest _)
-  "Lookup position of match.
-SELECTED is the currently selected candidate.
-CANDIDATES is the list of candidates.
-INPUT is the input string entered by the user."
-  (consult--line-point-placement selected candidates
-                                 (and (not (string-blank-p input))
-                                      (car (consult--completion-filter
-                                            input
-                                            (list (substring-no-properties selected))
-                                            'consult-location 'highlight)))
-                                 'completions-first-difference))
-
-;;;###autoload
-(defun consult-line (&optional initial start)
-  "Search for a matching line.
-
-Depending on the setting `consult-point-placement' the command
-jumps to the beginning or the end of the first match on the line
-or the line beginning.  The default candidate is the non-empty
-line next to point.  This command obeys narrowing.  Optional
-INITIAL input can be provided.  The search starting point is
-changed if the START prefix argument is set.  The symbol at point
-and the last `isearch-string' is added to the future history."
-  (interactive (list nil (not (not current-prefix-arg))))
-  (let* ((curr-line (line-number-at-pos (point) consult-line-numbers-widen))
-         (top (not (eq start consult-line-start-from-top)))
-         (candidates (consult--slow-operation "Collecting lines..."
-                       (consult--line-candidates top curr-line))))
-    (consult--read
-     candidates
-     :prompt (if top "Go to line from top: " "Go to line: ")
-     :annotate (consult--line-prefix curr-line)
-     :category 'consult-location
-     :sort nil
-     :require-match t
-     ;; Always add last `isearch-string' to future history
-     :add-history (list (thing-at-point 'symbol) isearch-string)
-     :history '(:input consult--line-history)
-     :lookup #'consult--line-match
-     :default (car candidates)
-     ;; Add `isearch-string' as initial input if starting from Isearch
-     :initial (or initial
-                  (and isearch-mode
-                       (prog1 isearch-string (isearch-done))))
-     :state (consult--location-state candidates))))
-
-;;;;; Command: consult-line-multi
-
-(defun consult--line-multi-match (selected candidates &rest _)
-  "Lookup position of match.
-SELECTED is the currently selected candidate.
-CANDIDATES is the list of candidates."
-  (consult--line-point-placement selected candidates
-                                 (car (member selected candidates))))
-
-(defun consult--line-multi-group (cand transform)
-  "Group function used by `consult-line-multi'.
-If TRANSFORM non-nil, return transformed CAND, otherwise return title."
-  (if transform cand
-    (let* ((marker (car (get-text-property 0 'consult-location cand)))
-          (buf (if (consp marker)
-                   (car marker) ;; Handle cheap marker
-                 (marker-buffer marker))))
-      (if buf (buffer-name buf) "Dead buffer"))))
-
-(defun consult--line-multi-candidates (buffers input)
-  "Collect matching candidates from multiple buffers.
-INPUT is the user input which should be matched.
-BUFFERS is the list of buffers."
-  (pcase-let ((`(,regexps . ,hl)
-               (funcall consult--regexp-compiler
-                        input 'emacs completion-ignore-case))
-              (candidates nil)
-              (cand-idx 0))
-    (save-match-data
-      (dolist (buf buffers (nreverse candidates))
-        (with-current-buffer buf
-          (save-excursion
-            (let ((line (line-number-at-pos (point-min) consult-line-numbers-widen)))
-              (goto-char (point-min))
-              (while (and (not (eobp))
-                          (save-excursion (re-search-forward (car regexps) nil t)))
-                (cl-incf line (consult--count-lines (match-beginning 0)))
-                (let ((bol (pos-bol))
-                      (eol (pos-eol)))
-                  (goto-char bol)
-                  (when (and (not (looking-at-p "^\\s-*$"))
-                             (seq-every-p (lambda (r)
-                                            (goto-char bol)
-                                            (re-search-forward r eol t))
-                                          (cdr regexps)))
-                    (push (consult--location-candidate
-                           (funcall hl (buffer-substring-no-properties bol eol))
-                           (cons buf bol) (1- line) cand-idx)
-                          candidates)
-                    (cl-incf cand-idx))
-                  (goto-char (1+ eol)))))))))))
-
-;;;###autoload
-(defun consult-line-multi (query &optional initial)
-  "Search for a matching line in multiple buffers.
-
-By default search across all project buffers.  If the prefix
-argument QUERY is non-nil, all buffers are searched.  Optional
-INITIAL input can be provided.  The symbol at point and the last
-`isearch-string' is added to the future history.  In order to
-search a subset of buffers, QUERY can be set to a plist according
-to `consult--buffer-query'."
-  (interactive "P")
-  (unless (keywordp (car-safe query))
-    (setq query (list :sort 'alpha-current :directory (and (not query) 'project))))
-  (pcase-let* ((`(,prompt . ,buffers) (consult--buffer-query-prompt "Go to line" query))
-               (collection (consult--dynamic-collection
-                            (apply-partially #'consult--line-multi-candidates
-                                             buffers))))
-    (consult--read
-     collection
-     :prompt prompt
-     :annotate (consult--line-prefix)
-     :category 'consult-location
-     :sort nil
-     :require-match t
-     ;; Always add last Isearch string to future history
-     :add-history (mapcar #'consult--async-split-initial
-                          (delq nil (list (thing-at-point 'symbol)
-                                          isearch-string)))
-     :history '(:input consult--line-multi-history)
-     :lookup #'consult--line-multi-match
-     ;; Add `isearch-string' as initial input if starting from Isearch
-     :initial (consult--async-split-initial
-               (or initial
-                   (and isearch-mode
-                        (prog1 isearch-string (isearch-done)))))
-     :state (consult--location-state (lambda () (funcall collection nil)))
-     :group #'consult--line-multi-group)))
-
-;;;;; Command: consult-keep-lines
-
-(defun consult--keep-lines-state (filter)
-  "State function for `consult-keep-lines' with FILTER function."
-  (let ((font-lock-orig font-lock-mode)
-        (whitespace-orig (bound-and-true-p whitespace-mode))
-        (hl-line-orig (bound-and-true-p hl-line-mode))
-        (point-orig (point))
-        lines content-orig replace last-input)
-    (if (use-region-p)
-        (save-restriction
-          ;; Use the same behavior as `keep-lines'.
-          (let ((rbeg (region-beginning))
-                (rend (save-excursion
-                        (goto-char (region-end))
-                        (unless (or (bolp) (eobp))
-                          (forward-line 0))
-                        (point))))
-            (consult--fontify-region rbeg rend)
-            (narrow-to-region rbeg rend)
-            (consult--each-line beg end
-              (push (consult--buffer-substring beg end) lines))
-            (setq content-orig (buffer-string)
-                  replace (lambda (content &optional pos)
-                            (delete-region rbeg rend)
-                            (insert-before-markers content)
-                            (goto-char (or pos rbeg))
-                            (setq rend (+ rbeg (length content)))
-                            (add-face-text-property rbeg rend 'region t)))))
-      (consult--fontify-all)
-      (setq content-orig (buffer-string)
-            replace (lambda (content &optional pos)
-                      (delete-region (point-min) (point-max))
-                      (insert content)
-                      (goto-char (or pos (point-min)))))
-      (consult--each-line beg end
-        (push (consult--buffer-substring beg end) lines)))
-    (setq lines (nreverse lines))
-    (lambda (action input)
-      ;; Restoring content and point position
-      (when (and (eq action 'return) last-input)
-        ;; No undo recording, modification hooks, buffer modified-status
-        (with-silent-modifications (funcall replace content-orig point-orig)))
-      ;; Committing or new input provided -> Update
-      (when (and input ;; Input has been provided
-                 (or
-                  ;; Committing, but not with empty input
-                  (and (eq action 'return) (not (string-match-p "\\`!? ?\\'" input)))
-                  ;; Input has changed
-                  (not (equal input last-input))))
-        (let ((filtered-content
-               (if (string-match-p "\\`!? ?\\'" input)
-                   ;; Special case the empty input for performance.
-                   ;; Otherwise it could happen that the minibuffer is empty,
-                   ;; but the buffer has not been updated.
-                   content-orig
-                 (if (eq action 'return)
-                     (apply #'concat (mapcan (lambda (x) (list x "\n"))
-                                             (funcall filter input lines)))
-                   (while-no-input
-                     ;; Heavy computation is interruptible if *not* committing!
-                     ;; Allocate new string candidates since the matching function mutates!
-                     (apply #'concat (mapcan (lambda (x) (list x "\n"))
-                                             (funcall filter input (mapcar #'copy-sequence lines)))))))))
-          (when (stringp filtered-content)
-            (when font-lock-mode (font-lock-mode -1))
-            (when (bound-and-true-p whitespace-mode) (whitespace-mode -1))
-            (when (bound-and-true-p hl-line-mode) (hl-line-mode -1))
-            (if (eq action 'return)
-                (atomic-change-group
-                  ;; Disable modification hooks for performance
-                  (let ((inhibit-modification-hooks t))
-                    (funcall replace filtered-content)))
-              ;; No undo recording, modification hooks, buffer modified-status
-              (with-silent-modifications
-                (funcall replace filtered-content)
-                (setq last-input input))))))
-      ;; Restore modes
-      (when (eq action 'return)
-        (when hl-line-orig (hl-line-mode 1))
-        (when whitespace-orig (whitespace-mode 1))
-        (when font-lock-orig (font-lock-mode 1))))))
-
-;;;###autoload
-(defun consult-keep-lines (filter &optional initial)
-  "Select a subset of the lines in the current buffer with live preview.
-
-The selected lines are kept and the other lines are deleted.  When called
-interactively, the lines selected are those that match the minibuffer input.  In
-order to match the inverse of the input, prefix the input with `! '.  When
-called from Elisp, the filtering is performed by a FILTER function.  This
-command obeys narrowing.
-
-FILTER is the filter function.
-INITIAL is the initial input."
-  (interactive
-   (list (lambda (pattern cands)
-           ;; Use consult-location completion category when filtering lines
-           (consult--completion-filter-dispatch
-            pattern cands 'consult-location 'highlight))))
-  (consult--forbid-minibuffer)
-  (let ((ro buffer-read-only))
-    (unwind-protect
-        (minibuffer-with-setup-hook
-            (lambda ()
-              (when ro
-                (minibuffer-message
-                 (substitute-command-keys
-                  " [Unlocked read-only buffer. \\[minibuffer-keyboard-quit] to quit.]"))))
-          (setq buffer-read-only nil)
-          (consult--with-increased-gc
-           (consult--prompt
-            :prompt "Keep lines: "
-            :initial initial
-            :history 'consult--line-history
-            :state (consult--keep-lines-state filter))))
-      (setq buffer-read-only ro))))
-
-;;;;; Command: consult-focus-lines
-
-(defun consult--focus-lines-state (filter)
-  "State function for `consult-focus-lines' with FILTER function."
-  (let (lines overlays last-input pt-orig pt-min pt-max)
-    (save-excursion
-      (save-restriction
-        (if (not (use-region-p))
-            (consult--fontify-all)
-          (consult--fontify-region (region-beginning) (region-end))
-          (narrow-to-region
-           (region-beginning)
-           ;; Behave the same as `keep-lines'.
-           ;; Move to the next line.
-           (save-excursion
-             (goto-char (region-end))
-             (unless (or (bolp) (eobp))
-               (forward-line 0))
-             (point))))
-        (setq pt-orig (point) pt-min (point-min) pt-max (point-max))
-        (let ((i 0))
-          (consult--each-line beg end
-            ;; Use "\n" for empty lines, since we need a non-empty string to
-            ;; attach the text property to.
-            (let ((line (if (eq beg end) (char-to-string ?\n)
-                          (buffer-substring-no-properties beg end))))
-              (put-text-property 0 1 'consult--focus-line (cons (cl-incf i) beg) line)
-              (push line lines)))
-          (setq lines (nreverse lines)))))
-    (lambda (action input)
-      ;; New input provided -> Update
-      (when (and input (not (equal input last-input)))
-        (let (new-overlays)
-          (pcase (while-no-input
-                   (unless (string-match-p "\\`!? ?\\'" input) ;; Empty input.
-                     (let* ((inhibit-quit (eq action 'return)) ;; Non interruptible, when quitting!
-                            (not (string-prefix-p "! " input))
-                            (stripped (string-remove-prefix "! " input))
-                            (matches (funcall filter stripped lines))
-                            (old-ind 0)
-                            (block-beg pt-min)
-                            (block-end pt-min))
-                       (while old-ind
-                         (let ((match (pop matches)) (ind nil) (beg pt-max) (end pt-max) prop)
-                           (when match
-                             (setq prop (get-text-property 0 'consult--focus-line match)
-                                   ind (car prop)
-                                   beg (cdr prop)
-                                   ;; Check for empty lines, see above.
-                                   end (+ 1 beg (if (equal match "\n") 0 (length match)))))
-                           (unless (eq ind (1+ old-ind))
-                             (let ((a (if not block-beg block-end))
-                                   (b (if not block-end beg)))
-                               (when (/= a b)
-                                 (push (consult--make-overlay a b 'invisible t) new-overlays)))
-                             (setq block-beg beg))
-                           (setq block-end end old-ind ind)))))
-                   'commit)
-            ('commit
-             (mapc #'delete-overlay overlays)
-             (setq last-input input overlays new-overlays))
-            (_ (mapc #'delete-overlay new-overlays)))))
-      (when (eq action 'return)
-        (cond
-         ((not input)
-          (mapc #'delete-overlay overlays)
-          (goto-char pt-orig))
-         ((equal input "")
-          (consult-focus-lines nil 'show)
-          (goto-char pt-orig))
-         (t
-          ;; Successfully terminated -> Remember invisible overlays
-          (setq consult--focus-lines-overlays
-                (nconc consult--focus-lines-overlays overlays))
-          ;; move point past invisible
-          (goto-char (if-let (ov (and (invisible-p pt-orig)
-                                      (seq-find (lambda (ov) (overlay-get ov 'invisible))
-                                                (overlays-at pt-orig))))
-                         (overlay-end ov)
-                       pt-orig))))))))
-
-;;;###autoload
-(defun consult-focus-lines (filter &optional show initial)
-  "Hide or show lines using overlays.
-
-The selected lines are shown and the other lines hidden.  When called
-interactively, the lines selected are those that match the minibuffer input.  In
-order to match the inverse of the input, prefix the input with `! '.  With
-optional prefix argument SHOW reveal the hidden lines.  Alternatively the
-command can be restarted to reveal the lines.  When called from Elisp, the
-filtering is performed by a FILTER function.  This command obeys narrowing.
-
-FILTER is the filter function.
-INITIAL is the initial input."
-  (interactive
-   (list (lambda (pattern cands)
-           ;; Use consult-location completion category when filtering lines
-           (consult--completion-filter-dispatch
-            pattern cands 'consult-location nil))
-         current-prefix-arg))
-  (if show
-      (progn
-        (mapc #'delete-overlay consult--focus-lines-overlays)
-        (setq consult--focus-lines-overlays nil)
-        (message "All lines revealed"))
-    (consult--forbid-minibuffer)
-    (consult--with-increased-gc
-     (consult--prompt
-      :prompt
-      (if consult--focus-lines-overlays
-          "Focus on lines (RET to reveal): "
-        "Focus on lines: ")
-      :initial initial
-      :history 'consult--line-history
-      :state (consult--focus-lines-state filter)))))
-
-;;;;; Command: consult-goto-line
-
-(defun consult--goto-line-position (str msg)
-  "Transform input STR to line number.
-Print an error message with MSG function."
-  (save-match-data
-    (if (and str (string-match "\\`\\([[:digit:]]+\\):?\\([[:digit:]]*\\)\\'" str))
-        (let ((line (string-to-number (match-string 1 str)))
-              (col (string-to-number (match-string 2 str))))
-          (save-excursion
-            (save-restriction
-              (when consult-line-numbers-widen
-                (widen))
-              (goto-char (point-min))
-              (forward-line (1- line))
-              (goto-char (min (+ (point) col) (pos-eol)))
-              (point))))
-      (when (and str (not (equal str "")))
-        (funcall msg "Please enter a number."))
-      nil)))
-
-;;;###autoload
-(defun consult-goto-line (&optional arg)
-  "Read line number and jump to the line with preview.
-
-Enter either a line number to jump to the first column of the
-given line or line:column in order to jump to a specific column.
-Jump directly if a line number is given as prefix ARG.  The
-command respects narrowing and the settings
-`consult-goto-line-numbers' and `consult-line-numbers-widen'."
-  (interactive "P")
-  (if arg
-      (call-interactively #'goto-line)
-    (consult--forbid-minibuffer)
-    (consult--local-let ((display-line-numbers consult-goto-line-numbers)
-                         (display-line-numbers-widen consult-line-numbers-widen))
-      (while (if-let (pos (consult--goto-line-position
-                           (consult--prompt
-                            :prompt "Go to line: "
-                            :history 'goto-line-history
-                            :state
-                            (let ((preview (consult--jump-preview)))
-                              (lambda (action str)
-                                (funcall preview action
-                                         (consult--goto-line-position str #'ignore)))))
-                           #'minibuffer-message))
-                 (consult--jump pos)
-               t)))))
-
-;;;;; Command: consult-recent-file
-
-(defun consult--file-preview ()
-  "Create preview function for files."
-  (let ((open (consult--temporary-files))
-        (preview (consult--buffer-preview)))
-    (lambda (action cand)
-      (unless cand
-        (funcall open))
-      (funcall preview action
-               (and cand
-                    (eq action 'preview)
-                    (funcall open cand))))))
-
-(defun consult--file-action (file)
-  "Open FILE via `consult--buffer-action'."
-  ;; Try to preserve the buffer as is, if it has already been opened, for
-  ;; example in literal or raw mode.
-  (setq file (abbreviate-file-name (expand-file-name file)))
-  (consult--buffer-action (or (get-file-buffer file) (find-file-noselect file))))
-
-(consult--define-state file)
-
-;;;###autoload
-(defun consult-recent-file ()
-  "Find recent file using `completing-read'."
-  (interactive)
-  (find-file
-   (consult--read
-    (or
-     (mapcar #'consult--fast-abbreviate-file-name (bound-and-true-p recentf-list))
-     (user-error "No recent files, `recentf-mode' is %s"
-                 (if recentf-mode "enabled" "disabled")))
-    :prompt "Find recent file: "
-    :sort nil
-    :require-match t
-    :category 'file
-    :state (consult--file-preview)
-    :history 'file-name-history)))
-
-;;;;; Command: consult-mode-command
-
-(defun consult--mode-name (mode)
-  "Return name part of MODE."
-  (replace-regexp-in-string
-   "global-\\(.*\\)-mode" "\\1"
-   (replace-regexp-in-string
-    "\\(-global\\)?-mode\\'" ""
-    (if (eq mode 'c-mode)
-        "cc"
-      (symbol-name mode))
-    'fixedcase)
-   'fixedcase))
-
-(defun consult--mode-command-candidates (modes)
-  "Extract commands from MODES.
-
-The list of features is searched for files belonging to the modes.
-From these files, the commands are extracted."
-  (let* ((case-fold-search)
-         (buffer (current-buffer))
-         (command-filter (consult--regexp-filter (seq-filter #'stringp consult-mode-command-filter)))
-         (feature-filter (seq-filter #'symbolp consult-mode-command-filter))
-         (minor-hash (consult--string-hash minor-mode-list))
-         (minor-local-modes (seq-filter (lambda (m)
-                                          (and (gethash m minor-hash)
-                                               (local-variable-if-set-p m)))
-                                        modes))
-         (minor-global-modes (seq-filter (lambda (m)
-                                           (and (gethash m minor-hash)
-                                                (not (local-variable-if-set-p m))))
-                                         modes))
-         (major-modes (seq-remove (lambda (m)
-                                    (gethash m minor-hash))
-                                  modes))
-         (major-paths-hash (consult--string-hash (mapcar #'symbol-file major-modes)))
-         (minor-local-paths-hash (consult--string-hash (mapcar #'symbol-file minor-local-modes)))
-         (minor-global-paths-hash (consult--string-hash (mapcar #'symbol-file minor-global-modes)))
-         (major-name-regexp (regexp-opt (mapcar #'consult--mode-name major-modes)))
-         (minor-local-name-regexp (regexp-opt (mapcar #'consult--mode-name minor-local-modes)))
-         (minor-global-name-regexp (regexp-opt (mapcar #'consult--mode-name minor-global-modes)))
-         (commands))
-    (dolist (feature load-history commands)
-      (when-let (name (alist-get 'provide feature))
-        (let* ((path (car feature))
-               (file (file-name-nondirectory path))
-               (key (cond
-                     ((memq name feature-filter) nil)
-                     ((or (gethash path major-paths-hash)
-                          (string-match-p major-name-regexp file))
-                      ?m)
-                     ((or (gethash path minor-local-paths-hash)
-                          (string-match-p minor-local-name-regexp file))
-                      ?l)
-                     ((or (gethash path minor-global-paths-hash)
-                          (string-match-p minor-global-name-regexp file))
-                      ?g))))
-          (when key
-            (dolist (cmd (cdr feature))
-              (let ((sym (cdr-safe cmd)))
-                (when (and (consp cmd)
-                           (eq (car cmd) 'defun)
-                           (commandp sym)
-                           (not (get sym 'byte-obsolete-info))
-                           (or (not read-extended-command-predicate)
-                               (funcall read-extended-command-predicate sym buffer)))
-                  (let ((name (symbol-name sym)))
-                    (unless (string-match-p command-filter name)
-                      (push (propertize name
-                                        'consult--candidate sym
-                                        'consult--type key)
-                            commands))))))))))))
-
-;;;###autoload
-(defun consult-mode-command (&rest modes)
-  "Run a command from any of the given MODES.
-
-If no MODES are specified, use currently active major and minor modes."
-  (interactive)
-  (unless modes
-    (setq modes (cons major-mode
-                      (seq-filter (lambda (m)
-                                    (and (boundp m) (symbol-value m)))
-                                  minor-mode-list))))
-  (let ((narrow `((?m . ,(format "Major: %s" major-mode))
-                  (?l . "Local Minor")
-                  (?g . "Global Minor"))))
-    (command-execute
-     (consult--read
-      (consult--mode-command-candidates modes)
-      :prompt "Mode command: "
-      :predicate
-      (lambda (cand)
-        (let ((key (get-text-property 0 'consult--type cand)))
-          (if consult--narrow
-              (= key consult--narrow)
-            (/= key ?g))))
-      :lookup #'consult--lookup-candidate
-      :group (consult--type-group narrow)
-      :narrow narrow
-      :require-match t
-      :history 'extended-command-history
-      :category 'command))))
-
-;;;;; Command: consult-yank
-
-(defun consult--read-from-kill-ring ()
-  "Open kill ring menu and return selected string."
-  ;; `current-kill' updates `kill-ring' with interprogram paste, see
-  ;; gh:minad/consult#443.
-  (current-kill 0)
-  ;; Do not specify a :lookup function in order to preserve completion-styles
-  ;; highlighting of the current candidate. We have to perform a final lookup to
-  ;; obtain the original candidate which may be propertized with yank-specific
-  ;; properties, like 'yank-handler.
-  (consult--lookup-member
-   (consult--read
-    (consult--remove-dups
-     (or (if yank-from-kill-ring-rotate
-             (append kill-ring-yank-pointer
-                     (butlast kill-ring (length kill-ring-yank-pointer)))
-           kill-ring)
-         (user-error "Kill ring is empty")))
-    :prompt "Yank from kill-ring: "
-    :history t ;; disable history
-    :sort nil
-    :category 'kill-ring
-    :require-match t
-    :state
-    (consult--insertion-preview
-     (point)
-     ;; If previous command is yank, hide previously yanked string
-     (or (and (eq last-command 'yank) (mark t)) (point))))
-   kill-ring))
-
-;; Adapted from the Emacs `yank-from-kill-ring' function.
-;;;###autoload
-(defun consult-yank-from-kill-ring (string &optional arg)
-  "Select STRING from the kill ring and insert it.
-With prefix ARG, put point at beginning, and mark at end, like `yank' does.
-
-This command behaves like `yank-from-kill-ring', which also offers a
-`completing-read' interface to the `kill-ring'.  Additionally the
-Consult version supports preview of the selected string."
-  (interactive (list (consult--read-from-kill-ring) current-prefix-arg))
-  (when string
-    (setq yank-window-start (window-start))
-    (push-mark)
-    (insert-for-yank string)
-    (setq this-command 'yank)
-    (when yank-from-kill-ring-rotate
-      (if-let (pos (seq-position kill-ring string))
-          (setq kill-ring-yank-pointer (nthcdr pos kill-ring))
-        (kill-new string)))
-    (when (consp arg)
-      ;; Swap point and mark like in `yank'.
-      (goto-char (prog1 (mark t)
-                   (set-marker (mark-marker) (point) (current-buffer)))))))
-
-(put 'consult-yank-replace 'delete-selection 'yank)
-(put 'consult-yank-pop 'delete-selection 'yank)
-(put 'consult-yank-from-kill-ring 'delete-selection 'yank)
-
-;;;###autoload
-(defun consult-yank-pop (&optional arg)
-  "If there is a recent yank act like `yank-pop'.
-
-Otherwise select string from the kill ring and insert it.
-See `yank-pop' for the meaning of ARG.
-
-This command behaves like `yank-pop', which also offers a
-`completing-read' interface to the `kill-ring'.  Additionally the
-Consult version supports preview of the selected string."
-  (interactive "*p")
-  (if (eq last-command 'yank)
-      (yank-pop (or arg 1))
-    (call-interactively #'consult-yank-from-kill-ring)))
-
-;; Adapted from the Emacs yank-pop function.
-;;;###autoload
-(defun consult-yank-replace (string)
-  "Select STRING from the kill ring.
-
-If there was no recent yank, insert the string.
-Otherwise replace the just-yanked string with the selected string."
-  (interactive (list (consult--read-from-kill-ring)))
-  (when string
-    (if (not (eq last-command 'yank))
-        (consult-yank-from-kill-ring string)
-      (let ((inhibit-read-only t)
-            (pt (point))
-            (mk (mark t)))
-        (setq this-command 'yank)
-        (funcall (or yank-undo-function 'delete-region) (min pt mk) (max pt mk))
-        (setq yank-undo-function nil)
-        (set-marker (mark-marker) pt (current-buffer))
-        (insert-for-yank string)
-        (set-window-start (selected-window) yank-window-start t)
-        (if (< pt mk)
-            (goto-char (prog1 (mark t)
-                         (set-marker (mark-marker) (point) (current-buffer)))))))))
-
-;;;;; Command: consult-bookmark
-
-(defun consult--bookmark-preview ()
-  "Create preview function for bookmarks."
-  (let ((preview (consult--jump-preview))
-        (open (consult--temporary-files)))
-    (lambda (action cand)
-      (unless cand
-        (funcall open))
-      (funcall
-       preview action
-       ;; Only preview bookmarks with the default handler.
-       (when-let ((bm (and cand (eq action 'preview) (assoc cand bookmark-alist)))
-                  (handler (or (bookmark-get-handler bm) #'bookmark-default-handler))
-                  ((eq handler #'bookmark-default-handler))
-                  (file (bookmark-get-filename bm))
-                  (pos (bookmark-get-position bm))
-                  (buf (funcall open file)))
-         (set-marker (make-marker) pos buf))))))
-
-(defun consult--bookmark-action (bm)
-  "Open BM via `consult--buffer-action'."
-  (bookmark-jump bm consult--buffer-display))
-
-(consult--define-state bookmark)
-
-(defun consult--bookmark-candidates ()
-  "Return bookmark candidates."
-  (bookmark-maybe-load-default-file)
-  (let ((narrow (cl-loop for (y _ . xs) in consult-bookmark-narrow nconc
-                         (cl-loop for x in xs collect (cons x y)))))
-    (cl-loop for bm in bookmark-alist collect
-             (propertize (car bm)
-                         'consult--type
-                         (alist-get
-                          (or (bookmark-get-handler bm) #'bookmark-default-handler)
-                          narrow)))))
-
-;;;###autoload
-(defun consult-bookmark (name)
-  "If bookmark NAME exists, open it, otherwise create a new bookmark with NAME.
-
-The command supports preview of file bookmarks and narrowing.  See the
-variable `consult-bookmark-narrow' for the narrowing configuration."
-  (interactive
-   (list
-    (let ((narrow (cl-loop for (x y . _) in consult-bookmark-narrow collect (cons x y))))
-      (consult--read
-       (consult--bookmark-candidates)
-       :prompt "Bookmark: "
-       :state (consult--bookmark-preview)
-       :category 'bookmark
-       :history 'bookmark-history
-       ;; Add default names to future history.
-       ;; Ignore errors such that `consult-bookmark' can be used in
-       ;; buffers which are not backed by a file.
-       :add-history (ignore-errors (bookmark-prop-get (bookmark-make-record) 'defaults))
-       :group (consult--type-group narrow)
-       :narrow (consult--type-narrow narrow)))))
-  (bookmark-maybe-load-default-file)
-  (if (assoc name bookmark-alist)
-      (bookmark-jump name)
-    (bookmark-set name)))
-
-;;;;; Command: consult-complex-command
-
-;;;###autoload
-(defun consult-complex-command ()
-  "Select and evaluate command from the command history.
-
-This command can act as a drop-in replacement for `repeat-complex-command'."
-  (interactive)
-  (let* ((history (or (delete-dups (mapcar #'prin1-to-string command-history))
-                      (user-error "There are no previous complex commands")))
-         (cmd (read (consult--read
-                     history
-                     :prompt "Command: "
-                     :default (car history)
-                     :sort nil
-                     :history t ;; disable history
-                     :category 'expression))))
-    ;; Taken from `repeat-complex-command'
-    (add-to-history 'command-history cmd)
-    (apply #'funcall-interactively
-           (car cmd)
-           (mapcar (lambda (e) (eval e t)) (cdr cmd)))))
-
-;;;;; Command: consult-history
-
-(declare-function ring-elements "ring")
-
-(defun consult--current-history ()
-  "Return the history and index variable relevant to the current buffer.
-If the minibuffer is active, the minibuffer history is returned,
-otherwise the history corresponding to the mode.  There is a
-special case for `repeat-complex-command', for which the command
-history is used."
-  (cond
-   ;; In the minibuffer we use the current minibuffer history,
-   ;; which can be configured by setting `minibuffer-history-variable'.
-   ((minibufferp)
-    (when (eq minibuffer-history-variable t)
-      (user-error "Minibuffer history is disabled for `%s'" this-command))
-    (list (mapcar #'consult--tofu-hide
-                  (if (eq minibuffer-history-variable 'command-history)
-                      ;; If pressing "C-x M-:", i.e., `repeat-complex-command',
-                      ;; we are instead querying the `command-history' and get a
-                      ;; full s-expression.  Alternatively you might want to use
-                      ;; `consult-complex-command', which can also be bound to
-                      ;; "C-x M-:"!
-                      (mapcar #'prin1-to-string command-history)
-                    (symbol-value minibuffer-history-variable)))))
-   ;; Otherwise we use a mode-specific history, see `consult-mode-histories'.
-   (t (let ((found (seq-find (lambda (h)
-                               (and (derived-mode-p (car h))
-                                    (boundp (if (consp (cdr h)) (cadr h) (cdr h)))))
-                             consult-mode-histories)))
-        (unless found
-          (user-error "No history configured for `%s', see `consult-mode-histories'"
-                      major-mode))
-        (cons (symbol-value (cadr found)) (cddr found))))))
-
-;;;###autoload
-(defun consult-history (&optional history index bol)
-  "Insert string from HISTORY of current buffer.
-In order to select from a specific HISTORY, pass the history
-variable as argument.  INDEX is the name of the index variable to
-update, if any.  BOL is the function which jumps to the beginning
-of the prompt.  See also `cape-history' from the Cape package."
-  (interactive)
-  (pcase-let* ((`(,history ,index ,bol) (if history
-                                            (list history index bol)
-                                          (consult--current-history)))
-               (history (if (ring-p history) (ring-elements history) history))
-               (`(,beg . ,end)
-                (if (minibufferp)
-                    (cons (minibuffer-prompt-end) (point-max))
-                  (if bol
-                      (save-excursion
-                        (funcall bol)
-                        (cons (point) (pos-eol)))
-                    (cons (point) (point)))))
-               (str (consult--local-let ((enable-recursive-minibuffers t))
-                      (consult--read
-                       (or (consult--remove-dups history)
-                           (user-error "History is empty"))
-                       :prompt "History: "
-                       :history t ;; disable history
-                       :category ;; Report category depending on history variable
-                       (and (minibufferp)
-                            (pcase minibuffer-history-variable
-                              ('extended-command-history 'command)
-                              ('buffer-name-history 'buffer)
-                              ('face-name-history 'face)
-                              ('read-envvar-name-history 'environment-variable)
-                              ('bookmark-history 'bookmark)
-                              ('file-name-history 'file)))
-                       :sort nil
-                       :initial (buffer-substring-no-properties beg end)
-                       :state (consult--insertion-preview beg end)))))
-    (delete-region beg end)
-    (when index
-      (set index (seq-position history str)))
-    (insert (substring-no-properties str))))
-
-;;;;; Command: consult-isearch-history
-
-(defun consult-isearch-forward (&optional reverse)
-  "Continue Isearch forward optionally in REVERSE."
-  (declare (completion ignore))
-  (interactive)
-  (consult--require-minibuffer)
-  (setq isearch-new-forward (not reverse) isearch-new-nonincremental nil)
-  (funcall (or (command-remapping #'exit-minibuffer) #'exit-minibuffer)))
-
-(defun consult-isearch-backward (&optional reverse)
-  "Continue Isearch backward optionally in REVERSE."
-  (declare (completion ignore))
-  (interactive)
-  (consult-isearch-forward (not reverse)))
-
-(defvar-keymap consult-isearch-history-map
-  :doc "Additional keymap used by `consult-isearch-history'."
-  "<remap> <isearch-forward>" #'consult-isearch-forward
-  "<remap> <isearch-backward>" #'consult-isearch-backward)
-
-(defun consult--isearch-history-candidates ()
-  "Return Isearch history candidates."
-  ;; Do not throw an error on empty history, in order to allow starting a
-  ;; search.  We do not :require-match here.
-  (let ((history (if (eq t search-default-mode)
-                     (append regexp-search-ring search-ring)
-                   (append search-ring regexp-search-ring))))
-    (delete-dups
-     (mapcar
-      (lambda (cand)
-        ;; The search type can be distinguished via text properties.
-        (let* ((props (plist-member (text-properties-at 0 cand)
-                                    'isearch-regexp-function))
-               (type (pcase (cadr props)
-                       ((and 'nil (guard (not props))) ?r)
-                       ('nil                           ?l)
-                       ('word-search-regexp            ?w)
-                       ('isearch-symbol-regexp         ?s)
-                       ('char-fold-to-regexp           ?c)
-                       (_                              ?u))))
-          ;; Disambiguate history items.  The same string could
-          ;; occur with different search types.
-          (consult--tofu-append cand type)))
-      history))))
-
-(defconst consult--isearch-history-narrow
-  '((?c . "Char")
-    (?u . "Custom")
-    (?l . "Literal")
-    (?r . "Regexp")
-    (?s . "Symbol")
-    (?w . "Word")))
-
-;;;###autoload
-(defun consult-isearch-history ()
-  "Read a search string with completion from the Isearch history.
-
-This replaces the current search string if Isearch is active, and
-starts a new Isearch session otherwise."
-  (interactive)
-  (consult--forbid-minibuffer)
-  (let* ((isearch-message-function #'ignore)
-         (cursor-in-echo-area t) ;; Avoid cursor flickering
-         (candidates (consult--isearch-history-candidates)))
-    (unless isearch-mode (isearch-mode t))
-    (with-isearch-suspended
-     (setq isearch-new-string
-           (consult--read
-            candidates
-            :prompt "I-search: "
-            :category 'consult-isearch-history
-            :history t ;; disable history
-            :sort nil
-            :initial isearch-string
-            :keymap consult-isearch-history-map
-            :annotate
-            (lambda (cand)
-              (consult--annotate-align
-               cand
-               (alist-get (consult--tofu-get cand) consult--isearch-history-narrow)))
-            :group
-            (lambda (cand transform)
-              (if transform
-                  cand
-                (alist-get (consult--tofu-get cand) consult--isearch-history-narrow)))
-            :lookup
-            (lambda (selected candidates &rest _)
-              (if-let (found (member selected candidates))
-                  (substring (car found) 0 -1)
-                selected))
-            :state
-            (lambda (action cand)
-              (when (and (eq action 'preview) cand)
-                (setq isearch-string cand)
-                (isearch-update-from-string-properties cand)
-                (isearch-update)))
-            :narrow
-            (list :predicate
-                  (lambda (cand) (= (consult--tofu-get cand) consult--narrow))
-                  :keys consult--isearch-history-narrow))
-           isearch-new-message
-           (mapconcat 'isearch-text-char-description isearch-new-string "")))
-    ;; Setting `isearch-regexp' etc only works outside of `with-isearch-suspended'.
-    (unless (plist-member (text-properties-at 0 isearch-string) 'isearch-regexp-function)
-      (setq isearch-regexp t
-            isearch-regexp-function nil))))
-
-;;;;; Command: consult-minor-mode-menu
-
-(defun consult--minor-mode-candidates ()
-  "Return list of minor-mode candidate strings."
-  (mapcar
-   (pcase-lambda (`(,name . ,sym))
-     (propertize
-      name
-      'consult--candidate sym
-      'consult--minor-mode-narrow
-      (logior
-       (ash (if (local-variable-if-set-p sym) ?l ?g) 8)
-       (if (and (boundp sym) (symbol-value sym)) ?i ?o))
-      'consult--minor-mode-group
-      (concat
-       (if (local-variable-if-set-p sym) "Local " "Global ")
-       (if (and (boundp sym) (symbol-value sym)) "On" "Off"))))
-   (nconc
-    ;; according to describe-minor-mode-completion-table-for-symbol
-    ;; the minor-mode-list contains *all* minor modes
-    (mapcar (lambda (sym) (cons (symbol-name sym) sym)) minor-mode-list)
-    ;; take the lighters from minor-mode-alist
-    (delq nil
-          (mapcar (pcase-lambda (`(,sym ,lighter))
-                    (when (and lighter (not (equal "" lighter)))
-                      (let (message-log-max)
-                        (setq lighter (string-trim (format-mode-line lighter)))
-                        (unless (string-blank-p lighter)
-                          (cons lighter sym)))))
-                  minor-mode-alist)))))
-
-(defconst consult--minor-mode-menu-narrow
-  '((?l . "Local")
-    (?g . "Global")
-    (?i . "On")
-    (?o . "Off")))
-
-;;;###autoload
-(defun consult-minor-mode-menu ()
-  "Enable or disable minor mode.
-
-This is an alternative to `minor-mode-menu-from-indicator'."
-  (interactive)
-  (call-interactively
-   (consult--read
-    (consult--minor-mode-candidates)
-    :prompt "Minor mode: "
-    :require-match t
-    :category 'minor-mode
-    :group
-    (lambda (cand transform)
-      (if transform cand (get-text-property 0 'consult--minor-mode-group cand)))
-    :narrow
-    (list :predicate
-          (lambda (cand)
-            (let ((narrow (get-text-property 0 'consult--minor-mode-narrow cand)))
-              (or (= (logand narrow 255) consult--narrow)
-                  (= (ash narrow -8) consult--narrow))))
-          :keys
-          consult--minor-mode-menu-narrow)
-    :lookup #'consult--lookup-candidate
-    :history 'consult--minor-mode-menu-history)))
-
-;;;;; Command: consult-theme
-
-;;;###autoload
-(defun consult-theme (theme)
-  "Disable current themes and enable THEME from `consult-themes'.
-
-The command supports previewing the currently selected theme."
-  (interactive
-   (list
-    (let* ((regexp (consult--regexp-filter
-                    (mapcar (lambda (x) (if (stringp x) x (format "\\`%s\\'" x)))
-                            consult-themes)))
-           (avail-themes (seq-filter
-                          (lambda (x) (string-match-p regexp (symbol-name x)))
-                          (cons 'default (custom-available-themes))))
-           (saved-theme (car custom-enabled-themes)))
-      (consult--read
-       (mapcar #'symbol-name avail-themes)
-       :prompt "Theme: "
-       :require-match t
-       :category 'theme
-       :history 'consult--theme-history
-       :lookup (lambda (selected &rest _)
-                 (setq selected (and selected (intern-soft selected)))
-                 (or (and selected (car (memq selected avail-themes)))
-                     saved-theme))
-       :state (lambda (action theme)
-                (pcase action
-                  ('return (consult-theme (or theme saved-theme)))
-                  ((and 'preview (guard theme)) (consult-theme theme))))
-       :default (symbol-name (or saved-theme 'default))))))
-  (when (eq theme 'default) (setq theme nil))
-  (unless (eq theme (car custom-enabled-themes))
-    (mapc #'disable-theme custom-enabled-themes)
-    (when theme
-      (if (custom-theme-p theme)
-          (enable-theme theme)
-        (load-theme theme :no-confirm)))))
-
-;;;;; Command: consult-buffer
-
-(defun consult--buffer-sort-alpha (buffers)
-  "Sort BUFFERS alphabetically, put starred buffers at the end."
-  (sort buffers
-        (lambda (x y)
-          (setq x (buffer-name x) y (buffer-name y))
-          (let ((a (and (length> x 0) (eq (aref x 0) ?*)))
-                (b (and (length> y 0) (eq (aref y 0) ?*))))
-            (if (eq a b)
-                (string< x y)
-              (not a))))))
-
-(defun consult--buffer-sort-alpha-current (buffers)
-  "Sort BUFFERS alphabetically, put current at the beginning."
-  (let ((buffers (consult--buffer-sort-alpha buffers))
-        (current (current-buffer)))
-    (if (memq current buffers)
-        (cons current (delq current buffers))
-      buffers)))
-
-(defun consult--buffer-sort-visibility (buffers)
-  "Sort BUFFERS by visibility."
-  (let ((hidden)
-        (current (car (memq (current-buffer) buffers))))
-    (consult--keep! buffers
-      (unless (eq it current)
-        (if (get-buffer-window it 'visible)
-            it
-          (push it hidden)
-          nil)))
-    (nconc (nreverse hidden) buffers (and current (list current)))))
-
-(defun consult--normalize-directory (dir)
-  "Normalize directory DIR.
-DIR can be project, nil or a path."
-  (cond
-   ((eq dir 'project) (consult--project-root))
-   (dir (expand-file-name dir))))
-
-(defun consult--buffer-query-prompt (prompt query)
-  "Return a list of buffers and create an appropriate prompt string.
-Return a pair of a prompt string and a list of buffers.  PROMPT
-is the prefix of the prompt string.  QUERY specifies the buffers
-to search and is passed to `consult--buffer-query'."
-  (let* ((dir (plist-get query :directory))
-         (ndir (consult--normalize-directory dir))
-         (buffers (apply #'consult--buffer-query :directory ndir query))
-         (count (length buffers)))
-    (cons (format "%s (%d buffer%s%s): " prompt count
-                  (if (= count 1) "" "s")
-                  (cond
-                   ((and ndir (eq dir 'project))
-                    (format ", Project %s" (consult--project-name ndir)))
-                   (ndir (concat  ", " (consult--left-truncate-file ndir)))
-                   (t "")))
-          buffers)))
-
-(cl-defun consult--buffer-query (&key sort directory mode as predicate (filter t)
-                                      include (exclude consult-buffer-filter)
-                                      (buffer-list t))
-  "Query for a list of matching buffers.
-The function supports filtering by various criteria which are
-used throughout Consult.  In particular it is the backbone of
-most `consult-buffer-sources'.
-DIRECTORY can either be the symbol project or a file name.
-SORT can be visibility, alpha or nil.
-FILTER can be either t, nil or invert.
-EXCLUDE is a list of regexps.
-INCLUDE is a list of regexps.
-MODE can be a mode or a list of modes to restrict the returned buffers.
-PREDICATE is a predicate function.
-BUFFER-LIST is the unfiltered list of buffers.
-AS is a conversion function."
-  (let ((root (consult--normalize-directory directory)))
-    (setq buffer-list (if (eq buffer-list t) (buffer-list) (copy-sequence buffer-list)))
-    (when sort
-      (setq buffer-list (funcall (intern (format "consult--buffer-sort-%s" sort)) buffer-list)))
-    (when (or filter mode as root)
-      (let ((exclude-re (consult--regexp-filter exclude))
-            (include-re (consult--regexp-filter include))
-            (case-fold-search))
-        (consult--keep! buffer-list
-          (and
-           (or (not mode)
-               (let ((mm (buffer-local-value 'major-mode it)))
-                 (if (consp mode)
-                     (seq-some (lambda (m) (provided-mode-derived-p mm m)) mode)
-                   (provided-mode-derived-p mm mode))))
-           (pcase-exhaustive filter
-             ('nil t)
-             ((or 't 'invert)
-              (eq (eq filter t)
-                  (and
-                   (or (not exclude)
-                       (not (string-match-p exclude-re (buffer-name it))))
-                   (or (not include)
-                       (not (not (string-match-p include-re (buffer-name it)))))))))
-           (or (not root)
-               (when-let (dir (buffer-local-value 'default-directory it))
-                 (string-prefix-p root
-                                  (if (and (/= 0 (length dir)) (eq (aref dir 0) ?/))
-                                      dir
-                                    (expand-file-name dir)))))
-           (or (not predicate) (funcall predicate it))
-           (if as (funcall as it) it)))))
-    buffer-list))
-
-(defun consult--buffer-file-hash ()
-  "Return hash table of all buffer file names."
-  (consult--string-hash (consult--buffer-query :as #'buffer-file-name)))
-
-(defun consult--buffer-pair (buffer)
-  "Return a pair of name of BUFFER and BUFFER."
-  (cons (buffer-name buffer) buffer))
-
-(defun consult--buffer-preview ()
-  "Buffer preview function."
-  (let ((orig-buf (window-buffer (consult--original-window)))
-        (orig-prev (copy-sequence (window-prev-buffers)))
-        (orig-next (copy-sequence (window-next-buffers)))
-        other-win)
-    (lambda (action cand)
-      (pcase action
-        ('exit
-         (set-window-prev-buffers other-win orig-prev)
-         (set-window-next-buffers other-win orig-next))
-        ('preview
-         (when (and (eq consult--buffer-display #'switch-to-buffer-other-window)
-                    (not other-win))
-           (switch-to-buffer-other-window orig-buf 'norecord)
-           (setq other-win (selected-window)))
-         (let ((win (or other-win (selected-window)))
-               (buf (or (and cand (get-buffer cand)) orig-buf)))
-           (when (and (window-live-p win) (buffer-live-p buf)
-                      (not (buffer-match-p consult-preview-excluded-buffers buf)))
-             (with-selected-window win
-               (unless (or orig-prev orig-next)
-                 (setq orig-prev (copy-sequence (window-prev-buffers))
-                       orig-next (copy-sequence (window-next-buffers))))
-               (switch-to-buffer buf 'norecord)))))))))
-
-(defun consult--buffer-action (buffer &optional norecord)
-  "Switch to BUFFER via `consult--buffer-display' function.
-If NORECORD is non-nil, do not record the buffer switch in the buffer list."
-  (funcall consult--buffer-display buffer norecord))
-
-(consult--define-state buffer)
-
-(defvar consult--source-bookmark
-  `(:name     "Bookmark"
-    :narrow   ?m
-    :category bookmark
-    :face     consult-bookmark
-    :history  bookmark-history
-    :items    ,#'bookmark-all-names
-    :state    ,#'consult--bookmark-state)
-  "Bookmark candidate source for `consult-buffer'.")
-
-(defvar consult--source-project-buffer
-  `(:name     "Project Buffer"
-    :narrow   ?b
-    :category buffer
-    :face     consult-buffer
-    :history  buffer-name-history
-    :state    ,#'consult--buffer-state
-    :enabled  ,(lambda () consult-project-function)
-    :items
-    ,(lambda ()
-       (when-let (root (consult--project-root))
-         (consult--buffer-query :sort 'visibility
-                                :directory root
-                                :as #'consult--buffer-pair))))
-  "Project buffer candidate source for `consult-buffer'.")
-
-(defvar consult--source-project-recent-file
-  `(:name     "Project File"
-    :narrow   ?f
-    :category file
-    :face     consult-file
-    :history  file-name-history
-    :state    ,#'consult--file-state
-    :new
-    ,(lambda (file)
-       (consult--file-action
-        (expand-file-name file (consult--project-root))))
-    :enabled
-    ,(lambda ()
-       (and consult-project-function
-            recentf-mode))
-    :items
-    ,(lambda ()
-       (when-let (root (consult--project-root))
-         (let ((len (length root))
-               (ht (consult--buffer-file-hash))
-               items)
-           (dolist (file (bound-and-true-p recentf-list) (nreverse items))
-             ;; Emacs 29 abbreviates file paths by default, see
-             ;; `recentf-filename-handlers'.  I recommend to set
-             ;; `recentf-filename-handlers' to nil to avoid any slow down.
-             (unless (eq (aref file 0) ?/)
-               (let (file-name-handler-alist) ;; No Tramp slowdown please.
-                 (setq file (expand-file-name file))))
-             (when (and (not (gethash file ht)) (string-prefix-p root file))
-               (let ((part (substring file len)))
-                 (when (equal part "") (setq part "./"))
-                 (put-text-property 0 1 'multi-category `(file . ,file) part)
-                 (push part items))))))))
-  "Project file candidate source for `consult-buffer'.")
-
-(defvar consult--source-project-buffer-hidden
-  `(:hidden t :narrow (?p . "Project") ,@consult--source-project-buffer)
-  "Like `consult--source-project-buffer' but hidden by default.")
-
-(defvar consult--source-project-recent-file-hidden
-  `(:hidden t :narrow (?p . "Project") ,@consult--source-project-recent-file)
-  "Like `consult--source-project-recent-file' but hidden by default.")
-
-(defvar consult--source-hidden-buffer
-  `(:name     "Hidden Buffer"
-    :narrow   ?\s
-    :hidden   t
-    :category buffer
-    :face     consult-buffer
-    :history  buffer-name-history
-    :action   ,#'consult--buffer-action
-    :items
-    ,(lambda () (consult--buffer-query :sort 'visibility
-                                       :filter 'invert
-                                       :as #'consult--buffer-pair)))
-  "Hidden buffer candidate source for `consult-buffer'.")
-
-(defvar consult--source-modified-buffer
-  `(:name     "Modified Buffer"
-    :narrow   ?*
-    :hidden   t
-    :category buffer
-    :face     consult-buffer
-    :history  buffer-name-history
-    :state    ,#'consult--buffer-state
-    :items
-    ,(lambda () (consult--buffer-query :sort 'visibility
-                                       :as #'consult--buffer-pair
-                                       :predicate
-                                       (lambda (buf)
-                                         (and (buffer-modified-p buf)
-                                              (buffer-file-name buf))))))
-  "Modified buffer candidate source for `consult-buffer'.")
-
-(defvar consult--source-buffer
-  `(:name     "Buffer"
-    :narrow   ?b
-    :category buffer
-    :face     consult-buffer
-    :history  buffer-name-history
-    :state    ,#'consult--buffer-state
-    :default  t
-    :items
-    ,(lambda () (consult--buffer-query :sort 'visibility
-                                       :as #'consult--buffer-pair)))
-  "Buffer candidate source for `consult-buffer'.")
-
-(defun consult--file-register-p (reg)
-  "Return non-nil if REG is a file register."
-  (memq (car-safe (cdr reg)) '(file-query file)))
-
-(autoload 'consult-register--candidates "consult-register")
-(defvar consult--source-file-register
-  `(:name     "File Register"
-    :narrow   (?r . "Register")
-    :category file
-    :state    ,#'consult--file-state
-    :enabled  ,(lambda () (seq-some #'consult--file-register-p register-alist))
-    :items    ,(lambda () (consult-register--candidates #'consult--file-register-p)))
-  "File register source.")
-
-(defvar consult--source-recent-file
-  `(:name     "File"
-    :narrow   ?f
-    :category file
-    :face     consult-file
-    :history  file-name-history
-    :state    ,#'consult--file-state
-    :new      ,#'consult--file-action
-    :enabled  ,(lambda () recentf-mode)
-    :items
-    ,(lambda ()
-       (let ((ht (consult--buffer-file-hash))
-             items)
-         (dolist (file (bound-and-true-p recentf-list) (nreverse items))
-           ;; Emacs 29 abbreviates file paths by default, see
-           ;; `recentf-filename-handlers'.  I recommend to set
-           ;; `recentf-filename-handlers' to nil to avoid any slow down.
-           (unless (eq (aref file 0) ?/)
-             (let (file-name-handler-alist) ;; No Tramp slowdown please.
-               (setq file (expand-file-name file))))
-           (unless (gethash file ht)
-             (push (consult--fast-abbreviate-file-name file) items))))))
-  "Recent file candidate source for `consult-buffer'.")
-
-;;;###autoload
-(defun consult-buffer (&optional sources)
-  "Enhanced `switch-to-buffer' command with support for virtual buffers.
-
-The command supports recent files, bookmarks, views and project files as
-virtual buffers.  Buffers are previewed.  Narrowing to buffers (b), files (f),
-bookmarks (m) and project files (p) is supported via the corresponding
-keys.  In order to determine the project-specific files and buffers, the
-`consult-project-function' is used.  The virtual buffer SOURCES
-default to `consult-buffer-sources'.  See `consult--multi' for the
-configuration of the virtual buffer sources."
-  (interactive)
-  (let ((selected (consult--multi (or sources consult-buffer-sources)
-                                  :require-match
-                                  (confirm-nonexistent-file-or-buffer)
-                                  :prompt "Switch to: "
-                                  :history 'consult--buffer-history
-                                  :sort nil)))
-    ;; For non-matching candidates, fall back to buffer creation.
-    (unless (plist-get (cdr selected) :match)
-      (consult--buffer-action (car selected)))))
-
-(defmacro consult--with-project (&rest body)
-  "Ensure that BODY is executed with a project root."
-  ;; We have to work quite hard here to ensure that the project root is
-  ;; only overridden at the current recursion level.  When entering a
-  ;; recursive minibuffer session, we should be able to still switch the
-  ;; project.  But who does that? Working on the first level on project A
-  ;; and on the second level on project B and on the third level on project C?
-  ;; You mustn't be afraid to dream a little bigger, darling.
-  `(let ((consult-project-function
-          (let ((root (or (consult--project-root t) (user-error "No project found")))
-                (depth (recursion-depth))
-                (orig consult-project-function))
-            (lambda (may-prompt)
-              (if (= depth (recursion-depth))
-                  root
-                (funcall orig may-prompt))))))
-     ,@body))
-
-;;;###autoload
-(defun consult-project-buffer ()
-  "Enhanced `project-switch-to-buffer' command with support for virtual buffers.
-The command may prompt you for a project directory if it is invoked from
-outside a project.  See `consult-buffer' for more details."
-  (interactive)
-  (consult--with-project
-   (consult-buffer consult-project-buffer-sources)))
-
-;;;###autoload
-(defun consult-buffer-other-window ()
-  "Variant of `consult-buffer', switching to a buffer in another window."
-  (interactive)
-  (let ((consult--buffer-display #'switch-to-buffer-other-window))
-    (consult-buffer)))
-
-;;;###autoload
-(defun consult-buffer-other-frame ()
-  "Variant of `consult-buffer', switching to a buffer in another frame."
-  (interactive)
-  (let ((consult--buffer-display #'switch-to-buffer-other-frame))
-    (consult-buffer)))
-
-;;;###autoload
-(defun consult-buffer-other-tab ()
-  "Variant of `consult-buffer', switching to a buffer in another tab."
-  (interactive)
-  (let ((consult--buffer-display #'switch-to-buffer-other-tab))
-    (consult-buffer)))
-
-;;;;; Command: consult-grep
-
-(defun consult--grep-format (async builder)
-  "Return ASYNC function highlighting grep match results.
-BUILDER is the command line builder function."
-  (let (highlight)
-    (lambda (action)
-      (cond
-       ((stringp action)
-        (setq highlight (cdr (funcall builder action)))
-        (funcall async action))
-       ((consp action)
-        (let ((file "") (file-len 0) result)
-          (save-match-data
-            (dolist (str action)
-              (when (and (string-match consult--grep-match-regexp str)
-                         ;; Filter out empty context lines
-                         (or (/= (aref str (match-beginning 3)) ?-)
-                             (/= (match-end 0) (length str))))
-                ;; We share the file name across candidates to reduce
-                ;; the amount of allocated memory.
-                (unless (and (= file-len (- (match-end 1) (match-beginning 1)))
-                             (eq t (compare-strings
-                                    file 0 file-len
-                                    str (match-beginning 1) (match-end 1) nil)))
-                  (setq file (match-string 1 str)
-                        file-len (length file)))
-                (let* ((line (match-string 2 str))
-                       (ctx (= (aref str (match-beginning 3)) ?-))
-                       (sep (if ctx "-" ":"))
-                       (content (substring str (match-end 0)))
-                       (line-len (length line)))
-                  (when (and consult-grep-max-columns
-                             (length> content consult-grep-max-columns))
-                    (setq content (substring content 0 consult-grep-max-columns)))
-                  (when highlight
-                    (funcall highlight content))
-                  (setq str (concat file sep line sep content))
-                  ;; Store file name in order to avoid allocations in `consult--prefix-group'
-                  (add-text-properties 0 file-len `(face consult-file consult--prefix-group ,file) str)
-                  (put-text-property (1+ file-len) (+ 1 file-len line-len) 'face 'consult-line-number str)
-                  (when ctx
-                    (add-face-text-property (+ 2 file-len line-len) (length str) 'consult-grep-context 'append str))
-                  (push str result)))))
-          (funcall async (nreverse result))))
-       (t (funcall async action))))))
-
-(defun consult--grep-position (cand &optional find-file)
-  "Return the grep position marker for CAND.
-FIND-FILE is the file open function, defaulting to `find-file-noselect'."
-  (when cand
-    (let* ((file-end (next-single-property-change 0 'face cand))
-           (line-end (next-single-property-change (1+ file-end) 'face cand))
-           (matches (consult--point-placement cand (1+ line-end) 'consult-grep-context))
-           (file (substring-no-properties cand 0 file-end))
-           (line (string-to-number (substring-no-properties cand (+ 1 file-end) line-end))))
-      (when-let (pos (consult--marker-from-line-column
-                      (funcall (or find-file #'consult--file-action) file)
-                      line (or (car matches) 0)))
-        (cons pos (cdr matches))))))
-
-(defun consult--grep-state ()
-  "Grep state function."
-  (let ((open (consult--temporary-files))
-        (jump (consult--jump-state)))
-    (lambda (action cand)
-      (unless cand
-        (funcall open))
-      (funcall jump action (consult--grep-position
-                            cand
-                            (and (not (eq action 'return)) open))))))
-
-(defun consult--grep-exclude-args ()
-  "Produce grep exclude arguments.
-Take the variables `grep-find-ignored-directories' and
-`grep-find-ignored-files' into account."
-  (unless (boundp 'grep-find-ignored-files) (require 'grep))
-  (nconc (mapcar (lambda (s) (concat "--exclude=" s))
-                 (bound-and-true-p grep-find-ignored-files))
-         (mapcar (lambda (s) (concat "--exclude-dir=" s))
-                 (bound-and-true-p grep-find-ignored-directories))))
-
-(defun consult--grep (prompt make-builder dir initial)
-  "Run asynchronous grep.
-
-MAKE-BUILDER is the function that returns the command line
-builder function.  DIR is a directory or a list of file or
-directories.  PROMPT is the prompt string.  INITIAL is initial
-input."
-  (pcase-let* ((`(,prompt ,paths ,dir) (consult--directory-prompt prompt dir))
-               (default-directory dir)
-               (builder (funcall make-builder paths)))
-    (consult--read
-     (consult--async-command builder
-       (consult--grep-format builder)
-       :file-handler t) ;; allow tramp
-     :prompt prompt
-     :lookup #'consult--lookup-member
-     :state (consult--grep-state)
-     :initial (consult--async-split-initial initial)
-     :add-history (consult--async-split-thingatpt 'symbol)
-     :require-match t
-     :category 'consult-grep
-     :group #'consult--prefix-group
-     :history '(:input consult--grep-history)
-     :sort nil)))
-
-(defun consult--grep-lookahead-p (&rest cmd)
-  "Return t if grep CMD supports look-ahead."
-  (eq 0 (process-file-shell-command
-         (concat "echo xaxbx | "
-                 (mapconcat #'shell-quote-argument `(,@cmd "^(?=.*b)(?=.*a)") " ")))))
-
-(defun consult--grep-make-builder (paths)
-  "Build grep command line and grep across PATHS."
-  (let* ((cmd (consult--build-args consult-grep-args))
-         (type (if (consult--grep-lookahead-p (car cmd) "-P") 'pcre 'extended)))
-    (lambda (input)
-      (pcase-let* ((`(,arg . ,opts) (consult--command-split input))
-                   (flags (append cmd opts))
-                   (ignore-case (or (member "-i" flags) (member "--ignore-case" flags))))
-        (if (or (member "-F" flags) (member "--fixed-strings" flags))
-            (cons (append cmd (list "-e" arg) opts paths)
-                  (apply-partially #'consult--highlight-regexps
-                                   (list (regexp-quote arg)) ignore-case))
-          (pcase-let ((`(,re . ,hl) (funcall consult--regexp-compiler arg type ignore-case)))
-            (when re
-              (cons (append cmd
-                            (list (if (eq type 'pcre) "-P" "-E") ;; perl or extended
-                                  "-e" (consult--join-regexps re type))
-                            opts paths)
-                    hl))))))))
-
-;;;###autoload
-(defun consult-grep (&optional dir initial)
-  "Search with `grep' for files in DIR where the content matches a regexp.
-
-The initial input is given by the INITIAL argument.  DIR can be nil, a
-directory string or a list of file/directory paths.  If `consult-grep'
-is called interactively with a prefix argument, the user can specify the
-directories or files to search in.  Multiple directories or files must
-be separated by comma in the minibuffer, since they are read via
-`completing-read-multiple'.  By default the project directory is used if
-`consult-project-function' is defined and returns non-nil.  Otherwise
-the `default-directory' is searched.  If the command is invoked with a
-double prefix argument (twice `C-u') the user is asked for a project, if
-not yet inside a project, or the current project is searched.
-
-The input string is split, the first part of the string (grep input) is
-passed to the asynchronous grep process and the second part of the
-string is passed to the completion-style filtering.
-
-The input string is split at a punctuation character, which is given as
-the first character of the input string.  The format is similar to
-Perl-style regular expressions, e.g., /regexp/.  Furthermore command
-line options can be passed to grep, specified behind --.  The overall
-prompt input has the form `#async-input -- grep-opts#filter-string'.
-
-Note that the grep input string is transformed from Emacs regular
-expressions to Posix regular expressions.  Always enter Emacs regular
-expressions at the prompt.  `consult-grep' behaves like builtin Emacs
-search commands, e.g., Isearch, which take Emacs regular expressions.
-Furthermore the asynchronous input split into words, each word must
-match separately and in any order.  See `consult--regexp-compiler' for
-the inner workings.  In order to disable transformations of the grep
-input, adjust `consult--regexp-compiler' accordingly.
-
-Here we give a few example inputs:
-
-#alpha beta         : Search for alpha and beta in any order.
-#alpha.*beta        : Search for alpha before beta.
-#\\(alpha\\|beta\\) : Search for alpha or beta (Note Emacs syntax!)
-#word -- -C3        : Search for word, include 3 lines as context
-#first#second       : Search for first, quick filter for second.
-
-The symbol at point is added to the future history."
-  (interactive "P")
-  (consult--grep "Grep" #'consult--grep-make-builder dir initial))
-
-;;;;; Command: consult-git-grep
-
-(defun consult--git-grep-make-builder (paths)
-  "Create grep command line builder given PATHS."
-  (let ((cmd (consult--build-args consult-git-grep-args)))
-    (lambda (input)
-      (pcase-let* ((`(,arg . ,opts) (consult--command-split input))
-                   (flags (append cmd opts))
-                   (ignore-case (or (member "-i" flags) (member "--ignore-case" flags))))
-        (if (or (member "-F" flags) (member "--fixed-strings" flags))
-            (cons (append cmd (list "-e" arg) opts paths)
-                  (apply-partially #'consult--highlight-regexps
-                                   (list (regexp-quote arg)) ignore-case))
-          (pcase-let ((`(,re . ,hl) (funcall consult--regexp-compiler arg 'extended ignore-case)))
-            (when re
-              (cons (append cmd
-                            (cdr (mapcan (lambda (x) (list "--and" "-e" x)) re))
-                            opts paths)
-                    hl))))))))
-
-;;;###autoload
-(defun consult-git-grep (&optional dir initial)
-  "Search with `git grep' for files in DIR with INITIAL input.
-See `consult-grep' for details."
-  (interactive "P")
-  (consult--grep "Git-grep" #'consult--git-grep-make-builder dir initial))
-
-;;;;; Command: consult-ripgrep
-
-(defun consult--ripgrep-make-builder (paths)
-  "Create ripgrep command line builder given PATHS."
-  (let* ((cmd (consult--build-args consult-ripgrep-args))
-         (type (if (consult--grep-lookahead-p (car cmd) "-P") 'pcre 'extended)))
-    (lambda (input)
-      (pcase-let* ((`(,arg . ,opts) (consult--command-split input))
-                   (flags (append cmd opts))
-                   (ignore-case
-                    (and (not (or (member "-s" flags) (member "--case-sensitive" flags)))
-                         (or (member "-i" flags) (member "--ignore-case" flags)
-                             (and (or (member "-S" flags) (member "--smart-case" flags))
-                                  (let (case-fold-search)
-                                    ;; Case insensitive if there are no uppercase letters
-                                    (not (string-match-p "[[:upper:]]" arg))))))))
-        (if (or (member "-F" flags) (member "--fixed-strings" flags))
-            (cons (append cmd (list "-e" arg) opts paths)
-                  (apply-partially #'consult--highlight-regexps
-                                   (list (regexp-quote arg)) ignore-case))
-          (pcase-let ((`(,re . ,hl) (funcall consult--regexp-compiler arg type ignore-case)))
-            (when re
-              (cons (append cmd (and (eq type 'pcre) '("-P"))
-                            (list "-e" (consult--join-regexps re type))
-                            opts paths)
-                    hl))))))))
-
-;;;###autoload
-(defun consult-ripgrep (&optional dir initial)
-  "Search with `rg' for files in DIR with INITIAL input.
-See `consult-grep' for details."
-  (interactive "P")
-  (consult--grep "Ripgrep" #'consult--ripgrep-make-builder dir initial))
-
-;;;;; Command: consult-find
-
-(defun consult--find (prompt builder initial)
-  "Run find command in current directory.
-
-The function returns the selected file.
-The filename at point is added to the future history.
-
-BUILDER is the command line builder function.
-PROMPT is the prompt.
-INITIAL is initial input."
-  (consult--read
-   (consult--async-command builder
-     (consult--async-map (lambda (x) (string-remove-prefix "./" x)))
-     (consult--async-highlight builder)
-     :file-handler t) ;; allow tramp
-   :prompt prompt
-   :sort nil
-   :require-match t
-   :initial (consult--async-split-initial initial)
-   :add-history (consult--async-split-thingatpt 'filename)
-   :category 'file
-   :history '(:input consult--find-history)))
-
-(defun consult--find-make-builder (paths)
-  "Build find command line, finding across PATHS."
-  (let* ((cmd (seq-mapcat (lambda (x)
-                            (if (equal x ".") paths (list x)))
-                          (consult--build-args consult-find-args)))
-         (type (if (eq 0 (process-file-shell-command
-                          (concat (car cmd) " -regextype emacs -version")))
-                   'emacs 'basic)))
-    (lambda (input)
-      (pcase-let* ((`(,arg . ,opts) (consult--command-split input))
-                   ;; ignore-case=t since -iregex is used below
-                   (`(,re . ,hl) (funcall consult--regexp-compiler arg type t)))
-        (when re
-          (cons (append cmd
-                        (cdr (mapcan
-                              (lambda (x)
-                                `("-and" "-iregex"
-                                  ,(format ".*%s.*"
-                                           ;; Replace non-capturing groups with capturing groups.
-                                           ;; GNU find does not support non-capturing groups.
-                                           (replace-regexp-in-string
-                                            "\\\\(\\?:" "\\(" x 'fixedcase 'literal))))
-                              re))
-                        opts)
-                hl))))))
-
-;;;###autoload
-(defun consult-find (&optional dir initial)
-  "Search for files with `find' in DIR.
-The file names must match the input regexp.  INITIAL is the
-initial minibuffer input.  See `consult-grep' for details
-regarding the asynchronous search and the arguments."
-  (interactive "P")
-  (pcase-let* ((`(,prompt ,paths ,dir) (consult--directory-prompt "Find" dir))
-               (default-directory dir)
-               (builder (consult--find-make-builder paths)))
-    (find-file (consult--find prompt builder initial))))
-
-;;;;; Command: consult-fd
-
-(defun consult--fd-make-builder (paths)
-  "Build find command line, finding across PATHS."
-  (let ((cmd (consult--build-args consult-fd-args)))
-    (lambda (input)
-      (pcase-let* ((`(,arg . ,opts) (consult--command-split input))
-                   (flags (append cmd opts))
-                   (ignore-case
-                    (and (not (or (member "-s" flags) (member "--case-sensitive" flags)))
-                         (or (member "-i" flags) (member "--ignore-case" flags)
-                             (let (case-fold-search)
-                               ;; Case insensitive if there are no uppercase letters
-                               (not (string-match-p "[[:upper:]]" arg)))))))
-        (if (or (member "-F" flags) (member "--fixed-strings" flags))
-            (cons (append cmd (list arg) opts paths)
-                  (apply-partially #'consult--highlight-regexps
-                                   (list (regexp-quote arg)) ignore-case))
-          (pcase-let ((`(,re . ,hl) (funcall consult--regexp-compiler arg 'pcre ignore-case)))
-            (when re
-              (cons (append cmd
-                            (mapcan (lambda (x) `("--and" ,x)) re)
-                            opts
-                            (mapcan (lambda (x) `("--search-path" ,x)) paths))
-                    hl))))))))
-
-;;;###autoload
-(defun consult-fd (&optional dir initial)
-  "Search for files with `fd' in DIR.
-The file names must match the input regexp.  INITIAL is the
-initial minibuffer input.  See `consult-grep' for details
-regarding the asynchronous search and the arguments."
-  (interactive "P")
-  (pcase-let* ((`(,prompt ,paths ,dir) (consult--directory-prompt "Fd" dir))
-               (default-directory dir)
-               (builder (consult--fd-make-builder paths)))
-    (find-file (consult--find prompt builder initial))))
-
-;;;;; Command: consult-locate
-
-(defun consult--locate-builder (input)
-  "Build command line from INPUT."
-  (pcase-let ((`(,arg . ,opts) (consult--command-split input)))
-    (unless (string-blank-p arg)
-      (cons (append (consult--build-args consult-locate-args)
-                    (consult--split-escaped arg) opts)
-            (cdr (consult--default-regexp-compiler input 'basic t))))))
-
-;;;###autoload
-(defun consult-locate (&optional initial)
-  "Search with `locate' for files which match input given INITIAL input.
-
-The input is treated literally such that locate can take advantage of
-the locate database index.  Regular expressions would often force a slow
-linear search through the entire database.  The locate process is started
-asynchronously, similar to `consult-grep'.  See `consult-grep' for more
-details regarding the asynchronous search."
-  (interactive)
-  (find-file (consult--find "Locate: " #'consult--locate-builder initial)))
-
-;;;;; Command: consult-man
-
-(defun consult--man-builder (input)
-  "Build command line from INPUT."
-  (pcase-let* ((`(,arg . ,opts) (consult--command-split input))
-               (`(,re . ,hl) (funcall consult--regexp-compiler arg 'extended t)))
-    (when re
-      (cons (append (consult--build-args consult-man-args)
-                    (list (consult--join-regexps re 'extended))
-                    opts)
-            hl))))
-
-(defun consult--man-format (lines)
-  "Format man candidates from LINES."
-  (let ((candidates))
-    (save-match-data
-      (dolist (str lines)
-        (when (string-match "\\`\\(.*?\\([^ ]+\\) *(\\([^,)]+\\)[^)]*).*?\\) +- +\\(.*\\)\\'" str)
-          (let* ((names (match-string 1 str))
-                 (name (match-string 2 str))
-                 (section (match-string 3 str))
-                 (desc (match-string 4 str))
-                 (cand (format "%s - %s" names desc)))
-            (add-text-properties 0 (length names)
-                                 (list 'face 'consult-file
-                                       'consult-man (concat section " " name))
-                                 cand)
-            (push cand candidates)))))
-    (nreverse candidates)))
-
-;;;###autoload
-(defun consult-man (&optional initial)
-  "Search for man page given INITIAL input.
-
-The input string is not preprocessed and passed literally to the
-underlying man commands.  The man process is started asynchronously,
-similar to `consult-grep'.  See `consult-grep' for more details regarding
-the asynchronous search."
-  (interactive)
-  (man (consult--read
-        (consult--async-command #'consult--man-builder
-          (consult--async-transform consult--man-format)
-          (consult--async-highlight #'consult--man-builder))
-        :prompt "Manual entry: "
-        :require-match t
-        :category 'consult-man
-        :lookup (apply-partially #'consult--lookup-prop 'consult-man)
-        :initial (consult--async-split-initial initial)
-        :add-history (consult--async-split-thingatpt 'symbol)
-        :history '(:input consult--man-history))))
-
-;;;; Preview at point in completions buffers
-
-(define-minor-mode consult-preview-at-point-mode
-  "Preview minor mode for *Completions* buffers.
-When moving around in the *Completions* buffer, the candidate at point is
-automatically previewed."
-  :group 'consult
-  (if consult-preview-at-point-mode
-      (add-hook 'post-command-hook #'consult-preview-at-point nil 'local)
-    (remove-hook 'post-command-hook #'consult-preview-at-point 'local)))
-
-(defun consult-preview-at-point ()
-  "Preview candidate at point in *Completions* buffer."
-  (interactive)
-  (when-let ((win (active-minibuffer-window))
-             (buf (window-buffer win))
-             (fun (buffer-local-value 'consult--preview-function buf)))
-    (funcall fun)))
-
-;;;; Integration with completion systems
-
-;;;;; Integration: Default *Completions*
-
-(defun consult--default-completion-minibuffer-candidate ()
-  "Return current minibuffer candidate from default completion system or Icomplete."
-  (when (and (minibufferp)
-             (eq completing-read-function #'completing-read-default))
-    (let ((content (minibuffer-contents-no-properties)))
-      ;; When the current minibuffer content matches a candidate, return it!
-      (if (test-completion content
-                           minibuffer-completion-table
-                           minibuffer-completion-predicate)
-          content
-        ;; Return the full first candidate of the sorted completion list.
-        (when-let ((completions (completion-all-sorted-completions)))
-          (concat
-           (substring content 0 (or (cdr (last completions)) 0))
-           (car completions)))))))
-
-(defun consult--default-completion-list-candidate ()
-  "Return current candidate at point from completions buffer."
-  (let (beg end)
-    (when (and
-           (derived-mode-p 'completion-list-mode)
-           ;; Logic taken from `choose-completion'.
-           ;; TODO Upstream a `completion-list-get-candidate' function.
-           (cond
-            ((and (not (eobp)) (get-text-property (point) 'mouse-face))
-             (setq end (point) beg (1+ (point))))
-            ((and (not (bobp)) (get-text-property (1- (point)) 'mouse-face))
-             (setq end (1- (point)) beg (point)))))
-      (setq beg (previous-single-property-change beg 'mouse-face)
-            end (or (next-single-property-change end 'mouse-face) (point-max)))
-      (or (get-text-property beg 'completion--string)
-          (buffer-substring-no-properties beg end)))))
-
-;;;;; Integration: Vertico
-
-(defvar vertico--input)
-(declare-function vertico--exhibit "ext:vertico")
-(declare-function vertico--candidate "ext:vertico")
-(declare-function vertico--filter-completions "ext:vertico")
-
-(defun consult--vertico-candidate ()
-  "Return current candidate for Consult preview."
-  (and vertico--input (vertico--candidate 'highlight)))
-
-(defun consult--vertico-refresh ()
-  "Refresh completion UI."
-  (when vertico--input
-    (setq vertico--input t)
-    (vertico--exhibit)))
-
-(defun consult--vertico-filter-adv (orig pattern cands category highlight)
-  "Advice for ORIG `consult--completion-filter' function.
-See `consult--completion-filter' for arguments PATTERN, CANDS, CATEGORY
-and HIGHLIGHT."
-  (if (and (not highlight) (bound-and-true-p vertico-mode))
-      ;; Optimize `consult--completion-filter' using the deferred highlighting
-      ;; from Vertico.  The advice is not necessary - it is a pure optimization.
-      (nconc (car (vertico--filter-completions pattern cands nil (length pattern)
-                                               `(metadata (category . ,category))))
-             nil)
-    (funcall orig pattern cands category highlight)))
-
-(with-eval-after-load 'vertico
-  (advice-add #'consult--completion-filter :around #'consult--vertico-filter-adv)
-  (add-hook 'consult--completion-candidate-hook #'consult--vertico-candidate)
-  (add-hook 'consult--completion-refresh-hook #'consult--vertico-refresh)
-  (define-key consult-async-map [remap vertico-insert] 'vertico-next-group))
-
-;;;;; Integration: Mct
-
-(with-eval-after-load 'mct (add-hook 'consult--completion-refresh-hook
-                                     'mct--live-completions-refresh))
-
-;;;;; Integration: Icomplete
-
-(defvar icomplete-mode)
-(declare-function icomplete-exhibit "icomplete")
-
-(defun consult--icomplete-refresh ()
-  "Refresh icomplete view."
-  (when icomplete-mode
-    (let ((top (car completion-all-sorted-completions)))
-      (completion--flush-all-sorted-completions)
-      ;; force flushing, otherwise narrowing is broken!
-      (setq completion-all-sorted-completions nil)
-      (when top
-        (let* ((completions (completion-all-sorted-completions))
-               (last (last completions))
-               (before)) ;; completions before top
-          ;; warning: completions is an improper list
-          (while (consp completions)
-            (if (equal (car completions) top)
-                (progn
-                  (setcdr last (append (nreverse before) (cdr last)))
-                  (setq completion-all-sorted-completions completions
-                        completions nil))
-              (push (car completions) before)
-              (setq completions (cdr completions)))))))
-    (icomplete-exhibit)))
-
-(with-eval-after-load 'icomplete
-  (add-hook 'consult--completion-refresh-hook #'consult--icomplete-refresh))
-
-(provide 'consult)
-;;; consult.el ends here
diff --git a/emacs/elpa/consult-20240930.1012/consult.elc b/emacs/elpa/consult-20240930.1012/consult.elc
Binary files differ.
diff --git a/emacs/elpa/consult-20240930.1012/consult-autoloads.el b/emacs/elpa/consult-20241001.2057/consult-autoloads.el
diff --git a/emacs/elpa/consult-20240930.1012/consult-compile.el b/emacs/elpa/consult-20241001.2057/consult-compile.el
diff --git a/emacs/elpa/consult-20240930.1012/consult-compile.elc b/emacs/elpa/consult-20241001.2057/consult-compile.elc
Binary files differ.
diff --git a/emacs/elpa/consult-20240930.1012/consult-flymake.el b/emacs/elpa/consult-20241001.2057/consult-flymake.el
diff --git a/emacs/elpa/consult-20240930.1012/consult-flymake.elc b/emacs/elpa/consult-20241001.2057/consult-flymake.elc
Binary files differ.
diff --git a/emacs/elpa/consult-20240930.1012/consult-imenu.el b/emacs/elpa/consult-20241001.2057/consult-imenu.el
diff --git a/emacs/elpa/consult-20240930.1012/consult-imenu.elc b/emacs/elpa/consult-20241001.2057/consult-imenu.elc
Binary files differ.
diff --git a/emacs/elpa/consult-20240930.1012/consult-info.el b/emacs/elpa/consult-20241001.2057/consult-info.el
diff --git a/emacs/elpa/consult-20240930.1012/consult-info.elc b/emacs/elpa/consult-20241001.2057/consult-info.elc
Binary files differ.
diff --git a/emacs/elpa/consult-20240930.1012/consult-kmacro.el b/emacs/elpa/consult-20241001.2057/consult-kmacro.el
diff --git a/emacs/elpa/consult-20240930.1012/consult-kmacro.elc b/emacs/elpa/consult-20241001.2057/consult-kmacro.elc
Binary files differ.
diff --git a/emacs/elpa/consult-20240930.1012/consult-org.el b/emacs/elpa/consult-20241001.2057/consult-org.el
diff --git a/emacs/elpa/consult-20240930.1012/consult-org.elc b/emacs/elpa/consult-20241001.2057/consult-org.elc
Binary files differ.
diff --git a/emacs/elpa/consult-20241001.2057/consult-pkg.el b/emacs/elpa/consult-20241001.2057/consult-pkg.el
@@ -0,0 +1,10 @@
+;; -*- no-byte-compile: t; lexical-binding: nil -*-
+(define-package "consult" "20241001.2057"
+  "Consulting completing-read."
+  '((emacs  "28.1")
+    (compat "30"))
+  :url "https://github.com/minad/consult"
+  :commit "07ea5421fbcb65b2207a43a0941124a95a47abc7"
+  :revdesc "07ea5421fbcb"
+  :keywords '("matching" "files" "completion")
+  :maintainers '(("Daniel Mendler" . "mail@daniel-mendler.de")))
diff --git a/emacs/elpa/consult-20240930.1012/consult-register.el b/emacs/elpa/consult-20241001.2057/consult-register.el
diff --git a/emacs/elpa/consult-20240930.1012/consult-register.elc b/emacs/elpa/consult-20241001.2057/consult-register.elc
Binary files differ.
diff --git a/emacs/elpa/consult-20240930.1012/consult-xref.el b/emacs/elpa/consult-20241001.2057/consult-xref.el
diff --git a/emacs/elpa/consult-20240930.1012/consult-xref.elc b/emacs/elpa/consult-20241001.2057/consult-xref.elc
Binary files differ.
diff --git a/emacs/elpa/consult-20241001.2057/consult.el b/emacs/elpa/consult-20241001.2057/consult.el
@@ -0,0 +1,5246 @@
+;;; consult.el --- Consulting completing-read -*- lexical-binding: t -*-
+
+;; Copyright (C) 2021-2024 Free Software Foundation, Inc.
+
+;; Author: Daniel Mendler and Consult contributors
+;; Maintainer: Daniel Mendler <mail@daniel-mendler.de>
+;; Created: 2020
+;; Package-Version: 20241001.2057
+;; Package-Revision: 07ea5421fbcb
+;; Package-Requires: ((emacs "28.1") (compat "30"))
+;; URL: https://github.com/minad/consult
+;; Keywords: matching, files, completion
+
+;; This file is part of GNU Emacs.
+
+;; This program is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; Consult implements a set of `consult-<thing>' commands, which aim to
+;; improve the way you use Emacs.  The commands are founded on
+;; `completing-read', which selects from a list of candidate strings.
+;; Consult provides an enhanced buffer switcher `consult-buffer' and
+;; search and navigation commands like `consult-imenu' and
+;; `consult-line'.  Searching through multiple files is supported by the
+;; asynchronous `consult-grep' command.  Many Consult commands support
+;; previewing candidates.  If a candidate is selected in the completion
+;; view, the buffer shows the candidate immediately.
+
+;; The Consult commands are compatible with multiple completion systems
+;; based on the Emacs `completing-read' API, including the default
+;; completion system, Vertico, Mct and Icomplete.
+
+;; See the README for an overview of the available Consult commands and
+;; the documentation of the configuration and installation of the
+;; package.
+
+;; The full list of contributors can be found in the acknowledgments
+;; section of the README.
+
+;;; Code:
+
+(eval-when-compile
+  (require 'cl-lib)
+  (require 'subr-x))
+(require 'compat)
+(require 'bookmark)
+
+(defgroup consult nil
+  "Consulting `completing-read'."
+  :link '(info-link :tag "Info Manual" "(consult)")
+  :link '(url-link :tag "Website" "https://github.com/minad/consult")
+  :link '(emacs-library-link :tag "Library Source" "consult.el")
+  :group 'files
+  :group 'outlines
+  :group 'minibuffer
+  :prefix "consult-")
+
+;;;; Customization
+
+(defcustom consult-narrow-key nil
+  "Prefix key for narrowing during completion.
+
+Good choices for this key are \"<\" and \"C-+\" for example. The
+key must be a string accepted by `key-valid-p'."
+  :type '(choice key (const :tag "None" nil)))
+
+(defcustom consult-widen-key nil
+  "Key used for widening during completion.
+
+If this key is unset, defaults to twice the `consult-narrow-key'.
+The key must be a string accepted by `key-valid-p'."
+  :type '(choice key (const :tag "None" nil)))
+
+(defcustom consult-project-function
+  #'consult--default-project-function
+  "Function which returns project root directory.
+The function takes one boolean argument MAY-PROMPT.  If
+MAY-PROMPT is non-nil, the function may ask the prompt the user
+for a project directory.  The root directory is used by
+`consult-buffer' and `consult-grep'."
+  :type `(choice
+          (const :tag "Default project function" ,#'consult--default-project-function)
+          (function :tag "Custom function")
+          (const :tag "No project integration" nil)))
+
+(defcustom consult-async-refresh-delay 0.2
+  "Refreshing delay of the completion UI for asynchronous commands.
+
+The completion UI is only updated every
+`consult-async-refresh-delay' seconds.  This applies to
+asynchronous commands like for example `consult-grep'."
+  :type '(float :tag "Delay in seconds"))
+
+(defcustom consult-async-input-throttle 0.5
+  "Input throttle for asynchronous commands.
+
+The asynchronous process is started only every
+`consult-async-input-throttle' seconds.  This applies to asynchronous
+commands, e.g., `consult-grep'."
+  :type '(float :tag "Delay in seconds"))
+
+(defcustom consult-async-input-debounce 0.2
+  "Input debounce for asynchronous commands.
+
+The asynchronous process is started only when there has not been new
+input for `consult-async-input-debounce' seconds.  This applies to
+asynchronous commands, e.g., `consult-grep'."
+  :type '(float :tag "Delay in seconds"))
+
+(defcustom consult-async-min-input 3
+  "Minimum number of characters needed, before asynchronous process is called.
+
+This applies to asynchronous commands, e.g., `consult-grep'."
+  :type '(natnum :tag "Number of characters"))
+
+(defcustom consult-async-split-style 'perl
+  "Async splitting style, see `consult-async-split-styles-alist'."
+  :type '(choice (const :tag "No splitting" nil)
+                 (const :tag "Comma" comma)
+                 (const :tag "Semicolon" semicolon)
+                 (const :tag "Perl" perl)))
+
+(defcustom consult-async-split-styles-alist
+  `((nil :function ,#'consult--split-nil)
+    (comma :separator ?, :function ,#'consult--split-separator)
+    (semicolon :separator ?\; :function ,#'consult--split-separator)
+    (perl :initial "#" :function ,#'consult--split-perl))
+  "Async splitting styles."
+  :type '(alist :key-type symbol :value-type plist))
+
+(defcustom consult-mode-histories
+  '((eshell-mode eshell-history-ring eshell-history-index    eshell-bol)
+    (comint-mode comint-input-ring   comint-input-ring-index comint-bol)
+    (term-mode   term-input-ring     term-input-ring-index   term-bol))
+  "Alist of mode histories (mode history index bol).
+The histories can be rings or lists.  Index, if provided, is a
+variable to set to the index of the selection within the ring or
+list.  Bol, if provided is a function which jumps to the beginning
+of the line after the prompt."
+  :type '(alist :key-type symbol
+                :value-type (group :tag "Include Index"
+                                   (symbol :tag "List/Ring")
+                                   (symbol :tag "Index Variable")
+                                   (symbol :tag "Bol Function"))))
+
+(defcustom consult-themes nil
+  "List of themes (symbols or regexps) to be presented for selection.
+nil shows all `custom-available-themes'."
+  :type '(repeat (choice symbol regexp)))
+
+(defcustom consult-after-jump-hook (list #'recenter)
+  "Function called after jumping to a location.
+
+Commonly used functions for this hook are `recenter' and
+`reposition-window'.  You may want to add a function which pulses the
+current line, e.g., `pulse-momentary-highlight-one-line'.  The hook
+called during preview and for the jump after selection."
+  :type 'hook)
+
+(defcustom consult-line-start-from-top nil
+  "Start search from the top if non-nil.
+Otherwise start the search at the current line and wrap around."
+  :type 'boolean)
+
+(defcustom consult-point-placement 'match-beginning
+  "Where to leave point when jumping to a match.
+This setting affects the command `consult-line' and the `consult-grep' variants."
+  :type '(choice (const :tag "Beginning of the line" line-beginning)
+                 (const :tag "Beginning of the match" match-beginning)
+                 (const :tag "End of the match" match-end)))
+
+(defcustom consult-line-numbers-widen t
+  "Show absolute line numbers when narrowing is active.
+
+See also `display-line-numbers-widen'."
+  :type 'boolean)
+
+(defcustom consult-goto-line-numbers t
+  "Show line numbers for `consult-goto-line'."
+  :type 'boolean)
+
+(defcustom consult-fontify-preserve t
+  "Preserve fontification for line-based commands."
+  :type 'boolean)
+
+(defcustom consult-fontify-max-size 1048576
+  "Buffers larger than this byte limit are not fontified.
+
+This is necessary in order to prevent a large startup time
+for navigation commands like `consult-line'."
+  :type '(natnum :tag "Buffer size in bytes"))
+
+(defcustom consult-buffer-filter
+  '("\\` "
+    "\\`\\*Completions\\*\\'"
+    "\\`\\*Flymake log\\*\\'"
+    "\\`\\*Semantic SymRef\\*\\'"
+    "\\`\\*vc\\*\\'"
+    "\\`newsrc-dribble\\'" ;; Gnus
+    "\\`\\*tramp/.*\\*\\'")
+  "Filter regexps for `consult-buffer'.
+
+The default setting is to filter ephemeral buffer names beginning
+with a space character, the *Completions* buffer and a few log
+buffers.  The regular expressions are matched case sensitively."
+  :type '(repeat regexp))
+
+(defcustom consult-buffer-sources
+  '(consult--source-hidden-buffer
+    consult--source-modified-buffer
+    consult--source-buffer
+    consult--source-recent-file
+    consult--source-file-register
+    consult--source-bookmark
+    consult--source-project-buffer-hidden
+    consult--source-project-recent-file-hidden)
+  "Sources used by `consult-buffer'.
+See also `consult-project-buffer-sources'.
+See `consult--multi' for a description of the source data structure."
+  :type '(repeat symbol))
+
+(defcustom consult-project-buffer-sources
+  '(consult--source-project-buffer
+    consult--source-project-recent-file)
+  "Sources used by `consult-project-buffer'.
+See also `consult-buffer-sources'.
+See `consult--multi' for a description of the source data structure."
+  :type '(repeat symbol))
+
+(defcustom consult-mode-command-filter
+  '(;; Filter commands
+    "-mode\\'" "--"
+    ;; Filter whole features
+    simple mwheel time so-long recentf tab-bar tab-line)
+  "Filter commands for `consult-mode-command'."
+  :type '(repeat (choice symbol regexp)))
+
+(defcustom consult-grep-max-columns 300
+  "Maximal number of columns of grep output.
+If set to nil, do not truncate candidates.  This can have negative
+performance implications but helps if you want to export long lines via
+`embark-export'."
+  :type '(choice natnum (const nil)))
+
+(defconst consult--grep-match-regexp
+  "\\`\\(?:\\./\\)?\\([^\n\0]+\\)\0\\([0-9]+\\)\\([-:\0]\\)"
+  "Regexp used to match file and line of grep output.")
+
+(defcustom consult-grep-args
+  '("grep" (consult--grep-exclude-args)
+    "--null --line-buffered --color=never --ignore-case\
+     --with-filename --line-number -I -r")
+  "Command line arguments for grep, see `consult-grep'.
+The dynamically computed arguments are appended.
+Can be either a string, or a list of strings or expressions."
+  :type '(choice string (repeat (choice string sexp))))
+
+(defcustom consult-git-grep-args
+  "git --no-pager grep --null --color=never --ignore-case\
+   --extended-regexp --line-number -I"
+  "Command line arguments for git-grep, see `consult-git-grep'.
+The dynamically computed arguments are appended.
+Can be either a string, or a list of strings or expressions."
+  :type '(choice string (repeat (choice string sexp))))
+
+(defcustom consult-ripgrep-args
+  "rg --null --line-buffered --color=never --max-columns=1000 --path-separator /\
+   --smart-case --no-heading --with-filename --line-number --search-zip"
+  "Command line arguments for ripgrep, see `consult-ripgrep'.
+The dynamically computed arguments are appended.
+Can be either a string, or a list of strings or expressions."
+  :type '(choice string (repeat (choice string sexp))))
+
+(defcustom consult-find-args
+  "find . -not ( -path */.[A-Za-z]* -prune )"
+  "Command line arguments for find, see `consult-find'.
+The dynamically computed arguments are appended.
+Can be either a string, or a list of strings or expressions."
+  :type '(choice string (repeat (choice string sexp))))
+
+(defcustom consult-fd-args
+  '((if (executable-find "fdfind" 'remote) "fdfind" "fd")
+    "--full-path --color=never")
+  "Command line arguments for fd, see `consult-fd'.
+The dynamically computed arguments are appended.
+Can be either a string, or a list of strings or expressions."
+  :type '(choice string (repeat (choice string sexp))))
+
+(defcustom consult-locate-args
+  "locate --ignore-case" ;; --existing not supported by Debian plocate
+  "Command line arguments for locate, see `consult-locate'.
+The dynamically computed arguments are appended.
+Can be either a string, or a list of strings or expressions."
+  :type '(choice string (repeat (choice string sexp))))
+
+(defcustom consult-man-args
+  "man -k"
+  "Command line arguments for man, see `consult-man'.
+The dynamically computed arguments are appended.
+Can be either a string, or a list of strings or expressions."
+  :type '(choice string (repeat (choice string sexp))))
+
+(defcustom consult-preview-key 'any
+  "Preview trigger keys, can be nil, `any', a single key or a list of keys.
+Debouncing can be specified via the `:debounce' attribute.  The
+individual keys must be strings accepted by `key-valid-p'."
+  :type '(choice (const :tag "Any key" any)
+                 (list :tag "Debounced"
+                       (const :debounce)
+                       (float :tag "Seconds" 0.1)
+                       (const any))
+                 (const :tag "No preview" nil)
+                 (key :tag "Key")
+                 (repeat :tag "List of keys" key)))
+
+(defcustom consult-preview-partial-size 1048576
+  "Files larger than this byte limit are previewed partially."
+  :type '(natnum :tag "File size in bytes"))
+
+(defcustom consult-preview-partial-chunk 102400
+  "Partial preview chunk size in bytes.
+If a file is larger than `consult-preview-partial-size' only the
+chunk from the beginning of the file is previewed."
+  :type '(natnum :tag "Chunk size in bytes"))
+
+(defcustom consult-preview-max-count 10
+  "Number of file buffers to keep open temporarily during preview."
+  :type '(natnum :tag "Number of buffers"))
+
+(defcustom consult-preview-excluded-buffers nil
+  "Buffers excluded from preview.
+The value should conform to the predicate format demanded by the
+function `buffer-match-p'."
+  :type 'sexp)
+
+(defcustom consult-preview-excluded-files
+  '("\\`/[^/|:]+:") ;; Do not preview remote files
+  "List of regexps matched against names of files, which are not previewed."
+  :type '(repeat regexp))
+
+(defcustom consult-preview-allowed-hooks
+  '(global-font-lock-mode
+    save-place-find-file-hook)
+  "List of hooks, which should be executed during file preview.
+This variable applies to `find-file-hook', `change-major-mode-hook' and
+mode hooks, e.g., `prog-mode-hook'."
+  :type '(repeat symbol))
+
+(defcustom consult-preview-variables
+  '((inhibit-message . t)
+    (enable-dir-local-variables . nil)
+    (enable-local-variables . :safe)
+    (non-essential . t)
+    (delay-mode-hooks . t))
+  "Variables which are bound for file preview."
+  :type '(alist :key-type symbol))
+
+(defcustom consult-bookmark-narrow
+  `((?f "File" bookmark-default-handler)
+    (?h "Help" help-bookmark-jump Info-bookmark-jump
+               Man-bookmark-jump woman-bookmark-jump)
+    (?p "Picture" image-bookmark-jump)
+    (?d "Docview" doc-view-bookmark-jump)
+    (?m "Mail" gnus-summary-bookmark-jump)
+    (?s "Eshell" eshell-bookmark-jump)
+    (?w "Web" eww-bookmark-jump xwidget-webkit-bookmark-jump-handler)
+    (?v "VC Directory" vc-dir-bookmark-jump)
+    (nil "Other"))
+  "Bookmark narrowing configuration.
+
+Each element of the list must have the form (char name handlers...)."
+  :type '(alist :key-type character :value-type (cons string (repeat function))))
+
+(define-obsolete-variable-alias
+  'consult-yank-rotate 'yank-from-kill-ring-rotate "1.8")
+
+;;;; Faces
+
+(defgroup consult-faces nil
+  "Faces used by Consult."
+  :group 'consult
+  :group 'faces)
+
+(defface consult-preview-line
+  '((t :inherit consult-preview-insertion :extend t))
+  "Face used for line previews.")
+
+(defface consult-highlight-match
+  '((t :inherit match))
+  "Face used to highlight matches in the completion candidates.
+Used for example by `consult-grep'.")
+
+(defface consult-highlight-mark
+  '((t :inherit consult-highlight-match))
+  "Face used for mark positions in completion candidates.
+Used for example by `consult-mark'.  The face should be different
+than the `cursor' face to avoid confusion.")
+
+(defface consult-preview-match
+  '((t :inherit isearch))
+  "Face used for match previews, e.g., in `consult-line'.")
+
+(defface consult-preview-insertion
+  '((t :inherit region))
+  "Face used for previews of text to be inserted.
+Used by `consult-completion-in-region', `consult-yank' and `consult-history'.")
+
+(defface consult-narrow-indicator
+  '((t :inherit warning))
+  "Face used for the narrowing indicator.")
+
+(defface consult-async-running
+  '((t :inherit consult-narrow-indicator))
+  "Face used if asynchronous process is running.")
+
+(defface consult-async-finished
+  '((t :inherit success))
+  "Face used if asynchronous process has finished.")
+
+(defface consult-async-failed
+  '((t :inherit error))
+  "Face used if asynchronous process has failed.")
+
+(defface consult-async-split
+  '((t :inherit font-lock-negation-char-face))
+  "Face used to highlight punctuation character.")
+
+(defface consult-help
+  '((t :inherit shadow))
+  "Face used to highlight help, e.g., in `consult-register-store'.")
+
+(defface consult-key
+  '((t :inherit font-lock-keyword-face))
+  "Face used to highlight keys, e.g., in `consult-register'.")
+
+(defface consult-line-number
+  '((t :inherit consult-key))
+  "Face used to highlight location line in `consult-global-mark'.")
+
+(defface consult-file
+  '((t :inherit font-lock-function-name-face))
+  "Face used to highlight files in `consult-buffer'.")
+
+(defface consult-grep-context
+  '((t :inherit shadow))
+  "Face used to highlight grep context in `consult-grep'.")
+
+(defface consult-bookmark
+  '((t :inherit font-lock-constant-face))
+  "Face used to highlight bookmarks in `consult-buffer'.")
+
+(defface consult-buffer
+  '((t))
+  "Face used to highlight buffers in `consult-buffer'.")
+
+(defface consult-line-number-prefix
+  '((t :inherit line-number))
+  "Face used to highlight line number prefixes.")
+
+(defface consult-line-number-wrapped
+  '((t :inherit consult-line-number-prefix :inherit font-lock-warning-face))
+  "Face used to highlight line number prefixes after wrap around.")
+
+(defface consult-separator
+  '((((class color) (min-colors 88) (background light))
+     :foreground "#ccc")
+    (((class color) (min-colors 88) (background dark))
+     :foreground "#333"))
+  "Face used for thin line separators in `consult-register-window'.")
+
+;;;; Input history variables
+
+(defvar consult--path-history nil)
+(defvar consult--grep-history nil)
+(defvar consult--find-history nil)
+(defvar consult--man-history nil)
+(defvar consult--line-history nil)
+(defvar consult--line-multi-history nil)
+(defvar consult--theme-history nil)
+(defvar consult--minor-mode-menu-history nil)
+(defvar consult--buffer-history nil)
+
+;;;; Internal variables
+
+(defvar consult--regexp-compiler
+  #'consult--default-regexp-compiler
+  "Regular expression compiler used by `consult-grep' and other commands.
+The function must return a list of regular expressions and a highlighter
+function.")
+
+(defvar consult--customize-alist
+  ;; Disable preview in frames, since `consult--jump-preview' does not properly
+  ;; clean up.  See gh:minad/consult#593. This issue should better be fixed in
+  ;; `consult--jump-preview'.
+  `((,#'consult-buffer-other-frame :preview-key nil)
+    (,#'consult-buffer-other-tab :preview-key nil))
+  "Command configuration alist for fine-grained configuration.
+
+Each element of the list must have the form (command-name plist...).  The
+options set here will be evaluated and passed to `consult--read', when
+called from the corresponding command.  Note that the options depend on
+the private `consult--read' API and should not be considered as stable
+as the public API.")
+
+(defvar consult--buffer-display #'switch-to-buffer
+  "Buffer display function.")
+
+(defvar consult--completion-candidate-hook
+  (list #'consult--default-completion-minibuffer-candidate
+        #'consult--default-completion-list-candidate)
+  "Get candidate from completion system.")
+
+(defvar consult--completion-refresh-hook nil
+  "Refresh completion system.")
+
+(defvar-local consult--preview-function nil
+  "Minibuffer-local variable which exposes the current preview function.
+This function can be called by custom completion systems from
+outside the minibuffer.")
+
+(defvar consult--annotate-align-step 10
+  "Round candidate width.")
+
+(defvar consult--annotate-align-width 0
+  "Maximum candidate width used for annotation alignment.")
+
+(defconst consult--tofu-char #x200000
+  "Special character used to encode line prefixes for disambiguation.
+We use invalid characters outside the Unicode range.")
+
+(defconst consult--tofu-range #x100000
+  "Special character range.")
+
+(defvar-local consult--narrow nil
+  "Current narrowing key.")
+
+(defvar-local consult--narrow-keys nil
+  "Narrowing prefixes of the current completion.")
+
+(defvar-local consult--narrow-predicate nil
+  "Narrowing predicate of the current completion.")
+
+(defvar-local consult--narrow-overlay nil
+  "Narrowing indicator overlay.")
+
+(defvar consult--gc-threshold (* 64 1024 1024)
+  "Large GC threshold for temporary increase.")
+
+(defvar consult--gc-percentage 0.5
+  "Large GC percentage for temporary increase.")
+
+(defvar consult--process-chunk (* 1024 1024)
+  "Increase process output chunk size.")
+
+(defvar consult--async-log
+  " *consult-async*"
+  "Buffer for async logging output used by `consult--async-process'.")
+
+(defvar-local consult--focus-lines-overlays nil
+  "Overlays used by `consult-focus-lines'.")
+
+(defvar-local consult--org-fold-regions nil
+  "Stored regions for the org-fold API.")
+
+;;;; Miscellaneous helper functions
+
+(defun consult--key-parse (key)
+  "Parse KEY or signal error if invalid."
+  (unless (key-valid-p key)
+    (error "%S is not a valid key definition; see `key-valid-p'" key))
+  (key-parse key))
+
+(defun consult--in-buffer (fun &optional buffer)
+  "Ensure that FUN is executed inside BUFFER."
+  (unless buffer (setq buffer (current-buffer)))
+  (lambda (&rest args)
+    (with-current-buffer buffer
+      (apply fun args))))
+
+(defun consult--completion-table-in-buffer (table &optional buffer)
+  "Ensure that completion TABLE is executed inside BUFFER."
+  (if (functionp table)
+      (consult--in-buffer
+       (lambda (str pred action)
+         (let ((result (funcall table str pred action)))
+           (pcase action
+             ('metadata
+              (setq result
+                    (mapcar
+                     (lambda (x)
+                       (if (and (string-suffix-p "-function" (symbol-name (car-safe x))) (cdr x))
+                           (cons (car x) (consult--in-buffer (cdr x)))
+                         x))
+                     result)))
+             ((and 'completion--unquote (guard (functionp (cadr result))))
+              (cl-callf consult--in-buffer (cadr result) buffer)
+              (cl-callf consult--in-buffer (cadddr result) buffer)))
+           result))
+       buffer)
+    table))
+
+(defun consult--build-args (arg)
+  "Return ARG as a flat list of split strings.
+
+Turn ARG into a list, and for each element either:
+- split it if it a string.
+- eval it if it is an expression."
+  (seq-mapcat (lambda (x)
+                (if (stringp x)
+                    (split-string-and-unquote x)
+                  (ensure-list (eval x 'lexical))))
+              (ensure-list arg)))
+
+(defun consult--command-split (str)
+  "Return command argument and options list given input STR."
+  (save-match-data
+    (let ((opts (when (string-match " +--\\( +\\|\\'\\)" str)
+                  (prog1 (substring str (match-end 0))
+                    (setq str (substring str 0 (match-beginning 0)))))))
+      ;; split-string-and-unquote fails if the quotes are invalid.  Ignore it.
+      (cons str (and opts (ignore-errors (split-string-and-unquote opts)))))))
+
+(defmacro consult--keep! (list form)
+  "Evaluate FORM for every element of LIST and keep the non-nil results."
+  (declare (indent 1))
+  (cl-with-gensyms (head prev result)
+    `(let* ((,head (cons nil ,list))
+            (,prev ,head))
+       (while (cdr ,prev)
+         (if-let (,result (let ((it (cadr ,prev))) ,form))
+             (progn
+               (pop ,prev)
+               (setcar ,prev ,result))
+           (setcdr ,prev (cddr ,prev))))
+       (setq ,list (cdr ,head))
+       nil)))
+
+(defun consult--completion-filter (pattern cands category _highlight)
+  "Filter CANDS with PATTERN.
+
+CATEGORY is the completion category, used to find the completion style via
+`completion-category-defaults' and `completion-category-overrides'.
+HIGHLIGHT must be non-nil if the resulting strings should be highlighted."
+  ;; completion-all-completions returns an improper list
+  ;; where the last link is not necessarily nil.
+  (nconc (completion-all-completions pattern cands nil (length pattern)
+                                     `(metadata (category . ,category)))
+         nil))
+
+(defun consult--completion-filter-complement (pattern cands category _highlight)
+  "Filter CANDS with complement of PATTERN.
+See `consult--completion-filter' for the arguments CATEGORY and HIGHLIGHT."
+  (let ((ht (consult--string-hash (consult--completion-filter pattern cands category nil))))
+    (seq-remove (lambda (x) (gethash x ht)) cands)))
+
+(defun consult--completion-filter-dispatch (pattern cands category highlight)
+  "Filter CANDS with PATTERN with optional complement.
+Either using `consult--completion-filter' or
+`consult--completion-filter-complement', depending on if the pattern starts
+with a bang.  See `consult--completion-filter' for the arguments CATEGORY and
+HIGHLIGHT."
+  (cond
+   ((string-match-p "\\`!? ?\\'" pattern) cands) ;; empty pattern
+   ((string-prefix-p "! " pattern) (consult--completion-filter-complement
+                                    (substring pattern 2) cands category nil))
+   (t (consult--completion-filter pattern cands category highlight))))
+
+(defmacro consult--each-line (beg end &rest body)
+  "Iterate over each line.
+
+The line beginning/ending BEG/END is bound in BODY."
+  (declare (indent 2))
+  (cl-with-gensyms (max)
+    `(save-excursion
+       (let ((,beg (point-min)) (,max (point-max)) ,end)
+         (while (< ,beg ,max)
+           (goto-char ,beg)
+           (setq ,end (pos-eol))
+           ,@body
+           (setq ,beg (1+ ,end)))))))
+
+(defun consult--display-width (string)
+  "Compute width of STRING taking display and invisible properties into account."
+  (let ((pos 0) (width 0) (end (length string)))
+    (while (< pos end)
+      (let ((nextd (next-single-property-change pos 'display string end))
+            (display (get-text-property pos 'display string)))
+        (if (stringp display)
+            (setq width (+ width (string-width display))
+                  pos nextd)
+          (while (< pos nextd)
+            (let ((nexti (next-single-property-change pos 'invisible string nextd)))
+              (unless (get-text-property pos 'invisible string)
+                (setq width (+ width (string-width string pos nexti))))
+              (setq pos nexti))))))
+    width))
+
+(defun consult--string-hash (strings)
+  "Create hash table from STRINGS."
+  (let ((ht (make-hash-table :test #'equal :size (length strings))))
+    (dolist (str strings)
+      (puthash str t ht))
+    ht))
+
+(defmacro consult--local-let (binds &rest body)
+  "Buffer local let BINDS of dynamic variables in BODY."
+  (declare (indent 1))
+  (let ((buffer (gensym "buffer"))
+        (local (mapcar (lambda (x) (cons (gensym "local") (car x))) binds)))
+    `(let ((,buffer (current-buffer))
+           ,@(mapcar (lambda (x) `(,(car x) (local-variable-p ',(cdr x)))) local))
+       (unwind-protect
+           (progn
+             ,@(mapcar (lambda (x) `(make-local-variable ',(car x))) binds)
+             (let (,@binds)
+               ,@body))
+         (when (buffer-live-p ,buffer)
+           (with-current-buffer ,buffer
+             ,@(mapcar (lambda (x)
+                         `(unless ,(car x)
+                            (kill-local-variable ',(cdr x))))
+                       local)))))))
+
+(defvar consult--fast-abbreviate-file-name nil)
+(defun consult--fast-abbreviate-file-name (name)
+  "Return abbreviate file NAME.
+This function is a pure variant of `abbreviate-file-name', which
+does not access the file system.  This is important if we require
+that the operation is fast, even for remote paths or paths on
+network file systems."
+  (save-match-data
+    (let (case-fold-search) ;; Assume that file system is case sensitive.
+      (setq name (directory-abbrev-apply name))
+      (if (string-match (with-memoization consult--fast-abbreviate-file-name
+                          (directory-abbrev-make-regexp (expand-file-name "~")))
+                        name)
+          (concat "~" (substring name (match-beginning 1)))
+        name))))
+
+(defun consult--left-truncate-file (file)
+  "Return abbreviated file name of FILE for use in `completing-read' prompt."
+  (save-match-data
+    (let ((file (directory-file-name (abbreviate-file-name file)))
+          (prefix nil))
+      (when (string-match "\\`/\\([^/|:]+:\\)" file)
+        (setq prefix (propertize (match-string 1 file) 'face 'error)
+              file (substring file (match-end 0))))
+      (when (and (string-match "/\\([^/]+\\)/\\([^/]+\\)\\'" file)
+                 (< (- (match-end 0) (match-beginning 0) -3) (length file)))
+        (setq file (format "…/%s/%s" (match-string 1 file) (match-string 2 file))))
+      (concat prefix file))))
+
+(defun consult--directory-prompt (prompt dir)
+  "Return prompt, paths and default directory.
+
+PROMPT is the prompt prefix.  The directory is appended to the
+prompt prefix.  For projects only the project name is shown.  The
+`default-directory' is not shown.  Other directories are
+abbreviated and only the last two path components are shown.
+
+If DIR is a string, it is returned as default directory.  If DIR
+is a list of strings, the list is returned as search paths.  If
+DIR is nil the `consult-project-function' is tried to retrieve
+the default directory.  If no project is found the
+`default-directory' is returned as is.  Otherwise the user is
+asked for the directories or files to search via
+`completing-read-multiple'."
+  (let* ((paths nil)
+         (dir
+          (pcase dir
+            ((pred stringp) dir)
+            ((or 'nil '(16)) (or (consult--project-root dir) default-directory))
+            (_
+               (pcase (if (stringp (car-safe dir))
+                          dir
+                        ;; Preserve this-command across `completing-read-multiple' call,
+                        ;; such that `consult-customize' continues to work.
+                        (let ((this-command this-command)
+                              (def (abbreviate-file-name default-directory))
+                              ;; TODO: `minibuffer-completing-file-name' is
+                              ;; mostly deprecated, but still in use. Packages
+                              ;; should instead use the completion metadata.
+                              (minibuffer-completing-file-name t)
+                              (ignore-case read-file-name-completion-ignore-case))
+                          (minibuffer-with-setup-hook
+                              (lambda ()
+                                (setq-local completion-ignore-case ignore-case)
+                                (set-syntax-table minibuffer-local-filename-syntax))
+                            (completing-read-multiple "Directories or files: "
+                                                      #'completion-file-name-table
+                                                      nil t def 'consult--path-history def))))
+                 ((and `(,p) (guard (file-directory-p p))) p)
+                 (ps (setq paths (mapcar (lambda (p)
+                                           (file-relative-name (expand-file-name p)))
+                                         ps))
+                     default-directory)))))
+         (edir (file-name-as-directory (expand-file-name dir)))
+         (pdir (let ((default-directory edir))
+                 ;; Bind default-directory in order to find the project
+                 (consult--project-root))))
+    (list
+     (format "%s (%s): " prompt
+             (pcase paths
+               ((guard (<= 1 (length paths) 2))
+                (string-join (mapcar #'consult--left-truncate-file paths) ", "))
+               (`(,p . ,_)
+                (format "%d paths, %s, …" (length paths) (consult--left-truncate-file p)))
+               ((guard (equal edir pdir)) (concat "Project " (consult--project-name pdir)))
+               (_ (consult--left-truncate-file edir))))
+     (or paths '("."))
+     edir)))
+
+(declare-function project-current "project")
+(declare-function project-root "project")
+
+(defun consult--default-project-function (may-prompt)
+  "Return project root directory.
+When no project is found and MAY-PROMPT is non-nil ask the user."
+  (when-let (proj (project-current may-prompt))
+    (project-root proj)))
+
+(defun consult--project-root (&optional may-prompt)
+  "Return project root as absolute path.
+When no project is found and MAY-PROMPT is non-nil ask the user."
+  ;; Preserve this-command across project selection,
+  ;; such that `consult-customize' continues to work.
+  (let ((this-command this-command))
+    (when-let (root (and consult-project-function
+                         (funcall consult-project-function may-prompt)))
+      (expand-file-name root))))
+
+(defun consult--project-name (dir)
+  "Return the project name for DIR."
+  (if (string-match "/\\([^/]+\\)/\\'" dir)
+      (propertize (match-string 1 dir) 'help-echo (abbreviate-file-name dir))
+    dir))
+
+(defun consult--format-file-line-match (file line match)
+  "Format string FILE:LINE:MATCH with faces."
+  (setq line (number-to-string line)
+        match (concat file ":" line ":" match)
+        file (length file))
+  (put-text-property 0 file 'face 'consult-file match)
+  (put-text-property (1+ file) (+ 1 file (length line)) 'face 'consult-line-number match)
+  match)
+
+(defun consult--make-overlay (beg end &rest props)
+  "Make consult overlay between BEG and END with PROPS."
+  (let ((ov (make-overlay beg end)))
+    (while props
+      (overlay-put ov (car props) (cadr props))
+      (setq props (cddr props)))
+    ov))
+
+(defun consult--remove-dups (list)
+  "Remove duplicate strings from LIST."
+  (delete-dups (copy-sequence list)))
+
+(defsubst consult--in-range-p (pos)
+  "Return t if position POS lies in range `point-min' to `point-max'."
+  (<= (point-min) pos (point-max)))
+
+(defun consult--completion-window-p ()
+  "Return non-nil if the selected window belongs to the completion UI."
+  (or (eq (selected-window) (active-minibuffer-window))
+      (eq #'completion-list-mode (buffer-local-value 'major-mode (window-buffer)))))
+
+(defun consult--original-window ()
+  "Return window which was just selected just before the minibuffer was entered.
+In contrast to `minibuffer-selected-window' never return nil and
+always return an appropriate non-minibuffer window."
+  (or (minibuffer-selected-window)
+      (if (window-minibuffer-p (selected-window))
+          (next-window)
+        (selected-window))))
+
+(defun consult--forbid-minibuffer ()
+  "Raise an error if executed from the minibuffer."
+  (when (minibufferp)
+    (user-error "`%s' called inside the minibuffer" this-command)))
+
+(defun consult--require-minibuffer ()
+  "Raise an error if executed outside the minibuffer."
+  (unless (minibufferp)
+    (user-error "`%s' must be called inside the minibuffer" this-command)))
+
+(defun consult--fontify-all ()
+  "Ensure that the whole buffer is fontified."
+  ;; Font-locking is lazy, i.e., if a line has not been looked at yet, the line
+  ;; is not font-locked.  We would observe this if consulting an unfontified
+  ;; line.  Therefore we have to enforce font-locking now, which is slow.  In
+  ;; order to prevent is hang-up we check the buffer size against
+  ;; `consult-fontify-max-size'.
+  (when (and consult-fontify-preserve jit-lock-mode
+             (< (buffer-size) consult-fontify-max-size))
+    (jit-lock-fontify-now)))
+
+(defun consult--fontify-region (start end)
+  "Ensure that region between START and END is fontified."
+  (when (and consult-fontify-preserve jit-lock-mode)
+    (jit-lock-fontify-now start end)))
+
+(defmacro consult--with-increased-gc (&rest body)
+  "Temporarily increase the GC limit in BODY to optimize for throughput."
+  (cl-with-gensyms (overwrite)
+    `(let* ((,overwrite (> consult--gc-threshold gc-cons-threshold))
+            (gc-cons-threshold (if ,overwrite consult--gc-threshold gc-cons-threshold))
+            (gc-cons-percentage (if ,overwrite consult--gc-percentage gc-cons-percentage)))
+       ,@body)))
+
+(defmacro consult--slow-operation (message &rest body)
+  "Show delayed MESSAGE if BODY takes too long.
+Also temporarily increase the GC limit via `consult--with-increased-gc'."
+  (declare (indent 1))
+  `(with-delayed-message (1 ,message)
+     (consult--with-increased-gc ,@body)))
+
+(defun consult--count-lines (pos)
+  "Move to position POS and return number of lines."
+  (let ((line 1))
+    (while (< (point) pos)
+      (forward-line)
+      (when (<= (point) pos)
+        (cl-incf line)))
+    (goto-char pos)
+    line))
+
+(defun consult--marker-from-line-column (buffer line column)
+  "Get marker in BUFFER from LINE and COLUMN."
+  (when (buffer-live-p buffer)
+    (with-current-buffer buffer
+      (save-excursion
+        (without-restriction
+          (goto-char (point-min))
+          ;; Location data might be invalid by now!
+          (ignore-errors
+            (forward-line (1- line))
+            (goto-char (min (+ (point) column) (pos-eol))))
+          (point-marker))))))
+
+(defun consult--line-prefix (&optional curr-line)
+  "Annotate `consult-location' candidates with line numbers.
+CURR-LINE is the current line number."
+  (setq curr-line (or curr-line -1))
+  (let* ((width (length (number-to-string (line-number-at-pos
+                                           (point-max)
+                                           consult-line-numbers-widen))))
+         (before (format #("%%%dd " 0 6 (face consult-line-number-wrapped)) width))
+         (after (format #("%%%dd " 0 6 (face consult-line-number-prefix)) width)))
+    (lambda (cand)
+      (let ((line (cdr (get-text-property 0 'consult-location cand))))
+        (list cand (format (if (< line curr-line) before after) line) "")))))
+
+(defsubst consult--location-candidate (cand marker line tofu &rest props)
+  "Add MARKER and LINE as `consult-location' text property to CAND.
+Furthermore add the additional text properties PROPS, and append
+TOFU suffix for disambiguation."
+  (setq cand (concat cand (consult--tofu-encode tofu)))
+  (add-text-properties 0 1 `(consult-location (,marker . ,line) ,@props) cand)
+  cand)
+
+;; There is a similar variable `yank-excluded-properties'.  Unfortunately
+;; we cannot use it here since it excludes too much (e.g., invisible)
+;; and at the same time not enough (e.g., cursor-sensor-functions).
+(defconst consult--remove-text-properties
+  '(category cursor cursor-intangible cursor-sensor-functions field follow-link
+    fontified front-sticky help-echo insert-behind-hooks insert-in-front-hooks
+    intangible keymap local-map modification-hooks mouse-face pointer read-only
+    rear-nonsticky yank-handler)
+  "List of text properties to remove from buffer strings.")
+
+(defsubst consult--buffer-substring (beg end &optional fontify)
+  "Return buffer substring between BEG and END.
+If FONTIFY and `consult-fontify-preserve' are non-nil, first ensure that the
+region has been fontified."
+  (if consult-fontify-preserve
+      (let (str)
+        (when fontify (consult--fontify-region beg end))
+        (setq str (buffer-substring beg end))
+        ;; TODO Propose the upstream addition of a function
+        ;; `preserve-list-of-text-properties', which should be as efficient as
+        ;; `remove-list-of-text-properties'.
+        (remove-list-of-text-properties
+         0 (- end beg) consult--remove-text-properties str)
+        str)
+    (buffer-substring-no-properties beg end)))
+
+(defun consult--line-with-mark (marker)
+  "Current line string where the MARKER position is highlighted."
+  (let* ((beg (pos-bol))
+         (end (pos-eol))
+         (str (consult--buffer-substring beg end 'fontify)))
+    (if (>= marker end)
+        (concat str #(" " 0 1 (face consult-highlight-mark)))
+      (put-text-property (- marker beg) (- (1+ marker) beg)
+                         'face 'consult-highlight-mark str)
+      str)))
+
+;;;; Tofu cooks
+
+(defsubst consult--tofu-p (char)
+  "Return non-nil if CHAR is a tofu."
+  (<= consult--tofu-char char (+ consult--tofu-char consult--tofu-range -1)))
+
+(defun consult--tofu-hide (str)
+  "Hide the tofus in STR."
+  (let* ((max (length str))
+         (end max))
+    (while (and (> end 0) (consult--tofu-p (aref str (1- end))))
+      (cl-decf end))
+    (when (< end max)
+      (setq str (copy-sequence str))
+      (put-text-property end max 'invisible t str))
+    str))
+
+(defsubst consult--tofu-append (cand id)
+  "Append tofu-encoded ID to CAND.
+The ID must fit within a single character.  It must be smaller
+than `consult--tofu-range'."
+  (setq id (char-to-string (+ consult--tofu-char id)))
+  (add-text-properties 0 1 '(invisible t consult-strip t) id)
+  (concat cand id))
+
+(defsubst consult--tofu-get (cand)
+  "Extract tofu-encoded ID from CAND.
+See `consult--tofu-append'."
+  (- (aref cand (1- (length cand))) consult--tofu-char))
+
+;; We must disambiguate the lines by adding a prefix such that two lines with
+;; the same text can be distinguished.  In order to avoid matching the line
+;; number, such that the user can search for numbers with `consult-line', we
+;; encode the line number as characters outside the Unicode range.  By doing
+;; that, no accidental matching can occur.
+(defun consult--tofu-encode (n)
+  "Return tofu-encoded number N as a string.
+Large numbers are encoded as multiple tofu characters."
+  (let (str tofu)
+    (while (progn
+             (setq tofu (char-to-string
+                         (+ consult--tofu-char (% n consult--tofu-range)))
+                   str (if str (concat tofu str) tofu))
+             (and (>= n consult--tofu-range)
+                  (setq n (/ n consult--tofu-range)))))
+    (add-text-properties 0 (length str) '(invisible t consult-strip t) str)
+    str))
+
+;;;; Regexp utilities
+
+(defun consult--find-highlights (str start &rest ignored-faces)
+  "Find highlighted regions in STR from position START.
+Highlighted regions have a non-nil face property.
+IGNORED-FACES are ignored when searching for matches."
+  (let (highlights
+        (end (length str))
+        (beg start))
+    (while (< beg end)
+      (let ((next (next-single-property-change beg 'face str end))
+            (val (get-text-property beg 'face str)))
+        (when (and val
+                   (not (memq val ignored-faces))
+                   (not (and (consp val)
+                             (seq-some (lambda (x) (memq x ignored-faces)) val))))
+          (push (cons (- beg start) (- next start)) highlights))
+        (setq beg next)))
+    (nreverse highlights)))
+
+(defun consult--point-placement (str start &rest ignored-faces)
+  "Compute point placement from STR with START offset.
+IGNORED-FACES are ignored when searching for matches.
+Return cons of point position and a list of match begin/end pairs."
+  (let* ((matches (apply #'consult--find-highlights str start ignored-faces))
+         (pos (pcase-exhaustive consult-point-placement
+                ('match-beginning (or (caar matches) 0))
+                ('match-end (or (cdar (last matches)) 0))
+                ('line-beginning 0))))
+    (dolist (match matches)
+      (cl-decf (car match) pos)
+      (cl-decf (cdr match) pos))
+    (cons pos matches)))
+
+(defun consult--highlight-regexps (regexps ignore-case str)
+  "Highlight REGEXPS in STR.
+If a regular expression contains capturing groups, only these are highlighted.
+If no capturing groups are used highlight the whole match.  Case is ignored
+if IGNORE-CASE is non-nil."
+  (dolist (re regexps)
+    (let ((i 0))
+      (while (and (let ((case-fold-search ignore-case))
+                    (string-match re str i))
+                  ;; Ensure that regexp search made progress (edge case for .*)
+                  (> (match-end 0) i))
+        ;; Unfortunately there is no way to avoid the allocation of the match
+        ;; data, since the number of capturing groups is unknown.
+        (let ((m (match-data)))
+          (setq i (cadr m) m (or (cddr m) m))
+          (while m
+            (when (car m)
+              (add-face-text-property (car m) (cadr m)
+                                      'consult-highlight-match nil str))
+            (setq m (cddr m)))))))
+  str)
+
+(defconst consult--convert-regexp-table
+  (append
+   ;; For simplicity, treat word beginning/end as word boundaries,
+   ;; since PCRE does not make this distinction.  Usually the
+   ;; context determines if \b is the beginning or the end.
+   '(("\\<" . "\\b") ("\\>" . "\\b")
+     ("\\_<" . "\\b") ("\\_>" . "\\b"))
+   ;; Treat \` and \' as beginning and end of line.  This is more
+   ;; widely supported and makes sense for line-based commands.
+   '(("\\`" . "^") ("\\'" . "$"))
+   ;; Historical: Unescaped *, +, ? are supported at the beginning
+   (mapcan (lambda (x)
+             (mapcar (lambda (y)
+                       (cons (concat x y)
+                             (concat (string-remove-prefix "\\" x) "\\" y)))
+                     '("*" "+" "?")))
+           '("" "\\(" "\\(?:" "\\|" "^"))
+   ;; Different escaping
+   (mapcan (lambda (x) `(,x (,(cdr x) . ,(car x))))
+           '(("\\|" . "|")
+             ("\\(" . "(") ("\\)" . ")")
+             ("\\{" . "{") ("\\}" . "}"))))
+  "Regexp conversion table.")
+
+(defun consult--convert-regexp (regexp type)
+  "Convert Emacs REGEXP to regexp syntax TYPE."
+  (if (memq type '(emacs basic))
+      regexp
+    ;; Support for Emacs regular expressions is fairly complete for basic
+    ;; usage.  There are a few unsupported Emacs regexp features:
+    ;; - \= point matching
+    ;; - Syntax classes \sx \Sx
+    ;; - Character classes \cx \Cx
+    ;; - Explicitly numbered groups (?3:group)
+    (replace-regexp-in-string
+     (rx (or "\\\\" "\\^"                         ;; Pass through
+             (seq (or "\\(?:" "\\|") (any "*+?")) ;; Historical: \|+ or \(?:* etc
+             (seq "\\(" (any "*+"))               ;; Historical: \(* or \(+
+             (seq (or bos "^") (any "*+?"))       ;; Historical: + or * at the beginning
+             (seq (opt "\\") (any "(){|}"))       ;; Escape parens/braces/pipe
+             (seq "\\" (any "'<>`"))              ;; Special escapes
+             (seq "\\_" (any "<>"))))             ;; Beginning or end of symbol
+     (lambda (x) (or (cdr (assoc x consult--convert-regexp-table)) x))
+     regexp 'fixedcase 'literal)))
+
+(defun consult--default-regexp-compiler (input type ignore-case)
+  "Compile the INPUT string to a list of regular expressions.
+The function should return a pair, the list of regular expressions and a
+highlight function.  The highlight function should take a single
+argument, the string to highlight given the INPUT.  TYPE is the desired
+type of regular expression, which can be `basic', `extended', `emacs' or
+`pcre'.  If IGNORE-CASE is non-nil return a highlight function which
+matches case insensitively."
+  (setq input (consult--split-escaped input))
+  (cons (mapcar (lambda (x) (consult--convert-regexp x type)) input)
+        (when-let (regexps (seq-filter #'consult--valid-regexp-p input))
+          (apply-partially #'consult--highlight-regexps regexps ignore-case))))
+
+(defun consult--split-escaped (str)
+  "Split STR at spaces, which can be escaped with backslash."
+  (mapcar
+   (lambda (x) (string-replace "\0" " " x))
+   (split-string (replace-regexp-in-string
+                  "\\\\\\\\\\|\\\\ "
+                  (lambda (x) (if (equal x "\\ ") "\0" x))
+                  str 'fixedcase 'literal)
+                 " +" t)))
+
+(defun consult--join-regexps (regexps type)
+  "Join REGEXPS of TYPE."
+  ;; Add look-ahead wrapper only if there is more than one regular expression
+  (cond
+   ((and (eq type 'pcre) (cdr regexps))
+    (concat "^" (mapconcat (lambda (x) (format "(?=.*%s)" x))
+                           regexps "")))
+   ((eq type 'basic)
+    (string-join regexps ".*"))
+   (t
+    (when (length> regexps 3)
+      (message "Too many regexps, %S ignored. Use post-filtering!"
+               (string-join (seq-drop regexps 3) " "))
+      (setq regexps (seq-take regexps 3)))
+    (consult--join-regexps-permutations regexps (and (eq type 'emacs) "\\")))))
+
+(defun consult--join-regexps-permutations (regexps esc)
+  "Join all permutations of REGEXPS.
+ESC is the escaping string for choice and groups."
+  (pcase regexps
+    ('nil "")
+    (`(,r) r)
+    (_ (mapconcat
+        (lambda (r)
+          (concat esc "(" r esc ").*" esc "("
+                  (consult--join-regexps-permutations (remove r regexps) esc)
+                  esc ")"))
+        regexps (concat esc "|")))))
+
+(defun consult--valid-regexp-p (re)
+  "Return t if regexp RE is valid."
+  (condition-case nil
+      (progn (string-match-p re "") t)
+    (invalid-regexp nil)))
+
+(defun consult--regexp-filter (regexps)
+  "Create filter regexp from REGEXPS."
+  (if (stringp regexps)
+      regexps
+    (mapconcat (lambda (x) (concat "\\(?:" x "\\)")) regexps "\\|")))
+
+;;;; Lookup functions
+
+(defun consult--lookup-member (selected candidates &rest _)
+  "Lookup SELECTED in CANDIDATES list, return original element."
+  (car (member selected candidates)))
+
+(defun consult--lookup-cons (selected candidates &rest _)
+  "Lookup SELECTED in CANDIDATES alist, return cons."
+  (assoc selected candidates))
+
+(defun consult--lookup-cdr (selected candidates &rest _)
+  "Lookup SELECTED in CANDIDATES alist, return `cdr' of element."
+  (cdr (assoc selected candidates)))
+
+(defun consult--lookup-location (selected candidates &rest _)
+  "Lookup SELECTED in CANDIDATES list of `consult-location' category.
+Return the location marker."
+  (when-let (found (member selected candidates))
+    (setq found (car (consult--get-location (car found))))
+    ;; Check that marker is alive
+    (and (or (not (markerp found)) (marker-buffer found)) found)))
+
+(defun consult--lookup-prop (prop selected candidates &rest _)
+  "Lookup SELECTED in CANDIDATES list and return PROP value."
+  (when-let (found (member selected candidates))
+    (get-text-property 0 prop (car found))))
+
+(defun consult--lookup-candidate (selected candidates &rest _)
+  "Lookup SELECTED in CANDIDATES list and return property `consult--candidate'."
+  (consult--lookup-prop 'consult--candidate selected candidates))
+
+;;;; Preview support
+
+(defun consult--preview-allowed-p (fun)
+  "Return non-nil if FUN is an allowed preview mode hook."
+  (or (memq fun consult-preview-allowed-hooks)
+      (when-let (((symbolp fun))
+                 (name (symbol-name fun))
+                 ;; Global modes in Emacs 29 are activated via a
+                 ;; `find-file-hook' ending with `-check-buffers'. This has been
+                 ;; changed in Emacs 30. Now a `change-major-mode-hook' is used
+                 ;; instead with the suffix `-check-buffers'.
+                 (suffix (static-if (>= emacs-major-version 30)
+                             "-enable-in-buffer"
+                           "-check-buffers"))
+                 ((string-suffix-p suffix name)))
+        (memq (intern (string-remove-suffix suffix name))
+              consult-preview-allowed-hooks))))
+
+(defun consult--filter-find-file-hook (orig &rest hooks)
+  "Filter `find-file-hook' by `consult-preview-allowed-hooks'.
+This function is an advice for `run-hooks'.
+ORIG is the original function, HOOKS the arguments."
+  (if (memq 'find-file-hook hooks)
+      (cl-letf* (((default-value 'find-file-hook)
+                  (seq-filter #'consult--preview-allowed-p
+                              (default-value 'find-file-hook)))
+                 (find-file-hook (default-value 'find-file-hook)))
+        (apply orig hooks))
+    (apply orig hooks)))
+
+(defun consult--find-file-temporarily-1 (name)
+  "Open file NAME, helper function for `consult--find-file-temporarily'."
+  (when-let (((not (seq-find (lambda (x) (string-match-p x name))
+                             consult-preview-excluded-files)))
+             ;; file-attributes may throw permission denied error
+             (attrs (ignore-errors (file-attributes name)))
+             (size (file-attribute-size attrs)))
+    (let* ((partial (>= size consult-preview-partial-size))
+           (buffer (if partial
+                       (generate-new-buffer (format "consult-partial-preview-%s" name))
+                     (find-file-noselect name 'nowarn)))
+           (success nil))
+      (unwind-protect
+          (with-current-buffer buffer
+            (if (not partial)
+                (when (or (eq major-mode 'hexl-mode)
+                        (and (eq major-mode 'fundamental-mode)
+                             (save-excursion (search-forward "\0" nil 'noerror))))
+                  (error "No preview of binary file `%s'"
+                         (file-name-nondirectory name)))
+              (with-silent-modifications
+                (setq buffer-read-only t)
+                (insert-file-contents name nil 0 consult-preview-partial-chunk)
+                (goto-char (point-max))
+                (insert "\nFile truncated. End of partial preview.\n")
+                (goto-char (point-min)))
+              (when (save-excursion (search-forward "\0" nil 'noerror))
+                (error "No partial preview of binary file `%s'"
+                       (file-name-nondirectory name)))
+              ;; Auto detect major mode and hope for the best, given that the
+              ;; file is only previewed partially.  If an error is thrown the
+              ;; buffer will be killed and preview is aborted.
+              (set-auto-mode)
+              (font-lock-mode 1))
+            (when (bound-and-true-p so-long-detected-p)
+              (error "No preview of file `%s' with long lines"
+                     (file-name-nondirectory name)))
+            ;; Run delayed hooks listed in `consult-preview-allowed-hooks'.
+            (dolist (hook (reverse (cons 'after-change-major-mode-hook delayed-mode-hooks)))
+              (run-hook-wrapped hook (lambda (fun)
+                                       (when (consult--preview-allowed-p fun)
+                                         (funcall fun))
+                                       nil)))
+            (setq success (current-buffer)))
+        (unless success
+          (kill-buffer buffer))))))
+
+(defun consult--find-file-temporarily (name)
+  "Open file NAME temporarily for preview."
+  (let ((vars (delq nil
+                    (mapcar
+                     (pcase-lambda (`(,k . ,v))
+                       (if (boundp k)
+                           (list k v (default-value k) (symbol-value k))
+                         (message "consult-preview-variables: The variable `%s' is not bound" k)
+                         nil))
+                     consult-preview-variables))))
+    (condition-case err
+        (unwind-protect
+            (progn
+              (advice-add #'run-hooks :around #'consult--filter-find-file-hook)
+              (pcase-dolist (`(,k ,v . ,_) vars)
+                (set-default k v)
+                (set k v))
+              (consult--find-file-temporarily-1 name))
+          (advice-remove #'run-hooks #'consult--filter-find-file-hook)
+          (pcase-dolist (`(,k ,_ ,d ,v) vars)
+            (set-default k d)
+            (set k v)))
+      (error
+       (message "%s" (error-message-string err))
+       nil))))
+
+(defun consult--temporary-files ()
+  "Return a function to open files temporarily for preview."
+  (let ((dir default-directory)
+        (hook (make-symbol "consult--temporary-files-upgrade-hook"))
+        (orig-buffers (buffer-list))
+        temporary-buffers)
+    (fset hook
+          (lambda (_)
+            ;; Fully initialize previewed files and keep them alive.
+            (unless (consult--completion-window-p)
+              (let (live-files)
+                (pcase-dolist (`(,file . ,buf) temporary-buffers)
+                  (when-let (wins (and (buffer-live-p buf)
+                                       (get-buffer-window-list buf)))
+                    (push (cons file (mapcar
+                                      (lambda (win)
+                                        (cons win (window-state-get win t)))
+                                      wins))
+                          live-files)))
+                (pcase-dolist (`(,_ . ,buf) temporary-buffers)
+                  (kill-buffer buf))
+                (setq temporary-buffers nil)
+                (pcase-dolist (`(,file . ,wins) live-files)
+                  (when-let (buf (consult--file-action file))
+                    (push buf orig-buffers)
+                    (pcase-dolist (`(,win . ,state) wins)
+                      (setf (car (alist-get 'buffer state)) buf)
+                      (window-state-put state win))))))))
+    (lambda (&optional name)
+      (if name
+          (let ((default-directory dir))
+            (setq name (abbreviate-file-name (expand-file-name name)))
+            (or
+             ;; Find existing fully initialized buffer (non-previewed).  We have
+             ;; to check for fully initialized buffer before accessing the
+             ;; previewed buffers, since `embark-act' can open a buffer which is
+             ;; currently previewed, such that we end up with two buffers for
+             ;; the same file - one previewed and only partially initialized and
+             ;; one fully initialized.  In this case we prefer the fully
+             ;; initialized buffer.  For directories `get-file-buffer' returns nil,
+             ;; therefore we have to special case Dired.
+             (if (and (fboundp 'dired-find-buffer-nocreate) (file-directory-p name))
+                 (dired-find-buffer-nocreate name)
+               (get-file-buffer name))
+             ;; Find existing previewed buffer.  Previewed buffers are not fully
+             ;; initialized (hooks are delayed) in order to ensure fast preview.
+             (cdr (assoc name temporary-buffers))
+             ;; Finally, if no existing buffer has been found, open the file for
+             ;; preview.
+             (when-let (buf (consult--find-file-temporarily name))
+               ;; Only add new buffer if not already in the list
+               (unless (or (rassq buf temporary-buffers) (memq buf orig-buffers))
+                 (add-hook 'window-selection-change-functions hook)
+                 (push (cons name buf) temporary-buffers)
+                 ;; Disassociate buffer from file by setting `buffer-file-name'
+                 ;; and `dired-directory' to nil and rename the buffer.  This
+                 ;; lets us open an already previewed buffer with the Embark
+                 ;; default action C-. RET.
+                 (with-current-buffer buf
+                   (rename-buffer
+                    (format " Preview:%s"
+                            (file-name-nondirectory (directory-file-name name)))
+                    'unique))
+                 ;; The buffer disassociation is delayed to avoid breaking modes
+                 ;; like `pdf-view-mode' or `doc-view-mode' which rely on
+                 ;; `buffer-file-name'.  Executing (set-visited-file-name nil)
+                 ;; early also prevents the major mode initialization.
+                 (let ((hook (make-symbol "consult--temporary-files-disassociate-hook")))
+                   (fset hook (lambda ()
+                                (when (buffer-live-p buf)
+                                  (with-current-buffer buf
+                                    (remove-hook 'pre-command-hook hook)
+                                    (setq-local buffer-read-only t
+                                                dired-directory nil
+                                                buffer-file-name nil)))))
+                   (add-hook 'pre-command-hook hook))
+                 ;; Only keep a few buffers alive
+                 (while (length> temporary-buffers consult-preview-max-count)
+                   (kill-buffer (cdar (last temporary-buffers)))
+                   (setq temporary-buffers (nbutlast temporary-buffers))))
+               buf)))
+        (remove-hook 'window-selection-change-functions hook)
+        (pcase-dolist (`(,_ . ,buf) temporary-buffers)
+          (kill-buffer buf))
+        (setq temporary-buffers nil)))))
+
+(defun consult--invisible-open-permanently ()
+  "Open overlays which hide the current line.
+See `isearch-open-necessary-overlays' and `isearch-open-overlay-temporary'."
+  (if (and (derived-mode-p 'org-mode) (fboundp 'org-fold-show-set-visibility))
+      ;; New Org 9.6 fold-core API
+      (let ((inhibit-redisplay t)) ;; HACK: Prevent flicker due to premature redisplay
+        (org-fold-show-set-visibility 'canonical))
+    (dolist (ov (overlays-in (pos-bol) (pos-eol)))
+      (when-let (fun (overlay-get ov 'isearch-open-invisible))
+        (when (invisible-p (overlay-get ov 'invisible))
+          (funcall fun ov))))))
+
+(defun consult--invisible-open-temporarily ()
+  "Temporarily open overlays which hide the current line.
+See `isearch-open-necessary-overlays' and `isearch-open-overlay-temporary'."
+  (if (and (derived-mode-p 'org-mode)
+           (fboundp 'org-fold-show-set-visibility)
+           (fboundp 'org-fold-core-get-regions)
+           (fboundp 'org-fold-core-region))
+      ;; New Org 9.6 fold-core API
+      ;; TODO The provided Org API `org-fold-show-set-visibility' cannot be used
+      ;; efficiently.  We obtain all regions in the whole buffer in order to
+      ;; restore them.  A better show API would return all the applied
+      ;; modifications such that we can restore the ones which got modified.
+      (progn
+        (unless consult--org-fold-regions
+          (setq consult--org-fold-regions
+                (delq nil (org-fold-core-get-regions
+                           :with-markers t :from (point-min) :to (point-max))))
+          (when consult--org-fold-regions
+            (let ((hook (make-symbol "consult--invisible-open-temporarily-cleanup-hook"))
+                  (buffer (current-buffer))
+                  (depth (recursion-depth)))
+              (fset hook
+                    (lambda ()
+                      (when (= (recursion-depth) depth)
+                        (remove-hook 'minibuffer-exit-hook hook)
+                        (run-at-time
+                         0 nil
+                         (lambda ()
+                           (when (buffer-live-p buffer)
+                             (with-current-buffer buffer
+                               (pcase-dolist (`(,beg ,end ,_) consult--org-fold-regions)
+                                 (when (markerp beg) (set-marker beg nil))
+                                 (when (markerp end) (set-marker end nil)))
+                               (kill-local-variable 'consult--org-fold-regions))))))))
+              (add-hook 'minibuffer-exit-hook hook))))
+        (let ((inhibit-redisplay t)) ;; HACK: Prevent flicker due to premature redisplay
+          (org-fold-show-set-visibility 'canonical))
+        (list (lambda ()
+                (pcase-dolist (`(,beg ,end ,spec) consult--org-fold-regions)
+                  (org-fold-core-region beg end t spec)))))
+    (let (restore)
+      (dolist (ov (overlays-in (pos-bol) (pos-eol)))
+        (let ((inv (overlay-get ov 'invisible)))
+          (when (and (invisible-p inv) (overlay-get ov 'isearch-open-invisible))
+            (push (if-let (fun (overlay-get ov 'isearch-open-invisible-temporary))
+                      (progn
+                        (funcall fun ov nil)
+                        (lambda () (funcall fun ov t)))
+                    (overlay-put ov 'invisible nil)
+                    (lambda () (overlay-put ov 'invisible inv)))
+                  restore))))
+      restore)))
+
+(defun consult--jump-ensure-buffer (pos)
+  "Ensure that buffer of marker POS is displayed, return t if successful."
+  (or (not (markerp pos))
+      ;; Switch to buffer if it is not visible
+      (when-let ((buf (marker-buffer pos)))
+        (or (and (eq (current-buffer) buf) (eq (window-buffer) buf))
+            (consult--buffer-action buf 'norecord)
+            t))))
+
+(defun consult--jump (pos)
+  "Jump to POS.
+First push current position to mark ring, then move to new
+position and run `consult-after-jump-hook'."
+  (when pos
+    ;; Extract marker from list with with overlay positions, see `consult--line-match'
+    (when (consp pos) (setq pos (car pos)))
+    ;; When the marker is in the same buffer, record previous location
+    ;; such that the user can jump back quickly.
+    (when (or (not (markerp pos)) (eq (current-buffer) (marker-buffer pos)))
+      ;; push-mark mutates markers in the mark-ring and the mark-marker.
+      ;; Therefore we transform the marker to a number to be safe.
+      ;; We all love side effects!
+      (setq pos (+ pos 0))
+      (push-mark (point) t))
+    (when (consult--jump-ensure-buffer pos)
+      (unless (= (goto-char pos) (point)) ;; Widen if jump failed
+        (widen)
+        (goto-char pos))
+      (consult--invisible-open-permanently)
+      (run-hooks 'consult-after-jump-hook)))
+  nil)
+
+(defun consult--jump-preview ()
+  "The preview function used if selecting from a list of candidate positions.
+The function can be used as the `:state' argument of `consult--read'."
+  (let (restore)
+    (lambda (action cand)
+      (when (eq action 'preview)
+        (mapc #'funcall restore)
+        (setq restore nil)
+        ;; TODO Better buffer preview support
+        ;; 1. Use consult--buffer-preview instead of consult--jump-ensure-buffer
+        ;; 2. Remove function consult--jump-ensure-buffer
+        ;; 3. Remove consult-buffer-other-* from consult-customize-alist
+        (when-let ((pos (or (car-safe cand) cand)) ;; Candidate can be previewed
+                   ((consult--jump-ensure-buffer pos)))
+          (let ((saved-min (point-min-marker))
+                (saved-max (point-max-marker))
+                (saved-pos (point-marker)))
+            (set-marker-insertion-type saved-max t) ;; Grow when text is inserted
+            (push (lambda ()
+                    (when-let ((buf (marker-buffer saved-pos)))
+                      (with-current-buffer buf
+                        (narrow-to-region saved-min saved-max)
+                        (goto-char saved-pos)
+                        (set-marker saved-pos nil)
+                        (set-marker saved-min nil)
+                        (set-marker saved-max nil))))
+                  restore))
+          (unless (= (goto-char pos) (point)) ;; Widen if jump failed
+            (widen)
+            (goto-char pos))
+          (setq restore (nconc (consult--invisible-open-temporarily) restore))
+          ;; Ensure that cursor is properly previewed (gh:minad/consult#764)
+          (unless (eq cursor-in-non-selected-windows 'box)
+            (let ((orig cursor-in-non-selected-windows)
+                  (buf (current-buffer)))
+              (push
+               (if (local-variable-p 'cursor-in-non-selected-windows)
+                   (lambda ()
+                     (when (buffer-live-p buf)
+                       (with-current-buffer buf
+                         (setq-local cursor-in-non-selected-windows orig))))
+                 (lambda ()
+                   (when (buffer-live-p buf)
+                     (with-current-buffer buf
+                       (kill-local-variable 'cursor-in-non-selected-windows)))))
+               restore)
+              (setq-local cursor-in-non-selected-windows 'box)))
+          ;; Match previews
+          (let ((overlays
+                 (list (save-excursion
+                         (let ((vbeg (progn (beginning-of-visual-line) (point)))
+                               (vend (progn (end-of-visual-line) (point)))
+                               (end (pos-eol)))
+                           (consult--make-overlay vbeg (if (= vend end) (1+ end) vend)
+                                                  'face 'consult-preview-line
+                                                  'window (selected-window)
+                                                  'priority 1))))))
+            (dolist (match (cdr-safe cand))
+              (push (consult--make-overlay (+ (point) (car match))
+                                           (+ (point) (cdr match))
+                                           'face 'consult-preview-match
+                                           'window (selected-window)
+                                           'priority 2)
+                    overlays))
+            (push (lambda () (mapc #'delete-overlay overlays)) restore))
+          (run-hooks 'consult-after-jump-hook))))))
+
+(defun consult--jump-state ()
+  "The state function used if selecting from a list of candidate positions."
+  (consult--state-with-return (consult--jump-preview) #'consult--jump))
+
+(defun consult--get-location (cand)
+  "Return location from CAND."
+  (let ((loc (get-text-property 0 'consult-location cand)))
+    (when (consp (car loc))
+      ;; Transform cheap marker to real marker
+      (setcar loc (set-marker (make-marker) (cdar loc) (caar loc))))
+    loc))
+
+(defun consult--location-state (candidates)
+  "Location state function.
+The cheap location markers from CANDIDATES are upgraded on window
+selection change to full Emacs markers."
+  (let ((jump (consult--jump-state))
+        (hook (make-symbol "consult--location-upgrade-hook")))
+    (fset hook
+          (lambda (_)
+            (unless (consult--completion-window-p)
+              (remove-hook 'window-selection-change-functions hook)
+              (mapc #'consult--get-location
+                    (if (functionp candidates) (funcall candidates) candidates)))))
+    (lambda (action cand)
+      (pcase action
+        ('setup (add-hook 'window-selection-change-functions hook))
+        ('exit (remove-hook 'window-selection-change-functions hook)))
+      (funcall jump action cand))))
+
+(defun consult--state-with-return (state return)
+  "Compose STATE function with RETURN function."
+  (lambda (action cand)
+    (funcall state action cand)
+    (when (and cand (eq action 'return))
+      (funcall return cand))))
+
+(defmacro consult--define-state (type)
+  "Define state function for TYPE."
+  `(defun ,(intern (format "consult--%s-state" type)) ()
+     ,(format "State function for %ss with preview.
+The result can be passed as :state argument to `consult--read'." type)
+     (consult--state-with-return (,(intern (format "consult--%s-preview" type)))
+                                 #',(intern (format "consult--%s-action" type)))))
+
+(defun consult--preview-key-normalize (preview-key)
+  "Normalize PREVIEW-KEY, return alist of keys and debounce times."
+  (let ((keys)
+        (debounce 0))
+    (setq preview-key (ensure-list preview-key))
+    (while preview-key
+      (if (eq (car preview-key) :debounce)
+          (setq debounce (cadr preview-key)
+                preview-key (cddr preview-key))
+        (let ((key (car preview-key)))
+          (unless (eq key 'any)
+            (setq key (consult--key-parse key)))
+          (push (cons key debounce) keys))
+        (pop preview-key)))
+    keys))
+
+(defun consult--preview-key-debounce (preview-key cand)
+  "Return debounce value of PREVIEW-KEY given the current candidate CAND."
+  (when (and (consp preview-key) (memq :keys preview-key))
+    (setq preview-key (funcall (plist-get preview-key :predicate) cand)))
+  (let ((map (make-sparse-keymap))
+        (keys (this-single-command-keys))
+        any)
+    (pcase-dolist (`(,k . ,d) (consult--preview-key-normalize preview-key))
+      (if (eq k 'any)
+          (setq any d)
+        (define-key map k `(lambda () ,d))))
+    (setq keys (lookup-key map keys))
+    (if (functionp keys) (funcall keys) any)))
+
+(defun consult--preview-append-local-pch (fun)
+  "Append FUN to local `post-command-hook' list."
+  ;; Symbol indirection because of bug#46407.
+  (let ((hook (make-symbol "consult--preview-post-command-hook")))
+    (fset hook fun)
+    ;; TODO Emacs 28 has a bug, where the hook--depth-alist is not cleaned up properly
+    ;; Do not use the broken add-hook here.
+    ;;(add-hook 'post-command-hook hook 'append 'local)
+    (setq-local post-command-hook
+                (append
+                 (remove t post-command-hook)
+                 (list hook)
+                 (and (memq t post-command-hook) '(t))))))
+
+(defun consult--with-preview-1 (preview-key state transform candidate save-input fun)
+  "Add preview support for FUN.
+See `consult--with-preview' for the arguments
+PREVIEW-KEY, STATE, TRANSFORM, CANDIDATE and SAVE-INPUT."
+  (let ((mb-input "") mb-narrow selected timer previewed)
+    (minibuffer-with-setup-hook
+        (if (and state preview-key)
+            (lambda ()
+              (let ((hook (make-symbol "consult--preview-minibuffer-exit-hook"))
+                    (depth (recursion-depth)))
+                (fset hook
+                      (lambda ()
+                        (when (= (recursion-depth) depth)
+                          (remove-hook 'minibuffer-exit-hook hook)
+                          (when timer
+                            (cancel-timer timer)
+                            (setq timer nil))
+                          (with-selected-window (consult--original-window)
+                            ;; STEP 3: Reset preview
+                            (when previewed
+                              (funcall state 'preview nil))
+                            ;; STEP 4: Notify the preview function of the minibuffer exit
+                            (funcall state 'exit nil)))))
+                (add-hook 'minibuffer-exit-hook hook))
+              ;; STEP 1: Setup the preview function
+              (with-selected-window (consult--original-window)
+                (funcall state 'setup nil))
+              (setq consult--preview-function
+                    (lambda ()
+                      (when-let ((cand (funcall candidate)))
+                        ;; Drop properties to prevent bugs regarding candidate
+                        ;; lookup, which must handle candidates without
+                        ;; properties.  Otherwise the arguments passed to the
+                        ;; lookup function are confusing, since during preview
+                        ;; the candidate has properties but for the final lookup
+                        ;; after completion it does not.
+                        (setq cand (substring-no-properties cand))
+                        (with-selected-window (active-minibuffer-window)
+                          (let ((input (minibuffer-contents-no-properties))
+                                (narrow consult--narrow)
+                                (win (consult--original-window)))
+                            (with-selected-window win
+                              (when-let ((transformed (funcall transform narrow input cand))
+                                         (debounce (consult--preview-key-debounce preview-key transformed)))
+                                (when timer
+                                  (cancel-timer timer)
+                                  (setq timer nil))
+                                ;; The transformed candidate may have text
+                                ;; properties, which change the preview display.
+                                ;; This matters for example for `consult-grep',
+                                ;; where the current candidate and input may
+                                ;; stay equal, but the highlighting of the
+                                ;; candidate changes while the candidates list
+                                ;; is lagging a bit behind and updates
+                                ;; asynchronously.
+                                ;;
+                                ;; In older Consult versions we instead compared
+                                ;; the input without properties, since I worried
+                                ;; that comparing the transformed candidates
+                                ;; could be potentially expensive. However
+                                ;; comparing the transformed candidates is more
+                                ;; correct. The transformed candidate is the
+                                ;; thing which is actually previewed.
+                                (unless (equal-including-properties previewed transformed)
+                                  (if (> debounce 0)
+                                      (setq timer
+                                            (run-at-time
+                                             debounce nil
+                                             (lambda ()
+                                               ;; Preview only when a completion
+                                               ;; window is selected and when
+                                               ;; the preview window is alive.
+                                               (when (and (consult--completion-window-p)
+                                                          (window-live-p win))
+                                                 (with-selected-window win
+                                                   ;; STEP 2: Preview candidate
+                                                   (funcall state 'preview (setq previewed transformed)))))))
+                                    ;; STEP 2: Preview candidate
+                                    (funcall state 'preview (setq previewed transformed)))))))))))
+              (consult--preview-append-local-pch
+               (lambda ()
+                 (setq mb-input (minibuffer-contents-no-properties)
+                       mb-narrow consult--narrow)
+                 (funcall consult--preview-function))))
+          (lambda ()
+            (consult--preview-append-local-pch
+             (lambda ()
+               (setq mb-input (minibuffer-contents-no-properties)
+                     mb-narrow consult--narrow)))))
+      (unwind-protect
+          (setq selected (when-let (result (funcall fun))
+                           (when-let ((save-input)
+                                      (list (symbol-value save-input))
+                                      ((equal (car list) result)))
+                             (set save-input (cdr list)))
+                           (funcall transform mb-narrow mb-input result)))
+        (when save-input
+          (add-to-history save-input mb-input))
+        (when state
+          ;; STEP 5: The preview function should perform its final action
+          (funcall state 'return selected))))))
+
+(defmacro consult--with-preview (preview-key state transform candidate save-input &rest body)
+  "Add preview support to BODY.
+
+STATE is the state function.
+TRANSFORM is the transformation function.
+CANDIDATE is the function returning the current candidate.
+PREVIEW-KEY are the keys which triggers the preview.
+SAVE-INPUT can be a history variable symbol to save the input.
+
+The state function takes two arguments, an action argument and the
+selected candidate.  The candidate argument can be nil if no candidate is
+selected or if the selection was aborted.  The function is called in
+sequence with the following arguments:
+
+  1. \\='setup nil         After entering the mb (minibuffer-setup-hook).
+⎧ 2. \\='preview CAND/nil  Preview candidate CAND or reset if CAND is nil.
+⎪    \\='preview CAND/nil
+⎪    \\='preview CAND/nil
+⎪    ...
+⎩ 3. \\='preview nil       Reset preview.
+  4. \\='exit nil          Before exiting the mb (minibuffer-exit-hook).
+  5. \\='return CAND/nil   After leaving the mb, CAND has been selected.
+
+The state function is always executed with the original window selected,
+see `consult--original-window'.  The state function is called once in
+the beginning of the minibuffer setup with the `setup' argument.  This is
+useful in order to perform certain setup operations which require that
+the minibuffer is initialized.  During completion candidates are
+previewed.  Then the function is called with the `preview' argument and a
+candidate CAND or nil if no candidate is selected.  Furthermore if nil is
+passed for CAND, then the preview must be undone and the original state
+must be restored.  The call with the `exit' argument happens once at the
+end of the completion process, just before exiting the minibuffer.  The
+minibuffer is still alive at that point.  Both `setup' and `exit' are
+only useful for setup and cleanup operations.  They don't receive a
+candidate as argument.  After leaving the minibuffer, the selected
+candidate or nil is passed to the state function with the action
+argument `return'.  At this point the state function can perform the
+actual action on the candidate.  The state function with the `return'
+argument is the continuation of `consult--read'.  Via `unwind-protect' it
+is guaranteed, that if the `setup' action of a state function is
+invoked, the state function will also be called with `exit' and
+`return'."
+  (declare (indent 5))
+  `(consult--with-preview-1 ,preview-key ,state ,transform ,candidate ,save-input (lambda () ,@body)))
+
+;;;; Narrowing and grouping
+
+(defun consult--prefix-group (cand transform)
+  "Return title for CAND or TRANSFORM the candidate.
+The candidate must have a `consult--prefix-group' property."
+  (if transform
+      (substring cand (1+ (length (get-text-property 0 'consult--prefix-group cand))))
+    (get-text-property 0 'consult--prefix-group cand)))
+
+(defun consult--type-group (types)
+  "Return group function for TYPES."
+  (lambda (cand transform)
+    (if transform cand
+      (alist-get (get-text-property 0 'consult--type cand) types))))
+
+(defun consult--type-narrow (types)
+  "Return narrowing configuration from TYPES."
+  (list :predicate
+        (lambda (cand) (eq (get-text-property 0 'consult--type cand) consult--narrow))
+        :keys types))
+
+(defun consult--widen-key ()
+  "Return widening key, if `consult-widen-key' is not set.
+The default is twice the `consult-narrow-key'."
+  (cond
+   (consult-widen-key
+    (consult--key-parse consult-widen-key))
+   (consult-narrow-key
+    (let ((key (consult--key-parse consult-narrow-key)))
+      (vconcat key key)))))
+
+(defun consult-narrow (key)
+  "Narrow current completion with KEY.
+
+This command is used internally by the narrowing system of `consult--read'."
+  (declare (completion ignore))
+  (interactive
+   (list (unless (equal (this-single-command-keys) (consult--widen-key))
+           last-command-event)))
+  (consult--require-minibuffer)
+  (setq consult--narrow key)
+  (when consult--narrow-predicate
+    (setq minibuffer-completion-predicate (and consult--narrow consult--narrow-predicate)))
+  (when consult--narrow-overlay
+    (delete-overlay consult--narrow-overlay))
+  (when consult--narrow
+    (setq consult--narrow-overlay
+          (consult--make-overlay
+           (1- (minibuffer-prompt-end)) (minibuffer-prompt-end)
+           'before-string
+           (propertize (format " [%s]" (alist-get consult--narrow
+                                                  consult--narrow-keys))
+                       'face 'consult-narrow-indicator))))
+  (run-hooks 'consult--completion-refresh-hook))
+
+(defconst consult--narrow-delete
+  `(menu-item
+    "" nil :filter
+    ,(lambda (&optional _)
+       (when (equal (minibuffer-contents-no-properties) "")
+         (lambda ()
+           (interactive)
+           (consult-narrow nil))))))
+
+(defconst consult--narrow-space
+  `(menu-item
+    "" nil :filter
+    ,(lambda (&optional _)
+       (let ((str (minibuffer-contents-no-properties)))
+         (when-let (pair (or (and (length= str 1)
+                                  (assoc (aref str 0) consult--narrow-keys))
+                             (and (equal str "")
+                                  (assoc ?\s consult--narrow-keys))))
+           (lambda ()
+             (interactive)
+             (delete-minibuffer-contents)
+             (consult-narrow (car pair))))))))
+
+(defun consult-narrow-help ()
+  "Print narrowing help as a `minibuffer-message'.
+
+This command can be bound to a key in `consult-narrow-map',
+to make it available for commands with narrowing."
+  (declare (completion ignore))
+  (interactive)
+  (consult--require-minibuffer)
+  (let ((minibuffer-message-timeout 1000000))
+    (minibuffer-message
+     (mapconcat (lambda (x)
+                  (concat
+                   (propertize (key-description (list (car x))) 'face 'consult-key)
+                   " "
+                   (propertize (cdr x) 'face 'consult-help)))
+                consult--narrow-keys
+                " "))))
+
+(defun consult--narrow-setup (settings map)
+  "Setup narrowing with SETTINGS and keymap MAP."
+  (if (memq :keys settings)
+      (setq consult--narrow-predicate (plist-get settings :predicate)
+            consult--narrow-keys (plist-get settings :keys))
+    (setq consult--narrow-predicate nil
+          consult--narrow-keys settings))
+  (when-let ((key consult-narrow-key))
+    (setq key (consult--key-parse key))
+    (dolist (pair consult--narrow-keys)
+      (define-key map (vconcat key (vector (car pair)))
+                  (cons (cdr pair) #'consult-narrow))))
+  (when-let ((widen (consult--widen-key)))
+    (define-key map widen (cons "All" #'consult-narrow)))
+  (when-let ((init (and (memq :keys settings) (plist-get settings :initial))))
+    (consult-narrow init)))
+
+;;;; Splitting completion style
+
+(defun consult--split-perl (str &optional _plist)
+  "Split input STR in async input and filtering part.
+
+The function returns a list with three elements: The async
+string, the start position of the completion filter string and a
+force flag.  If the first character is a punctuation character it
+determines the separator.  Examples: \"/async/filter\",
+\"#async#filter\"."
+  (if (string-match-p "^[[:punct:]]" str)
+      (save-match-data
+        (let ((q (regexp-quote (substring str 0 1))))
+          (string-match (concat "^" q "\\([^" q "]*\\)\\(" q "\\)?") str)
+          `(,(match-string 1 str)
+            ,(match-end 0)
+            ;; Force update it two punctuation characters are entered.
+            ,(match-end 2)
+            ;; List of highlights
+            (0 . ,(match-beginning 1))
+            ,@(and (match-end 2) `((,(match-beginning 2) . ,(match-end 2)))))))
+    `(,str ,(length str))))
+
+(defun consult--split-nil (str &optional _plist)
+  "Treat the complete input STR as async input."
+  `(,str ,(length str)))
+
+(defun consult--split-separator (str plist)
+  "Split input STR in async input and filtering part at first separator.
+PLIST is the splitter configuration, including the separator."
+  (let ((sep (regexp-quote (char-to-string (plist-get plist :separator)))))
+    (save-match-data
+      (if (string-match (format "^\\([^%s]+\\)\\(%s\\)?" sep sep) str)
+          `(,(match-string 1 str)
+            ,(match-end 0)
+            ;; Force update it space is entered.
+            ,(match-end 2)
+            ;; List of highlights
+            ,@(and (match-end 2) `((,(match-beginning 2) . ,(match-end 2)))))
+        `(,str ,(length str))))))
+
+(defun consult--split-setup (split)
+  "Setup splitting completion style with splitter function SPLIT."
+  (let* ((styles completion-styles)
+         (catdef completion-category-defaults)
+         (catovr completion-category-overrides)
+         (try (lambda (str table pred point)
+                (let ((completion-styles styles)
+                      (completion-category-defaults catdef)
+                      (completion-category-overrides catovr)
+                      (pos (cadr (funcall split str))))
+                  (pcase (completion-try-completion (substring str pos) table pred
+                                                    (max 0 (- point pos)))
+                    ('t t)
+                    (`(,newstr . ,newpt)
+                     (cons (concat (substring str 0 pos) newstr)
+                           (+ pos newpt)))))))
+         (all (lambda (str table pred point)
+                (let ((completion-styles styles)
+                      (completion-category-defaults catdef)
+                      (completion-category-overrides catovr)
+                      (pos (cadr (funcall split str))))
+                  (completion-all-completions (substring str pos) table pred
+                                              (max 0 (- point pos)))))))
+    (setq-local completion-styles-alist (cons `(consult--split ,try ,all "")
+                                              completion-styles-alist)
+                completion-styles '(consult--split)
+                completion-category-defaults nil
+                completion-category-overrides nil)))
+
+;;;; Asynchronous filtering functions
+
+(defun consult--async-p (fun)
+  "Return t if FUN is an asynchronous completion function."
+  (and (functionp fun)
+       (condition-case nil
+           (progn (funcall fun "" nil 'metadata) nil)
+         (wrong-number-of-arguments t))))
+
+(defmacro consult--with-async (bind &rest body)
+  "Setup asynchronous completion in BODY.
+
+BIND is the asynchronous function binding."
+  (declare (indent 1))
+  (let ((async (car bind)))
+    `(let ((,async ,@(cdr bind))
+           (new-chunk (max read-process-output-max consult--process-chunk))
+           orig-chunk)
+       (minibuffer-with-setup-hook
+           ;; Append such that we overwrite the completion style setting of
+           ;; `fido-mode'.  See `consult--async-split' and
+           ;; `consult--split-setup'.
+           (:append
+            (lambda ()
+              (when (consult--async-p ,async)
+                (setq orig-chunk read-process-output-max
+                      read-process-output-max new-chunk)
+                (funcall ,async 'setup)
+                (let* ((mb (current-buffer))
+                       (fun (lambda ()
+                              (when-let (win (active-minibuffer-window))
+                                (when (eq (window-buffer win) mb)
+                                  (with-current-buffer mb
+                                    (let ((inhibit-modification-hooks t))
+                                      ;; Push input string to request refresh.
+                                      (funcall ,async (minibuffer-contents-no-properties))))))))
+                       ;; We use a symbol in order to avoid adding lambdas to
+                       ;; the hook variable.  Symbol indirection because of
+                       ;; bug#46407.
+                       (hook (make-symbol "consult--async-after-change-hook")))
+                  ;; Delay modification hook to ensure that minibuffer is still
+                  ;; alive after the change, such that we don't restart a new
+                  ;; asynchronous search right before exiting the minibuffer.
+                  (fset hook (lambda (&rest _) (run-at-time 0 nil fun)))
+                  (add-hook 'after-change-functions hook nil 'local)
+                  (funcall hook)))))
+         (let ((,async (if (consult--async-p ,async) ,async (lambda (_) ,async))))
+           (unwind-protect
+               ,(macroexp-progn body)
+             (funcall ,async 'destroy)
+             (when (and orig-chunk (eq read-process-output-max new-chunk))
+               (setq read-process-output-max orig-chunk))))))))
+
+(defun consult--async-sink ()
+  "Create ASYNC sink function.
+
+An async function must accept a single action argument.  For the
+\\='setup action it is guaranteed that the call originates from
+the minibuffer.  For the other actions no assumption about the
+context can be made.
+
+\\='setup   Setup the internal closure state.  Return nil.
+\\='destroy Destroy the internal closure state.  Return nil.
+\\='flush   Flush the list of candidates.  Return nil.
+\\='refresh Request UI refresh.  Return nil.
+nil      Return the list of candidates.
+list     Append the list to the already existing candidates list and return it.
+string   Update with the current user input string.  Return nil."
+  (let (candidates last buffer)
+    (lambda (action)
+      (pcase-exhaustive action
+        ('setup
+         (setq buffer (current-buffer))
+         nil)
+        ((or (pred stringp) 'destroy) nil)
+        ('flush (setq candidates nil last nil))
+        ('refresh
+         ;; Refresh the UI when the current minibuffer window belongs
+         ;; to the current asynchronous completion session.
+         (when-let (win (active-minibuffer-window))
+           (when (eq (window-buffer win) buffer)
+             (with-selected-window win
+               (run-hooks 'consult--completion-refresh-hook)
+               ;; Interaction between asynchronous completion functions and
+               ;; preview: We have to trigger preview immediately when
+               ;; candidates arrive (gh:minad/consult#436).
+               (when (and consult--preview-function candidates)
+                 (funcall consult--preview-function)))))
+         nil)
+        ('nil candidates)
+        ((pred consp)
+         (setq last (last (if last (setcdr last action) (setq candidates action))))
+         candidates)))))
+
+(defun consult--async-split-style ()
+  "Return the async splitting style function and initial string."
+  (or (alist-get consult-async-split-style consult-async-split-styles-alist)
+      (user-error "Splitting style `%s' not found" consult-async-split-style)))
+
+(defun consult--async-split-initial (initial)
+  "Return initial string for async command.
+INITIAL is the additional initial string."
+  (concat (plist-get (consult--async-split-style) :initial) initial))
+
+(defun consult--async-split-thingatpt (thing)
+  "Return THING at point with async initial prefix."
+  (when-let (str (thing-at-point thing))
+    (consult--async-split-initial str)))
+
+(defun consult--async-split (async &optional split)
+  "Create async function, which splits the input string.
+ASYNC is the async sink.
+SPLIT is the splitting function."
+  (unless split
+    (let* ((style (consult--async-split-style))
+           (fn (plist-get style :function)))
+      (setq split (lambda (str) (funcall fn str style)))))
+  (lambda (action)
+    (pcase action
+      ('setup
+       (consult--split-setup split)
+       (funcall async 'setup))
+      ((pred stringp)
+       (pcase-let* ((`(,async-str ,_ ,force . ,highlights)
+                     (funcall split action))
+                    (async-len (length async-str))
+                    (input-len (length action))
+                    (end (minibuffer-prompt-end)))
+         ;; Highlight punctuation characters
+         (remove-list-of-text-properties end (+ end input-len) '(face))
+         (dolist (hl highlights)
+           (put-text-property (+ end (car hl)) (+ end (cdr hl))
+                              'face 'consult-async-split))
+         (funcall async
+                  ;; Pass through if the input is long enough!
+                  (if (or force (>= async-len consult-async-min-input))
+                      async-str
+                    ;; Pretend that there is no input
+                    ""))))
+      (_ (funcall async action)))))
+
+(defun consult--async-indicator (async)
+  "Create async function with a state indicator overlay.
+ASYNC is the async sink."
+  (let (ov)
+    (lambda (action &optional state)
+      (pcase action
+        ('indicator
+         (overlay-put ov 'display
+                      (pcase-exhaustive state
+                        ('running  #("*" 0 1 (face consult-async-running)))
+                        ('finished #(":" 0 1 (face consult-async-finished)))
+                        ('killed   #(";" 0 1 (face consult-async-failed)))
+                        ('failed   #("!" 0 1 (face consult-async-failed))))))
+        ('setup
+         (setq ov (make-overlay (- (minibuffer-prompt-end) 2)
+                                (- (minibuffer-prompt-end) 1)))
+         (funcall async 'setup))
+        ('destroy
+         (delete-overlay ov)
+         (funcall async 'destroy))
+        (_ (funcall async action))))))
+
+(defun consult--async-log (formatted &rest args)
+  "Log FORMATTED ARGS to variable `consult--async-log'."
+  (with-current-buffer (get-buffer-create consult--async-log)
+    (goto-char (point-max))
+    (insert (apply #'format formatted args))))
+
+(defun consult--async-process (async builder &rest props)
+  "Create process source async function.
+
+ASYNC is the async function which receives the candidates.
+BUILDER is the command line builder function.
+PROPS are optional properties passed to `make-process'."
+  (setq async (consult--async-indicator async))
+  (let (proc proc-buf last-args count)
+    (lambda (action)
+      (pcase action
+        ("" ;; If no input is provided kill current process
+         (when proc
+           (delete-process proc)
+           (kill-buffer proc-buf)
+           (setq proc nil proc-buf nil))
+         (setq last-args nil))
+        ((pred stringp)
+         (funcall async action)
+         (let* ((args (funcall builder action)))
+           (unless (stringp (car args))
+             (setq args (car args)))
+           (unless (equal args last-args)
+             (setq last-args args)
+             (when proc
+               (delete-process proc)
+               (kill-buffer proc-buf)
+               (setq proc nil proc-buf nil))
+             (when args
+               (let* ((flush t)
+                      (rest "")
+                      (proc-filter
+                       (lambda (_ out)
+                         (when flush
+                           (setq flush nil)
+                           (funcall async 'flush))
+                         (let ((lines (split-string out "[\r\n]+")))
+                           (if (not (cdr lines))
+                               (setq rest (concat rest (car lines)))
+                             (setcar lines (concat rest (car lines)))
+                             (let* ((len (length lines))
+                                    (last (nthcdr (- len 2) lines)))
+                               (setq rest (cadr last)
+                                     count (+ count len -1))
+                               (setcdr last nil)
+                               (funcall async lines))))))
+                      (proc-sentinel
+                       (lambda (_ event)
+                         (when flush
+                           (setq flush nil)
+                           (funcall async 'flush))
+                         (funcall async 'indicator
+                                  (cond
+                                   ((string-prefix-p "killed" event)   'killed)
+                                   ((string-prefix-p "finished" event) 'finished)
+                                   (t 'failed)))
+                         (when (and (string-prefix-p "finished" event) (not (equal rest "")))
+                           (cl-incf count)
+                           (funcall async (list rest)))
+                         (consult--async-log
+                          "consult--async-process sentinel: event=%s lines=%d\n"
+                          (string-trim event) count)
+                         (when (> (buffer-size proc-buf) 0)
+                           (with-current-buffer (get-buffer-create consult--async-log)
+                             (goto-char (point-max))
+                             (insert ">>>>> stderr >>>>>\n")
+                             (let ((beg (point)))
+                               (insert-buffer-substring proc-buf)
+                               (save-excursion
+                                 (goto-char beg)
+                                 (message #("%s" 0 2 (face error))
+                                          (buffer-substring-no-properties (pos-bol) (pos-eol)))))
+                             (insert "<<<<< stderr <<<<<\n")))))
+                      (process-adaptive-read-buffering nil))
+                 (funcall async 'indicator 'running)
+                 (consult--async-log "consult--async-process started: args=%S default-directory=%S\n"
+                                     args default-directory)
+                 (setq count 0
+                       proc-buf (generate-new-buffer " *consult-async-stderr*")
+                       proc (apply #'make-process
+                                   `(,@props
+                                     :connection-type pipe
+                                     :name ,(car args)
+                                     ;;; XXX tramp bug, the stderr buffer must be empty
+                                     :stderr ,proc-buf
+                                     :noquery t
+                                     :command ,args
+                                     :filter ,proc-filter
+                                     :sentinel ,proc-sentinel)))))))
+         nil)
+        ('destroy
+         (when proc
+           (delete-process proc)
+           (kill-buffer proc-buf)
+           (setq proc nil proc-buf nil))
+         (funcall async 'destroy))
+        (_ (funcall async action))))))
+
+(defun consult--async-highlight (async builder)
+  "Return a new ASYNC function with candidate highlighting.
+BUILDER is the command line builder function."
+  (let (highlight)
+    (lambda (action)
+      (cond
+       ((stringp action)
+        (setq highlight (cdr (funcall builder action)))
+        (funcall async action))
+       ((and (consp action) highlight)
+        (dolist (str action)
+          (funcall highlight str))
+        (funcall async action))
+       (t (funcall async action))))))
+
+(defun consult--async-throttle (async &optional throttle debounce)
+  "Create async function from ASYNC which throttles input.
+
+The THROTTLE delay defaults to `consult-async-input-throttle'.
+The DEBOUNCE delay defaults to `consult-async-input-debounce'."
+  (setq throttle (or throttle consult-async-input-throttle)
+        debounce (or debounce consult-async-input-debounce))
+  (let* ((input "") (timer (timer-create)) (last 0))
+    (lambda (action)
+      (pcase action
+        ((pred stringp)
+         (unless (equal action input)
+           (cancel-timer timer)
+           (funcall async "") ;; cancel running process
+           (setq input action)
+           (unless (equal action "")
+             (timer-set-function timer (lambda ()
+                                         (setq last (float-time))
+                                         (funcall async action)))
+             (timer-set-time
+              timer
+              (timer-relative-time
+               nil (max debounce (- (+ last throttle) (float-time)))))
+             (timer-activate timer)))
+         nil)
+        ('destroy
+         (cancel-timer timer)
+         (funcall async 'destroy))
+        (_ (funcall async action))))))
+
+(defun consult--async-refresh-immediate (async)
+  "Create async function from ASYNC, which refreshes the display.
+
+The refresh happens immediately when candidates are pushed."
+  (lambda (action)
+    (pcase action
+      ((or (pred consp) 'flush)
+       (prog1 (funcall async action)
+         (funcall async 'refresh)))
+      (_ (funcall async action)))))
+
+(defun consult--async-refresh-timer (async &optional delay)
+  "Create async function from ASYNC, which refreshes the display.
+
+The refresh happens after a DELAY, defaulting to `consult-async-refresh-delay'."
+  (let ((delay (or delay consult-async-refresh-delay))
+        (timer (timer-create)))
+    (timer-set-function timer async '(refresh))
+    (lambda (action)
+      (prog1 (funcall async action)
+        (pcase action
+          ((or (pred consp) 'flush)
+           (unless (memq timer timer-list)
+             (timer-set-time timer (timer-relative-time nil delay))
+             (timer-activate timer)))
+          ('destroy
+           (cancel-timer timer)))))))
+
+(defmacro consult--async-command (builder &rest args)
+  "Asynchronous command pipeline.
+ARGS is a list of `make-process' properties and transforms.
+BUILDER is the command line builder function, which takes the
+input string and must either return a list of command line
+arguments or a pair of the command line argument list and a
+highlighting function."
+  (declare (indent 1))
+  `(thread-first
+     (consult--async-sink)
+     (consult--async-refresh-timer)
+     ,@(seq-take-while (lambda (x) (not (keywordp x))) args)
+     (consult--async-process
+      ,builder
+      ,@(seq-drop-while (lambda (x) (not (keywordp x))) args))
+     (consult--async-throttle)
+     (consult--async-split)))
+
+(defmacro consult--async-transform (async &rest transform)
+  "Use FUN to TRANSFORM candidates of ASYNC."
+  (cl-with-gensyms (async-var action-var)
+    `(let ((,async-var ,async))
+       (lambda (,action-var)
+         (funcall ,async-var (if (consp ,action-var) (,@transform ,action-var) ,action-var))))))
+
+(defun consult--async-map (async fun)
+  "Map candidates of ASYNC by FUN."
+  (consult--async-transform async mapcar fun))
+
+(defun consult--async-filter (async fun)
+  "Filter candidates of ASYNC by FUN."
+  (consult--async-transform async seq-filter fun))
+
+;;;; Dynamic collections based
+
+(defun consult--dynamic-compute (async fun &optional debounce)
+  "Dynamic computation of candidates.
+ASYNC is the sink.
+FUN computes the candidates given the input.
+DEBOUNCE is the time after which an interrupted computation
+should be restarted."
+  (setq debounce (or debounce consult-async-input-debounce))
+  (setq async (consult--async-indicator async))
+  (let* ((request) (current) (timer)
+         (cancel (lambda () (when timer (cancel-timer timer) (setq timer nil))))
+         (start (lambda (req) (setq request req) (funcall async 'refresh))))
+    (lambda (action)
+      (pcase action
+        ((and 'nil (guard (not request)))
+         (funcall async nil))
+        ('nil
+         (funcall cancel)
+         (let ((state 'killed))
+           (unwind-protect
+               (progn
+                 (funcall async 'indicator 'running)
+                 (redisplay)
+                 ;; Run computation
+                 (let ((response (funcall fun request)))
+                   ;; Flush and update candidate list
+                   (funcall async 'flush)
+                   (setq state 'finished current request)
+                   (funcall async response)))
+             (funcall async 'indicator state)
+             ;; If the computation was killed, restart it after some time.
+             (when (eq state 'killed)
+               (setq timer (run-at-time debounce nil start request)))
+             (setq request nil))))
+        ((pred stringp)
+         (funcall cancel)
+         (if (or (equal action "") (equal action current))
+             (funcall async 'indicator 'finished)
+           (funcall start action)))
+        ('destroy
+         (funcall cancel)
+         (funcall async 'destroy))
+        (_ (funcall async action))))))
+
+(defun consult--dynamic-collection (fun)
+  "Dynamic collection with input splitting.
+FUN computes the candidates given the input."
+  (thread-first
+    (consult--async-sink)
+    (consult--dynamic-compute fun)
+    (consult--async-throttle)
+    (consult--async-split)))
+
+;;;; Special keymaps
+
+(defvar-keymap consult-async-map
+  :doc "Keymap added for commands with asynchronous candidates."
+  ;; Overwriting some unusable defaults of default minibuffer completion.
+  "<remap> <minibuffer-complete-word>" #'self-insert-command
+  ;; Remap Emacs 29 history and default completion for now
+  ;; (gh:minad/consult#613).
+  "<remap> <minibuffer-complete-defaults>" #'ignore
+  "<remap> <minibuffer-complete-history>" #'consult-history)
+
+(defvar-keymap consult-narrow-map
+  :doc "Narrowing keymap which is added to the local minibuffer map.
+Note that `consult-narrow-key' and `consult-widen-key' are bound dynamically."
+  "SPC" consult--narrow-space
+  "DEL" consult--narrow-delete)
+
+;;;; Internal API: consult--read
+
+(defun consult--annotate-align (cand ann)
+  "Align annotation ANN by computing the maximum CAND width."
+  (setq consult--annotate-align-width
+        (max consult--annotate-align-width
+             (* (ceiling (consult--display-width cand)
+                         consult--annotate-align-step)
+                consult--annotate-align-step)))
+  (when ann
+    (concat
+     #("   " 0 1 (display (space :align-to (+ left consult--annotate-align-width))))
+     ann)))
+
+(defun consult--add-history (async items)
+  "Add ITEMS to the minibuffer future history.
+ASYNC must be non-nil for async completion functions."
+  (delete-dups
+   (append
+    ;; the defaults are at the beginning of the future history
+    (ensure-list minibuffer-default)
+    ;; then our custom items
+    (remove "" (remq nil (ensure-list items)))
+    ;; Add all the completions for non-async commands.  For async commands this
+    ;; feature is not useful, since if one selects a completion candidate, the
+    ;; async search is restarted using that candidate string.  This usually does
+    ;; not yield a desired result since the async input uses a special format,
+    ;; e.g., `#grep#filter'.
+    (unless async
+      (all-completions ""
+                       minibuffer-completion-table
+                       minibuffer-completion-predicate)))))
+
+(defun consult--setup-keymap (keymap async narrow preview-key)
+  "Setup minibuffer keymap.
+
+KEYMAP is a command-specific keymap.
+ASYNC must be non-nil for async completion functions.
+NARROW are the narrow settings.
+PREVIEW-KEY are the preview keys."
+  (let ((old-map (current-local-map))
+        (map (make-sparse-keymap)))
+
+    ;; Add narrow keys
+    (when narrow
+      (consult--narrow-setup narrow map))
+
+    ;; Preview trigger keys
+    (when (and (consp preview-key) (memq :keys preview-key))
+      (setq preview-key (plist-get preview-key :keys)))
+    (setq preview-key (mapcar #'car (consult--preview-key-normalize preview-key)))
+    (when preview-key
+      (dolist (key preview-key)
+        (unless (or (eq key 'any) (lookup-key old-map key))
+          (define-key map key #'ignore))))
+
+    ;; Put the keymap together
+    (use-local-map
+     (make-composed-keymap
+      (delq nil (list keymap
+                      (and async consult-async-map)
+                      (and narrow consult-narrow-map)
+                      map))
+      old-map))))
+
+(defun consult--tofu-hide-in-minibuffer (&rest _)
+  "Hide the tofus in the minibuffer."
+  (let* ((min (minibuffer-prompt-end))
+         (max (point-max))
+         (pos max))
+    (while (and (> pos min) (consult--tofu-p (char-before pos)))
+      (cl-decf pos))
+    (when (< pos max)
+      (add-text-properties pos max '(invisible t rear-nonsticky t cursor-intangible t)))))
+
+(defun consult--read-annotate (fun cand)
+  "Annotate CAND with annotation function FUN."
+  (pcase (funcall fun cand)
+    (`(,_ ,_ ,suffix) suffix)
+    (ann ann)))
+
+(defun consult--read-affixate (fun cands)
+  "Affixate CANDS with annotation function FUN."
+  (mapcar (lambda (cand)
+            (let ((ann (funcall fun cand)))
+              (if (consp ann)
+                  ann
+                (setq ann (or ann ""))
+                (list cand ""
+                      ;; The default completion UI adds the
+                      ;; `completions-annotations' face if no other faces are
+                      ;; present.
+                      (if (text-property-not-all 0 (length ann) 'face nil ann)
+                          ann
+                        (propertize ann 'face 'completions-annotations))))))
+          cands))
+
+(cl-defun consult--read-1 (table &key
+                                 prompt predicate require-match history default
+                                 keymap category initial narrow add-history annotate
+                                 state preview-key sort lookup group inherit-input-method)
+  "See `consult--read' for the documentation of the arguments."
+  (minibuffer-with-setup-hook
+      (:append (lambda ()
+                 (add-hook 'after-change-functions #'consult--tofu-hide-in-minibuffer nil 'local)
+                 (consult--setup-keymap keymap (consult--async-p table) narrow preview-key)
+                 (setq-local minibuffer-default-add-function
+                             (apply-partially #'consult--add-history (consult--async-p table) add-history))))
+    (consult--with-async (async table)
+      (consult--with-preview
+          preview-key state
+          (lambda (narrow input cand)
+            (funcall lookup cand (funcall async nil) input narrow))
+          (apply-partially #'run-hook-with-args-until-success
+                           'consult--completion-candidate-hook)
+          (pcase-exhaustive history
+            (`(:input ,var) var)
+            ((pred symbolp)))
+        ;; Do not unnecessarily let-bind the lambdas to avoid over-capturing in
+        ;; the interpreter.  This will make closures and the lambda string
+        ;; representation larger, which makes debugging much worse.  Fortunately
+        ;; the over-capturing problem does not affect the bytecode interpreter
+        ;; which does a proper scope analysis.
+        (let* ((metadata `(metadata
+                           ,@(when category `((category . ,category)))
+                           ,@(when group `((group-function . ,group)))
+                           ,@(when annotate
+                               `((affixation-function
+                                  . ,(apply-partially #'consult--read-affixate annotate))
+                                 (annotation-function
+                                  . ,(apply-partially #'consult--read-annotate annotate))))
+                           ,@(unless sort '((cycle-sort-function . identity)
+                                            (display-sort-function . identity)))))
+               (consult--annotate-align-width 0)
+               (selected
+                (completing-read
+                 prompt
+                 (lambda (str pred action)
+                   (let ((result (complete-with-action action (funcall async nil) str pred)))
+                     (if (eq action 'metadata)
+                         (if (and (eq (car result) 'metadata) (cdr result))
+                             ;; Merge metadata
+                             `(metadata ,@(cdr metadata) ,@(cdr result))
+                           metadata)
+                       result)))
+                 predicate require-match initial
+                 (if (symbolp history) history (cadr history))
+                 default
+                 inherit-input-method)))
+          ;; Repair the null completion semantics. `completing-read' may return
+          ;; an empty string even if REQUIRE-MATCH is non-nil. One can always
+          ;; opt-in to null completion by passing the empty string for DEFAULT.
+          (when (and (eq require-match t) (not default) (equal selected ""))
+            (user-error "No selection"))
+          selected)))))
+
+(cl-defun consult--read (table &rest options &key
+                               prompt predicate require-match history default
+                               keymap category initial narrow add-history annotate
+                               state preview-key sort lookup group inherit-input-method)
+  "Enhanced completing read function to select from TABLE.
+
+The function is a thin wrapper around `completing-read'.  Keyword
+arguments are used instead of positional arguments for code
+clarity.  On top of `completing-read' it additionally supports
+computing the candidate list asynchronously, candidate preview
+and narrowing.  You should use `completing-read' instead of
+`consult--read' if you don't use asynchronous candidate
+computation or candidate preview.
+
+Keyword OPTIONS:
+
+PROMPT is the string which is shown as prompt in the minibuffer.
+PREDICATE is a filter function called for each candidate, returns
+nil or t.
+REQUIRE-MATCH equals t means that an exact match is required.
+HISTORY is the symbol of the history variable.
+DEFAULT is the default selected value.
+ADD-HISTORY is a list of items to add to the history.
+CATEGORY is the completion category symbol.
+SORT should be set to nil if the candidates are already sorted.
+This will disable sorting in the completion UI.
+LOOKUP is a lookup function passed the selected candidate string,
+the list of candidates, the current input string and the current
+narrowing value.
+ANNOTATE is a function passed a candidate string.  The function
+should either return an annotation string or a list of three
+strings (candidate prefix postfix).
+INITIAL is the initial input string.
+STATE is the state function, see `consult--with-preview'.
+GROUP is a completion metadata `group-function' as documented in
+the Elisp manual.
+PREVIEW-KEY are the preview keys.  Can be nil, `any', a single
+key or a list of keys.
+NARROW is an alist of narrowing prefix strings and description.
+KEYMAP is a command-specific keymap.
+INHERIT-INPUT-METHOD, if non-nil the minibuffer inherits the
+input method."
+  ;; supported types
+  (cl-assert (or (functionp table)     ;; dynamic table or asynchronous function
+                 (obarrayp table)      ;; obarray
+                 (hash-table-p table)  ;; hash table
+                 (not table)           ;; empty list
+                 (stringp (car table)) ;; string list
+                 (and (consp (car table)) (stringp (caar table)))   ;; string alist
+                 (and (consp (car table)) (symbolp (caar table))))) ;; symbol alist
+  (ignore prompt predicate require-match history default
+          keymap category initial narrow add-history annotate
+          state preview-key sort lookup group inherit-input-method)
+  (apply #'consult--read-1 table
+         (append
+          (consult--customize-get)
+          options
+          (list :prompt "Select: "
+                :preview-key consult-preview-key
+                :sort t
+                :lookup (lambda (selected &rest _) selected)))))
+
+;;;; Internal API: consult--prompt
+
+(cl-defun consult--prompt-1 (&key prompt history add-history initial default
+                                  keymap state preview-key transform inherit-input-method)
+  "See `consult--prompt' for documentation."
+  (minibuffer-with-setup-hook
+      (:append (lambda ()
+                 (consult--setup-keymap keymap nil nil preview-key)
+                 (setq-local minibuffer-default-add-function
+                             (apply-partially #'consult--add-history nil add-history))))
+    (consult--with-preview
+        preview-key state
+        (lambda (_narrow inp _cand) (funcall transform inp))
+        (lambda () "")
+        history
+        (read-from-minibuffer prompt initial nil nil history default inherit-input-method))))
+
+(cl-defun consult--prompt (&rest options &key prompt history add-history initial default
+                                 keymap state preview-key transform inherit-input-method)
+  "Read from minibuffer.
+
+Keyword OPTIONS:
+
+PROMPT is the string to prompt with.
+TRANSFORM is a function which is applied to the current input string.
+HISTORY is the symbol of the history variable.
+INITIAL is initial input.
+DEFAULT is the default selected value.
+ADD-HISTORY is a list of items to add to the history.
+STATE is the state function, see `consult--with-preview'.
+PREVIEW-KEY are the preview keys (nil, `any', a single key or a list of keys).
+KEYMAP is a command-specific keymap."
+  (ignore prompt history add-history initial default
+          keymap state preview-key transform inherit-input-method)
+  (apply #'consult--prompt-1
+         (append
+          (consult--customize-get)
+          options
+          (list :prompt "Input: "
+                :preview-key consult-preview-key
+                :transform #'identity))))
+
+;;;; Internal API: consult--multi
+
+(defsubst consult--multi-source (sources cand)
+  "Lookup source for CAND in SOURCES list."
+  (aref sources (consult--tofu-get cand)))
+
+(defun consult--multi-predicate (sources cand)
+  "Predicate function called for each candidate CAND given SOURCES."
+  (let* ((src (consult--multi-source sources cand))
+         (narrow (plist-get src :narrow))
+         (type (or (car-safe narrow) narrow -1)))
+    (or (eq consult--narrow type)
+        (not (or consult--narrow (plist-get src :hidden))))))
+
+(defun consult--multi-narrow (sources)
+  "Return narrow list from SOURCES."
+  (thread-last sources
+    (mapcar (lambda (src)
+              (when-let (narrow (plist-get src :narrow))
+                (if (consp narrow)
+                    narrow
+                  (when-let (name (plist-get src :name))
+                    (cons narrow name))))))
+    (delq nil)
+    (delete-dups)))
+
+(defun consult--multi-annotate (sources cand)
+  "Annotate candidate CAND from multi SOURCES."
+  (consult--annotate-align
+   cand
+   (let ((src (consult--multi-source sources cand)))
+     (if-let ((fun (plist-get src :annotate)))
+         (funcall fun (cdr (get-text-property 0 'multi-category cand)))
+       (plist-get src :name)))))
+
+(defun consult--multi-group (sources cand transform)
+  "Return title of candidate CAND or TRANSFORM the candidate given SOURCES."
+  (if transform cand
+    (plist-get (consult--multi-source sources cand) :name)))
+
+(defun consult--multi-preview-key (sources)
+  "Return preview keys from SOURCES."
+  (list :predicate
+        (lambda (cand)
+          (if (plist-member (cdr cand) :preview-key)
+              (plist-get (cdr cand) :preview-key)
+            consult-preview-key))
+        :keys
+        (delete-dups
+         (seq-mapcat (lambda (src)
+                       (let ((key (if (plist-member src :preview-key)
+                                      (plist-get src :preview-key)
+                                    consult-preview-key)))
+                         (ensure-list key)))
+                     sources))))
+
+(defun consult--multi-lookup (sources selected candidates _input narrow &rest _)
+  "Lookup SELECTED in CANDIDATES given SOURCES, with potential NARROW."
+  (if (or (string-blank-p selected)
+          (not (consult--tofu-p (aref selected (1- (length selected))))))
+      ;; Non-existing candidate without Tofu or default submitted (empty string)
+      (let* ((src (cond
+                   (narrow (seq-find (lambda (src)
+                                       (let ((n (plist-get src :narrow)))
+                                         (eq (or (car-safe n) n -1) narrow)))
+                                     sources))
+                   ((seq-find (lambda (src) (plist-get src :default)) sources))
+                   ((seq-find (lambda (src) (not (plist-get src :hidden))) sources))
+                   ((aref sources 0))))
+             (idx (seq-position sources src))
+             (def (and (string-blank-p selected) ;; default candidate
+                       (seq-find (lambda (cand) (eq idx (consult--tofu-get cand))) candidates))))
+        (if def
+            (cons (cdr (get-text-property 0 'multi-category def)) src)
+          `(,selected :match nil ,@src)))
+    (if-let (found (member selected candidates))
+        ;; Existing candidate submitted
+        (cons (cdr (get-text-property 0 'multi-category (car found)))
+              (consult--multi-source sources selected))
+      ;; Non-existing Tofu'ed candidate submitted, e.g., via Embark
+      `(,(substring selected 0 -1) :match nil ,@(consult--multi-source sources selected)))))
+
+(defun consult--multi-candidates (sources)
+  "Return `consult--multi' candidates from SOURCES."
+  (let ((idx 0) candidates)
+    (seq-doseq (src sources)
+      (let* ((face (and (plist-member src :face) `(face ,(plist-get src :face))))
+             (cat (plist-get src :category))
+             (items (plist-get src :items))
+             (items (if (functionp items) (funcall items) items)))
+        (dolist (item items)
+          (let* ((str (or (car-safe item) item))
+                 (cand (consult--tofu-append str idx)))
+            ;; Preserve existing `multi-category' datum of the candidate.
+            (if (and (eq str item) (get-text-property 0 'multi-category str))
+                (when face (add-text-properties 0 (length str) face cand))
+              ;; Attach `multi-category' datum and face.
+              (add-text-properties
+               0 (length str)
+               `(multi-category (,cat . ,(or (cdr-safe item) item)) ,@face) cand))
+            (push cand candidates))))
+      (cl-incf idx))
+    (nreverse candidates)))
+
+(defun consult--multi-enabled-sources (sources)
+  "Return vector of enabled SOURCES."
+  (vconcat
+   (seq-filter (lambda (src)
+                 (if-let (pred (plist-get src :enabled))
+                     (funcall pred)
+                   t))
+               (mapcar (lambda (src)
+                         (if (symbolp src) (symbol-value src) src))
+                       sources))))
+
+(defun consult--multi-state (sources)
+  "State function given SOURCES."
+  (when-let (states (delq nil (mapcar (lambda (src)
+                                        (when-let (fun (plist-get src :state))
+                                          (cons src (funcall fun))))
+                                      sources)))
+    (let (last-fun)
+      (pcase-lambda (action `(,cand . ,src))
+        (pcase action
+          ('setup
+           (pcase-dolist (`(,_ . ,fun) states)
+             (funcall fun 'setup nil)))
+          ('exit
+           (pcase-dolist (`(,_ . ,fun) states)
+             (funcall fun 'exit nil)))
+          ('preview
+           (let ((selected-fun (cdr (assq src states))))
+             ;; If the candidate source changed during preview communicate to
+             ;; the last source, that none of its candidates is previewed anymore.
+             (when (and last-fun (not (eq last-fun selected-fun)))
+               (funcall last-fun 'preview nil))
+             (setq last-fun selected-fun)
+             (when selected-fun
+               (funcall selected-fun 'preview cand))))
+          ('return
+           (let ((selected-fun (cdr (assq src states))))
+             ;; Finish all the sources, except the selected one.
+             (pcase-dolist (`(,_ . ,fun) states)
+               (unless (eq fun selected-fun)
+                 (funcall fun 'return nil)))
+             ;; Finish the source with the selected candidate
+             (when selected-fun
+               (funcall selected-fun 'return cand)))))))))
+
+(defun consult--multi (sources &rest options)
+  "Select from candidates taken from a list of SOURCES.
+
+OPTIONS is the plist of options passed to `consult--read'.  The following
+options are supported: :require-match, :history, :keymap, :initial,
+:add-history, :sort and :inherit-input-method.  The other options of
+`consult--read' are used by the implementation of `consult--multi' and
+should not be overwritten, except in in special scenarios.
+
+The function returns the selected candidate in the form (cons candidate
+source-plist).  The plist has the key :match with a value nil if the
+candidate does not exist, t if the candidate exists and `new' if the
+candidate has been created.  The sources of the source list can either be
+symbols of source variables or source values.  Source values must be
+plists with fields from the following list.
+
+Required source fields:
+* :category - Completion category symbol.
+* :items - List of strings to select from or function returning
+  list of strings.  Note that the strings can use text properties
+  to carry metadata, which is then available to the :annotate,
+  :action and :state functions.
+
+Optional source fields:
+* :name - Name of the source as a string, used for narrowing,
+  group titles and annotations.
+* :narrow - Narrowing character or (character . string) pair.
+* :enabled - Function which must return t if the source is enabled.
+* :hidden - When t candidates of this source are hidden by default.
+* :face - Face used for highlighting the candidates.
+* :annotate - Annotation function called for each candidate, returns string.
+* :history - Name of history variable to add selected candidate.
+* :default - Must be t if the first item of the source is the default value.
+* :action - Function called with the selected candidate.
+* :new - Function called with new candidate name, only if :require-match is nil.
+* :state - State constructor for the source, must return the
+  state function.  The state function is informed about state
+  changes of the UI and can be used to implement preview.
+* Other custom source fields can be added depending on the use
+  case.  Note that the source is returned by `consult--multi'
+  together with the selected candidate."
+  (let* ((sources (consult--multi-enabled-sources sources))
+         (candidates (consult--with-increased-gc
+                      (consult--multi-candidates sources)))
+         (selected
+          (apply #'consult--read
+                 candidates
+                 (append
+                  options
+                  (list
+                   :category    'multi-category
+                   :predicate   (apply-partially #'consult--multi-predicate sources)
+                   :annotate    (apply-partially #'consult--multi-annotate sources)
+                   :group       (apply-partially #'consult--multi-group sources)
+                   :lookup      (apply-partially #'consult--multi-lookup sources)
+                   :preview-key (consult--multi-preview-key sources)
+                   :narrow      (consult--multi-narrow sources)
+                   :state       (consult--multi-state sources))))))
+    (when-let (history (plist-get (cdr selected) :history))
+      (add-to-history history (car selected)))
+    (if (plist-member (cdr selected) :match)
+        (when-let (fun (plist-get (cdr selected) :new))
+          (funcall fun (car selected))
+          (plist-put (cdr selected) :match 'new))
+      (when-let (fun (plist-get (cdr selected) :action))
+        (funcall fun (car selected)))
+      (setq selected `(,(car selected) :match t ,@(cdr selected))))
+    selected))
+
+;;;; Customization macro
+
+(defun consult--customize-put (cmds prop form)
+  "Set property PROP to FORM of commands CMDS."
+  (dolist (cmd cmds)
+    (cond
+     ((and (boundp cmd) (consp (symbol-value cmd)))
+      (setf (plist-get (symbol-value cmd) prop) (eval form 'lexical)))
+     ((functionp cmd)
+      (setf (plist-get (alist-get cmd consult--customize-alist) prop) form))
+     (t (user-error "%s is neither a Command command nor a source" cmd))))
+  nil)
+
+(defmacro consult-customize (&rest args)
+  "Set properties of commands or sources.
+ARGS is a list of commands or sources followed by the list of
+keyword-value pairs.  For `consult-customize' to succeed, the
+customized sources and commands must exist.  When a command is
+invoked, the value of `this-command' is used to lookup the
+corresponding customization options."
+  (let (setter)
+    (while args
+      (let ((cmds (seq-take-while (lambda (x) (not (keywordp x))) args)))
+        (setq args (seq-drop-while (lambda (x) (not (keywordp x))) args))
+        (while (keywordp (car args))
+          (push `(consult--customize-put ',cmds ,(car args) ',(cadr args)) setter)
+          (setq args (cddr args)))))
+    (macroexp-progn setter)))
+
+(defun consult--customize-get ()
+  "Get configuration from `consult--customize-alist' for `this-command'."
+  (mapcar (lambda (x) (eval x 'lexical))
+          (alist-get this-command consult--customize-alist)))
+
+;;;; Commands
+
+;;;;; Command: consult-completion-in-region
+
+(defun consult--insertion-preview (start end)
+  "State function for previewing a candidate in a specific region.
+The candidates are previewed in the region from START to END.  This function is
+used as the `:state' argument for `consult--read' in the `consult-yank' family
+of functions and in `consult-completion-in-region'."
+  (unless (or (minibufferp)
+              ;; Disable preview if anything odd is going on with the markers.
+              ;; Otherwise we get "Marker points into wrong buffer errors".  See
+              ;; gh:minad/consult#375, where Org mode source blocks are
+              ;; completed in a different buffer than the original buffer.  This
+              ;; completion is probably also problematic in my Corfu completion
+              ;; package.
+              (not (eq (window-buffer) (current-buffer)))
+              (and (markerp start) (not (eq (marker-buffer start) (current-buffer))))
+              (and (markerp end) (not (eq (marker-buffer end) (current-buffer)))))
+    (let (ov)
+      (lambda (action cand)
+        (cond
+         ((and (not cand) ov)
+          (delete-overlay ov)
+          (setq ov nil))
+         ((and (eq action 'preview) cand)
+          (unless ov
+            (setq ov (consult--make-overlay start end
+                                            'invisible t
+                                            'window (selected-window))))
+          ;; Use `add-face-text-property' on a copy of "cand in order to merge face properties
+          (setq cand (copy-sequence cand))
+          (add-face-text-property 0 (length cand) 'consult-preview-insertion t cand)
+          ;; Use the `before-string' property since the overlay might be empty.
+          (overlay-put ov 'before-string cand)))))))
+
+;;;###autoload
+(defun consult-completion-in-region (start end collection &optional predicate)
+  "Use minibuffer completion as the UI for `completion-at-point'.
+
+The function is called with 4 arguments: START END COLLECTION
+PREDICATE.  The arguments and expected return value are as
+specified for `completion-in-region'.  Use this function as a
+value for `completion-in-region-function'."
+  (barf-if-buffer-read-only)
+  (let* ((initial (buffer-substring-no-properties start end))
+         (metadata (completion-metadata initial collection predicate))
+         ;; TODO: `minibuffer-completing-file-name' is mostly deprecated, but
+         ;; still in use. Packages should instead use the completion metadata.
+         (minibuffer-completing-file-name
+          (eq 'file (completion-metadata-get metadata 'category)))
+         (threshold (completion--cycle-threshold metadata))
+         (all (completion-all-completions initial collection predicate (length initial)))
+         ;; Wrap all annotation functions to ensure that they are executed
+         ;; in the original buffer.
+         (exit-fun (plist-get completion-extra-properties :exit-function))
+         (ann-fun (plist-get completion-extra-properties :annotation-function))
+         (aff-fun (plist-get completion-extra-properties :affixation-function))
+         (docsig-fun (plist-get completion-extra-properties :company-docsig))
+         (completion-extra-properties
+          `(,@(and ann-fun (list :annotation-function (consult--in-buffer ann-fun)))
+            ,@(and aff-fun (list :affixation-function (consult--in-buffer aff-fun)))
+            ;; Provide `:annotation-function' if `:company-docsig' is specified.
+            ,@(and docsig-fun (not ann-fun) (not aff-fun)
+                   (list :annotation-function
+                         (consult--in-buffer
+                          (lambda (cand)
+                            (concat (propertize " " 'display '(space :align-to center))
+                                    (funcall docsig-fun cand)))))))))
+    ;; error if `threshold' is t or the improper list `all' is too short
+    (if (and threshold
+             (or (not (consp (ignore-errors (nthcdr threshold all))))
+                 (and completion-cycling completion-all-sorted-completions)))
+        (completion--in-region start end collection predicate)
+      (let* ((limit (car (completion-boundaries initial collection predicate "")))
+             (this-command #'consult-completion-in-region)
+             (completion
+              (cond
+               ((atom all) nil)
+               ((and (consp all) (atom (cdr all)))
+                (concat (substring initial 0 limit) (car all)))
+               (t
+                (consult--local-let ((enable-recursive-minibuffers t))
+                  ;; Evaluate completion table in the original buffer.
+                  ;; This is a reasonable thing to do and required by
+                  ;; some completion tables in particular by lsp-mode.
+                  ;; See gh:minad/vertico#61.
+                  (consult--read (consult--completion-table-in-buffer collection)
+                                 :prompt "Completion: "
+                                 :state (consult--insertion-preview start end)
+                                 :predicate predicate
+                                 :initial initial))))))
+        (if completion
+            (progn
+              ;; bug#55205: completion--replace removes properties!
+              (completion--replace start end (setq completion (concat completion)))
+              (when exit-fun
+                (funcall exit-fun completion
+                         ;; If completion is finished and cannot be further
+                         ;; completed, return `finished'.  Otherwise return
+                         ;; `exact'.
+                         (if (eq (try-completion completion collection predicate) t)
+                             'finished 'exact)))
+              t)
+          (message "No completion")
+          nil)))))
+
+;;;;; Command: consult-outline
+
+(defun consult--outline-candidates ()
+  "Return alist of outline headings and positions."
+  (consult--forbid-minibuffer)
+  (let* ((line (line-number-at-pos (point-min) consult-line-numbers-widen))
+         (heading-regexp (concat "^\\(?:"
+                                 ;; default definition from outline.el
+                                 (or (bound-and-true-p outline-regexp) "[*\^L]+")
+                                 "\\)"))
+         (heading-alist (bound-and-true-p outline-heading-alist))
+         (level-fun (or (bound-and-true-p outline-level)
+                        (lambda () ;; as in the default from outline.el
+                          (or (cdr (assoc (match-string 0) heading-alist))
+                              (- (match-end 0) (match-beginning 0))))))
+         (buffer (current-buffer))
+         candidates)
+    (save-excursion
+      (goto-char (point-min))
+      (while (save-excursion
+               (if-let (fun (bound-and-true-p outline-search-function))
+                   (funcall fun)
+                 (re-search-forward heading-regexp nil t)))
+        (cl-incf line (consult--count-lines (match-beginning 0)))
+        (push (consult--location-candidate
+               (consult--buffer-substring (pos-bol) (pos-eol) 'fontify)
+               (cons buffer (point)) (1- line) (1- line)
+               'consult--outline-level (funcall level-fun))
+              candidates)
+        (goto-char (1+ (pos-eol)))))
+    (unless candidates
+      (user-error "No headings"))
+    (nreverse candidates)))
+
+;;;###autoload
+(defun consult-outline (&optional level)
+  "Jump to an outline heading, obtained by matching against `outline-regexp'.
+
+This command supports narrowing to a heading level and candidate
+preview.  The initial narrowing LEVEL can be given as prefix
+argument.  The symbol at point is added to the future history."
+  (interactive
+   (list (and current-prefix-arg (prefix-numeric-value current-prefix-arg))))
+  (let* ((candidates (consult--slow-operation
+                         "Collecting headings..."
+                       (consult--outline-candidates)))
+         (min-level (- (cl-loop for cand in candidates minimize
+                                (get-text-property 0 'consult--outline-level cand))
+                       ?1))
+         (narrow-pred (lambda (cand)
+                        (<= (get-text-property 0 'consult--outline-level cand)
+                            (+ consult--narrow min-level))))
+         (narrow-keys (mapcar (lambda (c) (cons c (format "Level %c" c)))
+                              (number-sequence ?1 ?9)))
+         (narrow-init (and level (max ?1 (min ?9 (+ level ?0))))))
+    (consult--read
+     candidates
+     :prompt "Go to heading: "
+     :annotate (consult--line-prefix)
+     :category 'consult-location
+     :sort nil
+     :require-match t
+     :lookup #'consult--line-match
+     :narrow `(:predicate ,narrow-pred :keys ,narrow-keys :initial ,narrow-init)
+     :history '(:input consult--line-history)
+     :add-history (thing-at-point 'symbol)
+     :state (consult--location-state candidates))))
+
+;;;;; Command: consult-mark
+
+(defun consult--mark-candidates (markers)
+  "Return list of candidates strings for MARKERS."
+  (consult--forbid-minibuffer)
+  (let ((candidates)
+        (current-buf (current-buffer)))
+    (save-excursion
+      (dolist (marker markers)
+        (when-let ((pos (marker-position marker))
+                   (buf (marker-buffer marker)))
+          (when (and (eq buf current-buf)
+                     (consult--in-range-p pos))
+            (goto-char pos)
+            ;; `line-number-at-pos' is a very slow function, which should be
+            ;; replaced everywhere.  However in this case the slow
+            ;; line-number-at-pos does not hurt much, since the mark ring is
+            ;; usually small since it is limited by `mark-ring-max'.
+            (push (consult--location-candidate
+                   (consult--line-with-mark marker) marker
+                   (line-number-at-pos pos consult-line-numbers-widen)
+                   marker)
+                  candidates)))))
+    (unless candidates
+      (user-error "No marks"))
+    (nreverse (delete-dups candidates))))
+
+;;;###autoload
+(defun consult-mark (&optional markers)
+  "Jump to a marker in MARKERS list (defaults to buffer-local `mark-ring').
+
+The command supports preview of the currently selected marker position.
+The symbol at point is added to the future history."
+  (interactive)
+  (consult--read
+   (consult--mark-candidates
+    (or markers (cons (mark-marker) mark-ring)))
+   :prompt "Go to mark: "
+   :annotate (consult--line-prefix)
+   :category 'consult-location
+   :sort nil
+   :require-match t
+   :lookup #'consult--lookup-location
+   :history '(:input consult--line-history)
+   :add-history (thing-at-point 'symbol)
+   :state (consult--jump-state)))
+
+;;;;; Command: consult-global-mark
+
+(defun consult--global-mark-candidates (markers)
+  "Return list of candidates strings for MARKERS."
+  (consult--forbid-minibuffer)
+  (let ((candidates))
+    (save-excursion
+      (dolist (marker markers)
+        (when-let ((pos (marker-position marker))
+                   (buf (marker-buffer marker)))
+          (unless (minibufferp buf)
+            (with-current-buffer buf
+              (when (consult--in-range-p pos)
+                (goto-char pos)
+                ;; `line-number-at-pos' is slow, see comment in `consult--mark-candidates'.
+                (let* ((line (line-number-at-pos pos consult-line-numbers-widen))
+                       (prefix (consult--format-file-line-match (buffer-name buf) line ""))
+                       (cand (concat prefix (consult--line-with-mark marker) (consult--tofu-encode marker))))
+                  (put-text-property 0 (length prefix) 'consult-strip t cand)
+                  (put-text-property 0 (length cand) 'consult-location (cons marker line) cand)
+                  (push cand candidates))))))))
+    (unless candidates
+      (user-error "No global marks"))
+    (nreverse (delete-dups candidates))))
+
+;;;###autoload
+(defun consult-global-mark (&optional markers)
+  "Jump to a marker in MARKERS list (defaults to `global-mark-ring').
+
+The command supports preview of the currently selected marker position.
+The symbol at point is added to the future history."
+  (interactive)
+  (consult--read
+   (consult--global-mark-candidates
+    (or markers global-mark-ring))
+   :prompt "Go to global mark: "
+   ;; Despite `consult-global-mark' formatting the candidates in grep-like
+   ;; style, we are not using the `consult-grep' category, since the candidates
+   ;; have location markers attached.
+   :category 'consult-location
+   :sort nil
+   :require-match t
+   :lookup #'consult--lookup-location
+   :history '(:input consult--line-history)
+   :add-history (thing-at-point 'symbol)
+   :state (consult--jump-state)))
+
+;;;;; Command: consult-line
+
+(defun consult--line-candidates (top curr-line)
+  "Return list of line candidates.
+Start from top if TOP non-nil.
+CURR-LINE is the current line number."
+  (consult--forbid-minibuffer)
+  (consult--fontify-all)
+  (let* ((buffer (current-buffer))
+         (line (line-number-at-pos (point-min) consult-line-numbers-widen))
+         default-cand candidates)
+    (consult--each-line beg end
+      (unless (looking-at-p "^\\s-*$")
+        (push (consult--location-candidate
+               (consult--buffer-substring beg end)
+               (cons buffer beg) line line)
+              candidates)
+        (when (and (not default-cand) (>= line curr-line))
+          (setq default-cand candidates)))
+      (cl-incf line))
+    (unless candidates
+      (user-error "No lines"))
+    (nreverse
+     (if (or top (not default-cand))
+         candidates
+       (let ((before (cdr default-cand)))
+         (setcdr default-cand nil)
+         (nconc before candidates))))))
+
+(defun consult--line-point-placement (selected candidates highlighted &rest ignored-faces)
+  "Find point position on matching line.
+SELECTED is the currently selected candidate.
+CANDIDATES is the list of candidates.
+HIGHLIGHTED is the highlighted string to determine the match position.
+IGNORED-FACES are ignored when determining the match position."
+  (when-let (pos (consult--lookup-location selected candidates))
+    (if highlighted
+        (let* ((matches (apply #'consult--point-placement highlighted 0 ignored-faces))
+               (dest (+ pos (car matches))))
+          ;; Only create a new marker when jumping across buffers (for example
+          ;; `consult-line-multi').  Avoid creating unnecessary markers, when
+          ;; scrolling through candidates, since creating markers is not free.
+          (when (and (markerp pos) (not (eq (marker-buffer pos) (current-buffer))))
+            (setq dest (move-marker (make-marker) dest (marker-buffer pos))))
+          (cons dest (cdr matches)))
+      pos)))
+
+(defun consult--line-match (selected candidates input &rest _)
+  "Lookup position of match.
+SELECTED is the currently selected candidate.
+CANDIDATES is the list of candidates.
+INPUT is the input string entered by the user."
+  (consult--line-point-placement selected candidates
+                                 (and (not (string-blank-p input))
+                                      (car (consult--completion-filter
+                                            input
+                                            (list (substring-no-properties selected))
+                                            'consult-location 'highlight)))
+                                 'completions-first-difference))
+
+;;;###autoload
+(defun consult-line (&optional initial start)
+  "Search for a matching line.
+
+Depending on the setting `consult-point-placement' the command
+jumps to the beginning or the end of the first match on the line
+or the line beginning.  The default candidate is the non-empty
+line next to point.  This command obeys narrowing.  Optional
+INITIAL input can be provided.  The search starting point is
+changed if the START prefix argument is set.  The symbol at point
+and the last `isearch-string' is added to the future history."
+  (interactive (list nil (not (not current-prefix-arg))))
+  (let* ((curr-line (line-number-at-pos (point) consult-line-numbers-widen))
+         (top (not (eq start consult-line-start-from-top)))
+         (candidates (consult--slow-operation "Collecting lines..."
+                       (consult--line-candidates top curr-line))))
+    (consult--read
+     candidates
+     :prompt (if top "Go to line from top: " "Go to line: ")
+     :annotate (consult--line-prefix curr-line)
+     :category 'consult-location
+     :sort nil
+     :require-match t
+     ;; Always add last `isearch-string' to future history
+     :add-history (list (thing-at-point 'symbol) isearch-string)
+     :history '(:input consult--line-history)
+     :lookup #'consult--line-match
+     :default (car candidates)
+     ;; Add `isearch-string' as initial input if starting from Isearch
+     :initial (or initial
+                  (and isearch-mode
+                       (prog1 isearch-string (isearch-done))))
+     :state (consult--location-state candidates))))
+
+;;;;; Command: consult-line-multi
+
+(defun consult--line-multi-match (selected candidates &rest _)
+  "Lookup position of match.
+SELECTED is the currently selected candidate.
+CANDIDATES is the list of candidates."
+  (consult--line-point-placement selected candidates
+                                 (car (member selected candidates))))
+
+(defun consult--line-multi-group (cand transform)
+  "Group function used by `consult-line-multi'.
+If TRANSFORM non-nil, return transformed CAND, otherwise return title."
+  (if transform cand
+    (let* ((marker (car (get-text-property 0 'consult-location cand)))
+          (buf (if (consp marker)
+                   (car marker) ;; Handle cheap marker
+                 (marker-buffer marker))))
+      (if buf (buffer-name buf) "Dead buffer"))))
+
+(defun consult--line-multi-candidates (buffers input)
+  "Collect matching candidates from multiple buffers.
+INPUT is the user input which should be matched.
+BUFFERS is the list of buffers."
+  (pcase-let ((`(,regexps . ,hl)
+               (funcall consult--regexp-compiler
+                        input 'emacs completion-ignore-case))
+              (candidates nil)
+              (cand-idx 0))
+    (save-match-data
+      (dolist (buf buffers (nreverse candidates))
+        (with-current-buffer buf
+          (save-excursion
+            (let ((line (line-number-at-pos (point-min) consult-line-numbers-widen)))
+              (goto-char (point-min))
+              (while (and (not (eobp))
+                          (save-excursion (re-search-forward (car regexps) nil t)))
+                (cl-incf line (consult--count-lines (match-beginning 0)))
+                (let ((bol (pos-bol))
+                      (eol (pos-eol)))
+                  (goto-char bol)
+                  (when (and (not (looking-at-p "^\\s-*$"))
+                             (seq-every-p (lambda (r)
+                                            (goto-char bol)
+                                            (re-search-forward r eol t))
+                                          (cdr regexps)))
+                    (push (consult--location-candidate
+                           (funcall hl (buffer-substring-no-properties bol eol))
+                           (cons buf bol) (1- line) cand-idx)
+                          candidates)
+                    (cl-incf cand-idx))
+                  (goto-char (1+ eol)))))))))))
+
+;;;###autoload
+(defun consult-line-multi (query &optional initial)
+  "Search for a matching line in multiple buffers.
+
+By default search across all project buffers.  If the prefix
+argument QUERY is non-nil, all buffers are searched.  Optional
+INITIAL input can be provided.  The symbol at point and the last
+`isearch-string' is added to the future history.  In order to
+search a subset of buffers, QUERY can be set to a plist according
+to `consult--buffer-query'."
+  (interactive "P")
+  (unless (keywordp (car-safe query))
+    (setq query (list :sort 'alpha-current :directory (and (not query) 'project))))
+  (pcase-let* ((`(,prompt . ,buffers) (consult--buffer-query-prompt "Go to line" query))
+               (collection (consult--dynamic-collection
+                            (apply-partially #'consult--line-multi-candidates
+                                             buffers))))
+    (consult--read
+     collection
+     :prompt prompt
+     :annotate (consult--line-prefix)
+     :category 'consult-location
+     :sort nil
+     :require-match t
+     ;; Always add last Isearch string to future history
+     :add-history (mapcar #'consult--async-split-initial
+                          (delq nil (list (thing-at-point 'symbol)
+                                          isearch-string)))
+     :history '(:input consult--line-multi-history)
+     :lookup #'consult--line-multi-match
+     ;; Add `isearch-string' as initial input if starting from Isearch
+     :initial (consult--async-split-initial
+               (or initial
+                   (and isearch-mode
+                        (prog1 isearch-string (isearch-done)))))
+     :state (consult--location-state (lambda () (funcall collection nil)))
+     :group #'consult--line-multi-group)))
+
+;;;;; Command: consult-keep-lines
+
+(defun consult--keep-lines-state (filter)
+  "State function for `consult-keep-lines' with FILTER function."
+  (let ((font-lock-orig font-lock-mode)
+        (whitespace-orig (bound-and-true-p whitespace-mode))
+        (hl-line-orig (bound-and-true-p hl-line-mode))
+        (point-orig (point))
+        lines content-orig replace last-input)
+    (if (use-region-p)
+        (save-restriction
+          ;; Use the same behavior as `keep-lines'.
+          (let ((rbeg (region-beginning))
+                (rend (save-excursion
+                        (goto-char (region-end))
+                        (unless (or (bolp) (eobp))
+                          (forward-line 0))
+                        (point))))
+            (consult--fontify-region rbeg rend)
+            (narrow-to-region rbeg rend)
+            (consult--each-line beg end
+              (push (consult--buffer-substring beg end) lines))
+            (setq content-orig (buffer-string)
+                  replace (lambda (content &optional pos)
+                            (delete-region rbeg rend)
+                            (insert-before-markers content)
+                            (goto-char (or pos rbeg))
+                            (setq rend (+ rbeg (length content)))
+                            (add-face-text-property rbeg rend 'region t)))))
+      (consult--fontify-all)
+      (setq content-orig (buffer-string)
+            replace (lambda (content &optional pos)
+                      (delete-region (point-min) (point-max))
+                      (insert content)
+                      (goto-char (or pos (point-min)))))
+      (consult--each-line beg end
+        (push (consult--buffer-substring beg end) lines)))
+    (setq lines (nreverse lines))
+    (lambda (action input)
+      ;; Restoring content and point position
+      (when (and (eq action 'return) last-input)
+        ;; No undo recording, modification hooks, buffer modified-status
+        (with-silent-modifications (funcall replace content-orig point-orig)))
+      ;; Committing or new input provided -> Update
+      (when (and input ;; Input has been provided
+                 (or
+                  ;; Committing, but not with empty input
+                  (and (eq action 'return) (not (string-match-p "\\`!? ?\\'" input)))
+                  ;; Input has changed
+                  (not (equal input last-input))))
+        (let ((filtered-content
+               (if (string-match-p "\\`!? ?\\'" input)
+                   ;; Special case the empty input for performance.
+                   ;; Otherwise it could happen that the minibuffer is empty,
+                   ;; but the buffer has not been updated.
+                   content-orig
+                 (if (eq action 'return)
+                     (apply #'concat (mapcan (lambda (x) (list x "\n"))
+                                             (funcall filter input lines)))
+                   (while-no-input
+                     ;; Heavy computation is interruptible if *not* committing!
+                     ;; Allocate new string candidates since the matching function mutates!
+                     (apply #'concat (mapcan (lambda (x) (list x "\n"))
+                                             (funcall filter input (mapcar #'copy-sequence lines)))))))))
+          (when (stringp filtered-content)
+            (when font-lock-mode (font-lock-mode -1))
+            (when (bound-and-true-p whitespace-mode) (whitespace-mode -1))
+            (when (bound-and-true-p hl-line-mode) (hl-line-mode -1))
+            (if (eq action 'return)
+                (atomic-change-group
+                  ;; Disable modification hooks for performance
+                  (let ((inhibit-modification-hooks t))
+                    (funcall replace filtered-content)))
+              ;; No undo recording, modification hooks, buffer modified-status
+              (with-silent-modifications
+                (funcall replace filtered-content)
+                (setq last-input input))))))
+      ;; Restore modes
+      (when (eq action 'return)
+        (when hl-line-orig (hl-line-mode 1))
+        (when whitespace-orig (whitespace-mode 1))
+        (when font-lock-orig (font-lock-mode 1))))))
+
+;;;###autoload
+(defun consult-keep-lines (filter &optional initial)
+  "Select a subset of the lines in the current buffer with live preview.
+
+The selected lines are kept and the other lines are deleted.  When called
+interactively, the lines selected are those that match the minibuffer input.  In
+order to match the inverse of the input, prefix the input with `! '.  When
+called from Elisp, the filtering is performed by a FILTER function.  This
+command obeys narrowing.
+
+FILTER is the filter function.
+INITIAL is the initial input."
+  (interactive
+   (list (lambda (pattern cands)
+           ;; Use consult-location completion category when filtering lines
+           (consult--completion-filter-dispatch
+            pattern cands 'consult-location 'highlight))))
+  (consult--forbid-minibuffer)
+  (let ((ro buffer-read-only))
+    (unwind-protect
+        (minibuffer-with-setup-hook
+            (lambda ()
+              (when ro
+                (minibuffer-message
+                 (substitute-command-keys
+                  " [Unlocked read-only buffer. \\[minibuffer-keyboard-quit] to quit.]"))))
+          (setq buffer-read-only nil)
+          (consult--with-increased-gc
+           (consult--prompt
+            :prompt "Keep lines: "
+            :initial initial
+            :history 'consult--line-history
+            :state (consult--keep-lines-state filter))))
+      (setq buffer-read-only ro))))
+
+;;;;; Command: consult-focus-lines
+
+(defun consult--focus-lines-state (filter)
+  "State function for `consult-focus-lines' with FILTER function."
+  (let (lines overlays last-input pt-orig pt-min pt-max)
+    (save-excursion
+      (save-restriction
+        (if (not (use-region-p))
+            (consult--fontify-all)
+          (consult--fontify-region (region-beginning) (region-end))
+          (narrow-to-region
+           (region-beginning)
+           ;; Behave the same as `keep-lines'.
+           ;; Move to the next line.
+           (save-excursion
+             (goto-char (region-end))
+             (unless (or (bolp) (eobp))
+               (forward-line 0))
+             (point))))
+        (setq pt-orig (point) pt-min (point-min) pt-max (point-max))
+        (let ((i 0))
+          (consult--each-line beg end
+            ;; Use "\n" for empty lines, since we need a non-empty string to
+            ;; attach the text property to.
+            (let ((line (if (eq beg end) (char-to-string ?\n)
+                          (buffer-substring-no-properties beg end))))
+              (put-text-property 0 1 'consult--focus-line (cons (cl-incf i) beg) line)
+              (push line lines)))
+          (setq lines (nreverse lines)))))
+    (lambda (action input)
+      ;; New input provided -> Update
+      (when (and input (not (equal input last-input)))
+        (let (new-overlays)
+          (pcase (while-no-input
+                   (unless (string-match-p "\\`!? ?\\'" input) ;; Empty input.
+                     (let* ((inhibit-quit (eq action 'return)) ;; Non interruptible, when quitting!
+                            (not (string-prefix-p "! " input))
+                            (stripped (string-remove-prefix "! " input))
+                            (matches (funcall filter stripped lines))
+                            (old-ind 0)
+                            (block-beg pt-min)
+                            (block-end pt-min))
+                       (while old-ind
+                         (let ((match (pop matches)) (ind nil) (beg pt-max) (end pt-max) prop)
+                           (when match
+                             (setq prop (get-text-property 0 'consult--focus-line match)
+                                   ind (car prop)
+                                   beg (cdr prop)
+                                   ;; Check for empty lines, see above.
+                                   end (+ 1 beg (if (equal match "\n") 0 (length match)))))
+                           (unless (eq ind (1+ old-ind))
+                             (let ((a (if not block-beg block-end))
+                                   (b (if not block-end beg)))
+                               (when (/= a b)
+                                 (push (consult--make-overlay a b 'invisible t) new-overlays)))
+                             (setq block-beg beg))
+                           (setq block-end end old-ind ind)))))
+                   'commit)
+            ('commit
+             (mapc #'delete-overlay overlays)
+             (setq last-input input overlays new-overlays))
+            (_ (mapc #'delete-overlay new-overlays)))))
+      (when (eq action 'return)
+        (cond
+         ((not input)
+          (mapc #'delete-overlay overlays)
+          (goto-char pt-orig))
+         ((equal input "")
+          (consult-focus-lines nil 'show)
+          (goto-char pt-orig))
+         (t
+          ;; Successfully terminated -> Remember invisible overlays
+          (setq consult--focus-lines-overlays
+                (nconc consult--focus-lines-overlays overlays))
+          ;; move point past invisible
+          (goto-char (if-let (ov (and (invisible-p pt-orig)
+                                      (seq-find (lambda (ov) (overlay-get ov 'invisible))
+                                                (overlays-at pt-orig))))
+                         (overlay-end ov)
+                       pt-orig))))))))
+
+;;;###autoload
+(defun consult-focus-lines (filter &optional show initial)
+  "Hide or show lines using overlays.
+
+The selected lines are shown and the other lines hidden.  When called
+interactively, the lines selected are those that match the minibuffer input.  In
+order to match the inverse of the input, prefix the input with `! '.  With
+optional prefix argument SHOW reveal the hidden lines.  Alternatively the
+command can be restarted to reveal the lines.  When called from Elisp, the
+filtering is performed by a FILTER function.  This command obeys narrowing.
+
+FILTER is the filter function.
+INITIAL is the initial input."
+  (interactive
+   (list (lambda (pattern cands)
+           ;; Use consult-location completion category when filtering lines
+           (consult--completion-filter-dispatch
+            pattern cands 'consult-location nil))
+         current-prefix-arg))
+  (if show
+      (progn
+        (mapc #'delete-overlay consult--focus-lines-overlays)
+        (setq consult--focus-lines-overlays nil)
+        (message "All lines revealed"))
+    (consult--forbid-minibuffer)
+    (consult--with-increased-gc
+     (consult--prompt
+      :prompt
+      (if consult--focus-lines-overlays
+          "Focus on lines (RET to reveal): "
+        "Focus on lines: ")
+      :initial initial
+      :history 'consult--line-history
+      :state (consult--focus-lines-state filter)))))
+
+;;;;; Command: consult-goto-line
+
+(defun consult--goto-line-position (str msg)
+  "Transform input STR to line number.
+Print an error message with MSG function."
+  (save-match-data
+    (if (and str (string-match "\\`\\([[:digit:]]+\\):?\\([[:digit:]]*\\)\\'" str))
+        (let ((line (string-to-number (match-string 1 str)))
+              (col (string-to-number (match-string 2 str))))
+          (save-excursion
+            (save-restriction
+              (when consult-line-numbers-widen
+                (widen))
+              (goto-char (point-min))
+              (forward-line (1- line))
+              (goto-char (min (+ (point) col) (pos-eol)))
+              (point))))
+      (when (and str (not (equal str "")))
+        (funcall msg "Please enter a number."))
+      nil)))
+
+;;;###autoload
+(defun consult-goto-line (&optional arg)
+  "Read line number and jump to the line with preview.
+
+Enter either a line number to jump to the first column of the
+given line or line:column in order to jump to a specific column.
+Jump directly if a line number is given as prefix ARG.  The
+command respects narrowing and the settings
+`consult-goto-line-numbers' and `consult-line-numbers-widen'."
+  (interactive "P")
+  (if arg
+      (call-interactively #'goto-line)
+    (consult--forbid-minibuffer)
+    (consult--local-let ((display-line-numbers consult-goto-line-numbers)
+                         (display-line-numbers-widen consult-line-numbers-widen))
+      (while (if-let (pos (consult--goto-line-position
+                           (consult--prompt
+                            :prompt "Go to line: "
+                            :history 'goto-line-history
+                            :state
+                            (let ((preview (consult--jump-preview)))
+                              (lambda (action str)
+                                (funcall preview action
+                                         (consult--goto-line-position str #'ignore)))))
+                           #'minibuffer-message))
+                 (consult--jump pos)
+               t)))))
+
+;;;;; Command: consult-recent-file
+
+(defun consult--file-preview ()
+  "Create preview function for files."
+  (let ((open (consult--temporary-files))
+        (preview (consult--buffer-preview)))
+    (lambda (action cand)
+      (unless cand
+        (funcall open))
+      (funcall preview action
+               (and cand
+                    (eq action 'preview)
+                    (funcall open cand))))))
+
+(defun consult--file-action (file)
+  "Open FILE via `consult--buffer-action'."
+  ;; Try to preserve the buffer as is, if it has already been opened, for
+  ;; example in literal or raw mode.
+  (setq file (abbreviate-file-name (expand-file-name file)))
+  (consult--buffer-action (or (get-file-buffer file) (find-file-noselect file))))
+
+(consult--define-state file)
+
+;;;###autoload
+(defun consult-recent-file ()
+  "Find recent file using `completing-read'."
+  (interactive)
+  (find-file
+   (consult--read
+    (or
+     (mapcar #'consult--fast-abbreviate-file-name (bound-and-true-p recentf-list))
+     (user-error "No recent files, `recentf-mode' is %s"
+                 (if recentf-mode "enabled" "disabled")))
+    :prompt "Find recent file: "
+    :sort nil
+    :require-match t
+    :category 'file
+    :state (consult--file-preview)
+    :history 'file-name-history)))
+
+;;;;; Command: consult-mode-command
+
+(defun consult--mode-name (mode)
+  "Return name part of MODE."
+  (replace-regexp-in-string
+   "global-\\(.*\\)-mode" "\\1"
+   (replace-regexp-in-string
+    "\\(-global\\)?-mode\\'" ""
+    (if (eq mode 'c-mode)
+        "cc"
+      (symbol-name mode))
+    'fixedcase)
+   'fixedcase))
+
+(defun consult--mode-command-candidates (modes)
+  "Extract commands from MODES.
+
+The list of features is searched for files belonging to the modes.
+From these files, the commands are extracted."
+  (let* ((case-fold-search)
+         (buffer (current-buffer))
+         (command-filter (consult--regexp-filter (seq-filter #'stringp consult-mode-command-filter)))
+         (feature-filter (seq-filter #'symbolp consult-mode-command-filter))
+         (minor-hash (consult--string-hash minor-mode-list))
+         (minor-local-modes (seq-filter (lambda (m)
+                                          (and (gethash m minor-hash)
+                                               (local-variable-if-set-p m)))
+                                        modes))
+         (minor-global-modes (seq-filter (lambda (m)
+                                           (and (gethash m minor-hash)
+                                                (not (local-variable-if-set-p m))))
+                                         modes))
+         (major-modes (seq-remove (lambda (m)
+                                    (gethash m minor-hash))
+                                  modes))
+         (major-paths-hash (consult--string-hash (mapcar #'symbol-file major-modes)))
+         (minor-local-paths-hash (consult--string-hash (mapcar #'symbol-file minor-local-modes)))
+         (minor-global-paths-hash (consult--string-hash (mapcar #'symbol-file minor-global-modes)))
+         (major-name-regexp (regexp-opt (mapcar #'consult--mode-name major-modes)))
+         (minor-local-name-regexp (regexp-opt (mapcar #'consult--mode-name minor-local-modes)))
+         (minor-global-name-regexp (regexp-opt (mapcar #'consult--mode-name minor-global-modes)))
+         (commands))
+    (dolist (feature load-history commands)
+      (when-let (name (alist-get 'provide feature))
+        (let* ((path (car feature))
+               (file (file-name-nondirectory path))
+               (key (cond
+                     ((memq name feature-filter) nil)
+                     ((or (gethash path major-paths-hash)
+                          (string-match-p major-name-regexp file))
+                      ?m)
+                     ((or (gethash path minor-local-paths-hash)
+                          (string-match-p minor-local-name-regexp file))
+                      ?l)
+                     ((or (gethash path minor-global-paths-hash)
+                          (string-match-p minor-global-name-regexp file))
+                      ?g))))
+          (when key
+            (dolist (cmd (cdr feature))
+              (let ((sym (cdr-safe cmd)))
+                (when (and (consp cmd)
+                           (eq (car cmd) 'defun)
+                           (commandp sym)
+                           (not (get sym 'byte-obsolete-info))
+                           (or (not read-extended-command-predicate)
+                               (funcall read-extended-command-predicate sym buffer)))
+                  (let ((name (symbol-name sym)))
+                    (unless (string-match-p command-filter name)
+                      (push (propertize name
+                                        'consult--candidate sym
+                                        'consult--type key)
+                            commands))))))))))))
+
+;;;###autoload
+(defun consult-mode-command (&rest modes)
+  "Run a command from any of the given MODES.
+
+If no MODES are specified, use currently active major and minor modes."
+  (interactive)
+  (unless modes
+    (setq modes (cons major-mode
+                      (seq-filter (lambda (m)
+                                    (and (boundp m) (symbol-value m)))
+                                  minor-mode-list))))
+  (let ((narrow `((?m . ,(format "Major: %s" major-mode))
+                  (?l . "Local Minor")
+                  (?g . "Global Minor"))))
+    (command-execute
+     (consult--read
+      (consult--mode-command-candidates modes)
+      :prompt "Mode command: "
+      :predicate
+      (lambda (cand)
+        (let ((key (get-text-property 0 'consult--type cand)))
+          (if consult--narrow
+              (= key consult--narrow)
+            (/= key ?g))))
+      :lookup #'consult--lookup-candidate
+      :group (consult--type-group narrow)
+      :narrow narrow
+      :require-match t
+      :history 'extended-command-history
+      :category 'command))))
+
+;;;;; Command: consult-yank
+
+(defun consult--read-from-kill-ring ()
+  "Open kill ring menu and return selected string."
+  ;; `current-kill' updates `kill-ring' with interprogram paste, see
+  ;; gh:minad/consult#443.
+  (current-kill 0)
+  ;; Do not specify a :lookup function in order to preserve completion-styles
+  ;; highlighting of the current candidate. We have to perform a final lookup to
+  ;; obtain the original candidate which may be propertized with yank-specific
+  ;; properties, like 'yank-handler.
+  (consult--lookup-member
+   (consult--read
+    (consult--remove-dups
+     (or (if yank-from-kill-ring-rotate
+             (append kill-ring-yank-pointer
+                     (butlast kill-ring (length kill-ring-yank-pointer)))
+           kill-ring)
+         (user-error "Kill ring is empty")))
+    :prompt "Yank from kill-ring: "
+    :history t ;; disable history
+    :sort nil
+    :category 'kill-ring
+    :require-match t
+    :state
+    (consult--insertion-preview
+     (point)
+     ;; If previous command is yank, hide previously yanked string
+     (or (and (eq last-command 'yank) (mark t)) (point))))
+   kill-ring))
+
+;; Adapted from the Emacs `yank-from-kill-ring' function.
+;;;###autoload
+(defun consult-yank-from-kill-ring (string &optional arg)
+  "Select STRING from the kill ring and insert it.
+With prefix ARG, put point at beginning, and mark at end, like `yank' does.
+
+This command behaves like `yank-from-kill-ring', which also offers a
+`completing-read' interface to the `kill-ring'.  Additionally the
+Consult version supports preview of the selected string."
+  (interactive (list (consult--read-from-kill-ring) current-prefix-arg))
+  (when string
+    (setq yank-window-start (window-start))
+    (push-mark)
+    (insert-for-yank string)
+    (setq this-command 'yank)
+    (when yank-from-kill-ring-rotate
+      (if-let (pos (seq-position kill-ring string))
+          (setq kill-ring-yank-pointer (nthcdr pos kill-ring))
+        (kill-new string)))
+    (when (consp arg)
+      ;; Swap point and mark like in `yank'.
+      (goto-char (prog1 (mark t)
+                   (set-marker (mark-marker) (point) (current-buffer)))))))
+
+(put 'consult-yank-replace 'delete-selection 'yank)
+(put 'consult-yank-pop 'delete-selection 'yank)
+(put 'consult-yank-from-kill-ring 'delete-selection 'yank)
+
+;;;###autoload
+(defun consult-yank-pop (&optional arg)
+  "If there is a recent yank act like `yank-pop'.
+
+Otherwise select string from the kill ring and insert it.
+See `yank-pop' for the meaning of ARG.
+
+This command behaves like `yank-pop', which also offers a
+`completing-read' interface to the `kill-ring'.  Additionally the
+Consult version supports preview of the selected string."
+  (interactive "*p")
+  (if (eq last-command 'yank)
+      (yank-pop (or arg 1))
+    (call-interactively #'consult-yank-from-kill-ring)))
+
+;; Adapted from the Emacs yank-pop function.
+;;;###autoload
+(defun consult-yank-replace (string)
+  "Select STRING from the kill ring.
+
+If there was no recent yank, insert the string.
+Otherwise replace the just-yanked string with the selected string."
+  (interactive (list (consult--read-from-kill-ring)))
+  (when string
+    (if (not (eq last-command 'yank))
+        (consult-yank-from-kill-ring string)
+      (let ((inhibit-read-only t)
+            (pt (point))
+            (mk (mark t)))
+        (setq this-command 'yank)
+        (funcall (or yank-undo-function 'delete-region) (min pt mk) (max pt mk))
+        (setq yank-undo-function nil)
+        (set-marker (mark-marker) pt (current-buffer))
+        (insert-for-yank string)
+        (set-window-start (selected-window) yank-window-start t)
+        (if (< pt mk)
+            (goto-char (prog1 (mark t)
+                         (set-marker (mark-marker) (point) (current-buffer)))))))))
+
+;;;;; Command: consult-bookmark
+
+(defun consult--bookmark-preview ()
+  "Create preview function for bookmarks."
+  (let ((preview (consult--jump-preview))
+        (open (consult--temporary-files)))
+    (lambda (action cand)
+      (unless cand
+        (funcall open))
+      (funcall
+       preview action
+       ;; Only preview bookmarks with the default handler.
+       (when-let ((bm (and cand (eq action 'preview) (assoc cand bookmark-alist)))
+                  (handler (or (bookmark-get-handler bm) #'bookmark-default-handler))
+                  ((eq handler #'bookmark-default-handler))
+                  (file (bookmark-get-filename bm))
+                  (pos (bookmark-get-position bm))
+                  (buf (funcall open file)))
+         (set-marker (make-marker) pos buf))))))
+
+(defun consult--bookmark-action (bm)
+  "Open BM via `consult--buffer-action'."
+  (bookmark-jump bm consult--buffer-display))
+
+(consult--define-state bookmark)
+
+(defun consult--bookmark-candidates ()
+  "Return bookmark candidates."
+  (bookmark-maybe-load-default-file)
+  (let ((narrow (cl-loop for (y _ . xs) in consult-bookmark-narrow nconc
+                         (cl-loop for x in xs collect (cons x y)))))
+    (cl-loop for bm in bookmark-alist collect
+             (propertize (car bm)
+                         'consult--type
+                         (alist-get
+                          (or (bookmark-get-handler bm) #'bookmark-default-handler)
+                          narrow)))))
+
+;;;###autoload
+(defun consult-bookmark (name)
+  "If bookmark NAME exists, open it, otherwise create a new bookmark with NAME.
+
+The command supports preview of file bookmarks and narrowing.  See the
+variable `consult-bookmark-narrow' for the narrowing configuration."
+  (interactive
+   (list
+    (let ((narrow (cl-loop for (x y . _) in consult-bookmark-narrow collect (cons x y))))
+      (consult--read
+       (consult--bookmark-candidates)
+       :prompt "Bookmark: "
+       :state (consult--bookmark-preview)
+       :category 'bookmark
+       :history 'bookmark-history
+       ;; Add default names to future history.
+       ;; Ignore errors such that `consult-bookmark' can be used in
+       ;; buffers which are not backed by a file.
+       :add-history (ignore-errors (bookmark-prop-get (bookmark-make-record) 'defaults))
+       :group (consult--type-group narrow)
+       :narrow (consult--type-narrow narrow)))))
+  (bookmark-maybe-load-default-file)
+  (if (assoc name bookmark-alist)
+      (bookmark-jump name)
+    (bookmark-set name)))
+
+;;;;; Command: consult-complex-command
+
+;;;###autoload
+(defun consult-complex-command ()
+  "Select and evaluate command from the command history.
+
+This command can act as a drop-in replacement for `repeat-complex-command'."
+  (interactive)
+  (let* ((history (or (delete-dups (mapcar #'prin1-to-string command-history))
+                      (user-error "There are no previous complex commands")))
+         (cmd (read (consult--read
+                     history
+                     :prompt "Command: "
+                     :default (car history)
+                     :sort nil
+                     :history t ;; disable history
+                     :category 'expression))))
+    ;; Taken from `repeat-complex-command'
+    (add-to-history 'command-history cmd)
+    (apply #'funcall-interactively
+           (car cmd)
+           (mapcar (lambda (e) (eval e t)) (cdr cmd)))))
+
+;;;;; Command: consult-history
+
+(declare-function ring-elements "ring")
+
+(defun consult--current-history ()
+  "Return the history and index variable relevant to the current buffer.
+If the minibuffer is active, the minibuffer history is returned,
+otherwise the history corresponding to the mode.  There is a
+special case for `repeat-complex-command', for which the command
+history is used."
+  (cond
+   ;; In the minibuffer we use the current minibuffer history,
+   ;; which can be configured by setting `minibuffer-history-variable'.
+   ((minibufferp)
+    (when (eq minibuffer-history-variable t)
+      (user-error "Minibuffer history is disabled for `%s'" this-command))
+    (list (mapcar #'consult--tofu-hide
+                  (if (eq minibuffer-history-variable 'command-history)
+                      ;; If pressing "C-x M-:", i.e., `repeat-complex-command',
+                      ;; we are instead querying the `command-history' and get a
+                      ;; full s-expression.  Alternatively you might want to use
+                      ;; `consult-complex-command', which can also be bound to
+                      ;; "C-x M-:"!
+                      (mapcar #'prin1-to-string command-history)
+                    (symbol-value minibuffer-history-variable)))))
+   ;; Otherwise we use a mode-specific history, see `consult-mode-histories'.
+   (t (let ((found (seq-find (lambda (h)
+                               (and (derived-mode-p (car h))
+                                    (boundp (if (consp (cdr h)) (cadr h) (cdr h)))))
+                             consult-mode-histories)))
+        (unless found
+          (user-error "No history configured for `%s', see `consult-mode-histories'"
+                      major-mode))
+        (cons (symbol-value (cadr found)) (cddr found))))))
+
+;;;###autoload
+(defun consult-history (&optional history index bol)
+  "Insert string from HISTORY of current buffer.
+In order to select from a specific HISTORY, pass the history
+variable as argument.  INDEX is the name of the index variable to
+update, if any.  BOL is the function which jumps to the beginning
+of the prompt.  See also `cape-history' from the Cape package."
+  (interactive)
+  (pcase-let* ((`(,history ,index ,bol) (if history
+                                            (list history index bol)
+                                          (consult--current-history)))
+               (history (if (ring-p history) (ring-elements history) history))
+               (`(,beg . ,end)
+                (if (minibufferp)
+                    (cons (minibuffer-prompt-end) (point-max))
+                  (if bol
+                      (save-excursion
+                        (funcall bol)
+                        (cons (point) (pos-eol)))
+                    (cons (point) (point)))))
+               (str (consult--local-let ((enable-recursive-minibuffers t))
+                      (consult--read
+                       (or (consult--remove-dups history)
+                           (user-error "History is empty"))
+                       :prompt "History: "
+                       :history t ;; disable history
+                       :category ;; Report category depending on history variable
+                       (and (minibufferp)
+                            (pcase minibuffer-history-variable
+                              ('extended-command-history 'command)
+                              ('buffer-name-history 'buffer)
+                              ('face-name-history 'face)
+                              ('read-envvar-name-history 'environment-variable)
+                              ('bookmark-history 'bookmark)
+                              ('file-name-history 'file)))
+                       :sort nil
+                       :initial (buffer-substring-no-properties beg end)
+                       :state (consult--insertion-preview beg end)))))
+    (delete-region beg end)
+    (when index
+      (set index (seq-position history str)))
+    (insert (substring-no-properties str))))
+
+;;;;; Command: consult-isearch-history
+
+(defun consult-isearch-forward (&optional reverse)
+  "Continue Isearch forward optionally in REVERSE."
+  (declare (completion ignore))
+  (interactive)
+  (consult--require-minibuffer)
+  (setq isearch-new-forward (not reverse) isearch-new-nonincremental nil)
+  (funcall (or (command-remapping #'exit-minibuffer) #'exit-minibuffer)))
+
+(defun consult-isearch-backward (&optional reverse)
+  "Continue Isearch backward optionally in REVERSE."
+  (declare (completion ignore))
+  (interactive)
+  (consult-isearch-forward (not reverse)))
+
+(defvar-keymap consult-isearch-history-map
+  :doc "Additional keymap used by `consult-isearch-history'."
+  "<remap> <isearch-forward>" #'consult-isearch-forward
+  "<remap> <isearch-backward>" #'consult-isearch-backward)
+
+(defun consult--isearch-history-candidates ()
+  "Return Isearch history candidates."
+  ;; Do not throw an error on empty history, in order to allow starting a
+  ;; search.  We do not :require-match here.
+  (let ((history (if (eq t search-default-mode)
+                     (append regexp-search-ring search-ring)
+                   (append search-ring regexp-search-ring))))
+    (delete-dups
+     (mapcar
+      (lambda (cand)
+        ;; The search type can be distinguished via text properties.
+        (let* ((props (plist-member (text-properties-at 0 cand)
+                                    'isearch-regexp-function))
+               (type (pcase (cadr props)
+                       ((and 'nil (guard (not props))) ?r)
+                       ('nil                           ?l)
+                       ('word-search-regexp            ?w)
+                       ('isearch-symbol-regexp         ?s)
+                       ('char-fold-to-regexp           ?c)
+                       (_                              ?u))))
+          ;; Disambiguate history items.  The same string could
+          ;; occur with different search types.
+          (consult--tofu-append cand type)))
+      history))))
+
+(defconst consult--isearch-history-narrow
+  '((?c . "Char")
+    (?u . "Custom")
+    (?l . "Literal")
+    (?r . "Regexp")
+    (?s . "Symbol")
+    (?w . "Word")))
+
+;;;###autoload
+(defun consult-isearch-history ()
+  "Read a search string with completion from the Isearch history.
+
+This replaces the current search string if Isearch is active, and
+starts a new Isearch session otherwise."
+  (interactive)
+  (consult--forbid-minibuffer)
+  (let* ((isearch-message-function #'ignore)
+         (cursor-in-echo-area t) ;; Avoid cursor flickering
+         (candidates (consult--isearch-history-candidates)))
+    (unless isearch-mode (isearch-mode t))
+    (with-isearch-suspended
+     (setq isearch-new-string
+           (consult--read
+            candidates
+            :prompt "I-search: "
+            :category 'consult-isearch-history
+            :history t ;; disable history
+            :sort nil
+            :initial isearch-string
+            :keymap consult-isearch-history-map
+            :annotate
+            (lambda (cand)
+              (consult--annotate-align
+               cand
+               (alist-get (consult--tofu-get cand) consult--isearch-history-narrow)))
+            :group
+            (lambda (cand transform)
+              (if transform
+                  cand
+                (alist-get (consult--tofu-get cand) consult--isearch-history-narrow)))
+            :lookup
+            (lambda (selected candidates &rest _)
+              (if-let (found (member selected candidates))
+                  (substring (car found) 0 -1)
+                selected))
+            :state
+            (lambda (action cand)
+              (when (and (eq action 'preview) cand)
+                (setq isearch-string cand)
+                (isearch-update-from-string-properties cand)
+                (isearch-update)))
+            :narrow
+            (list :predicate
+                  (lambda (cand) (= (consult--tofu-get cand) consult--narrow))
+                  :keys consult--isearch-history-narrow))
+           isearch-new-message
+           (mapconcat 'isearch-text-char-description isearch-new-string "")))
+    ;; Setting `isearch-regexp' etc only works outside of `with-isearch-suspended'.
+    (unless (plist-member (text-properties-at 0 isearch-string) 'isearch-regexp-function)
+      (setq isearch-regexp t
+            isearch-regexp-function nil))))
+
+;;;;; Command: consult-minor-mode-menu
+
+(defun consult--minor-mode-candidates ()
+  "Return list of minor-mode candidate strings."
+  (mapcar
+   (pcase-lambda (`(,name . ,sym))
+     (propertize
+      name
+      'consult--candidate sym
+      'consult--minor-mode-narrow
+      (logior
+       (ash (if (local-variable-if-set-p sym) ?l ?g) 8)
+       (if (and (boundp sym) (symbol-value sym)) ?i ?o))
+      'consult--minor-mode-group
+      (concat
+       (if (local-variable-if-set-p sym) "Local " "Global ")
+       (if (and (boundp sym) (symbol-value sym)) "On" "Off"))))
+   (nconc
+    ;; according to describe-minor-mode-completion-table-for-symbol
+    ;; the minor-mode-list contains *all* minor modes
+    (mapcar (lambda (sym) (cons (symbol-name sym) sym)) minor-mode-list)
+    ;; take the lighters from minor-mode-alist
+    (delq nil
+          (mapcar (pcase-lambda (`(,sym ,lighter))
+                    (when (and lighter (not (equal "" lighter)))
+                      (let (message-log-max)
+                        (setq lighter (string-trim (format-mode-line lighter)))
+                        (unless (string-blank-p lighter)
+                          (cons lighter sym)))))
+                  minor-mode-alist)))))
+
+(defconst consult--minor-mode-menu-narrow
+  '((?l . "Local")
+    (?g . "Global")
+    (?i . "On")
+    (?o . "Off")))
+
+;;;###autoload
+(defun consult-minor-mode-menu ()
+  "Enable or disable minor mode.
+
+This is an alternative to `minor-mode-menu-from-indicator'."
+  (interactive)
+  (call-interactively
+   (consult--read
+    (consult--minor-mode-candidates)
+    :prompt "Minor mode: "
+    :require-match t
+    :category 'minor-mode
+    :group
+    (lambda (cand transform)
+      (if transform cand (get-text-property 0 'consult--minor-mode-group cand)))
+    :narrow
+    (list :predicate
+          (lambda (cand)
+            (let ((narrow (get-text-property 0 'consult--minor-mode-narrow cand)))
+              (or (= (logand narrow 255) consult--narrow)
+                  (= (ash narrow -8) consult--narrow))))
+          :keys
+          consult--minor-mode-menu-narrow)
+    :lookup #'consult--lookup-candidate
+    :history 'consult--minor-mode-menu-history)))
+
+;;;;; Command: consult-theme
+
+;;;###autoload
+(defun consult-theme (theme)
+  "Disable current themes and enable THEME from `consult-themes'.
+
+The command supports previewing the currently selected theme."
+  (interactive
+   (list
+    (let* ((regexp (consult--regexp-filter
+                    (mapcar (lambda (x) (if (stringp x) x (format "\\`%s\\'" x)))
+                            consult-themes)))
+           (avail-themes (seq-filter
+                          (lambda (x) (string-match-p regexp (symbol-name x)))
+                          (cons 'default (custom-available-themes))))
+           (saved-theme (car custom-enabled-themes)))
+      (consult--read
+       (mapcar #'symbol-name avail-themes)
+       :prompt "Theme: "
+       :require-match t
+       :category 'theme
+       :history 'consult--theme-history
+       :lookup (lambda (selected &rest _)
+                 (setq selected (and selected (intern-soft selected)))
+                 (or (and selected (car (memq selected avail-themes)))
+                     saved-theme))
+       :state (lambda (action theme)
+                (pcase action
+                  ('return (consult-theme (or theme saved-theme)))
+                  ((and 'preview (guard theme)) (consult-theme theme))))
+       :default (symbol-name (or saved-theme 'default))))))
+  (when (eq theme 'default) (setq theme nil))
+  (unless (eq theme (car custom-enabled-themes))
+    (mapc #'disable-theme custom-enabled-themes)
+    (when theme
+      (if (custom-theme-p theme)
+          (enable-theme theme)
+        (load-theme theme :no-confirm)))))
+
+;;;;; Command: consult-buffer
+
+(defun consult--buffer-sort-alpha (buffers)
+  "Sort BUFFERS alphabetically, put starred buffers at the end."
+  (sort buffers
+        (lambda (x y)
+          (setq x (buffer-name x) y (buffer-name y))
+          (let ((a (and (length> x 0) (eq (aref x 0) ?*)))
+                (b (and (length> y 0) (eq (aref y 0) ?*))))
+            (if (eq a b)
+                (string< x y)
+              (not a))))))
+
+(defun consult--buffer-sort-alpha-current (buffers)
+  "Sort BUFFERS alphabetically, put current at the beginning."
+  (let ((buffers (consult--buffer-sort-alpha buffers))
+        (current (current-buffer)))
+    (if (memq current buffers)
+        (cons current (delq current buffers))
+      buffers)))
+
+(defun consult--buffer-sort-visibility (buffers)
+  "Sort BUFFERS by visibility."
+  (let ((hidden)
+        (current (car (memq (current-buffer) buffers))))
+    (consult--keep! buffers
+      (unless (eq it current)
+        (if (get-buffer-window it 'visible)
+            it
+          (push it hidden)
+          nil)))
+    (nconc (nreverse hidden) buffers (and current (list current)))))
+
+(defun consult--normalize-directory (dir)
+  "Normalize directory DIR.
+DIR can be project, nil or a path."
+  (cond
+   ((eq dir 'project) (consult--project-root))
+   (dir (expand-file-name dir))))
+
+(defun consult--buffer-query-prompt (prompt query)
+  "Return a list of buffers and create an appropriate prompt string.
+Return a pair of a prompt string and a list of buffers.  PROMPT
+is the prefix of the prompt string.  QUERY specifies the buffers
+to search and is passed to `consult--buffer-query'."
+  (let* ((dir (plist-get query :directory))
+         (ndir (consult--normalize-directory dir))
+         (buffers (apply #'consult--buffer-query :directory ndir query))
+         (count (length buffers)))
+    (cons (format "%s (%d buffer%s%s): " prompt count
+                  (if (= count 1) "" "s")
+                  (cond
+                   ((and ndir (eq dir 'project))
+                    (format ", Project %s" (consult--project-name ndir)))
+                   (ndir (concat  ", " (consult--left-truncate-file ndir)))
+                   (t "")))
+          buffers)))
+
+(cl-defun consult--buffer-query (&key sort directory mode as predicate (filter t)
+                                      include (exclude consult-buffer-filter)
+                                      (buffer-list t))
+  "Query for a list of matching buffers.
+The function supports filtering by various criteria which are
+used throughout Consult.  In particular it is the backbone of
+most `consult-buffer-sources'.
+DIRECTORY can either be the symbol project or a file name.
+SORT can be visibility, alpha or nil.
+FILTER can be either t, nil or invert.
+EXCLUDE is a list of regexps.
+INCLUDE is a list of regexps.
+MODE can be a mode or a list of modes to restrict the returned buffers.
+PREDICATE is a predicate function.
+BUFFER-LIST is the unfiltered list of buffers.
+AS is a conversion function."
+  (let ((root (consult--normalize-directory directory)))
+    (setq buffer-list (if (eq buffer-list t) (buffer-list) (copy-sequence buffer-list)))
+    (when sort
+      (setq buffer-list (funcall (intern (format "consult--buffer-sort-%s" sort)) buffer-list)))
+    (when (or filter mode as root)
+      (let ((exclude-re (consult--regexp-filter exclude))
+            (include-re (consult--regexp-filter include))
+            (case-fold-search))
+        (consult--keep! buffer-list
+          (and
+           (or (not mode)
+               (let ((mm (buffer-local-value 'major-mode it)))
+                 (if (consp mode)
+                     (seq-some (lambda (m) (provided-mode-derived-p mm m)) mode)
+                   (provided-mode-derived-p mm mode))))
+           (pcase-exhaustive filter
+             ('nil t)
+             ((or 't 'invert)
+              (eq (eq filter t)
+                  (and
+                   (or (not exclude)
+                       (not (string-match-p exclude-re (buffer-name it))))
+                   (or (not include)
+                       (not (not (string-match-p include-re (buffer-name it)))))))))
+           (or (not root)
+               (when-let (dir (buffer-local-value 'default-directory it))
+                 (string-prefix-p root
+                                  (if (and (/= 0 (length dir)) (eq (aref dir 0) ?/))
+                                      dir
+                                    (expand-file-name dir)))))
+           (or (not predicate) (funcall predicate it))
+           (if as (funcall as it) it)))))
+    buffer-list))
+
+(defun consult--buffer-file-hash ()
+  "Return hash table of all buffer file names."
+  (consult--string-hash (consult--buffer-query :as #'buffer-file-name)))
+
+(defun consult--buffer-pair (buffer)
+  "Return a pair of name of BUFFER and BUFFER."
+  (cons (buffer-name buffer) buffer))
+
+(defun consult--buffer-preview ()
+  "Buffer preview function."
+  (let ((orig-buf (window-buffer (consult--original-window)))
+        (orig-prev (copy-sequence (window-prev-buffers)))
+        (orig-next (copy-sequence (window-next-buffers)))
+        other-win)
+    (lambda (action cand)
+      (pcase action
+        ('exit
+         (set-window-prev-buffers other-win orig-prev)
+         (set-window-next-buffers other-win orig-next))
+        ('preview
+         (when (and (eq consult--buffer-display #'switch-to-buffer-other-window)
+                    (not other-win))
+           (switch-to-buffer-other-window orig-buf 'norecord)
+           (setq other-win (selected-window)))
+         (let ((win (or other-win (selected-window)))
+               (buf (or (and cand (get-buffer cand)) orig-buf)))
+           (when (and (window-live-p win) (buffer-live-p buf)
+                      (not (buffer-match-p consult-preview-excluded-buffers buf)))
+             (with-selected-window win
+               (unless (or orig-prev orig-next)
+                 (setq orig-prev (copy-sequence (window-prev-buffers))
+                       orig-next (copy-sequence (window-next-buffers))))
+               (switch-to-buffer buf 'norecord)))))))))
+
+(defun consult--buffer-action (buffer &optional norecord)
+  "Switch to BUFFER via `consult--buffer-display' function.
+If NORECORD is non-nil, do not record the buffer switch in the buffer list."
+  (funcall consult--buffer-display buffer norecord))
+
+(consult--define-state buffer)
+
+(defvar consult--source-bookmark
+  `(:name     "Bookmark"
+    :narrow   ?m
+    :category bookmark
+    :face     consult-bookmark
+    :history  bookmark-history
+    :items    ,#'bookmark-all-names
+    :state    ,#'consult--bookmark-state)
+  "Bookmark candidate source for `consult-buffer'.")
+
+(defvar consult--source-project-buffer
+  `(:name     "Project Buffer"
+    :narrow   ?b
+    :category buffer
+    :face     consult-buffer
+    :history  buffer-name-history
+    :state    ,#'consult--buffer-state
+    :enabled  ,(lambda () consult-project-function)
+    :items
+    ,(lambda ()
+       (when-let (root (consult--project-root))
+         (consult--buffer-query :sort 'visibility
+                                :directory root
+                                :as #'consult--buffer-pair))))
+  "Project buffer candidate source for `consult-buffer'.")
+
+(defvar consult--source-project-recent-file
+  `(:name     "Project File"
+    :narrow   ?f
+    :category file
+    :face     consult-file
+    :history  file-name-history
+    :state    ,#'consult--file-state
+    :new
+    ,(lambda (file)
+       (consult--file-action
+        (expand-file-name file (consult--project-root))))
+    :enabled
+    ,(lambda ()
+       (and consult-project-function
+            recentf-mode))
+    :items
+    ,(lambda ()
+       (when-let (root (consult--project-root))
+         (let ((len (length root))
+               (ht (consult--buffer-file-hash))
+               items)
+           (dolist (file (bound-and-true-p recentf-list) (nreverse items))
+             ;; Emacs 29 abbreviates file paths by default, see
+             ;; `recentf-filename-handlers'.  I recommend to set
+             ;; `recentf-filename-handlers' to nil to avoid any slow down.
+             (unless (eq (aref file 0) ?/)
+               (let (file-name-handler-alist) ;; No Tramp slowdown please.
+                 (setq file (expand-file-name file))))
+             (when (and (not (gethash file ht)) (string-prefix-p root file))
+               (let ((part (substring file len)))
+                 (when (equal part "") (setq part "./"))
+                 (put-text-property 0 1 'multi-category `(file . ,file) part)
+                 (push part items))))))))
+  "Project file candidate source for `consult-buffer'.")
+
+(defvar consult--source-project-buffer-hidden
+  `(:hidden t :narrow (?p . "Project") ,@consult--source-project-buffer)
+  "Like `consult--source-project-buffer' but hidden by default.")
+
+(defvar consult--source-project-recent-file-hidden
+  `(:hidden t :narrow (?p . "Project") ,@consult--source-project-recent-file)
+  "Like `consult--source-project-recent-file' but hidden by default.")
+
+(defvar consult--source-hidden-buffer
+  `(:name     "Hidden Buffer"
+    :narrow   ?\s
+    :hidden   t
+    :category buffer
+    :face     consult-buffer
+    :history  buffer-name-history
+    :action   ,#'consult--buffer-action
+    :items
+    ,(lambda () (consult--buffer-query :sort 'visibility
+                                       :filter 'invert
+                                       :as #'consult--buffer-pair)))
+  "Hidden buffer candidate source for `consult-buffer'.")
+
+(defvar consult--source-modified-buffer
+  `(:name     "Modified Buffer"
+    :narrow   ?*
+    :hidden   t
+    :category buffer
+    :face     consult-buffer
+    :history  buffer-name-history
+    :state    ,#'consult--buffer-state
+    :items
+    ,(lambda () (consult--buffer-query :sort 'visibility
+                                       :as #'consult--buffer-pair
+                                       :predicate
+                                       (lambda (buf)
+                                         (and (buffer-modified-p buf)
+                                              (buffer-file-name buf))))))
+  "Modified buffer candidate source for `consult-buffer'.")
+
+(defvar consult--source-buffer
+  `(:name     "Buffer"
+    :narrow   ?b
+    :category buffer
+    :face     consult-buffer
+    :history  buffer-name-history
+    :state    ,#'consult--buffer-state
+    :default  t
+    :items
+    ,(lambda () (consult--buffer-query :sort 'visibility
+                                       :as #'consult--buffer-pair)))
+  "Buffer candidate source for `consult-buffer'.")
+
+(defun consult--file-register-p (reg)
+  "Return non-nil if REG is a file register."
+  (memq (car-safe (cdr reg)) '(file-query file)))
+
+(autoload 'consult-register--candidates "consult-register")
+(defvar consult--source-file-register
+  `(:name     "File Register"
+    :narrow   (?r . "Register")
+    :category file
+    :state    ,#'consult--file-state
+    :enabled  ,(lambda () (seq-some #'consult--file-register-p register-alist))
+    :items    ,(lambda () (consult-register--candidates #'consult--file-register-p)))
+  "File register source.")
+
+(defvar consult--source-recent-file
+  `(:name     "File"
+    :narrow   ?f
+    :category file
+    :face     consult-file
+    :history  file-name-history
+    :state    ,#'consult--file-state
+    :new      ,#'consult--file-action
+    :enabled  ,(lambda () recentf-mode)
+    :items
+    ,(lambda ()
+       (let ((ht (consult--buffer-file-hash))
+             items)
+         (dolist (file (bound-and-true-p recentf-list) (nreverse items))
+           ;; Emacs 29 abbreviates file paths by default, see
+           ;; `recentf-filename-handlers'.  I recommend to set
+           ;; `recentf-filename-handlers' to nil to avoid any slow down.
+           (unless (eq (aref file 0) ?/)
+             (let (file-name-handler-alist) ;; No Tramp slowdown please.
+               (setq file (expand-file-name file))))
+           (unless (gethash file ht)
+             (push (consult--fast-abbreviate-file-name file) items))))))
+  "Recent file candidate source for `consult-buffer'.")
+
+;;;###autoload
+(defun consult-buffer (&optional sources)
+  "Enhanced `switch-to-buffer' command with support for virtual buffers.
+
+The command supports recent files, bookmarks, views and project files as
+virtual buffers.  Buffers are previewed.  Narrowing to buffers (b), files (f),
+bookmarks (m) and project files (p) is supported via the corresponding
+keys.  In order to determine the project-specific files and buffers, the
+`consult-project-function' is used.  The virtual buffer SOURCES
+default to `consult-buffer-sources'.  See `consult--multi' for the
+configuration of the virtual buffer sources."
+  (interactive)
+  (let ((selected (consult--multi (or sources consult-buffer-sources)
+                                  :require-match
+                                  (confirm-nonexistent-file-or-buffer)
+                                  :prompt "Switch to: "
+                                  :history 'consult--buffer-history
+                                  :sort nil)))
+    ;; For non-matching candidates, fall back to buffer creation.
+    (unless (plist-get (cdr selected) :match)
+      (consult--buffer-action (car selected)))))
+
+(defmacro consult--with-project (&rest body)
+  "Ensure that BODY is executed with a project root."
+  ;; We have to work quite hard here to ensure that the project root is
+  ;; only overridden at the current recursion level.  When entering a
+  ;; recursive minibuffer session, we should be able to still switch the
+  ;; project.  But who does that? Working on the first level on project A
+  ;; and on the second level on project B and on the third level on project C?
+  ;; You mustn't be afraid to dream a little bigger, darling.
+  `(let ((consult-project-function
+          (let ((root (or (consult--project-root t) (user-error "No project found")))
+                (depth (recursion-depth))
+                (orig consult-project-function))
+            (lambda (may-prompt)
+              (if (= depth (recursion-depth))
+                  root
+                (funcall orig may-prompt))))))
+     ,@body))
+
+;;;###autoload
+(defun consult-project-buffer ()
+  "Enhanced `project-switch-to-buffer' command with support for virtual buffers.
+The command may prompt you for a project directory if it is invoked from
+outside a project.  See `consult-buffer' for more details."
+  (interactive)
+  (consult--with-project
+   (consult-buffer consult-project-buffer-sources)))
+
+;;;###autoload
+(defun consult-buffer-other-window ()
+  "Variant of `consult-buffer', switching to a buffer in another window."
+  (interactive)
+  (let ((consult--buffer-display #'switch-to-buffer-other-window))
+    (consult-buffer)))
+
+;;;###autoload
+(defun consult-buffer-other-frame ()
+  "Variant of `consult-buffer', switching to a buffer in another frame."
+  (interactive)
+  (let ((consult--buffer-display #'switch-to-buffer-other-frame))
+    (consult-buffer)))
+
+;;;###autoload
+(defun consult-buffer-other-tab ()
+  "Variant of `consult-buffer', switching to a buffer in another tab."
+  (interactive)
+  (let ((consult--buffer-display #'switch-to-buffer-other-tab))
+    (consult-buffer)))
+
+;;;;; Command: consult-grep
+
+(defun consult--grep-format (async builder)
+  "Return ASYNC function highlighting grep match results.
+BUILDER is the command line builder function."
+  (let (highlight)
+    (lambda (action)
+      (cond
+       ((stringp action)
+        (setq highlight (cdr (funcall builder action)))
+        (funcall async action))
+       ((consp action)
+        (let ((file "") (file-len 0) result)
+          (save-match-data
+            (dolist (str action)
+              (when (and (string-match consult--grep-match-regexp str)
+                         ;; Filter out empty context lines
+                         (or (/= (aref str (match-beginning 3)) ?-)
+                             (/= (match-end 0) (length str))))
+                ;; We share the file name across candidates to reduce
+                ;; the amount of allocated memory.
+                (unless (and (= file-len (- (match-end 1) (match-beginning 1)))
+                             (eq t (compare-strings
+                                    file 0 file-len
+                                    str (match-beginning 1) (match-end 1) nil)))
+                  (setq file (match-string 1 str)
+                        file-len (length file)))
+                (let* ((line (match-string 2 str))
+                       (ctx (= (aref str (match-beginning 3)) ?-))
+                       (sep (if ctx "-" ":"))
+                       (content (substring str (match-end 0)))
+                       (line-len (length line)))
+                  (when (and consult-grep-max-columns
+                             (length> content consult-grep-max-columns))
+                    (setq content (substring content 0 consult-grep-max-columns)))
+                  (when highlight
+                    (funcall highlight content))
+                  (setq str (concat file sep line sep content))
+                  ;; Store file name in order to avoid allocations in `consult--prefix-group'
+                  (add-text-properties 0 file-len `(face consult-file consult--prefix-group ,file) str)
+                  (put-text-property (1+ file-len) (+ 1 file-len line-len) 'face 'consult-line-number str)
+                  (when ctx
+                    (add-face-text-property (+ 2 file-len line-len) (length str) 'consult-grep-context 'append str))
+                  (push str result)))))
+          (funcall async (nreverse result))))
+       (t (funcall async action))))))
+
+(defun consult--grep-position (cand &optional find-file)
+  "Return the grep position marker for CAND.
+FIND-FILE is the file open function, defaulting to `find-file-noselect'."
+  (when cand
+    (let* ((file-end (next-single-property-change 0 'face cand))
+           (line-end (next-single-property-change (1+ file-end) 'face cand))
+           (matches (consult--point-placement cand (1+ line-end) 'consult-grep-context))
+           (file (substring-no-properties cand 0 file-end))
+           (line (string-to-number (substring-no-properties cand (+ 1 file-end) line-end))))
+      (when-let (pos (consult--marker-from-line-column
+                      (funcall (or find-file #'consult--file-action) file)
+                      line (or (car matches) 0)))
+        (cons pos (cdr matches))))))
+
+(defun consult--grep-state ()
+  "Grep state function."
+  (let ((open (consult--temporary-files))
+        (jump (consult--jump-state)))
+    (lambda (action cand)
+      (unless cand
+        (funcall open))
+      (funcall jump action (consult--grep-position
+                            cand
+                            (and (not (eq action 'return)) open))))))
+
+(defun consult--grep-exclude-args ()
+  "Produce grep exclude arguments.
+Take the variables `grep-find-ignored-directories' and
+`grep-find-ignored-files' into account."
+  (unless (boundp 'grep-find-ignored-files) (require 'grep))
+  (nconc (mapcar (lambda (s) (concat "--exclude=" s))
+                 (bound-and-true-p grep-find-ignored-files))
+         (mapcar (lambda (s) (concat "--exclude-dir=" s))
+                 (bound-and-true-p grep-find-ignored-directories))))
+
+(defun consult--grep (prompt make-builder dir initial)
+  "Run asynchronous grep.
+
+MAKE-BUILDER is the function that returns the command line
+builder function.  DIR is a directory or a list of file or
+directories.  PROMPT is the prompt string.  INITIAL is initial
+input."
+  (pcase-let* ((`(,prompt ,paths ,dir) (consult--directory-prompt prompt dir))
+               (default-directory dir)
+               (builder (funcall make-builder paths)))
+    (consult--read
+     (consult--async-command builder
+       (consult--grep-format builder)
+       :file-handler t) ;; allow tramp
+     :prompt prompt
+     :lookup #'consult--lookup-member
+     :state (consult--grep-state)
+     :initial (consult--async-split-initial initial)
+     :add-history (consult--async-split-thingatpt 'symbol)
+     :require-match t
+     :category 'consult-grep
+     :group #'consult--prefix-group
+     :history '(:input consult--grep-history)
+     :sort nil)))
+
+(defun consult--grep-lookahead-p (&rest cmd)
+  "Return t if grep CMD supports look-ahead."
+  (eq 0 (process-file-shell-command
+         (concat "echo xaxbx | "
+                 (mapconcat #'shell-quote-argument `(,@cmd "^(?=.*b)(?=.*a)") " ")))))
+
+(defun consult--grep-make-builder (paths)
+  "Build grep command line and grep across PATHS."
+  (let* ((cmd (consult--build-args consult-grep-args))
+         (type (if (consult--grep-lookahead-p (car cmd) "-P") 'pcre 'extended)))
+    (lambda (input)
+      (pcase-let* ((`(,arg . ,opts) (consult--command-split input))
+                   (flags (append cmd opts))
+                   (ignore-case (or (member "-i" flags) (member "--ignore-case" flags))))
+        (if (or (member "-F" flags) (member "--fixed-strings" flags))
+            (cons (append cmd (list "-e" arg) opts paths)
+                  (apply-partially #'consult--highlight-regexps
+                                   (list (regexp-quote arg)) ignore-case))
+          (pcase-let ((`(,re . ,hl) (funcall consult--regexp-compiler arg type ignore-case)))
+            (when re
+              (cons (append cmd
+                            (list (if (eq type 'pcre) "-P" "-E") ;; perl or extended
+                                  "-e" (consult--join-regexps re type))
+                            opts paths)
+                    hl))))))))
+
+;;;###autoload
+(defun consult-grep (&optional dir initial)
+  "Search with `grep' for files in DIR where the content matches a regexp.
+
+The initial input is given by the INITIAL argument.  DIR can be nil, a
+directory string or a list of file/directory paths.  If `consult-grep'
+is called interactively with a prefix argument, the user can specify the
+directories or files to search in.  Multiple directories or files must
+be separated by comma in the minibuffer, since they are read via
+`completing-read-multiple'.  By default the project directory is used if
+`consult-project-function' is defined and returns non-nil.  Otherwise
+the `default-directory' is searched.  If the command is invoked with a
+double prefix argument (twice `C-u') the user is asked for a project, if
+not yet inside a project, or the current project is searched.
+
+The input string is split, the first part of the string (grep input) is
+passed to the asynchronous grep process and the second part of the
+string is passed to the completion-style filtering.
+
+The input string is split at a punctuation character, which is given as
+the first character of the input string.  The format is similar to
+Perl-style regular expressions, e.g., /regexp/.  Furthermore command
+line options can be passed to grep, specified behind --.  The overall
+prompt input has the form `#async-input -- grep-opts#filter-string'.
+
+Note that the grep input string is transformed from Emacs regular
+expressions to Posix regular expressions.  Always enter Emacs regular
+expressions at the prompt.  `consult-grep' behaves like builtin Emacs
+search commands, e.g., Isearch, which take Emacs regular expressions.
+Furthermore the asynchronous input split into words, each word must
+match separately and in any order.  See `consult--regexp-compiler' for
+the inner workings.  In order to disable transformations of the grep
+input, adjust `consult--regexp-compiler' accordingly.
+
+Here we give a few example inputs:
+
+#alpha beta         : Search for alpha and beta in any order.
+#alpha.*beta        : Search for alpha before beta.
+#\\(alpha\\|beta\\) : Search for alpha or beta (Note Emacs syntax!)
+#word -- -C3        : Search for word, include 3 lines as context
+#first#second       : Search for first, quick filter for second.
+
+The symbol at point is added to the future history."
+  (interactive "P")
+  (consult--grep "Grep" #'consult--grep-make-builder dir initial))
+
+;;;;; Command: consult-git-grep
+
+(defun consult--git-grep-make-builder (paths)
+  "Create grep command line builder given PATHS."
+  (let ((cmd (consult--build-args consult-git-grep-args)))
+    (lambda (input)
+      (pcase-let* ((`(,arg . ,opts) (consult--command-split input))
+                   (flags (append cmd opts))
+                   (ignore-case (or (member "-i" flags) (member "--ignore-case" flags))))
+        (if (or (member "-F" flags) (member "--fixed-strings" flags))
+            (cons (append cmd (list "-e" arg) opts paths)
+                  (apply-partially #'consult--highlight-regexps
+                                   (list (regexp-quote arg)) ignore-case))
+          (pcase-let ((`(,re . ,hl) (funcall consult--regexp-compiler arg 'extended ignore-case)))
+            (when re
+              (cons (append cmd
+                            (cdr (mapcan (lambda (x) (list "--and" "-e" x)) re))
+                            opts paths)
+                    hl))))))))
+
+;;;###autoload
+(defun consult-git-grep (&optional dir initial)
+  "Search with `git grep' for files in DIR with INITIAL input.
+See `consult-grep' for details."
+  (interactive "P")
+  (consult--grep "Git-grep" #'consult--git-grep-make-builder dir initial))
+
+;;;;; Command: consult-ripgrep
+
+(defun consult--ripgrep-make-builder (paths)
+  "Create ripgrep command line builder given PATHS."
+  (let* ((cmd (consult--build-args consult-ripgrep-args))
+         (type (if (consult--grep-lookahead-p (car cmd) "-P") 'pcre 'extended)))
+    (lambda (input)
+      (pcase-let* ((`(,arg . ,opts) (consult--command-split input))
+                   (flags (append cmd opts))
+                   (ignore-case
+                    (and (not (or (member "-s" flags) (member "--case-sensitive" flags)))
+                         (or (member "-i" flags) (member "--ignore-case" flags)
+                             (and (or (member "-S" flags) (member "--smart-case" flags))
+                                  (let (case-fold-search)
+                                    ;; Case insensitive if there are no uppercase letters
+                                    (not (string-match-p "[[:upper:]]" arg))))))))
+        (if (or (member "-F" flags) (member "--fixed-strings" flags))
+            (cons (append cmd (list "-e" arg) opts paths)
+                  (apply-partially #'consult--highlight-regexps
+                                   (list (regexp-quote arg)) ignore-case))
+          (pcase-let ((`(,re . ,hl) (funcall consult--regexp-compiler arg type ignore-case)))
+            (when re
+              (cons (append cmd (and (eq type 'pcre) '("-P"))
+                            (list "-e" (consult--join-regexps re type))
+                            opts paths)
+                    hl))))))))
+
+;;;###autoload
+(defun consult-ripgrep (&optional dir initial)
+  "Search with `rg' for files in DIR with INITIAL input.
+See `consult-grep' for details."
+  (interactive "P")
+  (consult--grep "Ripgrep" #'consult--ripgrep-make-builder dir initial))
+
+;;;;; Command: consult-find
+
+(defun consult--find (prompt builder initial)
+  "Run find command in current directory.
+
+The function returns the selected file.
+The filename at point is added to the future history.
+
+BUILDER is the command line builder function.
+PROMPT is the prompt.
+INITIAL is initial input."
+  (consult--read
+   (consult--async-command builder
+     (consult--async-map (lambda (x) (string-remove-prefix "./" x)))
+     (consult--async-highlight builder)
+     :file-handler t) ;; allow tramp
+   :prompt prompt
+   :sort nil
+   :require-match t
+   :initial (consult--async-split-initial initial)
+   :add-history (consult--async-split-thingatpt 'filename)
+   :category 'file
+   :history '(:input consult--find-history)))
+
+(defun consult--find-make-builder (paths)
+  "Build find command line, finding across PATHS."
+  (let* ((cmd (seq-mapcat (lambda (x)
+                            (if (equal x ".") paths (list x)))
+                          (consult--build-args consult-find-args)))
+         (type (if (eq 0 (process-file-shell-command
+                          (concat (car cmd) " -regextype emacs -version")))
+                   'emacs 'basic)))
+    (lambda (input)
+      (pcase-let* ((`(,arg . ,opts) (consult--command-split input))
+                   ;; ignore-case=t since -iregex is used below
+                   (`(,re . ,hl) (funcall consult--regexp-compiler arg type t)))
+        (when re
+          (cons (append cmd
+                        (cdr (mapcan
+                              (lambda (x)
+                                `("-and" "-iregex"
+                                  ,(format ".*%s.*"
+                                           ;; Replace non-capturing groups with capturing groups.
+                                           ;; GNU find does not support non-capturing groups.
+                                           (replace-regexp-in-string
+                                            "\\\\(\\?:" "\\(" x 'fixedcase 'literal))))
+                              re))
+                        opts)
+                hl))))))
+
+;;;###autoload
+(defun consult-find (&optional dir initial)
+  "Search for files with `find' in DIR.
+The file names must match the input regexp.  INITIAL is the
+initial minibuffer input.  See `consult-grep' for details
+regarding the asynchronous search and the arguments."
+  (interactive "P")
+  (pcase-let* ((`(,prompt ,paths ,dir) (consult--directory-prompt "Find" dir))
+               (default-directory dir)
+               (builder (consult--find-make-builder paths)))
+    (find-file (consult--find prompt builder initial))))
+
+;;;;; Command: consult-fd
+
+(defun consult--fd-make-builder (paths)
+  "Build find command line, finding across PATHS."
+  (let ((cmd (consult--build-args consult-fd-args)))
+    (lambda (input)
+      (pcase-let* ((`(,arg . ,opts) (consult--command-split input))
+                   (flags (append cmd opts))
+                   (ignore-case
+                    (and (not (or (member "-s" flags) (member "--case-sensitive" flags)))
+                         (or (member "-i" flags) (member "--ignore-case" flags)
+                             (let (case-fold-search)
+                               ;; Case insensitive if there are no uppercase letters
+                               (not (string-match-p "[[:upper:]]" arg)))))))
+        (if (or (member "-F" flags) (member "--fixed-strings" flags))
+            (cons (append cmd (list arg) opts paths)
+                  (apply-partially #'consult--highlight-regexps
+                                   (list (regexp-quote arg)) ignore-case))
+          (pcase-let ((`(,re . ,hl) (funcall consult--regexp-compiler arg 'pcre ignore-case)))
+            (when re
+              (cons (append cmd
+                            (mapcan (lambda (x) `("--and" ,x)) re)
+                            opts
+                            (mapcan (lambda (x) `("--search-path" ,x)) paths))
+                    hl))))))))
+
+;;;###autoload
+(defun consult-fd (&optional dir initial)
+  "Search for files with `fd' in DIR.
+The file names must match the input regexp.  INITIAL is the
+initial minibuffer input.  See `consult-grep' for details
+regarding the asynchronous search and the arguments."
+  (interactive "P")
+  (pcase-let* ((`(,prompt ,paths ,dir) (consult--directory-prompt "Fd" dir))
+               (default-directory dir)
+               (builder (consult--fd-make-builder paths)))
+    (find-file (consult--find prompt builder initial))))
+
+;;;;; Command: consult-locate
+
+(defun consult--locate-builder (input)
+  "Build command line from INPUT."
+  (pcase-let ((`(,arg . ,opts) (consult--command-split input)))
+    (unless (string-blank-p arg)
+      (cons (append (consult--build-args consult-locate-args)
+                    (consult--split-escaped arg) opts)
+            (cdr (consult--default-regexp-compiler input 'basic t))))))
+
+;;;###autoload
+(defun consult-locate (&optional initial)
+  "Search with `locate' for files which match input given INITIAL input.
+
+The input is treated literally such that locate can take advantage of
+the locate database index.  Regular expressions would often force a slow
+linear search through the entire database.  The locate process is started
+asynchronously, similar to `consult-grep'.  See `consult-grep' for more
+details regarding the asynchronous search."
+  (interactive)
+  (find-file (consult--find "Locate: " #'consult--locate-builder initial)))
+
+;;;;; Command: consult-man
+
+(defun consult--man-builder (input)
+  "Build command line from INPUT."
+  (pcase-let* ((`(,arg . ,opts) (consult--command-split input))
+               (`(,re . ,hl) (funcall consult--regexp-compiler arg 'extended t)))
+    (when re
+      (cons (append (consult--build-args consult-man-args)
+                    (list (consult--join-regexps re 'extended))
+                    opts)
+            hl))))
+
+(defun consult--man-format (lines)
+  "Format man candidates from LINES."
+  (let ((candidates))
+    (save-match-data
+      (dolist (str lines)
+        (when (string-match "\\`\\(.*?\\([^ ]+\\) *(\\([^,)]+\\)[^)]*).*?\\) +- +\\(.*\\)\\'" str)
+          (let* ((names (match-string 1 str))
+                 (name (match-string 2 str))
+                 (section (match-string 3 str))
+                 (desc (match-string 4 str))
+                 (cand (format "%s - %s" names desc)))
+            (add-text-properties 0 (length names)
+                                 (list 'face 'consult-file
+                                       'consult-man (concat section " " name))
+                                 cand)
+            (push cand candidates)))))
+    (nreverse candidates)))
+
+;;;###autoload
+(defun consult-man (&optional initial)
+  "Search for man page given INITIAL input.
+
+The input string is not preprocessed and passed literally to the
+underlying man commands.  The man process is started asynchronously,
+similar to `consult-grep'.  See `consult-grep' for more details regarding
+the asynchronous search."
+  (interactive)
+  (man (consult--read
+        (consult--async-command #'consult--man-builder
+          (consult--async-transform consult--man-format)
+          (consult--async-highlight #'consult--man-builder))
+        :prompt "Manual entry: "
+        :require-match t
+        :category 'consult-man
+        :lookup (apply-partially #'consult--lookup-prop 'consult-man)
+        :initial (consult--async-split-initial initial)
+        :add-history (consult--async-split-thingatpt 'symbol)
+        :history '(:input consult--man-history))))
+
+;;;; Preview at point in completions buffers
+
+(define-minor-mode consult-preview-at-point-mode
+  "Preview minor mode for *Completions* buffers.
+When moving around in the *Completions* buffer, the candidate at point is
+automatically previewed."
+  :group 'consult
+  (if consult-preview-at-point-mode
+      (add-hook 'post-command-hook #'consult-preview-at-point nil 'local)
+    (remove-hook 'post-command-hook #'consult-preview-at-point 'local)))
+
+(defun consult-preview-at-point ()
+  "Preview candidate at point in *Completions* buffer."
+  (interactive)
+  (when-let ((win (active-minibuffer-window))
+             (buf (window-buffer win))
+             (fun (buffer-local-value 'consult--preview-function buf)))
+    (funcall fun)))
+
+;;;; Integration with completion systems
+
+;;;;; Integration: Default *Completions*
+
+(defun consult--default-completion-minibuffer-candidate ()
+  "Return current minibuffer candidate from default completion system or Icomplete."
+  (when (and (minibufferp)
+             (eq completing-read-function #'completing-read-default))
+    (let ((content (minibuffer-contents-no-properties)))
+      ;; When the current minibuffer content matches a candidate, return it!
+      (if (test-completion content
+                           minibuffer-completion-table
+                           minibuffer-completion-predicate)
+          content
+        ;; Return the full first candidate of the sorted completion list.
+        (when-let ((completions (completion-all-sorted-completions)))
+          (concat
+           (substring content 0 (or (cdr (last completions)) 0))
+           (car completions)))))))
+
+(defun consult--default-completion-list-candidate ()
+  "Return current candidate at point from completions buffer."
+  (let (beg end)
+    (when (and
+           (derived-mode-p 'completion-list-mode)
+           ;; Logic taken from `choose-completion'.
+           ;; TODO Upstream a `completion-list-get-candidate' function.
+           (cond
+            ((and (not (eobp)) (get-text-property (point) 'mouse-face))
+             (setq end (point) beg (1+ (point))))
+            ((and (not (bobp)) (get-text-property (1- (point)) 'mouse-face))
+             (setq end (1- (point)) beg (point)))))
+      (setq beg (previous-single-property-change beg 'mouse-face)
+            end (or (next-single-property-change end 'mouse-face) (point-max)))
+      (or (get-text-property beg 'completion--string)
+          (buffer-substring-no-properties beg end)))))
+
+;;;;; Integration: Vertico
+
+(defvar vertico--input)
+(declare-function vertico--exhibit "ext:vertico")
+(declare-function vertico--candidate "ext:vertico")
+(declare-function vertico--filter-completions "ext:vertico")
+
+(defun consult--vertico-candidate ()
+  "Return current candidate for Consult preview."
+  (and vertico--input (vertico--candidate 'highlight)))
+
+(defun consult--vertico-refresh ()
+  "Refresh completion UI."
+  (when vertico--input
+    (setq vertico--input t)
+    (vertico--exhibit)))
+
+(defun consult--vertico-filter-adv (orig pattern cands category highlight)
+  "Advice for ORIG `consult--completion-filter' function.
+See `consult--completion-filter' for arguments PATTERN, CANDS, CATEGORY
+and HIGHLIGHT."
+  (if (and (not highlight) (bound-and-true-p vertico-mode))
+      ;; Optimize `consult--completion-filter' using the deferred highlighting
+      ;; from Vertico.  The advice is not necessary - it is a pure optimization.
+      (nconc (car (vertico--filter-completions pattern cands nil (length pattern)
+                                               `(metadata (category . ,category))))
+             nil)
+    (funcall orig pattern cands category highlight)))
+
+(with-eval-after-load 'vertico
+  (advice-add #'consult--completion-filter :around #'consult--vertico-filter-adv)
+  (add-hook 'consult--completion-candidate-hook #'consult--vertico-candidate)
+  (add-hook 'consult--completion-refresh-hook #'consult--vertico-refresh)
+  (define-key consult-async-map [remap vertico-insert] 'vertico-next-group))
+
+;;;;; Integration: Mct
+
+(with-eval-after-load 'mct (add-hook 'consult--completion-refresh-hook
+                                     'mct--live-completions-refresh))
+
+;;;;; Integration: Icomplete
+
+(defvar icomplete-mode)
+(declare-function icomplete-exhibit "icomplete")
+
+(defun consult--icomplete-refresh ()
+  "Refresh icomplete view."
+  (when icomplete-mode
+    (let ((top (car completion-all-sorted-completions)))
+      (completion--flush-all-sorted-completions)
+      ;; force flushing, otherwise narrowing is broken!
+      (setq completion-all-sorted-completions nil)
+      (when top
+        (let* ((completions (completion-all-sorted-completions))
+               (last (last completions))
+               (before)) ;; completions before top
+          ;; warning: completions is an improper list
+          (while (consp completions)
+            (if (equal (car completions) top)
+                (progn
+                  (setcdr last (append (nreverse before) (cdr last)))
+                  (setq completion-all-sorted-completions completions
+                        completions nil))
+              (push (car completions) before)
+              (setq completions (cdr completions)))))))
+    (icomplete-exhibit)))
+
+(with-eval-after-load 'icomplete
+  (add-hook 'consult--completion-refresh-hook #'consult--icomplete-refresh))
+
+(provide 'consult)
+;;; consult.el ends here
diff --git a/emacs/elpa/consult-20241001.2057/consult.elc b/emacs/elpa/consult-20241001.2057/consult.elc
Binary files differ.
diff --git a/emacs/elpa/doom-modeline-20240923.140/doom-modeline-pkg.el b/emacs/elpa/doom-modeline-20240923.140/doom-modeline-pkg.el
@@ -1,13 +0,0 @@
-;; -*- no-byte-compile: t; lexical-binding: nil -*-
-(define-package "doom-modeline" "20240923.140"
-  "A minimal and modern mode-line."
-  '((emacs       "25.1")
-    (compat      "29.1.4.5")
-    (nerd-icons  "0.1.0")
-    (shrink-path "0.3.1"))
-  :url "https://github.com/seagle0128/doom-modeline"
-  :commit "84a53e0f8c9d77a4634e7d07ea9aac9ac1fc1aee"
-  :revdesc "84a53e0f8c9d"
-  :keywords '("faces" "mode-line")
-  :authors '(("Vincent Zhang" . "seagle0128@gmail.com"))
-  :maintainers '(("Vincent Zhang" . "seagle0128@gmail.com")))
diff --git a/emacs/elpa/doom-modeline-20240923.140/doom-modeline-segments.el b/emacs/elpa/doom-modeline-20240923.140/doom-modeline-segments.el
@@ -1,3234 +0,0 @@
-;;; doom-modeline-segments.el --- The segments for doom-modeline -*- lexical-binding: t; -*-
-
-;; Copyright (C) 2018-2024 Vincent Zhang
-
-;; This file is not part of GNU Emacs.
-
-;;
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-;;
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-;;
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
-;;
-
-;;; Commentary:
-;;
-;; The segments for doom-modeline.
-;; Use `doom-modeline-def-segment' to create a new segment.
-;;
-
-;;; Code:
-
-(require 'doom-modeline-core)
-(require 'doom-modeline-env)
-(eval-when-compile
-  (require 'cl-lib)
-  (require 'seq)
-  (require 'subr-x))
-
-
-;;
-;; Externals
-;;
-
-(defvar Info-current-file)
-(defvar Info-current-node)
-(defvar Info-mode-line-node-keymap)
-(defvar anzu--cached-count)
-(defvar anzu--current-position)
-(defvar anzu--overflow-p)
-(defvar anzu--state)
-(defvar anzu--total-matched)
-(defvar anzu-cons-mode-line-p)
-(defvar aw-keys)
-(defvar battery-echo-area-format)
-(defvar battery-load-critical)
-(defvar battery-mode-line-format)
-(defvar battery-mode-line-limit)
-(defvar battery-status-function)
-(defvar boon-command-state)
-(defvar boon-insert-state)
-(defvar boon-off-state)
-(defvar boon-special-state)
-(defvar display-time-string)
-(defvar edebug-execution-mode)
-(defvar eglot--managed-mode)
-(defvar eglot-menu)
-(defvar eglot-menu-string)
-(defvar eglot-server-menu)
-(defvar erc-modified-channels-alist)
-(defvar evil-ex-active-highlights-alist)
-(defvar evil-ex-argument)
-(defvar evil-ex-range)
-(defvar evil-mc-frozen)
-(defvar evil-state)
-(defvar evil-visual-beginning)
-(defvar evil-visual-end)
-(defvar evil-visual-selection)
-(defvar flycheck--automatically-enabled-checkers)
-(defvar flycheck-current-errors)
-(defvar flycheck-mode-menu-map)
-(defvar flymake--mode-line-format)
-(defvar flymake--state)
-(defvar flymake-menu)
-(defvar gnus-newsrc-alist)
-(defvar gnus-newsrc-hashtb)
-(defvar grip--process)
-(defvar helm--mode-line-display-prefarg)
-(defvar iedit-occurrences-overlays)
-(defvar kele-menu-map)
-(defvar meow--indicator)
-(defvar minions-mode-line-lighter)
-(defvar minions-mode-line-minor-modes-map)
-(defvar mlscroll-right-align)
-(defvar mu4e--modeline-item)
-(defvar mu4e-alert-mode-line)
-(defvar mu4e-alert-modeline-formatter)
-(defvar mu4e-modeline-mode)
-(defvar objed--obj-state)
-(defvar objed--object)
-(defvar objed-modeline-setup-func)
-(defvar persp-nil-name)
-(defvar phi-replace--mode-line-format)
-(defvar phi-search--overlays)
-(defvar phi-search--selection)
-(defvar phi-search-mode-line-format)
-(defvar rcirc-activity)
-(defvar symbol-overlay-keywords-alist)
-(defvar symbol-overlay-temp-symbol)
-(defvar text-scale-mode-amount)
-(defvar tracking-buffers)
-(defvar winum-auto-setup-mode-line)
-(defvar xah-fly-insert-state-p)
-
-(declare-function anzu--reset-status "ext:anzu")
-(declare-function anzu--where-is-here "ext:anzu")
-(declare-function async-inject-variables "ext:async")
-(declare-function async-start "ext:async")
-(declare-function avy-traverse "ext:avy")
-(declare-function avy-tree "ext:avy")
-(declare-function aw-update "ext:ace-window")
-(declare-function aw-window-list "ext:ace-window")
-(declare-function battery-format "battery")
-(declare-function battery-update "battery")
-(declare-function boon-modeline-string "ext:boon")
-(declare-function boon-state-string "ext:boon")
-(declare-function cider--connection-info "ext:cider")
-(declare-function cider-connected-p "ext:cider")
-(declare-function cider-current-repl "ext:cider")
-(declare-function cider-jack-in "ext:cider")
-(declare-function cider-quit "ext:cider")
-(declare-function citre-mode "ext:citre-basic-tools")
-(declare-function compilation-goto-in-progress-buffer "compile")
-(declare-function dap--cur-session "ext:dap-mode")
-(declare-function dap--debug-session-name "ext:dap-mode")
-(declare-function dap--debug-session-state "ext:dap-mode")
-(declare-function dap--session-running "ext:dap-mode")
-(declare-function dap-debug-recent "ext:dap-mode")
-(declare-function dap-disconnect "ext:dap-mode")
-(declare-function dap-hydra "ext:dap-hydra")
-(declare-function edebug-help "edebug")
-(declare-function edebug-next-mode "edebug")
-(declare-function edebug-stop "edebug")
-(declare-function eglot--major-modes "eglot")
-(declare-function eglot--server-info "eglot" t t)
-(declare-function eglot-current-server "eglot")
-(declare-function eglot-managed-p "eglot")
-(declare-function eglot-project-nickname "eglot" t t)
-(declare-function erc-switch-to-buffer "erc")
-(declare-function erc-track-switch-buffer "erc-track")
-(declare-function evil-delimited-arguments "ext:evil-common")
-(declare-function evil-emacs-state-p "ext:evil-states" t t)
-(declare-function evil-force-normal-state "ext:evil-commands" t t)
-(declare-function evil-insert-state-p "ext:evil-states" t t)
-(declare-function evil-motion-state-p "ext:evil-states" t t)
-(declare-function evil-normal-state-p "ext:evil-states" t t)
-(declare-function evil-operator-state-p "ext:evil-states" t t)
-(declare-function evil-replace-state-p "ext:evil-states" t t)
-(declare-function evil-state-property "ext:evil-common")
-(declare-function evil-visual-state-p "ext:evil-states" t t)
-(declare-function eyebrowse--get "ext:eyebrowse")
-(declare-function face-remap-remove-relative "face-remap")
-(declare-function fancy-narrow-active-p "ext:fancy-narrow")
-(declare-function flycheck-buffer "ext:flycheck")
-(declare-function flycheck-count-errors "ext:flycheck")
-(declare-function flycheck-error-level-compilation-level "ext:flycheck")
-(declare-function flycheck-list-errors "ext:flycheck")
-(declare-function flycheck-next-error "ext:flycheck")
-(declare-function flycheck-previous-error "ext:flycheck")
-(declare-function flymake--diag-type "flymake" t t)
-(declare-function flymake--handle-report "flymake")
-(declare-function flymake--lookup-type-property "flymake")
-(declare-function flymake--state-diags "flymake" t t)
-(declare-function flymake-disabled-backends "flymake")
-(declare-function flymake-goto-next-error "flymake")
-(declare-function flymake-goto-prev-error "flymake")
-(declare-function flymake-reporting-backends "flymake")
-(declare-function flymake-running-backends "flymake")
-(declare-function flymake-show-buffer-diagnostics "flymake")
-(declare-function flymake-show-buffer-diagnostics "flymake")
-(declare-function flymake-start "flymake")
-(declare-function follow-all-followers "follow")
-(declare-function gnus-demon-add-handler "gnus-demon")
-(declare-function grip--preview-url "ext:grip-mode")
-(declare-function grip-browse-preview "ext:grip-mode")
-(declare-function grip-restart-preview "ext:grip-mode")
-(declare-function grip-stop-preview "ext:grip-mode")
-(declare-function helm-candidate-number-at-point "ext:helm-core")
-(declare-function helm-get-candidate-number "ext:helm-core")
-(declare-function iedit-find-current-occurrence-overlay "ext:iedit-lib")
-(declare-function iedit-prev-occurrence "ext:iedit-lib")
-(declare-function image-get-display-property "image-mode")
-(declare-function jsonrpc--request-continuations "jsonrpc" t t)
-(declare-function jsonrpc-last-error "jsonrpc" t t)
-(declare-function jsonrpc-name "jsonrpc" t t)
-(declare-function kele-current-context-name "ext:kele")
-(declare-function kele-current-namespace "ext:kele")
-(declare-function lsp--workspace-print "ext:lsp-mode")
-(declare-function lsp-describe-session "ext:lsp-mode")
-(declare-function lsp-workspace-folders-open "ext:lsp-mode")
-(declare-function lsp-workspace-restart "ext:lsp-mode")
-(declare-function lsp-workspace-shutdown "ext:lsp-mode")
-(declare-function lsp-workspaces "ext:lsp-mode")
-(declare-function lv-message "ext:lv")
-(declare-function mc/num-cursors "ext:multiple-cursors-core")
-(declare-function meow--current-state "ext:meow")
-(declare-function meow-beacon-mode-p "ext:meow")
-(declare-function meow-insert-mode-p "ext:meow")
-(declare-function meow-keypad-mode-p "ext:meow")
-(declare-function meow-motion-mode-p "ext:meow")
-(declare-function meow-normal-mode-p "ext:meow")
-(declare-function minions--prominent-modes "ext:minions")
-(declare-function mlscroll-mode-line "ext:mlscroll")
-(declare-function mu4e--modeline-string "ext:mu4e-modeline")
-(declare-function mu4e-alert-default-mode-line-formatter "ext:mu4e-alert")
-(declare-function mu4e-alert-enable-mode-line-display "ext:mu4e-alert")
-(declare-function nyan-create "ext:nyan-mode")
-(declare-function org-edit-src-save "org-src")
-(declare-function parrot-create "ext:parrot")
-(declare-function pdf-cache-number-of-pages "ext:pdf-cache" t t)
-(declare-function persp-add-buffer "ext:persp-mode")
-(declare-function persp-contain-buffer-p "ext:persp-mode")
-(declare-function persp-switch "ext:persp-mode")
-(declare-function phi-search--initialize "ext:phi-search")
-(declare-function poke-line-create "ext:poke-line")
-(declare-function popup-create "ext:popup")
-(declare-function popup-delete "ext:popup")
-(declare-function rcirc-next-active-buffer "rcirc")
-(declare-function rcirc-short-buffer-name "rcirc")
-(declare-function rcirc-switch-to-server-buffer "rcirc")
-(declare-function rcirc-window-configuration-change "rcirc")
-(declare-function rime--should-enable-p "ext:rime")
-(declare-function rime--should-inline-ascii-p "ext:rime")
-(declare-function sml-modeline-create "ext:sml-modeline")
-(declare-function svg-circle "svg")
-(declare-function svg-create "svg")
-(declare-function svg-image "svg")
-(declare-function svg-line "svg")
-(declare-function symbol-overlay-assoc "ext:symbol-overlay")
-(declare-function symbol-overlay-get-list "ext:symbol-overlay")
-(declare-function symbol-overlay-get-symbol "ext:symbol-overlay")
-(declare-function symbol-overlay-rename "ext:symbol-overlay")
-(declare-function tab-bar--current-tab "tab-bar")
-(declare-function tab-bar--current-tab-index "tab-bar")
-(declare-function tracking-next-buffer "ext:tracking")
-(declare-function tracking-previous-buffer "ext:tracking")
-(declare-function tracking-shorten "ext:tracking")
-(declare-function warning-numeric-level "warnings")
-(declare-function window-numbering-clear-mode-line "ext:window-numbering")
-(declare-function window-numbering-get-number-string "ext:window-numbering")
-(declare-function window-numbering-install-mode-line "ext:window-numbering")
-(declare-function winum--clear-mode-line "ext:winum")
-(declare-function winum--install-mode-line "ext:winum")
-(declare-function winum-get-number-string "ext:winum")
-
-
-
-;;
-;; Buffer information
-;;
-
-(defvar-local doom-modeline--buffer-file-icon nil)
-(defun doom-modeline-update-buffer-file-icon (&rest _)
-  "Update file icon in mode-line."
-  (setq doom-modeline--buffer-file-icon
-        (when (and doom-modeline-major-mode-icon
-                   (doom-modeline-icon-displayable-p))
-          (let ((icon (doom-modeline-icon-for-buffer)))
-            (propertize (if (or (null icon) (symbolp icon))
-                            (doom-modeline-icon 'faicon "nf-fa-file_o" nil nil
-                                                :face 'nerd-icons-dsilver)
-                          (doom-modeline-propertize-icon icon))
-                        'help-echo (format "Major-mode: %s" (format-mode-line mode-name)))))))
-(add-hook 'find-file-hook #'doom-modeline-update-buffer-file-icon)
-(add-hook 'after-change-major-mode-hook #'doom-modeline-update-buffer-file-icon)
-(add-hook 'clone-indirect-buffer-hook #'doom-modeline-update-buffer-file-icon)
-
-(doom-modeline-add-variable-watcher
- 'doom-modeline-icon
- (lambda (_sym val op _where)
-   (when (eq op 'set)
-     (setq doom-modeline-icon val)
-     (dolist (buf (buffer-list))
-       (with-current-buffer buf
-         (doom-modeline-update-buffer-file-icon))))))
-
-(defun doom-modeline-buffer-file-state-icon (icon unicode text face)
-  "Displays an ICON of buffer state with FACE.
-UNICODE and TEXT are the alternatives if it is not applicable.
-Uses `nerd-icons-mdicon' to fetch the icon."
-  (doom-modeline-icon 'mdicon icon unicode text :face face))
-
-(defvar-local doom-modeline--buffer-file-state-icon nil)
-(defun doom-modeline-update-buffer-file-state-icon (&rest _)
-  "Update the buffer or file state in mode-line."
-  (setq doom-modeline--buffer-file-state-icon
-        (when doom-modeline-buffer-state-icon
-          (ignore-errors
-            (concat
-             (cond ((not (or (and (buffer-file-name) (file-remote-p buffer-file-name))
-                             (verify-visited-file-modtime (current-buffer))))
-                    (doom-modeline-buffer-file-state-icon
-                     "nf-md-reload_alert" "⟳" "%1*"
-                     'doom-modeline-warning))
-                   (buffer-read-only
-                    (doom-modeline-buffer-file-state-icon
-                     "nf-md-lock" "🔒" "%1*"
-                     'doom-modeline-warning))
-                   ((and buffer-file-name (buffer-modified-p)
-                         doom-modeline-buffer-modification-icon)
-                    (doom-modeline-buffer-file-state-icon
-                     "nf-md-content_save_edit" "💾" "%1*"
-                     'doom-modeline-warning))
-                   ((and buffer-file-name
-                         ;; Avoid freezing while connection is lost
-                         (not (file-remote-p buffer-file-name))
-                         (not (file-exists-p buffer-file-name)))
-                    (doom-modeline-buffer-file-state-icon
-                     "nf-md-cancel" "🚫" "!"
-                     'doom-modeline-urgent))
-                   (t ""))
-             (when (or (buffer-narrowed-p)
-                       (and (bound-and-true-p fancy-narrow-mode)
-                            (fancy-narrow-active-p))
-                       (bound-and-true-p dired-narrow-mode))
-               (doom-modeline-buffer-file-state-icon
-                "nf-md-unfold_less_horizontal" "↕" "><"
-                'doom-modeline-warning)))))))
-
-(defvar-local doom-modeline--buffer-file-name nil)
-(defun doom-modeline-update-buffer-file-name (&rest _)
-  "Update buffer file name in mode-line."
-  (setq doom-modeline--buffer-file-name
-        (ignore-errors
-          (save-match-data
-            (if buffer-file-name
-                (doom-modeline-buffer-file-name)
-              (propertize "%b"
-                          'face 'doom-modeline-buffer-file
-                          'mouse-face 'doom-modeline-highlight
-                          'help-echo "Buffer name
-mouse-1: Previous buffer\nmouse-3: Next buffer"
-                          'local-map mode-line-buffer-identification-keymap))))))
-(add-hook 'find-file-hook #'doom-modeline-update-buffer-file-name)
-(add-hook 'after-save-hook #'doom-modeline-update-buffer-file-name)
-(add-hook 'clone-indirect-buffer-hook #'doom-modeline-update-buffer-file-name)
-(add-hook 'evil-insert-state-exit-hook #'doom-modeline-update-buffer-file-name)
-(add-hook 'Info-selection-hook #'doom-modeline-update-buffer-file-name)
-(advice-add #'rename-buffer :after #'doom-modeline-update-buffer-file-name)
-(advice-add #'set-visited-file-name :after #'doom-modeline-update-buffer-file-name)
-(advice-add #'pop-to-buffer :after #'doom-modeline-update-buffer-file-name)
-(advice-add #'popup-create :after #'doom-modeline-update-buffer-file-name)
-(advice-add #'popup-delete :after #'doom-modeline-update-buffer-file-name)
-;; (advice-add #'primitive-undo :after #'doom-modeline-update-buffer-file-name)
-;; (advice-add #'set-buffer-modified-p :after #'doom-modeline-update-buffer-file-name)
-
-(with-no-warnings
-  (if (boundp 'after-focus-change-function)
-      (progn
-        (advice-add #'handle-switch-frame :after #'doom-modeline-update-buffer-file-name)
-        (add-function :after after-focus-change-function #'doom-modeline-update-buffer-file-name))
-    (progn
-      (add-hook 'focus-in-hook #'doom-modeline-update-buffer-file-name)
-      (add-hook 'focus-out-hook #'doom-modeline-update-buffer-file-name))))
-
-(doom-modeline-add-variable-watcher
- 'doom-modeline-buffer-file-name-style
- (lambda (_sym val op _where)
-   (when (eq op 'set)
-     (setq doom-modeline-buffer-file-name-style val)
-     (dolist (buf (buffer-list))
-       (with-current-buffer buf
-         (when buffer-file-name
-           (doom-modeline-update-buffer-file-name)))))))
-
-(defsubst doom-modeline--buffer-mode-icon ()
-  "The icon of the current major mode."
-  (when (and doom-modeline-icon doom-modeline-major-mode-icon)
-    (when-let ((icon (or doom-modeline--buffer-file-icon
-                         (doom-modeline-update-buffer-file-icon))))
-      (unless (string-empty-p icon)
-        (concat
-         (if doom-modeline-major-mode-color-icon
-             (doom-modeline-display-icon icon)
-           (doom-modeline-propertize-icon
-            icon
-            (doom-modeline-face)))
-         (doom-modeline-vspc))))))
-
-(defsubst doom-modeline--buffer-state-icon ()
-  "The icon of the current buffer state."
-  (when doom-modeline-buffer-state-icon
-    (when-let ((icon (doom-modeline-update-buffer-file-state-icon)))
-      (unless (string-empty-p icon)
-        (concat
-         (doom-modeline-display-icon icon)
-         (doom-modeline-vspc))))))
-
-(defsubst doom-modeline--buffer-simple-name ()
-  "The buffer simple name."
-  (propertize "%b"
-              'face (doom-modeline-face
-                     (if (and doom-modeline-highlight-modified-buffer-name
-                              (buffer-modified-p))
-                         'doom-modeline-buffer-modified
-                       'doom-modeline-buffer-file))
-              'mouse-face 'doom-modeline-highlight
-              'help-echo "Buffer name
-mouse-1: Previous buffer\nmouse-3: Next buffer"
-              'local-map mode-line-buffer-identification-keymap))
-
-(defsubst doom-modeline--buffer-name ()
-  "The current buffer name."
-  (when doom-modeline-buffer-name
-    (if (and (not (eq doom-modeline-buffer-file-name-style 'file-name))
-             doom-modeline--limited-width-p)
-        ;; Only display the buffer name if the window is small, and doesn't
-        ;; need to respect file-name style.
-        (doom-modeline--buffer-simple-name)
-      (when-let ((name (or doom-modeline--buffer-file-name
-                           (doom-modeline-update-buffer-file-name))))
-        ;; Check if the buffer is modified
-        (if (and doom-modeline-highlight-modified-buffer-name
-                 (buffer-modified-p))
-            (propertize name 'face (doom-modeline-face 'doom-modeline-buffer-modified))
-          (doom-modeline-display-text name))))))
-
-(doom-modeline-def-segment buffer-info
-  "Combined information about the current buffer.
-
-Including the current working directory, the file name, and its state (modified,
-read-only or non-existent)."
-  (concat
-   (doom-modeline-spc)
-   (doom-modeline--buffer-mode-icon)
-   (doom-modeline--buffer-state-icon)
-   (doom-modeline--buffer-name)))
-
-(doom-modeline-def-segment buffer-info-simple
-  "Display only the current buffer's name, but with fontification."
-  (concat
-   (doom-modeline-spc)
-   (doom-modeline--buffer-mode-icon)
-   (doom-modeline--buffer-state-icon)
-   (doom-modeline--buffer-simple-name)))
-
-(doom-modeline-def-segment calc
-  "Display calculator icons and info."
-  (concat
-   (doom-modeline-spc)
-   (when-let ((icon (doom-modeline-icon 'faicon "nf-fa-calculator" "🖩" "")))
-     (concat
-      (doom-modeline-display-icon icon)
-      (doom-modeline-vspc)))
-   (doom-modeline--buffer-simple-name)))
-
-(doom-modeline-def-segment buffer-default-directory
-  "Displays `default-directory' with the icon and state.
-
-This is for special buffers like the scratch buffer where knowing the current
-project directory is important."
-  (let ((face (doom-modeline-face
-               (if (and buffer-file-name (buffer-modified-p))
-                   'doom-modeline-buffer-modified
-                 'doom-modeline-buffer-path))))
-    (concat
-     (doom-modeline-spc)
-     (and doom-modeline-major-mode-icon
-          (concat
-           (doom-modeline-icon
-            'octicon "nf-oct-file_directory_fill" "🖿" "" :face face)
-           (doom-modeline-vspc)))
-     (doom-modeline--buffer-state-icon)
-     (propertize (abbreviate-file-name default-directory) 'face face))))
-
-(doom-modeline-def-segment buffer-default-directory-simple
-  "Displays `default-directory'.
-
-This is for special buffers like the scratch buffer where knowing the current
-project directory is important."
-  (let ((face (doom-modeline-face 'doom-modeline-buffer-path)))
-    (concat
-     (doom-modeline-spc)
-     (and doom-modeline-major-mode-icon
-          (concat
-           (doom-modeline-icon
-            'octicon "nf-oct-file_directory_fill" "🖿" "" :face face)
-           (doom-modeline-vspc)))
-     (propertize (abbreviate-file-name default-directory) 'face face))))
-
-
-;;
-;; Encoding
-;;
-
-(doom-modeline-def-segment buffer-encoding
-  "Displays the eol and the encoding style of the buffer."
-  (when doom-modeline-buffer-encoding
-    (let ((sep (doom-modeline-spc))
-          (face (doom-modeline-face))
-          (mouse-face 'doom-modeline-highlight))
-      (concat
-       sep
-
-       ;; eol type
-       (let ((eol (coding-system-eol-type buffer-file-coding-system)))
-         (when (or (eq doom-modeline-buffer-encoding t)
-                   (and (eq doom-modeline-buffer-encoding 'nondefault)
-                        (not (equal eol doom-modeline-default-eol-type))))
-           (propertize
-            (pcase eol
-              (0 "LF ")
-              (1 "CRLF ")
-              (2 "CR ")
-              (_ ""))
-            'face face
-            'mouse-face mouse-face
-            'help-echo (format "End-of-line style: %s\nmouse-1: Cycle"
-                               (pcase eol
-                                 (0 "Unix-style LF")
-                                 (1 "DOS-style CRLF")
-                                 (2 "Mac-style CR")
-                                 (_ "Undecided")))
-            'local-map (let ((map (make-sparse-keymap)))
-                         (define-key map [mode-line mouse-1] 'mode-line-change-eol)
-                         map))))
-
-       ;; coding system
-       (let* ((sys (coding-system-plist buffer-file-coding-system))
-              (cat (plist-get sys :category))
-              (sym (if (memq cat
-                             '(coding-category-undecided coding-category-utf-8))
-                       'utf-8
-                     (plist-get sys :name))))
-         (when (or (eq doom-modeline-buffer-encoding t)
-                   (and (eq doom-modeline-buffer-encoding 'nondefault)
-                        (not (eq cat 'coding-category-undecided))
-                        (not (eq sym doom-modeline-default-coding-system))))
-           (propertize
-            (upcase (symbol-name sym))
-            'face face
-            'mouse-face mouse-face
-            'help-echo 'mode-line-mule-info-help-echo
-            'local-map mode-line-coding-system-map)))
-
-       sep))))
-
-
-;;
-;; Indentation
-;;
-
-(doom-modeline-def-segment indent-info
-  "Displays the indentation information."
-  (when doom-modeline-indent-info
-    (let ((do-propertize
-           (lambda (mode size)
-             (propertize
-              (format " %s %d " mode size)
-              'face (doom-modeline-face)))))
-      (if indent-tabs-mode
-          (funcall do-propertize "TAB" tab-width)
-        (let ((lookup-var
-               (seq-find (lambda (var)
-                           (and var (boundp var) (symbol-value var)))
-                         (cdr (assoc major-mode doom-modeline-indent-alist)) nil)))
-          (funcall do-propertize "SPC"
-                   (if lookup-var
-                       (symbol-value lookup-var)
-                     tab-width)))))))
-
-;;
-;; Remote host
-;;
-
-(doom-modeline-def-segment remote-host
-  "Hostname for remote buffers."
-  (when default-directory
-    (when-let ((host (file-remote-p default-directory 'host)))
-      (propertize
-       (concat "@" host)
-       'face (doom-modeline-face 'doom-modeline-host)))))
-
-
-;;
-;; Major mode
-;;
-
-(doom-modeline-def-segment major-mode
-  "The major mode, including environment and text-scale info."
-  (let ((sep (doom-modeline-spc))
-        (face (doom-modeline-face 'doom-modeline-buffer-major-mode)))
-    (concat
-     sep
-     (propertize (concat
-                  (format-mode-line
-                   (or (and (boundp 'delighted-modes)
-                            (cadr (assq major-mode delighted-modes)))
-                       mode-name))
-                  (when (and doom-modeline-env-version doom-modeline-env--version)
-                    (format " %s" doom-modeline-env--version)))
-                 'help-echo "Major mode\n\
-mouse-1: Display major mode menu\n\
-mouse-2: Show help for major mode\n\
-mouse-3: Toggle minor modes"
-                 'face face
-                 'mouse-face 'doom-modeline-highlight
-                 'local-map mode-line-major-mode-keymap)
-     (and (boundp 'text-scale-mode-amount)
-          (/= text-scale-mode-amount 0)
-          (propertize
-           (format
-            (if (> text-scale-mode-amount 0) " (%+d)" " (%-d)")
-            text-scale-mode-amount)
-           'face face))
-     sep)))
-
-
-;;
-;; Process
-;;
-
-(doom-modeline-def-segment process
-  "The process info."
-  (doom-modeline-display-text
-   (format-mode-line mode-line-process)))
-
-
-;;
-;; Minor modes
-;;
-
-(doom-modeline-def-segment minor-modes
-  (when doom-modeline-minor-modes
-    (let ((sep (doom-modeline-spc))
-          (face (doom-modeline-face 'doom-modeline-buffer-minor-mode))
-          (mouse-face 'doom-modeline-highlight)
-          (help-echo "Minor mode
-  mouse-1: Display minor mode menu
-  mouse-2: Show help for minor mode
-  mouse-3: Toggle minor modes"))
-      (if (bound-and-true-p minions-mode)
-          `((:propertize ("" ,(minions--prominent-modes))
-             face ,face
-		     mouse-face ,mouse-face
-		     help-echo ,help-echo
-		     local-map ,mode-line-minor-mode-keymap)
-            ,sep
-            (:propertize ("" ,(doom-modeline-icon 'octicon "nf-oct-gear" "⚙"
-                                                  minions-mode-line-lighter
-                                                  :face face))
-             mouse-face ,mouse-face
-             help-echo "Minions
-mouse-1: Display minor modes menu"
-             local-map ,minions-mode-line-minor-modes-map)
-            ,sep)
-        `((:propertize ("" minor-mode-alist)
-           face ,face
-           mouse-face ,mouse-face
-           help-echo ,help-echo
-           local-map ,mode-line-minor-mode-keymap)
-          ,sep)))))
-
-
-;;
-;; VCS
-;;
-
-(defun doom-modeline-vcs-icon (icon &optional unicode text face)
-  "Displays the vcs ICON with FACE and VOFFSET.
-
-UNICODE and TEXT are fallbacks.
-Uses `nerd-icons-octicon' to fetch the icon."
-  (doom-modeline-icon 'devicon (and doom-modeline-vcs-icon icon)
-                      unicode text :face face))
-
-(defvar-local doom-modeline--vcs nil)
-(defun doom-modeline-update-vcs (&rest _)
-  "Update vcs state in mode-line."
-  (setq doom-modeline--vcs
-        (when (and vc-mode buffer-file-name)
-          (let* ((backend (vc-backend buffer-file-name))
-                 (state (vc-state buffer-file-name backend))
-                 (icon (cond ((memq state '(edited added))
-                              (doom-modeline-vcs-icon "nf-dev-git_compare" "🔃" "*" 'doom-modeline-info))
-                             ((eq state 'needs-merge)
-                              (doom-modeline-vcs-icon "nf-dev-git_merge" "🔀" "?" 'doom-modeline-info))
-                             ((eq state 'needs-update)
-                              (doom-modeline-vcs-icon "nf-dev-git_pull_request" "⬇" "!" 'doom-modeline-warning))
-                             ((memq state '(removed conflict unregistered))
-                              (doom-modeline-icon 'octicon "nf-oct-alert" "⚠" "!" :face 'doom-modeline-urgent))
-                             (t (doom-modeline-vcs-icon "nf-dev-git_branch" "" "@" 'doom-modeline-info))))
-                 (str (or (and vc-display-status
-                               (functionp doom-modeline-vcs-display-function)
-                               (funcall doom-modeline-vcs-display-function))
-                          ""))
-                 (face (cond ((eq state 'needs-update)
-                              '(doom-modeline-warning bold))
-                             ((memq state '(removed conflict unregistered))
-                              '(doom-modeline-urgent bold))
-                             (t '(doom-modeline-info bold))))
-                 (text (propertize (if (length> str doom-modeline-vcs-max-length)
-                                       (concat
-                                        (substring str 0 (- doom-modeline-vcs-max-length 3))
-                                        doom-modeline-ellipsis)
-                                     str)
-                                   'face face)))
-            `((icon . ,icon) (text . ,text))))))
-(add-hook 'find-file-hook #'doom-modeline-update-vcs)
-(add-hook 'after-save-hook #'doom-modeline-update-vcs)
-(advice-add #'vc-refresh-state :after #'doom-modeline-update-vcs)
-
-(doom-modeline-add-variable-watcher
- 'doom-modeline-icon
- (lambda (_sym val op _where)
-   (when (eq op 'set)
-     (setq doom-modeline-icon val)
-     (dolist (buf (buffer-list))
-       (with-current-buffer buf
-         (doom-modeline-update-vcs))))))
-
-(doom-modeline-add-variable-watcher
- 'doom-modeline-unicode-fallback
- (lambda (_sym val op _where)
-   (when (eq op 'set)
-     (setq doom-modeline-unicode-fallback val)
-     (dolist (buf (buffer-list))
-       (with-current-buffer buf
-         (doom-modeline-update-vcs))))))
-
-(doom-modeline-add-variable-watcher
- 'doom-modeline-vcs-icon
- (lambda (_sym val op _where)
-   (when (eq op 'set)
-     (setq doom-modeline-vcs-icon val)
-     (dolist (buf (buffer-list))
-       (with-current-buffer buf
-         (doom-modeline-update-vcs))))))
-
-(doom-modeline-add-variable-watcher
- 'vc-display-status
- (lambda (_sym val op _where)
-   (when (eq op 'set)
-     (setq vc-display-status val)
-     (dolist (buf (buffer-list))
-       (with-current-buffer buf
-         (doom-modeline-update-vcs))))))
-
-(doom-modeline-def-segment vcs
-  "Displays the current branch, colored based on its state."
-  (when doom-modeline--vcs
-    (let-alist doom-modeline--vcs
-      (let ((sep (doom-modeline-spc))
-            (vsep (doom-modeline-vspc)))
-        (concat sep
-                (propertize (concat
-                             (doom-modeline-display-icon .icon)
-                             vsep
-                             (doom-modeline-display-text .text))
-                            'help-echo (get-text-property 1 'help-echo vc-mode)
-                            'mouse-face 'doom-modeline-highlight
-                            'local-map (get-text-property 1 'local-map vc-mode))
-                sep)))))
-
-
-;;
-;; Check
-;;
-
-(defun doom-modeline-check-icon (icon unicode text face)
-  "Displays the check ICON with FACE.
-
-UNICODE and TEXT are fallbacks.
-Uses `nerd-icons-mdicon' to fetch the icon."
-  (doom-modeline-icon 'mdicon (and doom-modeline-check-icon icon)
-                      unicode text :face face))
-
-(defun doom-modeline-check-text (text &optional face)
-  "Displays the check TEXT with FACE."
-  (propertize text 'face (or face 'mode-line)))
-
-;; Flycheck
-
-(defun doom-modeline--flycheck-count-errors ()
-  "Count the number of ERRORS, grouped by level.
-
-Return an alist, where each ITEM is a cons cell whose `car' is an
-error level, and whose `cdr' is the number of errors of that
-level."
-  (let ((info 0) (warning 0) (error 0))
-    (mapc
-     (lambda (item)
-       (let ((count (cdr item)))
-         (pcase (flycheck-error-level-compilation-level (car item))
-           (0 (cl-incf info count))
-           (1 (cl-incf warning count))
-           (2 (cl-incf error count)))))
-     (flycheck-count-errors flycheck-current-errors))
-    `((info . ,info) (warning . ,warning) (error . ,error))))
-
-(defvar-local doom-modeline--flycheck nil)
-(defun doom-modeline-update-flycheck (&optional status)
-  "Update flycheck via STATUS."
-  (setq doom-modeline--flycheck
-        (let-alist (doom-modeline--flycheck-count-errors)
-          (let* ((vsep (doom-modeline-vspc))
-                 (seg (if doom-modeline-check-simple-format
-                          (let ((count (+ .error .warning .info)))
-                            (pcase status
-                              ('finished    (if (> count 0)
-                                                (let ((face (if (> .error 0) 'doom-modeline-urgent 'doom-modeline-warning)))
-                                                  (concat
-                                                   (doom-modeline-check-icon "nf-md-alert_circle_outline" "⚠" "!" face)
-                                                   vsep
-                                                   (doom-modeline-check-text (number-to-string count) face)))
-                                              (doom-modeline-check-icon "nf-md-check_circle_outline" "✔" "*" 'doom-modeline-info)))
-                              ('running     (concat
-                                             (doom-modeline-check-icon "nf-md-timer_sand" "⏳" "*" 'doom-modeline-debug)
-                                             (when (> count 0)
-                                               (concat
-                                                vsep
-                                                (doom-modeline-check-text (number-to-string count) 'doom-modeline-debug)))))
-                              ('no-checker  (doom-modeline-check-icon "nf-md-alert_box_outline" "⚠" "-" 'doom-modeline-debug))
-                              ('errored     (doom-modeline-check-icon "nf-md-alert_box_outline" "⚠" "!" 'doom-modeline-urgent))
-                              ('interrupted (doom-modeline-check-icon "nf-md-pause_circle_outline" "⦷" "." 'doom-modeline-debug))
-                              ('suspicious  (doom-modeline-check-icon "nf-md-file_question_outline" "❓" "?" 'doom-modeline-debug))
-                              (_ "")))
-                        (concat (doom-modeline-check-icon "nf-md-close_circle_outline" "⮾" "!" 'doom-modeline-urgent)
-                                vsep
-                                (doom-modeline-check-text (number-to-string .error) 'doom-modeline-urgent)
-                                vsep
-                                (doom-modeline-check-icon "nf-md-alert_outline" "⚠" "!" 'doom-modeline-warning)
-                                vsep
-                                (doom-modeline-check-text (number-to-string .warning) 'doom-modeline-warning)
-                                vsep
-                                (doom-modeline-check-icon "nf-md-information_outline" "🛈" "!" 'doom-modeline-info)
-                                vsep
-                                (doom-modeline-check-text (number-to-string .info) 'doom-modeline-info)))))
-            (propertize seg
-                        'help-echo (concat "Flycheck\n"
-                                           (pcase status
-                                             ('finished (format "error: %d, warning: %d, info: %d" .error .warning .info))
-                                             ('running "Checking...")
-                                             ('no-checker "No Checker")
-                                             ('errored "Error")
-                                             ('interrupted "Interrupted")
-                                             ('suspicious "Suspicious"))
-                                           "\nmouse-1: Display minor mode menu\nmouse-2: Show help for minor mode")
-                        'mouse-face 'doom-modeline-highlight
-                        'local-map (let ((map (make-sparse-keymap)))
-                                     (define-key map [mode-line down-mouse-1]
-                                       flycheck-mode-menu-map)
-                                     (define-key map [mode-line mouse-2]
-                                       (lambda ()
-                                         (interactive)
-                                         (describe-function 'flycheck-mode)))
-                                     map))))))
-(add-hook 'flycheck-status-changed-functions #'doom-modeline-update-flycheck)
-(add-hook 'flycheck-mode-hook #'doom-modeline-update-flycheck)
-
-(doom-modeline-add-variable-watcher
- 'doom-modeline-icon
- (lambda (_sym val op _where)
-   (when (eq op 'set)
-     (setq doom-modeline-icon val)
-     (dolist (buf (buffer-list))
-       (with-current-buffer buf
-         (when (bound-and-true-p flycheck-mode)
-           (doom-modeline-update-flycheck)))))))
-
-(doom-modeline-add-variable-watcher
- 'doom-modeline-check-icon
- (lambda (_sym val op _where)
-   (when (eq op 'set)
-     (setq doom-modeline-check-icon val)
-     (dolist (buf (buffer-list))
-       (with-current-buffer buf
-         (when (bound-and-true-p flycheck-mode)
-           (doom-modeline-update-flycheck)))))))
-
-(doom-modeline-add-variable-watcher
- 'doom-modeline-unicode-fallback
- (lambda (_sym val op _where)
-   (when (eq op 'set)
-     (setq doom-modeline-unicode-fallback val)
-     (dolist (buf (buffer-list))
-       (with-current-buffer buf
-         (when (bound-and-true-p flycheck-mode)
-           (doom-modeline-update-flycheck)))))))
-
-(doom-modeline-add-variable-watcher
- 'doom-modeline-check-simple-format
- (lambda (_sym val op _where)
-   (when (eq op 'set)
-     (setq doom-modeline-check-simple-format val)
-     (dolist (buf (buffer-list))
-       (with-current-buffer buf
-         (when (bound-and-true-p flycheck-mode)
-           (doom-modeline-update-flycheck)))))))
-
-;; Flymake
-
-;; Compatibility
-;; @see https://github.com/emacs-mirror/emacs/commit/6e100869012da9244679696634cab6b9cac96303.
-(with-eval-after-load 'flymake
-  (unless (boundp 'flymake--state)
-    (defvaralias 'flymake--state 'flymake--backend-state))
-  (unless (fboundp 'flymake--state-diags)
-    (defalias 'flymake--state-diags 'flymake--backend-state-diags)))
-
-(defun doom-modeline--flymake-count-errors ()
-  "Count the number of ERRORS, grouped by level."
-  (let ((warning-level (warning-numeric-level :warning))
-        (note-level (warning-numeric-level :debug))
-        (note 0) (warning 0) (error 0))
-    (maphash (lambda (_b state)
-               (cl-loop
-                with diags = (flymake--state-diags state)
-                for diag in diags do
-                (let ((severity (flymake--lookup-type-property (flymake--diag-type diag) 'severity
-                                                               (warning-numeric-level :error))))
-                  (cond ((> severity warning-level) (cl-incf error))
-                        ((> severity note-level) (cl-incf warning))
-                        (t (cl-incf note))))))
-             flymake--state)
-    `((note . ,note) (warning . ,warning) (error . ,error))))
-
-(defvar-local doom-modeline--flymake nil)
-(defun doom-modeline-update-flymake (&rest _)
-  "Update flymake."
-  (setq doom-modeline--flymake
-        (let* ((known (hash-table-keys flymake--state))
-               (running (flymake-running-backends))
-               (disabled (flymake-disabled-backends))
-               (reported (flymake-reporting-backends))
-               (all-disabled (and disabled (null running)))
-               (some-waiting (cl-set-difference running reported)))
-          (let-alist (doom-modeline--flymake-count-errors)
-            (let* ((vsep (doom-modeline-vspc))
-                   (seg (if doom-modeline-check-simple-format
-                            (let ((count (+ .error .warning .note)))
-                              (cond
-                               (some-waiting (concat
-                                              (doom-modeline-check-icon "nf-md-timer_sand" "⏳" "*" 'doom-modeline-debug)
-                                              (when (> count 0)
-                                                (concat
-                                                 vsep
-                                                 (doom-modeline-check-text (number-to-string count) 'doom-modeline-debug)))))
-                               ((null known) (doom-modeline-check-icon "nf-md-alert_box_outline" "⚠" "!" 'doom-modeline-urgent))
-                               (all-disabled (doom-modeline-check-icon "nf-md-alert_box_outline" "⚠" "!" 'doom-modeline-warning))
-                               (t (if (> count 0)
-                                      (let ((face (cond ((> .error 0) 'doom-modeline-urgent)
-                                                        ((> .warning 0) 'doom-modeline-warning)
-                                                        (t 'doom-modeline-info))))
-                                        (concat
-                                         (doom-modeline-check-icon "nf-md-alert_circle_outline" "⚠" "!" face)
-                                         vsep
-                                         (doom-modeline-check-text (number-to-string count) face)))
-                                    (doom-modeline-check-icon "nf-md-check_circle_outline" "✔" "*" 'doom-modeline-info)))))
-                          (concat
-                           (doom-modeline-check-icon "nf-md-close_circle_outline" "⮾" "!" 'doom-modeline-urgent)
-                           vsep
-                           (doom-modeline-check-text (number-to-string .error) 'doom-modeline-urgent)
-                           vsep
-                           (doom-modeline-check-icon "nf-md-alert_outline" "⚠" "!" 'doom-modeline-warning)
-                           vsep
-                           (doom-modeline-check-text (number-to-string .warning) 'doom-modeline-warning)
-                           vsep
-                           (doom-modeline-check-icon "nf-md-information_outline" "🛈" "!" 'doom-modeline-info)
-                           vsep
-                           (doom-modeline-check-text (number-to-string .note) 'doom-modeline-info)))))
-              (propertize
-               seg
-               'help-echo (concat
-                           "Flymake\n"
-                           (cond (some-waiting "Checking...")
-                                 ((null known) "No Checker")
-                                 (all-disabled "All Checkers Disabled")
-                                 (t (format "%d/%d backends running\nerror: %d, warning: %d, note: %d"
-                                            (length running) (length known) .error .warning .note)))
-                           "\nmouse-1: Display minor mode menu\nmouse-2: Show help for minor mode")
-               'mouse-face 'doom-modeline-highlight
-               'local-map (let ((map (make-sparse-keymap)))
-                            (define-key map [mode-line down-mouse-1]
-                              flymake-menu)
-                            (define-key map [mode-line mouse-2]
-                              (lambda ()
-                                (interactive)
-                                (describe-function 'flymake-mode)))
-                            map)))))))
-(advice-add #'flymake--handle-report :after #'doom-modeline-update-flymake)
-
-(doom-modeline-add-variable-watcher
- 'doom-modeline-icon
- (lambda (_sym val op _where)
-   (when (eq op 'set)
-     (setq doom-modeline-icon val)
-     (dolist (buf (buffer-list))
-       (with-current-buffer buf
-         (when (bound-and-true-p flymake-mode)
-           (doom-modeline-update-flymake)))))))
-
-(doom-modeline-add-variable-watcher
- 'doom-modeline-check-icon
- (lambda (_sym val op _where)
-   (when (eq op 'set)
-     (setq doom-modeline-check-icon val)
-     (dolist (buf (buffer-list))
-       (with-current-buffer buf
-         (when (bound-and-true-p flymake-mode)
-           (doom-modeline-update-flymake)))))))
-
-(doom-modeline-add-variable-watcher
- 'doom-modeline-unicode-fallback
- (lambda (_sym val op _where)
-   (when (eq op 'set)
-     (setq doom-modeline-unicode-fallback val)
-     (dolist (buf (buffer-list))
-       (with-current-buffer buf
-         (when (bound-and-true-p flymake-mode)
-           (doom-modeline-update-flymake)))))))
-
-(doom-modeline-add-variable-watcher
- 'doom-modeline-check-simple-format
- (lambda (_sym val op _where)
-   (when (eq op 'set)
-     (setq doom-modeline-check-simple-format val)
-     (dolist (buf (buffer-list))
-       (with-current-buffer buf
-         (when (bound-and-true-p flymake-mode)
-           (doom-modeline-update-flymake)))))))
-
-(doom-modeline-def-segment check
-  "Displays color-coded error status in the current buffer with pretty icons."
-  (when-let ((sep (doom-modeline-spc))
-             (vsep (doom-modeline-vspc))
-             (seg (cond
-                   ((and (bound-and-true-p flymake-mode)
-                         (bound-and-true-p flymake--state)) ; only support 26+
-                    doom-modeline--flymake)
-                   ((and (bound-and-true-p flycheck-mode)
-                         (bound-and-true-p flycheck--automatically-enabled-checkers))
-                    doom-modeline--flycheck))))
-    (concat
-     sep
-     (let ((str))
-       (dolist (s (split-string seg " "))
-         (setq str
-               (concat str
-                       (if (string-match-p "^[0-9]+$" s)
-                           (concat vsep
-                                   (doom-modeline-display-text s)
-                                   vsep)
-                         (doom-modeline-display-icon s)))))
-       (propertize str
-                   'help-echo (get-text-property 0 'help-echo seg)
-                   'mouse-face 'doom-modeline-highlight
-                   'local-map (get-text-property 0 'local-map seg)))
-     sep)))
-
-
-;;
-;; Word Count
-;;
-
-(doom-modeline-def-segment word-count
-  "The buffer word count.
-Displayed when in a major mode in `doom-modeline-continuous-word-count-modes'.
-Respects `doom-modeline-enable-word-count'."
-  (when (and doom-modeline-enable-word-count
-             (member major-mode doom-modeline-continuous-word-count-modes))
-    (propertize (format " %dW" (count-words (point-min) (point-max)))
-                'face (doom-modeline-face))))
-
-
-;;
-;; Selection
-;;
-
-(defsubst doom-modeline-column (pos)
-  "Get the column of the position `POS'."
-  (save-excursion (goto-char pos)
-                  (current-column)))
-
-(doom-modeline-def-segment selection-info
-  "Information about the current selection.
-
-Such as how many characters and lines are selected, or the NxM dimensions of a
-block selection."
-  (when (and (or mark-active (and (bound-and-true-p evil-local-mode)
-                                  (eq evil-state 'visual)))
-             (doom-modeline--active))
-    (cl-destructuring-bind (beg . end)
-      (if (and (bound-and-true-p evil-local-mode) (eq evil-state 'visual))
-          (cons evil-visual-beginning evil-visual-end)
-        (cons (region-beginning) (region-end)))
-      (propertize
-       (let ((lines (count-lines beg (min end (point-max)))))
-         (concat
-          " "
-          (cond ((or (bound-and-true-p rectangle-mark-mode)
-                     (and (bound-and-true-p evil-visual-selection)
-                          (eq 'block evil-visual-selection)))
-                 (let ((cols (abs (- (doom-modeline-column end)
-                                     (doom-modeline-column beg)))))
-                   (format "%dx%dB" lines cols)))
-                ((and (bound-and-true-p evil-visual-selection)
-                      (eq evil-visual-selection 'line))
-                 (format "%dL" lines))
-                ((> lines 1)
-                 (format "%dC %dL" (- end beg) lines))
-                (t
-                 (format "%dC" (- end beg))))
-          (when doom-modeline-enable-word-count
-            (format " %dW" (count-words beg end)))
-          " "))
-       'face 'doom-modeline-emphasis))))
-
-
-;;
-;; Matches (macro, anzu, evil-substitute, iedit, symbol-overlay and multi-cursors)
-;;
-
-(defsubst doom-modeline--macro-recording ()
-  "Display current Emacs or evil macro being recorded."
-  (when (and (doom-modeline--active)
-             (or defining-kbd-macro executing-kbd-macro))
-    (let ((sep (propertize " " 'face 'doom-modeline-panel))
-          (vsep (propertize " " 'face
-                            '(:inherit (doom-modeline-panel variable-pitch))))
-          (macro-name (if (bound-and-true-p evil-this-macro)
-                          (format " @%s "
-                                  (char-to-string evil-this-macro))
-                        "Macro")))
-      (concat
-       sep
-       (if doom-modeline-always-show-macro-register
-           (propertize macro-name 'face 'doom-modeline-panel)
-         (concat
-          (doom-modeline-icon 'mdicon "nf-md-record" "●"
-                              macro-name
-                              :face '(:inherit (doom-modeline-urgent doom-modeline-panel))
-                              :v-adjust 0.15)
-          vsep
-          (doom-modeline-icon 'mdicon "nf-md-menu_right" "▶" ">"
-                              :face 'doom-modeline-panel
-                              :v-adjust 0.15)))
-       sep))))
-
-;; `anzu' and `evil-anzu' expose current/total state that can be displayed in the
-;; mode-line.
-(defun doom-modeline-fix-anzu-count (positions here)
-  "Calulate anzu count via POSITIONS and HERE."
-  (cl-loop with i = 0
-           for (start . end) in positions
-           do (cl-incf i)
-           when (and (>= here start) (<= here end))
-           return i
-           finally return 0))
-
-(advice-add #'anzu--where-is-here :override #'doom-modeline-fix-anzu-count)
-
-(setq anzu-cons-mode-line-p nil) ; manage modeline segment ourselves
-;; Ensure anzu state is cleared when searches & iedit are done
-(with-eval-after-load 'anzu
-  (add-hook 'isearch-mode-end-hook #'anzu--reset-status t)
-  (add-hook 'iedit-mode-end-hook #'anzu--reset-status)
-  (advice-add #'evil-force-normal-state :after #'anzu--reset-status)
-  ;; Fix matches segment mirroring across all buffers
-  (mapc #'make-variable-buffer-local
-        '(anzu--total-matched
-          anzu--current-position anzu--state anzu--cached-count
-          anzu--cached-positions anzu--last-command
-          anzu--last-isearch-string anzu--overflow-p)))
-
-(defsubst doom-modeline--anzu ()
-  "Show the match index and total number thereof.
-Requires `anzu', also `evil-anzu' if using `evil-mode' for compatibility with
-`evil-search'."
-  (when (and (bound-and-true-p anzu--state)
-             (not (bound-and-true-p iedit-mode)))
-    (propertize
-     (let ((here anzu--current-position)
-           (total anzu--total-matched))
-       (cond ((eq anzu--state 'replace-query)
-              (format " %d replace " anzu--cached-count))
-             ((eq anzu--state 'replace)
-              (format " %d/%d " here total))
-             (anzu--overflow-p
-              (format " %s+ " total))
-             (t
-              (format " %s/%d " here total))))
-     'face (doom-modeline-face 'doom-modeline-panel))))
-
-(defsubst doom-modeline--evil-substitute ()
-  "Show number of matches for `evil-ex' in real time.
-The number of matches contains substitutions and highlightings."
-  (when (and (bound-and-true-p evil-local-mode)
-             (or (assq 'evil-ex-substitute evil-ex-active-highlights-alist)
-                 (assq 'evil-ex-global-match evil-ex-active-highlights-alist)
-                 (assq 'evil-ex-buffer-match evil-ex-active-highlights-alist)))
-    (propertize
-     (let ((range (if evil-ex-range
-                      (cons (car evil-ex-range) (cadr evil-ex-range))
-                    (cons (line-beginning-position) (line-end-position))))
-           (pattern (car-safe (evil-delimited-arguments evil-ex-argument 2))))
-       (if pattern
-           (format " %s matches " (how-many pattern (car range) (cdr range)))
-         " - "))
-     'face (doom-modeline-face 'doom-modeline-panel))))
-
-(defun doom-modeline-themes--overlay-sort (a b)
-  "Sort overlay A and B."
-  (< (overlay-start a) (overlay-start b)))
-
-(defsubst doom-modeline--iedit ()
-  "Show the number of iedit regions matches + what match you're on."
-  (when (and (bound-and-true-p iedit-mode)
-             (bound-and-true-p iedit-occurrences-overlays))
-    (propertize
-     (let ((this-oc (or (let ((inhibit-message t))
-                          (iedit-find-current-occurrence-overlay))
-                        (save-excursion (iedit-prev-occurrence)
-                                        (iedit-find-current-occurrence-overlay))))
-           (length (length iedit-occurrences-overlays)))
-       (format " %s/%d "
-               (if this-oc
-                   (- length
-                      (length (memq this-oc (sort (append iedit-occurrences-overlays nil)
-                                                  #'doom-modeline-themes--overlay-sort)))
-                      -1)
-                 "-")
-               length))
-     'face (doom-modeline-face 'doom-modeline-panel))))
-
-(defsubst doom-modeline--symbol-overlay ()
-  "Show the number of matches for symbol overlay."
-  (when (and (doom-modeline--active)
-             (bound-and-true-p symbol-overlay-keywords-alist)
-             (not (bound-and-true-p symbol-overlay-temp-symbol))
-             (not (bound-and-true-p iedit-mode)))
-    (let* ((keyword (symbol-overlay-assoc (symbol-overlay-get-symbol t)))
-           (symbol (car keyword))
-           (before (symbol-overlay-get-list -1 symbol))
-           (after (symbol-overlay-get-list 1 symbol))
-           (count (length before)))
-      (if (symbol-overlay-assoc symbol)
-          (propertize
-           (format (concat  " %d/%d " (and (cadr keyword) "in scope "))
-                   (+ count 1)
-                   (+ count (length after)))
-           'face (doom-modeline-face 'doom-modeline-panel))))))
-
-(defsubst doom-modeline--multiple-cursors ()
-  "Show the number of multiple cursors."
-  (cl-destructuring-bind (count . face)
-    (cond ((bound-and-true-p multiple-cursors-mode)
-           (cons (mc/num-cursors)
-                 (doom-modeline-face 'doom-modeline-panel)))
-          ((bound-and-true-p evil-mc-cursor-list)
-           (cons (length evil-mc-cursor-list)
-                 (doom-modeline-face (if evil-mc-frozen
-                                         'doom-modeline-bar
-                                       'doom-modeline-panel))))
-          ((cons nil nil)))
-    (when count
-      (concat (propertize " " 'face face)
-              (if (doom-modeline-icon-displayable-p)
-                  (doom-modeline-icon 'faicon "nf-fa-i_cursor" "" "" :face face)
-                (propertize "I"
-                            'face `(:inherit ,face :height 1.4 :weight normal)
-                            'display '(raise -0.1)))
-              (propertize " "
-                          'face `(:inherit (variable-pitch ,face)))
-              (propertize (format "%d " count)
-                          'face face)))))
-
-(defsubst doom-modeline--phi-search ()
-  "Show the number of matches for `phi-search' and `phi-replace'."
-  (when (and (doom-modeline--active)
-             (bound-and-true-p phi-search--overlays))
-    (let ((total (length phi-search--overlays))
-          (selection phi-search--selection))
-      (when selection
-        (propertize
-         (format " %d/%d " (1+ selection) total)
-         'face (doom-modeline-face 'doom-modeline-panel))))))
-
-(defun doom-modeline--override-phi-search (orig-fun &rest args)
-  "Override the mode-line of `phi-search' and `phi-replace'.
-Apply ORIG-FUN with ARGS."
-  (if (bound-and-true-p doom-modeline-mode)
-      (apply orig-fun mode-line-format (cdr args))
-    (apply orig-fun args)))
-(advice-add #'phi-search--initialize :around #'doom-modeline--override-phi-search)
-
-(defsubst doom-modeline--buffer-size ()
-  "Show buffer size."
-  (when size-indication-mode
-    (let ((sep (doom-modeline-spc)))
-      (concat sep
-              (propertize "%I"
-                          'face (doom-modeline-face)
-                          'help-echo "Buffer size
-mouse-1: Display Line and Column Mode Menu"
-                          'mouse-face 'doom-modeline-highlight
-                          'local-map mode-line-column-line-number-mode-map)
-              sep))))
-
-(doom-modeline-def-segment matches
-  "Displays matches.
-
-Including:
-1. the currently recording macro, 2. A current/total for the
-current search term (with `anzu'), 3. The number of substitutions being
-conducted with `evil-ex-substitute', and/or 4. The number of active `iedit'
-regions, 5. The current/total for the highlight term (with `symbol-overlay'),
-6. The number of active `multiple-cursors'."
-  (let ((meta (concat (doom-modeline--macro-recording)
-                      (doom-modeline--anzu)
-                      (doom-modeline--phi-search)
-                      (doom-modeline--evil-substitute)
-                      (doom-modeline--iedit)
-                      (doom-modeline--symbol-overlay)
-                      (doom-modeline--multiple-cursors))))
-    (or (and (not (string-empty-p meta)) meta)
-        (doom-modeline--buffer-size))))
-
-(doom-modeline-def-segment buffer-size
-  "Display buffer size."
-  (doom-modeline--buffer-size))
-
-;;
-;; Media
-;;
-
-(doom-modeline-def-segment media-info
-  "Metadata regarding the current file, such as dimensions for images."
-  ;; TODO: Include other information
-  (cond ((eq major-mode 'image-mode)
-         (cl-destructuring-bind (width . height)
-           (when (fboundp 'image-size)
-             (image-size (image-get-display-property) :pixels))
-           (format "  %dx%d  " width height)))))
-
-
-;;
-;; Bars
-;;
-
-(defvar doom-modeline--bar-active nil)
-(defvar doom-modeline--bar-inactive nil)
-
-(defsubst doom-modeline--bar ()
-  "The default bar regulates the height of the mode-line in GUI."
-  (unless (and doom-modeline--bar-active doom-modeline--bar-inactive)
-    (let ((width doom-modeline-bar-width)
-          (height (max doom-modeline-height (doom-modeline--font-height))))
-      (setq doom-modeline--bar-active
-            (doom-modeline--create-bar-image 'doom-modeline-bar width height)
-            doom-modeline--bar-inactive
-            (doom-modeline--create-bar-image
-             'doom-modeline-bar-inactive width height))))
-  (if (doom-modeline--active)
-      doom-modeline--bar-active
-    doom-modeline--bar-inactive))
-
-(defun doom-modeline-refresh-bars ()
-  "Refresh mode-line bars on next redraw."
-  (setq doom-modeline--bar-active nil
-        doom-modeline--bar-inactive nil))
-
-(cl-defstruct doom-modeline--hud-cache active inactive top-margin bottom-margin)
-
-(defsubst doom-modeline--hud ()
-  "Powerline's hud segment reimplemented in the style of Doom's bar segment."
-  (let* ((ws (window-start))
-         (we (window-end))
-         (bs (buffer-size))
-         (height (max doom-modeline-height (doom-modeline--font-height)))
-         (top-margin (if (zerop bs)
-                         0
-                       (/ (* height (1- ws)) bs)))
-         (bottom-margin (if (zerop bs)
-                            0
-                          (max 0 (/ (* height (- bs we 1)) bs))))
-         (cache (or (window-parameter nil 'doom-modeline--hud-cache)
-                    (set-window-parameter
-                     nil
-                     'doom-modeline--hud-cache
-                     (make-doom-modeline--hud-cache)))))
-    (unless (and (doom-modeline--hud-cache-active cache)
-                 (doom-modeline--hud-cache-inactive cache)
-                 (= top-margin (doom-modeline--hud-cache-top-margin cache))
-                 (= bottom-margin
-                    (doom-modeline--hud-cache-bottom-margin cache)))
-      (setf (doom-modeline--hud-cache-active cache)
-            (doom-modeline--create-hud-image
-             'doom-modeline-bar 'default doom-modeline-bar-width
-             height top-margin bottom-margin)
-            (doom-modeline--hud-cache-inactive cache)
-            (doom-modeline--create-hud-image
-             'doom-modeline-bar-inactive 'default doom-modeline-bar-width
-             height top-margin bottom-margin)
-            (doom-modeline--hud-cache-top-margin cache) top-margin
-            (doom-modeline--hud-cache-bottom-margin cache) bottom-margin))
-    (if (doom-modeline--active)
-        (doom-modeline--hud-cache-active cache)
-      (doom-modeline--hud-cache-inactive cache))))
-
-(defun doom-modeline-invalidate-huds ()
-  "Invalidate all cached hud images."
-  (dolist (frame (frame-list))
-    (dolist (window (window-list frame))
-      (set-window-parameter window 'doom-modeline--hud-cache nil))))
-
-(doom-modeline-add-variable-watcher
- 'doom-modeline-height
- (lambda (_sym val op _where)
-   (when (and (eq op 'set) (integerp val))
-     (doom-modeline-refresh-bars)
-     (doom-modeline-invalidate-huds))))
-
-(doom-modeline-add-variable-watcher
- 'doom-modeline-bar-width
- (lambda (_sym val op _where)
-   (when (and (eq op 'set) (integerp val))
-     (doom-modeline-refresh-bars)
-     (doom-modeline-invalidate-huds))))
-
-(doom-modeline-add-variable-watcher
- 'doom-modeline-icon
- (lambda (_sym _val op _where)
-   (when (eq op 'set)
-     (doom-modeline-refresh-bars)
-     (doom-modeline-invalidate-huds))))
-
-(doom-modeline-add-variable-watcher
- 'doom-modeline-unicode-fallback
- (lambda (_sym _val op _where)
-   (when (eq op 'set)
-     (doom-modeline-refresh-bars)
-     (doom-modeline-invalidate-huds))))
-
-(add-hook 'window-configuration-change-hook #'doom-modeline-refresh-bars)
-(add-hook 'window-configuration-change-hook #'doom-modeline-invalidate-huds)
-
-(doom-modeline-def-segment bar
-  "The bar regulates the height of the `doom-modeline' in GUI."
-  (when (display-graphic-p)
-    (concat
-     (if doom-modeline-hud
-         (doom-modeline--hud)
-       (doom-modeline--bar))
-     (doom-modeline-spc))))
-
-(doom-modeline-def-segment hud
-  "Powerline's hud segment reimplemented in the style of bar segment."
-  (when (display-graphic-p)
-    (concat
-     (doom-modeline--hud)
-     (doom-modeline-spc))))
-
-
-;;
-;; Window number
-;;
-
-;; HACK: `ace-window-display-mode' should respect the ignore buffers.
-(defun doom-modeline-aw-update ()
-  "Update ace-window-path window parameter for all windows.
-Ensure all windows are labeled so the user can select a specific
-one. The ignored buffers are excluded unless `aw-ignore-on' is nil."
-  (let ((ignore-window-parameters t))
-    (avy-traverse
-     (avy-tree (aw-window-list) aw-keys)
-     (lambda (path leaf)
-       (set-window-parameter
-        leaf 'ace-window-path
-        (propertize
-         (apply #'string (reverse path))
-         'face 'aw-mode-line-face))))))
-(advice-add #'aw-update :override #'doom-modeline-aw-update)
-
-;; Remove original window number of `ace-window-display-mode'.
-(add-hook 'ace-window-display-mode-hook
-          (lambda ()
-            (setq-default mode-line-format
-                          (assq-delete-all 'ace-window-display-mode
-                                           (default-value 'mode-line-format)))))
-
-(advice-add #'window-numbering-install-mode-line :override #'ignore)
-(advice-add #'window-numbering-clear-mode-line :override #'ignore)
-(advice-add #'winum--install-mode-line :override #'ignore)
-(advice-add #'winum--clear-mode-line :override #'ignore)
-
-(doom-modeline-def-segment window-number
-  "The current window number."
-  (let ((num (cond
-              ((bound-and-true-p ace-window-display-mode)
-               (aw-update)
-               (window-parameter (selected-window) 'ace-window-path))
-              ((bound-and-true-p winum-mode)
-               (setq winum-auto-setup-mode-line nil)
-               (winum-get-number-string))
-              ((bound-and-true-p window-numbering-mode)
-               (window-numbering-get-number-string))
-              (t ""))))
-    (when (and (length> num 0)
-               (length> (cl-mapcan
-                         (lambda (frame)
-                           ;; Exclude minibuffer, tooltip and child frames
-                           (unless (or (and (fboundp 'frame-parent) (frame-parent frame))
-                                       (string= (frame-parameter frame 'name)
-                                                (alist-get 'name (bound-and-true-p tooltip-frame-parameters))))
-                             (window-list frame 'never)))
-                         (visible-frame-list))
-                        1))
-      (propertize (format " %s " num)
-                  'face (doom-modeline-face 'doom-modeline-buffer-major-mode)))))
-
-
-;;
-;; Workspace
-;;
-
-(doom-modeline-def-segment workspace-name
-  "The current workspace name or number.
-Requires `eyebrowse-mode' to be enabled or `tab-bar-mode' tabs to be created."
-  (when doom-modeline-workspace-name
-    (when-let
-        ((name (cond
-                ((and (bound-and-true-p eyebrowse-mode)
-                      (length> (eyebrowse--get 'window-configs) 1))
-                 (setq mode-line-misc-info
-                       (assq-delete-all 'eyebrowse-mode mode-line-misc-info))
-                 (when-let*
-                     ((num (eyebrowse--get 'current-slot))
-                      (tag (nth 2 (assoc num (eyebrowse--get 'window-configs)))))
-                   (if (length> tag 0) tag (int-to-string num))))
-                ((and (fboundp 'tab-bar-mode)
-                      (length> (frame-parameter nil 'tabs) 1))
-                 (let* ((current-tab (tab-bar--current-tab))
-                        (tab-index (tab-bar--current-tab-index))
-                        (explicit-name (alist-get 'explicit-name current-tab))
-                        (tab-name (alist-get 'name current-tab)))
-                   (if explicit-name tab-name (+ 1 tab-index)))))))
-      (propertize (format " %s " name)
-                  'face (doom-modeline-face 'doom-modeline-buffer-major-mode)))))
-
-
-;;
-;; Perspective
-;;
-
-(defvar-local doom-modeline--persp-name nil)
-(defun doom-modeline-update-persp-name (&rest _)
-  "Update perspective name in mode-line."
-  (setq doom-modeline--persp-name
-        ;; Support `persp-mode', while not support `perspective'
-        (when (and doom-modeline-persp-name
-                   (bound-and-true-p persp-mode)
-                   (fboundp 'safe-persp-name)
-                   (fboundp 'get-current-persp))
-          (let* ((persp (get-current-persp))
-                 (name (safe-persp-name persp))
-                 (face (if (and persp
-                                (not (persp-contain-buffer-p (current-buffer) persp)))
-                           'doom-modeline-persp-buffer-not-in-persp
-                         'doom-modeline-persp-name))
-                 (icon (doom-modeline-icon 'octicon "nf-oct-repo" "🖿" "#"
-                                           :face `(:inherit ,face :slant normal))))
-            (when (or doom-modeline-display-default-persp-name
-                      (not (string-equal persp-nil-name name)))
-              (concat " "
-                      (propertize (concat (and doom-modeline-persp-icon
-                                               (concat icon
-                                                       (propertize
-                                                        " "
-                                                        'display '((space :relative-width 0.5)))))
-                                          (propertize name 'face face))
-                                  'help-echo "mouse-1: Switch perspective
-mouse-2: Show help for minor mode"
-                                  'mouse-face 'doom-modeline-highlight
-                                  'local-map (let ((map (make-sparse-keymap)))
-                                               (define-key map [mode-line mouse-1]
-                                                 #'persp-switch)
-                                               (define-key map [mode-line mouse-2]
-                                                 (lambda ()
-                                                   (interactive)
-                                                   (describe-function 'persp-mode)))
-                                               map))
-                      " "))))))
-
-(add-hook 'buffer-list-update-hook #'doom-modeline-update-persp-name)
-(add-hook 'find-file-hook #'doom-modeline-update-persp-name)
-(add-hook 'persp-activated-functions #'doom-modeline-update-persp-name)
-(add-hook 'persp-renamed-functions #'doom-modeline-update-persp-name)
-(advice-add #'lv-message :after #'doom-modeline-update-persp-name)
-
-(doom-modeline-def-segment persp-name
-  "The current perspective name."
-  (when (doom-modeline--segment-visible 'persp-name)
-    doom-modeline--persp-name))
-
-
-;;
-;; Misc info
-;;
-
-(doom-modeline-def-segment misc-info
-  "Mode line construct for miscellaneous information.
-By default, this shows the information specified by `global-mode-string'."
-  (when (and (doom-modeline--segment-visible 'misc-info)
-             (or doom-modeline-display-misc-in-all-mode-lines
-                 (doom-modeline--active)))
-    (doom-modeline-display-text
-     (format-mode-line mode-line-misc-info))))
-
-
-;;
-;; Position
-;;
-
-(doom-modeline-def-segment buffer-position
-  "The buffer position information."
-  (let ((visible (doom-modeline--segment-visible 'buffer-position))
-        (sep (doom-modeline-spc))
-        (wsep (doom-modeline-wspc))
-        (face (doom-modeline-face))
-        (help-echo "Buffer percentage\n\
-mouse-1: Display Line and Column Mode Menu")
-        (mouse-face 'doom-modeline-highlight)
-        (local-map mode-line-column-line-number-mode-map))
-    `(,wsep
-
-      ;; Line and column
-      (:propertize
-       ((line-number-mode
-         (column-number-mode
-          (doom-modeline-column-zero-based
-           doom-modeline-position-column-line-format
-           ,(string-replace
-             "%c" "%C" (car doom-modeline-position-column-line-format)))
-          doom-modeline-position-line-format)
-         (column-number-mode
-          (doom-modeline-column-zero-based
-           doom-modeline-position-column-format
-           ,(string-replace
-             "%c" "%C" (car doom-modeline-position-column-format)))))
-        (doom-modeline-total-line-number
-         ,(and doom-modeline-total-line-number
-               (format "/%d" (line-number-at-pos (point-max))))))
-       face ,face
-       help-echo ,help-echo
-       mouse-face ,mouse-face
-       local-map ,local-map)
-
-      ((or line-number-mode column-number-mode)
-       ,sep)
-
-      ;; Position
-      (,visible
-       ,(cond
-         ((bound-and-true-p nyan-mode)
-          (concat sep (nyan-create) sep))
-         ((bound-and-true-p poke-line-mode)
-          (concat sep (poke-line-create) sep))
-         ((bound-and-true-p mlscroll-mode)
-          (concat sep
-                  (let ((mlscroll-right-align nil))
-                    (format-mode-line (mlscroll-mode-line)))
-                  sep))
-         ((bound-and-true-p sml-modeline-mode)
-          (concat sep (sml-modeline-create) sep))
-         (t "")))
-
-      ;; Percent position
-      (doom-modeline-percent-position
-       ((:propertize ("" doom-modeline-percent-position)
-         face ,face
-         help-echo ,help-echo
-         mouse-face ,mouse-face
-         local-map ,local-map)
-        ,sep)))))
-
-;;
-;; Party parrot
-;;
-(doom-modeline-def-segment parrot
-  "The party parrot animated icon. Requires `parrot-mode' to be enabled."
-  (when (and (doom-modeline--segment-visible 'parrot)
-             (bound-and-true-p parrot-mode))
-    (concat (doom-modeline-wspc)
-            (parrot-create)
-            (doom-modeline-spc))))
-
-;;
-;; Modals (evil, overwrite, god, ryo and xah-fly-keys, etc.)
-;;
-
-(defun doom-modeline--modal-icon (text face help-echo &optional icon unicode)
-  "Display the model icon with FACE and HELP-ECHO.
-TEXT is alternative if icon is not available."
-  (propertize (doom-modeline-icon
-               'mdicon
-               (and doom-modeline-modal-icon
-                    (or (and doom-modeline-modal-modern-icon icon)
-                        "nf-md-record"))
-               (or (and doom-modeline-modal-modern-icon unicode) "●")
-               text
-               :face (doom-modeline-face face))
-              'help-echo help-echo))
-
-(defsubst doom-modeline--evil ()
-  "The current evil state. Requires `evil-mode' to be enabled."
-  (when (bound-and-true-p evil-local-mode)
-    (doom-modeline--modal-icon
-     (let ((tag (evil-state-property evil-state :tag t)))
-       (if (stringp tag) tag (funcall tag)))
-     (cond
-      ((evil-normal-state-p) 'doom-modeline-evil-normal-state)
-      ((evil-emacs-state-p) 'doom-modeline-evil-emacs-state)
-      ((evil-insert-state-p) 'doom-modeline-evil-insert-state)
-      ((evil-motion-state-p) 'doom-modeline-evil-motion-state)
-      ((evil-visual-state-p) 'doom-modeline-evil-visual-state)
-      ((evil-operator-state-p) 'doom-modeline-evil-operator-state)
-      ((evil-replace-state-p) 'doom-modeline-evil-replace-state)
-      (t 'doom-modeline-evil-user-state))
-     (evil-state-property evil-state :name t)
-     (cond
-      ((evil-normal-state-p) "nf-md-alpha_n_circle")
-      ((evil-emacs-state-p) "nf-md-alpha_e_circle")
-      ((evil-insert-state-p) "nf-md-alpha_i_circle")
-      ((evil-motion-state-p) "nf-md-alpha_m_circle")
-      ((evil-visual-state-p) "nf-md-alpha_v_circle")
-      ((evil-operator-state-p) "nf-md-alpha_o_circle")
-      ((evil-replace-state-p) "nf-md-alpha_r_circle")
-      (t "nf-md-alpha_u_circle"))
-     (cond
-      ((evil-normal-state-p) "🅝")
-      ((evil-emacs-state-p) "🅔")
-      ((evil-insert-state-p) "🅘")
-      ((evil-motion-state-p) "🅜")
-      ((evil-visual-state-p) "🅥")
-      ((evil-operator-state-p) "🅞")
-      ((evil-replace-state-p) "🅡")
-      (t "🅤")))))
-
-(defsubst doom-modeline--overwrite ()
-  "The current overwrite state which is enabled by command `overwrite-mode'."
-  (when (and (bound-and-true-p overwrite-mode)
-             (not (bound-and-true-p evil-local-mode)))
-    (doom-modeline--modal-icon
-     "<W>" 'doom-modeline-overwrite "Overwrite mode"
-     "nf-md-marker" "🅦")))
-
-(defsubst doom-modeline--god ()
-  "The current god state which is enabled by the command `god-mode'."
-  (when (bound-and-true-p god-local-mode)
-    (doom-modeline--modal-icon
-     "<G>" 'doom-modeline-god "God mode"
-     "nf-md-account_circle" "🅖")))
-
-(defsubst doom-modeline--ryo ()
-  "The current ryo-modal state which is enabled by the command `ryo-modal-mode'."
-  (when (bound-and-true-p ryo-modal-mode)
-    (doom-modeline--modal-icon
-     "<R>" 'doom-modeline-ryo "Ryo modal"
-     "nf-md-star_circle" "✪")))
-
-(defsubst doom-modeline--xah-fly-keys ()
-  "The current `xah-fly-keys' state."
-  (when (bound-and-true-p xah-fly-keys)
-    (if xah-fly-insert-state-p
-        (doom-modeline--modal-icon
-         "<I>" 'doom-modeline-fly-insert-state "Xah-fly insert mode"
-         "nf-md-airplane_edit" "🛧")
-      (doom-modeline--modal-icon
-       "<C>" 'doom-modeline-fly-normal-state "Xah-fly command mode"
-       "nf-md-airplane_cog" "🛧"))))
-
-(defsubst doom-modeline--boon ()
-  "The current Boon state. Requires `boon-mode' to be enabled."
-  (when (bound-and-true-p boon-local-mode)
-    (doom-modeline--modal-icon
-     (boon-state-string)
-     (cond
-      (boon-command-state 'doom-modeline-boon-command-state)
-      (boon-insert-state 'doom-modeline-boon-insert-state)
-      (boon-special-state 'doom-modeline-boon-special-state)
-      (boon-off-state 'doom-modeline-boon-off-state)
-      (t 'doom-modeline-boon-off-state))
-     (boon-modeline-string)
-     "nf-md-coffee" "🍵")))
-
-(defsubst doom-modeline--meow ()
-  "The current Meow state. Requires `meow-mode' to be enabled."
-  (when (bound-and-true-p meow-mode)
-    (doom-modeline--modal-icon
-     (substring-no-properties meow--indicator)
-     (cond
-      ((meow-normal-mode-p) 'doom-modeline-meow-normal-state)
-      ((meow-insert-mode-p) 'doom-modeline-meow-insert-state)
-      ((meow-beacon-mode-p) 'doom-modeline-meow-beacon-state)
-      ((meow-motion-mode-p) 'doom-modeline-meow-motion-state)
-      ((meow-keypad-mode-p) 'doom-modeline-meow-keypad-state)
-      (t 'doom-modeline-meow-normal-state))
-     (symbol-name (meow--current-state))
-     (cond
-      ((meow-normal-mode-p) "nf-md-alpha_n_circle")
-      ((meow-insert-mode-p) "nf-md-alpha_i_circle")
-      ((meow-beacon-mode-p) "nf-md-alpha_b_circle")
-      ((meow-motion-mode-p) "nf-md-alpha_m_circle")
-      ((meow-keypad-mode-p) "nf-md-alpha_k_circle")
-      (t "nf-md-alpha_n_circle"))
-     (cond
-      ((meow-normal-mode-p) "🅝")
-      ((meow-insert-mode-p) "🅘")
-      ((meow-beacon-mode-p) "🅑")
-      ((meow-motion-mode-p) "🅜")
-      ((meow-keypad-mode-p) "🅚")
-      (t "🅝")))))
-
-(doom-modeline-def-segment modals
-  "Displays modal editing states.
-
-Including `evil', `overwrite', `god', `ryo' and `xha-fly-kyes', etc."
-  (when doom-modeline-modal
-    (let* ((evil (doom-modeline--evil))
-           (ow (doom-modeline--overwrite))
-           (god (doom-modeline--god))
-           (ryo (doom-modeline--ryo))
-           (xf (doom-modeline--xah-fly-keys))
-           (boon (doom-modeline--boon))
-           (vsep (doom-modeline-vspc))
-           (meow (doom-modeline--meow))
-           (sep (and (or evil ow god ryo xf boon) (doom-modeline-spc))))
-      (concat sep
-              (and evil (concat evil (and (or ow god ryo xf boon meow) vsep)))
-              (and ow (concat ow (and (or god ryo xf boon meow) vsep)))
-              (and god (concat god (and (or ryo xf boon meow) vsep)))
-              (and ryo (concat ryo (and (or xf boon meow) vsep)))
-              (and xf (concat xf (and (or boon meow) vsep)))
-              (and boon (concat boon (and meow vsep)))
-              meow
-              sep))))
-
-;;
-;; Objed state
-;;
-
-(defvar doom-modeline--objed-active nil)
-
-(defun doom-modeline-update-objed (_ &optional reset)
-  "Update `objed' status, inactive when RESET is true."
-  (setq doom-modeline--objed-active (not reset)))
-
-(setq objed-modeline-setup-func #'doom-modeline-update-objed)
-
-(doom-modeline-def-segment objed-state ()
-  "The current objed state."
-  (when (and doom-modeline--objed-active
-             (doom-modeline--active))
-    (propertize (format " %s(%s) "
-                        (symbol-name objed--object)
-                        (char-to-string (aref (symbol-name objed--obj-state) 0)))
-                'face 'doom-modeline-evil-emacs-state
-                'help-echo (format "Objed object: %s (%s)"
-                                   (symbol-name objed--object)
-                                   (symbol-name objed--obj-state)))))
-
-
-;;
-;; Input method
-;;
-
-(doom-modeline-def-segment input-method
-  "The current input method."
-  (when-let ((im (cond
-                  (current-input-method
-                   current-input-method-title)
-                  ((and (bound-and-true-p evil-local-mode)
-                        (bound-and-true-p evil-input-method))
-                   (nth 3 (assoc default-input-method input-method-alist)))
-                  (t nil)))
-             (sep (doom-modeline-spc)))
-    (concat
-     sep
-     (propertize im
-                 'face (doom-modeline-face
-                        (if (and (bound-and-true-p rime-mode)
-                                 (equal current-input-method "rime"))
-                            (if (and (rime--should-enable-p)
-                                     (not (rime--should-inline-ascii-p)))
-                                'doom-modeline-input-method
-                              'doom-modeline-input-method-alt)
-                          'doom-modeline-input-method))
-                 'help-echo (concat
-                             "Current input method: "
-                             current-input-method
-                             "\n\
-mouse-2: Disable input method\n\
-mouse-3: Describe current input method")
-                 'mouse-face 'doom-modeline-highlight
-                 'local-map mode-line-input-method-map)
-     sep)))
-
-
-;;
-;; Info
-;;
-
-(doom-modeline-def-segment info-nodes
-  "The topic and nodes in the Info buffer."
-  (concat
-   " ("
-   ;; topic
-   (propertize (if (stringp Info-current-file)
-                   (replace-regexp-in-string
-                    "%" "%%"
-                    (file-name-sans-extension
-                     (file-name-nondirectory Info-current-file)))
-                 (format "*%S*" Info-current-file))
-               'face (doom-modeline-face 'doom-modeline-info))
-   ") "
-   ;; node
-   (when Info-current-node
-     (propertize (replace-regexp-in-string
-                  "%" "%%" Info-current-node)
-                 'face (doom-modeline-face 'doom-modeline-buffer-path)
-                 'help-echo
-                 "mouse-1: scroll forward, mouse-3: scroll back"
-                 'mouse-face 'doom-modeline-highlight
-                 'local-map Info-mode-line-node-keymap))))
-
-
-;;
-;; REPL
-;;
-
-(defun doom-modeline-repl-icon (text face)
-  "Display REPL icon (or TEXT in terminal) with FACE."
-  (doom-modeline-icon 'faicon "nf-fa-terminal" "$" text :face face))
-
-(defvar doom-modeline--cider nil)
-
-(defun doom-modeline-update-cider ()
-  "Update cider repl state."
-  (setq doom-modeline--cider
-        (let* ((connected (cider-connected-p))
-               (face (if connected 'doom-modeline-repl-success 'doom-modeline-repl-warning))
-               (repl-buffer (cider-current-repl nil nil))
-               (cider-info (when repl-buffer
-                             (cider--connection-info repl-buffer t)))
-               (icon (doom-modeline-repl-icon "REPL" face)))
-          (propertize icon
-                      'help-echo
-                      (if connected
-                          (format "CIDER Connected %s\nmouse-2: CIDER quit" cider-info)
-                        "CIDER Disconnected\nmouse-1: CIDER jack-in")
-                      'mouse-face 'doom-modeline-highlight
-                      'local-map (let ((map (make-sparse-keymap)))
-                                   (if connected
-                                       (define-key map [mode-line mouse-2]
-                                         #'cider-quit)
-                                     (define-key map [mode-line mouse-1]
-                                       #'cider-jack-in))
-                                   map)))))
-
-(add-hook 'cider-connected-hook #'doom-modeline-update-cider)
-(add-hook 'cider-disconnected-hook #'doom-modeline-update-cider)
-(add-hook 'cider-mode-hook #'doom-modeline-update-cider)
-
-(doom-modeline-def-segment repl
-  "The REPL state."
-  (when doom-modeline-repl
-    (when-let ((icon (when (bound-and-true-p cider-mode)
-                       doom-modeline--cider))
-               (sep (doom-modeline-spc)))
-      (concat
-       sep
-       (doom-modeline-display-icon icon)
-       sep))))
-
-
-;;
-;; LSP
-;;
-
-(defun doom-modeline-lsp-icon (text face)
-  "Display LSP icon (or TEXT in terminal) with FACE."
-  (if doom-modeline-lsp-icon
-      (doom-modeline-icon 'octicon "nf-oct-rocket" "🚀" text :face face)
-    (propertize text 'face face)))
-
-(defvar-local doom-modeline--lsp nil)
-(defun doom-modeline-update-lsp (&rest _)
-  "Update `lsp-mode' state."
-  (setq doom-modeline--lsp
-        (let* ((workspaces (lsp-workspaces))
-               (face (if workspaces 'doom-modeline-lsp-success 'doom-modeline-lsp-warning))
-               (icon (doom-modeline-lsp-icon "LSP" face)))
-          (propertize icon
-                      'help-echo
-                      (if workspaces
-                          (concat "LSP connected "
-                                  (string-join
-                                   (mapcar (lambda (w)
-                                             (format "[%s]\n" (lsp--workspace-print w)))
-                                           workspaces))
-                                  "C-mouse-1: Switch to another workspace folder
-mouse-1: Describe current session
-mouse-2: Quit server
-mouse-3: Reconnect to server")
-                        "LSP Disconnected
-mouse-1: Reload to start server")
-                      'mouse-face 'doom-modeline-highlight
-                      'local-map (let ((map (make-sparse-keymap)))
-                                   (if workspaces
-                                       (progn
-                                         (define-key map [mode-line C-mouse-1]
-                                           #'lsp-workspace-folders-open)
-                                         (define-key map [mode-line mouse-1]
-                                           #'lsp-describe-session)
-                                         (define-key map [mode-line mouse-2]
-                                           #'lsp-workspace-shutdown)
-                                         (define-key map [mode-line mouse-3]
-                                           #'lsp-workspace-restart))
-                                     (progn
-                                       (define-key map [mode-line mouse-1]
-                                         (lambda ()
-                                           (interactive)
-                                           (ignore-errors (revert-buffer t t))))))
-                                   map)))))
-(add-hook 'lsp-before-initialize-hook #'doom-modeline-update-lsp)
-(add-hook 'lsp-after-initialize-hook #'doom-modeline-update-lsp)
-(add-hook 'lsp-after-uninitialized-functions #'doom-modeline-update-lsp)
-(add-hook 'lsp-before-open-hook #'doom-modeline-update-lsp)
-(add-hook 'lsp-after-open-hook #'doom-modeline-update-lsp)
-
-(defun doom-modeline--eglot-pending-count (server)
-  "Get count of pending eglot requests to SERVER."
-  (if (fboundp 'jsonrpc-continuation-count)
-      (jsonrpc-continuation-count server)
-    (hash-table-count (jsonrpc--request-continuations server))))
-
-(defvar-local doom-modeline--eglot nil)
-(defun doom-modeline-update-eglot ()
-  "Update eglot state."
-  (setq doom-modeline--eglot
-        (let* ((server (and (eglot-managed-p) (eglot-current-server)))
-               (nick (and server (eglot-project-nickname server)))
-               (pending (and server (doom-modeline--eglot-pending-count server)))
-               (last-error (and server (jsonrpc-last-error server)))
-               (face (cond (last-error 'doom-modeline-lsp-error)
-                           ((and pending (cl-plusp pending)) 'doom-modeline-lsp-warning)
-                           (nick 'doom-modeline-lsp-success)
-                           (t 'doom-modeline-lsp-warning)))
-               (server-info (and server (eglot--server-info server)))
-               (server-name (or (plist-get server-info :name)
-                                (and server (jsonrpc-name server)) ""))
-               (major-modes (or (and server (eglot--major-modes server)) ""))
-               (icon (doom-modeline-lsp-icon eglot-menu-string face)))
-          (propertize icon
-                      'help-echo (format "Eglot connected [%s]\n%s %s
-mouse-1: Display minor mode menu
-mouse-3: LSP server control menu"
-                                         nick server-name major-modes)
-                      'mouse-face 'doom-modeline-highlight
-                      'local-map (let ((map (make-sparse-keymap)))
-                                   (define-key map [mode-line mouse-1] eglot-menu)
-                                   (define-key map [mode-line mouse-3] eglot-server-menu)
-                                   map)))))
-(add-hook 'eglot-managed-mode-hook #'doom-modeline-update-eglot)
-
-(defvar-local doom-modeline--tags nil)
-(defun doom-modeline-update-tags ()
-  "Update tags state."
-  (setq doom-modeline--tags
-        (propertize
-         (doom-modeline-lsp-icon "Tags" 'doom-modeline-lsp-success)
-         'help-echo "Tags: Citre mode
-mouse-1: Toggle citre mode"
-         'mouse-face 'doom-modeline-highlight
-         'local-map (make-mode-line-mouse-map 'mouse-1 #'citre-mode))))
-(add-hook 'citre-mode-hook #'doom-modeline-update-tags)
-
-(defun doom-modeline-update-lsp-icon ()
-  "Update lsp icon."
-  (cond ((bound-and-true-p lsp-mode)
-         (doom-modeline-update-lsp))
-        ((bound-and-true-p eglot--managed-mode)
-         (doom-modeline-update-eglot))
-        ((bound-and-true-p citre-mode)
-         (doom-modeline-update-tags))))
-
-(doom-modeline-add-variable-watcher
- 'doom-modeline-lsp-icon
- (lambda (_sym val op _where)
-   (when (eq op 'set)
-     (setq doom-modeline-lsp-icon val)
-     (dolist (buf (buffer-list))
-       (with-current-buffer buf
-         (doom-modeline-update-lsp-icon))))))
-
-(doom-modeline-add-variable-watcher
- 'doom-modeline-icon
- (lambda (_sym val op _where)
-   (when (eq op 'set)
-     (setq doom-modeline-icon val)
-     (dolist (buf (buffer-list))
-       (with-current-buffer buf
-         (doom-modeline-update-lsp-icon))))))
-
-(doom-modeline-add-variable-watcher
- 'doom-modeline-unicode-fallback
- (lambda (_sym val op _where)
-   (when (eq op 'set)
-     (setq doom-modeline-unicode-fallback val)
-     (dolist (buf (buffer-list))
-       (with-current-buffer buf
-         (doom-modeline-update-lsp-icon))))))
-
-(doom-modeline-def-segment lsp
-  "The LSP server state."
-  (when doom-modeline-lsp
-    (when-let ((icon (cond ((bound-and-true-p lsp-mode)
-                            doom-modeline--lsp)
-                           ((bound-and-true-p eglot--managed-mode)
-                            doom-modeline--eglot)
-                           ((bound-and-true-p citre-mode)
-                            doom-modeline--tags)))
-               (sep (doom-modeline-spc)))
-      (concat
-       sep
-       (doom-modeline-display-icon icon)
-       sep))))
-
-(defun doom-modeline-override-eglot ()
-  "Override `eglot' mode-line."
-  (if (and doom-modeline-lsp
-           (bound-and-true-p doom-modeline-mode))
-      (setq mode-line-misc-info
-            (delq (assq 'eglot--managed-mode mode-line-misc-info) mode-line-misc-info))
-    (add-to-list 'mode-line-misc-info
-                 `(eglot--managed-mode (" [" eglot--mode-line-format "] ")))))
-(add-hook 'eglot-managed-mode-hook #'doom-modeline-override-eglot)
-(add-hook 'doom-modeline-mode-hook #'doom-modeline-override-eglot)
-
-(doom-modeline-add-variable-watcher
- 'doom-modeline-battery
- (lambda (_sym val op _where)
-   (when (eq op 'set)
-     (setq doom-modeline-lsp val)
-     (doom-modeline-override-eglot))))
-
-
-;;
-;; GitHub
-;;
-
-(defvar doom-modeline--github-notification-number 0)
-(defvar doom-modeline-before-github-fetch-notification-hook nil
-  "Hooks before fetching GitHub notifications.
-Example:
-  (add-hook \\='doom-modeline-before-github-fetch-notification-hook
-          #\\='auth-source-pass-enable)")
-
-(defvar doom-modeline-after-github-fetch-notification-hook nil
-  "Hooks after fetching GitHub notifications.")
-
-(defun doom-modeline--github-fetch-notifications ()
-  "Fetch GitHub notifications."
-  (when (and doom-modeline-github
-             (require 'async nil t))
-    (async-start
-     `(lambda ()
-        ,(async-inject-variables
-          "\\`\\(load-path\\|auth-sources\\|doom-modeline-before-github-fetch-notification-hook\\)\\'")
-        (run-hooks 'doom-modeline-before-github-fetch-notification-hook)
-        (when (require 'ghub nil t)
-          (with-timeout (10)
-            (ignore-errors
-              (when-let* ((username (ghub--username ghub-default-host))
-                          (token (or (ghub--token ghub-default-host username 'forge t)
-                                     (ghub--token ghub-default-host username 'ghub t))))
-                (ghub-get "/notifications"
-                          '((notifications . t))
-                          :host ghub-default-host
-                          :username username
-                          :auth token
-                          :unpaginate t
-                          :noerror t))))))
-     (lambda (result)
-       (message "")                     ; suppress message
-       (setq doom-modeline--github-notification-number (length result))
-       (run-hooks 'doom-modeline-after-github-fetch-notification-hook)))))
-
-(defvar doom-modeline--github-timer nil)
-(defun doom-modeline-github-timer ()
-  "Start/Stop the timer for GitHub fetching."
-  (if (timerp doom-modeline--github-timer)
-      (cancel-timer doom-modeline--github-timer))
-  (setq doom-modeline--github-timer
-        (and doom-modeline-github
-             (run-with-idle-timer 30
-                                  doom-modeline-github-interval
-                                  #'doom-modeline--github-fetch-notifications))))
-
-(doom-modeline-add-variable-watcher
- 'doom-modeline-github
- (lambda (_sym val op _where)
-   (when (eq op 'set)
-     (setq doom-modeline-github val)
-     (doom-modeline-github-timer))))
-
-(doom-modeline-github-timer)
-
-(doom-modeline-def-segment github
-  "The GitHub notifications."
-  (when (and doom-modeline-github
-             (doom-modeline--segment-visible 'github)
-             (numberp doom-modeline--github-notification-number))
-    (let ((sep (doom-modeline-spc)))
-      (concat
-       sep
-       (propertize
-        (concat
-         (doom-modeline-icon 'octicon "nf-oct-mark_github" "🔔" "&"
-                             :face 'doom-modeline-notification)
-         (and (> doom-modeline--github-notification-number 0) (doom-modeline-vspc))
-         (propertize
-          (cond
-           ((<= doom-modeline--github-notification-number 0) "")
-           ((> doom-modeline--github-notification-number 99) "99+")
-           (t (number-to-string doom-modeline--github-notification-number)))
-          'face '(:inherit
-                  (doom-modeline-unread-number doom-modeline-notification))))
-        'help-echo "Github Notifications
-mouse-1: Show notifications
-mouse-3: Fetch notifications"
-        'mouse-face 'doom-modeline-highlight
-        'local-map (let ((map (make-sparse-keymap)))
-                     (define-key map [mode-line mouse-1]
-                       (lambda ()
-                         "Open GitHub notifications page."
-                         (interactive)
-                         (run-with-idle-timer 300 nil #'doom-modeline--github-fetch-notifications)
-                         (browse-url "https://github.com/notifications")))
-                     (define-key map [mode-line mouse-3]
-                       (lambda ()
-                         "Fetching GitHub notifications."
-                         (interactive)
-                         (message "Fetching GitHub notifications...")
-                         (doom-modeline--github-fetch-notifications)))
-                     map))
-       sep))))
-
-
-;;
-;; Debug states
-;;
-
-;; Highlight the doom-modeline while debugging.
-(defvar-local doom-modeline--debug-cookie nil)
-(defun doom-modeline--debug-visual (&rest _)
-  "Update the face of mode-line for debugging."
-  (mapc (lambda (buffer)
-          (with-current-buffer buffer
-            (setq doom-modeline--debug-cookie
-                  (face-remap-add-relative 'doom-modeline 'doom-modeline-debug-visual))
-            (force-mode-line-update)))
-        (buffer-list)))
-
-(defun doom-modeline--normal-visual (&rest _)
-  "Restore the face of mode-line."
-  (mapc (lambda (buffer)
-          (with-current-buffer buffer
-            (when doom-modeline--debug-cookie
-              (face-remap-remove-relative doom-modeline--debug-cookie)
-              (force-mode-line-update))))
-        (buffer-list)))
-
-(add-hook 'dap-session-created-hook #'doom-modeline--debug-visual)
-(add-hook 'dap-terminated-hook #'doom-modeline--normal-visual)
-
-(defun doom-modeline-debug-icon (face)
-  "Display debug icon with FACE and ARGS."
-  (doom-modeline-icon 'codicon "nf-cod-debug" "🐛" "!" :face face))
-
-(defun doom-modeline--debug-dap ()
-  "The current `dap-mode' state."
-  (when (and (bound-and-true-p dap-mode)
-             (bound-and-true-p lsp-mode))
-    (when-let ((session (dap--cur-session)))
-      (when (dap--session-running session)
-        (propertize (doom-modeline-debug-icon 'doom-modeline-info)
-                    'help-echo (format "DAP (%s - %s)
-mouse-1: Display debug hydra
-mouse-2: Display recent configurations
-mouse-3: Disconnect session"
-                                       (dap--debug-session-name session)
-                                       (dap--debug-session-state session))
-                    'mouse-face 'doom-modeline-highlight
-                    'local-map (let ((map (make-sparse-keymap)))
-                                 (define-key map [mode-line mouse-1]
-                                   #'dap-hydra)
-                                 (define-key map [mode-line mouse-2]
-                                   #'dap-debug-recent)
-                                 (define-key map [mode-line mouse-3]
-                                   #'dap-disconnect)
-                                 map))))))
-
-(defvar-local doom-modeline--debug-dap nil)
-(defun doom-modeline-update-debug-dap (&rest _)
-  "Update dap debug state."
-  (setq doom-modeline--debug-dap (doom-modeline--debug-dap)))
-
-(add-hook 'dap-session-created-hook #'doom-modeline-update-debug-dap)
-(add-hook 'dap-session-changed-hook #'doom-modeline-update-debug-dap)
-(add-hook 'dap-terminated-hook #'doom-modeline-update-debug-dap)
-
-(defsubst doom-modeline--debug-edebug ()
-  "The current `edebug' state."
-  (when (bound-and-true-p edebug-mode)
-    (propertize (doom-modeline-debug-icon 'doom-modeline-info)
-                'help-echo (format "EDebug (%s)
-mouse-1: Show help
-mouse-2: Next
-mouse-3: Stop debugging"
-                                   edebug-execution-mode)
-                'mouse-face 'doom-modeline-highlight
-                'local-map (let ((map (make-sparse-keymap)))
-                             (define-key map [mode-line mouse-1]
-                               #'edebug-help)
-                             (define-key map [mode-line mouse-2]
-                               #'edebug-next-mode)
-                             (define-key map [mode-line mouse-3]
-                               #'edebug-stop)
-                             map))))
-
-(defsubst doom-modeline--debug-on-error ()
-  "The current `debug-on-error' state."
-  (when debug-on-error
-    (propertize (doom-modeline-debug-icon 'doom-modeline-urgent)
-                'help-echo "Debug on Error
-mouse-1: Toggle Debug on Error"
-                'mouse-face 'doom-modeline-highlight
-                'local-map (make-mode-line-mouse-map 'mouse-1 #'toggle-debug-on-error))))
-
-(defsubst doom-modeline--debug-on-quit ()
-  "The current `debug-on-quit' state."
-  (when debug-on-quit
-    (propertize (doom-modeline-debug-icon 'doom-modeline-warning)
-                'help-echo "Debug on Quit
-mouse-1: Toggle Debug on Quit"
-                'mouse-face 'doom-modeline-highlight
-                'local-map (make-mode-line-mouse-map 'mouse-1 #'toggle-debug-on-quit))))
-
-(doom-modeline-def-segment debug
-  "The current debug state."
-  (when (doom-modeline--segment-visible 'debug)
-    (let* ((dap doom-modeline--debug-dap)
-           (edebug (doom-modeline--debug-edebug))
-           (on-error (doom-modeline--debug-on-error))
-           (on-quit (doom-modeline--debug-on-quit))
-           (vsep (doom-modeline-vspc))
-           (sep (and (or dap edebug on-error on-quit) (doom-modeline-spc))))
-      (concat sep
-              (and dap (concat dap (and (or edebug on-error on-quit) vsep)))
-              (and edebug (concat edebug (and (or on-error on-quit) vsep)))
-              (and on-error (concat on-error (and on-quit vsep)))
-              on-quit
-              sep))))
-
-
-;;
-;; PDF pages
-;;
-
-(defvar-local doom-modeline--pdf-pages nil)
-(defun doom-modeline-update-pdf-pages ()
-  "Update PDF pages."
-  (setq doom-modeline--pdf-pages
-        (format "  P%d/%d "
-                (or (eval `(pdf-view-current-page)) 0)
-                (pdf-cache-number-of-pages))))
-(add-hook 'pdf-view-change-page-hook #'doom-modeline-update-pdf-pages)
-
-(doom-modeline-def-segment pdf-pages
-  "Display PDF pages."
-  doom-modeline--pdf-pages)
-
-
-;;
-;; `mu4e' notifications
-;;
-
-(doom-modeline-def-segment mu4e
-  "Show notifications of any unread emails in `mu4e'."
-  (when (and doom-modeline-mu4e
-             (doom-modeline--segment-visible 'mu4e))
-    (let ((sep (doom-modeline-spc))
-          (vsep (doom-modeline-vspc))
-          (icon (doom-modeline-icon 'mdicon "nf-md-email" "📧" "#"
-                                    :face 'doom-modeline-notification)))
-      (cond ((and (bound-and-true-p mu4e-alert-mode-line)
-                  (numberp mu4e-alert-mode-line)
-                  ;; don't display if the unread mails count is zero
-                  (> mu4e-alert-mode-line 0))
-             (concat
-              sep
-              (propertize
-               (concat
-                icon
-                vsep
-                (propertize
-                 (if (> mu4e-alert-mode-line doom-modeline-number-limit)
-                     (format "%d+" doom-modeline-number-limit)
-                   (number-to-string mu4e-alert-mode-line))
-                 'face '(:inherit
-                         (doom-modeline-unread-number doom-modeline-notification))))
-               'mouse-face 'doom-modeline-highlight
-               'keymap '(mode-line keymap
-                                   (mouse-1 . mu4e-alert-view-unread-mails)
-                                   (mouse-2 . mu4e-alert-view-unread-mails)
-                                   (mouse-3 . mu4e-alert-view-unread-mails))
-               'help-echo (concat (if (= mu4e-alert-mode-line 1)
-                                      "You have an unread email"
-                                    (format "You have %s unread emails" mu4e-alert-mode-line))
-                                  "\nClick here to view "
-                                  (if (= mu4e-alert-mode-line 1) "it" "them")))
-              sep))
-            ((bound-and-true-p mu4e-modeline-mode)
-             (concat sep icon vsep
-                     (propertize (mu4e--modeline-string)
-                                 'face 'doom-modeline-notification)
-                     sep))))))
-
-(defun doom-modeline-override-mu4e-alert (&rest _)
-  "Delete `mu4e-alert-mode-line' from global modeline string."
-  (when (and (featurep 'mu4e-alert)
-             (bound-and-true-p mu4e-alert-mode-line))
-    (if (and doom-modeline-mu4e
-             (bound-and-true-p doom-modeline-mode))
-        ;; Delete original modeline
-        (progn
-          (setq global-mode-string
-                (delete '(:eval mu4e-alert-mode-line) global-mode-string))
-          (setq mu4e-alert-modeline-formatter #'identity))
-      ;; Recover default settings
-      (setq mu4e-alert-modeline-formatter #'mu4e-alert-default-mode-line-formatter))))
-(advice-add #'mu4e-alert-enable-mode-line-display
-            :after #'doom-modeline-override-mu4e-alert)
-(add-hook 'doom-modeline-mode-hook #'doom-modeline-override-mu4e-alert)
-
-(defun doom-modeline-override-mu4e-modeline (&rest _)
-  "Delete `mu4e-alert-mode-line' from global modeline string."
-  (when (bound-and-true-p mu4e-modeline-mode)
-    (if (and doom-modeline-mu4e
-             (bound-and-true-p doom-modeline-mode))
-        ;; Delete original modeline
-        (setq global-mode-string
-              (delete mu4e--modeline-item global-mode-string))
-      ;; Recover default settings
-      (add-to-list 'global-mode-string mu4e--modeline-item))))
-(add-hook 'mu4e-modeline-mode-hook #'doom-modeline-override-mu4e-modeline)
-(add-hook 'doom-modeline-mode-hook #'doom-modeline-override-mu4e-modeline)
-
-(doom-modeline-add-variable-watcher
- 'doom-modeline-mu4e
- (lambda (_sym val op _where)
-   (when (eq op 'set)
-     (setq doom-modeline-mu4e val)
-     (doom-modeline-override-mu4e-alert)
-     (doom-modeline-override-mu4e-modeline))))
-
-
-;;
-;; `gnus' notifications
-;;
-
-(defvar doom-modeline--gnus-unread-mail 0)
-(defvar doom-modeline--gnus-started nil
-  "Used to determine if gnus has started.")
-(defun doom-modeline-update-gnus-status (&rest _)
-  "Get the total number of unread news of gnus group."
-  (setq doom-modeline--gnus-unread-mail
-        (when (and doom-modeline-gnus
-                   doom-modeline--gnus-started)
-          (let ((total-unread-news-number 0))
-            (mapc (lambda (g)
-                    (let* ((group (car g))
-                           (unread (eval `(gnus-group-unread ,group))))
-                      (when (and (not (seq-contains-p doom-modeline-gnus-excluded-groups group))
-                                 (numberp unread)
-                                 (> unread 0))
-                        (setq total-unread-news-number (+ total-unread-news-number unread)))))
-                  gnus-newsrc-alist)
-            total-unread-news-number))))
-
-;; Update the modeline after changes have been made
-(add-hook 'gnus-group-update-hook #'doom-modeline-update-gnus-status)
-(add-hook 'gnus-summary-update-hook #'doom-modeline-update-gnus-status)
-(add-hook 'gnus-group-update-group-hook #'doom-modeline-update-gnus-status)
-(add-hook 'gnus-after-getting-new-news-hook #'doom-modeline-update-gnus-status)
-
-;; Only start to listen to gnus when gnus is actually running
-(defun doom-modeline-start-gnus-listener ()
-  "Start GNUS listener."
-  (when (and doom-modeline-gnus
-             (not doom-modeline--gnus-started))
-    (setq doom-modeline--gnus-started t)
-    ;; Scan gnus in the background if the timer is higher than 0
-    (doom-modeline-update-gnus-status)
-    (if (> doom-modeline-gnus-timer 0)
-        (gnus-demon-add-handler 'gnus-demon-scan-news doom-modeline-gnus-timer doom-modeline-gnus-idle))))
-(add-hook 'gnus-started-hook #'doom-modeline-start-gnus-listener)
-
-;; Stop the listener if gnus isn't running
-(defun doom-modeline-stop-gnus-listener ()
-  "Stop GNUS listener."
-  (setq doom-modeline--gnus-started nil))
-(add-hook 'gnus-exit-gnus-hook #'doom-modeline-stop-gnus-listener)
-
-(doom-modeline-def-segment gnus
-  "Show notifications of any unread emails in `gnus'."
-  (when (and (doom-modeline--segment-visible 'gnus)
-             doom-modeline-gnus
-             doom-modeline--gnus-started
-             ;; Don't display if the unread mails count is zero
-             (numberp doom-modeline--gnus-unread-mail)
-             (> doom-modeline--gnus-unread-mail 0))
-    (let ((sep (doom-modeline-spc))
-          (vsep (doom-modeline-vspc)))
-      (concat
-       sep
-       (propertize
-        (concat
-         (doom-modeline-icon 'mdicon "nf-md-email" "📧" "#"
-                             :face 'doom-modeline-notification)
-         vsep
-         (propertize
-          (if (> doom-modeline--gnus-unread-mail doom-modeline-number-limit)
-              (format "%d+" doom-modeline-number-limit)
-            (number-to-string doom-modeline--gnus-unread-mail))
-          'face '(:inherit
-                  (doom-modeline-unread-number doom-modeline-notification))))
-        'mouse-face 'doom-modeline-highlight
-        'help-echo (if (= doom-modeline--gnus-unread-mail 1)
-                       "You have an unread email"
-                     (format "You have %s unread emails" doom-modeline--gnus-unread-mail)))
-       sep))))
-
-
-;;
-;; IRC notifications
-;;
-
-(defun doom-modeline-shorten-irc (name)
-  "Shorten IRC buffer `name' according to IRC mode.
-
-Calls the mode specific function to return the shortened
-version of `NAME' if applicable:
-- Circe: `tracking-shorten'
-- ERC: `erc-track-shorten-function'
-- rcirc: `rcirc-shorten-buffer-name'
-
-The specific function will decide how to stylize the buffer name,
-read the individual functions documentation for more."
-  (or (and (fboundp 'tracking-shorten)
-           (car (tracking-shorten (list name))))
-      (and (boundp 'erc-track-shorten-function)
-           (functionp erc-track-shorten-function)
-	       (car (funcall erc-track-shorten-function (list name))))
-      (and (fboundp 'rcirc-short-buffer-name)
-           (rcirc-short-buffer-name name))
-      name))
-
-(defun doom-modeline--tracking-buffers (buffers)
-  "Logic to convert some irc BUFFERS to their font-awesome icon."
-  (mapconcat
-   (lambda (b)
-     (propertize
-      (funcall doom-modeline-irc-stylize b)
-      'face '(:inherit (doom-modeline-unread-number doom-modeline-notification))
-      'help-echo (format "IRC Notification: %s\nmouse-1: Switch to buffer" b)
-      'mouse-face 'doom-modeline-highlight
-      'local-map (make-mode-line-mouse-map
-                  'mouse-1
-                  (lambda ()
-                    (interactive)
-                    (when (buffer-live-p (get-buffer b))
-                      (switch-to-buffer b))))))
-   buffers
-   (doom-modeline-vspc)))
-
-(defun doom-modeline--circe-p ()
-  "Check if `circe' is in use."
-  (boundp 'tracking-mode-line-buffers))
-
-(defun doom-modeline--erc-p ()
-  "Check if `erc' is in use."
-  (boundp 'erc-modified-channels-alist))
-
-(defun doom-modeline--rcirc-p ()
-  "Check if `rcirc' is in use."
-  (bound-and-true-p rcirc-track-minor-mode))
-
-(defun doom-modeline--get-buffers ()
-  "Gets the buffers that have activity."
-  (cond
-   ((doom-modeline--circe-p)
-    tracking-buffers)
-   ((doom-modeline--erc-p)
-    (mapcar (lambda (l)
-              (buffer-name (car l)))
-            erc-modified-channels-alist))
-   ((doom-modeline--rcirc-p)
-    (mapcar (lambda (b)
-              (buffer-name b))
-            rcirc-activity))))
-
-;; Create a modeline segment that contains all the irc tracked buffers
-(doom-modeline-def-segment irc-buffers
-  "The list of shortened, unread irc buffers."
-  (when (and doom-modeline-irc
-             (doom-modeline--segment-visible 'irc-buffers))
-    (let* ((buffers (doom-modeline--get-buffers))
-           (number (length buffers))
-           (sep (doom-modeline-spc)))
-      (when (> number 0)
-        (concat
-         sep
-         (doom-modeline--tracking-buffers buffers)
-         sep)))))
-
-(doom-modeline-def-segment irc
-  "A notification icon for any unread irc buffer."
-  (when (and doom-modeline-irc
-             (doom-modeline--segment-visible 'irc))
-    (let* ((buffers (doom-modeline--get-buffers))
-           (number (length buffers))
-           (sep (doom-modeline-spc))
-           (vsep (doom-modeline-vspc)))
-      (when (> number 0)
-        (concat
-         sep
-
-         (propertize (concat
-                      (doom-modeline-icon 'mdicon "nf-md-message_processing" "🗊" "#"
-                                          :face 'doom-modeline-notification)
-                      vsep
-                      ;; Display the number of unread buffers
-                      (propertize (number-to-string number)
-                                  'face '(:inherit
-                                          (doom-modeline-unread-number
-                                           doom-modeline-notification))))
-                     'help-echo (format "IRC Notifications: %s\n%s"
-                                        (mapconcat
-                                         (lambda (b) (funcall doom-modeline-irc-stylize b))
-                                         buffers
-                                         ", ")
-                                        (cond
-                                         ((doom-modeline--circe-p)
-                                          "mouse-1: Switch to previous unread buffer
-mouse-3: Switch to next unread buffer")
-                                         ((doom-modeline--erc-p)
-                                          "mouse-1: Switch to buffer
-mouse-3: Switch to next unread buffer")
-                                         ((doom-modeline--rcirc-p)
-                                          "mouse-1: Switch to server buffer
-mouse-3: Switch to next unread buffer")))
-                     'mouse-face 'doom-modeline-highlight
-                     'local-map (let ((map (make-sparse-keymap)))
-                                  (cond
-                                   ((doom-modeline--circe-p)
-                                    (define-key map [mode-line mouse-1]
-                                      #'tracking-previous-buffer)
-                                    (define-key map [mode-line mouse-3]
-                                      #'tracking-next-buffer))
-                                   ((doom-modeline--erc-p)
-                                    (define-key map [mode-line mouse-1]
-                                      #'erc-switch-to-buffer)
-                                    (define-key map [mode-line mouse-3]
-                                      #'erc-track-switch-buffer))
-                                   ((doom-modeline--rcirc-p)
-                                    (define-key map [mode-line mouse-1]
-                                      #'rcirc-switch-to-server-buffer)
-                                    (define-key map [mode-line mouse-3]
-                                      #'rcirc-next-active-buffer)))
-                                  map))
-
-         ;; Display the unread irc buffers as well
-         (when doom-modeline-irc-buffers
-           (concat sep (doom-modeline--tracking-buffers buffers)))
-
-         sep)))))
-
-(defun doom-modeline-override-rcirc ()
-  "Override default `rcirc' mode-line."
-  (if (and doom-modeline-irc
-           (bound-and-true-p doom-modeline-mode))
-      (setq global-mode-string
-		    (delq 'rcirc-activity-string global-mode-string))
-    (when (and rcirc-track-minor-mode
-               (not (memq 'rcirc-activity-string global-mode-string)))
-	  (setq global-mode-string
-		    (append global-mode-string '(rcirc-activity-string))))))
-(add-hook 'rcirc-track-minor-mode-hook #'doom-modeline-override-rcirc)
-(add-hook 'doom-modeline-mode-hook #'doom-modeline-override-rcirc)
-
-(doom-modeline-add-variable-watcher
- 'doom-modeline-irc
- (lambda (_sym val op _where)
-   (when (eq op 'set)
-     (setq doom-modeline-irc val)
-     (doom-modeline-override-rcirc))))
-
-
-;;
-;; Battery status
-;;
-
-(defun doom-modeline-battery-icon (icon unicode text face)
-  "Displays the battery ICON with FACE.
-
-UNICODE and TEXT are fallbacks.
-Uses `nerd-icons-mdicon' to fetch the icon."
-  (doom-modeline-icon 'mdicon icon unicode text :face face))
-
-(defvar doom-modeline--battery-status nil)
-(defun doom-modeline-update-battery-status ()
-  "Update battery status."
-  (setq doom-modeline--battery-status
-        (when (and doom-modeline-battery
-                   (bound-and-true-p display-battery-mode))
-          (let* ((data (and battery-status-function
-                            (functionp battery-status-function)
-                            (funcall battery-status-function)))
-                 (status (cdr (assoc ?L data)))
-                 (charging? (or (string-equal "AC" status)
-                                (string-equal "on-line" status)))
-                 (percentage (car (read-from-string (or (cdr (assq ?p data)) "ERR"))))
-                 (valid-percentage? (and (numberp percentage)
-                                         (>= percentage 0)
-                                         (<= percentage battery-mode-line-limit)))
-                 (face (if valid-percentage?
-                           (cond (charging? 'doom-modeline-battery-charging)
-                                 ((< percentage battery-load-critical) 'doom-modeline-battery-critical)
-                                 ((< percentage 25) 'doom-modeline-battery-warning)
-                                 ((< percentage 95) 'doom-modeline-battery-normal)
-                                 (t 'doom-modeline-battery-full))
-                         'doom-modeline-battery-error))
-                 (icon (if valid-percentage?
-                           (cond
-                            ((>= percentage 100)
-                             (doom-modeline-battery-icon (if charging?
-                                                             "nf-md-battery_charging_100"
-                                                           "nf-md-battery")
-                                                         "🔋" "-" face))
-                            ((>= percentage 90)
-                             (doom-modeline-battery-icon (if charging?
-                                                             "nf-md-battery_charging_90"
-                                                           "nf-md-battery_90")
-                                                         "🔋" "-" face))
-                            ((>= percentage 80)
-                             (doom-modeline-battery-icon (if charging?
-                                                             "nf-md-battery_charging_80"
-                                                           "nf-md-battery_80")
-                                                         "🔋" "-" face))
-                            ((>= percentage 70)
-                             (doom-modeline-battery-icon (if charging?
-                                                             "nf-md-battery_charging_70"
-                                                           "nf-md-battery_70")
-                                                         "🔋" "-" face))
-                            ((>= percentage 60)
-                             (doom-modeline-battery-icon (if charging?
-                                                             "nf-md-battery_charging_60"
-                                                           "nf-md-battery_60")
-                                                         "🔋" "-" face))
-                            ((>= percentage 50)
-                             (doom-modeline-battery-icon (if charging?
-                                                             "nf-md-battery_charging_50"
-                                                           "nf-md-battery_50")
-                                                         "🔋" "-" face))
-                            ((>= percentage 40)
-                             (doom-modeline-battery-icon (if charging?
-                                                             "nf-md-battery_charging_40"
-                                                           "nf-md-battery_40")
-                                                         "🔋" "-" face))
-                            ((>= percentage 30)
-                             (doom-modeline-battery-icon (if charging?
-                                                             "nf-md-battery_charging_30"
-                                                           "nf-md-battery_30")
-                                                         "🔋" "-" face))
-                            ((>= percentage 20)
-                             (doom-modeline-battery-icon (if charging?
-                                                             "nf-md-battery_charging_20"
-                                                           "nf-md-battery_20")
-                                                         "🔋" "-" face))
-                            ((>= percentage 10)
-                             (doom-modeline-battery-icon (if charging?
-                                                             "nf-md-battery_charging_10"
-                                                           "nf-md-battery_10")
-                                                         "🪫" "-" face))
-                            (t (doom-modeline-battery-icon (if charging?
-                                                               "nf-md-battery_charging_outline"
-                                                             "nf-md-battery_outline")
-                                                           "🪫" "!" face)))
-                         (doom-modeline-battery-icon "nf-md-battery_alert" "⚠" "N/A" face)))
-                 (text (if valid-percentage? (format "%d%s" percentage "%%") ""))
-                 (help-echo (if (and battery-echo-area-format data valid-percentage?)
-                                (battery-format battery-echo-area-format data)
-                              "Battery status not available")))
-            (cons (propertize icon 'help-echo help-echo)
-                  (propertize text 'face face 'help-echo help-echo))))))
-
-(doom-modeline-add-variable-watcher
- 'doom-modeline-icon
- (lambda (_sym val op _where)
-   (when (eq op 'set)
-     (setq doom-modeline-icon val)
-     (doom-modeline-update-battery-status))))
-
-(doom-modeline-add-variable-watcher
- 'doom-modeline-unicode-fallback
- (lambda (_sym val op _where)
-   (when (eq op 'set)
-     (setq doom-modeline-unicode-fallback val)
-     (doom-modeline-update-battery-status))))
-
-(doom-modeline-def-segment battery
-  "Display battery status."
-  (when (and doom-modeline-battery
-             (bound-and-true-p display-battery-mode)
-             (doom-modeline--segment-visible 'battery))
-    (let ((sep (doom-modeline-spc))
-          (vsep (doom-modeline-vspc)))
-      (concat sep
-              (car doom-modeline--battery-status)
-              vsep
-              (cdr doom-modeline--battery-status)
-              sep))))
-
-(defun doom-modeline-override-battery ()
-  "Override default battery mode-line."
-  (if (and doom-modeline-battery
-           (bound-and-true-p doom-modeline-mode))
-      (progn
-        (advice-add #'battery-update :override #'doom-modeline-update-battery-status)
-        (setq global-mode-string
-		      (delq 'battery-mode-line-string global-mode-string))
-        (and (bound-and-true-p display-battery-mode) (battery-update)))
-    (progn
-      (advice-remove #'battery-update #'doom-modeline-update-battery-status)
-      (when (and display-battery-mode battery-status-function battery-mode-line-format
-                 (not (memq 'battery-mode-line-string global-mode-string)))
-        (setq global-mode-string
-		      (append global-mode-string '(battery-mode-line-string)))))))
-(add-hook 'display-battery-mode-hook #'doom-modeline-override-battery)
-(add-hook 'doom-modeline-mode-hook #'doom-modeline-override-battery)
-
-(doom-modeline-add-variable-watcher
- 'doom-modeline-battery
- (lambda (_sym val op _where)
-   (when (eq op 'set)
-     (setq doom-modeline-battery val)
-     (doom-modeline-override-battery))))
-
-
-;;
-;; Package information
-;;
-
-(doom-modeline-def-segment package
-  "Show package information via `paradox'."
-  (concat
-   (doom-modeline-display-text
-    (format-mode-line 'mode-line-front-space))
-
-   (when (and doom-modeline-icon doom-modeline-major-mode-icon)
-     (concat
-      (doom-modeline-spc)
-      (doom-modeline-icon 'faicon "nf-fa-archive" nil nil
-                          :face (doom-modeline-face
-                                 (if doom-modeline-major-mode-color-icon
-                                     'nerd-icons-silver
-                                   'mode-line)))))
-   (doom-modeline-display-text
-    (format-mode-line 'mode-line-buffer-identification))))
-
-
-;;
-;; Helm
-;;
-
-(defvar doom-modeline--helm-buffer-ids
-  '(("*helm*" . "HELM")
-    ("*helm M-x*" . "HELM M-x")
-    ("*swiper*" . "SWIPER")
-    ("*Projectile Perspectives*" . "HELM Projectile Perspectives")
-    ("*Projectile Layouts*" . "HELM Projectile Layouts")
-    ("*helm-ag*" . (lambda ()
-                     (format "HELM Ag: Using %s"
-                             (car (split-string helm-ag-base-command))))))
-  "Alist of custom helm buffer names to use.
-The cdr can also be a function that returns a name to use.")
-
-(doom-modeline-def-segment helm-buffer-id
-  "Helm session identifier."
-  (when (bound-and-true-p helm-alive-p)
-    (let ((sep (doom-modeline-spc)))
-      (concat
-       sep
-       (when doom-modeline-icon
-         (concat
-          (doom-modeline-icon 'sucicon "nf-custom-emacs" nil nil
-                              :face (doom-modeline-face
-                                     (and doom-modeline-major-mode-color-icon
-                                          'nerd-icons-blue)))
-          sep))
-       (propertize
-        (let ((custom (cdr (assoc (buffer-name) doom-modeline--helm-buffer-ids)))
-              (case-fold-search t)
-              (name (replace-regexp-in-string "-" " " (buffer-name))))
-          (cond ((stringp custom) custom)
-                ((functionp custom) (funcall custom))
-                (t
-                 (string-match "\\*helm:? \\(mode \\)?\\([^\\*]+\\)\\*" name)
-                 (concat "HELM " (capitalize (match-string 2 name))))))
-        'face (doom-modeline-face 'doom-modeline-buffer-file))
-       sep))))
-
-(doom-modeline-def-segment helm-number
-  "Number of helm candidates."
-  (when (bound-and-true-p helm-alive-p)
-    (concat
-     (propertize (format " %d/%d"
-                         (helm-candidate-number-at-point)
-                         (helm-get-candidate-number t))
-                 'face (doom-modeline-face 'doom-modeline-buffer-path))
-     (propertize (format " (%d total) " (helm-get-candidate-number))
-                 'face (doom-modeline-face 'doom-modeline-info)))))
-
-(doom-modeline-def-segment helm-help
-  "Helm keybindings help."
-  (when (bound-and-true-p helm-alive-p)
-    (mapcar
-     (lambda (s)
-       (if (string-prefix-p "\\<" s)
-           (propertize (substitute-command-keys s)
-                       'face (doom-modeline-face
-                              'doom-modeline-buffer-file))
-         s))
-     '("\\<helm-map>\\[helm-help]" "(help) "
-       "\\<helm-map>\\[helm-select-action]" "(actions) "
-       "\\<helm-map>\\[helm-maybe-exit-minibuffer]/F1/F2..." "(action) "))))
-
-(doom-modeline-def-segment helm-prefix-argument
-  "Helm prefix argument."
-  (when (and (bound-and-true-p helm-alive-p)
-             helm--mode-line-display-prefarg)
-    (let ((arg (prefix-numeric-value (or prefix-arg current-prefix-arg))))
-      (unless (= arg 1)
-        (propertize (format "C-u %s" arg)
-                    'face (doom-modeline-face 'doom-modeline-info))))))
-
-(defvar doom-modeline--helm-current-source nil
-  "The currently active helm source.")
-(doom-modeline-def-segment helm-follow
-  "Helm follow indicator."
-  (and (bound-and-true-p helm-alive-p)
-       doom-modeline--helm-current-source
-       (eq 1 (cdr (assq 'follow doom-modeline--helm-current-source)))
-       "HF"))
-
-;;
-;; Git timemachine
-;;
-
-(doom-modeline-def-segment git-timemachine
-  (concat
-   (doom-modeline-spc)
-   (doom-modeline--buffer-mode-icon)
-   (doom-modeline--buffer-state-icon)
-   (propertize
-    "*%b*"
-    'face (doom-modeline-face 'doom-modeline-buffer-timemachine))))
-
-;;
-;; Markdown/Org preview
-;;
-
-(doom-modeline-def-segment grip
-  (when (bound-and-true-p grip-mode)
-    (let ((sep (doom-modeline-spc)))
-      (concat
-       sep
-       (let ((face (doom-modeline-face
-                    (if grip--process
-                        (pcase (process-status grip--process)
-                          ('run 'doom-modeline-info)
-                          ('exit 'doom-modeline-warning)
-                          (_ 'doom-modeline-urgent))
-                      'doom-modeline-urgent))))
-         (propertize
-          (doom-modeline-icon 'codicon "nf-cod-open_preview" "🗐" "@" :face face)
-          'help-echo (format "Preview on %s
-mouse-1: Preview in browser
-mouse-2: Stop preview
-mouse-3: Restart preview"
-                             (grip--preview-url))
-          'mouse-face 'doom-modeline-highlight
-          'local-map (let ((map (make-sparse-keymap)))
-                       (define-key map [mode-line mouse-1]
-                         #'grip-browse-preview)
-                       (define-key map [mode-line mouse-2]
-                         #'grip-stop-preview)
-                       (define-key map [mode-line mouse-3]
-                         #'grip-restart-preview)
-                       map)))
-       sep))))
-
-;;
-;; Follow mode
-;;
-
-(doom-modeline-def-segment follow
-  (when (bound-and-true-p follow-mode)
-    (let* ((windows (follow-all-followers))
-           (nwindows (length windows))
-           (nfollowing (- (length (memq (selected-window) windows)) 1)))
-      (concat
-       (doom-modeline-spc)
-       (propertize (format "Follow %d/%d" (- nwindows nfollowing) nwindows)
-                   'face 'doom-modeline-buffer-minor-mode)))))
-
-;;
-;; Display time
-;;
-
-(defconst doom-modeline--clock-hour-hand-ratio 0.45
-  "Length of the hour hand as a proportion of the radius.")
-
-(defconst doom-modeline--clock-minute-hand-ratio 0.7
-  "Length of the minute hand as a proportion of the radius.")
-
-(defun doom-modeline--create-clock-svg (hour minute radius color)
-  "Construct an SVG clock showing the time HOUR:MINUTE.
-The clock will be of the specified RADIUS and COLOR."
-  (let ((thickness-factor (image-compute-scaling-factor 'auto))
-        (hour-x (* radius (sin (* (- 6 hour (/ minute 60.0)) (/ float-pi 6)))
-                   doom-modeline--clock-hour-hand-ratio))
-        (hour-y (* radius (cos (* (- 6 hour (/ minute 60.0)) (/ float-pi 6)))
-                   doom-modeline--clock-hour-hand-ratio))
-        (minute-x (* radius (sin (* (- 30 minute) (/ float-pi 30)))
-                     doom-modeline--clock-minute-hand-ratio))
-        (minute-y (* radius (cos (* (- 30 minute) (/ float-pi 30)))
-                     doom-modeline--clock-minute-hand-ratio))
-        (svg (svg-create (* 2 radius) (* 2 radius) :stroke color)))
-    (svg-circle svg radius radius (- radius thickness-factor)
-                :fill "none" :stroke-width (* 2 thickness-factor))
-    (svg-circle svg radius radius thickness-factor
-                :fill color :stroke "none")
-    (svg-line svg radius radius (+ radius hour-x) (+ radius hour-y)
-              :stroke-width (* 2 thickness-factor))
-    (svg-line svg radius radius (+ radius minute-x) (+ radius minute-y)
-              :stroke-width (* 1.5 thickness-factor))
-    svg))
-
-(defvar doom-modeline--clock-cache nil
-  "The last result of `doom-modeline--generate-clock'.")
-
-(defun doom-modeline--generate-clock ()
-  "Return a string containing the current time as an analogue clock svg.
-When the svg library is not available, return nil."
-  (cdr
-   (or (and (equal (truncate (float-time)
-                             (* doom-modeline-time-clock-minute-resolution 60))
-                   (car doom-modeline--clock-cache))
-            doom-modeline--clock-cache)
-       (and (require 'svg nil t)
-            (setq doom-modeline--clock-cache
-                  (cons (truncate (float-time)
-                                  (* doom-modeline-time-clock-minute-resolution 60))
-                        (propertize
-                         " "
-                         'display
-                         (svg-image
-                          (doom-modeline--create-clock-svg
-                           (string-to-number (format-time-string "%-I")) ; hour
-                           (* (truncate (string-to-number (format-time-string "%-M"))
-                                        doom-modeline-time-clock-minute-resolution)
-                              doom-modeline-time-clock-minute-resolution) ; minute
-                           (if (integerp doom-modeline-time-clock-size) ; radius
-                               doom-modeline-time-clock-size
-                             (* doom-modeline-height 0.5 doom-modeline-time-clock-size))
-                           "currentColor")
-                          :scale 1 :ascent 'center)
-                         'face 'doom-modeline-time
-                         'help-echo (lambda (_window _object _pos)
-                                      (format-time-string "%c")))))))))
-
-(defun doom-modeline-time-icon ()
-  "Displays the time icon."
-  (or (and doom-modeline-time-live-icon
-           doom-modeline-time-analogue-clock
-           (display-graphic-p)
-           (doom-modeline--generate-clock))
-      (doom-modeline-icon
-       'mdicon
-       (if doom-modeline-time-live-icon
-           (pcase (% (caddr (decode-time)) 12)
-             (0 "nf-md-clock_time_twelve_outline")
-             (1 "nf-md-clock_time_one_outline")
-             (2 "nf-md-clock_time_two_outline")
-             (3 "nf-md-clock_time_three_outline")
-             (4 "nf-md-clock_time_four_outline")
-             (5 "nf-md-clock_time_five_outline")
-             (6 "nf-md-clock_time_six_outline")
-             (7 "nf-md-clock_time_seven_outline")
-             (8 "nf-md-clock_time_eight_outline")
-             (9 "nf-md-clock_time_nine_outline")
-             (10 "nf-md-clock_time_ten_outline")
-             (11 "nf-md-clock_time_eleven_outline"))
-         "nf-md-clock_outline")
-       "⏰"
-       ""
-       :face '(:inherit doom-modeline-time :weight normal))))
-
-(doom-modeline-def-segment time
-  (when (and doom-modeline-time
-             (bound-and-true-p display-time-mode)
-             (doom-modeline--segment-visible 'time))
-    (concat
-     (doom-modeline-spc)
-     (when doom-modeline-time-icon
-       (concat
-        (doom-modeline-time-icon)
-        (and (or doom-modeline-icon doom-modeline-unicode-fallback)
-             (doom-modeline-vspc))))
-     (propertize display-time-string
-                 'face (doom-modeline-face 'doom-modeline-time)))))
-
-(defun doom-modeline-override-time ()
-  "Override default `display-time' mode-line."
-  (or global-mode-string (setq global-mode-string '("")))
-  (if (and doom-modeline-time
-           (bound-and-true-p doom-modeline-mode))
-      (setq global-mode-string (delq 'display-time-string global-mode-string))
-    (setq global-mode-string (append global-mode-string '(display-time-string)))))
-(add-hook 'display-time-mode-hook #'doom-modeline-override-time)
-(add-hook 'doom-modeline-mode-hook #'doom-modeline-override-time)
-
-(doom-modeline-add-variable-watcher
- 'doom-modeline-time
- (lambda (_sym val op _where)
-   (when (eq op 'set)
-     (setq doom-modeline-time val)
-     (doom-modeline-override-time))))
-
-;;
-;; Compilation
-;;
-
-(doom-modeline-def-segment compilation
-  (and (bound-and-true-p compilation-in-progress)
-       (propertize "[Compiling] "
-                   'face (doom-modeline-face 'doom-modeline-compilation)
-	               'help-echo "Compiling; mouse-2: Goto Buffer"
-                   'mouse-face 'doom-modeline-highlight
-                   'local-map
-                   (make-mode-line-mouse-map
-                    'mouse-2
-                    #'compilation-goto-in-progress-buffer))))
-
-;;
-;; Eldoc
-;;
-
-(doom-modeline-def-segment eldoc
-  (and (bound-and-true-p eldoc-mode)
-       '(eldoc-mode-line-string
-		 (" " eldoc-mode-line-string " "))))
-
-(defun doom-modeline-eldoc-minibuffer-message (format-string &rest args)
-  "Display message specified by FORMAT-STRING and ARGS on the mode-line as needed.
-This function displays the message produced by formatting ARGS
-with FORMAT-STRING on the mode line when the current buffer is a minibuffer.
-Otherwise, it displays the message like `message' would."
-  (if (minibufferp)
-      (progn
-	    (add-hook 'minibuffer-exit-hook
-		          (lambda () (setq eldoc-mode-line-string nil
-			                  ;; https://debbugs.gnu.org/16920
-			                  eldoc-last-message nil))
-		          nil t)
-	    (with-current-buffer
-	        (window-buffer
-	         (or (window-in-direction 'above (minibuffer-window))
-                 (minibuffer-selected-window)
-		         (get-largest-window)))
-          (setq eldoc-mode-line-string
-                (when (stringp format-string)
-                  (apply #'format-message format-string args)))
-          (force-mode-line-update)))
-    (apply #'message format-string args)))
-
-;;
-;; Kubernetes
-;;
-
-(doom-modeline-def-segment k8s
-  (when (and (bound-and-true-p kele-mode) (doom-modeline--segment-visible 'k8s))
-    (let* ((ctx (kele-current-context-name :wait nil))
-           (ns (kele-current-namespace :wait nil))
-           (icon (doom-modeline-icon 'mdicon "nf-md-kubernetes" "K8s:" "K8s:"))
-           (sep (doom-modeline-spc))
-           (help-msg (let ((msgs (list (format "Current context: %s" ctx))))
-                       (when ns
-                         (setq msgs (append msgs (list (format "Current namespace: %s" ns)))))
-                       (string-join msgs "\n"))))
-      (propertize (concat
-                   icon sep ctx
-                   (when (and doom-modeline-k8s-show-namespace ns) (format "(%s)" ns))
-                   sep)
-                  'local-map (let ((map (make-sparse-keymap)))
-                               (define-key map [mode-line down-mouse-1] kele-menu-map)
-                               map)
-                  'mouse-face 'doom-modeline-highlight
-                  'help-echo help-msg))))
-
-(provide 'doom-modeline-segments)
-
-;;; doom-modeline-segments.el ends here
diff --git a/emacs/elpa/doom-modeline-20240923.140/doom-modeline-segments.elc b/emacs/elpa/doom-modeline-20240923.140/doom-modeline-segments.elc
Binary files differ.
diff --git a/emacs/elpa/doom-modeline-20240923.140/doom-modeline.el b/emacs/elpa/doom-modeline-20240923.140/doom-modeline.el
@@ -1,263 +0,0 @@
-;;; doom-modeline.el --- A minimal and modern mode-line -*- lexical-binding: t; -*-
-
-;; Copyright (C) 2018-2024 Vincent Zhang
-
-;; Author: Vincent Zhang <seagle0128@gmail.com>
-;; Homepage: https://github.com/seagle0128/doom-modeline
-;; Package-Version: 20240923.140
-;; Package-Revision: 84a53e0f8c9d
-;; Package-Requires: ((emacs "25.1") (compat "29.1.4.5") (nerd-icons "0.1.0") (shrink-path "0.3.1"))
-;; Keywords: faces mode-line
-
-;; This file is not part of GNU Emacs.
-
-;;
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-;;
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-;;
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
-;;
-
-;;; Commentary:
-;;
-;; This package offers a fancy and fast mode-line inspired by minimalism design.
-;;
-;; It's integrated into Doom Emacs (https://github.com/hlissner/doom-emacs) and
-;; Centaur Emacs (https://github.com/seagle0128/.emacs.d).
-;;
-;; The doom-modeline offers:
-;; - A match count panel (for anzu, iedit, multiple-cursors, symbol-overlay,
-;;   evil-search and evil-substitute)
-;; - An indicator for recording a macro
-;; - Current environment version (e.g. python, ruby, go, etc.) in the major-mode
-;; - A customizable mode-line height (see doom-modeline-height)
-;; - A minor modes segment which is compatible with minions
-;; - An error/warning count segment for flymake/flycheck
-;; - A workspace number segment for eyebrowse
-;; - A perspective name segment for persp-mode
-;; - A window number segment for winum and window-numbering
-;; - An indicator for modal editing state, including evil, overwrite, god, ryo
-;;   and xah-fly-keys, etc.
-;; - An indicator for battery status
-;; - An indicator for current input method
-;; - An indicator for debug state
-;; - An indicator for remote host
-;; - An indicator for LSP state with lsp-mode or eglot
-;; - An indicator for github notifications
-;; - An indicator for unread emails with mu4e-alert
-;; - An indicator for unread emails with gnus (basically builtin)
-;; - An indicator for irc notifications with circe, rcirc or erc.
-;; - An indicator for buffer position which is compatible with nyan-mode or poke-line
-;; - An indicator for party parrot
-;; - An indicator for PDF page number with pdf-tools
-;; - An indicator for markdown/org previews with grip
-;; - Truncated file name, file icon, buffer state and project name in buffer
-;;   information segment, which is compatible with project, find-file-in-project
-;;   and projectile
-;; - New mode-line for Info-mode buffers
-;; - New package mode-line for paradox
-;; - New mode-line for helm buffers
-;; - New mode-line for git-timemachine buffers
-;;
-;; Installation:
-;; From melpa, `M-x package-install RET doom-modeline RET`.
-;; In `init.el`,
-;; (require 'doom-modeline)
-;; (doom-modeline-mode 1)
-;; or
-;; (use-package doom-modeline
-;;   :ensure t
-;;   :hook (after-init . doom-modeline-mode))
-;;
-
-;;; Code:
-
-(require 'doom-modeline-core)
-(require 'doom-modeline-segments)
-
-
-;;
-;; Mode lines
-;;
-
-(doom-modeline-def-modeline 'main
-  '(eldoc bar workspace-name window-number modals matches follow buffer-info remote-host buffer-position word-count parrot selection-info)
-  '(compilation objed-state misc-info persp-name battery grip irc mu4e gnus github debug repl lsp minor-modes input-method indent-info buffer-encoding major-mode process vcs check time))
-
-(doom-modeline-def-modeline 'minimal
-  '(bar window-number modals matches buffer-info-simple)
-  '(media-info major-mode time))
-
-(doom-modeline-def-modeline 'special
-  '(eldoc bar window-number modals matches buffer-info remote-host buffer-position word-count parrot selection-info)
-  '(compilation objed-state misc-info battery irc-buffers debug minor-modes input-method indent-info buffer-encoding major-mode process time))
-
-(doom-modeline-def-modeline 'project
-  '(bar window-number modals buffer-default-directory remote-host buffer-position)
-  '(compilation misc-info battery irc mu4e gnus github debug minor-modes input-method major-mode process time))
-
-(doom-modeline-def-modeline 'dashboard
-  '(bar window-number modals buffer-default-directory-simple remote-host)
-  '(compilation misc-info battery irc mu4e gnus github debug minor-modes input-method major-mode process time))
-
-(doom-modeline-def-modeline 'vcs
-  '(bar window-number modals matches buffer-info remote-host buffer-position parrot selection-info)
-  '(compilation misc-info battery irc mu4e gnus github debug minor-modes buffer-encoding major-mode process time))
-
-(doom-modeline-def-modeline 'package
-  '(bar window-number modals package)
-  '(compilation misc-info major-mode process time))
-
-(doom-modeline-def-modeline 'info
-  '(bar window-number modals buffer-info info-nodes buffer-position parrot selection-info)
-  '(compilation misc-info buffer-encoding major-mode time))
-
-(doom-modeline-def-modeline 'media
-  '(bar window-number modals buffer-size buffer-info)
-  '(compilation misc-info media-info major-mode process vcs time))
-
-(doom-modeline-def-modeline 'message
-  '(eldoc bar window-number modals matches buffer-info-simple buffer-position word-count parrot selection-info)
-  '(compilation objed-state misc-info battery debug minor-modes input-method indent-info buffer-encoding major-mode time))
-
-(doom-modeline-def-modeline 'pdf
-  '(bar window-number modals matches buffer-info pdf-pages)
-  '(compilation misc-info major-mode process vcs time))
-
-(doom-modeline-def-modeline 'org-src
-  '(eldoc bar window-number modals matches buffer-info buffer-position word-count parrot selection-info)
-  '(compilation objed-state misc-info debug lsp minor-modes input-method indent-info buffer-encoding major-mode process check time))
-
-(doom-modeline-def-modeline 'helm
-  '(bar helm-buffer-id helm-number helm-follow helm-prefix-argument)
-  '(helm-help time))
-
-(doom-modeline-def-modeline 'timemachine
-  '(eldoc bar window-number modals matches git-timemachine buffer-position word-count parrot selection-info)
-  '(misc-info minor-modes indent-info buffer-encoding major-mode time))
-
-(doom-modeline-def-modeline 'calculator
-  '(window-number modals matches calc buffer-position)
-  '(misc-info minor-modes major-mode process))
-
-
-;;
-;; Interfaces
-;;
-
-;;;###autoload
-(defun doom-modeline-set-main-modeline (&optional default)
-  "Set main mode-line.
-If DEFAULT is non-nil, set the default mode-line for all buffers."
-  (doom-modeline-set-modeline 'main default))
-
-
-;;
-;; Minor mode
-;;
-
-;; Suppress warnings
-(defvar 2C-mode-line-format)
-(defvar flymake-mode-line-format)
-(defvar helm-ag-show-status-function)
-(declare-function helm-display-mode-line "ext:helm-core")
-
-(defvar doom-modeline-mode-map (make-sparse-keymap))
-
-(defvar doom-modeline-mode-alist
-  '((message-mode         . message)
-    (git-commit-mode      . message)
-    (magit-mode           . vcs)
-    (dashboard-mode       . dashboard)
-    (Info-mode            . info)
-    (image-mode           . media)
-    (pdf-view-mode        . pdf)
-    (org-src-mode         . org-src)
-    (paradox-menu-mode    . package)
-    (xwidget-webkit-mode  . minimal)
-    (git-timemachine-mode . timemachine)
-    (calc-mode            . calculator)
-    (calc-trail-mode      . calculator)
-    (circe-mode           . special)
-    (erc-mode             . special)
-    (rcirc-mode           . special))
-  "Alist of major modes and mode-lines.")
-
-(defun doom-modeline-auto-set-modeline ()
-  "Set mode-line base on major-mode."
-  (catch 'found
-    (dolist (x doom-modeline-mode-alist)
-      (when (derived-mode-p (car x))
-        (doom-modeline-set-modeline (cdr x))
-        (throw 'found x)))))
-
-(defun doom-modeline-set-helm-modeline (&rest _) ; To advice helm
-  "Set helm mode-line."
-  (doom-modeline-set-modeline 'helm))
-
-;;;###autoload
-(define-minor-mode doom-modeline-mode
-  "Toggle `doom-modeline' on or off."
-  :group 'doom-modeline
-  :global t
-  :lighter nil
-  :keymap doom-modeline-mode-map
-  (if doom-modeline-mode
-      (progn
-        (doom-modeline-refresh-bars)        ; Create bars
-        (doom-modeline-set-main-modeline t) ; Set default mode-line
-
-        ;; Apply to all existing buffers.
-        (dolist (buf (buffer-list))
-          (with-current-buffer buf
-            (unless (doom-modeline-auto-set-modeline)
-              (doom-modeline-set-main-modeline))))
-
-        ;; For flymake
-        (setq flymake-mode-line-format nil) ; remove the lighter of minor mode
-
-        ;; For Eldoc
-        (setq eldoc-message-function #'doom-modeline-eldoc-minibuffer-message)
-
-        ;; For two-column editing
-        (setq 2C-mode-line-format (doom-modeline 'special))
-
-        ;; Automatically set mode-lines
-        (add-hook 'after-change-major-mode-hook #'doom-modeline-auto-set-modeline)
-
-        ;; Special handles
-        (advice-add #'helm-display-mode-line :after #'doom-modeline-set-helm-modeline)
-        (setq helm-ag-show-status-function #'doom-modeline-set-helm-modeline))
-    (progn
-      ;; Restore mode-line
-      (let ((original-format (doom-modeline--original-value 'mode-line-format)))
-        (setq-default mode-line-format original-format)
-        (dolist (buf (buffer-list))
-          (with-current-buffer buf
-            (setq mode-line-format original-format))))
-
-      ;; For flymake
-      (setq flymake-mode-line-format (doom-modeline--original-value 'flymake-mode-line-format))
-
-      ;; For Eldoc
-      (setq eldoc-message-function #'eldoc-minibuffer-message)
-
-      ;; For two-column editing
-      (setq 2C-mode-line-format (doom-modeline--original-value '2C-mode-line-format))
-
-      ;; Cleanup
-      (remove-hook 'after-change-major-mode-hook #'doom-modeline-auto-set-modeline)
-      (advice-remove #'helm-display-mode-line #'doom-modeline-set-helm-modeline)
-      (setq helm-ag-show-status-function (default-value 'helm-ag-show-status-function)))))
-
-(provide 'doom-modeline)
-
-;;; doom-modeline.el ends here
diff --git a/emacs/elpa/doom-modeline-20240923.140/doom-modeline-autoloads.el b/emacs/elpa/doom-modeline-20241002.1003/doom-modeline-autoloads.el
diff --git a/emacs/elpa/doom-modeline-20240923.140/doom-modeline-core.el b/emacs/elpa/doom-modeline-20241002.1003/doom-modeline-core.el
diff --git a/emacs/elpa/doom-modeline-20240923.140/doom-modeline-core.elc b/emacs/elpa/doom-modeline-20241002.1003/doom-modeline-core.elc
Binary files differ.
diff --git a/emacs/elpa/doom-modeline-20240923.140/doom-modeline-env.el b/emacs/elpa/doom-modeline-20241002.1003/doom-modeline-env.el
diff --git a/emacs/elpa/doom-modeline-20240923.140/doom-modeline-env.elc b/emacs/elpa/doom-modeline-20241002.1003/doom-modeline-env.elc
Binary files differ.
diff --git a/emacs/elpa/doom-modeline-20241002.1003/doom-modeline-pkg.el b/emacs/elpa/doom-modeline-20241002.1003/doom-modeline-pkg.el
@@ -0,0 +1,13 @@
+;; -*- no-byte-compile: t; lexical-binding: nil -*-
+(define-package "doom-modeline" "20241002.1003"
+  "A minimal and modern mode-line."
+  '((emacs       "25.1")
+    (compat      "29.1.4.5")
+    (nerd-icons  "0.1.0")
+    (shrink-path "0.3.1"))
+  :url "https://github.com/seagle0128/doom-modeline"
+  :commit "ec6bc00ac035e75ad10b52e516ea5d95cc9e0bd9"
+  :revdesc "ec6bc00ac035"
+  :keywords '("faces" "mode-line")
+  :authors '(("Vincent Zhang" . "seagle0128@gmail.com"))
+  :maintainers '(("Vincent Zhang" . "seagle0128@gmail.com")))
diff --git a/emacs/elpa/doom-modeline-20241002.1003/doom-modeline-segments.el b/emacs/elpa/doom-modeline-20241002.1003/doom-modeline-segments.el
@@ -0,0 +1,3235 @@
+;;; doom-modeline-segments.el --- The segments for doom-modeline -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2018-2024 Vincent Zhang
+
+;; This file is not part of GNU Emacs.
+
+;;
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+;;
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
+;;
+
+;;; Commentary:
+;;
+;; The segments for doom-modeline.
+;; Use `doom-modeline-def-segment' to create a new segment.
+;;
+
+;;; Code:
+
+(require 'doom-modeline-core)
+(require 'doom-modeline-env)
+(eval-when-compile
+  (require 'cl-lib)
+  (require 'seq)
+  (require 'subr-x))
+
+
+;;
+;; Externals
+;;
+
+(defvar Info-current-file)
+(defvar Info-current-node)
+(defvar Info-mode-line-node-keymap)
+(defvar anzu--cached-count)
+(defvar anzu--current-position)
+(defvar anzu--overflow-p)
+(defvar anzu--state)
+(defvar anzu--total-matched)
+(defvar anzu-cons-mode-line-p)
+(defvar aw-keys)
+(defvar battery-echo-area-format)
+(defvar battery-load-critical)
+(defvar battery-mode-line-format)
+(defvar battery-mode-line-limit)
+(defvar battery-status-function)
+(defvar boon-command-state)
+(defvar boon-insert-state)
+(defvar boon-off-state)
+(defvar boon-special-state)
+(defvar display-time-string)
+(defvar edebug-execution-mode)
+(defvar eglot--managed-mode)
+(defvar eglot-menu)
+(defvar eglot-menu-string)
+(defvar eglot-server-menu)
+(defvar erc-modified-channels-alist)
+(defvar evil-ex-active-highlights-alist)
+(defvar evil-ex-argument)
+(defvar evil-ex-range)
+(defvar evil-mc-frozen)
+(defvar evil-state)
+(defvar evil-visual-beginning)
+(defvar evil-visual-end)
+(defvar evil-visual-selection)
+(defvar flycheck--automatically-enabled-checkers)
+(defvar flycheck-current-errors)
+(defvar flycheck-mode-menu-map)
+(defvar flymake--mode-line-format)
+(defvar flymake--state)
+(defvar flymake-menu)
+(defvar gnus-newsrc-alist)
+(defvar gnus-newsrc-hashtb)
+(defvar grip--process)
+(defvar helm--mode-line-display-prefarg)
+(defvar iedit-occurrences-overlays)
+(defvar kele-menu-map)
+(defvar meow--indicator)
+(defvar minions-mode-line-lighter)
+(defvar minions-mode-line-minor-modes-map)
+(defvar mlscroll-right-align)
+(defvar mu4e--modeline-item)
+(defvar mu4e-alert-mode-line)
+(defvar mu4e-alert-modeline-formatter)
+(defvar mu4e-modeline-mode)
+(defvar objed--obj-state)
+(defvar objed--object)
+(defvar objed-modeline-setup-func)
+(defvar persp-nil-name)
+(defvar phi-replace--mode-line-format)
+(defvar phi-search--overlays)
+(defvar phi-search--selection)
+(defvar phi-search-mode-line-format)
+(defvar rcirc-activity)
+(defvar symbol-overlay-keywords-alist)
+(defvar symbol-overlay-temp-symbol)
+(defvar text-scale-mode-amount)
+(defvar tracking-buffers)
+(defvar winum-auto-setup-mode-line)
+(defvar xah-fly-insert-state-p)
+
+(declare-function anzu--reset-status "ext:anzu")
+(declare-function anzu--where-is-here "ext:anzu")
+(declare-function async-inject-variables "ext:async")
+(declare-function async-start "ext:async")
+(declare-function avy-traverse "ext:avy")
+(declare-function avy-tree "ext:avy")
+(declare-function aw-update "ext:ace-window")
+(declare-function aw-window-list "ext:ace-window")
+(declare-function battery-format "battery")
+(declare-function battery-update "battery")
+(declare-function boon-modeline-string "ext:boon")
+(declare-function boon-state-string "ext:boon")
+(declare-function cider--connection-info "ext:cider")
+(declare-function cider-connected-p "ext:cider")
+(declare-function cider-current-repl "ext:cider")
+(declare-function cider-jack-in "ext:cider")
+(declare-function cider-quit "ext:cider")
+(declare-function citre-mode "ext:citre-basic-tools")
+(declare-function compilation-goto-in-progress-buffer "compile")
+(declare-function dap--cur-session "ext:dap-mode")
+(declare-function dap--debug-session-name "ext:dap-mode")
+(declare-function dap--debug-session-state "ext:dap-mode")
+(declare-function dap--session-running "ext:dap-mode")
+(declare-function dap-debug-recent "ext:dap-mode")
+(declare-function dap-disconnect "ext:dap-mode")
+(declare-function dap-hydra "ext:dap-hydra")
+(declare-function edebug-help "edebug")
+(declare-function edebug-next-mode "edebug")
+(declare-function edebug-stop "edebug")
+(declare-function eglot--major-modes "eglot")
+(declare-function eglot--server-info "eglot" t t)
+(declare-function eglot-current-server "eglot")
+(declare-function eglot-managed-p "eglot")
+(declare-function eglot-project-nickname "eglot" t t)
+(declare-function erc-switch-to-buffer "erc")
+(declare-function erc-track-switch-buffer "erc-track")
+(declare-function evil-delimited-arguments "ext:evil-common")
+(declare-function evil-emacs-state-p "ext:evil-states" t t)
+(declare-function evil-force-normal-state "ext:evil-commands" t t)
+(declare-function evil-insert-state-p "ext:evil-states" t t)
+(declare-function evil-motion-state-p "ext:evil-states" t t)
+(declare-function evil-normal-state-p "ext:evil-states" t t)
+(declare-function evil-operator-state-p "ext:evil-states" t t)
+(declare-function evil-replace-state-p "ext:evil-states" t t)
+(declare-function evil-state-property "ext:evil-common")
+(declare-function evil-visual-state-p "ext:evil-states" t t)
+(declare-function eyebrowse--get "ext:eyebrowse")
+(declare-function face-remap-remove-relative "face-remap")
+(declare-function fancy-narrow-active-p "ext:fancy-narrow")
+(declare-function flycheck-buffer "ext:flycheck")
+(declare-function flycheck-count-errors "ext:flycheck")
+(declare-function flycheck-error-level-compilation-level "ext:flycheck")
+(declare-function flycheck-list-errors "ext:flycheck")
+(declare-function flycheck-next-error "ext:flycheck")
+(declare-function flycheck-previous-error "ext:flycheck")
+(declare-function flymake--diag-type "flymake" t t)
+(declare-function flymake--handle-report "flymake")
+(declare-function flymake--lookup-type-property "flymake")
+(declare-function flymake--state-diags "flymake" t t)
+(declare-function flymake-disabled-backends "flymake")
+(declare-function flymake-goto-next-error "flymake")
+(declare-function flymake-goto-prev-error "flymake")
+(declare-function flymake-reporting-backends "flymake")
+(declare-function flymake-running-backends "flymake")
+(declare-function flymake-show-buffer-diagnostics "flymake")
+(declare-function flymake-show-buffer-diagnostics "flymake")
+(declare-function flymake-start "flymake")
+(declare-function follow-all-followers "follow")
+(declare-function gnus-demon-add-handler "gnus-demon")
+(declare-function grip--preview-url "ext:grip-mode")
+(declare-function grip-browse-preview "ext:grip-mode")
+(declare-function grip-restart-preview "ext:grip-mode")
+(declare-function grip-stop-preview "ext:grip-mode")
+(declare-function helm-candidate-number-at-point "ext:helm-core")
+(declare-function helm-get-candidate-number "ext:helm-core")
+(declare-function iedit-find-current-occurrence-overlay "ext:iedit-lib")
+(declare-function iedit-prev-occurrence "ext:iedit-lib")
+(declare-function image-get-display-property "image-mode")
+(declare-function jsonrpc--request-continuations "jsonrpc" t t)
+(declare-function jsonrpc-last-error "jsonrpc" t t)
+(declare-function jsonrpc-name "jsonrpc" t t)
+(declare-function kele-current-context-name "ext:kele")
+(declare-function kele-current-namespace "ext:kele")
+(declare-function lsp--workspace-print "ext:lsp-mode")
+(declare-function lsp-describe-session "ext:lsp-mode")
+(declare-function lsp-workspace-folders-open "ext:lsp-mode")
+(declare-function lsp-workspace-restart "ext:lsp-mode")
+(declare-function lsp-workspace-shutdown "ext:lsp-mode")
+(declare-function lsp-workspaces "ext:lsp-mode")
+(declare-function lv-message "ext:lv")
+(declare-function mc/num-cursors "ext:multiple-cursors-core")
+(declare-function meow--current-state "ext:meow")
+(declare-function meow-beacon-mode-p "ext:meow")
+(declare-function meow-insert-mode-p "ext:meow")
+(declare-function meow-keypad-mode-p "ext:meow")
+(declare-function meow-motion-mode-p "ext:meow")
+(declare-function meow-normal-mode-p "ext:meow")
+(declare-function minions--prominent-modes "ext:minions")
+(declare-function mlscroll-mode-line "ext:mlscroll")
+(declare-function mu4e--modeline-string "ext:mu4e-modeline")
+(declare-function mu4e-alert-default-mode-line-formatter "ext:mu4e-alert")
+(declare-function mu4e-alert-enable-mode-line-display "ext:mu4e-alert")
+(declare-function nyan-create "ext:nyan-mode")
+(declare-function org-edit-src-save "org-src")
+(declare-function parrot-create "ext:parrot")
+(declare-function pdf-cache-number-of-pages "ext:pdf-cache" t t)
+(declare-function persp-add-buffer "ext:persp-mode")
+(declare-function persp-contain-buffer-p "ext:persp-mode")
+(declare-function persp-switch "ext:persp-mode")
+(declare-function phi-search--initialize "ext:phi-search")
+(declare-function poke-line-create "ext:poke-line")
+(declare-function popup-create "ext:popup")
+(declare-function popup-delete "ext:popup")
+(declare-function rcirc-next-active-buffer "rcirc")
+(declare-function rcirc-short-buffer-name "rcirc")
+(declare-function rcirc-switch-to-server-buffer "rcirc")
+(declare-function rcirc-window-configuration-change "rcirc")
+(declare-function rime--should-enable-p "ext:rime")
+(declare-function rime--should-inline-ascii-p "ext:rime")
+(declare-function sml-modeline-create "ext:sml-modeline")
+(declare-function svg-circle "svg")
+(declare-function svg-create "svg")
+(declare-function svg-image "svg")
+(declare-function svg-line "svg")
+(declare-function symbol-overlay-assoc "ext:symbol-overlay")
+(declare-function symbol-overlay-get-list "ext:symbol-overlay")
+(declare-function symbol-overlay-get-symbol "ext:symbol-overlay")
+(declare-function symbol-overlay-rename "ext:symbol-overlay")
+(declare-function tab-bar--current-tab "tab-bar")
+(declare-function tab-bar--current-tab-index "tab-bar")
+(declare-function tracking-next-buffer "ext:tracking")
+(declare-function tracking-previous-buffer "ext:tracking")
+(declare-function tracking-shorten "ext:tracking")
+(declare-function warning-numeric-level "warnings")
+(declare-function window-numbering-clear-mode-line "ext:window-numbering")
+(declare-function window-numbering-get-number-string "ext:window-numbering")
+(declare-function window-numbering-install-mode-line "ext:window-numbering")
+(declare-function winum--clear-mode-line "ext:winum")
+(declare-function winum--install-mode-line "ext:winum")
+(declare-function winum-get-number-string "ext:winum")
+
+
+
+;;
+;; Buffer information
+;;
+
+(defvar-local doom-modeline--buffer-file-icon nil)
+(defun doom-modeline-update-buffer-file-icon (&rest _)
+  "Update file icon in mode-line."
+  (setq doom-modeline--buffer-file-icon
+        (when (and doom-modeline-major-mode-icon
+                   (doom-modeline-icon-displayable-p))
+          (let ((icon (doom-modeline-icon-for-buffer)))
+            (propertize (if (or (null icon) (symbolp icon))
+                            (doom-modeline-icon 'faicon "nf-fa-file_o" nil nil
+                                                :face 'nerd-icons-dsilver)
+                          (doom-modeline-propertize-icon icon))
+                        'help-echo (format "Major-mode: %s" (format-mode-line mode-name)))))))
+(add-hook 'find-file-hook #'doom-modeline-update-buffer-file-icon)
+(add-hook 'after-change-major-mode-hook #'doom-modeline-update-buffer-file-icon)
+(add-hook 'clone-indirect-buffer-hook #'doom-modeline-update-buffer-file-icon)
+
+(doom-modeline-add-variable-watcher
+ 'doom-modeline-icon
+ (lambda (_sym val op _where)
+   (when (eq op 'set)
+     (setq doom-modeline-icon val)
+     (dolist (buf (buffer-list))
+       (with-current-buffer buf
+         (doom-modeline-update-buffer-file-icon))))))
+
+(defun doom-modeline-buffer-file-state-icon (icon unicode text face)
+  "Displays an ICON of buffer state with FACE.
+UNICODE and TEXT are the alternatives if it is not applicable.
+Uses `nerd-icons-mdicon' to fetch the icon."
+  (doom-modeline-icon 'mdicon icon unicode text :face face))
+
+(defvar-local doom-modeline--buffer-file-state-icon nil)
+(defun doom-modeline-update-buffer-file-state-icon (&rest _)
+  "Update the buffer or file state in mode-line."
+  (setq doom-modeline--buffer-file-state-icon
+        (when doom-modeline-buffer-state-icon
+          (ignore-errors
+            (concat
+             (cond ((not (or (and (buffer-file-name) (file-remote-p buffer-file-name))
+                             (verify-visited-file-modtime (current-buffer))))
+                    (doom-modeline-buffer-file-state-icon
+                     "nf-md-reload_alert" "⟳" "%1*"
+                     'doom-modeline-warning))
+                   (buffer-read-only
+                    (doom-modeline-buffer-file-state-icon
+                     "nf-md-lock" "🔒" "%1*"
+                     'doom-modeline-warning))
+                   ((and buffer-file-name (buffer-modified-p)
+                         doom-modeline-buffer-modification-icon)
+                    (doom-modeline-buffer-file-state-icon
+                     "nf-md-content_save_edit" "💾" "%1*"
+                     'doom-modeline-warning))
+                   ((and buffer-file-name
+                         ;; Avoid freezing while connection is lost
+                         (not (file-remote-p buffer-file-name))
+                         (not (file-exists-p buffer-file-name)))
+                    (doom-modeline-buffer-file-state-icon
+                     "nf-md-cancel" "🚫" "!"
+                     'doom-modeline-urgent))
+                   (t ""))
+             (when (or (buffer-narrowed-p)
+                       (and (bound-and-true-p fancy-narrow-mode)
+                            (fancy-narrow-active-p))
+                       (bound-and-true-p dired-narrow-mode))
+               (doom-modeline-buffer-file-state-icon
+                "nf-md-unfold_less_horizontal" "↕" "><"
+                'doom-modeline-warning)))))))
+
+(defvar-local doom-modeline--buffer-file-name nil)
+(defun doom-modeline-update-buffer-file-name (&rest _)
+  "Update buffer file name in mode-line."
+  (setq doom-modeline--buffer-file-name
+        (ignore-errors
+          (save-match-data
+            (if buffer-file-name
+                (doom-modeline-buffer-file-name)
+              (propertize "%b"
+                          'face 'doom-modeline-buffer-file
+                          'mouse-face 'doom-modeline-highlight
+                          'help-echo "Buffer name
+mouse-1: Previous buffer\nmouse-3: Next buffer"
+                          'local-map mode-line-buffer-identification-keymap))))))
+(add-hook 'find-file-hook #'doom-modeline-update-buffer-file-name)
+(add-hook 'after-save-hook #'doom-modeline-update-buffer-file-name)
+(add-hook 'clone-indirect-buffer-hook #'doom-modeline-update-buffer-file-name)
+(add-hook 'evil-insert-state-exit-hook #'doom-modeline-update-buffer-file-name)
+(add-hook 'Info-selection-hook #'doom-modeline-update-buffer-file-name)
+(advice-add #'rename-buffer :after #'doom-modeline-update-buffer-file-name)
+(advice-add #'set-visited-file-name :after #'doom-modeline-update-buffer-file-name)
+(advice-add #'pop-to-buffer :after #'doom-modeline-update-buffer-file-name)
+(advice-add #'popup-create :after #'doom-modeline-update-buffer-file-name)
+(advice-add #'popup-delete :after #'doom-modeline-update-buffer-file-name)
+;; (advice-add #'primitive-undo :after #'doom-modeline-update-buffer-file-name)
+;; (advice-add #'set-buffer-modified-p :after #'doom-modeline-update-buffer-file-name)
+
+(with-no-warnings
+  (if (boundp 'after-focus-change-function)
+      (progn
+        (advice-add #'handle-switch-frame :after #'doom-modeline-update-buffer-file-name)
+        (add-function :after after-focus-change-function #'doom-modeline-update-buffer-file-name))
+    (progn
+      (add-hook 'focus-in-hook #'doom-modeline-update-buffer-file-name)
+      (add-hook 'focus-out-hook #'doom-modeline-update-buffer-file-name))))
+
+(doom-modeline-add-variable-watcher
+ 'doom-modeline-buffer-file-name-style
+ (lambda (_sym val op _where)
+   (when (eq op 'set)
+     (setq doom-modeline-buffer-file-name-style val)
+     (dolist (buf (buffer-list))
+       (with-current-buffer buf
+         (when buffer-file-name
+           (doom-modeline-update-buffer-file-name)))))))
+
+(defsubst doom-modeline--buffer-mode-icon ()
+  "The icon of the current major mode."
+  (when (and doom-modeline-icon doom-modeline-major-mode-icon)
+    (when-let ((icon (or doom-modeline--buffer-file-icon
+                         (doom-modeline-update-buffer-file-icon))))
+      (unless (string-empty-p icon)
+        (concat
+         (if doom-modeline-major-mode-color-icon
+             (doom-modeline-display-icon icon)
+           (doom-modeline-propertize-icon
+            icon
+            (doom-modeline-face)))
+         (doom-modeline-vspc))))))
+
+(defsubst doom-modeline--buffer-state-icon ()
+  "The icon of the current buffer state."
+  (when doom-modeline-buffer-state-icon
+    (when-let ((icon (doom-modeline-update-buffer-file-state-icon)))
+      (unless (string-empty-p icon)
+        (concat
+         (doom-modeline-display-icon icon)
+         (doom-modeline-vspc))))))
+
+(defsubst doom-modeline--buffer-simple-name ()
+  "The buffer simple name."
+  (propertize "%b"
+              'face (doom-modeline-face
+                     (if (and doom-modeline-highlight-modified-buffer-name
+                              (buffer-modified-p))
+                         'doom-modeline-buffer-modified
+                       'doom-modeline-buffer-file))
+              'mouse-face 'doom-modeline-highlight
+              'help-echo "Buffer name
+mouse-1: Previous buffer\nmouse-3: Next buffer"
+              'local-map mode-line-buffer-identification-keymap))
+
+(defsubst doom-modeline--buffer-name ()
+  "The current buffer name."
+  (when doom-modeline-buffer-name
+    (if (and (not (eq doom-modeline-buffer-file-name-style 'file-name))
+             doom-modeline--limited-width-p)
+        ;; Only display the buffer name if the window is small, and doesn't
+        ;; need to respect file-name style.
+        (doom-modeline--buffer-simple-name)
+      (when-let ((name (or doom-modeline--buffer-file-name
+                           (doom-modeline-update-buffer-file-name))))
+        ;; Check if the buffer is modified
+        (if (and doom-modeline-highlight-modified-buffer-name
+                 (buffer-modified-p))
+            (propertize name 'face (doom-modeline-face 'doom-modeline-buffer-modified))
+          (doom-modeline-display-text name))))))
+
+(doom-modeline-def-segment buffer-info
+  "Combined information about the current buffer.
+
+Including the current working directory, the file name, and its state (modified,
+read-only or non-existent)."
+  (concat
+   (doom-modeline-spc)
+   (doom-modeline--buffer-mode-icon)
+   (doom-modeline--buffer-state-icon)
+   (doom-modeline--buffer-name)))
+
+(doom-modeline-def-segment buffer-info-simple
+  "Display only the current buffer's name, but with fontification."
+  (concat
+   (doom-modeline-spc)
+   (doom-modeline--buffer-mode-icon)
+   (doom-modeline--buffer-state-icon)
+   (doom-modeline--buffer-simple-name)))
+
+(doom-modeline-def-segment calc
+  "Display calculator icons and info."
+  (concat
+   (doom-modeline-spc)
+   (when-let ((icon (doom-modeline-icon 'faicon "nf-fa-calculator" "🖩" "")))
+     (concat
+      (doom-modeline-display-icon icon)
+      (doom-modeline-vspc)))
+   (doom-modeline--buffer-simple-name)))
+
+(doom-modeline-def-segment buffer-default-directory
+  "Displays `default-directory' with the icon and state.
+
+This is for special buffers like the scratch buffer where knowing the current
+project directory is important."
+  (let ((face (doom-modeline-face
+               (if (and buffer-file-name (buffer-modified-p))
+                   'doom-modeline-buffer-modified
+                 'doom-modeline-buffer-path))))
+    (concat
+     (doom-modeline-spc)
+     (and doom-modeline-major-mode-icon
+          (concat
+           (doom-modeline-icon
+            'octicon "nf-oct-file_directory_fill" "🖿" "" :face face)
+           (doom-modeline-vspc)))
+     (doom-modeline--buffer-state-icon)
+     (propertize (abbreviate-file-name default-directory) 'face face))))
+
+(doom-modeline-def-segment buffer-default-directory-simple
+  "Displays `default-directory'.
+
+This is for special buffers like the scratch buffer where knowing the current
+project directory is important."
+  (let ((face (doom-modeline-face 'doom-modeline-buffer-path)))
+    (concat
+     (doom-modeline-spc)
+     (and doom-modeline-major-mode-icon
+          (concat
+           (doom-modeline-icon
+            'octicon "nf-oct-file_directory_fill" "🖿" "" :face face)
+           (doom-modeline-vspc)))
+     (propertize (abbreviate-file-name default-directory) 'face face))))
+
+
+;;
+;; Encoding
+;;
+
+(doom-modeline-def-segment buffer-encoding
+  "Displays the eol and the encoding style of the buffer."
+  (when doom-modeline-buffer-encoding
+    (let ((sep (doom-modeline-spc))
+          (face (doom-modeline-face))
+          (mouse-face 'doom-modeline-highlight))
+      (concat
+       sep
+
+       ;; eol type
+       (let ((eol (coding-system-eol-type buffer-file-coding-system)))
+         (when (or (eq doom-modeline-buffer-encoding t)
+                   (and (eq doom-modeline-buffer-encoding 'nondefault)
+                        (not (equal eol doom-modeline-default-eol-type))))
+           (propertize
+            (pcase eol
+              (0 "LF ")
+              (1 "CRLF ")
+              (2 "CR ")
+              (_ ""))
+            'face face
+            'mouse-face mouse-face
+            'help-echo (format "End-of-line style: %s\nmouse-1: Cycle"
+                               (pcase eol
+                                 (0 "Unix-style LF")
+                                 (1 "DOS-style CRLF")
+                                 (2 "Mac-style CR")
+                                 (_ "Undecided")))
+            'local-map (let ((map (make-sparse-keymap)))
+                         (define-key map [mode-line mouse-1] 'mode-line-change-eol)
+                         map))))
+
+       ;; coding system
+       (let* ((sys (coding-system-plist buffer-file-coding-system))
+              (cat (plist-get sys :category))
+              (sym (if (memq cat
+                             '(coding-category-undecided coding-category-utf-8))
+                       'utf-8
+                     (plist-get sys :name))))
+         (when (or (eq doom-modeline-buffer-encoding t)
+                   (and (eq doom-modeline-buffer-encoding 'nondefault)
+                        (not (eq cat 'coding-category-undecided))
+                        (not (eq sym doom-modeline-default-coding-system))))
+           (propertize
+            (upcase (symbol-name sym))
+            'face face
+            'mouse-face mouse-face
+            'help-echo 'mode-line-mule-info-help-echo
+            'local-map mode-line-coding-system-map)))
+
+       sep))))
+
+
+;;
+;; Indentation
+;;
+
+(doom-modeline-def-segment indent-info
+  "Displays the indentation information."
+  (when doom-modeline-indent-info
+    (let ((do-propertize
+           (lambda (mode size)
+             (propertize
+              (format " %s %d " mode size)
+              'face (doom-modeline-face)))))
+      (if indent-tabs-mode
+          (funcall do-propertize "TAB" tab-width)
+        (let ((lookup-var
+               (seq-find (lambda (var)
+                           (and var (boundp var) (symbol-value var)))
+                         (cdr (assoc major-mode doom-modeline-indent-alist)) nil)))
+          (funcall do-propertize "SPC"
+                   (if lookup-var
+                       (symbol-value lookup-var)
+                     tab-width)))))))
+
+;;
+;; Remote host
+;;
+
+(doom-modeline-def-segment remote-host
+  "Hostname for remote buffers."
+  (when default-directory
+    (when-let ((host (file-remote-p default-directory 'host)))
+      (propertize
+       (concat "@" host)
+       'face (doom-modeline-face 'doom-modeline-host)))))
+
+
+;;
+;; Major mode
+;;
+
+(doom-modeline-def-segment major-mode
+  "The major mode, including environment and text-scale info."
+  (let ((sep (doom-modeline-spc))
+        (face (doom-modeline-face 'doom-modeline-buffer-major-mode)))
+    (concat
+     sep
+     (propertize (concat
+                  (format-mode-line
+                   (or (and (boundp 'delighted-modes)
+                            (cadr (assq major-mode delighted-modes)))
+                       mode-name))
+                  (when (and doom-modeline-env-version doom-modeline-env--version)
+                    (format " %s" doom-modeline-env--version)))
+                 'help-echo "Major mode\n\
+mouse-1: Display major mode menu\n\
+mouse-2: Show help for major mode\n\
+mouse-3: Toggle minor modes"
+                 'face face
+                 'mouse-face 'doom-modeline-highlight
+                 'local-map mode-line-major-mode-keymap)
+     (and (boundp 'text-scale-mode-amount)
+          (/= text-scale-mode-amount 0)
+          (propertize
+           (format
+            (if (> text-scale-mode-amount 0) " (%+d)" " (%-d)")
+            text-scale-mode-amount)
+           'face face))
+     sep)))
+
+
+;;
+;; Process
+;;
+
+(doom-modeline-def-segment process
+  "The process info."
+  (doom-modeline-display-text
+   (format-mode-line mode-line-process)))
+
+
+;;
+;; Minor modes
+;;
+
+(doom-modeline-def-segment minor-modes
+  (when doom-modeline-minor-modes
+    (let ((sep (doom-modeline-spc))
+          (face (doom-modeline-face 'doom-modeline-buffer-minor-mode))
+          (mouse-face 'doom-modeline-highlight)
+          (help-echo "Minor mode
+  mouse-1: Display minor mode menu
+  mouse-2: Show help for minor mode
+  mouse-3: Toggle minor modes"))
+      (if (bound-and-true-p minions-mode)
+          `((:propertize ("" ,(minions--prominent-modes))
+             face ,face
+		     mouse-face ,mouse-face
+		     help-echo ,help-echo
+		     local-map ,mode-line-minor-mode-keymap)
+            ,sep
+            (:propertize ("" ,(doom-modeline-icon 'octicon "nf-oct-gear" "⚙"
+                                                  minions-mode-line-lighter
+                                                  :face face))
+             mouse-face ,mouse-face
+             help-echo "Minions
+mouse-1: Display minor modes menu"
+             local-map ,minions-mode-line-minor-modes-map)
+            ,sep)
+        `((:propertize ("" minor-mode-alist)
+           face ,face
+           mouse-face ,mouse-face
+           help-echo ,help-echo
+           local-map ,mode-line-minor-mode-keymap)
+          ,sep)))))
+
+
+;;
+;; VCS
+;;
+
+(defun doom-modeline-vcs-icon (icon &optional unicode text face)
+  "Displays the vcs ICON with FACE and VOFFSET.
+
+UNICODE and TEXT are fallbacks.
+Uses `nerd-icons-octicon' to fetch the icon."
+  (doom-modeline-icon 'devicon (and doom-modeline-vcs-icon icon)
+                      unicode text :face face))
+
+(defvar-local doom-modeline--vcs nil)
+(defun doom-modeline-update-vcs (&rest _)
+  "Update vcs state in mode-line."
+  (setq doom-modeline--vcs
+        (when (and vc-mode buffer-file-name)
+          (let* ((backend (vc-backend buffer-file-name))
+                 (state (vc-state buffer-file-name backend))
+                 (icon (cond ((memq state '(edited added))
+                              (doom-modeline-vcs-icon "nf-dev-git_compare" "🔃" "*" 'doom-modeline-info))
+                             ((eq state 'needs-merge)
+                              (doom-modeline-vcs-icon "nf-dev-git_merge" "🔀" "?" 'doom-modeline-info))
+                             ((eq state 'needs-update)
+                              (doom-modeline-vcs-icon "nf-dev-git_pull_request" "⬇" "!" 'doom-modeline-warning))
+                             ((memq state '(removed conflict unregistered))
+                              (doom-modeline-icon 'octicon "nf-oct-alert" "⚠" "!" :face 'doom-modeline-urgent))
+                             (t (doom-modeline-vcs-icon "nf-dev-git_branch" "" "@" 'doom-modeline-info))))
+                 (str (or (and vc-display-status
+                               (functionp doom-modeline-vcs-display-function)
+                               (funcall doom-modeline-vcs-display-function))
+                          ""))
+                 (face (cond ((eq state 'needs-update)
+                              '(doom-modeline-warning bold))
+                             ((memq state '(removed conflict unregistered))
+                              '(doom-modeline-urgent bold))
+                             (t '(doom-modeline-info bold))))
+                 (text (propertize (if (length> str doom-modeline-vcs-max-length)
+                                       (concat
+                                        (substring str 0 (- doom-modeline-vcs-max-length 3))
+                                        doom-modeline-ellipsis)
+                                     str)
+                                   'face face)))
+            `((icon . ,icon) (text . ,text))))))
+(add-hook 'find-file-hook #'doom-modeline-update-vcs)
+(add-hook 'after-save-hook #'doom-modeline-update-vcs)
+(advice-add #'vc-refresh-state :after #'doom-modeline-update-vcs)
+
+(doom-modeline-add-variable-watcher
+ 'doom-modeline-icon
+ (lambda (_sym val op _where)
+   (when (eq op 'set)
+     (setq doom-modeline-icon val)
+     (dolist (buf (buffer-list))
+       (with-current-buffer buf
+         (doom-modeline-update-vcs))))))
+
+(doom-modeline-add-variable-watcher
+ 'doom-modeline-unicode-fallback
+ (lambda (_sym val op _where)
+   (when (eq op 'set)
+     (setq doom-modeline-unicode-fallback val)
+     (dolist (buf (buffer-list))
+       (with-current-buffer buf
+         (doom-modeline-update-vcs))))))
+
+(doom-modeline-add-variable-watcher
+ 'doom-modeline-vcs-icon
+ (lambda (_sym val op _where)
+   (when (eq op 'set)
+     (setq doom-modeline-vcs-icon val)
+     (dolist (buf (buffer-list))
+       (with-current-buffer buf
+         (doom-modeline-update-vcs))))))
+
+(doom-modeline-add-variable-watcher
+ 'vc-display-status
+ (lambda (_sym val op _where)
+   (when (eq op 'set)
+     (setq vc-display-status val)
+     (dolist (buf (buffer-list))
+       (with-current-buffer buf
+         (doom-modeline-update-vcs))))))
+
+(doom-modeline-def-segment vcs
+  "Displays the current branch, colored based on its state."
+  (when doom-modeline--vcs
+    (let-alist doom-modeline--vcs
+      (let ((sep (doom-modeline-spc))
+            (vsep (doom-modeline-vspc)))
+        (concat sep
+                (propertize (concat
+                             (doom-modeline-display-icon .icon)
+                             vsep
+                             (doom-modeline-display-text .text))
+                            'help-echo (get-text-property 1 'help-echo vc-mode)
+                            'mouse-face 'doom-modeline-highlight
+                            'local-map (get-text-property 1 'local-map vc-mode))
+                sep)))))
+
+
+;;
+;; Check
+;;
+
+(defun doom-modeline-check-icon (icon unicode text face)
+  "Displays the check ICON with FACE.
+
+UNICODE and TEXT are fallbacks.
+Uses `nerd-icons-mdicon' to fetch the icon."
+  (doom-modeline-icon 'mdicon (and doom-modeline-check-icon icon)
+                      unicode text :face face))
+
+(defun doom-modeline-check-text (text &optional face)
+  "Displays the check TEXT with FACE."
+  (propertize text 'face (or face 'mode-line)))
+
+;; Flycheck
+
+(defun doom-modeline--flycheck-count-errors ()
+  "Count the number of ERRORS, grouped by level.
+
+Return an alist, where each ITEM is a cons cell whose `car' is an
+error level, and whose `cdr' is the number of errors of that
+level."
+  (let ((info 0) (warning 0) (error 0))
+    (mapc
+     (lambda (item)
+       (let ((count (cdr item)))
+         (pcase (flycheck-error-level-compilation-level (car item))
+           (0 (cl-incf info count))
+           (1 (cl-incf warning count))
+           (2 (cl-incf error count)))))
+     (flycheck-count-errors flycheck-current-errors))
+    `((info . ,info) (warning . ,warning) (error . ,error))))
+
+(defvar-local doom-modeline--flycheck nil)
+(defun doom-modeline-update-flycheck (&optional status)
+  "Update flycheck via STATUS."
+  (setq doom-modeline--flycheck
+        (let-alist (doom-modeline--flycheck-count-errors)
+          (let* ((vsep (doom-modeline-vspc))
+                 (seg (if doom-modeline-check-simple-format
+                          (let ((count (+ .error .warning .info)))
+                            (pcase status
+                              ('finished    (if (> count 0)
+                                                (let ((face (if (> .error 0) 'doom-modeline-urgent 'doom-modeline-warning)))
+                                                  (concat
+                                                   (doom-modeline-check-icon "nf-md-alert_circle_outline" "⚠" "!" face)
+                                                   vsep
+                                                   (doom-modeline-check-text (number-to-string count) face)))
+                                              (doom-modeline-check-icon "nf-md-check_circle_outline" "✔" "*" 'doom-modeline-info)))
+                              ('running     (concat
+                                             (doom-modeline-check-icon "nf-md-timer_sand" "⏳" "*" 'doom-modeline-debug)
+                                             (when (> count 0)
+                                               (concat
+                                                vsep
+                                                (doom-modeline-check-text (number-to-string count) 'doom-modeline-debug)))))
+                              ('no-checker  (doom-modeline-check-icon "nf-md-alert_box_outline" "⚠" "-" 'doom-modeline-debug))
+                              ('errored     (doom-modeline-check-icon "nf-md-alert_box_outline" "⚠" "!" 'doom-modeline-urgent))
+                              ('interrupted (doom-modeline-check-icon "nf-md-pause_circle_outline" "⦷" "." 'doom-modeline-debug))
+                              ('suspicious  (doom-modeline-check-icon "nf-md-file_question_outline" "❓" "?" 'doom-modeline-debug))
+                              (_ "")))
+                        (concat (doom-modeline-check-icon "nf-md-close_circle_outline" "⮾" "!" 'doom-modeline-urgent)
+                                vsep
+                                (doom-modeline-check-text (number-to-string .error) 'doom-modeline-urgent)
+                                vsep
+                                (doom-modeline-check-icon "nf-md-alert_outline" "⚠" "!" 'doom-modeline-warning)
+                                vsep
+                                (doom-modeline-check-text (number-to-string .warning) 'doom-modeline-warning)
+                                vsep
+                                (doom-modeline-check-icon "nf-md-information_outline" "🛈" "!" 'doom-modeline-info)
+                                vsep
+                                (doom-modeline-check-text (number-to-string .info) 'doom-modeline-info)))))
+            (propertize seg
+                        'help-echo (concat "Flycheck\n"
+                                           (pcase status
+                                             ('finished (format "error: %d, warning: %d, info: %d" .error .warning .info))
+                                             ('running "Checking...")
+                                             ('no-checker "No Checker")
+                                             ('errored "Error")
+                                             ('interrupted "Interrupted")
+                                             ('suspicious "Suspicious"))
+                                           "\nmouse-1: Display minor mode menu\nmouse-2: Show help for minor mode")
+                        'mouse-face 'doom-modeline-highlight
+                        'local-map (let ((map (make-sparse-keymap)))
+                                     (define-key map [mode-line down-mouse-1]
+                                       flycheck-mode-menu-map)
+                                     (define-key map [mode-line mouse-2]
+                                       (lambda ()
+                                         (interactive)
+                                         (describe-function 'flycheck-mode)))
+                                     map))))))
+(add-hook 'flycheck-status-changed-functions #'doom-modeline-update-flycheck)
+(add-hook 'flycheck-mode-hook #'doom-modeline-update-flycheck)
+
+(doom-modeline-add-variable-watcher
+ 'doom-modeline-icon
+ (lambda (_sym val op _where)
+   (when (eq op 'set)
+     (setq doom-modeline-icon val)
+     (dolist (buf (buffer-list))
+       (with-current-buffer buf
+         (when (bound-and-true-p flycheck-mode)
+           (doom-modeline-update-flycheck)))))))
+
+(doom-modeline-add-variable-watcher
+ 'doom-modeline-check-icon
+ (lambda (_sym val op _where)
+   (when (eq op 'set)
+     (setq doom-modeline-check-icon val)
+     (dolist (buf (buffer-list))
+       (with-current-buffer buf
+         (when (bound-and-true-p flycheck-mode)
+           (doom-modeline-update-flycheck)))))))
+
+(doom-modeline-add-variable-watcher
+ 'doom-modeline-unicode-fallback
+ (lambda (_sym val op _where)
+   (when (eq op 'set)
+     (setq doom-modeline-unicode-fallback val)
+     (dolist (buf (buffer-list))
+       (with-current-buffer buf
+         (when (bound-and-true-p flycheck-mode)
+           (doom-modeline-update-flycheck)))))))
+
+(doom-modeline-add-variable-watcher
+ 'doom-modeline-check-simple-format
+ (lambda (_sym val op _where)
+   (when (eq op 'set)
+     (setq doom-modeline-check-simple-format val)
+     (dolist (buf (buffer-list))
+       (with-current-buffer buf
+         (when (bound-and-true-p flycheck-mode)
+           (doom-modeline-update-flycheck)))))))
+
+;; Flymake
+
+;; Compatibility
+;; @see https://github.com/emacs-mirror/emacs/commit/6e100869012da9244679696634cab6b9cac96303.
+(with-eval-after-load 'flymake
+  (unless (boundp 'flymake--state)
+    (defvaralias 'flymake--state 'flymake--backend-state))
+  (unless (fboundp 'flymake--state-diags)
+    (defalias 'flymake--state-diags 'flymake--backend-state-diags)))
+
+(defun doom-modeline--flymake-count-errors ()
+  "Count the number of ERRORS, grouped by level."
+  (let ((warning-level (warning-numeric-level :warning))
+        (note-level (warning-numeric-level :debug))
+        (note 0) (warning 0) (error 0))
+    (maphash (lambda (_b state)
+               (cl-loop
+                with diags = (flymake--state-diags state)
+                for diag in diags do
+                (let ((severity (flymake--lookup-type-property (flymake--diag-type diag) 'severity
+                                                               (warning-numeric-level :error))))
+                  (cond ((> severity warning-level) (cl-incf error))
+                        ((> severity note-level) (cl-incf warning))
+                        (t (cl-incf note))))))
+             flymake--state)
+    `((note . ,note) (warning . ,warning) (error . ,error))))
+
+(defvar-local doom-modeline--flymake nil)
+(defun doom-modeline-update-flymake (&rest _)
+  "Update flymake."
+  (setq doom-modeline--flymake
+        (let* ((known (hash-table-keys flymake--state))
+               (running (flymake-running-backends))
+               (disabled (flymake-disabled-backends))
+               (reported (flymake-reporting-backends))
+               (all-disabled (and disabled (null running)))
+               (some-waiting (cl-set-difference running reported)))
+          (let-alist (doom-modeline--flymake-count-errors)
+            (let* ((vsep (doom-modeline-vspc))
+                   (seg (if doom-modeline-check-simple-format
+                            (let ((count (+ .error .warning .note)))
+                              (cond
+                               (some-waiting (concat
+                                              (doom-modeline-check-icon "nf-md-timer_sand" "⏳" "*" 'doom-modeline-debug)
+                                              (when (> count 0)
+                                                (concat
+                                                 vsep
+                                                 (doom-modeline-check-text (number-to-string count) 'doom-modeline-debug)))))
+                               ((null known) (doom-modeline-check-icon "nf-md-alert_box_outline" "⚠" "!" 'doom-modeline-urgent))
+                               (all-disabled (doom-modeline-check-icon "nf-md-alert_box_outline" "⚠" "!" 'doom-modeline-warning))
+                               (t (if (> count 0)
+                                      (let ((face (cond ((> .error 0) 'doom-modeline-urgent)
+                                                        ((> .warning 0) 'doom-modeline-warning)
+                                                        (t 'doom-modeline-info))))
+                                        (concat
+                                         (doom-modeline-check-icon "nf-md-alert_circle_outline" "⚠" "!" face)
+                                         vsep
+                                         (doom-modeline-check-text (number-to-string count) face)))
+                                    (doom-modeline-check-icon "nf-md-check_circle_outline" "✔" "*" 'doom-modeline-info)))))
+                          (concat
+                           (doom-modeline-check-icon "nf-md-close_circle_outline" "⮾" "!" 'doom-modeline-urgent)
+                           vsep
+                           (doom-modeline-check-text (number-to-string .error) 'doom-modeline-urgent)
+                           vsep
+                           (doom-modeline-check-icon "nf-md-alert_outline" "⚠" "!" 'doom-modeline-warning)
+                           vsep
+                           (doom-modeline-check-text (number-to-string .warning) 'doom-modeline-warning)
+                           vsep
+                           (doom-modeline-check-icon "nf-md-information_outline" "🛈" "!" 'doom-modeline-info)
+                           vsep
+                           (doom-modeline-check-text (number-to-string .note) 'doom-modeline-info)))))
+              (propertize
+               seg
+               'help-echo (concat
+                           "Flymake\n"
+                           (cond (some-waiting "Checking...")
+                                 ((null known) "No Checker")
+                                 (all-disabled "All Checkers Disabled")
+                                 (t (format "%d/%d backends running\nerror: %d, warning: %d, note: %d"
+                                            (length running) (length known) .error .warning .note)))
+                           "\nmouse-1: Display minor mode menu\nmouse-2: Show help for minor mode")
+               'mouse-face 'doom-modeline-highlight
+               'local-map (let ((map (make-sparse-keymap)))
+                            (define-key map [mode-line down-mouse-1]
+                              flymake-menu)
+                            (define-key map [mode-line mouse-2]
+                              (lambda ()
+                                (interactive)
+                                (describe-function 'flymake-mode)))
+                            map)))))))
+(advice-add #'flymake--handle-report :after #'doom-modeline-update-flymake)
+
+(doom-modeline-add-variable-watcher
+ 'doom-modeline-icon
+ (lambda (_sym val op _where)
+   (when (eq op 'set)
+     (setq doom-modeline-icon val)
+     (dolist (buf (buffer-list))
+       (with-current-buffer buf
+         (when (bound-and-true-p flymake-mode)
+           (doom-modeline-update-flymake)))))))
+
+(doom-modeline-add-variable-watcher
+ 'doom-modeline-check-icon
+ (lambda (_sym val op _where)
+   (when (eq op 'set)
+     (setq doom-modeline-check-icon val)
+     (dolist (buf (buffer-list))
+       (with-current-buffer buf
+         (when (bound-and-true-p flymake-mode)
+           (doom-modeline-update-flymake)))))))
+
+(doom-modeline-add-variable-watcher
+ 'doom-modeline-unicode-fallback
+ (lambda (_sym val op _where)
+   (when (eq op 'set)
+     (setq doom-modeline-unicode-fallback val)
+     (dolist (buf (buffer-list))
+       (with-current-buffer buf
+         (when (bound-and-true-p flymake-mode)
+           (doom-modeline-update-flymake)))))))
+
+(doom-modeline-add-variable-watcher
+ 'doom-modeline-check-simple-format
+ (lambda (_sym val op _where)
+   (when (eq op 'set)
+     (setq doom-modeline-check-simple-format val)
+     (dolist (buf (buffer-list))
+       (with-current-buffer buf
+         (when (bound-and-true-p flymake-mode)
+           (doom-modeline-update-flymake)))))))
+
+(doom-modeline-def-segment check
+  "Displays color-coded error status in the current buffer with pretty icons."
+  (when-let ((sep (doom-modeline-spc))
+             (vsep (doom-modeline-vspc))
+             (seg (cond
+                   ((and (bound-and-true-p flymake-mode)
+                         (bound-and-true-p flymake--state)) ; only support 26+
+                    doom-modeline--flymake)
+                   ((and (bound-and-true-p flycheck-mode)
+                         (bound-and-true-p flycheck--automatically-enabled-checkers))
+                    doom-modeline--flycheck))))
+    (concat
+     sep
+     (let ((str))
+       (dolist (s (split-string seg " "))
+         (setq str
+               (concat str
+                       (if (string-match-p "^[0-9]+$" s)
+                           (concat vsep
+                                   (doom-modeline-display-text s)
+                                   vsep)
+                         (doom-modeline-display-icon s)))))
+       (propertize str
+                   'help-echo (get-text-property 0 'help-echo seg)
+                   'mouse-face 'doom-modeline-highlight
+                   'local-map (get-text-property 0 'local-map seg)))
+     sep)))
+
+
+;;
+;; Word Count
+;;
+
+(doom-modeline-def-segment word-count
+  "The buffer word count.
+Displayed when in a major mode in `doom-modeline-continuous-word-count-modes'.
+Respects `doom-modeline-enable-word-count'."
+  (when (and doom-modeline-enable-word-count
+             (member major-mode doom-modeline-continuous-word-count-modes))
+    (propertize (format " %dW" (count-words (point-min) (point-max)))
+                'face (doom-modeline-face))))
+
+
+;;
+;; Selection
+;;
+
+(defsubst doom-modeline-column (pos)
+  "Get the column of the position `POS'."
+  (save-excursion (goto-char pos)
+                  (current-column)))
+
+(doom-modeline-def-segment selection-info
+  "Information about the current selection.
+
+Such as how many characters and lines are selected, or the NxM dimensions of a
+block selection."
+  (when (and (or mark-active (and (bound-and-true-p evil-local-mode)
+                                  (eq evil-state 'visual)))
+             (doom-modeline--active))
+    (cl-destructuring-bind (beg . end)
+      (if (and (bound-and-true-p evil-local-mode) (eq evil-state 'visual))
+          (cons evil-visual-beginning evil-visual-end)
+        (cons (region-beginning) (region-end)))
+      (propertize
+       (let ((lines (count-lines beg (min end (point-max)))))
+         (concat
+          " "
+          (cond ((or (bound-and-true-p rectangle-mark-mode)
+                     (and (bound-and-true-p evil-visual-selection)
+                          (eq 'block evil-visual-selection)))
+                 (let ((cols (abs (- (doom-modeline-column end)
+                                     (doom-modeline-column beg)))))
+                   (format "%dx%dB" lines cols)))
+                ((and (bound-and-true-p evil-visual-selection)
+                      (eq evil-visual-selection 'line))
+                 (format "%dL" lines))
+                ((> lines 1)
+                 (format "%dC %dL" (- end beg) lines))
+                (t
+                 (format "%dC" (- end beg))))
+          (when doom-modeline-enable-word-count
+            (format " %dW" (count-words beg end)))
+          " "))
+       'face 'doom-modeline-emphasis))))
+
+
+;;
+;; Matches (macro, anzu, evil-substitute, iedit, symbol-overlay and multi-cursors)
+;;
+
+(defsubst doom-modeline--macro-recording ()
+  "Display current Emacs or evil macro being recorded."
+  (when (and (doom-modeline--active)
+             (or defining-kbd-macro executing-kbd-macro))
+    (let ((sep (propertize " " 'face 'doom-modeline-panel))
+          (vsep (propertize " " 'face
+                            '(:inherit (doom-modeline-panel variable-pitch))))
+          (macro-name (if (bound-and-true-p evil-this-macro)
+                          (format " @%s "
+                                  (char-to-string evil-this-macro))
+                        "Macro")))
+      (concat
+       sep
+       (if doom-modeline-always-show-macro-register
+           (propertize macro-name 'face 'doom-modeline-panel)
+         (concat
+          (doom-modeline-icon 'mdicon "nf-md-record" "●"
+                              macro-name
+                              :face '(:inherit (doom-modeline-urgent doom-modeline-panel))
+                              :v-adjust 0.15)
+          vsep
+          (doom-modeline-icon 'mdicon "nf-md-menu_right" "▶" ">"
+                              :face 'doom-modeline-panel
+                              :v-adjust 0.15)))
+       sep))))
+
+;; `anzu' and `evil-anzu' expose current/total state that can be displayed in the
+;; mode-line.
+(defun doom-modeline-fix-anzu-count (positions here)
+  "Calulate anzu count via POSITIONS and HERE."
+  (cl-loop with i = 0
+           for (start . end) in positions
+           do (cl-incf i)
+           when (and (>= here start) (<= here end))
+           return i
+           finally return 0))
+
+(advice-add #'anzu--where-is-here :override #'doom-modeline-fix-anzu-count)
+
+(setq anzu-cons-mode-line-p nil) ; manage modeline segment ourselves
+;; Ensure anzu state is cleared when searches & iedit are done
+(with-eval-after-load 'anzu
+  (add-hook 'isearch-mode-end-hook #'anzu--reset-status t)
+  (add-hook 'iedit-mode-end-hook #'anzu--reset-status)
+  (advice-add #'evil-force-normal-state :after #'anzu--reset-status)
+  ;; Fix matches segment mirroring across all buffers
+  (mapc #'make-variable-buffer-local
+        '(anzu--total-matched
+          anzu--current-position anzu--state anzu--cached-count
+          anzu--cached-positions anzu--last-command
+          anzu--last-isearch-string anzu--overflow-p)))
+
+(defsubst doom-modeline--anzu ()
+  "Show the match index and total number thereof.
+Requires `anzu', also `evil-anzu' if using `evil-mode' for compatibility with
+`evil-search'."
+  (when (and (bound-and-true-p anzu--state)
+             (not (bound-and-true-p iedit-mode)))
+    (propertize
+     (let ((here anzu--current-position)
+           (total anzu--total-matched))
+       (cond ((eq anzu--state 'replace-query)
+              (format " %d replace " anzu--cached-count))
+             ((eq anzu--state 'replace)
+              (format " %d/%d " here total))
+             (anzu--overflow-p
+              (format " %s+ " total))
+             (t
+              (format " %s/%d " here total))))
+     'face (doom-modeline-face 'doom-modeline-panel))))
+
+(defsubst doom-modeline--evil-substitute ()
+  "Show number of matches for `evil-ex' in real time.
+The number of matches contains substitutions and highlightings."
+  (when (and (bound-and-true-p evil-local-mode)
+             (or (assq 'evil-ex-substitute evil-ex-active-highlights-alist)
+                 (assq 'evil-ex-global-match evil-ex-active-highlights-alist)
+                 (assq 'evil-ex-buffer-match evil-ex-active-highlights-alist)))
+    (propertize
+     (let ((range (if evil-ex-range
+                      (cons (car evil-ex-range) (cadr evil-ex-range))
+                    (cons (line-beginning-position) (line-end-position))))
+           (pattern (car-safe (evil-delimited-arguments evil-ex-argument 2))))
+       (if pattern
+           (format " %s matches " (how-many pattern (car range) (cdr range)))
+         " - "))
+     'face (doom-modeline-face 'doom-modeline-panel))))
+
+(defun doom-modeline-themes--overlay-sort (a b)
+  "Sort overlay A and B."
+  (< (overlay-start a) (overlay-start b)))
+
+(defsubst doom-modeline--iedit ()
+  "Show the number of iedit regions matches + what match you're on."
+  (when (and (bound-and-true-p iedit-mode)
+             (bound-and-true-p iedit-occurrences-overlays))
+    (propertize
+     (let ((this-oc (or (let ((inhibit-message t))
+                          (iedit-find-current-occurrence-overlay))
+                        (save-excursion (iedit-prev-occurrence)
+                                        (iedit-find-current-occurrence-overlay))))
+           (length (length iedit-occurrences-overlays)))
+       (format " %s/%d "
+               (if this-oc
+                   (- length
+                      (length (memq this-oc (sort (append iedit-occurrences-overlays nil)
+                                                  #'doom-modeline-themes--overlay-sort)))
+                      -1)
+                 "-")
+               length))
+     'face (doom-modeline-face 'doom-modeline-panel))))
+
+(defsubst doom-modeline--symbol-overlay ()
+  "Show the number of matches for symbol overlay."
+  (when (and (doom-modeline--active)
+             (bound-and-true-p symbol-overlay-keywords-alist)
+             (not (bound-and-true-p symbol-overlay-temp-symbol))
+             (not (bound-and-true-p iedit-mode)))
+    (let* ((keyword (symbol-overlay-assoc (symbol-overlay-get-symbol t)))
+           (symbol (car keyword))
+           (before (symbol-overlay-get-list -1 symbol))
+           (after (symbol-overlay-get-list 1 symbol))
+           (count (length before)))
+      (if (symbol-overlay-assoc symbol)
+          (propertize
+           (format (concat  " %d/%d " (and (cadr keyword) "in scope "))
+                   (+ count 1)
+                   (+ count (length after)))
+           'face (doom-modeline-face 'doom-modeline-panel))))))
+
+(defsubst doom-modeline--multiple-cursors ()
+  "Show the number of multiple cursors."
+  (cl-destructuring-bind (count . face)
+    (cond ((bound-and-true-p multiple-cursors-mode)
+           (cons (mc/num-cursors)
+                 (doom-modeline-face 'doom-modeline-panel)))
+          ((bound-and-true-p evil-mc-cursor-list)
+           (cons (length evil-mc-cursor-list)
+                 (doom-modeline-face (if evil-mc-frozen
+                                         'doom-modeline-bar
+                                       'doom-modeline-panel))))
+          ((cons nil nil)))
+    (when count
+      (concat (propertize " " 'face face)
+              (if (doom-modeline-icon-displayable-p)
+                  (doom-modeline-icon 'faicon "nf-fa-i_cursor" "" "" :face face)
+                (propertize "I"
+                            'face `(:inherit ,face :height 1.4 :weight normal)
+                            'display '(raise -0.1)))
+              (propertize " "
+                          'face `(:inherit (variable-pitch ,face)))
+              (propertize (format "%d " count)
+                          'face face)))))
+
+(defsubst doom-modeline--phi-search ()
+  "Show the number of matches for `phi-search' and `phi-replace'."
+  (when (and (doom-modeline--active)
+             (bound-and-true-p phi-search--overlays))
+    (let ((total (length phi-search--overlays))
+          (selection phi-search--selection))
+      (when selection
+        (propertize
+         (format " %d/%d " (1+ selection) total)
+         'face (doom-modeline-face 'doom-modeline-panel))))))
+
+(defun doom-modeline--override-phi-search (orig-fun &rest args)
+  "Override the mode-line of `phi-search' and `phi-replace'.
+Apply ORIG-FUN with ARGS."
+  (if (bound-and-true-p doom-modeline-mode)
+      (apply orig-fun mode-line-format (cdr args))
+    (apply orig-fun args)))
+(advice-add #'phi-search--initialize :around #'doom-modeline--override-phi-search)
+
+(defsubst doom-modeline--buffer-size ()
+  "Show buffer size."
+  (when size-indication-mode
+    (let ((sep (doom-modeline-spc)))
+      (concat sep
+              (propertize "%I"
+                          'face (doom-modeline-face)
+                          'help-echo "Buffer size
+mouse-1: Display Line and Column Mode Menu"
+                          'mouse-face 'doom-modeline-highlight
+                          'local-map mode-line-column-line-number-mode-map)
+              sep))))
+
+(doom-modeline-def-segment matches
+  "Displays matches.
+
+Including:
+1. the currently recording macro, 2. A current/total for the
+current search term (with `anzu'), 3. The number of substitutions being
+conducted with `evil-ex-substitute', and/or 4. The number of active `iedit'
+regions, 5. The current/total for the highlight term (with `symbol-overlay'),
+6. The number of active `multiple-cursors'."
+  (let ((meta (concat (doom-modeline--macro-recording)
+                      (doom-modeline--anzu)
+                      (doom-modeline--phi-search)
+                      (doom-modeline--evil-substitute)
+                      (doom-modeline--iedit)
+                      (doom-modeline--symbol-overlay)
+                      (doom-modeline--multiple-cursors))))
+    (or (and (not (string-empty-p meta)) meta)
+        (doom-modeline--buffer-size))))
+
+(doom-modeline-def-segment buffer-size
+  "Display buffer size."
+  (doom-modeline--buffer-size))
+
+;;
+;; Media
+;;
+
+(doom-modeline-def-segment media-info
+  "Metadata regarding the current file, such as dimensions for images."
+  ;; TODO: Include other information
+  (cond ((eq major-mode 'image-mode)
+         (cl-destructuring-bind (width . height)
+           (when (fboundp 'image-size)
+             (image-size (image-get-display-property) :pixels))
+           (format "  %dx%d  " width height)))))
+
+
+;;
+;; Bars
+;;
+
+(defvar doom-modeline--bar-active nil)
+(defvar doom-modeline--bar-inactive nil)
+
+(defsubst doom-modeline--bar ()
+  "The default bar regulates the height of the mode-line in GUI."
+  (unless (and doom-modeline--bar-active doom-modeline--bar-inactive)
+    (let ((width doom-modeline-bar-width)
+          (height (max doom-modeline-height (doom-modeline--font-height))))
+      (setq doom-modeline--bar-active
+            (doom-modeline--create-bar-image 'doom-modeline-bar width height)
+            doom-modeline--bar-inactive
+            (doom-modeline--create-bar-image
+             'doom-modeline-bar-inactive width height))))
+  (if (doom-modeline--active)
+      doom-modeline--bar-active
+    doom-modeline--bar-inactive))
+
+(defun doom-modeline-refresh-bars ()
+  "Refresh mode-line bars on next redraw."
+  (setq doom-modeline--bar-active nil
+        doom-modeline--bar-inactive nil))
+
+(cl-defstruct doom-modeline--hud-cache active inactive top-margin bottom-margin)
+
+(defsubst doom-modeline--hud ()
+  "Powerline's hud segment reimplemented in the style of Doom's bar segment."
+  (let* ((ws (window-start))
+         (we (window-end))
+         (bs (buffer-size))
+         (height (max doom-modeline-height (doom-modeline--font-height)))
+         (top-margin (if (zerop bs)
+                         0
+                       (/ (* height (1- ws)) bs)))
+         (bottom-margin (if (zerop bs)
+                            0
+                          (max 0 (/ (* height (- bs we 1)) bs))))
+         (cache (or (window-parameter nil 'doom-modeline--hud-cache)
+                    (set-window-parameter
+                     nil
+                     'doom-modeline--hud-cache
+                     (make-doom-modeline--hud-cache)))))
+    (unless (and (doom-modeline--hud-cache-active cache)
+                 (doom-modeline--hud-cache-inactive cache)
+                 (= top-margin (doom-modeline--hud-cache-top-margin cache))
+                 (= bottom-margin
+                    (doom-modeline--hud-cache-bottom-margin cache)))
+      (setf (doom-modeline--hud-cache-active cache)
+            (doom-modeline--create-hud-image
+             'doom-modeline-bar 'default doom-modeline-bar-width
+             height top-margin bottom-margin)
+            (doom-modeline--hud-cache-inactive cache)
+            (doom-modeline--create-hud-image
+             'doom-modeline-bar-inactive 'default doom-modeline-bar-width
+             height top-margin bottom-margin)
+            (doom-modeline--hud-cache-top-margin cache) top-margin
+            (doom-modeline--hud-cache-bottom-margin cache) bottom-margin))
+    (if (doom-modeline--active)
+        (doom-modeline--hud-cache-active cache)
+      (doom-modeline--hud-cache-inactive cache))))
+
+(defun doom-modeline-invalidate-huds ()
+  "Invalidate all cached hud images."
+  (dolist (frame (frame-list))
+    (dolist (window (window-list frame))
+      (set-window-parameter window 'doom-modeline--hud-cache nil))))
+
+(doom-modeline-add-variable-watcher
+ 'doom-modeline-height
+ (lambda (_sym val op _where)
+   (when (and (eq op 'set) (integerp val))
+     (doom-modeline-refresh-bars)
+     (doom-modeline-invalidate-huds))))
+
+(doom-modeline-add-variable-watcher
+ 'doom-modeline-bar-width
+ (lambda (_sym val op _where)
+   (when (and (eq op 'set) (integerp val))
+     (doom-modeline-refresh-bars)
+     (doom-modeline-invalidate-huds))))
+
+(doom-modeline-add-variable-watcher
+ 'doom-modeline-icon
+ (lambda (_sym _val op _where)
+   (when (eq op 'set)
+     (doom-modeline-refresh-bars)
+     (doom-modeline-invalidate-huds))))
+
+(doom-modeline-add-variable-watcher
+ 'doom-modeline-unicode-fallback
+ (lambda (_sym _val op _where)
+   (when (eq op 'set)
+     (doom-modeline-refresh-bars)
+     (doom-modeline-invalidate-huds))))
+
+(add-hook 'window-configuration-change-hook #'doom-modeline-refresh-bars)
+(add-hook 'window-configuration-change-hook #'doom-modeline-invalidate-huds)
+
+(doom-modeline-def-segment bar
+  "The bar regulates the height of the `doom-modeline' in GUI."
+  (when (display-graphic-p)
+    (concat
+     (if doom-modeline-hud
+         (doom-modeline--hud)
+       (doom-modeline--bar))
+     (doom-modeline-spc))))
+
+(doom-modeline-def-segment hud
+  "Powerline's hud segment reimplemented in the style of bar segment."
+  (when (display-graphic-p)
+    (concat
+     (doom-modeline--hud)
+     (doom-modeline-spc))))
+
+
+;;
+;; Window number
+;;
+
+;; HACK: `ace-window-display-mode' should respect the ignore buffers.
+(defun doom-modeline-aw-update ()
+  "Update ace-window-path window parameter for all windows.
+Ensure all windows are labeled so the user can select a specific
+one. The ignored buffers are excluded unless `aw-ignore-on' is nil."
+  (let ((ignore-window-parameters t))
+    (avy-traverse
+     (avy-tree (aw-window-list) aw-keys)
+     (lambda (path leaf)
+       (set-window-parameter
+        leaf 'ace-window-path
+        (propertize
+         (apply #'string (reverse path))
+         'face 'aw-mode-line-face))))))
+(advice-add #'aw-update :override #'doom-modeline-aw-update)
+
+;; Remove original window number of `ace-window-display-mode'.
+(add-hook 'ace-window-display-mode-hook
+          (lambda ()
+            (setq-default mode-line-format
+                          (assq-delete-all 'ace-window-display-mode
+                                           (default-value 'mode-line-format)))))
+
+(advice-add #'window-numbering-install-mode-line :override #'ignore)
+(advice-add #'window-numbering-clear-mode-line :override #'ignore)
+(advice-add #'winum--install-mode-line :override #'ignore)
+(advice-add #'winum--clear-mode-line :override #'ignore)
+
+(doom-modeline-def-segment window-number
+  "The current window number."
+  (let ((num (cond
+              ((bound-and-true-p ace-window-display-mode)
+               (aw-update)
+               (window-parameter (selected-window) 'ace-window-path))
+              ((bound-and-true-p winum-mode)
+               (setq winum-auto-setup-mode-line nil)
+               (winum-get-number-string))
+              ((bound-and-true-p window-numbering-mode)
+               (window-numbering-get-number-string))
+              (t ""))))
+    (when (and (length> num 0)
+               (length> (cl-mapcan
+                         (lambda (frame)
+                           ;; Exclude minibuffer, tooltip and child frames
+                           (unless (or (and (fboundp 'frame-parent) (frame-parent frame))
+                                       (string= (frame-parameter frame 'name)
+                                                (alist-get 'name (bound-and-true-p tooltip-frame-parameters))))
+                             (window-list frame 'never)))
+                         (visible-frame-list))
+                        1))
+      (propertize (format " %s " num)
+                  'face (doom-modeline-face 'doom-modeline-buffer-major-mode)))))
+
+
+;;
+;; Workspace
+;;
+
+(doom-modeline-def-segment workspace-name
+  "The current workspace name or number.
+Requires `eyebrowse-mode' to be enabled or `tab-bar-mode' tabs to be created."
+  (when doom-modeline-workspace-name
+    (when-let
+        ((name (cond
+                ((and (bound-and-true-p eyebrowse-mode)
+                      (length> (eyebrowse--get 'window-configs) 1))
+                 (setq mode-line-misc-info
+                       (assq-delete-all 'eyebrowse-mode mode-line-misc-info))
+                 (when-let*
+                     ((num (eyebrowse--get 'current-slot))
+                      (tag (nth 2 (assoc num (eyebrowse--get 'window-configs)))))
+                   (if (length> tag 0) tag (int-to-string num))))
+                ((and (fboundp 'tab-bar-mode)
+                      (length> (frame-parameter nil 'tabs) 1))
+                 (let* ((current-tab (tab-bar--current-tab))
+                        (tab-index (tab-bar--current-tab-index))
+                        (explicit-name (alist-get 'explicit-name current-tab))
+                        (tab-name (alist-get 'name current-tab)))
+                   (if explicit-name tab-name (+ 1 tab-index)))))))
+      (propertize (format " %s " name)
+                  'face (doom-modeline-face 'doom-modeline-buffer-major-mode)))))
+
+
+;;
+;; Perspective
+;;
+
+(defvar-local doom-modeline--persp-name nil)
+(defun doom-modeline-update-persp-name (&rest _)
+  "Update perspective name in mode-line."
+  (setq doom-modeline--persp-name
+        ;; Support `persp-mode', while not support `perspective'
+        (when (and doom-modeline-persp-name
+                   (bound-and-true-p persp-mode)
+                   (fboundp 'safe-persp-name)
+                   (fboundp 'get-current-persp))
+          (let* ((persp (get-current-persp))
+                 (name (safe-persp-name persp))
+                 (face (if (and persp
+                                (not (persp-contain-buffer-p (current-buffer) persp)))
+                           'doom-modeline-persp-buffer-not-in-persp
+                         'doom-modeline-persp-name))
+                 (icon (doom-modeline-icon 'octicon "nf-oct-repo" "🖿" "#"
+                                           :face `(:inherit ,face :slant normal))))
+            (when (or doom-modeline-display-default-persp-name
+                      (not (string-equal persp-nil-name name)))
+              (concat " "
+                      (propertize (concat (and doom-modeline-persp-icon
+                                               (concat icon
+                                                       (propertize
+                                                        " "
+                                                        'display '((space :relative-width 0.5)))))
+                                          (propertize name 'face face))
+                                  'help-echo "mouse-1: Switch perspective
+mouse-2: Show help for minor mode"
+                                  'mouse-face 'doom-modeline-highlight
+                                  'local-map (let ((map (make-sparse-keymap)))
+                                               (define-key map [mode-line mouse-1]
+                                                 #'persp-switch)
+                                               (define-key map [mode-line mouse-2]
+                                                 (lambda ()
+                                                   (interactive)
+                                                   (describe-function 'persp-mode)))
+                                               map))
+                      " "))))))
+
+(add-hook 'buffer-list-update-hook #'doom-modeline-update-persp-name)
+(add-hook 'find-file-hook #'doom-modeline-update-persp-name)
+(add-hook 'persp-activated-functions #'doom-modeline-update-persp-name)
+(add-hook 'persp-renamed-functions #'doom-modeline-update-persp-name)
+(advice-add #'lv-message :after #'doom-modeline-update-persp-name)
+
+(doom-modeline-def-segment persp-name
+  "The current perspective name."
+  (when (doom-modeline--segment-visible 'persp-name)
+    doom-modeline--persp-name))
+
+
+;;
+;; Misc info
+;;
+
+(doom-modeline-def-segment misc-info
+  "Mode line construct for miscellaneous information.
+By default, this shows the information specified by `global-mode-string'."
+  (when (or doom-modeline-display-misc-in-all-mode-lines
+            (doom-modeline--segment-visible 'misc-info))
+    (doom-modeline-display-text
+     (string-replace "%" "%%" (format-mode-line mode-line-misc-info)))))
+
+
+;;
+;; Position
+;;
+
+(doom-modeline-def-segment buffer-position
+  "The buffer position information."
+  (let ((visible (doom-modeline--segment-visible 'buffer-position))
+        (sep (doom-modeline-spc))
+        (wsep (doom-modeline-wspc))
+        (face (doom-modeline-face))
+        (help-echo "Buffer percentage\n\
+mouse-1: Display Line and Column Mode Menu")
+        (mouse-face 'doom-modeline-highlight)
+        (local-map mode-line-column-line-number-mode-map))
+    `(,wsep
+
+      ;; Line and column
+      (:propertize
+       ((line-number-mode
+         (column-number-mode
+          (doom-modeline-column-zero-based
+           doom-modeline-position-column-line-format
+           ,(string-replace
+             "%c" "%C" (car doom-modeline-position-column-line-format)))
+          doom-modeline-position-line-format)
+         (column-number-mode
+          (doom-modeline-column-zero-based
+           doom-modeline-position-column-format
+           ,(string-replace
+             "%c" "%C" (car doom-modeline-position-column-format)))))
+        (doom-modeline-total-line-number
+         ,(and doom-modeline-total-line-number
+               (format "/%d" (line-number-at-pos (point-max))))))
+       face ,face
+       help-echo ,help-echo
+       mouse-face ,mouse-face
+       local-map ,local-map)
+
+      ((or line-number-mode column-number-mode)
+       ,sep)
+
+      ;; Position
+      (,visible
+       ,(cond
+         ((bound-and-true-p nyan-mode)
+          (concat sep (nyan-create) sep))
+         ((bound-and-true-p poke-line-mode)
+          (concat sep (poke-line-create) sep))
+         ((bound-and-true-p mlscroll-mode)
+          (concat sep
+                  (let ((mlscroll-right-align nil))
+                    (format-mode-line (mlscroll-mode-line)))
+                  sep))
+         ((bound-and-true-p sml-modeline-mode)
+          (concat sep (sml-modeline-create) sep))
+         (t "")))
+
+      ;; Percent position
+      (doom-modeline-percent-position
+       ((:propertize ("" doom-modeline-percent-position)
+         face ,face
+         help-echo ,help-echo
+         mouse-face ,mouse-face
+         local-map ,local-map)
+        ,sep)))))
+
+;;
+;; Party parrot
+;;
+(doom-modeline-def-segment parrot
+  "The party parrot animated icon. Requires `parrot-mode' to be enabled."
+  (when (and (doom-modeline--segment-visible 'parrot)
+             (bound-and-true-p parrot-mode))
+    (concat (doom-modeline-wspc)
+            (parrot-create)
+            (doom-modeline-spc))))
+
+;;
+;; Modals (evil, overwrite, god, ryo and xah-fly-keys, etc.)
+;;
+
+(defun doom-modeline--modal-icon (text face help-echo &optional icon unicode)
+  "Display the model icon with FACE and HELP-ECHO.
+TEXT is alternative if icon is not available."
+  (propertize (doom-modeline-icon
+               'mdicon
+               (and doom-modeline-modal-icon
+                    (or (and doom-modeline-modal-modern-icon icon)
+                        "nf-md-record"))
+               (or (and doom-modeline-modal-modern-icon unicode) "●")
+               text
+               :face (doom-modeline-face face))
+              'help-echo help-echo))
+
+(defsubst doom-modeline--evil ()
+  "The current evil state. Requires `evil-mode' to be enabled."
+  (when (bound-and-true-p evil-local-mode)
+    (doom-modeline--modal-icon
+     (let ((tag (evil-state-property evil-state :tag t)))
+       (if (stringp tag) tag (funcall tag)))
+     (cond
+      ((evil-normal-state-p) 'doom-modeline-evil-normal-state)
+      ((evil-emacs-state-p) 'doom-modeline-evil-emacs-state)
+      ((evil-insert-state-p) 'doom-modeline-evil-insert-state)
+      ((evil-motion-state-p) 'doom-modeline-evil-motion-state)
+      ((evil-visual-state-p) 'doom-modeline-evil-visual-state)
+      ((evil-operator-state-p) 'doom-modeline-evil-operator-state)
+      ((evil-replace-state-p) 'doom-modeline-evil-replace-state)
+      (t 'doom-modeline-evil-user-state))
+     (evil-state-property evil-state :name t)
+     (cond
+      ((evil-normal-state-p) "nf-md-alpha_n_circle")
+      ((evil-emacs-state-p) "nf-md-alpha_e_circle")
+      ((evil-insert-state-p) "nf-md-alpha_i_circle")
+      ((evil-motion-state-p) "nf-md-alpha_m_circle")
+      ((evil-visual-state-p) "nf-md-alpha_v_circle")
+      ((evil-operator-state-p) "nf-md-alpha_o_circle")
+      ((evil-replace-state-p) "nf-md-alpha_r_circle")
+      (t "nf-md-alpha_u_circle"))
+     (cond
+      ((evil-normal-state-p) "🅝")
+      ((evil-emacs-state-p) "🅔")
+      ((evil-insert-state-p) "🅘")
+      ((evil-motion-state-p) "🅜")
+      ((evil-visual-state-p) "🅥")
+      ((evil-operator-state-p) "🅞")
+      ((evil-replace-state-p) "🅡")
+      (t "🅤")))))
+
+(defsubst doom-modeline--overwrite ()
+  "The current overwrite state which is enabled by command `overwrite-mode'."
+  (when (and (bound-and-true-p overwrite-mode)
+             (not (bound-and-true-p evil-local-mode)))
+    (doom-modeline--modal-icon
+     "<W>" 'doom-modeline-overwrite "Overwrite mode"
+     "nf-md-marker" "🅦")))
+
+(defsubst doom-modeline--god ()
+  "The current god state which is enabled by the command `god-mode'."
+  (when (bound-and-true-p god-local-mode)
+    (doom-modeline--modal-icon
+     "<G>" 'doom-modeline-god "God mode"
+     "nf-md-account_circle" "🅖")))
+
+(defsubst doom-modeline--ryo ()
+  "The current ryo-modal state which is enabled by the command `ryo-modal-mode'."
+  (when (bound-and-true-p ryo-modal-mode)
+    (doom-modeline--modal-icon
+     "<R>" 'doom-modeline-ryo "Ryo modal"
+     "nf-md-star_circle" "✪")))
+
+(defsubst doom-modeline--xah-fly-keys ()
+  "The current `xah-fly-keys' state."
+  (when (bound-and-true-p xah-fly-keys)
+    (if xah-fly-insert-state-p
+        (doom-modeline--modal-icon
+         "<I>" 'doom-modeline-fly-insert-state "Xah-fly insert mode"
+         "nf-md-airplane_edit" "🛧")
+      (doom-modeline--modal-icon
+       "<C>" 'doom-modeline-fly-normal-state "Xah-fly command mode"
+       "nf-md-airplane_cog" "🛧"))))
+
+(defsubst doom-modeline--boon ()
+  "The current Boon state. Requires `boon-mode' to be enabled."
+  (when (bound-and-true-p boon-local-mode)
+    (doom-modeline--modal-icon
+     (boon-state-string)
+     (cond
+      (boon-command-state 'doom-modeline-boon-command-state)
+      (boon-insert-state 'doom-modeline-boon-insert-state)
+      (boon-special-state 'doom-modeline-boon-special-state)
+      (boon-off-state 'doom-modeline-boon-off-state)
+      (t 'doom-modeline-boon-off-state))
+     (boon-modeline-string)
+     "nf-md-coffee" "🍵")))
+
+(defsubst doom-modeline--meow ()
+  "The current Meow state. Requires `meow-mode' to be enabled."
+  (when (bound-and-true-p meow-mode)
+    (doom-modeline--modal-icon
+     (substring-no-properties meow--indicator)
+     (cond
+      ((meow-normal-mode-p) 'doom-modeline-meow-normal-state)
+      ((meow-insert-mode-p) 'doom-modeline-meow-insert-state)
+      ((meow-beacon-mode-p) 'doom-modeline-meow-beacon-state)
+      ((meow-motion-mode-p) 'doom-modeline-meow-motion-state)
+      ((meow-keypad-mode-p) 'doom-modeline-meow-keypad-state)
+      (t 'doom-modeline-meow-normal-state))
+     (symbol-name (meow--current-state))
+     (cond
+      ((meow-normal-mode-p) "nf-md-alpha_n_circle")
+      ((meow-insert-mode-p) "nf-md-alpha_i_circle")
+      ((meow-beacon-mode-p) "nf-md-alpha_b_circle")
+      ((meow-motion-mode-p) "nf-md-alpha_m_circle")
+      ((meow-keypad-mode-p) "nf-md-alpha_k_circle")
+      (t "nf-md-alpha_n_circle"))
+     (cond
+      ((meow-normal-mode-p) "🅝")
+      ((meow-insert-mode-p) "🅘")
+      ((meow-beacon-mode-p) "🅑")
+      ((meow-motion-mode-p) "🅜")
+      ((meow-keypad-mode-p) "🅚")
+      (t "🅝")))))
+
+(doom-modeline-def-segment modals
+  "Displays modal editing states.
+
+Including `evil', `overwrite', `god', `ryo' and `xha-fly-kyes', etc."
+  (when doom-modeline-modal
+    (let* ((evil (doom-modeline--evil))
+           (ow (doom-modeline--overwrite))
+           (god (doom-modeline--god))
+           (ryo (doom-modeline--ryo))
+           (xf (doom-modeline--xah-fly-keys))
+           (boon (doom-modeline--boon))
+           (vsep (doom-modeline-vspc))
+           (meow (doom-modeline--meow))
+           (sep (and (or evil ow god ryo xf boon) (doom-modeline-spc))))
+      (concat sep
+              (and evil (concat evil (and (or ow god ryo xf boon meow) vsep)))
+              (and ow (concat ow (and (or god ryo xf boon meow) vsep)))
+              (and god (concat god (and (or ryo xf boon meow) vsep)))
+              (and ryo (concat ryo (and (or xf boon meow) vsep)))
+              (and xf (concat xf (and (or boon meow) vsep)))
+              (and boon (concat boon (and meow vsep)))
+              meow
+              sep))))
+
+;;
+;; Objed state
+;;
+
+(defvar doom-modeline--objed-active nil)
+
+(defun doom-modeline-update-objed (_ &optional reset)
+  "Update `objed' status, inactive when RESET is true."
+  (setq doom-modeline--objed-active (not reset)))
+
+(setq objed-modeline-setup-func #'doom-modeline-update-objed)
+
+(doom-modeline-def-segment objed-state ()
+  "The current objed state."
+  (when (and doom-modeline--objed-active
+             (doom-modeline--active))
+    (propertize (format " %s(%s) "
+                        (symbol-name objed--object)
+                        (char-to-string (aref (symbol-name objed--obj-state) 0)))
+                'face 'doom-modeline-evil-emacs-state
+                'help-echo (format "Objed object: %s (%s)"
+                                   (symbol-name objed--object)
+                                   (symbol-name objed--obj-state)))))
+
+
+;;
+;; Input method
+;;
+
+(doom-modeline-def-segment input-method
+  "The current input method."
+  (when-let ((im (cond
+                  (current-input-method
+                   current-input-method-title)
+                  ((and (bound-and-true-p evil-local-mode)
+                        (bound-and-true-p evil-input-method))
+                   (nth 3 (assoc default-input-method input-method-alist)))
+                  (t nil)))
+             (sep (doom-modeline-spc)))
+    (concat
+     sep
+     (propertize im
+                 'face (doom-modeline-face
+                        (if (and (bound-and-true-p rime-mode)
+                                 (equal current-input-method "rime"))
+                            (if (and (rime--should-enable-p)
+                                     (not (rime--should-inline-ascii-p)))
+                                'doom-modeline-input-method
+                              'doom-modeline-input-method-alt)
+                          'doom-modeline-input-method))
+                 'help-echo (concat
+                             "Current input method: "
+                             current-input-method
+                             "\n\
+mouse-2: Disable input method\n\
+mouse-3: Describe current input method")
+                 'mouse-face 'doom-modeline-highlight
+                 'local-map mode-line-input-method-map)
+     sep)))
+
+
+;;
+;; Info
+;;
+
+(doom-modeline-def-segment info-nodes
+  "The topic and nodes in the Info buffer."
+  (concat
+   " ("
+   ;; topic
+   (propertize (if (stringp Info-current-file)
+                   (replace-regexp-in-string
+                    "%" "%%"
+                    (file-name-sans-extension
+                     (file-name-nondirectory Info-current-file)))
+                 (format "*%S*" Info-current-file))
+               'face (doom-modeline-face 'doom-modeline-info))
+   ") "
+   ;; node
+   (when Info-current-node
+     (propertize (replace-regexp-in-string
+                  "%" "%%" Info-current-node)
+                 'face (doom-modeline-face 'doom-modeline-buffer-path)
+                 'help-echo
+                 "mouse-1: scroll forward, mouse-3: scroll back"
+                 'mouse-face 'doom-modeline-highlight
+                 'local-map Info-mode-line-node-keymap))))
+
+
+;;
+;; REPL
+;;
+
+(defun doom-modeline-repl-icon (text face)
+  "Display REPL icon (or TEXT in terminal) with FACE."
+  (doom-modeline-icon 'faicon "nf-fa-terminal" "$" text :face face))
+
+(defvar doom-modeline--cider nil)
+
+(defun doom-modeline-update-cider ()
+  "Update cider repl state."
+  (setq doom-modeline--cider
+        (let* ((connected (cider-connected-p))
+               (face (if connected 'doom-modeline-repl-success 'doom-modeline-repl-warning))
+               (repl-buffer (cider-current-repl nil nil))
+               (cider-info (when repl-buffer
+                             (cider--connection-info repl-buffer t)))
+               (icon (doom-modeline-repl-icon "REPL" face)))
+          (propertize icon
+                      'help-echo
+                      (if connected
+                          (format "CIDER Connected %s\nmouse-2: CIDER quit" cider-info)
+                        "CIDER Disconnected\nmouse-1: CIDER jack-in")
+                      'mouse-face 'doom-modeline-highlight
+                      'local-map (let ((map (make-sparse-keymap)))
+                                   (if connected
+                                       (define-key map [mode-line mouse-2]
+                                         #'cider-quit)
+                                     (define-key map [mode-line mouse-1]
+                                       #'cider-jack-in))
+                                   map)))))
+
+(add-hook 'cider-connected-hook #'doom-modeline-update-cider)
+(add-hook 'cider-disconnected-hook #'doom-modeline-update-cider)
+(add-hook 'cider-mode-hook #'doom-modeline-update-cider)
+
+(doom-modeline-def-segment repl
+  "The REPL state."
+  (when doom-modeline-repl
+    (when-let ((icon (when (bound-and-true-p cider-mode)
+                       doom-modeline--cider))
+               (sep (doom-modeline-spc)))
+      (concat
+       sep
+       (doom-modeline-display-icon icon)
+       sep))))
+
+
+;;
+;; LSP
+;;
+
+(defun doom-modeline-lsp-icon (text face)
+  "Display LSP icon (or TEXT in terminal) with FACE."
+  (if doom-modeline-lsp-icon
+      (doom-modeline-icon 'octicon "nf-oct-rocket" "🚀" text :face face)
+    (propertize text 'face face)))
+
+(defvar-local doom-modeline--lsp nil)
+(defun doom-modeline-update-lsp (&rest _)
+  "Update `lsp-mode' state."
+  (setq doom-modeline--lsp
+        (let* ((workspaces (lsp-workspaces))
+               (face (if workspaces 'doom-modeline-lsp-success 'doom-modeline-lsp-warning))
+               (icon (doom-modeline-lsp-icon "LSP" face)))
+          (propertize icon
+                      'help-echo
+                      (if workspaces
+                          (concat "LSP connected "
+                                  (string-join
+                                   (mapcar (lambda (w)
+                                             (format "[%s]\n" (lsp--workspace-print w)))
+                                           workspaces))
+                                  "C-mouse-1: Switch to another workspace folder
+mouse-1: Describe current session
+mouse-2: Quit server
+mouse-3: Reconnect to server")
+                        "LSP Disconnected
+mouse-1: Reload to start server")
+                      'mouse-face 'doom-modeline-highlight
+                      'local-map (let ((map (make-sparse-keymap)))
+                                   (if workspaces
+                                       (progn
+                                         (define-key map [mode-line C-mouse-1]
+                                           #'lsp-workspace-folders-open)
+                                         (define-key map [mode-line mouse-1]
+                                           #'lsp-describe-session)
+                                         (define-key map [mode-line mouse-2]
+                                           #'lsp-workspace-shutdown)
+                                         (define-key map [mode-line mouse-3]
+                                           #'lsp-workspace-restart))
+                                     (progn
+                                       (define-key map [mode-line mouse-1]
+                                         (lambda ()
+                                           (interactive)
+                                           (ignore-errors (revert-buffer t t))))))
+                                   map)))))
+(add-hook 'lsp-before-initialize-hook #'doom-modeline-update-lsp)
+(add-hook 'lsp-after-initialize-hook #'doom-modeline-update-lsp)
+(add-hook 'lsp-after-uninitialized-functions #'doom-modeline-update-lsp)
+(add-hook 'lsp-before-open-hook #'doom-modeline-update-lsp)
+(add-hook 'lsp-after-open-hook #'doom-modeline-update-lsp)
+
+(defun doom-modeline--eglot-pending-count (server)
+  "Get count of pending eglot requests to SERVER."
+  (if (fboundp 'jsonrpc-continuation-count)
+      (jsonrpc-continuation-count server)
+    (hash-table-count (jsonrpc--request-continuations server))))
+
+(defvar-local doom-modeline--eglot nil)
+(defun doom-modeline-update-eglot ()
+  "Update eglot state."
+  (setq doom-modeline--eglot
+        (let* ((server (and (eglot-managed-p) (eglot-current-server)))
+               (nick (and server (eglot-project-nickname server)))
+               (pending (and server (doom-modeline--eglot-pending-count server)))
+               (last-error (and server (jsonrpc-last-error server)))
+               (face (cond (last-error 'doom-modeline-lsp-error)
+                           ((and pending (cl-plusp pending)) 'doom-modeline-lsp-warning)
+                           (nick 'doom-modeline-lsp-success)
+                           (t 'doom-modeline-lsp-warning)))
+               (server-info (and server (eglot--server-info server)))
+               (server-name (or (plist-get server-info :name)
+                                (and server (jsonrpc-name server)) ""))
+               (major-modes (or (and server (eglot--major-modes server)) ""))
+               (icon (doom-modeline-lsp-icon eglot-menu-string face)))
+          (propertize icon
+                      'help-echo (format "Eglot connected [%s]\n%s %s
+mouse-1: Display minor mode menu
+mouse-3: LSP server control menu"
+                                         nick server-name major-modes)
+                      'mouse-face 'doom-modeline-highlight
+                      'local-map (let ((map (make-sparse-keymap)))
+                                   (define-key map [mode-line mouse-1] eglot-menu)
+                                   (define-key map [mode-line mouse-3] eglot-server-menu)
+                                   map)))))
+(add-hook 'eglot-managed-mode-hook #'doom-modeline-update-eglot)
+
+(defvar-local doom-modeline--tags nil)
+(defun doom-modeline-update-tags ()
+  "Update tags state."
+  (setq doom-modeline--tags
+        (propertize
+         (doom-modeline-lsp-icon "Tags" 'doom-modeline-lsp-success)
+         'help-echo "Tags: Citre mode
+mouse-1: Toggle citre mode"
+         'mouse-face 'doom-modeline-highlight
+         'local-map (make-mode-line-mouse-map 'mouse-1 #'citre-mode))))
+(add-hook 'citre-mode-hook #'doom-modeline-update-tags)
+
+(defun doom-modeline-update-lsp-icon ()
+  "Update lsp icon."
+  (cond ((bound-and-true-p lsp-mode)
+         (doom-modeline-update-lsp))
+        ((bound-and-true-p eglot--managed-mode)
+         (doom-modeline-update-eglot))
+        ((bound-and-true-p citre-mode)
+         (doom-modeline-update-tags))))
+
+(doom-modeline-add-variable-watcher
+ 'doom-modeline-lsp-icon
+ (lambda (_sym val op _where)
+   (when (eq op 'set)
+     (setq doom-modeline-lsp-icon val)
+     (dolist (buf (buffer-list))
+       (with-current-buffer buf
+         (doom-modeline-update-lsp-icon))))))
+
+(doom-modeline-add-variable-watcher
+ 'doom-modeline-icon
+ (lambda (_sym val op _where)
+   (when (eq op 'set)
+     (setq doom-modeline-icon val)
+     (dolist (buf (buffer-list))
+       (with-current-buffer buf
+         (doom-modeline-update-lsp-icon))))))
+
+(doom-modeline-add-variable-watcher
+ 'doom-modeline-unicode-fallback
+ (lambda (_sym val op _where)
+   (when (eq op 'set)
+     (setq doom-modeline-unicode-fallback val)
+     (dolist (buf (buffer-list))
+       (with-current-buffer buf
+         (doom-modeline-update-lsp-icon))))))
+
+(doom-modeline-def-segment lsp
+  "The LSP server state."
+  (when doom-modeline-lsp
+    (when-let ((icon (cond ((bound-and-true-p lsp-mode)
+                            doom-modeline--lsp)
+                           ((bound-and-true-p eglot--managed-mode)
+                            doom-modeline--eglot)
+                           ((bound-and-true-p citre-mode)
+                            doom-modeline--tags)))
+               (sep (doom-modeline-spc)))
+      (concat
+       sep
+       (doom-modeline-display-icon icon)
+       sep))))
+
+(defun doom-modeline-override-eglot ()
+  "Override `eglot' mode-line."
+  (if (and doom-modeline-lsp
+           (bound-and-true-p doom-modeline-mode))
+      (setq mode-line-misc-info
+            (delq (assq 'eglot--managed-mode mode-line-misc-info) mode-line-misc-info))
+    (add-to-list 'mode-line-misc-info
+                 `(eglot--managed-mode (" [" eglot--mode-line-format "] ")))))
+(add-hook 'eglot-managed-mode-hook #'doom-modeline-override-eglot)
+(add-hook 'doom-modeline-mode-hook #'doom-modeline-override-eglot)
+
+(doom-modeline-add-variable-watcher
+ 'doom-modeline-battery
+ (lambda (_sym val op _where)
+   (when (eq op 'set)
+     (setq doom-modeline-lsp val)
+     (doom-modeline-override-eglot))))
+
+
+;;
+;; GitHub
+;;
+
+(defvar doom-modeline--github-notification-number 0)
+(defvar doom-modeline-before-github-fetch-notification-hook nil
+  "Hooks before fetching GitHub notifications.
+Example:
+  (add-hook \\='doom-modeline-before-github-fetch-notification-hook
+          #\\='auth-source-pass-enable)")
+
+(defvar doom-modeline-after-github-fetch-notification-hook nil
+  "Hooks after fetching GitHub notifications.")
+
+(defun doom-modeline--github-fetch-notifications ()
+  "Fetch GitHub notifications."
+  (when (and doom-modeline-github
+             (require 'async nil t))
+    (async-start
+     `(lambda ()
+        ,(async-inject-variables
+          "\\`\\(load-path\\|auth-sources\\|doom-modeline-before-github-fetch-notification-hook\\)\\'")
+        (run-hooks 'doom-modeline-before-github-fetch-notification-hook)
+        (when (require 'ghub nil t)
+          (with-timeout (10)
+            (ignore-errors
+              (when-let* ((username (ghub--username ghub-default-host))
+                          (token (or (ghub--token ghub-default-host username 'forge t)
+                                     (ghub--token ghub-default-host username 'ghub t))))
+                (ghub-get "/notifications"
+                          '((notifications . t))
+                          :host ghub-default-host
+                          :username username
+                          :auth token
+                          :unpaginate t
+                          :noerror t))))))
+     (lambda (result)
+       (message "")                     ; suppress message
+       (setq doom-modeline--github-notification-number (length result))
+       (run-hooks 'doom-modeline-after-github-fetch-notification-hook)))))
+
+(defvar doom-modeline--github-timer nil)
+(defun doom-modeline-github-timer ()
+  "Start/Stop the timer for GitHub fetching."
+  (if (timerp doom-modeline--github-timer)
+      (cancel-timer doom-modeline--github-timer))
+  (setq doom-modeline--github-timer
+        (and doom-modeline-github
+             (run-with-idle-timer 30
+                                  doom-modeline-github-interval
+                                  #'doom-modeline--github-fetch-notifications))))
+
+(doom-modeline-add-variable-watcher
+ 'doom-modeline-github
+ (lambda (_sym val op _where)
+   (when (eq op 'set)
+     (setq doom-modeline-github val)
+     (doom-modeline-github-timer))))
+
+(doom-modeline-github-timer)
+
+(doom-modeline-def-segment github
+  "The GitHub notifications."
+  (when (and doom-modeline-github
+             (doom-modeline--segment-visible 'github)
+             (numberp doom-modeline--github-notification-number))
+    (let ((sep (doom-modeline-spc)))
+      (concat
+       sep
+       (propertize
+        (concat
+         (doom-modeline-icon 'octicon "nf-oct-mark_github" "🔔" "&"
+                             :face 'doom-modeline-notification)
+         (and (> doom-modeline--github-notification-number 0) (doom-modeline-vspc))
+         (propertize
+          (cond
+           ((<= doom-modeline--github-notification-number 0) "")
+           ((> doom-modeline--github-notification-number 99) "99+")
+           (t (number-to-string doom-modeline--github-notification-number)))
+          'face '(:inherit
+                  (doom-modeline-unread-number doom-modeline-notification))))
+        'help-echo "Github Notifications
+mouse-1: Show notifications
+mouse-3: Fetch notifications"
+        'mouse-face 'doom-modeline-highlight
+        'local-map (let ((map (make-sparse-keymap)))
+                     (define-key map [mode-line mouse-1]
+                       (lambda ()
+                         "Open GitHub notifications page."
+                         (interactive)
+                         (run-with-idle-timer 300 nil #'doom-modeline--github-fetch-notifications)
+                         (browse-url "https://github.com/notifications")))
+                     (define-key map [mode-line mouse-3]
+                       (lambda ()
+                         "Fetching GitHub notifications."
+                         (interactive)
+                         (message "Fetching GitHub notifications...")
+                         (doom-modeline--github-fetch-notifications)))
+                     map))
+       sep))))
+
+
+;;
+;; Debug states
+;;
+
+;; Highlight the doom-modeline while debugging.
+(defvar-local doom-modeline--debug-cookie nil)
+(defun doom-modeline--debug-visual (&rest _)
+  "Update the face of mode-line for debugging."
+  (mapc (lambda (buffer)
+          (with-current-buffer buffer
+            (setq doom-modeline--debug-cookie
+                  (face-remap-add-relative 'doom-modeline 'doom-modeline-debug-visual))
+            (force-mode-line-update)))
+        (buffer-list)))
+
+(defun doom-modeline--normal-visual (&rest _)
+  "Restore the face of mode-line."
+  (mapc (lambda (buffer)
+          (with-current-buffer buffer
+            (when doom-modeline--debug-cookie
+              (face-remap-remove-relative doom-modeline--debug-cookie)
+              (force-mode-line-update))))
+        (buffer-list)))
+
+(add-hook 'dap-session-created-hook #'doom-modeline--debug-visual)
+(add-hook 'dap-terminated-hook #'doom-modeline--normal-visual)
+
+(defun doom-modeline-debug-icon (face)
+  "Display debug icon with FACE and ARGS."
+  (doom-modeline-icon 'codicon "nf-cod-debug" "🐛" "!" :face face))
+
+(defun doom-modeline--debug-dap ()
+  "The current `dap-mode' state."
+  (when (and (bound-and-true-p dap-mode)
+             (bound-and-true-p lsp-mode))
+    (when-let ((session (dap--cur-session)))
+      (when (dap--session-running session)
+        (propertize (doom-modeline-debug-icon 'doom-modeline-info)
+                    'help-echo (format "DAP (%s - %s)
+mouse-1: Display debug hydra
+mouse-2: Display recent configurations
+mouse-3: Disconnect session"
+                                       (dap--debug-session-name session)
+                                       (dap--debug-session-state session))
+                    'mouse-face 'doom-modeline-highlight
+                    'local-map (let ((map (make-sparse-keymap)))
+                                 (define-key map [mode-line mouse-1]
+                                   #'dap-hydra)
+                                 (define-key map [mode-line mouse-2]
+                                   #'dap-debug-recent)
+                                 (define-key map [mode-line mouse-3]
+                                   #'dap-disconnect)
+                                 map))))))
+
+(defvar-local doom-modeline--debug-dap nil)
+(defun doom-modeline-update-debug-dap (&rest _)
+  "Update dap debug state."
+  (setq doom-modeline--debug-dap (doom-modeline--debug-dap)))
+
+(add-hook 'dap-session-created-hook #'doom-modeline-update-debug-dap)
+(add-hook 'dap-session-changed-hook #'doom-modeline-update-debug-dap)
+(add-hook 'dap-terminated-hook #'doom-modeline-update-debug-dap)
+
+(defsubst doom-modeline--debug-edebug ()
+  "The current `edebug' state."
+  (when (bound-and-true-p edebug-mode)
+    (propertize (doom-modeline-debug-icon 'doom-modeline-info)
+                'help-echo (format "EDebug (%s)
+mouse-1: Show help
+mouse-2: Next
+mouse-3: Stop debugging"
+                                   edebug-execution-mode)
+                'mouse-face 'doom-modeline-highlight
+                'local-map (let ((map (make-sparse-keymap)))
+                             (define-key map [mode-line mouse-1]
+                               #'edebug-help)
+                             (define-key map [mode-line mouse-2]
+                               #'edebug-next-mode)
+                             (define-key map [mode-line mouse-3]
+                               #'edebug-stop)
+                             map))))
+
+(defsubst doom-modeline--debug-on-error ()
+  "The current `debug-on-error' state."
+  (when debug-on-error
+    (propertize (doom-modeline-debug-icon 'doom-modeline-urgent)
+                'help-echo "Debug on Error
+mouse-1: Toggle Debug on Error"
+                'mouse-face 'doom-modeline-highlight
+                'local-map (make-mode-line-mouse-map 'mouse-1 #'toggle-debug-on-error))))
+
+(defsubst doom-modeline--debug-on-quit ()
+  "The current `debug-on-quit' state."
+  (when debug-on-quit
+    (propertize (doom-modeline-debug-icon 'doom-modeline-warning)
+                'help-echo "Debug on Quit
+mouse-1: Toggle Debug on Quit"
+                'mouse-face 'doom-modeline-highlight
+                'local-map (make-mode-line-mouse-map 'mouse-1 #'toggle-debug-on-quit))))
+
+(doom-modeline-def-segment debug
+  "The current debug state."
+  (when (doom-modeline--segment-visible 'debug)
+    (let* ((dap doom-modeline--debug-dap)
+           (edebug (doom-modeline--debug-edebug))
+           (on-error (doom-modeline--debug-on-error))
+           (on-quit (doom-modeline--debug-on-quit))
+           (vsep (doom-modeline-vspc))
+           (sep (and (or dap edebug on-error on-quit) (doom-modeline-spc))))
+      (concat sep
+              (and dap (concat dap (and (or edebug on-error on-quit) vsep)))
+              (and edebug (concat edebug (and (or on-error on-quit) vsep)))
+              (and on-error (concat on-error (and on-quit vsep)))
+              on-quit
+              sep))))
+
+
+;;
+;; PDF pages
+;;
+
+(defvar-local doom-modeline--pdf-pages nil)
+(defun doom-modeline-update-pdf-pages ()
+  "Update PDF pages."
+  (setq doom-modeline--pdf-pages
+        (format "  P%d/%d "
+                (or (eval `(pdf-view-current-page)) 0)
+                (pdf-cache-number-of-pages))))
+(add-hook 'pdf-view-change-page-hook #'doom-modeline-update-pdf-pages)
+
+(doom-modeline-def-segment pdf-pages
+  "Display PDF pages."
+  doom-modeline--pdf-pages)
+
+
+;;
+;; `mu4e' notifications
+;;
+
+(doom-modeline-def-segment mu4e
+  "Show notifications of any unread emails in `mu4e'."
+  (when (and doom-modeline-mu4e
+             (doom-modeline--segment-visible 'mu4e))
+    (let ((sep (doom-modeline-spc))
+          (vsep (doom-modeline-vspc))
+          (icon (doom-modeline-icon 'mdicon "nf-md-email" "📧" "#"
+                                    :face 'doom-modeline-notification)))
+      (cond ((and (bound-and-true-p mu4e-alert-mode-line)
+                  (numberp mu4e-alert-mode-line)
+                  ;; don't display if the unread mails count is zero
+                  (> mu4e-alert-mode-line 0))
+             (concat
+              sep
+              (propertize
+               (concat
+                icon
+                vsep
+                (propertize
+                 (if (> mu4e-alert-mode-line doom-modeline-number-limit)
+                     (format "%d+" doom-modeline-number-limit)
+                   (number-to-string mu4e-alert-mode-line))
+                 'face '(:inherit
+                         (doom-modeline-unread-number doom-modeline-notification))))
+               'mouse-face 'doom-modeline-highlight
+               'keymap '(mode-line keymap
+                                   (mouse-1 . mu4e-alert-view-unread-mails)
+                                   (mouse-2 . mu4e-alert-view-unread-mails)
+                                   (mouse-3 . mu4e-alert-view-unread-mails))
+               'help-echo (concat (if (= mu4e-alert-mode-line 1)
+                                      "You have an unread email"
+                                    (format "You have %s unread emails" mu4e-alert-mode-line))
+                                  "\nClick here to view "
+                                  (if (= mu4e-alert-mode-line 1) "it" "them")))
+              sep))
+            ((bound-and-true-p mu4e-modeline-mode)
+             (concat sep icon vsep
+                     (propertize (mu4e--modeline-string)
+                                 'face 'doom-modeline-notification)
+                     sep))))))
+
+(defun doom-modeline-override-mu4e-alert (&rest _)
+  "Delete `mu4e-alert-mode-line' from global modeline string."
+  (when (and (featurep 'mu4e-alert)
+             (bound-and-true-p mu4e-alert-mode-line))
+    (if (and doom-modeline-mu4e
+             (bound-and-true-p doom-modeline-mode))
+        ;; Delete original modeline
+        (progn
+          (setq global-mode-string
+                (delete '(:eval mu4e-alert-mode-line) global-mode-string))
+          (setq mu4e-alert-modeline-formatter #'identity))
+      ;; Recover default settings
+      (setq mu4e-alert-modeline-formatter #'mu4e-alert-default-mode-line-formatter))))
+(advice-add #'mu4e-alert-enable-mode-line-display
+            :after #'doom-modeline-override-mu4e-alert)
+(add-hook 'doom-modeline-mode-hook #'doom-modeline-override-mu4e-alert)
+
+(defun doom-modeline-override-mu4e-modeline (&rest _)
+  "Delete `mu4e-alert-mode-line' from global modeline string."
+  (when (bound-and-true-p mu4e-modeline-mode)
+    (if (and doom-modeline-mu4e
+             (bound-and-true-p doom-modeline-mode))
+        ;; Delete original modeline
+        (setq global-mode-string
+              (delete mu4e--modeline-item global-mode-string))
+      ;; Recover default settings
+      (add-to-list 'global-mode-string mu4e--modeline-item))))
+(add-hook 'mu4e-modeline-mode-hook #'doom-modeline-override-mu4e-modeline)
+(add-hook 'doom-modeline-mode-hook #'doom-modeline-override-mu4e-modeline)
+
+(doom-modeline-add-variable-watcher
+ 'doom-modeline-mu4e
+ (lambda (_sym val op _where)
+   (when (eq op 'set)
+     (setq doom-modeline-mu4e val)
+     (doom-modeline-override-mu4e-alert)
+     (doom-modeline-override-mu4e-modeline))))
+
+
+;;
+;; `gnus' notifications
+;;
+
+(defvar doom-modeline--gnus-unread-mail 0)
+(defvar doom-modeline--gnus-started nil
+  "Used to determine if gnus has started.")
+(defun doom-modeline-update-gnus-status (&rest _)
+  "Get the total number of unread news of gnus group."
+  (setq doom-modeline--gnus-unread-mail
+        (when (and doom-modeline-gnus
+                   doom-modeline--gnus-started)
+          (let ((total-unread-news-number 0))
+            (mapc (lambda (g)
+                    (let* ((group (car g))
+                           (unread (eval `(gnus-group-unread ,group))))
+                      (when (and (not (seq-contains-p doom-modeline-gnus-excluded-groups group))
+                                 (numberp unread)
+                                 (> unread 0))
+                        (setq total-unread-news-number (+ total-unread-news-number unread)))))
+                  gnus-newsrc-alist)
+            total-unread-news-number))))
+
+;; Update the modeline after changes have been made
+(add-hook 'gnus-group-update-hook #'doom-modeline-update-gnus-status)
+(add-hook 'gnus-summary-update-hook #'doom-modeline-update-gnus-status)
+(add-hook 'gnus-group-update-group-hook #'doom-modeline-update-gnus-status)
+(add-hook 'gnus-after-getting-new-news-hook #'doom-modeline-update-gnus-status)
+
+;; Only start to listen to gnus when gnus is actually running
+(defun doom-modeline-start-gnus-listener ()
+  "Start GNUS listener."
+  (when (and doom-modeline-gnus
+             (not doom-modeline--gnus-started))
+    (setq doom-modeline--gnus-started t)
+    ;; Scan gnus in the background if the timer is higher than 0
+    (doom-modeline-update-gnus-status)
+    (if (> doom-modeline-gnus-timer 0)
+        (gnus-demon-add-handler 'gnus-demon-scan-news doom-modeline-gnus-timer doom-modeline-gnus-idle))))
+(add-hook 'gnus-started-hook #'doom-modeline-start-gnus-listener)
+
+;; Stop the listener if gnus isn't running
+(defun doom-modeline-stop-gnus-listener ()
+  "Stop GNUS listener."
+  (setq doom-modeline--gnus-started nil))
+(add-hook 'gnus-exit-gnus-hook #'doom-modeline-stop-gnus-listener)
+
+(doom-modeline-def-segment gnus
+  "Show notifications of any unread emails in `gnus'."
+  (when (and (doom-modeline--segment-visible 'gnus)
+             doom-modeline-gnus
+             doom-modeline--gnus-started
+             ;; Don't display if the unread mails count is zero
+             (numberp doom-modeline--gnus-unread-mail)
+             (> doom-modeline--gnus-unread-mail 0))
+    (let ((sep (doom-modeline-spc))
+          (vsep (doom-modeline-vspc)))
+      (concat
+       sep
+       (propertize
+        (concat
+         (doom-modeline-icon 'mdicon "nf-md-email" "📧" "#"
+                             :face 'doom-modeline-notification)
+         vsep
+         (propertize
+          (if (> doom-modeline--gnus-unread-mail doom-modeline-number-limit)
+              (format "%d+" doom-modeline-number-limit)
+            (number-to-string doom-modeline--gnus-unread-mail))
+          'face '(:inherit
+                  (doom-modeline-unread-number doom-modeline-notification))))
+        'mouse-face 'doom-modeline-highlight
+        'help-echo (if (= doom-modeline--gnus-unread-mail 1)
+                       "You have an unread email"
+                     (format "You have %s unread emails" doom-modeline--gnus-unread-mail)))
+       sep))))
+
+
+;;
+;; IRC notifications
+;;
+
+(defun doom-modeline-shorten-irc (name)
+  "Shorten IRC buffer `name' according to IRC mode.
+
+Calls the mode specific function to return the shortened
+version of `NAME' if applicable:
+- Circe: `tracking-shorten'
+- ERC: `erc-track-shorten-function'
+- rcirc: `rcirc-shorten-buffer-name'
+
+The specific function will decide how to stylize the buffer name,
+read the individual functions documentation for more."
+  (or (and (fboundp 'tracking-shorten)
+           (car (tracking-shorten (list name))))
+      (and (boundp 'erc-track-shorten-function)
+           (functionp erc-track-shorten-function)
+	       (car (funcall erc-track-shorten-function (list name))))
+      (and (fboundp 'rcirc-short-buffer-name)
+           (rcirc-short-buffer-name name))
+      name))
+
+(defun doom-modeline--tracking-buffers (buffers)
+  "Logic to convert some irc BUFFERS to their font-awesome icon."
+  (mapconcat
+   (lambda (b)
+     (propertize
+      (funcall doom-modeline-irc-stylize b)
+      'face '(:inherit (doom-modeline-unread-number doom-modeline-notification))
+      'help-echo (format "IRC Notification: %s\nmouse-1: Switch to buffer" b)
+      'mouse-face 'doom-modeline-highlight
+      'local-map (make-mode-line-mouse-map
+                  'mouse-1
+                  (lambda ()
+                    (interactive)
+                    (when (buffer-live-p (get-buffer b))
+                      (switch-to-buffer b))))))
+   buffers
+   (doom-modeline-vspc)))
+
+(defun doom-modeline--circe-p ()
+  "Check if `circe' is in use."
+  (boundp 'tracking-mode-line-buffers))
+
+(defun doom-modeline--erc-p ()
+  "Check if `erc' is in use."
+  (boundp 'erc-modified-channels-alist))
+
+(defun doom-modeline--rcirc-p ()
+  "Check if `rcirc' is in use."
+  (bound-and-true-p rcirc-track-minor-mode))
+
+(defun doom-modeline--get-buffers ()
+  "Gets the buffers that have activity."
+  (cond
+   ((doom-modeline--circe-p)
+    tracking-buffers)
+   ((doom-modeline--erc-p)
+    (mapcar (lambda (l)
+              (buffer-name (car l)))
+            erc-modified-channels-alist))
+   ((doom-modeline--rcirc-p)
+    (mapcar (lambda (b)
+              (buffer-name b))
+            rcirc-activity))))
+
+;; Create a modeline segment that contains all the irc tracked buffers
+(doom-modeline-def-segment irc-buffers
+  "The list of shortened, unread irc buffers."
+  (when (and doom-modeline-irc
+             (doom-modeline--segment-visible 'irc-buffers))
+    (let* ((buffers (doom-modeline--get-buffers))
+           (number (length buffers))
+           (sep (doom-modeline-spc)))
+      (when (> number 0)
+        (concat
+         sep
+         (doom-modeline--tracking-buffers buffers)
+         sep)))))
+
+(doom-modeline-def-segment irc
+  "A notification icon for any unread irc buffer."
+  (when (and doom-modeline-irc
+             (doom-modeline--segment-visible 'irc))
+    (let* ((buffers (doom-modeline--get-buffers))
+           (number (length buffers))
+           (sep (doom-modeline-spc))
+           (vsep (doom-modeline-vspc)))
+      (when (> number 0)
+        (concat
+         sep
+
+         (propertize (concat
+                      (doom-modeline-icon 'mdicon "nf-md-message_processing" "🗊" "#"
+                                          :face 'doom-modeline-notification)
+                      vsep
+                      ;; Display the number of unread buffers
+                      (propertize (number-to-string number)
+                                  'face '(:inherit
+                                          (doom-modeline-unread-number
+                                           doom-modeline-notification))))
+                     'help-echo (format "IRC Notifications: %s\n%s"
+                                        (mapconcat
+                                         (lambda (b) (funcall doom-modeline-irc-stylize b))
+                                         buffers
+                                         ", ")
+                                        (cond
+                                         ((doom-modeline--circe-p)
+                                          "mouse-1: Switch to previous unread buffer
+mouse-3: Switch to next unread buffer")
+                                         ((doom-modeline--erc-p)
+                                          "mouse-1: Switch to buffer
+mouse-3: Switch to next unread buffer")
+                                         ((doom-modeline--rcirc-p)
+                                          "mouse-1: Switch to server buffer
+mouse-3: Switch to next unread buffer")))
+                     'mouse-face 'doom-modeline-highlight
+                     'local-map (let ((map (make-sparse-keymap)))
+                                  (cond
+                                   ((doom-modeline--circe-p)
+                                    (define-key map [mode-line mouse-1]
+                                      #'tracking-previous-buffer)
+                                    (define-key map [mode-line mouse-3]
+                                      #'tracking-next-buffer))
+                                   ((doom-modeline--erc-p)
+                                    (define-key map [mode-line mouse-1]
+                                      #'erc-switch-to-buffer)
+                                    (define-key map [mode-line mouse-3]
+                                      #'erc-track-switch-buffer))
+                                   ((doom-modeline--rcirc-p)
+                                    (define-key map [mode-line mouse-1]
+                                      #'rcirc-switch-to-server-buffer)
+                                    (define-key map [mode-line mouse-3]
+                                      #'rcirc-next-active-buffer)))
+                                  map))
+
+         ;; Display the unread irc buffers as well
+         (when doom-modeline-irc-buffers
+           (concat sep (doom-modeline--tracking-buffers buffers)))
+
+         sep)))))
+
+(defun doom-modeline-override-rcirc ()
+  "Override default `rcirc' mode-line."
+  (if (and doom-modeline-irc
+           (bound-and-true-p doom-modeline-mode))
+      (setq global-mode-string
+		    (delq 'rcirc-activity-string global-mode-string))
+    (when (and rcirc-track-minor-mode
+               (not (memq 'rcirc-activity-string global-mode-string)))
+	  (setq global-mode-string
+		    (append global-mode-string '(rcirc-activity-string))))))
+(add-hook 'rcirc-track-minor-mode-hook #'doom-modeline-override-rcirc)
+(add-hook 'doom-modeline-mode-hook #'doom-modeline-override-rcirc)
+
+(doom-modeline-add-variable-watcher
+ 'doom-modeline-irc
+ (lambda (_sym val op _where)
+   (when (eq op 'set)
+     (setq doom-modeline-irc val)
+     (doom-modeline-override-rcirc))))
+
+
+;;
+;; Battery status
+;;
+
+(defun doom-modeline-battery-icon (icon unicode text face)
+  "Displays the battery ICON with FACE.
+
+UNICODE and TEXT are fallbacks.
+Uses `nerd-icons-mdicon' to fetch the icon."
+  (doom-modeline-icon 'mdicon icon unicode text :face face))
+
+(defvar doom-modeline--battery-status nil)
+(defun doom-modeline-update-battery-status ()
+  "Update battery status."
+  (setq doom-modeline--battery-status
+        (when (and doom-modeline-battery
+                   (bound-and-true-p display-battery-mode))
+          (let* ((data (and battery-status-function
+                            (functionp battery-status-function)
+                            (funcall battery-status-function)))
+                 (status (cdr (assoc ?L data)))
+                 (charging? (or (string-equal "AC" status)
+                                (string-equal "on-line" status)))
+                 (percentage (car (read-from-string (or (cdr (assq ?p data)) "ERR"))))
+                 (valid-percentage? (and (numberp percentage)
+                                         (>= percentage 0)
+                                         (<= percentage battery-mode-line-limit)))
+                 (face (if valid-percentage?
+                           (cond (charging? 'doom-modeline-battery-charging)
+                                 ((< percentage battery-load-critical) 'doom-modeline-battery-critical)
+                                 ((< percentage 25) 'doom-modeline-battery-warning)
+                                 ((< percentage 95) 'doom-modeline-battery-normal)
+                                 (t 'doom-modeline-battery-full))
+                         'doom-modeline-battery-error))
+                 (icon (if valid-percentage?
+                           (cond
+                            ((>= percentage 100)
+                             (doom-modeline-battery-icon (if charging?
+                                                             "nf-md-battery_charging_100"
+                                                           "nf-md-battery")
+                                                         "🔋" "-" face))
+                            ((>= percentage 90)
+                             (doom-modeline-battery-icon (if charging?
+                                                             "nf-md-battery_charging_90"
+                                                           "nf-md-battery_90")
+                                                         "🔋" "-" face))
+                            ((>= percentage 80)
+                             (doom-modeline-battery-icon (if charging?
+                                                             "nf-md-battery_charging_80"
+                                                           "nf-md-battery_80")
+                                                         "🔋" "-" face))
+                            ((>= percentage 70)
+                             (doom-modeline-battery-icon (if charging?
+                                                             "nf-md-battery_charging_70"
+                                                           "nf-md-battery_70")
+                                                         "🔋" "-" face))
+                            ((>= percentage 60)
+                             (doom-modeline-battery-icon (if charging?
+                                                             "nf-md-battery_charging_60"
+                                                           "nf-md-battery_60")
+                                                         "🔋" "-" face))
+                            ((>= percentage 50)
+                             (doom-modeline-battery-icon (if charging?
+                                                             "nf-md-battery_charging_50"
+                                                           "nf-md-battery_50")
+                                                         "🔋" "-" face))
+                            ((>= percentage 40)
+                             (doom-modeline-battery-icon (if charging?
+                                                             "nf-md-battery_charging_40"
+                                                           "nf-md-battery_40")
+                                                         "🔋" "-" face))
+                            ((>= percentage 30)
+                             (doom-modeline-battery-icon (if charging?
+                                                             "nf-md-battery_charging_30"
+                                                           "nf-md-battery_30")
+                                                         "🔋" "-" face))
+                            ((>= percentage 20)
+                             (doom-modeline-battery-icon (if charging?
+                                                             "nf-md-battery_charging_20"
+                                                           "nf-md-battery_20")
+                                                         "🔋" "-" face))
+                            ((>= percentage 10)
+                             (doom-modeline-battery-icon (if charging?
+                                                             "nf-md-battery_charging_10"
+                                                           "nf-md-battery_10")
+                                                         "🪫" "-" face))
+                            (t (doom-modeline-battery-icon (if charging?
+                                                               "nf-md-battery_charging_outline"
+                                                             "nf-md-battery_outline")
+                                                           "🪫" "!" face)))
+                         (doom-modeline-battery-icon "nf-md-battery_alert" "⚠" "N/A" face)))
+                 (text (if valid-percentage? (format "%d%s" percentage "%%") ""))
+                 (help-echo (if (and battery-echo-area-format data valid-percentage?)
+                                (battery-format battery-echo-area-format data)
+                              "Battery status not available")))
+            (cons (propertize icon 'help-echo help-echo)
+                  (propertize text 'face face 'help-echo help-echo))))))
+
+(doom-modeline-add-variable-watcher
+ 'doom-modeline-icon
+ (lambda (_sym val op _where)
+   (when (eq op 'set)
+     (setq doom-modeline-icon val)
+     (doom-modeline-update-battery-status))))
+
+(doom-modeline-add-variable-watcher
+ 'doom-modeline-unicode-fallback
+ (lambda (_sym val op _where)
+   (when (eq op 'set)
+     (setq doom-modeline-unicode-fallback val)
+     (doom-modeline-update-battery-status))))
+
+(doom-modeline-def-segment battery
+  "Display battery status."
+  (when (and doom-modeline-battery
+             (bound-and-true-p display-battery-mode)
+             (doom-modeline--segment-visible 'battery))
+    (let ((sep (doom-modeline-spc))
+          (vsep (doom-modeline-vspc)))
+      (concat sep
+              (car doom-modeline--battery-status)
+              vsep
+              (cdr doom-modeline--battery-status)
+              sep))))
+
+(defun doom-modeline-override-battery ()
+  "Override default battery mode-line."
+  (if (and doom-modeline-battery
+           (bound-and-true-p doom-modeline-mode))
+      (progn
+        (advice-add #'battery-update :override #'doom-modeline-update-battery-status)
+        (setq global-mode-string
+		      (delq 'battery-mode-line-string global-mode-string))
+        (and (bound-and-true-p display-battery-mode) (battery-update)))
+    (progn
+      (advice-remove #'battery-update #'doom-modeline-update-battery-status)
+      (when (and display-battery-mode battery-status-function battery-mode-line-format
+                 (not (memq 'battery-mode-line-string global-mode-string)))
+        (setq global-mode-string
+		      (append global-mode-string '(battery-mode-line-string)))))))
+(add-hook 'display-battery-mode-hook #'doom-modeline-override-battery)
+(add-hook 'doom-modeline-mode-hook #'doom-modeline-override-battery)
+
+(doom-modeline-add-variable-watcher
+ 'doom-modeline-battery
+ (lambda (_sym val op _where)
+   (when (eq op 'set)
+     (setq doom-modeline-battery val)
+     (doom-modeline-override-battery))))
+
+
+;;
+;; Package information
+;;
+
+(doom-modeline-def-segment package
+  "Show package information via `paradox'."
+  (concat
+   (doom-modeline-display-text
+    (format-mode-line 'mode-line-front-space))
+
+   (when (and doom-modeline-icon doom-modeline-major-mode-icon)
+     (concat
+      (doom-modeline-spc)
+      (doom-modeline-icon 'faicon "nf-fa-archive" nil nil
+                          :face (doom-modeline-face
+                                 (if doom-modeline-major-mode-color-icon
+                                     'nerd-icons-silver
+                                   'mode-line)))))
+   (doom-modeline-display-text
+    (format-mode-line 'mode-line-buffer-identification))))
+
+
+;;
+;; Helm
+;;
+
+(defvar doom-modeline--helm-buffer-ids
+  '(("*helm*" . "HELM")
+    ("*helm M-x*" . "HELM M-x")
+    ("*swiper*" . "SWIPER")
+    ("*Projectile Perspectives*" . "HELM Projectile Perspectives")
+    ("*Projectile Layouts*" . "HELM Projectile Layouts")
+    ("*helm-ag*" . (lambda ()
+                     (format "HELM Ag: Using %s"
+                             (car (split-string helm-ag-base-command))))))
+  "Alist of custom helm buffer names to use.
+The cdr can also be a function that returns a name to use.")
+
+(doom-modeline-def-segment helm-buffer-id
+  "Helm session identifier."
+  (when (bound-and-true-p helm-alive-p)
+    (let ((sep (doom-modeline-spc)))
+      (concat
+       sep
+       (when doom-modeline-icon
+         (concat
+          (doom-modeline-icon 'sucicon "nf-custom-emacs" nil nil
+                              :face (doom-modeline-face
+                                     (and doom-modeline-major-mode-color-icon
+                                          'nerd-icons-blue)))
+          sep))
+       (propertize
+        (let ((custom (cdr (assoc (buffer-name) doom-modeline--helm-buffer-ids)))
+              (case-fold-search t)
+              (name (replace-regexp-in-string "-" " " (buffer-name))))
+          (cond ((stringp custom) custom)
+                ((functionp custom) (funcall custom))
+                (t
+                 (string-match "\\*helm:? \\(mode \\)?\\([^\\*]+\\)\\*" name)
+                 (concat "HELM " (capitalize (match-string 2 name))))))
+        'face (doom-modeline-face 'doom-modeline-buffer-file))
+       sep))))
+
+(doom-modeline-def-segment helm-number
+  "Number of helm candidates."
+  (when (bound-and-true-p helm-alive-p)
+    (concat
+     (propertize (format " %d/%d"
+                         (helm-candidate-number-at-point)
+                         (helm-get-candidate-number t))
+                 'face (doom-modeline-face 'doom-modeline-buffer-path))
+     (propertize (format " (%d total) " (helm-get-candidate-number))
+                 'face (doom-modeline-face 'doom-modeline-info)))))
+
+(doom-modeline-def-segment helm-help
+  "Helm keybindings help."
+  (when (bound-and-true-p helm-alive-p)
+    (mapcar
+     (lambda (s)
+       (if (string-prefix-p "\\<" s)
+           (propertize (substitute-command-keys s)
+                       'face (doom-modeline-face
+                              'doom-modeline-buffer-file))
+         s))
+     '("\\<helm-map>\\[helm-help]" "(help) "
+       "\\<helm-map>\\[helm-select-action]" "(actions) "
+       "\\<helm-map>\\[helm-maybe-exit-minibuffer]/F1/F2..." "(action) "))))
+
+(doom-modeline-def-segment helm-prefix-argument
+  "Helm prefix argument."
+  (when (and (bound-and-true-p helm-alive-p)
+             helm--mode-line-display-prefarg)
+    (let ((arg (prefix-numeric-value (or prefix-arg current-prefix-arg))))
+      (unless (= arg 1)
+        (propertize (format "C-u %s" arg)
+                    'face (doom-modeline-face 'doom-modeline-info))))))
+
+(defvar doom-modeline--helm-current-source nil
+  "The currently active helm source.")
+(doom-modeline-def-segment helm-follow
+  "Helm follow indicator."
+  (and (bound-and-true-p helm-alive-p)
+       doom-modeline--helm-current-source
+       (eq 1 (cdr (assq 'follow doom-modeline--helm-current-source)))
+       "HF"))
+
+;;
+;; Git timemachine
+;;
+
+(doom-modeline-def-segment git-timemachine
+  (concat
+   (doom-modeline-spc)
+   (doom-modeline--buffer-mode-icon)
+   (doom-modeline--buffer-state-icon)
+   (propertize
+    "*%b*"
+    'face (doom-modeline-face 'doom-modeline-buffer-timemachine))))
+
+;;
+;; Markdown/Org preview
+;;
+
+(doom-modeline-def-segment grip
+  (when (bound-and-true-p grip-mode)
+    (let ((sep (doom-modeline-spc)))
+      (concat
+       sep
+       (let ((face (doom-modeline-face
+                    (if grip--process
+                        (pcase (process-status grip--process)
+                          ('run 'doom-modeline-info)
+                          ('exit 'doom-modeline-warning)
+                          (_ 'doom-modeline-urgent))
+                      'doom-modeline-urgent))))
+         (propertize
+          (doom-modeline-icon 'codicon "nf-cod-open_preview" "🗐" "@" :face face)
+          'help-echo (format "Preview on %s
+mouse-1: Preview in browser
+mouse-2: Stop preview
+mouse-3: Restart preview"
+                             (grip--preview-url))
+          'mouse-face 'doom-modeline-highlight
+          'local-map (let ((map (make-sparse-keymap)))
+                       (define-key map [mode-line mouse-1]
+                         #'grip-browse-preview)
+                       (define-key map [mode-line mouse-2]
+                         #'grip-stop-preview)
+                       (define-key map [mode-line mouse-3]
+                         #'grip-restart-preview)
+                       map)))
+       sep))))
+
+;;
+;; Follow mode
+;;
+
+(doom-modeline-def-segment follow
+  (when (bound-and-true-p follow-mode)
+    (let* ((windows (follow-all-followers))
+           (nwindows (length windows))
+           (nfollowing (- (length (memq (selected-window) windows)) 1)))
+      (concat
+       (doom-modeline-spc)
+       (propertize (format "Follow %d/%d" (- nwindows nfollowing) nwindows)
+                   'face 'doom-modeline-buffer-minor-mode)))))
+
+;;
+;; Display time
+;;
+
+(defconst doom-modeline--clock-hour-hand-ratio 0.45
+  "Length of the hour hand as a proportion of the radius.")
+
+(defconst doom-modeline--clock-minute-hand-ratio 0.7
+  "Length of the minute hand as a proportion of the radius.")
+
+(defun doom-modeline--create-clock-svg (hour minute radius color)
+  "Construct an SVG clock showing the time HOUR:MINUTE.
+The clock will be of the specified RADIUS and COLOR."
+  (let ((thickness-factor (image-compute-scaling-factor 'auto))
+        (hour-x (* radius (sin (* (- 6 hour (/ minute 60.0)) (/ float-pi 6)))
+                   doom-modeline--clock-hour-hand-ratio))
+        (hour-y (* radius (cos (* (- 6 hour (/ minute 60.0)) (/ float-pi 6)))
+                   doom-modeline--clock-hour-hand-ratio))
+        (minute-x (* radius (sin (* (- 30 minute) (/ float-pi 30)))
+                     doom-modeline--clock-minute-hand-ratio))
+        (minute-y (* radius (cos (* (- 30 minute) (/ float-pi 30)))
+                     doom-modeline--clock-minute-hand-ratio))
+        (svg (svg-create (* 2 radius) (* 2 radius) :stroke color)))
+    (svg-circle svg radius radius (- radius thickness-factor)
+                :fill "none" :stroke-width (* 2 thickness-factor))
+    (svg-circle svg radius radius thickness-factor
+                :fill color :stroke "none")
+    (svg-line svg radius radius (+ radius hour-x) (+ radius hour-y)
+              :stroke-width (* 2 thickness-factor))
+    (svg-line svg radius radius (+ radius minute-x) (+ radius minute-y)
+              :stroke-width (* 1.5 thickness-factor))
+    svg))
+
+(defvar doom-modeline--clock-cache nil
+  "The last result of `doom-modeline--generate-clock'.")
+
+(defun doom-modeline--generate-clock ()
+  "Return a string containing the current time as an analogue clock svg.
+When the svg library is not available, return nil."
+  (cdr
+   (or (and (equal (truncate (float-time)
+                             (* doom-modeline-time-clock-minute-resolution 60))
+                   (car doom-modeline--clock-cache))
+            doom-modeline--clock-cache)
+       (and (require 'svg nil t)
+            (setq doom-modeline--clock-cache
+                  (cons (truncate (float-time)
+                                  (* doom-modeline-time-clock-minute-resolution 60))
+                        (propertize
+                         " "
+                         'display
+                         (svg-image
+                          (doom-modeline--create-clock-svg
+                           (string-to-number (format-time-string "%-I")) ; hour
+                           (* (truncate (string-to-number (format-time-string "%-M"))
+                                        doom-modeline-time-clock-minute-resolution)
+                              doom-modeline-time-clock-minute-resolution) ; minute
+                           (if (integerp doom-modeline-time-clock-size) ; radius
+                               doom-modeline-time-clock-size
+                             (* doom-modeline-height 0.5 doom-modeline-time-clock-size))
+                           "currentColor")
+                          :scale 1 :ascent 'center)
+                         'face 'doom-modeline-time
+                         'help-echo (lambda (_window _object _pos)
+                                      (format-time-string "%c")))))))))
+
+(defun doom-modeline-time-icon ()
+  "Displays the time icon."
+  (or (and doom-modeline-time-live-icon
+           doom-modeline-time-analogue-clock
+           (display-graphic-p)
+           (doom-modeline--generate-clock))
+      (doom-modeline-icon
+       'mdicon
+       (if doom-modeline-time-live-icon
+           (pcase (% (caddr (decode-time)) 12)
+             (0 "nf-md-clock_time_twelve_outline")
+             (1 "nf-md-clock_time_one_outline")
+             (2 "nf-md-clock_time_two_outline")
+             (3 "nf-md-clock_time_three_outline")
+             (4 "nf-md-clock_time_four_outline")
+             (5 "nf-md-clock_time_five_outline")
+             (6 "nf-md-clock_time_six_outline")
+             (7 "nf-md-clock_time_seven_outline")
+             (8 "nf-md-clock_time_eight_outline")
+             (9 "nf-md-clock_time_nine_outline")
+             (10 "nf-md-clock_time_ten_outline")
+             (11 "nf-md-clock_time_eleven_outline"))
+         "nf-md-clock_outline")
+       "⏰"
+       ""
+       :face '(:inherit doom-modeline-time :weight normal))))
+
+(doom-modeline-def-segment time
+  (when (and doom-modeline-time
+             (bound-and-true-p display-time-mode)
+             (doom-modeline--segment-visible 'time))
+    (concat
+     (doom-modeline-spc)
+     (when doom-modeline-time-icon
+       (concat
+        (doom-modeline-time-icon)
+        (and (or doom-modeline-icon doom-modeline-unicode-fallback)
+             (doom-modeline-vspc))))
+     (propertize display-time-string
+                 'face (doom-modeline-face 'doom-modeline-time)))))
+
+(defun doom-modeline-override-time ()
+  "Override default `display-time' mode-line."
+  (or global-mode-string (setq global-mode-string '("")))
+  (if (and doom-modeline-time
+           (bound-and-true-p doom-modeline-mode))
+      (setq global-mode-string (delq 'display-time-string global-mode-string))
+    (or (memq 'display-time-string global-mode-string)
+	    (setq global-mode-string
+		      (append global-mode-string '(display-time-string))))))
+(add-hook 'display-time-mode-hook #'doom-modeline-override-time)
+(add-hook 'doom-modeline-mode-hook #'doom-modeline-override-time)
+
+(doom-modeline-add-variable-watcher
+ 'doom-modeline-time
+ (lambda (_sym val op _where)
+   (when (eq op 'set)
+     (setq doom-modeline-time val)
+     (doom-modeline-override-time))))
+
+;;
+;; Compilation
+;;
+
+(doom-modeline-def-segment compilation
+  (and (bound-and-true-p compilation-in-progress)
+       (propertize "[Compiling] "
+                   'face (doom-modeline-face 'doom-modeline-compilation)
+	               'help-echo "Compiling; mouse-2: Goto Buffer"
+                   'mouse-face 'doom-modeline-highlight
+                   'local-map
+                   (make-mode-line-mouse-map
+                    'mouse-2
+                    #'compilation-goto-in-progress-buffer))))
+
+;;
+;; Eldoc
+;;
+
+(doom-modeline-def-segment eldoc
+  (and (bound-and-true-p eldoc-mode)
+       '(eldoc-mode-line-string
+		 (" " eldoc-mode-line-string " "))))
+
+(defun doom-modeline-eldoc-minibuffer-message (format-string &rest args)
+  "Display message specified by FORMAT-STRING and ARGS on the mode-line as needed.
+This function displays the message produced by formatting ARGS
+with FORMAT-STRING on the mode line when the current buffer is a minibuffer.
+Otherwise, it displays the message like `message' would."
+  (if (minibufferp)
+      (progn
+	    (add-hook 'minibuffer-exit-hook
+		          (lambda () (setq eldoc-mode-line-string nil
+			                  ;; https://debbugs.gnu.org/16920
+			                  eldoc-last-message nil))
+		          nil t)
+	    (with-current-buffer
+	        (window-buffer
+	         (or (window-in-direction 'above (minibuffer-window))
+                 (minibuffer-selected-window)
+		         (get-largest-window)))
+          (setq eldoc-mode-line-string
+                (when (stringp format-string)
+                  (apply #'format-message format-string args)))
+          (force-mode-line-update)))
+    (apply #'message format-string args)))
+
+;;
+;; Kubernetes
+;;
+
+(doom-modeline-def-segment k8s
+  (when (and (bound-and-true-p kele-mode) (doom-modeline--segment-visible 'k8s))
+    (let* ((ctx (kele-current-context-name :wait nil))
+           (ns (kele-current-namespace :wait nil))
+           (icon (doom-modeline-icon 'mdicon "nf-md-kubernetes" "K8s:" "K8s:"))
+           (sep (doom-modeline-spc))
+           (help-msg (let ((msgs (list (format "Current context: %s" ctx))))
+                       (when ns
+                         (setq msgs (append msgs (list (format "Current namespace: %s" ns)))))
+                       (string-join msgs "\n"))))
+      (propertize (concat
+                   icon sep ctx
+                   (when (and doom-modeline-k8s-show-namespace ns) (format "(%s)" ns))
+                   sep)
+                  'local-map (let ((map (make-sparse-keymap)))
+                               (define-key map [mode-line down-mouse-1] kele-menu-map)
+                               map)
+                  'mouse-face 'doom-modeline-highlight
+                  'help-echo help-msg))))
+
+(provide 'doom-modeline-segments)
+
+;;; doom-modeline-segments.el ends here
diff --git a/emacs/elpa/doom-modeline-20241002.1003/doom-modeline-segments.elc b/emacs/elpa/doom-modeline-20241002.1003/doom-modeline-segments.elc
Binary files differ.
diff --git a/emacs/elpa/doom-modeline-20241002.1003/doom-modeline.el b/emacs/elpa/doom-modeline-20241002.1003/doom-modeline.el
@@ -0,0 +1,263 @@
+;;; doom-modeline.el --- A minimal and modern mode-line -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2018-2024 Vincent Zhang
+
+;; Author: Vincent Zhang <seagle0128@gmail.com>
+;; Homepage: https://github.com/seagle0128/doom-modeline
+;; Package-Version: 20241002.1003
+;; Package-Revision: ec6bc00ac035
+;; Package-Requires: ((emacs "25.1") (compat "29.1.4.5") (nerd-icons "0.1.0") (shrink-path "0.3.1"))
+;; Keywords: faces mode-line
+
+;; This file is not part of GNU Emacs.
+
+;;
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+;;
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
+;;
+
+;;; Commentary:
+;;
+;; This package offers a fancy and fast mode-line inspired by minimalism design.
+;;
+;; It's integrated into Doom Emacs (https://github.com/hlissner/doom-emacs) and
+;; Centaur Emacs (https://github.com/seagle0128/.emacs.d).
+;;
+;; The doom-modeline offers:
+;; - A match count panel (for anzu, iedit, multiple-cursors, symbol-overlay,
+;;   evil-search and evil-substitute)
+;; - An indicator for recording a macro
+;; - Current environment version (e.g. python, ruby, go, etc.) in the major-mode
+;; - A customizable mode-line height (see doom-modeline-height)
+;; - A minor modes segment which is compatible with minions
+;; - An error/warning count segment for flymake/flycheck
+;; - A workspace number segment for eyebrowse
+;; - A perspective name segment for persp-mode
+;; - A window number segment for winum and window-numbering
+;; - An indicator for modal editing state, including evil, overwrite, god, ryo
+;;   and xah-fly-keys, etc.
+;; - An indicator for battery status
+;; - An indicator for current input method
+;; - An indicator for debug state
+;; - An indicator for remote host
+;; - An indicator for LSP state with lsp-mode or eglot
+;; - An indicator for github notifications
+;; - An indicator for unread emails with mu4e-alert
+;; - An indicator for unread emails with gnus (basically builtin)
+;; - An indicator for irc notifications with circe, rcirc or erc.
+;; - An indicator for buffer position which is compatible with nyan-mode or poke-line
+;; - An indicator for party parrot
+;; - An indicator for PDF page number with pdf-tools
+;; - An indicator for markdown/org previews with grip
+;; - Truncated file name, file icon, buffer state and project name in buffer
+;;   information segment, which is compatible with project, find-file-in-project
+;;   and projectile
+;; - New mode-line for Info-mode buffers
+;; - New package mode-line for paradox
+;; - New mode-line for helm buffers
+;; - New mode-line for git-timemachine buffers
+;;
+;; Installation:
+;; From melpa, `M-x package-install RET doom-modeline RET`.
+;; In `init.el`,
+;; (require 'doom-modeline)
+;; (doom-modeline-mode 1)
+;; or
+;; (use-package doom-modeline
+;;   :ensure t
+;;   :hook (after-init . doom-modeline-mode))
+;;
+
+;;; Code:
+
+(require 'doom-modeline-core)
+(require 'doom-modeline-segments)
+
+
+;;
+;; Mode lines
+;;
+
+(doom-modeline-def-modeline 'main
+  '(eldoc bar workspace-name window-number modals matches follow buffer-info remote-host buffer-position word-count parrot selection-info)
+  '(compilation objed-state misc-info persp-name battery grip irc mu4e gnus github debug repl lsp minor-modes input-method indent-info buffer-encoding major-mode process vcs check time))
+
+(doom-modeline-def-modeline 'minimal
+  '(bar window-number modals matches buffer-info-simple)
+  '(media-info major-mode time))
+
+(doom-modeline-def-modeline 'special
+  '(eldoc bar window-number modals matches buffer-info remote-host buffer-position word-count parrot selection-info)
+  '(compilation objed-state misc-info battery irc-buffers debug minor-modes input-method indent-info buffer-encoding major-mode process time))
+
+(doom-modeline-def-modeline 'project
+  '(bar window-number modals buffer-default-directory remote-host buffer-position)
+  '(compilation misc-info battery irc mu4e gnus github debug minor-modes input-method major-mode process time))
+
+(doom-modeline-def-modeline 'dashboard
+  '(bar window-number modals buffer-default-directory-simple remote-host)
+  '(compilation misc-info battery irc mu4e gnus github debug minor-modes input-method major-mode process time))
+
+(doom-modeline-def-modeline 'vcs
+  '(bar window-number modals matches buffer-info remote-host buffer-position parrot selection-info)
+  '(compilation misc-info battery irc mu4e gnus github debug minor-modes buffer-encoding major-mode process time))
+
+(doom-modeline-def-modeline 'package
+  '(bar window-number modals package)
+  '(compilation misc-info major-mode process time))
+
+(doom-modeline-def-modeline 'info
+  '(bar window-number modals buffer-info info-nodes buffer-position parrot selection-info)
+  '(compilation misc-info buffer-encoding major-mode time))
+
+(doom-modeline-def-modeline 'media
+  '(bar window-number modals buffer-size buffer-info)
+  '(compilation misc-info media-info major-mode process vcs time))
+
+(doom-modeline-def-modeline 'message
+  '(eldoc bar window-number modals matches buffer-info-simple buffer-position word-count parrot selection-info)
+  '(compilation objed-state misc-info battery debug minor-modes input-method indent-info buffer-encoding major-mode time))
+
+(doom-modeline-def-modeline 'pdf
+  '(bar window-number modals matches buffer-info pdf-pages)
+  '(compilation misc-info major-mode process vcs time))
+
+(doom-modeline-def-modeline 'org-src
+  '(eldoc bar window-number modals matches buffer-info buffer-position word-count parrot selection-info)
+  '(compilation objed-state misc-info debug lsp minor-modes input-method indent-info buffer-encoding major-mode process check time))
+
+(doom-modeline-def-modeline 'helm
+  '(bar helm-buffer-id helm-number helm-follow helm-prefix-argument)
+  '(helm-help time))
+
+(doom-modeline-def-modeline 'timemachine
+  '(eldoc bar window-number modals matches git-timemachine buffer-position word-count parrot selection-info)
+  '(misc-info minor-modes indent-info buffer-encoding major-mode time))
+
+(doom-modeline-def-modeline 'calculator
+  '(window-number modals matches calc buffer-position)
+  '(misc-info minor-modes major-mode process))
+
+
+;;
+;; Interfaces
+;;
+
+;;;###autoload
+(defun doom-modeline-set-main-modeline (&optional default)
+  "Set main mode-line.
+If DEFAULT is non-nil, set the default mode-line for all buffers."
+  (doom-modeline-set-modeline 'main default))
+
+
+;;
+;; Minor mode
+;;
+
+;; Suppress warnings
+(defvar 2C-mode-line-format)
+(defvar flymake-mode-line-format)
+(defvar helm-ag-show-status-function)
+(declare-function helm-display-mode-line "ext:helm-core")
+
+(defvar doom-modeline-mode-map (make-sparse-keymap))
+
+(defvar doom-modeline-mode-alist
+  '((message-mode         . message)
+    (git-commit-mode      . message)
+    (magit-mode           . vcs)
+    (dashboard-mode       . dashboard)
+    (Info-mode            . info)
+    (image-mode           . media)
+    (pdf-view-mode        . pdf)
+    (org-src-mode         . org-src)
+    (paradox-menu-mode    . package)
+    (xwidget-webkit-mode  . minimal)
+    (git-timemachine-mode . timemachine)
+    (calc-mode            . calculator)
+    (calc-trail-mode      . calculator)
+    (circe-mode           . special)
+    (erc-mode             . special)
+    (rcirc-mode           . special))
+  "Alist of major modes and mode-lines.")
+
+(defun doom-modeline-auto-set-modeline ()
+  "Set mode-line base on major-mode."
+  (catch 'found
+    (dolist (x doom-modeline-mode-alist)
+      (when (derived-mode-p (car x))
+        (doom-modeline-set-modeline (cdr x))
+        (throw 'found x)))))
+
+(defun doom-modeline-set-helm-modeline (&rest _) ; To advice helm
+  "Set helm mode-line."
+  (doom-modeline-set-modeline 'helm))
+
+;;;###autoload
+(define-minor-mode doom-modeline-mode
+  "Toggle `doom-modeline' on or off."
+  :group 'doom-modeline
+  :global t
+  :lighter nil
+  :keymap doom-modeline-mode-map
+  (if doom-modeline-mode
+      (progn
+        (doom-modeline-refresh-bars)        ; Create bars
+        (doom-modeline-set-main-modeline t) ; Set default mode-line
+
+        ;; Apply to all existing buffers.
+        (dolist (buf (buffer-list))
+          (with-current-buffer buf
+            (unless (doom-modeline-auto-set-modeline)
+              (doom-modeline-set-main-modeline))))
+
+        ;; For flymake
+        (setq flymake-mode-line-format nil) ; remove the lighter of minor mode
+
+        ;; For Eldoc
+        (setq eldoc-message-function #'doom-modeline-eldoc-minibuffer-message)
+
+        ;; For two-column editing
+        (setq 2C-mode-line-format (doom-modeline 'special))
+
+        ;; Automatically set mode-lines
+        (add-hook 'after-change-major-mode-hook #'doom-modeline-auto-set-modeline)
+
+        ;; Special handles
+        (advice-add #'helm-display-mode-line :after #'doom-modeline-set-helm-modeline)
+        (setq helm-ag-show-status-function #'doom-modeline-set-helm-modeline))
+    (progn
+      ;; Restore mode-line
+      (let ((original-format (doom-modeline--original-value 'mode-line-format)))
+        (setq-default mode-line-format original-format)
+        (dolist (buf (buffer-list))
+          (with-current-buffer buf
+            (setq mode-line-format original-format))))
+
+      ;; For flymake
+      (setq flymake-mode-line-format (doom-modeline--original-value 'flymake-mode-line-format))
+
+      ;; For Eldoc
+      (setq eldoc-message-function #'eldoc-minibuffer-message)
+
+      ;; For two-column editing
+      (setq 2C-mode-line-format (doom-modeline--original-value '2C-mode-line-format))
+
+      ;; Cleanup
+      (remove-hook 'after-change-major-mode-hook #'doom-modeline-auto-set-modeline)
+      (advice-remove #'helm-display-mode-line #'doom-modeline-set-helm-modeline)
+      (setq helm-ag-show-status-function (default-value 'helm-ag-show-status-function)))))
+
+(provide 'doom-modeline)
+
+;;; doom-modeline.el ends here
diff --git a/emacs/elpa/doom-modeline-20240923.140/doom-modeline.elc b/emacs/elpa/doom-modeline-20241002.1003/doom-modeline.elc
Binary files differ.
diff --git a/emacs/elpa/f-20240308.906/f-pkg.el b/emacs/elpa/f-20240308.906/f-pkg.el
@@ -1,16 +0,0 @@
-(define-package "f" "20240308.906" "Modern API for working with files and directories"
-  '((emacs "24.1")
-    (s "1.7.0")
-    (dash "2.2.0"))
-  :commit "1e7020dc0d4c52d3da9bd610d431cab13aa02d8c" :authors
-  '(("Johan Andersson" . "johan.rejeep@gmail.com"))
-  :maintainers
-  '(("Lucien Cartier-Tilet" . "lucien@phundrak.com"))
-  :maintainer
-  '("Lucien Cartier-Tilet" . "lucien@phundrak.com")
-  :keywords
-  '("files" "directories")
-  :url "http://github.com/rejeep/f.el")
-;; Local Variables:
-;; no-byte-compile: t
-;; End:
diff --git a/emacs/elpa/f-20240308.906/f-shortdoc.el b/emacs/elpa/f-20240308.906/f-shortdoc.el
@@ -1,438 +0,0 @@
-;;; f-shortdoc.el --- Shortdoc for f.el -*- lexical-binding: t; no-byte-compile: t; -*-
-
-;; Author: Lucien Cartier-Tilet <lucien@phundrak.com>
-;; Maintainer: Lucien Cartier-Tilet <lucien@phundrak.com>
-;; Version: 0.1.0
-;; Package-Requires: ((emacs "28.1"))
-;; Homepage: https://github.com/rejeep/f.el
-
-;; This file is not part of GNU Emacs
-
-;; This program is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-
-;;; Commentary:
-
-;; Shortdoc implementation for f.el
-
-;;; Code:
-
-(when (version<= "28.1" emacs-version)
-  (require 'shortdoc)
-
-  (define-short-documentation-group f
-    "Paths"
-    (f-join
-     :eval (f-join "path")
-     :eval (f-join "path" "to")
-     :eval (f-join "/" "path" "to" "heaven")
-     :eval (f-join "path" "/to" "file"))
-
-    (f-split
-     :eval (f-split "path")
-     :eval (f-split "path/to")
-     :eval (f-split "/path/to/heaven")
-     :eval (f-split "~/back/to/earth"))
-
-    (f-expand
-     :no-eval (f-expand "name")
-     :result-string "/default/directory/name"
-     :no-eval (f-expand "name" "other/directory")
-     :result-string "other/directory/name")
-
-    (f-filename
-     :eval (f-filename "path/to/file.ext")
-     :eval (f-filename "path/to/directory"))
-
-    (f-dirname
-     :eval (f-dirname "path/to/file.ext")
-     :eval (f-dirname "path/to/directory")
-     :eval (f-dirname "/"))
-
-    (f-common-parent
-     :eval (f-common-parent '("foo/bar/baz" "foo/bar/qux" "foo/bar/mux"))
-     :eval (f-common-parent '("/foo/bar/baz" "/foo/bar/qux" "/foo/bax/mux"))
-     :eval (f-common-parent '("foo/bar/baz" "quack/bar/qux" "lack/bar/mux")))
-
-    (f-ext
-     :eval (f-ext "path/to/file")
-     :eval (f-ext "path/to/file.txt")
-     :eval (f-ext "path/to/file.txt.org"))
-
-    (f-no-ext
-     :eval (f-no-ext "path/to/file")
-     :eval (f-no-ext "path/to/file.txt")
-     :eval (f-no-ext "path/to/file.txt.org"))
-
-    (f-swap-ext
-     :eval (f-swap-ext "path/to/file.ext" "org"))
-
-    (f-base
-     :eval (f-base "path/to/file.ext")
-     :eval (f-base "path/to/directory"))
-
-    (f-relative
-     :eval (f-relative "/some/path/relative/to/my/file.txt" "/some/path/")
-     :eval (f-relative "/default/directory/my/file.txt"))
-
-    (f-short
-     :no-eval (f-short "/Users/foo/Code/on/macOS")
-     :result-string "~/Code/on/macOS"
-     :no-eval (f-short "/home/foo/Code/on/linux")
-     :result-string "~/Code/on/linux"
-     :eval (f-short "/path/to/Code/bar"))
-
-    (f-long
-     :eval (f-long "~/Code/bar")
-     :eval (f-long "/path/to/Code/bar"))
-
-    (f-canonical
-     :eval (f-canonical "/path/to/real/file")
-     :no-eval (f-canonical "/link/to/file")
-     :result-string "/path/to/real/file")
-
-    (f-slash
-     :no-eval (f-slash "/path/to/file")
-     :result-string "/path/to/file"
-     :no-eval (f-slash "/path/to/dir")
-     :result-string "/path/to/dir/"
-     :no-eval (f-slash "/path/to/dir/")
-     :result-string "/path/to/dir/")
-
-    (f-full
-     :eval (f-full "~/path/to/file")
-     :eval (f-full "~/path/to/dir")
-     :eval (f-full "~/path/to/dir/"))
-
-    (f-uniquify
-     :eval (f-uniquify '("/foo/bar" "/foo/baz" "/foo/quux"))
-     :eval (f-uniquify '("/foo/bar" "/www/bar" "/foo/quux"))
-     :eval (f-uniquify '("/foo/bar" "/www/bar" "/www/bar/quux"))
-     :eval (f-uniquify '("/foo/bar" "/foo/baz" "/home/www/bar" "/home/www/baz" "/var/foo" "/opt/foo/www/baz")))
-
-    (f-uniquify-alist
-     :eval (f-uniquify-alist '("/foo/bar" "/foo/baz" "/foo/quux"))
-     :eval (f-uniquify-alist '("/foo/bar" "/www/bar" "/foo/quux"))
-     :eval (f-uniquify-alist '("/foo/bar" "/www/bar" "/www/bar/quux"))
-     :eval (f-uniquify-alist '("/foo/bar" "/foo/baz" "/home/www/bar" "/home/www/baz" "/var/foo" "/opt/foo/www/baz")))
-
-    "I/O"
-    (f-read-bytes
-     :no-eval* (f-read-bytes "path/to/binary/data"))
-
-    (f-write-bytes
-     :no-eval* (f-write-bytes (unibyte-string 72 101 108 108 111 32 119 111 114 108 100) "path/to/binary/data"))
-
-    (f-append-bytes
-     :no-eval* (f-append-bytes "path/to/file" (unibyte-string 72 101 108 108 111 32 119 111 114 108 100)))
-
-    (f-read-text
-     :no-eval* (f-read-text "path/to/file.txt" 'utf-8)
-     :no-eval* (f-read "path/to/file.txt" 'utf-8))
-
-    (f-write-text
-     :no-eval* (f-write-text "Hello world" 'utf-8 "path/to/file.txt")
-     :no-eval* (f-write "Hello world" 'utf-8 "path/to/file.txt"))
-
-    (f-append-text
-     :no-eval* (f-append-text "Hello world" 'utf-8 "path/to/file.txt")
-     :no-eval* (f-append "Hello world" 'utf-8 "path/to/file.txt"))
-
-    "Destructive"
-    (f-mkdir
-     :no-eval (f-mkdir "dir")
-     :result-string "creates /default/directory/dir"
-     :no-eval (f-mkdir "other" "dir")
-     :result-string "creates /default/directory/other/dir"
-     :no-eval (f-mkdir "/" "some" "path")
-     :result-string "creates /some/path"
-     :no-eval (f-mkdir "~" "yet" "another" "dir")
-     :result-string "creates ~/yet/another/dir")
-
-    (f-mkdir-full-path
-     :no-eval (f-mkdir-full-path "dir")
-     :result-string "creates /default/directory/dir"
-     :no-eval (f-mkdir-full-path "other/dir")
-     :result-string "creates /default/directory/other/dir"
-     :no-eval (f-mkdir-full-path "/some/path")
-     :result-string "creates /some/path"
-     :no-eval (f-mkdir-full-path "~/yet/another/dir")
-     :result-string "creates ~/yet/another/dir")
-
-    (f-delete
-     :no-eval* (f-delete "dir")
-     :no-eval* (f-delete "other/dir" t)
-     :no-eval* (f-delete "path/to/file.txt"))
-
-    (f-symlink
-     :no-eval* (f-symlink "path/to/source" "path/to/link"))
-
-    (f-move
-     :no-eval* (f-move "path/to/file.txt" "new-file.txt")
-     :no-eval* (f-move "path/to/file.txt" "other/path"))
-
-    (f-copy
-     :no-eval* (f-copy "path/to/file.txt" "new-file.txt")
-     :no-eval* (f-copy "path/to/dir" "other/dir"))
-
-    (f-copy-contents
-     :no-eval* (f-copy-contents "path/to/dir" "path/to/other/dir"))
-
-    (f-touch
-     :no-eval* (f-touch "path/to/existing/file.txt")
-     :no-eval* (f-touch "path/to/non/existing/file.txt"))
-
-    "Predicates"
-    (f-exists-p
-     :no-eval* (f-exists-p "path/to/file.txt")
-     :no-eval* (f-exists-p "path/to/dir"))
-
-    (f-directory-p
-     :no-eval* (f-directory-p "path/to/file.txt")
-     :no-eval* (f-directory-p "path/to/dir"))
-
-    (f-file-p
-     :no-eval* (f-file-p "path/to/file.txt")
-     :no-eval* (f-file-p "path/to/dir"))
-
-    (f-symlink-p
-     :no-eval* (f-symlink-p "path/to/file.txt")
-     :no-eval* (f-symlink-p "path/to/dir")
-     :no-eval* (f-symlink-p "path/to/link"))
-
-    (f-readable-p
-     :no-eval* (f-readable-p "path/to/file.txt")
-     :no-eval* (f-readable-p "path/to/dir"))
-
-    (f-writable-p
-     :no-eval* (f-writable-p "path/to/file.txt")
-     :no-eval* (f-writable-p "path/to/dir"))
-
-    (f-executable-p
-     :no-eval* (f-executable-p "path/to/file.txt")
-     :no-eval* (f-executable-p "path/to/dir"))
-
-    (f-absolute-p
-     :eval (f-absolute-p "path/to/dir")
-     :eval (f-absolute-p "/full/path/to/dir"))
-
-    (f-relative-p
-     :eval (f-relative-p "path/to/dir")
-     :eval (f-relative-p "/full/path/to/dir"))
-
-    (f-root-p
-     :eval (f-root-p "/")
-     :eval (f-root-p "/not/root"))
-
-    (f-ext-p
-     :eval (f-ext-p "path/to/file.el" "el")
-     :eval (f-ext-p "path/to/file.el" "txt")
-     :eval (f-ext-p "path/to/file.el")
-     :eval (f-ext-p "path/to/file"))
-
-    (f-same-p
-     :eval (f-same-p "foo.txt" "foo.txt")
-     :eval (f-same-p "foo/bar/../baz" "foo/baz")
-     :eval (f-same-p "/path/to/foo.txt" "/path/to/bar.txt"))
-
-    (f-parent-of-p
-     :no-eval (f-parent-of-p "/path/to" "/path/to/dir")
-     :result t
-     :no-eval (f-parent-of-p "/path/to/dir" "/path/to")
-     :result nil
-     :no-eval (f-parent-of-p "/path/to" "/path/to")
-     :result nil)
-
-    (f-child-of-p
-     :no-eval (f-child-of-p "/path/to" "/path/to/dir")
-     :result nil
-     :no-eval (f-child-of-p "/path/to/dir" "/path/to")
-     :result t
-     :no-eval (f-child-of-p "/path/to" "/path/to")
-     :result nil)
-
-    (f-ancestor-of-p
-     :no-eval (f-ancestor-of-p "/path/to" "/path/to/dir")
-     :result t
-     :no-eval (f-ancestor-of-p "/path" "/path/to/dir")
-     :result t
-     :no-eval (f-ancestor-of-p "/path/to/dir" "/path/to")
-     :result nil
-     :no-eval (f-ancestor-of-p "/path/to" "/path/to")
-     :result nil)
-
-    (f-descendant-of-p
-     :no-eval (f-descendant-of-p "/path/to/dir" "/path/to")
-     :result t
-     :no-eval (f-descendant-of-p "/path/to/dir" "/path")
-     :result t
-     :no-eval (f-descendant-of-p "/path/to" "/path/to/dir")
-     :result nil
-     :no-eval (f-descendant-of-p "/path/to" "/path/to")
-     :result nil)
-
-    (f-hidden-p
-     :eval (f-hidden-p "path/to/foo")
-     :eval (f-hidden-p ".path/to/foo")
-     :eval (f-hidden-p "path/.to/foo")
-     :eval (f-hidden-p "path/to/.foo")
-     :eval (f-hidden-p ".path/to/foo" 'any)
-     :eval (f-hidden-p "path/.to/foo" 'any)
-     :eval (f-hidden-p "path/to/.foo" 'any)
-     :eval (f-hidden-p ".path/to/foo" 'last)
-     :eval (f-hidden-p "path/.to/foo" 'last)
-     :eval (f-hidden-p "path/to/.foo" 'last))
-
-    (f-empty-p
-     :no-eval (f-empty-p "/path/to/empty-file")
-     :result t
-     :no-eval (f-empty-p "/path/to/file-with-contents")
-     :result nil
-     :no-eval (f-empty-p "/path/to/empty-dir/")
-     :result t
-     :no-eval (f-empty-p "/path/to/dir-with-contents/")
-     :result nil)
-
-    (f-older-p
-     :no-eval (f-older-p "older-file.txt" "newer-file.txt")
-     :result t
-     :no-eval (f-older-p "newer-file.txt" "older-file.txt")
-     :result nil
-     :no-eval (f-older-p "same-time1.txt" "same-time2.txt")
-     :result nil)
-
-    (f-newer-p
-     :no-eval (f-newer-p "newer-file.txt" "older-file.txt")
-     :result t
-     :no-eval (f-newer-p "older-file.txt" "newer-file.txt")
-     :result nil
-     :no-eval (f-newer-p "same-time1.txt" "same-time2.txt")
-     :result nil)
-
-    (f-same-time-p
-     :no-eval (f-same-time-p "same-time1.txt" "same-time2.txt")
-     :result t
-     :no-eval (f-same-time-p "newer-file.txt" "older-file.txt")
-     :result nil
-     :no-eval (f-same-time-p "older-file.txt" "newer-file.txt")
-     :result nil)
-
-    "Stats"
-    (f-size
-     :no-eval* (f-size "path/to/file.txt")
-     :no-eval* (f-size "path/to/dir"))
-
-    (f-depth
-     :eval (f-depth "/")
-     :eval (f-depth "/var/")
-     :eval (f-depth "/usr/local/bin"))
-
-    (f-change-time
-     :no-eval (f-change-time "path/to/file.txt")
-     :result (25517 48756 26337 111000)
-     :no-eval (f-change-time "path/to/dir")
-     :result (25517 57887 344657 210000)
-     :no-eval (f-change-time "path/to/file.txt" t)
-     :result (1672330868026337111 . 1000000000)
-     :no-eval (f-change-time "path/to/dir" t)
-     :result (1672339999344657210 . 1000000000)
-     :no-eval (f-change-time "path/to/file.txt" 'seconds)
-     :result 1672330868
-     :no-eval (f-change-time "path/to/dir" 'seconds)
-     :result 1672339999)
-
-    (f-modification-time
-     :no-eval (f-modification-time "path/to/file.txt")
-     :result (25517 48756 26337 111000)
-     :no-eval (f-modification-time "path/to/dir")
-     :result (25517 57887 344657 210000)
-     :no-eval (f-modification-time "path/to/file.txt" t)
-     :result (1672330868026337111 . 1000000000)
-     :no-eval (f-modification-time "path/to/dir" t)
-     :result (1672339999344657210 . 1000000000)
-     :no-eval (f-modification-time "path/to/file.txt" 'seconds)
-     :result 1672330868
-     :no-eval (f-modification-time "path/to/dir" 'seconds)
-     :result 1672339999)
-
-    (f-access-time
-     :no-eval (f-access-time "path/to/file.txt")
-     :result (25517 48756 26337 111000)
-     :no-eval (f-access-time "path/to/dir")
-     :result (25517 57887 344657 210000)
-     :no-eval (f-access-time "path/to/file.txt" t)
-     :result (1672330868026337111 . 1000000000)
-     :no-eval (f-access-time "path/to/dir" t)
-     :result (1672339999344657210 . 1000000000)
-     :no-eval (f-access-time "path/to/file.txt" 'seconds)
-     :result 1672330868
-     :no-eval (f-access-time "path/to/dir" 'seconds)
-     :result 1672339999)
-
-    "Misc"
-    (f-this-file
-     :no-eval* (f-this-file))
-
-    (f-path-separator
-     :eval (f-path-separator))
-
-    (f-glob
-     :no-eval* (f-glob "path/to/*.el")
-     :no-eval* (f-glob "*.el" "path/to"))
-
-    (f-entries
-     :no-eval* (f-entries "path/to/dir")
-     :no-eval* (f-entries "path/to/dir" (lambda (file) (s-matches? "test" file)))
-     :no-eval* (f-entries "path/to/dir" nil t)
-     :no-eval* (f--entries "path/to/dir" (s-matches? "test" it)))
-
-    (f-directories
-     :no-eval* (f-directories "path/to/dir")
-     :no-eval* (f-directories "path/to/dir" (lambda (dir) (equal (f-filename dir) "test")))
-     :no-eval* (f-directories "path/to/dir" nil t)
-     :no-eval* (f--directories "path/to/dir" (equal (f-filename it) "test")))
-
-    (f-files
-     :no-eval* (f-files "path/to/dir")
-     :no-eval* (f-files "path/to/dir" (lambda (file) (equal (f-ext file) "el")))
-     :no-eval* (f-files "path/to/dir" nil t)
-     :no-eval* (f--files "path/to/dir" (equal (f-ext it) "el")))
-
-    (f-root
-     :eval (f-root))
-
-    (f-traverse-upwards
-     :no-eval* (f-traverse-upwards
-                (lambda (path)
-                  (f-exists? (f-expand ".git" path)))
-                start-path)
-
-     :no-eval* (f--traverse-upwards (f-exists? (f-expand ".git" it)) start-path))
-
-    (f-with-sandbox
-     :no-eval (f-with-sandbox foo-path
-                (f-touch (f-expand "foo" foo-path)))
-     :no-eval (f-with-sandbox (list foo-path bar-path)
-                (f-touch (f-expand "foo" foo-path))
-                (f-touch (f-expand "bar" bar-path)))
-     :no-eval (f-with-sandbox foo-path
-                (f-touch (f-expand "bar" bar-path)))))) ;; "Destructive operation outside sandbox"
-
-(eval-when-compile
-  (when (version< emacs-version "28.1")
-    (warn "Emacs should not be compiling this file")))
-
-(provide 'f-shortdoc)
-
-;;; f-shortdoc.el ends here
diff --git a/emacs/elpa/f-20240308.906/f.el b/emacs/elpa/f-20240308.906/f.el
@@ -1,799 +0,0 @@
-;;; f.el --- Modern API for working with files and directories -*- lexical-binding: t; -*-
-
-;; Copyright (C) 2013 Johan Andersson
-
-;; Author: Johan Andersson <johan.rejeep@gmail.com>
-;; Maintainer: Lucien Cartier-Tilet <lucien@phundrak.com>
-;; Version: 0.20.0
-;; Package-Requires: ((emacs "24.1") (s "1.7.0") (dash "2.2.0"))
-;; Keywords: files, directories
-;; Homepage: http://github.com/rejeep/f.el
-
-;; This file is NOT part of GNU Emacs.
-
-;;; License:
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
-
-;;; Commentary:
-;;
-;; Much inspired by magnar's excellent s.el and dash.el, f.el is a
-;; modern API for working with files and directories in Emacs.
-
-;;; Code:
-
-
-
-(require 's)
-(require 'dash)
-(when (version<= "28.1" emacs-version)
-  (when (< emacs-major-version 29)
-   (require 'f-shortdoc nil t)))
-
-(put 'f-guard-error 'error-conditions '(error f-guard-error))
-(put 'f-guard-error 'error-message "Destructive operation outside sandbox")
-
-(defvar f--guard-paths nil
-  "List of allowed paths to modify when guarded.
-
-Do not modify this variable.")
-
-(defmacro f--destructive (path &rest body)
-  "If PATH is allowed to be modified, yield BODY.
-
-If PATH is not allowed to be modified, throw error."
-  (declare (indent 1))
-  `(if f--guard-paths
-       (if (--any? (or (f-same-p it ,path)
-                       (f-ancestor-of-p it ,path)) f--guard-paths)
-           (progn ,@body)
-         (signal 'f-guard-error (list ,path f--guard-paths)))
-     ,@body))
-
-
-;;;; Paths
-
-(defun f-join (&rest args)
-  "Join ARGS to a single path.
-
-Be aware if one of the arguments is an absolute path, `f-join'
-will discard all the preceeding arguments and make this absolute
-path the new root of the generated path."
-  (let (path
-        (relative (f-relative-p (car args))))
-    (mapc
-     (lambda (arg)
-       (setq path (cond ((not path) arg)
-                        ((f-absolute-p arg)
-                         (progn
-                           (setq relative nil)
-                           arg))
-                        (t (f-expand arg path)))))
-     args)
-    (if relative (f-relative path) path)))
-
-(defun f-split (path)
-  "Split PATH and return list containing parts."
-  (let ((parts (split-string path (f-path-separator) 'omit-nulls)))
-    (if (string= (s-left 1 path) (f-path-separator))
-        (push (f-path-separator) parts)
-      parts)))
-
-(defun f-expand (path &optional dir)
-  "Expand PATH relative to DIR (or `default-directory').
-PATH and DIR can be either a directory names or directory file
-names.  Return a directory name if PATH is a directory name, and
-a directory file name otherwise.  File name handlers are
-ignored."
-  (let (file-name-handler-alist)
-    (expand-file-name path dir)))
-
-(defun f-filename (path)
-  "Return the name of PATH."
-  (file-name-nondirectory (directory-file-name path)))
-
-(defalias 'f-parent 'f-dirname)
-
-(defun f-dirname (path)
-  "Return the parent directory to PATH."
-  (let ((parent (file-name-directory
-                 (directory-file-name (f-expand path default-directory)))))
-    (unless (f-same-p path parent)
-      (if (f-relative-p path)
-          (f-relative parent)
-        (directory-file-name parent)))))
-
-(defun f-common-parent (paths)
-  "Return the deepest common parent directory of PATHS."
-  (cond
-   ((not paths) nil)
-   ((not (cdr paths)) (f-parent (car paths)))
-   (:otherwise
-    (let* ((paths (-map 'f-split paths))
-           (common (caar paths))
-           (re nil))
-      (while (and (not (null (car paths))) (--all? (equal (car it) common) paths))
-        (setq paths (-map 'cdr paths))
-        (push common re)
-        (setq common (caar paths)))
-      (cond
-       ((null re) "")
-       ((and (= (length re) 1) (f-root-p (car re)))
-        (f-root))
-       (:otherwise
-        (concat (apply 'f-join (nreverse re)) "/")))))))
-
-(defalias 'f-ext 'file-name-extension)
-
-(defalias 'f-no-ext 'file-name-sans-extension)
-
-(defun f-swap-ext (path ext)
-  "Return PATH but with EXT as the new extension.
-EXT must not be nil or empty."
-  (if (s-blank-p ext)
-      (error "Extension cannot be empty or nil")
-    (concat (f-no-ext path) "." ext)))
-
-(defun f-base (path)
-  "Return the name of PATH, excluding the extension of file."
-  (f-no-ext (f-filename path)))
-
-(defalias 'f-relative 'file-relative-name)
-
-(defalias 'f-short 'abbreviate-file-name)
-(defalias 'f-abbrev 'abbreviate-file-name)
-
-(defun f-long (path)
-  "Return long version of PATH."
-  (f-expand path))
-
-(defalias 'f-canonical 'file-truename)
-
-(defun f-slash (path)
-  "Append slash to PATH unless one already.
-
-Some functions, such as `call-process' requires there to be an
-ending slash."
-  (if (f-dir-p path)
-      (file-name-as-directory path)
-    path))
-
-(defun f-full (path)
-  "Return absolute path to PATH, with ending slash."
-  (f-slash (f-long path)))
-
-(defun f--uniquify (paths)
-  "Helper for `f-uniquify' and `f-uniquify-alist'."
-  (let* ((files-length (length paths))
-         (uniq-filenames (--map (cons it (f-filename it)) paths))
-         (uniq-filenames-next (-group-by 'cdr uniq-filenames)))
-    (while (/= files-length (length uniq-filenames-next))
-      (setq uniq-filenames-next
-            (-group-by 'cdr
-                       (--mapcat
-                        (let ((conf-files (cdr it)))
-                          (if (> (length conf-files) 1)
-                              (--map (cons
-                                      (car it)
-                                      (concat
-                                       (f-filename (s-chop-suffix (cdr it)
-                                                                  (car it)))
-                                       (f-path-separator) (cdr it)))
-                                     conf-files)
-                            conf-files))
-                        uniq-filenames-next))))
-    uniq-filenames-next))
-
-(defun f-uniquify (files)
-  "Return unique suffixes of FILES.
-
-This function expects no duplicate paths."
-  (-map 'car (f--uniquify files)))
-
-(defun f-uniquify-alist (files)
-  "Return alist mapping FILES to unique suffixes of FILES.
-
-This function expects no duplicate paths."
-  (-map 'cadr (f--uniquify files)))
-
-
-;;;; I/O
-
-(defun f-read-bytes (path &optional beg end)
-  "Read binary data from PATH.
-
-Return the binary data as unibyte string.  The optional second
-and third arguments BEG and END specify what portion of the file
-to read."
-  (with-temp-buffer
-    (set-buffer-multibyte nil)
-    (setq buffer-file-coding-system 'binary)
-    (insert-file-contents-literally path nil beg end)
-    (buffer-substring-no-properties (point-min) (point-max))))
-
-(defalias 'f-read 'f-read-text)
-(defun f-read-text (path &optional coding)
-  "Read text with PATH, using CODING.
-
-CODING defaults to `utf-8'.
-
-Return the decoded text as multibyte string."
-  (decode-coding-string (f-read-bytes path) (or coding 'utf-8)))
-
-(defalias 'f-write 'f-write-text)
-(defun f-write-text (text coding path)
-  "Write TEXT with CODING to PATH.
-
-TEXT is a multibyte string.  CODING is a coding system to encode
-TEXT with.  PATH is a file name to write to."
-  (f-write-bytes (encode-coding-string text coding) path))
-
-(defun f-unibyte-string-p (s)
-  "Determine whether S is a unibyte string."
-  (not (multibyte-string-p s)))
-
-(defun f-write-bytes (data path)
-  "Write binary DATA to PATH.
-
-DATA is a unibyte string.  PATH is a file name to write to."
-  (f--write-bytes data path nil))
-
-(defalias 'f-append 'f-append-text)
-(defun f-append-text (text coding path)
-  "Append TEXT with CODING to PATH.
-
-If PATH does not exist, it is created."
-  (f-append-bytes (encode-coding-string text coding) path))
-
-(defun f-append-bytes (data path)
-  "Append binary DATA to PATH.
-
-If PATH does not exist, it is created."
-  (f--write-bytes data path :append))
-
-(defun f--write-bytes (data filename append)
-  "Write binary DATA to FILENAME.
-If APPEND is non-nil, append the DATA to the existing contents."
-  (f--destructive filename
-    (unless (f-unibyte-string-p data)
-      (signal 'wrong-type-argument (list 'f-unibyte-string-p data)))
-    (let ((coding-system-for-write 'binary)
-          (write-region-annotate-functions nil)
-          (write-region-post-annotation-function nil))
-      (write-region data nil filename append :silent)
-      nil)))
-
-
-;;;; Destructive
-
-(defun f-mkdir (&rest dirs)
-  "Create directories DIRS.
-
-DIRS should be a successive list of directories forming together
-a full path.  The easiest way to call this function with a fully
-formed path is using `f-split' alongside it:
-
-    (apply #\\='f-mkdir (f-split \"path/to/file\"))
-
-Although it works sometimes, it is not recommended to use fully
-formed paths in the function. In this case, it is recommended to
-use `f-mkdir-full-path' instead."
-  (let (path)
-    (-each
-        dirs
-      (lambda (dir)
-        (setq path (f-expand dir path))
-        (unless (f-directory-p path)
-          (f--destructive path (make-directory path)))))))
-
-(defun f-mkdir-full-path (dir)
-  "Create DIR from a full path.
-
-This function is similar to `f-mkdir' except it can accept a full
-path instead of requiring several successive directory names."
-  (apply #'f-mkdir (f-split dir)))
-
-(defun f-delete (path &optional force)
-  "Delete PATH, which can be file or directory.
-
-If FORCE is t, a directory will be deleted recursively."
-  (f--destructive path
-    (if (or (f-file-p path) (f-symlink-p path))
-        (delete-file path)
-      (delete-directory path force))))
-
-(defun f-symlink (source path)
-  "Create a symlink to SOURCE from PATH."
-  (f--destructive path (make-symbolic-link source path)))
-
-(defun f-move (from to)
-  "Move or rename FROM to TO.
-If TO is a directory name, move FROM into TO."
-  (f--destructive to (rename-file from to t)))
-
-(defun f-copy (from to)
-  "Copy file or directory FROM to TO.
-If FROM names a directory and TO is a directory name, copy FROM
-into TO as a subdirectory."
-  (f--destructive to
-    (if (f-file-p from)
-        (copy-file from to)
-      ;; The behavior of `copy-directory' differs between Emacs 23 and
-      ;; 24 in that in Emacs 23, the contents of `from' is copied to
-      ;; `to', while in Emacs 24 the directory `from' is copied to
-      ;; `to'. We want the Emacs 24 behavior.
-      (if (> emacs-major-version 23)
-          (copy-directory from to)
-        (if (f-dir-p to)
-            (progn
-              (apply 'f-mkdir (f-split to))
-              (let ((new-to (f-expand (f-filename from) to)))
-                (copy-directory from new-to)))
-          (copy-directory from to))))))
-
-(defun f-copy-contents (from to)
-  "Copy contents in directory FROM, to directory TO."
-  (unless (f-exists-p to)
-    (error "Cannot copy contents to non existing directory %s" to))
-  (unless (f-dir-p from)
-    (error "Cannot copy contents as %s is a file" from))
-  (--each (f-entries from)
-    (f-copy it (file-name-as-directory to))))
-
-(defun f-touch (path)
-  "Update PATH last modification date or create if it does not exist."
-  (f--destructive path
-    (if (f-file-p path)
-        (set-file-times path)
-      (f-write-bytes "" path))))
-
-
-;;;; Predicates
-
-(defalias 'f-exists-p 'file-exists-p)
-(defalias 'f-exists? 'file-exists-p)
-
-(defalias 'f-directory-p 'file-directory-p)
-(defalias 'f-directory? 'file-directory-p)
-(defalias 'f-dir-p 'file-directory-p)
-(defalias 'f-dir? 'file-directory-p)
-
-
-(defalias 'f-file-p 'file-regular-p)
-(defalias 'f-file? 'file-regular-p)
-
-(defun f-symlink-p (path)
-  "Return t if PATH is symlink, false otherwise."
-  (not (not (file-symlink-p path))))
-
-(defalias 'f-symlink? 'f-symlink-p)
-
-(defalias 'f-readable-p 'file-readable-p)
-(defalias 'f-readable? 'file-readable-p)
-
-(defalias 'f-writable-p 'file-writable-p)
-(defalias 'f-writable? 'file-writable-p)
-
-(defalias 'f-executable-p 'file-executable-p)
-(defalias 'f-executable? 'file-executable-p)
-
-(defalias 'f-absolute-p 'file-name-absolute-p)
-(defalias 'f-absolute? 'file-name-absolute-p)
-
-(defun f-relative-p (path)
-  "Return t if PATH is relative, false otherwise."
-  (not (f-absolute-p path)))
-
-(defalias 'f-relative? 'f-relative-p)
-
-(defun f-root-p (path)
-  "Return t if PATH is root directory, false otherwise."
-  (not (f-parent path)))
-
-(defalias 'f-root? 'f-root-p)
-
-(defun f-ext-p (path &optional ext)
-  "Return t if extension of PATH is EXT, false otherwise.
-
-If EXT is nil or omitted, return t if PATH has any extension,
-false otherwise.
-
-The extension, in a file name, is the part that follows the last
-'.', excluding version numbers and backup suffixes."
-  (if ext
-      (string= (f-ext path) ext)
-    (not (eq (f-ext path) nil))))
-
-(defalias 'f-ext? 'f-ext-p)
-
-(defalias 'f-equal-p 'f-same-p)
-(defalias 'f-equal? 'f-same-p)
-
-(defun f-same-p (path-a path-b)
-  "Return t if PATH-A and PATH-B are references to same file."
-  (equal
-   (f-canonical (directory-file-name (f-expand path-a)))
-   (f-canonical (directory-file-name (f-expand path-b)))))
-
-(defalias 'f-same? 'f-same-p)
-
-(defun f-parent-of-p (path-a path-b)
-  "Return t if PATH-A is parent of PATH-B."
-  (--when-let (f-parent path-b)
-    (f-same-p path-a it)))
-
-(defalias 'f-parent-of? 'f-parent-of-p)
-
-(defun f-child-of-p (path-a path-b)
-  "Return t if PATH-A is child of PATH-B."
-  (--when-let (f-parent path-a)
-    (f-same-p it path-b)))
-
-(defalias 'f-child-of? 'f-child-of-p)
-
-(defun f-ancestor-of-p (path-a path-b)
-  "Return t if PATH-A is ancestor of PATH-B."
-  (unless (f-same-p path-a path-b)
-    (string-prefix-p (f-full path-a)
-                     (f-full path-b))))
-
-(defalias 'f-ancestor-of? 'f-ancestor-of-p)
-
-(defun f-descendant-of-p (path-a path-b)
-  "Return t if PATH-A is desendant of PATH-B."
-  (unless (f-same-p path-a path-b)
-    (let ((path-a (f-split (f-full path-a)))
-          (path-b (f-split (f-full path-b)))
-          (parent-p t))
-      (while (and path-b parent-p)
-        (if (string= (car path-a) (car path-b))
-            (setq path-a (cdr path-a)
-                  path-b (cdr path-b))
-          (setq parent-p nil)))
-      parent-p)))
-
-(defalias 'f-descendant-of? 'f-descendant-of-p)
-
-(defun f-hidden-p (path &optional behavior)
-  "Return t if PATH is hidden, nil otherwise.
-
-BEHAVIOR controls when a path should be considered as hidden
-depending on its value.  Beware, if PATH begins with \"./\", the
-current dir \".\" will not be considered as hidden.
-
-When BEHAVIOR is nil, it will only check if the path begins with
-a dot, as in .a/b/c, and return t if there is one.  This is the
-old behavior of f.el left as default for backward-compatibility
-purposes.
-
-When BEHAVIOR is ANY, return t if any of the elements of PATH is
-hidden, nil otherwise.
-
-When BEHAVIOR is LAST, return t only if the last element of PATH
-is hidden, nil otherwise.
-
-TODO: Hidden directories and files on Windows are marked
-differently than on *NIX systems.  This should be properly
-implemented."
-  (let ((split-path (f-split path))
-        (check-hidden (lambda (elt)
-                        (and (string= (substring elt 0 1) ".")
-                             (not (member elt '("." "..")))))))
-    (pcase behavior
-      ('any  (-any check-hidden split-path))
-      ('last (apply check-hidden (last split-path)))
-      (otherwise (if (null otherwise)
-                     (funcall check-hidden (car split-path))
-                   (error "Invalid value %S for argument BEHAVIOR" otherwise))))))
-
-(defalias 'f-hidden? 'f-hidden-p)
-
-(defun f-empty-p (path)
-  "If PATH is a file, return t if the file in PATH is empty, nil otherwise.
-If PATH is directory, return t if directory has no files, nil otherwise."
-  (if (f-directory-p path)
-      (equal (f-files path nil t) nil)
-    (= (f-size path) 0)))
-
-(defalias 'f-empty? 'f-empty-p)
-
-
-;;;; Stats
-
-(defun f-size (path)
-  "Return size of PATH.
-
-If PATH is a file, return size of that file.  If PATH is
-directory, return sum of all files in PATH."
-  (if (f-directory-p path)
-      (-sum (-map 'f-size (f-files path nil t)))
-    (nth 7 (file-attributes path))))
-
-(defun f-depth (path)
-  "Return the depth of PATH.
-
-At first, PATH is expanded with `f-expand'.  Then the full path is used to
-detect the depth.
-'/' will be zero depth,  '/usr' will be one depth.  And so on."
-  (- (length (f-split (f-expand path))) 1))
-
-;; For Emacs 28 and below, forward-declare ‘current-time-list’, which was
-;; introduced in Emacs 29.
-(defvar current-time-list)
-
-(defun f--get-time (path timestamp-p fn)
-  "Helper function, get time-related information for PATH.
-Helper for `f-change-time', `f-modification-time',
-`f-access-time'.  It is meant to be called internally, avoid
-calling it manually unless you have to.
-
-If TIMESTAMP-P is non-nil, return the date requested as a
-timestamp.  If the value is \\='seconds, return the timestamp as
-a timestamp with a one-second precision.  Otherwise, the
-timestamp is returned in a (TICKS . HZ) format, see
-`current-time' if using Emacs 29 or newer.
-
-Otherwise, if TIMESTAMP-P is nil, return the default style of
-`current-time'.
-
-FN is the function specified by the caller function to retrieve
-the correct data from PATH."
-      (let* ((current-time-list (not timestamp-p))
-             (date (apply fn (list (file-attributes path))))
-             (emacs29-or-newer-p (version<= "29" emacs-version)))
-        (cond
-         ((and (eq timestamp-p 'seconds) emacs29-or-newer-p)
-          (/ (car date) (cdr date)))
-         ((or (and (not (eq timestamp-p 'seconds)) emacs29-or-newer-p)
-              (and (not timestamp-p) (not emacs29-or-newer-p)))
-          date)
-         ((and (eq timestamp-p 'seconds) (not emacs29-or-newer-p))
-          (+ (* (nth 0 date) (expt 2 16))
-             (nth 1 date)))
-         ((and timestamp-p (not emacs29-or-newer-p))
-          `(,(+ (* (nth 0 date) (expt 2 16) 1000)
-                (* (nth 1 date) 1000)
-                (nth 3 date))
-            . 1000)))))
-
-(defun f-change-time (path &optional timestamp-p)
-  "Return the last status change time of PATH.
-
-The status change time (ctime) of PATH in the same format as
-`current-time'.  For details on TIMESTAMP-P and the format of the
-returned value, see `f--get-time'."
-  (f--get-time path
-               timestamp-p
-               (if (fboundp 'file-attribute-status-change-time)
-                   #'file-attribute-status-change-time
-                 (lambda (f) (nth 6 f)))))
-
-(defun f-modification-time (path &optional timestamp-p)
-  "Return the last modification time of PATH.
-The modification time (mtime) of PATH in the same format as
-`current-time'.  For details on TIMESTAMP-P and the format of the
-returned value, see `f--get-time'."
-  (f--get-time path
-               timestamp-p
-               (if (fboundp 'file-attribute-modification-time)
-                   #'file-attribute-modification-time
-                 (lambda (f) (nth 5 f)))))
-
-(defun f-access-time (path &optional timestamp-p)
-  "Return the last access time of PATH.
-The access time (atime) of PATH is in the same format as
-`current-time'.  For details on TIMESTAMP-P and the format of the
-returned value, see `f--get-time'."
-  (f--get-time path
-               timestamp-p
-               (if (fboundp 'file-attribute-access-time)
-                   #'file-attribute-access-time
-                 (lambda (f) (nth 4 f)))))
-
-(defun f--three-way-compare (a b)
-  "Three way comparison.
-
-Return -1 if A < B.
-Return 0 if A = B.
-Return 1 if A > B."
-  (cond ((< a b) -1)
-        ((= a b) 0)
-        ((> a b) 1)))
-
-;; TODO: How to properly test this function?
-(defun f--date-compare (file other method)
-  "Three-way comparison of the date of FILE and OTHER.
-
-This function can return three values:
-* 1 means FILE is newer than OTHER
-* 0 means FILE and NEWER share the same date
-* -1 means FILE is older than OTHER
-
-The statistics used for the date comparison depends on METHOD.
-When METHOD is null, compare their modification time.  Otherwise,
-compare their change time when METHOD is \\='change, or compare
-their last access time when METHOD is \\='access."
-  (let* ((fn-method (cond
-                     ((eq 'change method) #'f-change-time)
-                     ((eq 'access method) #'f-access-time)
-                     ((null method)       #'f-modification-time)
-                     (t (error "Unknown method %S" method))))
-         (date-file (apply fn-method (list file)))
-         (date-other (apply fn-method (list other)))
-         (dates      (-zip-pair date-file date-other)))
-    (-reduce-from (lambda (acc elt)
-                    (if (= acc 0)
-                        (f--three-way-compare (car elt) (cdr elt))
-                      acc))
-                  0
-                  dates)))
-
-(defun f-older-p (file other &optional method)
-  "Compare if FILE is older than OTHER.
-
-For more info on METHOD, see `f--date-compare'."
-  (< (f--date-compare file other method) 0))
-
-(defalias 'f-older? #'f-older-p)
-
-(defun f-newer-p (file other &optional method)
-  "Compare if FILE is newer than OTHER.
-
-For more info on METHOD, see `f--date-compare'."
-  (> (f--date-compare file other method) 0))
-
-(defalias 'f-newer? #'f-newer-p)
-
-(defun f-same-time-p (file other &optional method)
-  "Check if FILE and OTHER share the same access or modification time.
-
-For more info on METHOD, see `f--date-compare'."
-  (= (f--date-compare file other method) 0))
-
-(defalias 'f-same-time? #'f-same-time-p)
-
-
-;;;; Misc
-
-(defun f-this-file ()
-  "Return path to this file."
-  (cond
-   (load-in-progress load-file-name)
-   ((and (boundp 'byte-compile-current-file) byte-compile-current-file)
-    byte-compile-current-file)
-   (:else (buffer-file-name))))
-
-(defvar f--path-separator nil
-  "A variable to cache result of `f-path-separator'.")
-
-(defun f-path-separator ()
-  "Return path separator."
-  (or f--path-separator
-      (setq f--path-separator (substring (f-join "x" "y") 1 2))))
-
-(defun f-glob (pattern &optional path)
-  "Find PATTERN in PATH."
-  (file-expand-wildcards
-   (f-join (or path default-directory) pattern)))
-
-(defun f--collect-entries (path recursive)
-  (let (result
-        (entries
-         (-reject
-          (lambda (file)
-            (member (f-filename file) '("." "..")))
-          (directory-files path t))))
-    (cond (recursive
-           (mapc
-            (lambda (entry)
-              (if (f-file-p entry)
-                  (setq result (cons entry result))
-                (when (f-directory-p entry)
-                  (setq result (cons entry result))
-                  (if (f-readable-p entry)
-                      (setq result (append result (f--collect-entries entry recursive)))
-                    result))))
-            entries))
-          (t (setq result entries)))
-    result))
-
-(defmacro f--entries (path body &optional recursive)
-  "Anaphoric version of `f-entries'."
-  `(f-entries
-    ,path
-    (lambda (path)
-      (let ((it path))
-        ,body))
-    ,recursive))
-
-(defun f-entries (path &optional fn recursive)
-  "Find all files and directories in PATH.
-
-FN - called for each found file and directory.  If FN returns a thruthy
-value, file or directory will be included.
-RECURSIVE - Search for files and directories recursive."
-  (let ((entries (f--collect-entries path recursive)))
-    (if fn (-select fn entries) entries)))
-
-(defmacro f--directories (path body &optional recursive)
-  "Anaphoric version of `f-directories'."
-  `(f-directories
-    ,path
-    (lambda (path)
-      (let ((it path))
-        ,body))
-    ,recursive))
-
-(defun f-directories (path &optional fn recursive)
-  "Find all directories in PATH.  See `f-entries'."
-  (let ((directories (-select 'f-directory-p (f--collect-entries path recursive))))
-    (if fn (-select fn directories) directories)))
-
-(defmacro f--files (path body &optional recursive)
-  "Anaphoric version of `f-files'."
-  `(f-files
-    ,path
-    (lambda (path)
-      (let ((it path))
-        ,body))
-    ,recursive))
-
-(defun f-files (path &optional fn recursive)
-  "Find all files in PATH.  See `f-entries'."
-  (let ((files (-select 'f-file-p (f--collect-entries path recursive))))
-    (if fn (-select fn files) files)))
-
-(defmacro f--traverse-upwards (body &optional path)
-  "Anaphoric version of `f-traverse-upwards'."
-  `(f-traverse-upwards
-    (lambda (dir)
-      (let ((it dir))
-        ,body))
-    ,path))
-
-(defun f-traverse-upwards (fn &optional path)
-  "Traverse up as long as FN return nil, starting at PATH.
-
-If FN returns a non-nil value, the path sent as argument to FN is
-returned.  If no function callback return a non-nil value, nil is
-returned."
-  (unless path
-    (setq path default-directory))
-  (when (f-relative-p path)
-    (setq path (f-expand path)))
-  (if (funcall fn path)
-      path
-    (unless (f-root-p path)
-      (f-traverse-upwards fn (f-parent path)))))
-
-(defun f-root ()
-  "Return absolute root."
-  (f-traverse-upwards 'f-root-p))
-
-(defmacro f-with-sandbox (path-or-paths &rest body)
-  "Only allow PATH-OR-PATHS and descendants to be modified in BODY."
-  (declare (indent 1))
-  `(let ((paths (if (listp ,path-or-paths)
-                    ,path-or-paths
-                  (list ,path-or-paths))))
-     (unwind-protect
-         (let ((f--guard-paths paths))
-           ,@body)
-       (setq f--guard-paths nil))))
-
-(provide 'f)
-
-;;; f.el ends here
diff --git a/emacs/elpa/f-20240308.906/f.elc b/emacs/elpa/f-20240308.906/f.elc
Binary files differ.
diff --git a/emacs/elpa/f-20240308.906/f-autoloads.el b/emacs/elpa/f-20241003.1131/f-autoloads.el
diff --git a/emacs/elpa/f-20241003.1131/f-pkg.el b/emacs/elpa/f-20241003.1131/f-pkg.el
@@ -0,0 +1,12 @@
+;; -*- no-byte-compile: t; lexical-binding: nil -*-
+(define-package "f" "20241003.1131"
+  "Modern API for working with files and directories."
+  '((emacs "24.1")
+    (s     "1.7.0")
+    (dash  "2.2.0"))
+  :url "https://github.com/rejeep/f.el"
+  :commit "931b6d0667fe03e7bf1c6c282d6d8d7006143c52"
+  :revdesc "931b6d0667fe"
+  :keywords '("files" "directories")
+  :authors '(("Johan Andersson" . "johan.rejeep@gmail.com"))
+  :maintainers '(("Lucien Cartier-Tilet" . "lucien@phundrak.com")))
diff --git a/emacs/elpa/f-20241003.1131/f-shortdoc.el b/emacs/elpa/f-20241003.1131/f-shortdoc.el
@@ -0,0 +1,437 @@
+;;; f-shortdoc.el --- Shortdoc for f.el -*- lexical-binding: t; no-byte-compile: t; -*-
+
+;; Author: Lucien Cartier-Tilet <lucien@phundrak.com>
+;; Maintainer: Lucien Cartier-Tilet <lucien@phundrak.com>
+;; Package-Requires: ((emacs "28.1"))
+;; Homepage: https://github.com/rejeep/f.el
+
+;; This file is not part of GNU Emacs
+
+;; This program is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+
+;;; Commentary:
+
+;; Shortdoc implementation for f.el
+
+;;; Code:
+
+(when (version<= "28.1" emacs-version)
+  (require 'shortdoc)
+
+  (define-short-documentation-group f
+    "Paths"
+    (f-join
+     :eval (f-join "path")
+     :eval (f-join "path" "to")
+     :eval (f-join "/" "path" "to" "heaven")
+     :eval (f-join "path" "/to" "file"))
+
+    (f-split
+     :eval (f-split "path")
+     :eval (f-split "path/to")
+     :eval (f-split "/path/to/heaven")
+     :eval (f-split "~/back/to/earth"))
+
+    (f-expand
+     :no-eval (f-expand "name")
+     :result-string "/default/directory/name"
+     :no-eval (f-expand "name" "other/directory")
+     :result-string "other/directory/name")
+
+    (f-filename
+     :eval (f-filename "path/to/file.ext")
+     :eval (f-filename "path/to/directory"))
+
+    (f-dirname
+     :eval (f-dirname "path/to/file.ext")
+     :eval (f-dirname "path/to/directory")
+     :eval (f-dirname "/"))
+
+    (f-common-parent
+     :eval (f-common-parent '("foo/bar/baz" "foo/bar/qux" "foo/bar/mux"))
+     :eval (f-common-parent '("/foo/bar/baz" "/foo/bar/qux" "/foo/bax/mux"))
+     :eval (f-common-parent '("foo/bar/baz" "quack/bar/qux" "lack/bar/mux")))
+
+    (f-ext
+     :eval (f-ext "path/to/file")
+     :eval (f-ext "path/to/file.txt")
+     :eval (f-ext "path/to/file.txt.org"))
+
+    (f-no-ext
+     :eval (f-no-ext "path/to/file")
+     :eval (f-no-ext "path/to/file.txt")
+     :eval (f-no-ext "path/to/file.txt.org"))
+
+    (f-swap-ext
+     :eval (f-swap-ext "path/to/file.ext" "org"))
+
+    (f-base
+     :eval (f-base "path/to/file.ext")
+     :eval (f-base "path/to/directory"))
+
+    (f-relative
+     :eval (f-relative "/some/path/relative/to/my/file.txt" "/some/path/")
+     :eval (f-relative "/default/directory/my/file.txt"))
+
+    (f-short
+     :no-eval (f-short "/Users/foo/Code/on/macOS")
+     :result-string "~/Code/on/macOS"
+     :no-eval (f-short "/home/foo/Code/on/linux")
+     :result-string "~/Code/on/linux"
+     :eval (f-short "/path/to/Code/bar"))
+
+    (f-long
+     :eval (f-long "~/Code/bar")
+     :eval (f-long "/path/to/Code/bar"))
+
+    (f-canonical
+     :eval (f-canonical "/path/to/real/file")
+     :no-eval (f-canonical "/link/to/file")
+     :result-string "/path/to/real/file")
+
+    (f-slash
+     :no-eval (f-slash "/path/to/file")
+     :result-string "/path/to/file"
+     :no-eval (f-slash "/path/to/dir")
+     :result-string "/path/to/dir/"
+     :no-eval (f-slash "/path/to/dir/")
+     :result-string "/path/to/dir/")
+
+    (f-full
+     :eval (f-full "~/path/to/file")
+     :eval (f-full "~/path/to/dir")
+     :eval (f-full "~/path/to/dir/"))
+
+    (f-uniquify
+     :eval (f-uniquify '("/foo/bar" "/foo/baz" "/foo/quux"))
+     :eval (f-uniquify '("/foo/bar" "/www/bar" "/foo/quux"))
+     :eval (f-uniquify '("/foo/bar" "/www/bar" "/www/bar/quux"))
+     :eval (f-uniquify '("/foo/bar" "/foo/baz" "/home/www/bar" "/home/www/baz" "/var/foo" "/opt/foo/www/baz")))
+
+    (f-uniquify-alist
+     :eval (f-uniquify-alist '("/foo/bar" "/foo/baz" "/foo/quux"))
+     :eval (f-uniquify-alist '("/foo/bar" "/www/bar" "/foo/quux"))
+     :eval (f-uniquify-alist '("/foo/bar" "/www/bar" "/www/bar/quux"))
+     :eval (f-uniquify-alist '("/foo/bar" "/foo/baz" "/home/www/bar" "/home/www/baz" "/var/foo" "/opt/foo/www/baz")))
+
+    "I/O"
+    (f-read-bytes
+     :no-eval* (f-read-bytes "path/to/binary/data"))
+
+    (f-write-bytes
+     :no-eval* (f-write-bytes (unibyte-string 72 101 108 108 111 32 119 111 114 108 100) "path/to/binary/data"))
+
+    (f-append-bytes
+     :no-eval* (f-append-bytes "path/to/file" (unibyte-string 72 101 108 108 111 32 119 111 114 108 100)))
+
+    (f-read-text
+     :no-eval* (f-read-text "path/to/file.txt" 'utf-8)
+     :no-eval* (f-read "path/to/file.txt" 'utf-8))
+
+    (f-write-text
+     :no-eval* (f-write-text "Hello world" 'utf-8 "path/to/file.txt")
+     :no-eval* (f-write "Hello world" 'utf-8 "path/to/file.txt"))
+
+    (f-append-text
+     :no-eval* (f-append-text "Hello world" 'utf-8 "path/to/file.txt")
+     :no-eval* (f-append "Hello world" 'utf-8 "path/to/file.txt"))
+
+    "Destructive"
+    (f-mkdir
+     :no-eval (f-mkdir "dir")
+     :result-string "creates /default/directory/dir"
+     :no-eval (f-mkdir "other" "dir")
+     :result-string "creates /default/directory/other/dir"
+     :no-eval (f-mkdir "/" "some" "path")
+     :result-string "creates /some/path"
+     :no-eval (f-mkdir "~" "yet" "another" "dir")
+     :result-string "creates ~/yet/another/dir")
+
+    (f-mkdir-full-path
+     :no-eval (f-mkdir-full-path "dir")
+     :result-string "creates /default/directory/dir"
+     :no-eval (f-mkdir-full-path "other/dir")
+     :result-string "creates /default/directory/other/dir"
+     :no-eval (f-mkdir-full-path "/some/path")
+     :result-string "creates /some/path"
+     :no-eval (f-mkdir-full-path "~/yet/another/dir")
+     :result-string "creates ~/yet/another/dir")
+
+    (f-delete
+     :no-eval* (f-delete "dir")
+     :no-eval* (f-delete "other/dir" t)
+     :no-eval* (f-delete "path/to/file.txt"))
+
+    (f-symlink
+     :no-eval* (f-symlink "path/to/source" "path/to/link"))
+
+    (f-move
+     :no-eval* (f-move "path/to/file.txt" "new-file.txt")
+     :no-eval* (f-move "path/to/file.txt" "other/path"))
+
+    (f-copy
+     :no-eval* (f-copy "path/to/file.txt" "new-file.txt")
+     :no-eval* (f-copy "path/to/dir" "other/dir"))
+
+    (f-copy-contents
+     :no-eval* (f-copy-contents "path/to/dir" "path/to/other/dir"))
+
+    (f-touch
+     :no-eval* (f-touch "path/to/existing/file.txt")
+     :no-eval* (f-touch "path/to/non/existing/file.txt"))
+
+    "Predicates"
+    (f-exists-p
+     :no-eval* (f-exists-p "path/to/file.txt")
+     :no-eval* (f-exists-p "path/to/dir"))
+
+    (f-directory-p
+     :no-eval* (f-directory-p "path/to/file.txt")
+     :no-eval* (f-directory-p "path/to/dir"))
+
+    (f-file-p
+     :no-eval* (f-file-p "path/to/file.txt")
+     :no-eval* (f-file-p "path/to/dir"))
+
+    (f-symlink-p
+     :no-eval* (f-symlink-p "path/to/file.txt")
+     :no-eval* (f-symlink-p "path/to/dir")
+     :no-eval* (f-symlink-p "path/to/link"))
+
+    (f-readable-p
+     :no-eval* (f-readable-p "path/to/file.txt")
+     :no-eval* (f-readable-p "path/to/dir"))
+
+    (f-writable-p
+     :no-eval* (f-writable-p "path/to/file.txt")
+     :no-eval* (f-writable-p "path/to/dir"))
+
+    (f-executable-p
+     :no-eval* (f-executable-p "path/to/file.txt")
+     :no-eval* (f-executable-p "path/to/dir"))
+
+    (f-absolute-p
+     :eval (f-absolute-p "path/to/dir")
+     :eval (f-absolute-p "/full/path/to/dir"))
+
+    (f-relative-p
+     :eval (f-relative-p "path/to/dir")
+     :eval (f-relative-p "/full/path/to/dir"))
+
+    (f-root-p
+     :eval (f-root-p "/")
+     :eval (f-root-p "/not/root"))
+
+    (f-ext-p
+     :eval (f-ext-p "path/to/file.el" "el")
+     :eval (f-ext-p "path/to/file.el" "txt")
+     :eval (f-ext-p "path/to/file.el")
+     :eval (f-ext-p "path/to/file"))
+
+    (f-same-p
+     :eval (f-same-p "foo.txt" "foo.txt")
+     :eval (f-same-p "foo/bar/../baz" "foo/baz")
+     :eval (f-same-p "/path/to/foo.txt" "/path/to/bar.txt"))
+
+    (f-parent-of-p
+     :no-eval (f-parent-of-p "/path/to" "/path/to/dir")
+     :result t
+     :no-eval (f-parent-of-p "/path/to/dir" "/path/to")
+     :result nil
+     :no-eval (f-parent-of-p "/path/to" "/path/to")
+     :result nil)
+
+    (f-child-of-p
+     :no-eval (f-child-of-p "/path/to" "/path/to/dir")
+     :result nil
+     :no-eval (f-child-of-p "/path/to/dir" "/path/to")
+     :result t
+     :no-eval (f-child-of-p "/path/to" "/path/to")
+     :result nil)
+
+    (f-ancestor-of-p
+     :no-eval (f-ancestor-of-p "/path/to" "/path/to/dir")
+     :result t
+     :no-eval (f-ancestor-of-p "/path" "/path/to/dir")
+     :result t
+     :no-eval (f-ancestor-of-p "/path/to/dir" "/path/to")
+     :result nil
+     :no-eval (f-ancestor-of-p "/path/to" "/path/to")
+     :result nil)
+
+    (f-descendant-of-p
+     :no-eval (f-descendant-of-p "/path/to/dir" "/path/to")
+     :result t
+     :no-eval (f-descendant-of-p "/path/to/dir" "/path")
+     :result t
+     :no-eval (f-descendant-of-p "/path/to" "/path/to/dir")
+     :result nil
+     :no-eval (f-descendant-of-p "/path/to" "/path/to")
+     :result nil)
+
+    (f-hidden-p
+     :eval (f-hidden-p "path/to/foo")
+     :eval (f-hidden-p ".path/to/foo")
+     :eval (f-hidden-p "path/.to/foo")
+     :eval (f-hidden-p "path/to/.foo")
+     :eval (f-hidden-p ".path/to/foo" 'any)
+     :eval (f-hidden-p "path/.to/foo" 'any)
+     :eval (f-hidden-p "path/to/.foo" 'any)
+     :eval (f-hidden-p ".path/to/foo" 'last)
+     :eval (f-hidden-p "path/.to/foo" 'last)
+     :eval (f-hidden-p "path/to/.foo" 'last))
+
+    (f-empty-p
+     :no-eval (f-empty-p "/path/to/empty-file")
+     :result t
+     :no-eval (f-empty-p "/path/to/file-with-contents")
+     :result nil
+     :no-eval (f-empty-p "/path/to/empty-dir/")
+     :result t
+     :no-eval (f-empty-p "/path/to/dir-with-contents/")
+     :result nil)
+
+    (f-older-p
+     :no-eval (f-older-p "older-file.txt" "newer-file.txt")
+     :result t
+     :no-eval (f-older-p "newer-file.txt" "older-file.txt")
+     :result nil
+     :no-eval (f-older-p "same-time1.txt" "same-time2.txt")
+     :result nil)
+
+    (f-newer-p
+     :no-eval (f-newer-p "newer-file.txt" "older-file.txt")
+     :result t
+     :no-eval (f-newer-p "older-file.txt" "newer-file.txt")
+     :result nil
+     :no-eval (f-newer-p "same-time1.txt" "same-time2.txt")
+     :result nil)
+
+    (f-same-time-p
+     :no-eval (f-same-time-p "same-time1.txt" "same-time2.txt")
+     :result t
+     :no-eval (f-same-time-p "newer-file.txt" "older-file.txt")
+     :result nil
+     :no-eval (f-same-time-p "older-file.txt" "newer-file.txt")
+     :result nil)
+
+    "Stats"
+    (f-size
+     :no-eval* (f-size "path/to/file.txt")
+     :no-eval* (f-size "path/to/dir"))
+
+    (f-depth
+     :eval (f-depth "/")
+     :eval (f-depth "/var/")
+     :eval (f-depth "/usr/local/bin"))
+
+    (f-change-time
+     :no-eval (f-change-time "path/to/file.txt")
+     :result (25517 48756 26337 111000)
+     :no-eval (f-change-time "path/to/dir")
+     :result (25517 57887 344657 210000)
+     :no-eval (f-change-time "path/to/file.txt" t)
+     :result (1672330868026337111 . 1000000000)
+     :no-eval (f-change-time "path/to/dir" t)
+     :result (1672339999344657210 . 1000000000)
+     :no-eval (f-change-time "path/to/file.txt" 'seconds)
+     :result 1672330868
+     :no-eval (f-change-time "path/to/dir" 'seconds)
+     :result 1672339999)
+
+    (f-modification-time
+     :no-eval (f-modification-time "path/to/file.txt")
+     :result (25517 48756 26337 111000)
+     :no-eval (f-modification-time "path/to/dir")
+     :result (25517 57887 344657 210000)
+     :no-eval (f-modification-time "path/to/file.txt" t)
+     :result (1672330868026337111 . 1000000000)
+     :no-eval (f-modification-time "path/to/dir" t)
+     :result (1672339999344657210 . 1000000000)
+     :no-eval (f-modification-time "path/to/file.txt" 'seconds)
+     :result 1672330868
+     :no-eval (f-modification-time "path/to/dir" 'seconds)
+     :result 1672339999)
+
+    (f-access-time
+     :no-eval (f-access-time "path/to/file.txt")
+     :result (25517 48756 26337 111000)
+     :no-eval (f-access-time "path/to/dir")
+     :result (25517 57887 344657 210000)
+     :no-eval (f-access-time "path/to/file.txt" t)
+     :result (1672330868026337111 . 1000000000)
+     :no-eval (f-access-time "path/to/dir" t)
+     :result (1672339999344657210 . 1000000000)
+     :no-eval (f-access-time "path/to/file.txt" 'seconds)
+     :result 1672330868
+     :no-eval (f-access-time "path/to/dir" 'seconds)
+     :result 1672339999)
+
+    "Misc"
+    (f-this-file
+     :no-eval* (f-this-file))
+
+    (f-path-separator
+     :eval (f-path-separator))
+
+    (f-glob
+     :no-eval* (f-glob "path/to/*.el")
+     :no-eval* (f-glob "*.el" "path/to"))
+
+    (f-entries
+     :no-eval* (f-entries "path/to/dir")
+     :no-eval* (f-entries "path/to/dir" (lambda (file) (s-matches? "test" file)))
+     :no-eval* (f-entries "path/to/dir" nil t)
+     :no-eval* (f--entries "path/to/dir" (s-matches? "test" it)))
+
+    (f-directories
+     :no-eval* (f-directories "path/to/dir")
+     :no-eval* (f-directories "path/to/dir" (lambda (dir) (equal (f-filename dir) "test")))
+     :no-eval* (f-directories "path/to/dir" nil t)
+     :no-eval* (f--directories "path/to/dir" (equal (f-filename it) "test")))
+
+    (f-files
+     :no-eval* (f-files "path/to/dir")
+     :no-eval* (f-files "path/to/dir" (lambda (file) (equal (f-ext file) "el")))
+     :no-eval* (f-files "path/to/dir" nil t)
+     :no-eval* (f--files "path/to/dir" (equal (f-ext it) "el")))
+
+    (f-root
+     :eval (f-root))
+
+    (f-traverse-upwards
+     :no-eval* (f-traverse-upwards
+                (lambda (path)
+                  (f-exists? (f-expand ".git" path)))
+                start-path)
+
+     :no-eval* (f--traverse-upwards (f-exists? (f-expand ".git" it)) start-path))
+
+    (f-with-sandbox
+     :no-eval (f-with-sandbox foo-path
+                (f-touch (f-expand "foo" foo-path)))
+     :no-eval (f-with-sandbox (list foo-path bar-path)
+                (f-touch (f-expand "foo" foo-path))
+                (f-touch (f-expand "bar" bar-path)))
+     :no-eval (f-with-sandbox foo-path
+                (f-touch (f-expand "bar" bar-path)))))) ;; "Destructive operation outside sandbox"
+
+(eval-when-compile
+  (when (version< emacs-version "28.1")
+    (warn "Emacs should not be compiling this file")))
+
+(provide 'f-shortdoc)
+
+;;; f-shortdoc.el ends here
diff --git a/emacs/elpa/f-20241003.1131/f.el b/emacs/elpa/f-20241003.1131/f.el
@@ -0,0 +1,800 @@
+;;; f.el --- Modern API for working with files and directories -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2013 Johan Andersson
+
+;; Author: Johan Andersson <johan.rejeep@gmail.com>
+;; Maintainer: Lucien Cartier-Tilet <lucien@phundrak.com>
+;; Package-Version: 20241003.1131
+;; Package-Revision: 931b6d0667fe
+;; Package-Requires: ((emacs "24.1") (s "1.7.0") (dash "2.2.0"))
+;; Keywords: files, directories
+;; Homepage: http://github.com/rejeep/f.el
+
+;; This file is NOT part of GNU Emacs.
+
+;;; License:
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 3, or (at your option)
+;; any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Much inspired by magnar's excellent s.el and dash.el, f.el is a
+;; modern API for working with files and directories in Emacs.
+
+;;; Code:
+
+
+
+(require 's)
+(require 'dash)
+(when (version<= "28.1" emacs-version)
+  (when (< emacs-major-version 29)
+   (require 'f-shortdoc nil t)))
+
+(put 'f-guard-error 'error-conditions '(error f-guard-error))
+(put 'f-guard-error 'error-message "Destructive operation outside sandbox")
+
+(defvar f--guard-paths nil
+  "List of allowed paths to modify when guarded.
+
+Do not modify this variable.")
+
+(defmacro f--destructive (path &rest body)
+  "If PATH is allowed to be modified, yield BODY.
+
+If PATH is not allowed to be modified, throw error."
+  (declare (indent 1))
+  `(if f--guard-paths
+       (if (--any? (or (f-same-p it ,path)
+                       (f-ancestor-of-p it ,path)) f--guard-paths)
+           (progn ,@body)
+         (signal 'f-guard-error (list ,path f--guard-paths)))
+     ,@body))
+
+
+;;;; Paths
+
+(defun f-join (&rest args)
+  "Join ARGS to a single path.
+
+Be aware if one of the arguments is an absolute path, `f-join'
+will discard all the preceeding arguments and make this absolute
+path the new root of the generated path."
+  (let (path
+        (relative (f-relative-p (car args))))
+    (mapc
+     (lambda (arg)
+       (setq path (cond ((not path) arg)
+                        ((f-absolute-p arg)
+                         (progn
+                           (setq relative nil)
+                           arg))
+                        (t (f-expand arg path)))))
+     args)
+    (if relative (f-relative path) path)))
+
+(defun f-split (path)
+  "Split PATH and return list containing parts."
+  (let ((parts (split-string path (f-path-separator) 'omit-nulls)))
+    (if (string= (s-left 1 path) (f-path-separator))
+        (push (f-path-separator) parts)
+      parts)))
+
+(defun f-expand (path &optional dir)
+  "Expand PATH relative to DIR (or `default-directory').
+PATH and DIR can be either a directory names or directory file
+names.  Return a directory name if PATH is a directory name, and
+a directory file name otherwise.  File name handlers are
+ignored."
+  (let (file-name-handler-alist)
+    (expand-file-name path dir)))
+
+(defun f-filename (path)
+  "Return the name of PATH."
+  (file-name-nondirectory (directory-file-name path)))
+
+(defalias 'f-parent 'f-dirname)
+
+(defun f-dirname (path)
+  "Return the parent directory to PATH."
+  (let ((parent (file-name-directory
+                 (directory-file-name (f-expand path default-directory)))))
+    (unless (f-same-p path parent)
+      (if (f-relative-p path)
+          (f-relative parent)
+        (directory-file-name parent)))))
+
+(defun f-common-parent (paths)
+  "Return the deepest common parent directory of PATHS."
+  (cond
+   ((not paths) nil)
+   ((not (cdr paths)) (f-parent (car paths)))
+   (:otherwise
+    (let* ((paths (-map 'f-split paths))
+           (common (caar paths))
+           (re nil))
+      (while (and (not (null (car paths))) (--all? (equal (car it) common) paths))
+        (setq paths (-map 'cdr paths))
+        (push common re)
+        (setq common (caar paths)))
+      (cond
+       ((null re) "")
+       ((and (= (length re) 1) (f-root-p (car re)))
+        (f-root))
+       (:otherwise
+        (concat (apply 'f-join (nreverse re)) "/")))))))
+
+(defalias 'f-ext 'file-name-extension)
+
+(defalias 'f-no-ext 'file-name-sans-extension)
+
+(defun f-swap-ext (path ext)
+  "Return PATH but with EXT as the new extension.
+EXT must not be nil or empty."
+  (if (s-blank-p ext)
+      (error "Extension cannot be empty or nil")
+    (concat (f-no-ext path) "." ext)))
+
+(defun f-base (path)
+  "Return the name of PATH, excluding the extension of file."
+  (f-no-ext (f-filename path)))
+
+(defalias 'f-relative 'file-relative-name)
+
+(defalias 'f-short 'abbreviate-file-name)
+(defalias 'f-abbrev 'abbreviate-file-name)
+
+(defun f-long (path)
+  "Return long version of PATH."
+  (f-expand path))
+
+(defalias 'f-canonical 'file-truename)
+
+(defun f-slash (path)
+  "Append slash to PATH unless one already.
+
+Some functions, such as `call-process' requires there to be an
+ending slash."
+  (if (f-dir-p path)
+      (file-name-as-directory path)
+    path))
+
+(defun f-full (path)
+  "Return absolute path to PATH, with ending slash."
+  (f-slash (f-long path)))
+
+(defun f--uniquify (paths)
+  "Helper for `f-uniquify' and `f-uniquify-alist'."
+  (let* ((files-length (length paths))
+         (uniq-filenames (--map (cons it (f-filename it)) paths))
+         (uniq-filenames-next (-group-by 'cdr uniq-filenames)))
+    (while (/= files-length (length uniq-filenames-next))
+      (setq uniq-filenames-next
+            (-group-by 'cdr
+                       (--mapcat
+                        (let ((conf-files (cdr it)))
+                          (if (> (length conf-files) 1)
+                              (--map (cons
+                                      (car it)
+                                      (concat
+                                       (f-filename (s-chop-suffix (cdr it)
+                                                                  (car it)))
+                                       (f-path-separator) (cdr it)))
+                                     conf-files)
+                            conf-files))
+                        uniq-filenames-next))))
+    uniq-filenames-next))
+
+(defun f-uniquify (files)
+  "Return unique suffixes of FILES.
+
+This function expects no duplicate paths."
+  (-map 'car (f--uniquify files)))
+
+(defun f-uniquify-alist (files)
+  "Return alist mapping FILES to unique suffixes of FILES.
+
+This function expects no duplicate paths."
+  (-map 'cadr (f--uniquify files)))
+
+
+;;;; I/O
+
+(defun f-read-bytes (path &optional beg end)
+  "Read binary data from PATH.
+
+Return the binary data as unibyte string.  The optional second
+and third arguments BEG and END specify what portion of the file
+to read."
+  (with-temp-buffer
+    (set-buffer-multibyte nil)
+    (setq buffer-file-coding-system 'binary)
+    (insert-file-contents-literally path nil beg end)
+    (buffer-substring-no-properties (point-min) (point-max))))
+
+(defalias 'f-read 'f-read-text)
+(defun f-read-text (path &optional coding)
+  "Read text with PATH, using CODING.
+
+CODING defaults to `utf-8'.
+
+Return the decoded text as multibyte string."
+  (decode-coding-string (f-read-bytes path) (or coding 'utf-8)))
+
+(defalias 'f-write 'f-write-text)
+(defun f-write-text (text coding path)
+  "Write TEXT with CODING to PATH.
+
+TEXT is a multibyte string.  CODING is a coding system to encode
+TEXT with.  PATH is a file name to write to."
+  (f-write-bytes (encode-coding-string text coding) path))
+
+(defun f-unibyte-string-p (s)
+  "Determine whether S is a unibyte string."
+  (not (multibyte-string-p s)))
+
+(defun f-write-bytes (data path)
+  "Write binary DATA to PATH.
+
+DATA is a unibyte string.  PATH is a file name to write to."
+  (f--write-bytes data path nil))
+
+(defalias 'f-append 'f-append-text)
+(defun f-append-text (text coding path)
+  "Append TEXT with CODING to PATH.
+
+If PATH does not exist, it is created."
+  (f-append-bytes (encode-coding-string text coding) path))
+
+(defun f-append-bytes (data path)
+  "Append binary DATA to PATH.
+
+If PATH does not exist, it is created."
+  (f--write-bytes data path :append))
+
+(defun f--write-bytes (data filename append)
+  "Write binary DATA to FILENAME.
+If APPEND is non-nil, append the DATA to the existing contents."
+  (f--destructive filename
+    (unless (f-unibyte-string-p data)
+      (signal 'wrong-type-argument (list 'f-unibyte-string-p data)))
+    (let ((coding-system-for-write 'binary)
+          (write-region-annotate-functions nil)
+          (write-region-post-annotation-function nil))
+      (write-region data nil filename append :silent)
+      nil)))
+
+
+;;;; Destructive
+
+(defun f-mkdir (&rest dirs)
+  "Create directories DIRS.
+
+DIRS should be a successive list of directories forming together
+a full path.  The easiest way to call this function with a fully
+formed path is using `f-split' alongside it:
+
+    (apply #\\='f-mkdir (f-split \"path/to/file\"))
+
+Although it works sometimes, it is not recommended to use fully
+formed paths in the function. In this case, it is recommended to
+use `f-mkdir-full-path' instead."
+  (let (path)
+    (-each
+        dirs
+      (lambda (dir)
+        (setq path (f-expand dir path))
+        (unless (f-directory-p path)
+          (f--destructive path (make-directory path)))))))
+
+(defun f-mkdir-full-path (dir)
+  "Create DIR from a full path.
+
+This function is similar to `f-mkdir' except it can accept a full
+path instead of requiring several successive directory names."
+  (apply #'f-mkdir (f-split dir)))
+
+(defun f-delete (path &optional force)
+  "Delete PATH, which can be file or directory.
+
+If FORCE is t, a directory will be deleted recursively."
+  (f--destructive path
+    (if (or (f-file-p path) (f-symlink-p path))
+        (delete-file path)
+      (delete-directory path force))))
+
+(defun f-symlink (source path)
+  "Create a symlink to SOURCE from PATH."
+  (f--destructive path (make-symbolic-link source path)))
+
+(defun f-move (from to)
+  "Move or rename FROM to TO.
+If TO is a directory name, move FROM into TO."
+  (f--destructive to (rename-file from to t)))
+
+(defun f-copy (from to)
+  "Copy file or directory FROM to TO.
+If FROM names a directory and TO is a directory name, copy FROM
+into TO as a subdirectory."
+  (f--destructive to
+    (if (f-file-p from)
+        (copy-file from to)
+      ;; The behavior of `copy-directory' differs between Emacs 23 and
+      ;; 24 in that in Emacs 23, the contents of `from' is copied to
+      ;; `to', while in Emacs 24 the directory `from' is copied to
+      ;; `to'. We want the Emacs 24 behavior.
+      (if (> emacs-major-version 23)
+          (copy-directory from to)
+        (if (f-dir-p to)
+            (progn
+              (apply 'f-mkdir (f-split to))
+              (let ((new-to (f-expand (f-filename from) to)))
+                (copy-directory from new-to)))
+          (copy-directory from to))))))
+
+(defun f-copy-contents (from to)
+  "Copy contents in directory FROM, to directory TO."
+  (unless (f-exists-p to)
+    (error "Cannot copy contents to non existing directory %s" to))
+  (unless (f-dir-p from)
+    (error "Cannot copy contents as %s is a file" from))
+  (--each (f-entries from)
+    (f-copy it (file-name-as-directory to))))
+
+(defun f-touch (path)
+  "Update PATH last modification date or create if it does not exist."
+  (f--destructive path
+    (if (f-file-p path)
+        (set-file-times path)
+      (f-write-bytes "" path))))
+
+
+;;;; Predicates
+
+(defalias 'f-exists-p 'file-exists-p)
+(defalias 'f-exists? 'file-exists-p)
+
+(defalias 'f-directory-p 'file-directory-p)
+(defalias 'f-directory? 'file-directory-p)
+(defalias 'f-dir-p 'file-directory-p)
+(defalias 'f-dir? 'file-directory-p)
+
+
+(defalias 'f-file-p 'file-regular-p)
+(defalias 'f-file? 'file-regular-p)
+
+(defun f-symlink-p (path)
+  "Return t if PATH is symlink, false otherwise."
+  (not (not (file-symlink-p path))))
+
+(defalias 'f-symlink? 'f-symlink-p)
+
+(defalias 'f-readable-p 'file-readable-p)
+(defalias 'f-readable? 'file-readable-p)
+
+(defalias 'f-writable-p 'file-writable-p)
+(defalias 'f-writable? 'file-writable-p)
+
+(defalias 'f-executable-p 'file-executable-p)
+(defalias 'f-executable? 'file-executable-p)
+
+(defalias 'f-absolute-p 'file-name-absolute-p)
+(defalias 'f-absolute? 'file-name-absolute-p)
+
+(defun f-relative-p (path)
+  "Return t if PATH is relative, false otherwise."
+  (not (f-absolute-p path)))
+
+(defalias 'f-relative? 'f-relative-p)
+
+(defun f-root-p (path)
+  "Return t if PATH is root directory, false otherwise."
+  (not (f-parent path)))
+
+(defalias 'f-root? 'f-root-p)
+
+(defun f-ext-p (path &optional ext)
+  "Return t if extension of PATH is EXT, false otherwise.
+
+If EXT is nil or omitted, return t if PATH has any extension,
+false otherwise.
+
+The extension, in a file name, is the part that follows the last
+'.', excluding version numbers and backup suffixes."
+  (if ext
+      (string= (f-ext path) ext)
+    (not (eq (f-ext path) nil))))
+
+(defalias 'f-ext? 'f-ext-p)
+
+(defalias 'f-equal-p 'f-same-p)
+(defalias 'f-equal? 'f-same-p)
+
+(defun f-same-p (path-a path-b)
+  "Return t if PATH-A and PATH-B are references to same file."
+  (equal
+   (f-canonical (directory-file-name (f-expand path-a)))
+   (f-canonical (directory-file-name (f-expand path-b)))))
+
+(defalias 'f-same? 'f-same-p)
+
+(defun f-parent-of-p (path-a path-b)
+  "Return t if PATH-A is parent of PATH-B."
+  (--when-let (f-parent path-b)
+    (f-same-p path-a it)))
+
+(defalias 'f-parent-of? 'f-parent-of-p)
+
+(defun f-child-of-p (path-a path-b)
+  "Return t if PATH-A is child of PATH-B."
+  (--when-let (f-parent path-a)
+    (f-same-p it path-b)))
+
+(defalias 'f-child-of? 'f-child-of-p)
+
+(defun f-ancestor-of-p (path-a path-b)
+  "Return t if PATH-A is ancestor of PATH-B."
+  (unless (f-same-p path-a path-b)
+    (string-prefix-p (f-full path-a)
+                     (f-full path-b))))
+
+(defalias 'f-ancestor-of? 'f-ancestor-of-p)
+
+(defun f-descendant-of-p (path-a path-b)
+  "Return t if PATH-A is desendant of PATH-B."
+  (unless (f-same-p path-a path-b)
+    (let ((path-a (f-split (f-full path-a)))
+          (path-b (f-split (f-full path-b)))
+          (parent-p t))
+      (while (and path-b parent-p)
+        (if (string= (car path-a) (car path-b))
+            (setq path-a (cdr path-a)
+                  path-b (cdr path-b))
+          (setq parent-p nil)))
+      parent-p)))
+
+(defalias 'f-descendant-of? 'f-descendant-of-p)
+
+(defun f-hidden-p (path &optional behavior)
+  "Return t if PATH is hidden, nil otherwise.
+
+BEHAVIOR controls when a path should be considered as hidden
+depending on its value.  Beware, if PATH begins with \"./\", the
+current dir \".\" will not be considered as hidden.
+
+When BEHAVIOR is nil, it will only check if the path begins with
+a dot, as in .a/b/c, and return t if there is one.  This is the
+old behavior of f.el left as default for backward-compatibility
+purposes.
+
+When BEHAVIOR is ANY, return t if any of the elements of PATH is
+hidden, nil otherwise.
+
+When BEHAVIOR is LAST, return t only if the last element of PATH
+is hidden, nil otherwise.
+
+TODO: Hidden directories and files on Windows are marked
+differently than on *NIX systems.  This should be properly
+implemented."
+  (let ((split-path (f-split path))
+        (check-hidden (lambda (elt)
+                        (and (string= (substring elt 0 1) ".")
+                             (not (member elt '("." "..")))))))
+    (pcase behavior
+      ('any  (-any check-hidden split-path))
+      ('last (apply check-hidden (last split-path)))
+      (otherwise (if (null otherwise)
+                     (funcall check-hidden (car split-path))
+                   (error "Invalid value %S for argument BEHAVIOR" otherwise))))))
+
+(defalias 'f-hidden? 'f-hidden-p)
+
+(defun f-empty-p (path)
+  "If PATH is a file, return t if the file in PATH is empty, nil otherwise.
+If PATH is directory, return t if directory has no files, nil otherwise."
+  (if (f-directory-p path)
+      (equal (f-files path nil t) nil)
+    (= (f-size path) 0)))
+
+(defalias 'f-empty? 'f-empty-p)
+
+
+;;;; Stats
+
+(defun f-size (path)
+  "Return size of PATH.
+
+If PATH is a file, return size of that file.  If PATH is
+directory, return sum of all files in PATH."
+  (if (f-directory-p path)
+      (-sum (-map 'f-size (f-files path nil t)))
+    (nth 7 (file-attributes path))))
+
+(defun f-depth (path)
+  "Return the depth of PATH.
+
+At first, PATH is expanded with `f-expand'.  Then the full path is used to
+detect the depth.
+'/' will be zero depth,  '/usr' will be one depth.  And so on."
+  (- (length (f-split (f-expand path))) 1))
+
+;; For Emacs 28 and below, forward-declare ‘current-time-list’, which was
+;; introduced in Emacs 29.
+(defvar current-time-list)
+
+(defun f--get-time (path timestamp-p fn)
+  "Helper function, get time-related information for PATH.
+Helper for `f-change-time', `f-modification-time',
+`f-access-time'.  It is meant to be called internally, avoid
+calling it manually unless you have to.
+
+If TIMESTAMP-P is non-nil, return the date requested as a
+timestamp.  If the value is \\='seconds, return the timestamp as
+a timestamp with a one-second precision.  Otherwise, the
+timestamp is returned in a (TICKS . HZ) format, see
+`current-time' if using Emacs 29 or newer.
+
+Otherwise, if TIMESTAMP-P is nil, return the default style of
+`current-time'.
+
+FN is the function specified by the caller function to retrieve
+the correct data from PATH."
+      (let* ((current-time-list (not timestamp-p))
+             (date (apply fn (list (file-attributes path))))
+             (emacs29-or-newer-p (version<= "29" emacs-version)))
+        (cond
+         ((and (eq timestamp-p 'seconds) emacs29-or-newer-p)
+          (/ (car date) (cdr date)))
+         ((or (and (not (eq timestamp-p 'seconds)) emacs29-or-newer-p)
+              (and (not timestamp-p) (not emacs29-or-newer-p)))
+          date)
+         ((and (eq timestamp-p 'seconds) (not emacs29-or-newer-p))
+          (+ (* (nth 0 date) (expt 2 16))
+             (nth 1 date)))
+         ((and timestamp-p (not emacs29-or-newer-p))
+          `(,(+ (* (nth 0 date) (expt 2 16) 1000)
+                (* (nth 1 date) 1000)
+                (nth 3 date))
+            . 1000)))))
+
+(defun f-change-time (path &optional timestamp-p)
+  "Return the last status change time of PATH.
+
+The status change time (ctime) of PATH in the same format as
+`current-time'.  For details on TIMESTAMP-P and the format of the
+returned value, see `f--get-time'."
+  (f--get-time path
+               timestamp-p
+               (if (fboundp 'file-attribute-status-change-time)
+                   #'file-attribute-status-change-time
+                 (lambda (f) (nth 6 f)))))
+
+(defun f-modification-time (path &optional timestamp-p)
+  "Return the last modification time of PATH.
+The modification time (mtime) of PATH in the same format as
+`current-time'.  For details on TIMESTAMP-P and the format of the
+returned value, see `f--get-time'."
+  (f--get-time path
+               timestamp-p
+               (if (fboundp 'file-attribute-modification-time)
+                   #'file-attribute-modification-time
+                 (lambda (f) (nth 5 f)))))
+
+(defun f-access-time (path &optional timestamp-p)
+  "Return the last access time of PATH.
+The access time (atime) of PATH is in the same format as
+`current-time'.  For details on TIMESTAMP-P and the format of the
+returned value, see `f--get-time'."
+  (f--get-time path
+               timestamp-p
+               (if (fboundp 'file-attribute-access-time)
+                   #'file-attribute-access-time
+                 (lambda (f) (nth 4 f)))))
+
+(defun f--three-way-compare (a b)
+  "Three way comparison.
+
+Return -1 if A < B.
+Return 0 if A = B.
+Return 1 if A > B."
+  (cond ((< a b) -1)
+        ((= a b) 0)
+        ((> a b) 1)))
+
+;; TODO: How to properly test this function?
+(defun f--date-compare (file other method)
+  "Three-way comparison of the date of FILE and OTHER.
+
+This function can return three values:
+* 1 means FILE is newer than OTHER
+* 0 means FILE and NEWER share the same date
+* -1 means FILE is older than OTHER
+
+The statistics used for the date comparison depends on METHOD.
+When METHOD is null, compare their modification time.  Otherwise,
+compare their change time when METHOD is \\='change, or compare
+their last access time when METHOD is \\='access."
+  (let* ((fn-method (cond
+                     ((eq 'change method) #'f-change-time)
+                     ((eq 'access method) #'f-access-time)
+                     ((null method)       #'f-modification-time)
+                     (t (error "Unknown method %S" method))))
+         (date-file (apply fn-method (list file)))
+         (date-other (apply fn-method (list other)))
+         (dates      (-zip-pair date-file date-other)))
+    (-reduce-from (lambda (acc elt)
+                    (if (= acc 0)
+                        (f--three-way-compare (car elt) (cdr elt))
+                      acc))
+                  0
+                  dates)))
+
+(defun f-older-p (file other &optional method)
+  "Compare if FILE is older than OTHER.
+
+For more info on METHOD, see `f--date-compare'."
+  (< (f--date-compare file other method) 0))
+
+(defalias 'f-older? #'f-older-p)
+
+(defun f-newer-p (file other &optional method)
+  "Compare if FILE is newer than OTHER.
+
+For more info on METHOD, see `f--date-compare'."
+  (> (f--date-compare file other method) 0))
+
+(defalias 'f-newer? #'f-newer-p)
+
+(defun f-same-time-p (file other &optional method)
+  "Check if FILE and OTHER share the same access or modification time.
+
+For more info on METHOD, see `f--date-compare'."
+  (= (f--date-compare file other method) 0))
+
+(defalias 'f-same-time? #'f-same-time-p)
+
+
+;;;; Misc
+
+(defun f-this-file ()
+  "Return path to this file."
+  (cond
+   (load-in-progress load-file-name)
+   ((and (boundp 'byte-compile-current-file) byte-compile-current-file)
+    byte-compile-current-file)
+   (:else (buffer-file-name))))
+
+(defvar f--path-separator nil
+  "A variable to cache result of `f-path-separator'.")
+
+(defun f-path-separator ()
+  "Return path separator."
+  (or f--path-separator
+      (setq f--path-separator (substring (f-join "x" "y") 1 2))))
+
+(defun f-glob (pattern &optional path)
+  "Find PATTERN in PATH."
+  (file-expand-wildcards
+   (f-join (or path default-directory) pattern)))
+
+(defun f--collect-entries (path recursive)
+  (let (result
+        (entries
+         (-reject
+          (lambda (file)
+            (member (f-filename file) '("." "..")))
+          (directory-files path t))))
+    (cond (recursive
+           (mapc
+            (lambda (entry)
+              (if (f-file-p entry)
+                  (setq result (cons entry result))
+                (when (f-directory-p entry)
+                  (setq result (cons entry result))
+                  (if (f-readable-p entry)
+                      (setq result (append result (f--collect-entries entry recursive)))
+                    result))))
+            entries))
+          (t (setq result entries)))
+    result))
+
+(defmacro f--entries (path body &optional recursive)
+  "Anaphoric version of `f-entries'."
+  `(f-entries
+    ,path
+    (lambda (path)
+      (let ((it path))
+        ,body))
+    ,recursive))
+
+(defun f-entries (path &optional fn recursive)
+  "Find all files and directories in PATH.
+
+FN - called for each found file and directory.  If FN returns a thruthy
+value, file or directory will be included.
+RECURSIVE - Search for files and directories recursive."
+  (let ((entries (f--collect-entries path recursive)))
+    (if fn (-select fn entries) entries)))
+
+(defmacro f--directories (path body &optional recursive)
+  "Anaphoric version of `f-directories'."
+  `(f-directories
+    ,path
+    (lambda (path)
+      (let ((it path))
+        ,body))
+    ,recursive))
+
+(defun f-directories (path &optional fn recursive)
+  "Find all directories in PATH.  See `f-entries'."
+  (let ((directories (-select 'f-directory-p (f--collect-entries path recursive))))
+    (if fn (-select fn directories) directories)))
+
+(defmacro f--files (path body &optional recursive)
+  "Anaphoric version of `f-files'."
+  `(f-files
+    ,path
+    (lambda (path)
+      (let ((it path))
+        ,body))
+    ,recursive))
+
+(defun f-files (path &optional fn recursive)
+  "Find all files in PATH.  See `f-entries'."
+  (let ((files (-select 'f-file-p (f--collect-entries path recursive))))
+    (if fn (-select fn files) files)))
+
+(defmacro f--traverse-upwards (body &optional path)
+  "Anaphoric version of `f-traverse-upwards'."
+  `(f-traverse-upwards
+    (lambda (dir)
+      (let ((it dir))
+        ,body))
+    ,path))
+
+(defun f-traverse-upwards (fn &optional path)
+  "Traverse up as long as FN return nil, starting at PATH.
+
+If FN returns a non-nil value, the path sent as argument to FN is
+returned.  If no function callback return a non-nil value, nil is
+returned."
+  (unless path
+    (setq path default-directory))
+  (when (f-relative-p path)
+    (setq path (f-expand path)))
+  (if (funcall fn path)
+      path
+    (unless (f-root-p path)
+      (f-traverse-upwards fn (f-parent path)))))
+
+(defun f-root ()
+  "Return absolute root."
+  (f-traverse-upwards 'f-root-p))
+
+(defmacro f-with-sandbox (path-or-paths &rest body)
+  "Only allow PATH-OR-PATHS and descendants to be modified in BODY."
+  (declare (indent 1))
+  `(let ((paths (if (listp ,path-or-paths)
+                    ,path-or-paths
+                  (list ,path-or-paths))))
+     (unwind-protect
+         (let ((f--guard-paths paths))
+           ,@body)
+       (setq f--guard-paths nil))))
+
+(provide 'f)
+
+;;; f.el ends here
diff --git a/emacs/elpa/f-20241003.1131/f.elc b/emacs/elpa/f-20241003.1131/f.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-go.el b/emacs/elpa/lsp-mode-20240930.1803/lsp-go.el
@@ -1,360 +0,0 @@
-;;; lsp-go.el --- Go Client settings             -*- lexical-binding: t; -*-
-
-;; Copyright (C) 2019  Muir Manders
-
-;; Author: Muir Manders <muir@mnd.rs>
-;; Keywords:
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; lsp-go client
-
-;;; Code:
-
-(require 'lsp-mode)
-(require 'lsp-completion)
-
-(defgroup lsp-go nil
-  "LSP support for the Go Programming Language, using the gopls language server."
-  :link '(url-link "https://github.com/golang/tools/blob/master/gopls/README.md")
-  :group 'lsp-mode
-  :package-version '(lsp-mode . "6.3.2"))
-
-(define-obsolete-variable-alias
-  'lsp-gopls-server-path
-  'lsp-go-gopls-server-path
-  "lsp-mode 7.0.1")
-
-(defcustom lsp-go-gopls-server-path "gopls"
-  "Path to gopls server binary."
-  :type 'string
-  :group 'lsp-go)
-
-(define-obsolete-variable-alias
-  'lsp-gopls-server-args
-  'lsp-go-gopls-server-args
-  "lsp-mode 7.0.1")
-
-(defcustom lsp-go-gopls-server-args '("-remote=auto")
-  "Extra CLI arguments for gopls."
-  :type '(repeat string)
-  :group 'lsp-go)
-
-(define-obsolete-variable-alias
-  'lsp-gopls-use-placeholders
-  'lsp-go-use-placeholders
-  "lsp-mode 7.0.1")
-
-(defcustom lsp-go-use-placeholders t
-  "Cause gopls to provide placeholder parameter snippets when
-completing function calls."
-  :type 'boolean
-  :group 'lsp-go)
-
-(define-obsolete-variable-alias
-  'lsp-gopls-build-flags
-  'lsp-go-build-flags
-  "lsp-mode 7.0.1")
-
-(defcustom lsp-go-build-flags []
-  "A vector of flags passed on to the build system when invoked,
-  applied to queries like `go list'."
-  :type 'lsp-string-vector
-  :group 'lsp-go
-  :risky t
-  :package-version '(lsp-mode "6.2"))
-
-(define-obsolete-variable-alias
-  'lsp-gopls-env
-  'lsp-go-env
-  "lsp-mode 7.0.1")
-
-(defcustom lsp-go-env nil
-  "`gopls' has the unusual ability to set environment variables,
-  intended to affect the behavior of commands invoked by `gopls'
-  on the user's behalf. This variable takes a hash table of env
-  var names to desired values."
-  :type '(alist :key-type (symbol :tag "env var name") :value-type (string :tag "value"))
-  :group 'lsp-go
-  :risky t
-  :package-version '(lsp-mode "6.2"))
-
-(defcustom lsp-go-directory-filters []
-  "A vector of directory filters."
-  :link '(url-link "https://github.com/golang/tools/blob/67e49ef2d0f326051e22a4a55bdf9344ae1a8ed8/gopls/doc/settings.md#directoryfilters-string")
-  :group 'lsp-go
-  :type 'lsp-string-vector
-  :package-version '(lsp-mode "8.0.0"))
-
-(define-obsolete-variable-alias
-  'lsp-gopls-hover-kind
-  'lsp-go-hover-kind
-  "lsp-mode 7.0.1")
-
-(defcustom lsp-go-hover-kind "SynopsisDocumentation"
-  "`gopls' allows the end user to select the desired amount of
-  documentation returned during e.g. hover and thing-at-point
-  operations."
-  :type '(choice (const "SynopsisDocumentation")
-                 (const "NoDocumentation")
-                 (const "FullDocumentation")
-                 (const "SingleLine")
-                 (const "Structured"))
-  :group 'lsp-go
-  :risky t
-  :package-version '(lsp-mode "6.2"))
-
-(define-obsolete-variable-alias
-  'lsp-gopls-available-codelens
-  'lsp-go-available-codelenses
-  "lsp-mode 7.0.1")
-
-(define-obsolete-variable-alias
-  'lsp-go-available-codelens
-  'lsp-go-available-codelenses
-  "lsp-mode 7.0.1")
-
-(defvar lsp-go-available-codelenses
-  '(
-    (gc_details . "Toggle the calculation of gc annotations")
-    (generate . "Run `go generate` for a directory")
-    (regenerate_cgo . "Regenerate cgo definitions")
-    (test . "Run `go test` for a specific set of test or benchmark functions (legacy)")
-    (tidy . "Run `go mod tidy` for a module")
-    (upgrade_dependency . "Upgrade a dependency")
-    (vendor . "Runs `go mod vendor' for a module"))
-  "Available codelenses that can be further enabled or disabled
-  through `lsp-go-codelenses'.")
-
-(defun lsp-go--defcustom-available-as-alist-type (alist)
-  "Return a list for the `:type' field in `defcustom' used to populate an alist.
-
-The input ALIST has the form `((\"name\" . \"documentation sentence\") [...])'
-
-The returned type provides a tri-state that either:
-  - does not include the element in the alist
-  - sets element to false (actually, :json-false)
-  - sets element to true \(actually, t)"
-  (let ((list '()))
-    (dolist (v alist)
-      (push `(cons
-              :tag ,(cdr v)
-              (const :format "" ,(car v))
-              (choice (const :tag "Enable" t) (const :tag "Disable" :json-false)))
-            list))
-    (push 'set list)
-    list))
-
-(define-obsolete-variable-alias
-  'lsp-gopls-codelens
-  'lsp-go-codelenses
-  "lsp-mode 7.0.1")
-
-(define-obsolete-variable-alias
-  'lsp-go-codelens
-  'lsp-go-codelenses
-  "lsp-mode 7.0.1")
-
-(defcustom lsp-go-codelenses '((gc_details . :json-false)
-                               (generate . t)
-                               (regenerate_cgo . t)
-                               (tidy . t)
-                               (upgrade_dependency . t)
-                               (test . t)
-                               (vendor . t))
-  "Select what codelenses should be enabled or not.
-
-The codelenses can be found at https://github.com/golang/tools/blob/3fa0e8f87c1aae0a9adc2a63af1a1945d16d9359/internal/lsp/source/options.go#L106-L112."
-  :type (lsp-go--defcustom-available-as-alist-type lsp-go-available-codelenses)
-  :group 'lsp-go
-  :risky t
-  :package-version '(lsp-mode "7.0"))
-
-(define-obsolete-variable-alias
-  'lsp-clients-go-library-directories
-  'lsp-go-library-directories
-  "lsp-mode 7.0.1")
-
-(defcustom lsp-go-library-directories '("/usr")
-  "List of directories which will be considered to be libraries."
-  :group 'lsp-go
-  :risky t
-  :type '(repeat string))
-
-(define-obsolete-variable-alias
-  'lsp-clients-go-library-directories-include-go-modules
-  'lsp-go-library-directories-include-go-modules
-  "lsp-mode 7.0.1")
-
-(defcustom lsp-go-library-directories-include-go-modules t
-  "Whether or not $GOPATH/pkg/mod should be included as a library directory."
-  :type 'boolean
-  :group 'lsp-go)
-
-(defun lsp-go--library-default-directories (_workspace)
-  "Calculate go library directories.
-
-If `lsp-go-library-directories-include-go-modules' is non-nil
-and the environment variable GOPATH is set this function will return
-$GOPATH/pkg/mod along with the value of
-`lsp-go-library-directories'."
-  (let ((library-dirs lsp-go-library-directories))
-    (when (and lsp-go-library-directories-include-go-modules
-               (or (and (not (file-remote-p default-directory)) (executable-find "go"))
-                   (and (version<= "27.0" emacs-version) (with-no-warnings (executable-find "go" (file-remote-p default-directory))))))
-      (with-temp-buffer
-        (when (zerop (process-file "go" nil t nil "env" "GOPATH"))
-          (setq library-dirs
-                (append
-                 library-dirs
-                 (list
-                  (concat
-                   (string-trim-right (buffer-substring (point-min) (point-max)))
-                   "/pkg/mod")))))))
-    (if (file-remote-p default-directory)
-        (mapcar (lambda (path) (concat (file-remote-p default-directory) path)) library-dirs)
-      library-dirs)))
-
-(defcustom lsp-go-link-target "pkg.go.dev"
-  "Which website to use for displaying Go documentation."
-  :type '(choice (const "pkg.go.dev")
-                 (string :tag "A custom website"))
-  :group 'lsp-go
-  :package-version '(lsp-mode "7.0.1"))
-
-(defcustom lsp-go-links-in-hover t
-  "If non-nil, hover documentation includes links."
-  :type 'boolean
-  :group 'lsp-go
-  :package-version '(lsp-mode "8.0.0"))
-
-(defcustom lsp-go-use-gofumpt nil
-  "If non-nil, use gofumpt formatting."
-  :type 'boolean
-  :group 'lsp-go
-  :package-version '(lsp-mode "8.0.0"))
-
-(defcustom lsp-go-goimports-local ""
-  "Equivalent of the goimports -local flag, which puts imports beginning with
- this string after third-party packages.  It should be the prefix of the import
- path whose imports should be grouped separately."
-  :type 'string
-  :group 'lsp-go
-  :package-version '(lsp-mode "8.0.0"))
-
-(defcustom lsp-go-analyses nil
-  "Specify analyses that the user would like to enable or disable. A map of the
-  names of analysis passes that should be enabled/disabled. A full list of
-  analyzers that gopls uses can be found at
-  https://github.com/golang/tools/blob/master/gopls/doc/analyzers.md"
-  :type '(alist :key-type (string :tag "analyzer name") :value-type (boolean :tag "value"))
-  :group 'lsp-go
-  :risky t
-  :package-version '(lsp-mode "8.0.0"))
-
-(defcustom lsp-go-import-shortcut "Both"
-  "Specifies whether import statements should link to documentation or go to
-  definitions."
-  :type '(choice (const "Both")
-                 (const "Link")
-                 (const "Definition"))
-  :group 'lsp-go
-  :risky t
-  :package-version '(lsp-mode "8.0.0"))
-
-(defcustom lsp-go-symbol-matcher "Fuzzy"
-  "Sets the algorithm that is used when finding workspace symbols."
-  :type '(choice (const "Fuzzy")
-                 (const "CaseInsensitive")
-                 (const "CaseSensitive"))
-  :group 'lsp-go
-  :risky t
-  :package-version '(lsp-mode "8.0.0"))
-
-(defcustom lsp-go-symbol-style "Dynamic"
-  "Controls how symbols are qualified in symbol responses.
-
-  `Dynamic' uses whichever qualifier results in the highest scoring match for
-  the given symbol query. Here a `qualifier' is any `/' or '.' delimited suffix
-  of the fully qualified symbol. i.e. `to/pkg.Foo.Field' or just `Foo.Field'.
-
-  `Full' is fully qualified symbols, i.e. `path/to/pkg.Foo.Field'.
-
-  `Package' is package qualified symbols i.e. `pkg.Foo.Field'."
-  :type '(choice (const "Dynamic")
-                 (const "Full")
-                 (const "Package"))
-  :group 'lsp-go
-  :risky t
-  :package-version '(lsp-mode "8.0.0"))
-
-(lsp-register-custom-settings
- '(("gopls.usePlaceholders" lsp-go-use-placeholders t)
-   ("gopls.hoverKind" lsp-go-hover-kind)
-   ("gopls.buildFlags" lsp-go-build-flags)
-   ("gopls.env" lsp-go-env)
-   ("gopls.linkTarget" lsp-go-link-target)
-   ("gopls.codelenses" lsp-go-codelenses)
-   ("gopls.linksInHover" lsp-go-links-in-hover t)
-   ("gopls.gofumpt" lsp-go-use-gofumpt t)
-   ("gopls.local" lsp-go-goimports-local)
-   ("gopls.directoryFilters" lsp-go-directory-filters)
-   ("gopls.analyses" lsp-go-analyses)
-   ("gopls.importShortcut" lsp-go-import-shortcut)
-   ("gopls.symbolMatcher" lsp-go-symbol-matcher)
-   ("gopls.symbolStyle" lsp-go-symbol-style)))
-
-(defcustom lsp-go-server-wrapper-function
-  #'identity
-  "Function to wrap the language server process started by lsp-go.
-
-For example, you can pick a go binary provided by a repository's
-flake.nix file with:
-
-  (use-package nix-sandbox)
-  (defun my/nix--lsp-go-wrapper (args)
-    (if-let ((sandbox (nix-current-sandbox)))
-        (apply `nix-shell-command sandbox args)
-      args))
-  (setq lsp-go-server-path \"gopls\"
-        lsp-go-server-wrapper-function `my/nix--lsp-go-wrapper)"
-  :group 'lsp-go
-  :type '(choice
-          (function-item :tag "None" :value identity)
-          (function :tag "Custom function")))
-
-(defun lsp-go--server-command ()
-  "Command and arguments for launching the inferior language server process.
-These are assembled from the customizable variables `lsp-go-server-path'
-and `lsp-go-server-wrapper-function'."
-  (funcall lsp-go-server-wrapper-function (append (list lsp-go-gopls-server-path) lsp-go-gopls-server-args)))
-
-(lsp-register-client
- (make-lsp-client :new-connection (lsp-stdio-connection 'lsp-go--server-command)
-                  :activation-fn (lsp-activate-on "go" "go.mod")
-                  :language-id "go"
-                  :priority 0
-                  :server-id 'gopls
-                  :completion-in-comments? t
-                  :library-folders-fn #'lsp-go--library-default-directories
-                  :after-open-fn (lambda ()
-                                   ;; https://github.com/golang/tools/commit/b2d8b0336
-                                   (setq-local lsp-completion-filter-on-incomplete nil))))
-
-(lsp-consistency-check lsp-go)
-
-(provide 'lsp-go)
-;;; lsp-go.el ends here
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-go.elc b/emacs/elpa/lsp-mode-20240930.1803/lsp-go.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-graphql.el b/emacs/elpa/lsp-mode-20240930.1803/lsp-graphql.el
@@ -1,74 +0,0 @@
-;;; lsp-graphql.el --- lsp client for graphql        -*- lexical-binding: t; -*-
-
-;; Copyright (C) 2021  Binbin Ye
-
-;; Author: Binbin Ye
-;; Keywords: lsp, graphql
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; Support for running graphql lsp.  Support multiple server running at the same time when editing tsx/jsx.
-
-;;; Code:
-
-(require 'lsp-mode)
-
-(lsp-dependency 'graphql-language-service-cli
-                '(:system "graphql-lsp")
-                '(:npm :package "graphql-language-service-cli"
-                       :path "graphql-lsp"))
-
-
-(defgroup lsp-graphql nil
-  "LSP support for the GraphQL, using the graphql-language-service-cli as language server."
-  :link '(url-link "https://github.com/graphql/graphiql/tree/main/packages/graphql-language-service-cli#readme")
-  :group 'lsp-mode)
-
-(defcustom lsp-clients-graphql-server-args '("server" "--method=stream")
-  "CLI arguments for graphql language server."
-  :type '(repeat string)
-  :risky t
-  :group 'lsp-graphql)
-
-(defun lsp-graphql-activate-p (filename &optional _)
-  "Check if the GraphQL language server should be enabled based on FILENAME."
-  (or (string-match-p (rx (one-or-more anything) "."
-                        (or "ts" "js" "jsx" "tsx" "vue" "graphql" "gql")eos)
-        filename)
-    (and (derived-mode-p 'js-mode 'js2-mode 'typescript-mode 'typescript-ts-mode)
-      (not (derived-mode-p 'json-mode)))))
-
-(lsp-register-client
-  (make-lsp-client :new-connection (lsp-stdio-connection (lambda()
-                                                           (cons (lsp-package-path 'graphql-language-service-cli)
-                                                                 lsp-clients-graphql-server-args)))
-                   :major-modes '(graphql-mode)
-                   :language-id "graphql"
-                   :server-id 'graphql-lsp
-                   :priority -3
-                   :add-on? t
-                   :multi-root t
-                   :activation-fn 'lsp-graphql-activate-p
-                   :download-server-fn (lambda (_client callback error-callback _update?)
-                                         (lsp-package-ensure
-                                          'graphql-language-service-cli
-                                          callback
-                                          error-callback))))
-
-(lsp-consistency-check lsp-graphql)
-
-(provide 'lsp-graphql)
-;;; lsp-graphql.el ends here
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-graphql.elc b/emacs/elpa/lsp-mode-20240930.1803/lsp-graphql.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-mode-pkg.el b/emacs/elpa/lsp-mode-20240930.1803/lsp-mode-pkg.el
@@ -1,15 +0,0 @@
-;; -*- no-byte-compile: t; lexical-binding: nil -*-
-(define-package "lsp-mode" "20240930.1803"
-  "LSP mode."
-  '((emacs         "27.1")
-    (dash          "2.18.0")
-    (f             "0.20.0")
-    (ht            "2.3")
-    (spinner       "1.7.3")
-    (markdown-mode "2.3")
-    (lv            "0")
-    (eldoc         "1.11"))
-  :url "https://github.com/emacs-lsp/lsp-mode"
-  :commit "532d38b3472c8b229c7c50f30f0dda1121768ca5"
-  :revdesc "532d38b3472c"
-  :keywords '("languages"))
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-mode.el b/emacs/elpa/lsp-mode-20240930.1803/lsp-mode.el
@@ -1,9917 +0,0 @@
-;;; lsp-mode.el --- LSP mode                              -*- lexical-binding: t; -*-
-
-;; Copyright (C) 2020-2024 emacs-lsp maintainers
-
-;; Author: Vibhav Pant, Fangrui Song, Ivan Yonchovski
-;; Keywords: languages
-;; Package-Requires: ((emacs "27.1") (dash "2.18.0") (f "0.20.0") (ht "2.3") (spinner "1.7.3") (markdown-mode "2.3") (lv "0") (eldoc "1.11"))
-;; Package-Version: 20240930.1803
-;; Package-Revision: 532d38b3472c
-
-;; URL: https://github.com/emacs-lsp/lsp-mode
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; Emacs client/library for the Language Server Protocol
-
-;;; Code:
-
-(require 'cl-generic)
-(require 'cl-lib)
-(require 'compile)
-(require 'dash)
-(require 'epg)
-(require 'ewoc)
-(require 'f)
-(require 'filenotify)
-(require 'files)
-(require 'ht)
-(require 'imenu)
-(require 'inline)
-(require 'json)
-(require 'lv)
-(require 'markdown-mode)
-(require 'network-stream)
-(require 'pcase)
-(require 'rx)
-(require 's)
-(require 'seq)
-(require 'spinner)
-(require 'subr-x)
-(require 'tree-widget)
-(require 'url-parse)
-(require 'url-util)
-(require 'widget)
-(require 'xref)
-(require 'minibuffer)
-(require 'help-mode)
-(require 'lsp-protocol)
-
-(defgroup lsp-mode nil
-  "Language Server Protocol client."
-  :group 'tools
-  :tag "Language Server (lsp-mode)")
-
-(declare-function evil-set-command-property "ext:evil-common")
-(declare-function projectile-project-root "ext:projectile")
-(declare-function yas-expand-snippet "ext:yasnippet")
-(declare-function dap-mode "ext:dap-mode")
-(declare-function dap-auto-configure-mode "ext:dap-mode")
-
-(defvar yas-inhibit-overlay-modification-protection)
-(defvar yas-indent-line)
-(defvar yas-wrap-around-region)
-(defvar yas-also-auto-indent-first-line)
-(defvar dap-auto-configure-mode)
-(defvar dap-ui-menu-items)
-(defvar company-minimum-prefix-length)
-
-(defconst lsp--message-type-face
-  `((1 . ,compilation-error-face)
-    (2 . ,compilation-warning-face)
-    (3 . ,compilation-message-face)
-    (4 . ,compilation-info-face)))
-
-(defconst lsp--errors
-  '((-32700 "Parse Error")
-    (-32600 "Invalid Request")
-    (-32601 "Method not Found")
-    (-32602 "Invalid Parameters")
-    (-32603 "Internal Error")
-    (-32099 "Server Start Error")
-    (-32000 "Server End Error")
-    (-32002 "Server Not Initialized")
-    (-32001 "Unknown Error Code")
-    (-32800 "Request Cancelled"))
-  "Alist of error codes to user friendly strings.")
-
-(defconst lsp--empty-ht (make-hash-table))
-
-(eval-and-compile
-  (defun dash-expand:&lsp-wks (key source)
-    `(,(intern-soft (format "lsp--workspace-%s" (eval key))) ,source))
-
-  (defun dash-expand:&lsp-cln (key source)
-    `(,(intern-soft (format "lsp--client-%s" (eval key))) ,source)))
-
-(define-obsolete-variable-alias 'lsp-print-io 'lsp-log-io "lsp-mode 6.1")
-
-(defcustom lsp-log-io nil
-  "If non-nil, log all messages from the language server to a *lsp-log* buffer."
-  :group 'lsp-mode
-  :type 'boolean)
-
-(defcustom lsp-log-io-allowlist-methods '()
-  "The methods to filter before print to lsp-log-io."
-  :group 'lsp-mode
-  :type '(repeat string)
-  :package-version '(lsp-mode . "9.0.0"))
-
-(defcustom lsp-log-max message-log-max
-  "Maximum number of lines to keep in the log buffer.
-If nil, disable message logging.  If t, log messages but don’t truncate
-the buffer when it becomes large."
-  :group 'lsp-mode
-  :type '(choice (const :tag "Disable" nil)
-                 (integer :tag "lines")
-                 (const :tag "Unlimited" t))
-  :package-version '(lsp-mode . "6.1"))
-
-(defcustom lsp-io-messages-max t
-  "Maximum number of messages that can be locked in a `lsp-io' buffer."
-  :group 'lsp-mode
-  :type '(choice (const :tag "Unlimited" t)
-                 (integer :tag "Messages"))
-  :package-version '(lsp-mode . "6.1"))
-
-(defcustom lsp-keep-workspace-alive t
-  "If non nil keep workspace alive when the last workspace buffer is closed."
-  :group 'lsp-mode
-  :type 'boolean)
-
-(defcustom lsp-enable-snippet t
-  "Enable/disable snippet completion support."
-  :group 'lsp-completion
-  :type 'boolean)
-
-(defcustom lsp-enable-folding t
-  "Enable/disable code folding support."
-  :group 'lsp-mode
-  :type 'boolean
-  :package-version '(lsp-mode . "6.1"))
-
-(define-obsolete-variable-alias 'lsp-enable-semantic-highlighting 'lsp-semantic-tokens-enable "lsp-mode 8.0.0")
-
-(defcustom lsp-semantic-tokens-enable nil
-  "Enable/disable support for semantic tokens.
-As defined by the Language Server Protocol 3.16."
-  :group 'lsp-semantic-tokens
-  :type 'boolean)
-
-(defcustom lsp-folding-range-limit nil
-  "The maximum number of folding ranges to receive from the language server."
-  :group 'lsp-mode
-  :type '(choice (const :tag "No limit." nil)
-                 (integer :tag "Number of lines."))
-  :package-version '(lsp-mode . "6.1"))
-
-(defcustom lsp-folding-line-folding-only nil
-  "If non-nil, only fold complete lines."
-  :group 'lsp-mode
-  :type 'boolean
-  :package-version '(lsp-mode . "6.1"))
-
-(defcustom lsp-client-packages
-  '( ccls lsp-actionscript lsp-ada lsp-angular lsp-ansible lsp-asm lsp-astro
-     lsp-autotools lsp-awk lsp-bash lsp-beancount lsp-bufls lsp-clangd
-     lsp-clojure lsp-cmake lsp-cobol lsp-credo lsp-crystal lsp-csharp lsp-css
-     lsp-cucumber lsp-cypher lsp-d lsp-dart lsp-dhall lsp-docker lsp-dockerfile
-     lsp-earthly lsp-elixir lsp-elm lsp-emmet lsp-erlang lsp-eslint lsp-fortran lsp-futhark
-     lsp-fsharp lsp-gdscript lsp-gleam lsp-glsl lsp-go lsp-golangci-lint lsp-grammarly
-     lsp-graphql lsp-groovy lsp-hack lsp-haskell lsp-haxe lsp-idris lsp-java
-     lsp-javascript lsp-jq lsp-json lsp-kotlin lsp-latex lsp-lisp lsp-ltex
-     lsp-lua lsp-magik lsp-markdown lsp-marksman lsp-mdx lsp-meson lsp-metals lsp-mint
-     lsp-mojo lsp-move lsp-mssql lsp-nginx lsp-nim lsp-nix lsp-nushell lsp-ocaml
-     lsp-openscad lsp-pascal lsp-perl lsp-perlnavigator lsp-php lsp-pls
-     lsp-purescript lsp-pwsh lsp-pyls lsp-pylsp lsp-pyright lsp-python-ms
-     lsp-qml lsp-r lsp-racket lsp-remark lsp-rf lsp-roslyn lsp-rubocop lsp-ruby-lsp
-     lsp-ruby-syntax-tree lsp-ruff lsp-rust lsp-semgrep lsp-shader
-     lsp-solargraph lsp-solidity lsp-sonarlint lsp-sorbet lsp-sourcekit
-     lsp-sql lsp-sqls lsp-steep lsp-svelte lsp-tailwindcss lsp-terraform
-     lsp-tex lsp-tilt lsp-toml lsp-trunk lsp-ttcn3 lsp-typeprof lsp-v
-     lsp-vala lsp-verilog lsp-vetur lsp-vhdl lsp-vimscript lsp-volar lsp-wgsl
-     lsp-xml lsp-yaml lsp-yang lsp-zig)
-  "List of the clients to be automatically required."
-  :group 'lsp-mode
-  :type '(repeat symbol))
-
-(defcustom lsp-progress-via-spinner t
-  "If non-nil, display LSP $/progress reports via a spinner in the modeline."
-  :group 'lsp-mode
-  :type 'boolean)
-
-(defcustom lsp-progress-spinner-type 'progress-bar
-  "Holds the type of spinner to be used in the mode-line.
-Takes a value accepted by `spinner-start'."
-  :group 'lsp-mode
-  :type `(choice :tag "Choose a spinner by name"
-                 ,@(mapcar (lambda (c) (list 'const (car c)))
-                           spinner-types)))
-
-(defvar-local lsp-use-workspace-root-for-server-default-directory nil
-  "Use `lsp-workspace-root' for `default-directory' when starting LSP process.")
-
-(defvar-local lsp--cur-workspace nil)
-
-(defvar-local lsp--cur-version 0)
-(defvar-local lsp--virtual-buffer-connections nil)
-(defvar-local lsp--virtual-buffer nil)
-(defvar lsp--virtual-buffer-mappings (ht))
-
-(defvar lsp--uri-file-prefix (pcase system-type
-                               (`windows-nt "file:///")
-                               (_ "file://"))
-  "Prefix for a file-uri.")
-
-(defvar-local lsp-buffer-uri nil
-  "If set, return it instead of calculating it using `buffer-file-name'.")
-
-(define-error 'lsp-error "Unknown lsp-mode error")
-(define-error 'lsp-empty-response-error
-  "Empty response from the language server" 'lsp-error)
-(define-error 'lsp-timed-out-error
-  "Timed out while waiting for a response from the language server" 'lsp-error)
-(define-error 'lsp-capability-not-supported
-  "Capability not supported by the language server" 'lsp-error)
-(define-error 'lsp-file-scheme-not-supported
-  "Unsupported file scheme" 'lsp-error)
-(define-error 'lsp-client-already-exists-error
-  "A client with this server-id already exists" 'lsp-error)
-(define-error 'lsp-no-code-actions
-  "No code actions" 'lsp-error)
-
-(defcustom lsp-auto-guess-root nil
-  "Automatically guess the project root using projectile/project.
-Do *not* use this setting unless you are familiar with `lsp-mode'
-internals and you are sure that all of your projects are
-following `projectile'/`project.el' conventions."
-  :group 'lsp-mode
-  :type 'boolean)
-
-(defcustom lsp-guess-root-without-session nil
-  "Ignore the session file when calculating the project root.
-You almost always want to set lsp-auto-guess-root too.
-Do *not* use this setting unless you are familiar with `lsp-mode'
-internals and you are sure that all of your projects are
-following `projectile'/`project.el' conventions."
-  :group 'lsp-mode
-  :type 'boolean)
-
-(defcustom lsp-restart 'interactive
-  "Defines how server-exited events must be handled."
-  :group 'lsp-mode
-  :type '(choice (const interactive)
-                 (const auto-restart)
-                 (const ignore)))
-
-(defcustom lsp-session-file (expand-file-name (locate-user-emacs-file ".lsp-session-v1"))
-  "File where session information is stored."
-  :group 'lsp-mode
-  :type 'file)
-
-(defcustom lsp-auto-configure t
-  "Auto configure `lsp-mode' main features.
-When set to t `lsp-mode' will auto-configure completion,
-code-actions, breadcrumb, `flycheck', `flymake', `imenu', symbol highlighting,
-lenses, links, and so on.
-
-For finer granularity you may use `lsp-enable-*' properties."
-  :group 'lsp-mode
-  :type 'boolean
-  :package-version '(lsp-mode . "6.1"))
-
-(defcustom lsp-disabled-clients nil
-  "A list of disabled/blocklisted clients.
-Each entry in the list can be either:
-a symbol, the server-id for the LSP client, or
-a cons pair (MAJOR-MODE . CLIENTS), where MAJOR-MODE is the major-mode,
-and CLIENTS is either a client or a list of clients.
-
-This option can also be used as a file- or directory-local variable to
-disable a language server for individual files or directories/projects
-respectively."
-  :group 'lsp-mode
-  :type '(repeat (symbol))
-  :safe 'listp
-  :package-version '(lsp-mode . "6.1"))
-
-(defvar lsp-clients (make-hash-table :test 'eql)
-  "Hash table server-id -> client.
-It contains all of the clients that are currently registered.")
-
-(defvar lsp-enabled-clients nil
-  "List of clients allowed to be used for projects.
-When nil, all registered clients are considered candidates.")
-
-(defvar lsp-last-id 0
-  "Last request id.")
-
-(defcustom lsp-before-initialize-hook nil
-  "List of functions to be called before a Language Server has been initialized
-for a new workspace."
-  :type 'hook
-  :group 'lsp-mode)
-
-(defcustom lsp-after-initialize-hook nil
-  "List of functions to be called after a Language Server has been initialized
-for a new workspace."
-  :type 'hook
-  :group 'lsp-mode)
-
-(defcustom lsp-before-open-hook nil
-  "List of functions to be called before a new file with LSP support is opened."
-  :type 'hook
-  :group 'lsp-mode)
-
-(defcustom lsp-after-open-hook nil
-  "List of functions to be called after a new file with LSP support is opened."
-  :type 'hook
-  :group 'lsp-mode)
-
-(defcustom lsp-enable-file-watchers t
-  "If non-nil lsp-mode will watch the files in the workspace if
-the server has requested that."
-  :type 'boolean
-  :group 'lsp-mode
-  :package-version '(lsp-mode . "6.1"))
-;;;###autoload(put 'lsp-enable-file-watchers 'safe-local-variable #'booleanp)
-
-(define-obsolete-variable-alias 'lsp-file-watch-ignored 'lsp-file-watch-ignored-directories "8.0.0")
-
-(defcustom lsp-file-watch-ignored-directories
-  '(; SCM tools
-    "[/\\\\]\\.git\\'"
-    "[/\\\\]\\.github\\'"
-    "[/\\\\]\\.gitlab\\'"
-    "[/\\\\]\\.circleci\\'"
-    "[/\\\\]\\.hg\\'"
-    "[/\\\\]\\.bzr\\'"
-    "[/\\\\]_darcs\\'"
-    "[/\\\\]\\.svn\\'"
-    "[/\\\\]_FOSSIL_\\'"
-    ;; IDE or build tools
-    "[/\\\\]\\.idea\\'"
-    "[/\\\\]\\.ensime_cache\\'"
-    "[/\\\\]\\.eunit\\'"
-    "[/\\\\]node_modules"
-    "[/\\\\]\\.yarn\\'"
-    "[/\\\\]\\.fslckout\\'"
-    "[/\\\\]\\.tox\\'"
-    "[/\\\\]\\.nox\\'"
-    "[/\\\\]dist\\'"
-    "[/\\\\]dist-newstyle\\'"
-    "[/\\\\]\\.stack-work\\'"
-    "[/\\\\]\\.bloop\\'"
-    "[/\\\\]\\.metals\\'"
-    "[/\\\\]target\\'"
-    "[/\\\\]\\.ccls-cache\\'"
-    "[/\\\\]\\.vs\\'"
-    "[/\\\\]\\.vscode\\'"
-    "[/\\\\]\\.venv\\'"
-    "[/\\\\]\\.mypy_cache\\'"
-    "[/\\\\]\\.pytest_cache\\'"
-    ;; Swift Package Manager
-    "[/\\\\]\\.build\\'"
-    ;; Python
-    "[/\\\\]__pycache__\\'"
-    ;; Autotools output
-    "[/\\\\]\\.deps\\'"
-    "[/\\\\]build-aux\\'"
-    "[/\\\\]autom4te.cache\\'"
-    "[/\\\\]\\.reference\\'"
-    ;; Bazel
-    "[/\\\\]bazel-[^/\\\\]+\\'"
-    ;; CSharp
-    "[/\\\\]\\.cache[/\\\\]lsp-csharp\\'"
-    "[/\\\\]\\.meta\\'"
-    "[/\\\\]\\.nuget\\'"
-    ;; Unity
-    "[/\\\\]Library\\'"
-    ;; Clojure
-    "[/\\\\]\\.lsp\\'"
-    "[/\\\\]\\.clj-kondo\\'"
-    "[/\\\\]\\.shadow-cljs\\'"
-    "[/\\\\]\\.babel_cache\\'"
-    "[/\\\\]\\.cpcache\\'"
-    "[/\\\\]\\checkouts\\'"
-    ;; Gradle
-    "[/\\\\]\\.gradle\\'"
-    ;; Maven
-    "[/\\\\]\\.m2\\'"
-    ;; .Net Core build-output
-    "[/\\\\]bin/Debug\\'"
-    "[/\\\\]obj\\'"
-    ;; OCaml and Dune
-    "[/\\\\]_opam\\'"
-    "[/\\\\]_build\\'"
-    ;; Elixir
-    "[/\\\\]\\.elixir_ls\\'"
-    ;; Elixir Credo
-    "[/\\\\]\\.elixir-tools\\'"
-    ;; terraform and terragrunt
-    "[/\\\\]\\.terraform\\'"
-    "[/\\\\]\\.terragrunt-cache\\'"
-    ;; nix-direnv
-    "[/\\\\]\\result"
-    "[/\\\\]\\result-bin"
-    "[/\\\\]\\.direnv\\'")
-  "List of regexps matching directory paths which won't be monitored when
-creating file watches. Customization of this variable is only honored at
-the global level or at a root of an lsp workspace."
-  :group 'lsp-mode
-  :type '(repeat string)
-  :package-version '(lsp-mode . "8.0.0"))
-
-(define-obsolete-function-alias 'lsp-file-watch-ignored 'lsp-file-watch-ignored-directories "7.0.1")
-
-(defun lsp-file-watch-ignored-directories ()
-  lsp-file-watch-ignored-directories)
-
-;; Allow lsp-file-watch-ignored-directories as a file or directory-local variable
-;;;###autoload(put 'lsp-file-watch-ignored-directories 'safe-local-variable 'lsp--string-listp)
-
-(defcustom lsp-file-watch-ignored-files
-  '(
-    ;; Flycheck tempfiles
-    "[/\\\\]flycheck_[^/\\\\]+\\'"
-    ;; lockfiles
-    "[/\\\\]\\.#[^/\\\\]+\\'"
-    ;; backup files
-    "[/\\\\][^/\\\\]+~\\'" )
-  "List of regexps matching files for which change events will
-not be sent to the server.
-
-This setting has no impact on whether a file-watch is created for
-a directory; it merely prevents notifications pertaining to
-matched files from being sent to the server.  To prevent a
-file-watch from being created for a directory, customize
-`lsp-file-watch-ignored-directories'
-
-Customization of this variable is only honored at the global
-level or at a root of an lsp workspace."
-  :group 'lsp-mode
-  :type '(repeat string)
-  :package-version '(lsp-mode . "8.0.0"))
-
-;; Allow lsp-file-watch-ignored-files as a file or directory-local variable
-;;;###autoload(put 'lsp-file-watch-ignored-files 'safe-local-variable 'lsp--string-listp)
-
-(defcustom lsp-after-uninitialized-functions nil
-  "List of functions to be called after a Language Server has been uninitialized."
-  :type 'hook
-  :group 'lsp-mode
-  :package-version '(lsp-mode . "6.3"))
-
-(defconst lsp--sync-full 1)
-(defconst lsp--sync-incremental 2)
-
-(defcustom lsp-debounce-full-sync-notifications t
-  "If non-nil debounce full sync events.
-This flag affects only servers which do not support incremental updates."
-  :type 'boolean
-  :group 'lsp-mode
-  :package-version '(lsp-mode . "6.1"))
-
-(defcustom lsp-debounce-full-sync-notifications-interval 1.0
-  "Time to wait before sending full sync synchronization after buffer modification."
-  :type 'float
-  :group 'lsp-mode
-  :package-version '(lsp-mode . "6.1"))
-
-(defvar lsp--stderr-index 0)
-
-(defvar lsp--delayed-requests nil)
-(defvar lsp--delay-timer nil)
-
-(defcustom lsp-document-sync-method nil
-  "How to sync the document with the language server."
-  :type '(choice (const :tag "Documents are synced by always sending the full content of the document." lsp--sync-full)
-                 (const :tag "Documents are synced by always sending incremental changes to the document." lsp--sync-incremental)
-                 (const :tag "Use the method recommended by the language server." nil))
-  :group 'lsp-mode)
-
-(defcustom lsp-auto-execute-action t
-  "Auto-execute single action."
-  :type 'boolean
-  :group 'lsp-mode)
-
-(defcustom lsp-enable-links t
-  "If non-nil, all references to links in a file will be made clickable, if
-supported by the language server."
-  :type 'boolean
-  :group 'lsp-mode
-  :package-version '(lsp-mode . "6.1"))
-
-(defcustom lsp-enable-imenu t
-  "If non-nil, automatically enable `imenu' integration when server provides
-`textDocument/documentSymbol'."
-  :type 'boolean
-  :group 'lsp-mode
-  :package-version '(lsp-mode . "6.2"))
-
-(defcustom lsp-enable-dap-auto-configure t
-  "If non-nil, enable `dap-auto-configure-mode`."
-  :type 'boolean
-  :group 'lsp-mode
-  :package-version '(lsp-mode . "7.0"))
-
-(defcustom lsp-eldoc-enable-hover t
-  "If non-nil, `eldoc' will display hover info when it is present."
-  :type 'boolean
-  :group 'lsp-mode)
-
-(defcustom lsp-eldoc-render-all nil
-  "Display all of the info returned by document/onHover.
-If this is set to nil, `eldoc' will show only the symbol information."
-  :type 'boolean
-  :group 'lsp-mode)
-
-(define-obsolete-variable-alias 'lsp-enable-completion-at-point
-  'lsp-completion-enable "lsp-mode 7.0.1")
-
-(defcustom lsp-completion-enable t
-  "Enable `completion-at-point' integration."
-  :type 'boolean
-  :group 'lsp-completion)
-
-(defcustom lsp-enable-symbol-highlighting t
-  "Highlight references of the symbol at point."
-  :type 'boolean
-  :group 'lsp-mode)
-
-(defcustom lsp-enable-xref t
-  "Enable xref integration."
-  :type 'boolean
-  :group 'lsp-mode)
-
-(defcustom lsp-references-exclude-definition nil
-  "If non-nil, exclude declarations when finding references."
-  :type 'boolean
-  :group 'lsp-mode)
-
-(defcustom lsp-enable-indentation t
-  "Indent regions using the file formatting functionality provided by the
-language server."
-  :type 'boolean
-  :group 'lsp-mode)
-
-(defcustom lsp-enable-on-type-formatting t
-  "Enable `textDocument/onTypeFormatting' integration."
-  :type 'boolean
-  :group 'lsp-mode)
-
-(defcustom lsp-enable-text-document-color t
-  "Enable `textDocument/documentColor' integration."
-  :type 'boolean
-  :group 'lsp-mode)
-
-(defcustom lsp-before-save-edits t
-  "If non-nil, `lsp-mode' will apply edits suggested by the language server
-before saving a document."
-  :type 'boolean
-  :group 'lsp-mode)
-
-(defcustom lsp-after-apply-edits-hook nil
-  "Hooks to run when text edit is applied.
-It contains the operation source."
-  :type 'hook
-  :group 'lsp-mode
-  :package-version '(lsp-mode . "8.0.0"))
-
-(defcustom lsp-apply-edits-after-file-operations t
-  "Whether to apply edits returned by server after file operations if any.
-Applicable only if server supports workspace.fileOperations for operations:
-`workspace/willRenameFiles', `workspace/willCreateFiles' and
-`workspace/willDeleteFiles'."
-  :group 'lsp-mode
-  :type 'boolean)
-
-(defcustom lsp-modeline-code-actions-enable t
-  "Whether to show code actions on modeline."
-  :type 'boolean
-  :group 'lsp-modeline)
-
-(defcustom lsp-modeline-diagnostics-enable t
-  "Whether to show diagnostics on modeline."
-  :type 'boolean
-  :group 'lsp-modeline)
-
-(defcustom lsp-modeline-workspace-status-enable t
-  "Whether to show workspace status on modeline."
-  :type 'boolean
-  :group 'lsp-modeline
-  :package-version '(lsp-mode . "8.0.0"))
-
-(defcustom lsp-headerline-breadcrumb-enable t
-  "Whether to enable breadcrumb on headerline."
-  :type 'boolean
-  :group 'lsp-headerline)
-
-(defcustom lsp-configure-hook nil
-  "Hooks to run when `lsp-configure-buffer' is called."
-  :type 'hook
-  :group 'lsp-mode)
-
-(defcustom lsp-unconfigure-hook nil
-  "Hooks to run when `lsp-unconfig-buffer' is called."
-  :type 'hook
-  :group 'lsp-mode)
-
-(defcustom lsp-after-diagnostics-hook nil
-  "Hooks to run after diagnostics are received.
-Note: it runs only if the receiving buffer is open. Use
-`lsp-diagnostics-updated-hook'if you want to be notified when
-diagnostics have changed."
-  :type 'hook
-  :group 'lsp-mode)
-
-(define-obsolete-variable-alias 'lsp-after-diagnostics-hook
-  'lsp-diagnostics-updated-hook "lsp-mode 6.4")
-
-(defcustom lsp-diagnostics-updated-hook nil
-  "Hooks to run after diagnostics are received."
-  :type 'hook
-  :group 'lsp-mode)
-
-(define-obsolete-variable-alias 'lsp-workspace-folders-changed-hook
-  'lsp-workspace-folders-changed-functions "lsp-mode 6.3")
-
-(defcustom lsp-workspace-folders-changed-functions nil
-  "Hooks to run after the folders has changed.
-The hook will receive two parameters list of added and removed folders."
-  :type 'hook
-  :group 'lsp-mode)
-
-(define-obsolete-variable-alias 'lsp-eldoc-hook 'eldoc-documentation-functions "lsp-mode 9.0.0")
-
-(defcustom lsp-before-apply-edits-hook nil
-  "Hooks to run before applying edits."
-  :type 'hook
-  :group 'lsp-mode)
-
-(defgroup lsp-imenu nil
-  "LSP Imenu."
-  :group 'lsp-mode
-  :tag "LSP Imenu")
-
-(defcustom lsp-imenu-show-container-name t
-  "Display the symbol's container name in an imenu entry."
-  :type 'boolean
-  :group 'lsp-imenu)
-
-(defcustom lsp-imenu-container-name-separator "/"
-  "Separator string to use to separate the container name from the symbol while
-displaying imenu entries."
-  :type 'string
-  :group 'lsp-imenu)
-
-(defcustom lsp-imenu-sort-methods '(kind name)
-  "How to sort the imenu items.
-
-The value is a list of `kind' `name' or `position'.  Priorities
-are determined by the index of the element."
-  :type '(repeat (choice (const name)
-                         (const position)
-                         (const kind)))
-  :group 'lsp-imenu)
-
-(defcustom lsp-imenu-index-symbol-kinds nil
-  "Which symbol kinds to show in imenu."
-  :type '(repeat (choice (const :tag "Miscellaneous" nil)
-                         (const :tag "File" File)
-                         (const :tag "Module" Module)
-                         (const :tag "Namespace" Namespace)
-                         (const :tag "Package" Package)
-                         (const :tag "Class" Class)
-                         (const :tag "Method" Method)
-                         (const :tag "Property" Property)
-                         (const :tag "Field" Field)
-                         (const :tag "Constructor" Constructor)
-                         (const :tag "Enum" Enum)
-                         (const :tag "Interface" Interface)
-                         (const :tag "Function" Function)
-                         (const :tag "Variable" Variable)
-                         (const :tag "Constant" Constant)
-                         (const :tag "String" String)
-                         (const :tag "Number" Number)
-                         (const :tag "Boolean" Boolean)
-                         (const :tag "Array" Array)
-                         (const :tag "Object" Object)
-                         (const :tag "Key" Key)
-                         (const :tag "Null" Null)
-                         (const :tag "Enum Member" EnumMember)
-                         (const :tag "Struct" Struct)
-                         (const :tag "Event" Event)
-                         (const :tag "Operator" Operator)
-                         (const :tag "Type Parameter" TypeParameter)))
-  :group 'lsp-imenu)
-
-;; vibhavp: Should we use a lower value (5)?
-(defcustom lsp-response-timeout 10
-  "Number of seconds to wait for a response from the language server before
-timing out. Nil if no timeout."
-  :type '(choice
-          (number :tag "Seconds")
-          (const :tag "No timeout" nil))
-  :group 'lsp-mode)
-
-(defcustom lsp-tcp-connection-timeout 2
-  "The timeout for tcp connection in seconds."
-  :type 'number
-  :group 'lsp-mode
-  :package-version '(lsp-mode . "6.2"))
-
-(defconst lsp--imenu-compare-function-alist
-  (list (cons 'name #'lsp--imenu-compare-name)
-        (cons 'kind #'lsp--imenu-compare-kind)
-        (cons 'position #'lsp--imenu-compare-line-col))
-  "An alist of (METHOD . FUNCTION).
-METHOD is one of the symbols accepted by
-`lsp-imenu-sort-methods'.
-
-FUNCTION takes two hash tables representing DocumentSymbol.  It
-returns a negative number, 0, or a positive number indicating
-whether the first parameter is less than, equal to, or greater
-than the second parameter.")
-
-(defcustom lsp-diagnostic-clean-after-change nil
-  "When non-nil, clean the diagnostics on change.
-
-Note that when that setting is nil, `lsp-mode' will show stale
-diagnostics until server publishes the new set of diagnostics"
-  :type 'boolean
-  :group 'lsp-diagnostics
-  :package-version '(lsp-mode . "7.0.1"))
-
-(defcustom lsp-server-trace nil
-  "Request tracing on the server side.
-The actual trace output at each level depends on the language server in use.
-Changes take effect only when a new session is started."
-  :type '(choice (const :tag "Disabled" "off")
-                 (const :tag "Messages only" "messages")
-                 (const :tag "Verbose" "verbose")
-                 (const :tag "Default (disabled)" nil))
-  :group 'lsp-mode
-  :package-version '(lsp-mode . "6.1"))
-
-(defcustom lsp-auto-touch-files t
-  "If non-nil ensure the files exist before sending
-`textDocument/didOpen' notification."
-  :type 'boolean
-  :group 'lsp-mode
-  :package-version '(lsp-mode . "9.0.0"))
-
-(defvar lsp-language-id-configuration
-  '(("\\(^CMakeLists\\.txt\\|\\.cmake\\)\\'" . "cmake")
-    ("\\(^Dockerfile\\(?:\\..*\\)?\\|\\.[Dd]ockerfile\\)\\'" . "dockerfile")
-    ("\\.astro$" . "astro")
-    ("\\.cs\\'" . "csharp")
-    ("\\.css$" . "css")
-    ("\\.cypher$" . "cypher")
-    ("Earthfile" . "earthfile")
-    ("\\.ebuild$" . "shellscript")
-    ("\\.go\\'" . "go")
-    ("\\.html$" . "html")
-    ("\\.hx$" . "haxe")
-    ("\\.hy$" . "hy")
-    ("\\.java\\'" . "java")
-    ("\\.jq$"  . "jq")
-    ("\\.js$" . "javascript")
-    ("\\.json$" . "json")
-    ("\\.jsonc$" . "jsonc")
-    ("\\.jsonnet$" . "jsonnet")
-    ("\\.jsx$" . "javascriptreact")
-    ("\\.lua$" . "lua")
-    ("\\.mdx\\'" . "mdx")
-    ("\\.nu$" . "nushell")
-    ("\\.php$" . "php")
-    ("\\.ps[dm]?1\\'" . "powershell")
-    ("\\.rs\\'" . "rust")
-    ("\\.spec\\'" . "rpm-spec")
-    ("\\.sql$" . "sql")
-    ("\\.svelte$" . "svelte")
-    ("\\.toml\\'" . "toml")
-    ("\\.ts$" . "typescript")
-    ("\\.tsx$" . "typescriptreact")
-    ("\\.ttcn3$" . "ttcn3")
-    ("\\.vue$" . "vue")
-    ("\\.xml$" . "xml")
-    ("\\ya?ml$" . "yaml")
-    ("^PKGBUILD$" . "shellscript")
-    ("^go\\.mod\\'" . "go.mod")
-    ("^settings\\.json$" . "jsonc")
-    ("^yang\\.settings$" . "jsonc")
-    ("^meson\\(_options\\.txt\\|\\.\\(build\\|format\\)\\)\\'" . "meson")
-    (ada-mode . "ada")
-    (ada-ts-mode . "ada")
-    (gpr-mode . "gpr")
-    (gpr-ts-mode . "gpr")
-    (awk-mode . "awk")
-    (awk-ts-mode . "awk")
-    (nxml-mode . "xml")
-    (sql-mode . "sql")
-    (vimrc-mode . "vim")
-    (vimscript-ts-mode . "vim")
-    (sh-mode . "shellscript")
-    (bash-ts-mode . "shellscript")
-    (ebuild-mode . "shellscript")
-    (pkgbuild-mode . "shellscript")
-    (envrc-file-mode . "shellscript")
-    (scala-mode . "scala")
-    (scala-ts-mode . "scala")
-    (julia-mode . "julia")
-    (julia-ts-mode . "julia")
-    (clojure-mode . "clojure")
-    (clojurec-mode . "clojure")
-    (clojurescript-mode . "clojurescript")
-    (clojure-ts-mode . "clojure")
-    (clojure-ts-clojurec-mode . "clojure")
-    (clojure-ts-clojurescript-mode . "clojurescript")
-    (java-mode . "java")
-    (java-ts-mode . "java")
-    (jdee-mode . "java")
-    (groovy-mode . "groovy")
-    (python-mode . "python")
-    (python-ts-mode . "python")
-    (cython-mode . "python")
-    ("\\(\\.mojo\\|\\.🔥\\)\\'" . "mojo")
-    (lsp--render-markdown . "markdown")
-    (move-mode . "move")
-    (rust-mode . "rust")
-    (rust-ts-mode . "rust")
-    (rustic-mode . "rust")
-    (kotlin-mode . "kotlin")
-    (kotlin-ts-mode . "kotlin")
-    (css-mode . "css")
-    (css-ts-mode . "css")
-    (less-mode . "less")
-    (less-css-mode . "less")
-    (lua-mode . "lua")
-    (lua-ts-mode . "lua")
-    (sass-mode . "sass")
-    (ssass-mode . "sass")
-    (scss-mode . "scss")
-    (scad-mode . "openscad")
-    (xml-mode . "xml")
-    (c-mode . "c")
-    (c-ts-mode . "c")
-    (c++-mode . "cpp")
-    (c++-ts-mode . "cpp")
-    (cuda-mode . "cuda")
-    (objc-mode . "objective-c")
-    (html-mode . "html")
-    (html-ts-mode . "html")
-    (sgml-mode . "html")
-    (mhtml-mode . "html")
-    (mint-mode . "mint")
-    (go-dot-mod-mode . "go.mod")
-    (go-mod-ts-mode . "go.mod")
-    (go-mode . "go")
-    (go-ts-mode . "go")
-    (graphql-mode . "graphql")
-    (haskell-mode . "haskell")
-    (haskell-ts-mode . "haskell")
-    (hack-mode . "hack")
-    (php-mode . "php")
-    (php-ts-mode . "php")
-    (powershell-mode . "powershell")
-    (powershell-mode . "PowerShell")
-    (powershell-ts-mode . "powershell")
-    (json-mode . "json")
-    (json-ts-mode . "json")
-    (jsonc-mode . "jsonc")
-    (rjsx-mode . "javascript")
-    (js2-mode . "javascript")
-    (js-mode . "javascript")
-    (js-ts-mode . "javascript")
-    (typescript-mode . "typescript")
-    (typescript-ts-mode . "typescript")
-    (tsx-ts-mode . "typescriptreact")
-    (svelte-mode . "svelte")
-    (fsharp-mode . "fsharp")
-    (reason-mode . "reason")
-    (caml-mode . "ocaml")
-    (tuareg-mode . "ocaml")
-    (futhark-mode . "futhark")
-    (swift-mode . "swift")
-    (elixir-mode . "elixir")
-    (elixir-ts-mode . "elixir")
-    (heex-ts-mode . "elixir")
-    (conf-javaprop-mode . "spring-boot-properties")
-    (yaml-mode . "yaml")
-    (yaml-ts-mode . "yaml")
-    (ruby-mode . "ruby")
-    (enh-ruby-mode . "ruby")
-    (ruby-ts-mode . "ruby")
-    (feature-mode . "cucumber")
-    (fortran-mode . "fortran")
-    (f90-mode . "fortran")
-    (elm-mode . "elm")
-    (dart-mode . "dart")
-    (erlang-mode . "erlang")
-    (dockerfile-mode . "dockerfile")
-    (dockerfile-ts-mode . "dockerfile")
-    (csharp-mode . "csharp")
-    (csharp-tree-sitter-mode . "csharp")
-    (csharp-ts-mode . "csharp")
-    (plain-tex-mode . "plaintex")
-    (context-mode . "context")
-    (cypher-mode . "cypher")
-    (latex-mode . "latex")
-    (LaTeX-mode . "latex")
-    (v-mode . "v")
-    (vhdl-mode . "vhdl")
-    (vhdl-ts-mode . "vhdl")
-    (verilog-mode . "verilog")
-    (terraform-mode . "terraform")
-    (ess-julia-mode . "julia")
-    (ess-r-mode . "r")
-    (crystal-mode . "crystal")
-    (nim-mode . "nim")
-    (dhall-mode . "dhall")
-    (cmake-mode . "cmake")
-    (cmake-ts-mode . "cmake")
-    (purescript-mode . "purescript")
-    (gdscript-mode . "gdscript")
-    (gdscript-ts-mode . "gdscript")
-    (perl-mode . "perl")
-    (cperl-mode . "perl")
-    (robot-mode . "robot")
-    (racket-mode . "racket")
-    (nix-mode . "nix")
-    (nix-ts-mode . "nix")
-    (prolog-mode . "prolog")
-    (vala-mode . "vala")
-    (actionscript-mode . "actionscript")
-    (d-mode . "d")
-    (zig-mode . "zig")
-    (text-mode . "plaintext")
-    (markdown-mode . "markdown")
-    (gfm-mode . "markdown")
-    (beancount-mode . "beancount")
-    (conf-toml-mode . "toml")
-    (toml-ts-mode . "toml")
-    (org-mode . "org")
-    (org-journal-mode . "org")
-    (nginx-mode . "nginx")
-    (magik-mode . "magik")
-    (magik-ts-mode . "magik")
-    (idris-mode . "idris")
-    (idris2-mode . "idris2")
-    (gleam-mode . "gleam")
-    (gleam-ts-mode . "gleam")
-    (graphviz-dot-mode . "dot")
-    (tiltfile-mode . "tiltfile")
-    (solidity-mode . "solidity")
-    (bibtex-mode . "bibtex")
-    (rst-mode . "restructuredtext")
-    (glsl-mode . "glsl")
-    (shader-mode . "shaderlab")
-    (wgsl-mode . "wgsl")
-    (jq-mode . "jq")
-    (jq-ts-mode . "jq")
-    (protobuf-mode . "protobuf")
-    (nushell-mode . "nushell")
-    (nushell-ts-mode . "nushell")
-    (meson-mode . "meson")
-    (yang-mode . "yang"))
-  "Language id configuration.")
-
-(defvar lsp--last-active-workspaces nil
-  "Keep track of last active workspace.
-We want to try the last workspace first when jumping into a library
-directory")
-
-(defvar lsp-method-requirements
-  '(("textDocument/callHierarchy" :capability :callHierarchyProvider)
-    ("textDocument/codeAction" :capability :codeActionProvider)
-    ("codeAction/resolve"
-     :check-command (lambda (workspace)
-                      (with-lsp-workspace workspace
-                        (lsp:code-action-options-resolve-provider?
-                         (lsp--capability-for-method "textDocument/codeAction")))))
-    ("textDocument/codeLens" :capability :codeLensProvider)
-    ("textDocument/completion" :capability :completionProvider)
-    ("completionItem/resolve"
-     :check-command (lambda (wk)
-                      (with-lsp-workspace wk
-                        (lsp:completion-options-resolve-provider?
-                         (lsp--capability-for-method "textDocument/completion")))))
-    ("textDocument/declaration" :capability :declarationProvider)
-    ("textDocument/definition" :capability :definitionProvider)
-    ("textDocument/documentColor" :capability :colorProvider)
-    ("textDocument/documentLink" :capability :documentLinkProvider)
-    ("textDocument/inlayHint" :capability :inlayHintProvider)
-    ("textDocument/documentHighlight" :capability :documentHighlightProvider)
-    ("textDocument/documentSymbol" :capability :documentSymbolProvider)
-    ("textDocument/foldingRange" :capability :foldingRangeProvider)
-    ("textDocument/formatting" :capability :documentFormattingProvider)
-    ("textDocument/hover" :capability :hoverProvider)
-    ("textDocument/implementation" :capability :implementationProvider)
-    ("textDocument/linkedEditingRange" :capability :linkedEditingRangeProvider)
-    ("textDocument/onTypeFormatting" :capability :documentOnTypeFormattingProvider)
-    ("textDocument/prepareRename"
-     :check-command (lambda (workspace)
-                      (with-lsp-workspace workspace
-                        (lsp:rename-options-prepare-provider?
-                         (lsp--capability-for-method "textDocument/rename")))))
-    ("textDocument/rangeFormatting" :capability :documentRangeFormattingProvider)
-    ("textDocument/references" :capability :referencesProvider)
-    ("textDocument/rename" :capability :renameProvider)
-    ("textDocument/selectionRange" :capability :selectionRangeProvider)
-    ("textDocument/semanticTokens" :capability :semanticTokensProvider)
-    ("textDocument/semanticTokensFull"
-     :check-command (lambda (workspace)
-                      (with-lsp-workspace workspace
-                        (lsp-get (lsp--capability :semanticTokensProvider) :full))))
-    ("textDocument/semanticTokensFull/Delta"
-     :check-command (lambda (workspace)
-                      (with-lsp-workspace workspace
-                        (let ((capFull (lsp-get (lsp--capability :semanticTokensProvider) :full)))
-                          (and (not (booleanp capFull)) (lsp-get capFull :delta))))))
-    ("textDocument/semanticTokensRangeProvider"
-     :check-command (lambda (workspace)
-                      (with-lsp-workspace workspace
-                        (lsp-get (lsp--capability :semanticTokensProvider) :range))))
-    ("textDocument/signatureHelp" :capability :signatureHelpProvider)
-    ("textDocument/typeDefinition" :capability :typeDefinitionProvider)
-    ("textDocument/typeHierarchy" :capability :typeHierarchyProvider)
-    ("textDocument/diagnostic" :capability :diagnosticProvider)
-    ("workspace/executeCommand" :capability :executeCommandProvider)
-    ("workspace/symbol" :capability :workspaceSymbolProvider))
-
-  "Map methods to requirements.
-It is used by request-sending functions to determine which server
-must be used for handling a particular message.")
-
-(defconst lsp--file-change-type
-  `((created . 1)
-    (changed . 2)
-    (deleted . 3)))
-
-(defconst lsp--watch-kind
-  `((create . 1)
-    (change . 2)
-    (delete . 4)))
-
-(defvar lsp-window-body-width 40
-  "Window body width when rendering doc.")
-
-(defface lsp-face-highlight-textual
-  '((t :inherit highlight))
-  "Face used for textual occurrences of symbols."
-  :group 'lsp-mode)
-
-(defface lsp-face-highlight-read
-  '((t :inherit highlight :underline t))
-  "Face used for highlighting symbols being read."
-  :group 'lsp-mode)
-
-(defface lsp-face-highlight-write
-  '((t :inherit highlight :weight bold))
-  "Face used for highlighting symbols being written to."
-  :group 'lsp-mode)
-
-(define-obsolete-variable-alias 'lsp-lens-auto-enable
-  'lsp-lens-enable "lsp-mode 7.0.1")
-
-(defcustom lsp-lens-enable t
-  "Auto enable lenses if server supports."
-  :group 'lsp-lens
-  :type 'boolean
-  :package-version '(lsp-mode . "6.3"))
-
-(defcustom lsp-symbol-highlighting-skip-current nil
-  "If non-nil skip current symbol when setting symbol highlights."
-  :group 'lsp-mode
-  :type 'boolean)
-
-(defcustom lsp-file-watch-threshold 1000
-  "Show warning if the files to watch are more than.
-Set to nil to disable the warning."
-  :type 'number
-  :group 'lsp-mode)
-;;;###autoload(put 'lsp-file-watch-threshold 'safe-local-variable (lambda (i) (or (numberp i) (not i))))
-
-(defvar lsp-custom-markup-modes
-  '((rust-mode "no_run" "rust,no_run" "rust,ignore" "rust,should_panic"))
-  "Mode to uses with markdown code blocks.
-They are added to `markdown-code-lang-modes'")
-
-(defcustom lsp-signature-render-documentation t
-  "Display signature documentation in `eldoc'."
-  :type 'boolean
-  :group 'lsp-mode
-  :package-version '(lsp-mode . "6.2"))
-
-(defcustom lsp-signature-auto-activate '(:on-trigger-char :on-server-request)
-  "Auto activate signature conditions."
-  :type '(repeat (choice (const :tag "On trigger chars pressed." :on-trigger-char)
-                         (const :tag "After selected completion." :after-completion)
-                         (const :tag "When the server has sent show signature help." :on-server-request)))
-  :group 'lsp-mode
-  :package-version '(lsp-mode . "6.2"))
-
-(defcustom lsp-signature-doc-lines 20
-  "If number, limit the number of lines to show in the docs."
-  :type 'number
-  :group 'lsp-mode
-  :package-version '(lsp-mode . "6.3"))
-
-(defcustom lsp-signature-function 'lsp-lv-message
-  "The function used for displaying signature info.
-It will be called with one param - the signature info. When
-called with nil the signature info must be cleared."
-  :type 'function
-  :group 'lsp-mode
-  :package-version '(lsp-mode . "6.3"))
-
-(defcustom lsp-keymap-prefix "s-l"
-  "LSP-mode keymap prefix."
-  :group 'lsp-mode
-  :type 'string
-  :package-version '(lsp-mode . "6.3"))
-
-(defvar-local lsp--buffer-workspaces ()
-  "List of the buffer workspaces.")
-
-(defvar-local lsp--buffer-deferred nil
-  "Whether buffer was loaded via `lsp-deferred'.")
-
-(defvar lsp--session nil
-  "Contain the `lsp-session' for the current Emacs instance.")
-
-(defvar lsp--tcp-port 10000)
-
-(defvar lsp--client-packages-required nil
-  "If nil, `lsp-client-packages' are yet to be required.")
-
-(defvar lsp--tcp-server-port 0
-  "The server socket which is opened when using `lsp-tcp-server' (a server
-socket is opened in Emacs and the language server connects to it).  The
-default value of 0 ensures that a random high port is used. Set it to a positive
-integer to use a specific port.")
-
-(defvar lsp--tcp-server-wait-seconds 10
-  "Wait this amount of time for the client to connect to our server socket
-when using `lsp-tcp-server'.")
-
-(defvar-local lsp--document-symbols nil
-  "The latest document symbols.")
-
-(defvar-local lsp--document-selection-range-cache nil
-  "The document selection cache.")
-
-(defvar-local lsp--document-symbols-request-async nil
-  "If non-nil, request document symbols asynchronously.")
-
-(defvar-local lsp--document-symbols-tick -1
-  "The value of `buffer-chars-modified-tick' when document
-  symbols were last retrieved.")
-
-(defvar-local lsp--have-document-highlights nil
-  "Set to `t' on symbol highlighting, cleared on
-`lsp--cleanup-highlights-if-needed'. Checking a separately
-defined flag is substantially faster than unconditionally
-calling `remove-overlays'.")
-
-;; Buffer local variable for storing number of lines.
-(defvar lsp--log-lines)
-
-(defvar-local lsp--eldoc-saved-message nil)
-
-(defvar lsp--on-change-timer nil)
-(defvar lsp--on-idle-timer nil)
-
-(defvar-local lsp--signature-last nil)
-(defvar-local lsp--signature-last-index nil)
-(defvar lsp--signature-last-buffer nil)
-
-(defvar-local lsp--virtual-buffer-point-max nil)
-
-(cl-defmethod lsp-execute-command (_server _command _arguments)
-  "Ask SERVER to execute COMMAND with ARGUMENTS.")
-
-(defun lsp-elt (sequence n)
-  "Return Nth element of SEQUENCE or nil if N is out of range."
-  (cond
-   ((listp sequence) (elt sequence n))
-   ((arrayp sequence)
-    (and (> (length sequence) n) (aref sequence n)))
-   (t (and (> (length sequence) n) (elt sequence n)))))
-
-;; define seq-first and seq-rest for older emacs
-(defun lsp-seq-first (sequence)
-  "Return the first element of SEQUENCE."
-  (lsp-elt sequence 0))
-
-(defun lsp-seq-rest (sequence)
-  "Return a sequence of the elements of SEQUENCE except the first one."
-  (seq-drop sequence 1))
-
-;;;###autoload
-(defun lsp--string-listp (sequence)
-  "Return t if all elements of SEQUENCE are strings, else nil."
-  (not (seq-find (lambda (x) (not (stringp x))) sequence)))
-
-(defun lsp--string-vector-p (candidate)
-  "Returns true if CANDIDATE is a vector data structure and
-every element of it is of type string, else nil."
-  (and
-   (vectorp candidate)
-   (seq-every-p #'stringp candidate)))
-
-(make-obsolete 'lsp--string-vector-p nil "lsp-mode 8.0.0")
-
-(defun lsp--editable-vector-match (widget value)
-  "Function for `lsp-editable-vector' :match."
-  ;; Value must be a list or a vector and all the members must match the type.
-  (and (or (listp value) (vectorp value))
-       (length (cdr (lsp--editable-vector-match-inline widget value)))))
-
-(defun lsp--editable-vector-match-inline (widget value)
-  "Value for `lsp-editable-vector' :match-inline."
-  (let ((type (nth 0 (widget-get widget :args)))
-        (ok t)
-        found)
-    (while (and value ok)
-      (let ((answer (widget-match-inline type value)))
-        (if answer
-            (let ((head (if (vectorp answer) (aref answer 0) (car answer)))
-                  (tail (if (vectorp answer) (seq-drop 1 answer) (cdr answer))))
-              (setq found (append found head)
-                    value tail))
-          (setq ok nil))))
-    (cons found value)))
-
-(defun lsp--editable-vector-value-to-external (_widget internal-value)
-  "Convert the internal list value to a vector."
-  (if (listp internal-value)
-      (apply 'vector internal-value)
-    internal-value))
-
-(defun lsp--editable-vector-value-to-internal (_widget external-value)
-  "Convert the external vector value to a list."
-  (if (vectorp external-value)
-      (append external-value nil)
-    external-value))
-
-(define-widget 'lsp--editable-vector 'editable-list
-  "A subclass of `editable-list' that accepts and returns a
-vector instead of a list."
-  :value-to-external 'lsp--editable-vector-value-to-external
-  :value-to-internal 'lsp--editable-vector-value-to-internal
-  :match 'lsp--editable-vector-match
-  :match-inline 'lsp--editable-vector-match-inline)
-
-(define-widget 'lsp-repeatable-vector 'lsp--editable-vector
-  "A variable length homogeneous vector."
-  :tag "Repeat"
-  :format "%{%t%}:\n%v%i\n")
-
-(define-widget 'lsp-string-vector 'lazy
-  "A vector of zero or more elements, every element of which is a string.
-Appropriate for any language-specific `defcustom' that needs to
-serialize as a JSON array of strings.
-
-Deprecated. Use `lsp-repeatable-vector' instead. "
-  :offset 4
-  :tag "Vector"
-  :type '(lsp-repeatable-vector string))
-
-(make-obsolete 'lsp-string-vector nil "lsp-mode 8.0.0")
-
-(defvar lsp--show-message t
-  "If non-nil, show debug message from `lsp-mode'.")
-
-(defun lsp--message  (format &rest args)
-  "Wrapper for `message'
-
-We `inhibit-message' the message when the cursor is in the
-minibuffer and when emacs version is before emacs 27 due to the
-fact that we often use `lsp--info', `lsp--warn' and `lsp--error'
-in async context and the call to these function is removing the
-minibuffer prompt. The issue with async messages is already fixed
-in emacs 27.
-
-See #2049"
-  (when lsp--show-message
-    (let ((inhibit-message (or inhibit-message
-                               (and (minibufferp)
-                                    (version< emacs-version "27.0")))))
-      (apply #'message format args))))
-
-(defun lsp--info (format &rest args)
-  "Display lsp info message with FORMAT with ARGS."
-  (lsp--message "%s :: %s" (propertize "LSP" 'face 'success) (apply #'format format args)))
-
-(defun lsp--warn (format &rest args)
-  "Display lsp warn message with FORMAT with ARGS."
-  (lsp--message "%s :: %s" (propertize "LSP" 'face 'warning) (apply #'format format args)))
-
-(defun lsp--error (format &rest args)
-  "Display lsp error message with FORMAT with ARGS."
-  (lsp--message "%s :: %s" (propertize "LSP" 'face 'error) (apply #'format format args)))
-
-(defun lsp-log (format &rest args)
-  "Log message to the ’*lsp-log*’ buffer.
-
-FORMAT and ARGS i the same as for `message'."
-  (when lsp-log-max
-    (let ((log-buffer (get-buffer "*lsp-log*"))
-          (inhibit-read-only t))
-      (unless log-buffer
-        (setq log-buffer (get-buffer-create "*lsp-log*"))
-        (with-current-buffer log-buffer
-          (buffer-disable-undo)
-          (view-mode 1)
-          (set (make-local-variable 'lsp--log-lines) 0)))
-      (with-current-buffer log-buffer
-        (save-excursion
-          (let* ((message (apply 'format format args))
-                 ;; Count newlines in message.
-                 (newlines (1+ (cl-loop with start = 0
-                                        for count from 0
-                                        while (string-match "\n" message start)
-                                        do (setq start (match-end 0))
-                                        finally return count))))
-            (goto-char (point-max))
-
-            ;; in case the buffer is not empty insert before last \n to preserve
-            ;; the point position(in case it is in the end)
-            (if (eq (point) (point-min))
-                (progn
-                  (insert "\n")
-                  (backward-char))
-              (backward-char)
-              (insert "\n"))
-            (insert message)
-
-            (setq lsp--log-lines (+ lsp--log-lines newlines))
-
-            (when (and (integerp lsp-log-max) (> lsp--log-lines lsp-log-max))
-              (let ((to-delete (- lsp--log-lines lsp-log-max)))
-                (goto-char (point-min))
-                (forward-line to-delete)
-                (delete-region (point-min) (point))
-                (setq lsp--log-lines lsp-log-max)))))))))
-
-(defalias 'lsp-message 'lsp-log)
-
-(defalias 'lsp-ht 'ht)
-
-(defalias 'lsp-file-local-name 'file-local-name)
-
-(defun lsp-f-canonical (file-name)
-  "Return the canonical FILE-NAME, without a trailing slash."
-  (directory-file-name (expand-file-name file-name)))
-
-(defalias 'lsp-canonical-file-name 'lsp-f-canonical)
-
-(defun lsp-f-same? (path-a path-b)
-  "Return t if PATH-A and PATH-B are references to the same file.
-Symlinks are not followed."
-  (when (and (f-exists? path-a)
-             (f-exists? path-b))
-    (equal
-     (lsp-f-canonical (directory-file-name (f-expand path-a)))
-     (lsp-f-canonical (directory-file-name (f-expand path-b))))))
-
-(defun lsp-f-parent (path)
-  "Return the parent directory to PATH.
-Symlinks are not followed."
-  (let ((parent (file-name-directory
-                 (directory-file-name (f-expand path default-directory)))))
-    (unless (lsp-f-same? path parent)
-      (if (f-relative? path)
-          (f-relative parent)
-        (directory-file-name parent)))))
-
-(defun lsp-f-ancestor-of? (path-a path-b)
-  "Return t if PATH-A is an ancestor of PATH-B.
-Symlinks are not followed."
-  (unless (lsp-f-same? path-a path-b)
-    (s-prefix? (concat (lsp-f-canonical path-a) (f-path-separator))
-               (lsp-f-canonical path-b))))
-
-(defun lsp--merge-results (results method)
-  "Merge RESULTS by filtering the empty hash-tables and merging
-the lists according to METHOD."
-  (pcase (--map (if (vectorp it)
-                    (append it nil) it)
-                (-filter #'identity results))
-    (`() ())
-    ;; only one result - simply return it
-    (`(,fst) fst)
-    ;; multiple results merge it based on strategy
-    (results
-     (pcase method
-       ("textDocument/hover" (pcase (seq-filter
-                                     (-compose #'not #'lsp-empty?)
-                                     results)
-                               (`(,hover) hover)
-                               (hovers (lsp-make-hover
-                                        :contents
-                                        (-mapcat
-                                         (-lambda ((&Hover :contents))
-                                           (if (and (sequencep contents)
-                                                    (not (stringp contents)))
-                                               (append contents ())
-                                             (list contents)))
-                                         hovers)))))
-       ("textDocument/completion"
-        (lsp-make-completion-list
-         :is-incomplete (seq-some
-                         #'lsp:completion-list-is-incomplete
-                         results)
-         :items (cl-mapcan (lambda (it) (append (if (lsp-completion-list? it)
-                                                    (lsp:completion-list-items it)
-                                                  it)
-                                                nil))
-                           results)))
-       ("completionItem/resolve"
-        (let ((item (cl-first results)))
-          (when-let ((details (seq-filter #'identity
-                                          (seq-map #'lsp:completion-item-detail? results))))
-            (lsp:set-completion-item-detail?
-             item
-             (string-join details " ")))
-          (when-let ((docs (seq-filter #'identity
-                                       (seq-map #'lsp:completion-item-documentation? results))))
-            (lsp:set-completion-item-documentation?
-             item
-             (lsp-make-markup-content
-              :kind (or (seq-some (lambda (it)
-                                    (when (equal (lsp:markup-content-kind it)
-                                                 lsp/markup-kind-markdown)
-                                      lsp/markup-kind-markdown))
-                                  docs)
-                        lsp/markup-kind-plain-text)
-              :value (string-join (seq-map (lambda (doc)
-                                             (or (lsp:markup-content-value doc)
-                                                 (and (stringp doc) doc)))
-                                           docs)
-                                  "\n"))))
-          (when-let ((edits (seq-filter #'identity
-                                        (seq-map #'lsp:completion-item-additional-text-edits? results))))
-            (lsp:set-completion-item-additional-text-edits?
-             item
-             (cl-mapcan (lambda (it) (if (seqp it) it (list it))) edits)))
-          item))
-       (_ (cl-mapcan (lambda (it) (if (seqp it) it (list it))) results))))))
-
-(defun lsp--spinner-start ()
-  "Start spinner indication."
-  (condition-case _err (spinner-start (lsp-progress-spinner-type)) (error)))
-
-(defun lsp--propertize (str type)
-  "Propertize STR as per TYPE."
-  (propertize str 'face (alist-get type lsp--message-type-face)))
-
-(defun lsp-workspaces ()
-  "Return the lsp workspaces associated with the current project."
-  (if lsp--cur-workspace (list lsp--cur-workspace) lsp--buffer-workspaces))
-
-(defun lsp--completing-read (prompt collection transform-fn &optional predicate
-                                    require-match initial-input
-                                    hist def inherit-input-method)
-  "Wrap `completing-read' to provide transformation function and disable sort.
-
-TRANSFORM-FN will be used to transform each of the items before displaying.
-
-PROMPT COLLECTION PREDICATE REQUIRE-MATCH INITIAL-INPUT HIST DEF
-INHERIT-INPUT-METHOD will be proxied to `completing-read' without changes."
-  (let* ((col (--map (cons (funcall transform-fn it) it) collection))
-         (completion (completing-read prompt
-                                      (lambda (string pred action)
-                                        (if (eq action 'metadata)
-                                            `(metadata (display-sort-function . identity))
-                                          (complete-with-action action col string pred)))
-                                      predicate require-match initial-input hist
-                                      def inherit-input-method)))
-    (cdr (assoc completion col))))
-
-(defconst lsp--system-arch (lambda ()
-                             (setq lsp--system-arch
-                                   (pcase system-type
-                                     ('windows-nt
-                                      (pcase system-configuration
-                                        ((rx bol "x86_64-") 'x64)
-                                        (_ 'x86)))
-                                     ('darwin
-                                      (pcase system-configuration
-                                        ((rx "aarch64-") 'arm64)
-                                        (_ 'x64)))
-                                     ('gnu/linux
-                                       (pcase system-configuration
-                                         ((rx bol "aarch64-") 'arm64)
-                                         ((rx bol "x86_64") 'x64)
-                                         ((rx bol (| "i386" "i886")) 'x32)))
-                                     (_
-                                      (pcase system-configuration
-                                        ((rx bol "x86_64") 'x64)
-                                        ((rx bol (| "i386" "i886")) 'x32))))))
-  "Return the system architecture of `Emacs'.
-Special values:
-  `x64'       64bit
-  `x32'       32bit
-  `arm64'     ARM 64bit")
-
-(defmacro lsp-with-current-buffer (buffer-id &rest body)
-  (declare (indent 1) (debug t))
-  `(if-let ((wcb (plist-get ,buffer-id :with-current-buffer)))
-       (with-lsp-workspaces (plist-get ,buffer-id :workspaces)
-         (funcall wcb (lambda () ,@body)))
-     (with-current-buffer ,buffer-id
-       ,@body)))
-
-(defvar lsp--throw-on-input nil
-  "Make `lsp-*-while-no-input' throws `input' on interrupted.")
-
-(defmacro lsp--catch (tag bodyform &rest handlers)
-  "Catch TAG thrown in BODYFORM.
-The return value from TAG will be handled in HANDLERS by `pcase'."
-  (declare (debug (form form &rest (pcase-PAT body))) (indent 2))
-  (let ((re-sym (make-symbol "re")))
-    `(let ((,re-sym (catch ,tag ,bodyform)))
-       (pcase ,re-sym
-         ,@handlers))))
-
-(defmacro lsp--while-no-input (&rest body)
-  "Wrap BODY in `while-no-input' and respecting `non-essential'.
-If `lsp--throw-on-input' is set, will throw if input is pending, else
-return value of `body' or nil if interrupted."
-  (declare (debug t) (indent 0))
-  `(if non-essential
-       (let ((res (while-no-input ,@body)))
-         (cond
-          ((and lsp--throw-on-input (equal res t))
-           (throw 'input :interrupted))
-          ((booleanp res) nil)
-          (t res)))
-     ,@body))
-
-;; A ‘lsp--client’ object describes the client-side behavior of a language
-;; server.  It is used to start individual server processes, each of which is
-;; represented by a ‘lsp--workspace’ object.  Client objects are normally
-;; created using ‘lsp-define-stdio-client’ or ‘lsp-define-tcp-client’.  Each
-;; workspace refers to exactly one client, but there can be multiple workspaces
-;; for a single client.
-(cl-defstruct lsp--client
-  ;; ‘language-id’ is a function that receives a buffer as a single argument
-  ;; and should return the language identifier for that buffer.  See
-  ;; https://microsoft.github.io/language-server-protocol/specification#textdocumentitem
-  ;; for a list of language identifiers.  Also consult the documentation for
-  ;; the language server represented by this client to find out what language
-  ;; identifiers it supports or expects.
-  (language-id nil)
-
-  ;; ‘add-on?’ when set to t the server will be started no matter whether there
-  ;; is another server handling the same mode.
-  (add-on? nil)
-  ;; ‘new-connection’ is a function that should start a language server process
-  ;; and return a cons (COMMAND-PROCESS . COMMUNICATION-PROCESS).
-  ;; COMMAND-PROCESS must be a process object representing the server process
-  ;; just started.  COMMUNICATION-PROCESS must be a process (including pipe and
-  ;; network processes) that ‘lsp-mode’ uses to communicate with the language
-  ;; server using the language server protocol.  COMMAND-PROCESS and
-  ;; COMMUNICATION-PROCESS may be the same process; in that case
-  ;; ‘new-connection’ may also return that process as a single
-  ;; object. ‘new-connection’ is called with two arguments, FILTER and
-  ;; SENTINEL.  FILTER should be used as process filter for
-  ;; COMMUNICATION-PROCESS, and SENTINEL should be used as process sentinel for
-  ;; COMMAND-PROCESS.
-  (new-connection nil)
-
-  ;; ‘ignore-regexps’ is a list of regexps.  When a data packet from the
-  ;; language server matches any of these regexps, it will be ignored.  This is
-  ;; intended for dealing with language servers that output non-protocol data.
-  (ignore-regexps nil)
-
-  ;; ‘ignore-messages’ is a list of regexps.  When a message from the language
-  ;; server matches any of these regexps, it will be ignored.  This is useful
-  ;; for filtering out unwanted messages; such as servers that send nonstandard
-  ;; message types, or extraneous log messages.
-  (ignore-messages nil)
-
-  ;; ‘notification-handlers’ is a hash table mapping notification method names
-  ;; (strings) to functions handling the respective notifications.  Upon
-  ;; receiving a notification, ‘lsp-mode’ will call the associated handler
-  ;; function passing two arguments, the ‘lsp--workspace’ object and the
-  ;; deserialized notification parameters.
-  (notification-handlers (make-hash-table :test 'equal))
-
-  ;; ‘request-handlers’ is a hash table mapping request method names
-  ;; (strings) to functions handling the respective notifications.  Upon
-  ;; receiving a request, ‘lsp-mode’ will call the associated handler function
-  ;; passing two arguments, the ‘lsp--workspace’ object and the deserialized
-  ;; request parameters.
-  (request-handlers (make-hash-table :test 'equal))
-
-  ;; ‘response-handlers’ is a hash table mapping integral JSON-RPC request
-  ;; identifiers for pending asynchronous requests to functions handling the
-  ;; respective responses.  Upon receiving a response from the language server,
-  ;; ‘lsp-mode’ will call the associated response handler function with a
-  ;; single argument, the deserialized response parameters.
-  (response-handlers (make-hash-table :test 'eql))
-
-  ;; ‘prefix-function’ is called for getting the prefix for completion.
-  ;; The function takes no parameter and returns a cons (start . end) representing
-  ;; the start and end bounds of the prefix. If it's not set, the client uses a
-  ;; default prefix function."
-  (prefix-function nil)
-
-  ;; Contains mapping of scheme to the function that is going to be used to load
-  ;; the file.
-  (uri-handlers (make-hash-table :test #'equal))
-
-  ;; ‘action-handlers’ is a hash table mapping action to a handler function. It
-  ;; can be used in `lsp-execute-code-action' to determine whether the action
-  ;; current client is interested in executing the action instead of sending it
-  ;; to the server.
-  (action-handlers (make-hash-table :test 'equal))
-
-  ;; `action-filter' can be set to a function that modifies any incoming
-  ;; `CodeAction' in place before it is executed. The return value is ignored.
-  ;; This can be used to patch up broken code action requests before they are
-  ;; sent back to the LSP server. See `lsp-fix-code-action-booleans' for an
-  ;; example of a function that can be useful here.
-  (action-filter nil)
-
-  ;; major modes supported by the client.
-  major-modes
-  ;; Function that will be called to decide if this language client
-  ;; should manage a particular buffer. The function will be passed
-  ;; the file name and major mode to inform the decision. Setting
-  ;; `activation-fn' will override `major-modes', if
-  ;; present.
-  activation-fn
-  ;; Break the tie when major-mode is supported by multiple clients.
-  (priority 0)
-  ;; Unique identifier for representing the client object.
-  server-id
-  ;; defines whether the client supports multi root workspaces.
-  multi-root
-  ;; Initialization options or a function that returns initialization options.
-  initialization-options
-  ;; `semantic-tokens-faces-overrides’ is a plist that can be used to extend, or
-  ;; completely replace, the faces used for semantic highlighting on a
-  ;; client-by-client basis.
-  ;;
-  ;; It recognizes four members, all of which are optional: `:types’ and
-  ;; `:modifiers’, respectively, should be face definition lists akin to
-  ;; `:lsp-semantic-token-faces’. If specified, each of these face lists will be
-  ;; merged with the default face definition list.
-  ;;
-  ;; Alternatively, if the plist members `:discard-default-types’ or
-  ;; `:discard-default-modifiers' are non-nil, the default `:type' or `:modifiers'
-  ;; face definitions will be replaced entirely by their respective overrides.
-  ;;
-  ;; For example, setting `:semantic-tokens-faces-overrides' to
-  ;; `(:types (("macro" . font-lock-keyword-face)))' will remap "macro" tokens from
-  ;; their default face `lsp-face-semhl-macro' to `font-lock-keyword-face'.
-  ;;
-  ;; `(:types (("macro" . font-lock-keyword-face) ("not-quite-a-macro" . some-face)))'
-  ;; will also remap "macro", but on top of that associate the fictional token type
-  ;; "not-quite-a-macro" with the face named `some-face'.
-  ;;
-  ;; `(:types (("macro" . font-lock-keyword-face))
-  ;;   :modifiers (("declaration" . lsp-face-semhl-interface))
-  ;;   :discard-default-types t
-  ;;   :discard-default-modifiers t)'
-  ;; will discard all default face definitions, hence leaving the client with
-  ;; only one token type "macro", mapped to `font-lock-keyword-face', and one
-  ;; modifier type "declaration", mapped to `lsp-face-semhl-interface'.
-  semantic-tokens-faces-overrides
-  ;; Provides support for registering LSP Server specific capabilities.
-  custom-capabilities
-  ;; Function which returns the folders that are considered to be not projects but library files.
-  ;; The function accepts one parameter currently active workspace.
-  ;; See: https://github.com/emacs-lsp/lsp-mode/issues/225.
-  library-folders-fn
-  ;; function which will be called when opening file in the workspace to perform
-  ;; client specific initialization. The function accepts one parameter
-  ;; currently active workspace.
-  before-file-open-fn
-  ;; Function which will be called right after a workspace has been initialized.
-  initialized-fn
-  ;; ‘remote?’ indicate whether the client can be used for LSP server over TRAMP.
-  (remote? nil)
-
-  ;; ‘completion-in-comments?’ t if the client supports completion in comments.
-  (completion-in-comments? nil)
-
-  ;; ‘path->uri-fn’ the function to use for path->uri conversion for the client.
-  (path->uri-fn nil)
-
-  ;; ‘uri->path-fn’ the function to use for uri->path conversion for the client.
-  (uri->path-fn nil)
-  ;; Function that returns an environment structure that will be used
-  ;; to set some environment variables when starting the language
-  ;; server process. These environment variables enable some
-  ;; additional features in the language server. The environment
-  ;; structure is an alist of the form (KEY . VALUE), where KEY is a
-  ;; string (regularly in all caps), and VALUE may be a string, a
-  ;; boolean, or a sequence of strings.
-  environment-fn
-
-  ;; ‘after-open-fn’ workspace after open specific hooks.
-  (after-open-fn nil)
-
-  ;; ‘async-request-handlers’ is a hash table mapping request method names
-  ;; (strings) to functions handling the respective requests that may take
-  ;; time to finish.  Upon receiving a request, ‘lsp-mode’ will call the
-  ;; associated handler function passing three arguments, the ‘lsp--workspace’
-  ;; object, the deserialized request parameters and the callback which accept
-  ;; result as its parameter.
-  (async-request-handlers (make-hash-table :test 'equal))
-  download-server-fn
-  download-in-progress?
-  buffers
-  synchronize-sections)
-
-(defun lsp-clients-executable-find (find-command &rest args)
-  "Finds an executable by invoking a search command.
-
-FIND-COMMAND is the executable finder that searches for the
-actual language server executable. ARGS is a list of arguments to
-give to FIND-COMMAND to find the language server.  Returns the
-output of FIND-COMMAND if it exits successfully, nil otherwise.
-
-Typical uses include finding an executable by invoking `find' in
-a project, finding LLVM commands on macOS with `xcrun', or
-looking up project-specific language servers for projects written
-in the various dynamic languages, e.g. `nvm', `pyenv' and `rbenv'
-etc."
-  (when-let* ((find-command-path (executable-find find-command))
-              (executable-path
-               (with-temp-buffer
-                 (when (zerop (apply 'call-process find-command-path nil t nil args))
-                   (buffer-substring-no-properties (point-min) (point-max))))))
-    (string-trim executable-path)))
-
-(defvar lsp--already-widened nil)
-
-(defmacro lsp-save-restriction-and-excursion (&rest form)
-  (declare (indent 0) (debug t))
-  `(if lsp--already-widened
-       (save-excursion ,@form)
-     (-let [lsp--already-widened t]
-       (save-restriction
-         (widen)
-         (save-excursion ,@form)))))
-
-;; from http://emacs.stackexchange.com/questions/8082/how-to-get-buffer-position-given-line-number-and-column-number
-(defun lsp--line-character-to-point (line character)
-  "Return the point for character CHARACTER on line LINE."
-  (or (lsp-virtual-buffer-call :line/character->point line character)
-      (let ((inhibit-field-text-motion t))
-        (lsp-save-restriction-and-excursion
-          (goto-char (point-min))
-          (forward-line line)
-          ;; server may send character position beyond the current line and we
-          ;; should fallback to line end.
-          (-let [line-end (line-end-position)]
-            (if (> character (- line-end (point)))
-                line-end
-              (forward-char character)
-              (point)))))))
-
-(lsp-defun lsp--position-to-point ((&Position :line :character))
-  "Convert `Position' object in PARAMS to a point."
-  (lsp--line-character-to-point line character))
-
-(lsp-defun lsp--range-to-region ((&RangeToPoint :start :end))
-  (cons start end))
-
-(lsp-defun lsp--range-text ((&RangeToPoint :start :end))
-  (buffer-substring start end))
-
-(lsp-defun lsp--find-wrapping-range ((&SelectionRange :parent? :range (&RangeToPoint :start :end)))
-  (cond
-   ((and
-     (region-active-p)
-     (<= start (region-beginning) end)
-     (<= start (region-end) end)
-     (or (not (= start (region-beginning)))
-         (not (= end (region-end)))))
-    (cons start end))
-   ((and (<= start (point) end)
-         (not (region-active-p)))
-    (cons start end))
-   (parent? (lsp--find-wrapping-range parent?))))
-
-(defun lsp--get-selection-range ()
-  (or
-   (-when-let ((cache . cache-tick) lsp--document-selection-range-cache)
-     (when (= cache-tick (buffer-modified-tick)) cache))
-   (let ((response (cl-first
-                    (lsp-request
-                     "textDocument/selectionRange"
-                     (list :textDocument (lsp--text-document-identifier)
-                           :positions (vector (lsp--cur-position)))))))
-     (setq lsp--document-selection-range-cache
-           (cons response (buffer-modified-tick)))
-     response)))
-
-(defun lsp-extend-selection ()
-  "Extend selection."
-  (interactive)
-  (unless (lsp-feature? "textDocument/selectionRange")
-    (signal 'lsp-capability-not-supported (list "selectionRangeProvider")))
-  (-when-let ((start . end) (lsp--find-wrapping-range (lsp--get-selection-range)))
-    (goto-char start)
-    (set-mark (point))
-    (goto-char end)
-    (exchange-point-and-mark)))
-
-(defun lsp-warn (message &rest args)
-  "Display a warning message made from (`format-message' MESSAGE ARGS...).
-This is equivalent to `display-warning', using `lsp-mode' as the type and
-`:warning' as the level."
-  (display-warning 'lsp-mode (apply #'format-message message args)))
-
-(defun lsp--get-uri-handler (scheme)
-  "Get uri handler for SCHEME in the current workspace."
-  (--some (gethash scheme (lsp--client-uri-handlers (lsp--workspace-client it)))
-          (or (lsp-workspaces) (lsp--session-workspaces (lsp-session)))))
-
-(defun lsp--fix-path-casing (path)
-  "On windows, downcases path because the windows file system is
-case-insensitive.
-
-On other systems, returns path without change."
-  (if (eq system-type 'windows-nt) (downcase path) path))
-
-(defun lsp--uri-to-path (uri)
-  "Convert URI to a file path."
-  (if-let ((fn (->> (lsp-workspaces)
-                    (-keep (-compose #'lsp--client-uri->path-fn #'lsp--workspace-client))
-                    (cl-first))))
-      (funcall fn uri)
-    (lsp--uri-to-path-1 uri)))
-
-(defun lsp-remap-path-if-needed (file-name)
-  (-if-let ((virtual-buffer &as &plist :buffer) (gethash file-name lsp--virtual-buffer-mappings))
-      (propertize (buffer-local-value 'buffer-file-name buffer)
-                  'lsp-virtual-buffer virtual-buffer)
-    file-name))
-
-(defun lsp--uri-to-path-1 (uri)
-  "Convert URI to a file path."
-  (let* ((url (url-generic-parse-url (url-unhex-string uri)))
-         (type (url-type url))
-         (target (url-target url))
-         (file
-          (concat (decode-coding-string (url-filename url)
-                                        (or locale-coding-system 'utf-8))
-                  (when (and target
-                             (not (s-match
-                                   (rx "#" (group (1+ num)) (or "," "#")
-                                       (group (1+ num))
-                                       string-end)
-                                   uri)))
-                    (concat "#" target))))
-         (file-name (if (and type (not (string= type "file")))
-                        (if-let ((handler (lsp--get-uri-handler type)))
-                            (funcall handler uri)
-                          uri)
-                      ;; `url-generic-parse-url' is buggy on windows:
-                      ;; https://github.com/emacs-lsp/lsp-mode/pull/265
-                      (or (and (eq system-type 'windows-nt)
-                               (eq (elt file 0) ?\/)
-                               (substring file 1))
-                          file))))
-    (->> file-name
-         (concat (-some #'lsp--workspace-host-root (lsp-workspaces)))
-         (lsp-remap-path-if-needed))))
-
-(defun lsp--buffer-uri ()
-  "Return URI of the current buffer."
-  (or lsp-buffer-uri
-      (plist-get lsp--virtual-buffer :buffer-uri)
-      (lsp--path-to-uri
-       (or (buffer-file-name) (buffer-file-name (buffer-base-buffer))))))
-
-(defun lsp-register-client-capabilities (&rest _args)
-  "Implemented only to make `company-lsp' happy.
-DELETE when `lsp-mode.el' is deleted.")
-
-(defconst lsp--url-path-allowed-chars
-  (url--allowed-chars (append '(?/) url-unreserved-chars))
-  "`url-unreserved-chars' with additional delim ?/.
-This set of allowed chars is enough for hexifying local file paths.")
-
-(defun lsp--path-to-uri-1 (path)
-  (concat lsp--uri-file-prefix
-          (--> path
-            (expand-file-name it)
-            (or (file-remote-p it 'localname t) it)
-            (url-hexify-string it lsp--url-path-allowed-chars))))
-
-(defun lsp--path-to-uri (path)
-  "Convert PATH to a uri."
-  (if-let ((uri-fn (->> (lsp-workspaces)
-                        (-keep (-compose #'lsp--client-path->uri-fn #'lsp--workspace-client))
-                        (cl-first))))
-      (funcall uri-fn path)
-    (lsp--path-to-uri-1 path)))
-
-(defun lsp--string-match-any (regex-list str)
-  "Return the first regex, if any, within REGEX-LIST matching STR."
-  (--first (string-match it str) regex-list))
-
-(cl-defstruct lsp-watch
-  (descriptors (make-hash-table :test 'equal))
-  root-directory)
-
-(defun lsp--folder-watch-callback (event callback watch ignored-files ignored-directories)
-  (let ((file-name (cl-third event))
-        (event-type (cl-second event)))
-    (cond
-     ((and (file-directory-p file-name)
-           (equal 'created event-type)
-           (not (lsp--string-match-any ignored-directories file-name)))
-
-      (lsp-watch-root-folder (file-truename file-name) callback ignored-files ignored-directories watch)
-
-      ;; process the files that are already present in
-      ;; the directory.
-      (->> (directory-files-recursively file-name ".*" t)
-           (seq-do (lambda (f)
-                     (unless (file-directory-p f)
-                       (funcall callback (list nil 'created f)))))))
-     ((and (memq event-type '(created deleted changed))
-           (not (file-directory-p file-name))
-           (not (lsp--string-match-any ignored-files file-name)))
-      (funcall callback event))
-     ((and (memq event-type '(renamed))
-           (not (file-directory-p file-name))
-           (not (lsp--string-match-any ignored-files file-name)))
-      (funcall callback `(,(cl-first event) deleted ,(cl-third event)))
-      (funcall callback `(,(cl-first event) created ,(cl-fourth event)))))))
-
-(defun lsp--ask-about-watching-big-repo (number-of-directories dir)
-  "Ask the user if they want to watch NUMBER-OF-DIRECTORIES from a repository DIR.
-This is useful when there is a lot of files in a repository, as
-that may slow Emacs down. Returns t if the user wants to watch
-the entire repository, nil otherwise."
-  (prog1
-      (yes-or-no-p
-       (format
-        "Watching all the files in %s would require adding watches to %s directories, so watching the repo may slow Emacs down.
-Do you want to watch all files in %s? "
-        dir
-        number-of-directories
-        dir))
-    (lsp--info
-     (concat "You can configure this warning with the `lsp-enable-file-watchers' "
-             "and `lsp-file-watch-threshold' variables"))))
-
-
-(defun lsp--path-is-watchable-directory (path dir ignored-directories)
-  "Figure out whether PATH (inside of DIR) is meant to have a file watcher set.
-IGNORED-DIRECTORIES is a list of regexes to filter out directories we don't
-want to watch."
-  (let
-      ((full-path (f-join dir path)))
-    (and (file-accessible-directory-p full-path)
-         (not (equal path "."))
-         (not (equal path ".."))
-         (not (lsp--string-match-any ignored-directories full-path)))))
-
-
-(defun lsp--all-watchable-directories (dir ignored-directories)
-  "Traverse DIR recursively returning a list of paths that should have watchers.
-IGNORED-DIRECTORIES will be used for exclusions"
-  (let* ((dir (if (f-symlink? dir)
-                  (file-truename dir)
-                dir)))
-    (apply #'nconc
-           ;; the directory itself is assumed to be part of the set
-           (list dir)
-           ;; collect all subdirectories that are watchable
-           (-map
-            (lambda (path) (lsp--all-watchable-directories (f-join dir path) ignored-directories))
-            ;; but only look at subdirectories that are watchable
-            (-filter (lambda (path) (lsp--path-is-watchable-directory path dir ignored-directories))
-                     (directory-files dir))))))
-
-(defun lsp-watch-root-folder (dir callback ignored-files ignored-directories &optional watch warn-big-repo?)
-  "Create recursive file notification watch in DIR.
-CALLBACK will be called when there are changes in any of
-the monitored files. WATCHES is a hash table directory->file
-notification handle which contains all of the watch that
-already have been created. Watches will not be created for
-any directory that matches any regex in IGNORED-DIRECTORIES.
-Watches will not be created for any file that matches any
-regex in IGNORED-FILES."
-  (let* ((dir (if (f-symlink? dir)
-                  (file-truename dir)
-                dir))
-         (watch (or watch (make-lsp-watch :root-directory dir)))
-         (dirs-to-watch (lsp--all-watchable-directories dir ignored-directories)))
-    (lsp-log "Creating watchers for following %s folders:\n  %s"
-             (length dirs-to-watch)
-             (s-join "\n  " dirs-to-watch))
-    (when (or
-           (not warn-big-repo?)
-           (not lsp-file-watch-threshold)
-           (let ((number-of-directories (length dirs-to-watch)))
-             (or
-              (< number-of-directories lsp-file-watch-threshold)
-              (condition-case nil
-                  (lsp--ask-about-watching-big-repo number-of-directories dir)
-                (quit)))))
-      (dolist (current-dir dirs-to-watch)
-        (condition-case err
-            (progn
-              (puthash
-               current-dir
-               (file-notify-add-watch current-dir
-                                      '(change)
-                                      (lambda (event)
-                                        (lsp--folder-watch-callback event callback watch ignored-files ignored-directories)))
-               (lsp-watch-descriptors watch)))
-          (error (lsp-log "Failed to create a watch for %s: message" (error-message-string err)))
-          (file-missing (lsp-log "Failed to create a watch for %s: message" (error-message-string err))))))
-    watch))
-
-(defun lsp-kill-watch (watch)
-  "Delete WATCH."
-  (-> watch lsp-watch-descriptors hash-table-values (-each #'file-notify-rm-watch))
-  (ht-clear! (lsp-watch-descriptors watch)))
-
-(defun lsp-json-bool (val)
-  "Convert VAL to JSON boolean."
-  (if val t :json-false))
-
-(defmacro with-lsp-workspace (workspace &rest body)
-  "Helper macro for invoking BODY in WORKSPACE context."
-  (declare (debug (form body))
-           (indent 1))
-  `(let ((lsp--cur-workspace ,workspace)) ,@body))
-
-(defmacro with-lsp-workspaces (workspaces &rest body)
-  "Helper macro for invoking BODY against multiple WORKSPACES."
-  (declare (debug (form body))
-           (indent 1))
-  `(let ((lsp--buffer-workspaces ,workspaces)) ,@body))
-
-
-
-(defmacro lsp-consistency-check (package)
-  `(defconst ,(intern (concat (symbol-name package)
-                              "-plist-value-when-compiled"))
-     (eval-when-compile lsp-use-plists)))
-
-
-;; loading code-workspace files
-
-;;;###autoload
-(defun lsp-load-vscode-workspace (file)
-  "Load vscode workspace from FILE"
-  (interactive "fSelect file to import: ")
-  (mapc #'lsp-workspace-folders-remove (lsp-session-folders (lsp-session)))
-
-  (let ((dir (f-dirname file)))
-    (->> file
-         (json-read-file)
-         (alist-get 'folders)
-         (-map (-lambda ((&alist 'path))
-                 (lsp-workspace-folders-add (expand-file-name path dir)))))))
-
-;;;###autoload
-(defun lsp-save-vscode-workspace (file)
-  "Save vscode workspace to FILE"
-  (interactive "FSelect file to save to: ")
-
-  (let ((json-encoding-pretty-print t))
-    (f-write-text (json-encode
-                   `((folders . ,(->> (lsp-session)
-                                      (lsp-session-folders)
-                                      (--map `((path . ,it)))))))
-                  'utf-8
-                  file)))
-
-
-(defmacro lsp-foreach-workspace (&rest body)
-  "Execute BODY for each of the current workspaces."
-  (declare (debug (form body)))
-  `(--map (with-lsp-workspace it ,@body) (lsp-workspaces)))
-
-(defmacro when-lsp-workspace (workspace &rest body)
-  "Helper macro for invoking BODY in WORKSPACE context if present."
-  (declare (debug (form body))
-           (indent 1))
-  `(when-let ((lsp--cur-workspace ,workspace)) ,@body))
-
-(lsp-defun lsp--window-show-quick-pick (_workspace (&ShowQuickPickParams :place-holder :can-pick-many :items))
-  (if-let* ((selectfunc (if can-pick-many #'completing-read-multiple #'completing-read))
-            (itemLabels (seq-map (-lambda ((item &as &QuickPickItem :label)) (format "%s" label))
-                                 items))
-            (result (funcall-interactively
-                     selectfunc
-                     (format "%s%s " place-holder (if can-pick-many " (* for all)" "")) itemLabels))
-            (choices (if (listp result)
-                         (if (equal result '("*"))
-                             itemLabels
-                           result)
-                       (list result))))
-      (vconcat (seq-filter #'identity (seq-map (-lambda ((item &as &QuickPickItem :label :user-data))
-                                                 (if (member label choices)
-                                                     (lsp-make-quick-pick-item :label label :picked t :user-data user-data)
-                                                   nil))
-                                               items)))))
-
-(lsp-defun lsp--window-show-input-box (_workspace (&ShowInputBoxParams :prompt :value?))
-  (read-string (format "%s: " prompt) (or value? "")))
-
-(lsp-defun lsp--window-show-message (_workspace (&ShowMessageRequestParams :message :type))
-  "Send the server's messages to log.
-PARAMS - the data sent from _WORKSPACE."
-  (funcall (cl-case type
-             (1 'lsp--error)
-             (2 'lsp--warn)
-             (t 'lsp--info))
-           "%s"
-           message))
-
-(lsp-defun lsp--window-log-message (workspace (&ShowMessageRequestParams :message :type))
-  "Send the server's messages to log.
-PARAMS - the data sent from WORKSPACE."
-  (ignore
-   (let ((client (lsp--workspace-client workspace)))
-     (when (or (not client)
-               (cl-notany (-rpartial #'string-match-p message)
-                          (lsp--client-ignore-messages client)))
-       (lsp-log "%s" (lsp--propertize message type))))))
-
-(lsp-defun lsp--window-log-message-request ((&ShowMessageRequestParams :message :type :actions?))
-  "Display a message request to user sending the user selection back to server."
-  (let* ((message (lsp--propertize message type))
-         (choices (seq-map #'lsp:message-action-item-title actions?)))
-    (if choices
-        (completing-read (concat message " ") (seq-into choices 'list) nil t)
-      (lsp-log message))))
-
-(lsp-defun lsp--window-show-document ((&ShowDocumentParams :uri :selection?))
-  "Show document URI in a buffer and go to SELECTION if any."
-  (let ((path (lsp--uri-to-path uri)))
-    (when (f-exists? path)
-      (with-current-buffer (find-file path)
-        (when selection?
-          (goto-char (lsp--position-to-point (lsp:range-start selection?))))
-        t))))
-
-(defcustom lsp-progress-prefix "⌛ "
-  "Progress prefix."
-  :group 'lsp-mode
-  :type 'string
-  :package-version '(lsp-mode . "8.0.0"))
-
-(defcustom lsp-progress-function #'lsp-on-progress-modeline
-  "Function for handling the progress notifications."
-  :group 'lsp-mode
-  :type '(choice
-          (const :tag "Use modeline" lsp-on-progress-modeline)
-          (const :tag "Legacy(uses either `progress-reporter' or `spinner' based on `lsp-progress-via-spinner')"
-                 lsp-on-progress-legacy)
-          (const :tag "Ignore" ignore)
-          (function :tag "Other function"))
-  :package-version '(lsp-mode . "8.0.0"))
-
-(defcustom lsp-request-while-no-input-may-block nil
-  "Have `lsp-request-while-no-input` block unless `non-essential` is t."
-  :group 'lsp-mode
-  :type 'boolean)
-
-(defun lsp--progress-status ()
-  "Returns the status of the progress for the current workspaces."
-  (-let ((progress-status
-          (s-join
-           "|"
-           (-keep
-            (lambda (workspace)
-              (let ((tokens (lsp--workspace-work-done-tokens workspace)))
-                (unless (ht-empty? tokens)
-                  (mapconcat
-                   (-lambda ((&WorkDoneProgressBegin :message? :title :percentage?))
-                     (concat (if percentage?
-                                 (if (numberp percentage?)
-                                     (format "%.0f%%%% " percentage?)
-                                   (format "%s%%%% " percentage?))
-                               "")
-                             (or message? title)))
-                   (ht-values tokens)
-                   "|"))))
-            (lsp-workspaces)))))
-    (unless (s-blank? progress-status)
-      (concat lsp-progress-prefix progress-status " "))))
-
-(lsp-defun lsp-on-progress-modeline (workspace (&ProgressParams :token :value
-                                                                (value &as &WorkDoneProgress :kind)))
-  "PARAMS contains the progress data.
-WORKSPACE is the workspace that contains the progress token."
-  (add-to-list 'global-mode-string '(t (:eval (lsp--progress-status))))
-  (pcase kind
-    ("begin" (lsp-workspace-set-work-done-token token value workspace))
-    ("report" (lsp-workspace-set-work-done-token token value workspace))
-    ("end" (lsp-workspace-rem-work-done-token token workspace)))
-  (force-mode-line-update))
-
-(lsp-defun lsp-on-progress-legacy (workspace (&ProgressParams :token :value
-                                                              (value &as &WorkDoneProgress :kind)))
-  "PARAMS contains the progress data.
-WORKSPACE is the workspace that contains the progress token."
-  (pcase kind
-    ("begin"
-     (-let* (((&WorkDoneProgressBegin :title :percentage?) value)
-             (reporter
-              (if lsp-progress-via-spinner
-                  (let* ((spinner-strings (alist-get (lsp-progress-spinner-type) spinner-types))
-                         ;; Set message as a tooltip for the spinner strings
-                         (propertized-strings
-                          (seq-map (lambda (string) (propertize string 'help-echo title))
-                                   spinner-strings))
-                         (spinner-type (vconcat propertized-strings)))
-                    ;; The progress relates to the server as a whole,
-                    ;; display it on all buffers.
-                    (mapcar (lambda (buffer)
-                              (lsp-with-current-buffer buffer
-                                (spinner-start spinner-type))
-                              buffer)
-                            (lsp--workspace-buffers workspace)))
-                (if percentage?
-                    (make-progress-reporter title 0 100 percentage?)
-                  ;; No percentage, just progress
-                  (make-progress-reporter title nil nil)))))
-       (lsp-workspace-set-work-done-token token reporter workspace)))
-    ("report"
-     (when-let ((reporter (lsp-workspace-get-work-done-token token workspace)))
-       (unless lsp-progress-via-spinner
-         (progress-reporter-update reporter (lsp:work-done-progress-report-percentage? value)))))
-
-    ("end"
-     (when-let ((reporter (lsp-workspace-get-work-done-token token workspace)))
-       (if lsp-progress-via-spinner
-           (mapc (lambda (buffer)
-                   (when (lsp-buffer-live-p buffer)
-                     (lsp-with-current-buffer buffer
-                       (spinner-stop))))
-                 reporter)
-         (progress-reporter-done reporter))
-       (lsp-workspace-rem-work-done-token token workspace)))))
-
-
-;; diagnostics
-
-(defvar lsp-diagnostic-filter nil
-  "A a function which will be called with
-  `&PublishDiagnosticsParams' and `workspace' which can be used
-  to filter out the diagnostics. The function should return
-  `&PublishDiagnosticsParams'.
-
-Common usecase are:
-1. Filter the diagnostics for a particular language server.
-2. Filter out the diagnostics under specific level.")
-
-(defvar lsp-diagnostic-stats (ht))
-
-(defun lsp-diagnostics (&optional current-workspace?)
-  "Return the diagnostics from all workspaces."
-  (or (pcase (if current-workspace?
-                 (lsp-workspaces)
-               (lsp--session-workspaces (lsp-session)))
-        (`() ())
-        (`(,workspace) (lsp--workspace-diagnostics workspace))
-        (`,workspaces (let ((result (make-hash-table :test 'equal)))
-                        (mapc (lambda (workspace)
-                                (->> workspace
-                                     (lsp--workspace-diagnostics)
-                                     (maphash (lambda (file-name diagnostics)
-                                                (puthash file-name
-                                                         (append (gethash file-name result) diagnostics)
-                                                         result)))))
-                              workspaces)
-                        result)))
-      (ht)))
-
-(defun lsp-diagnostics-stats-for (path)
-  "Get diagnostics statistics for PATH.
-The result format is vector [_ errors warnings infos hints] or nil."
-  (gethash (lsp--fix-path-casing path) lsp-diagnostic-stats))
-
-(defun lsp-diagnostics--request-pull-diagnostics (workspace)
-  "Request new diagnostics for the current file within WORKSPACE.
-This is only executed if the server supports pull diagnostics."
-  (when (lsp-feature? "textDocument/diagnostic")
-    (let ((path (lsp--fix-path-casing (buffer-file-name))))
-      (lsp-request-async "textDocument/diagnostic"
-                         (list :textDocument (lsp--text-document-identifier))
-                         (-lambda ((&DocumentDiagnosticReport :kind :items?))
-                           (lsp-diagnostics--apply-pull-diagnostics workspace path kind items?))
-                         :mode 'tick))))
-
-(defun lsp-diagnostics--update-path (path new-stats)
-  (let ((new-stats (copy-sequence new-stats))
-        (path (lsp--fix-path-casing (directory-file-name path))))
-    (if-let ((old-data (gethash path lsp-diagnostic-stats)))
-        (dotimes (idx 5)
-          (cl-callf + (aref old-data idx)
-            (aref new-stats idx)))
-      (puthash path new-stats lsp-diagnostic-stats))))
-
-(defun lsp-diagnostics--convert-and-update-path-stats (workspace path diagnostics)
-  (let ((path (lsp--fix-path-casing path))
-        (new-stats (make-vector 5 0)))
-    (mapc (-lambda ((&Diagnostic :severity?))
-            (cl-incf (aref new-stats (or severity? 1))))
-          diagnostics)
-    (when-let ((old-diags (gethash path (lsp--workspace-diagnostics workspace))))
-      (mapc (-lambda ((&Diagnostic :severity?))
-              (cl-decf (aref new-stats (or severity? 1))))
-            old-diags))
-    (lsp-diagnostics--update-path path new-stats)
-    (while (not (string= path (setf path (file-name-directory
-                                          (directory-file-name path)))))
-      (lsp-diagnostics--update-path path new-stats))))
-
-(lsp-defun lsp--on-diagnostics-update-stats (workspace
-                                             (&PublishDiagnosticsParams :uri :diagnostics))
-  (lsp-diagnostics--convert-and-update-path-stats workspace (lsp--uri-to-path uri) diagnostics))
-
-(defun lsp-diagnostics--apply-pull-diagnostics (workspace path kind diagnostics?)
-  "Update WORKSPACE diagnostics at PATH with DIAGNOSTICS?.
-Depends on KIND being a \\='full\\=' update."
-  (cond
-   ((equal kind "full")
-    ;; TODO support `lsp-diagnostic-filter'
-    ;; (the params types differ from the published diagnostics response)
-    (lsp-diagnostics--convert-and-update-path-stats workspace path diagnostics?)
-    (-let* ((lsp--virtual-buffer-mappings (ht))
-            (workspace-diagnostics (lsp--workspace-diagnostics workspace)))
-      (if (seq-empty-p diagnostics?)
-          (remhash path workspace-diagnostics)
-        (puthash path (append diagnostics? nil) workspace-diagnostics))
-      (run-hooks 'lsp-diagnostics-updated-hook)))
-    ((equal kind "unchanged") t)
-    (t (lsp--error "Unknown pull diagnostic result kind '%s'" kind))))
-
-(defun lsp--on-diagnostics (workspace params)
-  "Callback for textDocument/publishDiagnostics.
-interface PublishDiagnosticsParams {
-    uri: string;
-    diagnostics: Diagnostic[];
-}
-PARAMS contains the diagnostics data.
-WORKSPACE is the workspace that contains the diagnostics."
-  (when lsp-diagnostic-filter
-    (setf params (funcall lsp-diagnostic-filter params workspace)))
-
-  (lsp--on-diagnostics-update-stats workspace params)
-
-  (-let* (((&PublishDiagnosticsParams :uri :diagnostics) params)
-          (lsp--virtual-buffer-mappings (ht))
-          (file (lsp--fix-path-casing (lsp--uri-to-path uri)))
-          (workspace-diagnostics (lsp--workspace-diagnostics workspace)))
-
-    (if (seq-empty-p diagnostics)
-        (remhash file workspace-diagnostics)
-      (puthash file (append diagnostics nil) workspace-diagnostics))
-
-    (run-hooks 'lsp-diagnostics-updated-hook)))
-
-(defun lsp-diagnostics--workspace-cleanup (workspace)
-  (->> workspace
-       (lsp--workspace-diagnostics)
-       (maphash (lambda (key _)
-                  (lsp--on-diagnostics-update-stats
-                   workspace
-                   (lsp-make-publish-diagnostics-params
-                    :uri (lsp--path-to-uri key)
-                    :diagnostics [])))))
-  (clrhash (lsp--workspace-diagnostics workspace)))
-
-
-
-;; textDocument/foldingRange support
-
-(cl-defstruct lsp--folding-range beg end kind children)
-
-(defvar-local lsp--cached-folding-ranges nil)
-(defvar-local lsp--cached-nested-folding-ranges nil)
-
-(defun lsp--folding-range-width (range)
-  (- (lsp--folding-range-end range)
-     (lsp--folding-range-beg range)))
-
-(defun lsp--get-folding-ranges ()
-  "Get the folding ranges for the current buffer."
-  (unless (eq (buffer-chars-modified-tick) (car lsp--cached-folding-ranges))
-    (let* ((ranges (lsp-request "textDocument/foldingRange"
-                                `(:textDocument ,(lsp--text-document-identifier))))
-           (sorted-line-col-pairs (->> ranges
-                                       (cl-mapcan (-lambda ((&FoldingRange :start-line
-                                                                           :start-character?
-                                                                           :end-line
-                                                                           :end-character?))
-                                                    (list (cons start-line start-character?)
-                                                          (cons end-line end-character?))))
-                                       (-sort #'lsp--line-col-comparator)))
-           (line-col-to-point-map (lsp--convert-line-col-to-points-batch
-                                   sorted-line-col-pairs)))
-      (setq lsp--cached-folding-ranges
-            (cons (buffer-chars-modified-tick)
-                  (--> ranges
-                    (seq-map (-lambda ((range &as
-                                              &FoldingRange :start-line
-                                              :start-character?
-                                              :end-line
-                                              :end-character?
-                                              :kind?))
-                               (make-lsp--folding-range
-                                :beg (ht-get line-col-to-point-map
-                                             (cons start-line start-character?))
-                                :end (ht-get line-col-to-point-map
-                                             (cons end-line end-character?))
-                                :kind kind?))
-                             it)
-                    (seq-filter (lambda (folding-range)
-                                  (< (lsp--folding-range-beg folding-range)
-                                     (lsp--folding-range-end folding-range)))
-                                it)
-                    (seq-into it 'list)
-                    (delete-dups it))))))
-  (cdr lsp--cached-folding-ranges))
-
-(defun lsp--get-nested-folding-ranges ()
-  "Get a list of nested folding ranges for the current buffer."
-  (-let [(tick . _) lsp--cached-folding-ranges]
-    (if (and (eq tick (buffer-chars-modified-tick))
-             lsp--cached-nested-folding-ranges)
-        lsp--cached-nested-folding-ranges
-      (setq lsp--cached-nested-folding-ranges
-            (lsp--folding-range-build-trees (lsp--get-folding-ranges))))))
-
-(defun lsp--folding-range-build-trees (ranges)
-  (setq ranges (seq-sort #'lsp--range-before-p ranges))
-  (let* ((dummy-node (make-lsp--folding-range
-                      :beg most-negative-fixnum
-                      :end most-positive-fixnum))
-         (stack (list dummy-node)))
-    (dolist (range ranges)
-      (while (not (lsp--range-inside-p range (car stack)))
-        (pop stack))
-      (push range (lsp--folding-range-children (car stack)))
-      (push range stack))
-    (lsp--folding-range-children dummy-node)))
-
-(defun lsp--range-inside-p (r1 r2)
-  "Return non-nil if folding range R1 lies inside R2"
-  (and (>= (lsp--folding-range-beg r1) (lsp--folding-range-beg r2))
-       (<= (lsp--folding-range-end r1) (lsp--folding-range-end r2))))
-
-(defun lsp--range-before-p (r1 r2)
-  "Return non-nil if folding range R1 ends before R2"
-  ;; Ensure r1 comes before r2
-  (or (< (lsp--folding-range-beg r1)
-         (lsp--folding-range-beg r2))
-      ;; If beg(r1) == beg(r2) make sure r2 ends first
-      (and (= (lsp--folding-range-beg r1)
-              (lsp--folding-range-beg r2))
-           (< (lsp--folding-range-end r2)
-              (lsp--folding-range-end r1)))))
-
-(defun lsp--point-inside-range-p (point range)
-  "Return non-nil if POINT lies inside folding range RANGE."
-  (and (>= point (lsp--folding-range-beg range))
-       (<= point (lsp--folding-range-end range))))
-
-(cl-defun lsp--get-current-innermost-folding-range (&optional (point (point)))
-  "Return the innermost folding range POINT lies in."
-  (seq-reduce (lambda (innermost-range curr-range)
-                (if (and (lsp--point-inside-range-p point curr-range)
-                         (or (null innermost-range)
-                             (lsp--range-inside-p curr-range innermost-range)))
-                    curr-range
-                  innermost-range))
-              (lsp--get-folding-ranges)
-              nil))
-
-(cl-defun lsp--get-current-outermost-folding-range (&optional (point (point)))
-  "Return the outermost folding range POINT lies in."
-  (cdr (seq-reduce (-lambda ((best-pair &as outermost-width . _) curr-range)
-                     (let ((curr-width (lsp--folding-range-width curr-range)))
-                       (if (and (lsp--point-inside-range-p point curr-range)
-                                (or (null best-pair)
-                                    (> curr-width outermost-width)))
-                           (cons curr-width curr-range)
-                         best-pair)))
-                   (lsp--get-folding-ranges)
-                   nil)))
-
-(defun lsp--folding-range-at-point-bounds ()
-  (when (and lsp-enable-folding
-             (lsp-feature? "textDocument/foldingRange"))
-    (if-let ((range (lsp--get-current-innermost-folding-range)))
-        (cons (lsp--folding-range-beg range)
-              (lsp--folding-range-end range)))))
-(put 'lsp--folding-range 'bounds-of-thing-at-point
-     #'lsp--folding-range-at-point-bounds)
-
-(defun lsp--get-nearest-folding-range (&optional backward)
-  (let ((point (point))
-        (found nil))
-    (while (not
-            (or found
-                (if backward
-                    (<= point (point-min))
-                  (>= point (point-max)))))
-      (if backward (cl-decf point) (cl-incf point))
-      (setq found (lsp--get-current-innermost-folding-range point)))
-    found))
-
-(defun lsp--folding-range-at-point-forward-op (n)
-  (when (and lsp-enable-folding
-             (not (zerop n))
-             (lsp-feature? "textDocument/foldingRange"))
-    (cl-block break
-      (dotimes (_ (abs n))
-        (if-let ((range (lsp--get-nearest-folding-range (< n 0))))
-            (goto-char (if (< n 0)
-                           (lsp--folding-range-beg range)
-                         (lsp--folding-range-end range)))
-          (cl-return-from break))))))
-(put 'lsp--folding-range 'forward-op
-     #'lsp--folding-range-at-point-forward-op)
-
-(defun lsp--folding-range-at-point-beginning-op ()
-  (goto-char (car (lsp--folding-range-at-point-bounds))))
-(put 'lsp--folding-range 'beginning-op
-     #'lsp--folding-range-at-point-beginning-op)
-
-(defun lsp--folding-range-at-point-end-op ()
-  (goto-char (cdr (lsp--folding-range-at-point-bounds))))
-(put 'lsp--folding-range 'end-op
-     #'lsp--folding-range-at-point-end-op)
-
-(defun lsp--range-at-point-bounds ()
-  (or (lsp--folding-range-at-point-bounds)
-      (when-let ((range (and
-                         (lsp-feature? "textDocument/hover")
-                         (->> (lsp--text-document-position-params)
-                              (lsp-request "textDocument/hover")
-                              (lsp:hover-range?)))))
-        (lsp--range-to-region range))))
-
-;; A more general purpose "thing", useful for applications like focus.el
-(put 'lsp--range 'bounds-of-thing-at-point
-     #'lsp--range-at-point-bounds)
-
-(defun lsp--log-io-p (method)
-  "Return non nil if should log for METHOD."
-  (and lsp-log-io
-       (or (not lsp-log-io-allowlist-methods)
-           (member method lsp-log-io-allowlist-methods))))
-
-
-;; toggles
-
-(defun lsp-toggle-trace-io ()
-  "Toggle client-server protocol logging."
-  (interactive)
-  (setq lsp-log-io (not lsp-log-io))
-  (lsp--info "Server logging %s." (if lsp-log-io "enabled" "disabled")))
-
-(defun lsp-toggle-signature-auto-activate ()
-  "Toggle signature auto activate."
-  (interactive)
-  (setq lsp-signature-auto-activate
-        (unless lsp-signature-auto-activate '(:on-trigger-char)))
-  (lsp--info "Signature autoactivate %s." (if lsp-signature-auto-activate "enabled" "disabled"))
-  (lsp--update-signature-help-hook))
-
-(defun lsp-toggle-on-type-formatting ()
-  "Toggle on type formatting."
-  (interactive)
-  (setq lsp-enable-on-type-formatting (not lsp-enable-on-type-formatting))
-  (lsp--info "On type formatting is %s." (if lsp-enable-on-type-formatting "enabled" "disabled"))
-  (lsp--update-on-type-formatting-hook))
-
-(defun lsp-toggle-symbol-highlight ()
-  "Toggle symbol highlighting."
-  (interactive)
-  (setq lsp-enable-symbol-highlighting (not lsp-enable-symbol-highlighting))
-
-  (cond
-   ((and lsp-enable-symbol-highlighting
-         (lsp-feature? "textDocument/documentHighlight"))
-    (add-hook 'lsp-on-idle-hook #'lsp--document-highlight nil t)
-    (lsp--info "Symbol highlighting enabled in current buffer."))
-   ((not lsp-enable-symbol-highlighting)
-    (remove-hook 'lsp-on-idle-hook #'lsp--document-highlight t)
-    (lsp--remove-overlays 'lsp-highlight)
-    (lsp--info "Symbol highlighting disabled in current buffer."))))
-
-
-;; keybindings
-(defvar lsp--binding-descriptions nil
-  "List of key binding/short description pair.")
-
-(defmacro lsp-define-conditional-key (keymap key def desc cond &rest bindings)
-  "In KEYMAP, define key sequence KEY as DEF conditionally.
-This is like `define-key', except the definition disappears
-whenever COND evaluates to nil.
-DESC is the short-description for the binding.
-BINDINGS is a list of (key def desc cond)."
-  (declare (indent defun)
-           (debug (form form form form form &rest sexp)))
-  (->> (cl-list* key def desc cond bindings)
-       (-partition 4)
-       (-mapcat (-lambda ((key def desc cond))
-                  `((define-key ,keymap ,key
-                      '(menu-item
-                        ,(format "maybe-%s" def)
-                        ,def
-                        :filter
-                        (lambda (item)
-                          (when (with-current-buffer (or (when (buffer-live-p lsp--describe-buffer)
-                                                           lsp--describe-buffer)
-                                                         (current-buffer))
-                                  ,cond)
-                            item))))
-                    (when (stringp ,key)
-                      (setq lsp--binding-descriptions
-                            (append lsp--binding-descriptions '(,key ,desc)))))))
-       macroexp-progn))
-
-(defvar lsp--describe-buffer nil)
-
-(defun lsp-describe-buffer-bindings-advice (fn buffer &optional prefix menus)
-  (let ((lsp--describe-buffer buffer))
-    (funcall fn buffer prefix menus)))
-
-(advice-add 'describe-buffer-bindings
-            :around
-            #'lsp-describe-buffer-bindings-advice)
-
-(defun lsp--prepend-prefix (mappings)
-  (->> mappings
-       (-partition 2)
-       (-mapcat (-lambda ((key description))
-                  (list (concat lsp-keymap-prefix " " key)
-                        description)))))
-
-(defvar lsp-command-map
-  (-doto (make-sparse-keymap)
-    (lsp-define-conditional-key
-      ;; workspaces
-      "wD" lsp-disconnect "disconnect" (lsp-workspaces)
-      "wd" lsp-describe-session "describe session" t
-      "wq" lsp-workspace-shutdown "shutdown server" (lsp-workspaces)
-      "wr" lsp-workspace-restart "restart server" (lsp-workspaces)
-      "ws" lsp "start server" t
-
-      ;; formatting
-      "==" lsp-format-buffer "format buffer" (or (lsp-feature? "textDocument/rangeFormatting")
-                                                 (lsp-feature? "textDocument/formatting"))
-      "=r" lsp-format-region "format region" (lsp-feature? "textDocument/rangeFormatting")
-
-      ;; folders
-      "Fa" lsp-workspace-folders-add "add folder" t
-      "Fb" lsp-workspace-blocklist-remove "un-blocklist folder" t
-      "Fr" lsp-workspace-folders-remove "remove folder" t
-
-      ;; toggles
-      "TD" lsp-modeline-diagnostics-mode "toggle modeline diagnostics" (lsp-feature?
-                                                                        "textDocument/publishDiagnostics")
-      "TL" lsp-toggle-trace-io "toggle log io" t
-      "TS" lsp-ui-sideline-mode "toggle sideline" (featurep 'lsp-ui-sideline)
-      "TT" lsp-treemacs-sync-mode "toggle treemacs integration" (featurep 'lsp-treemacs)
-      "Ta" lsp-modeline-code-actions-mode "toggle modeline code actions" (lsp-feature?
-                                                                          "textDocument/codeAction")
-      "Tb" lsp-headerline-breadcrumb-mode "toggle breadcrumb" (lsp-feature?
-                                                               "textDocument/documentSymbol")
-      "Td" lsp-ui-doc-mode "toggle documentation popup" (featurep 'lsp-ui-doc)
-      "Tf" lsp-toggle-on-type-formatting "toggle on type formatting" (lsp-feature?
-                                                                      "textDocument/onTypeFormatting")
-      "Th" lsp-toggle-symbol-highlight "toggle highlighting" (lsp-feature? "textDocument/documentHighlight")
-      "Tl" lsp-lens-mode "toggle lenses" (lsp-feature? "textDocument/codeLens")
-      "Ts" lsp-toggle-signature-auto-activate "toggle signature" (lsp-feature? "textDocument/signatureHelp")
-
-      ;; goto
-      "ga" xref-find-apropos "find symbol in workspace" (lsp-feature? "workspace/symbol")
-      "gd" lsp-find-declaration "find declarations" (lsp-feature? "textDocument/declaration")
-      "ge" lsp-treemacs-errors-list "show errors" (fboundp 'lsp-treemacs-errors-list)
-      "gg" lsp-find-definition "find definitions" (lsp-feature? "textDocument/definition")
-      "gh" lsp-treemacs-call-hierarchy "call hierarchy" (and (lsp-feature? "callHierarchy/incomingCalls")
-                                                             (fboundp 'lsp-treemacs-call-hierarchy))
-      "gi" lsp-find-implementation "find implementations" (lsp-feature? "textDocument/implementation")
-      "gr" lsp-find-references "find references" (lsp-feature? "textDocument/references")
-      "gt" lsp-find-type-definition "find type definition" (lsp-feature? "textDocument/typeDefinition")
-
-      ;; help
-      "hg" lsp-ui-doc-glance "glance symbol" (and (featurep 'lsp-ui-doc)
-                                                  (lsp-feature? "textDocument/hover"))
-      "hh" lsp-describe-thing-at-point "describe symbol at point" (lsp-feature? "textDocument/hover")
-      "hs" lsp-signature-activate "signature help" (lsp-feature? "textDocument/signatureHelp")
-
-      ;; refactoring
-      "ro" lsp-organize-imports "organize imports" (lsp-feature? "textDocument/codeAction")
-      "rr" lsp-rename "rename" (lsp-feature? "textDocument/rename")
-
-      ;; actions
-      "aa" lsp-execute-code-action "code actions" (lsp-feature? "textDocument/codeAction")
-      "ah" lsp-document-highlight "highlight symbol" (lsp-feature? "textDocument/documentHighlight")
-      "al" lsp-avy-lens "lens" (and (bound-and-true-p lsp-lens-mode) (featurep 'avy))
-
-      ;; peeks
-      "Gg" lsp-ui-peek-find-definitions "peek definitions" (and (lsp-feature? "textDocument/definition")
-                                                                (fboundp 'lsp-ui-peek-find-definitions))
-      "Gi" lsp-ui-peek-find-implementation "peek implementations" (and
-                                                                   (fboundp 'lsp-ui-peek-find-implementation)
-                                                                   (lsp-feature? "textDocument/implementation"))
-      "Gr" lsp-ui-peek-find-references "peek references" (and (fboundp 'lsp-ui-peek-find-references)
-                                                              (lsp-feature? "textDocument/references"))
-      "Gs" lsp-ui-peek-find-workspace-symbol "peek workspace symbol" (and (fboundp
-                                                                           'lsp-ui-peek-find-workspace-symbol)
-                                                                          (lsp-feature? "workspace/symbol")))))
-
-
-;; which-key integration
-
-(declare-function which-key-add-major-mode-key-based-replacements "ext:which-key")
-(declare-function which-key-add-key-based-replacements "ext:which-key")
-
-(defun lsp-enable-which-key-integration (&optional all-modes)
-  "Adds descriptions for `lsp-mode-map' to `which-key-mode' for the current
-active `major-mode', or for all major modes when ALL-MODES is t."
-  (cl-flet ((which-key-fn (if all-modes
-                              'which-key-add-key-based-replacements
-                            (apply-partially 'which-key-add-major-mode-key-based-replacements major-mode))))
-    (apply
-     #'which-key-fn
-     (lsp--prepend-prefix
-      (cl-list*
-       ""    "lsp"
-       "w"   "workspaces"
-       "F"   "folders"
-       "="   "formatting"
-       "T"   "toggle"
-       "g"   "goto"
-       "h"   "help"
-       "r"   "refactor"
-       "a"   "code actions"
-       "G"   "peek"
-       lsp--binding-descriptions)))))
-
-
-;; Globbing syntax
-
-;; We port VSCode's glob-to-regexp code
-;; (https://github.com/Microsoft/vscode/blob/466da1c9013c624140f6d1473b23a870abc82d44/src/vs/base/common/glob.ts)
-;; since the LSP globbing syntax seems to be the same as that of
-;; VSCode.
-
-(defconst lsp-globstar "**"
-  "Globstar pattern.")
-
-(defconst lsp-glob-split ?/
-  "The character by which we split path components in a glob
-pattern.")
-
-(defconst lsp-path-regexp "[/\\\\]"
-  "Forward or backslash to be used as a path separator in
-computed regexps.")
-
-(defconst lsp-non-path-regexp "[^/\\\\]"
-  "A regexp matching anything other than a slash.")
-
-(defconst lsp-globstar-regexp
-  (format "\\(?:%s\\|%s+%s\\|%s%s+\\)*?"
-          lsp-path-regexp
-          lsp-non-path-regexp lsp-path-regexp
-          lsp-path-regexp lsp-non-path-regexp)
-  "Globstar in regexp form.")
-
-(defun lsp-split-glob-pattern (pattern split-char)
-  "Split PATTERN at SPLIT-CHAR while respecting braces and brackets."
-  (when pattern
-    (let ((segments nil)
-          (in-braces nil)
-          (in-brackets nil)
-          (current-segment ""))
-      (dolist (char (string-to-list pattern))
-        (cl-block 'exit-point
-          (if (eq char split-char)
-              (when (and (null in-braces)
-                         (null in-brackets))
-                (push current-segment segments)
-                (setq current-segment "")
-                (cl-return-from 'exit-point))
-            (pcase char
-              (?{
-               (setq in-braces t))
-              (?}
-               (setq in-braces nil))
-              (?\[
-               (setq in-brackets t))
-              (?\]
-               (setq in-brackets nil))))
-          (setq current-segment (concat current-segment
-                                        (char-to-string char)))))
-      (unless (string-empty-p current-segment)
-        (push current-segment segments))
-      (nreverse segments))))
-
-(defun lsp--glob-to-regexp (pattern)
-  "Helper function to convert a PATTERN from LSP's glob syntax to
-an Elisp regexp."
-  (if (string-empty-p pattern)
-      ""
-    (let ((current-regexp "")
-          (glob-segments (lsp-split-glob-pattern pattern lsp-glob-split)))
-      (if (-all? (lambda (segment) (eq segment lsp-globstar))
-                 glob-segments)
-          ".*"
-        (let ((prev-segment-was-globstar nil))
-          (seq-do-indexed
-           (lambda (segment index)
-             (if (string-equal segment lsp-globstar)
-                 (unless prev-segment-was-globstar
-                   (setq current-regexp (concat current-regexp
-                                                lsp-globstar-regexp))
-                   (setq prev-segment-was-globstar t))
-               (let ((in-braces nil)
-                     (brace-val "")
-                     (in-brackets nil)
-                     (bracket-val ""))
-                 (dolist (char (string-to-list segment))
-                   (cond
-                    ((and (not (char-equal char ?\}))
-                          in-braces)
-                     (setq brace-val (concat brace-val
-                                             (char-to-string char))))
-                    ((and in-brackets
-                          (or (not (char-equal char ?\]))
-                              (string-empty-p bracket-val)))
-                     (let ((curr (cond
-                                  ((char-equal char ?-)
-                                   "-")
-                                  ;; NOTE: ?\^ and ?^ are different characters
-                                  ((and (memq char '(?^ ?!))
-                                        (string-empty-p bracket-val))
-                                   "^")
-                                  ((char-equal char lsp-glob-split)
-                                   "")
-                                  (t
-                                   (regexp-quote (char-to-string char))))))
-                       (setq bracket-val (concat bracket-val curr))))
-                    (t
-                     (cl-case char
-                       (?{
-                        (setq in-braces t))
-                       (?\[
-                        (setq in-brackets t))
-                       (?}
-                        (let* ((choices (lsp-split-glob-pattern brace-val ?\,))
-                               (brace-regexp (concat "\\(?:"
-                                                     (mapconcat #'lsp--glob-to-regexp choices "\\|")
-                                                     "\\)")))
-                          (setq current-regexp (concat current-regexp
-                                                       brace-regexp))
-                          (setq in-braces nil)
-                          (setq brace-val "")))
-                       (?\]
-                        (setq current-regexp
-                              (concat current-regexp
-                                      "[" bracket-val "]"))
-                        (setq in-brackets nil)
-                        (setq bracket-val ""))
-                       (??
-                        (setq current-regexp
-                              (concat current-regexp
-                                      lsp-non-path-regexp)))
-                       (?*
-                        (setq current-regexp
-                              (concat current-regexp
-                                      lsp-non-path-regexp "*?")))
-                       (t
-                        (setq current-regexp
-                              (concat current-regexp
-                                      (regexp-quote (char-to-string char)))))))))
-                 (when (and (< index (1- (length glob-segments)))
-                            (or (not (string-equal (nth (1+ index) glob-segments)
-                                                   lsp-globstar))
-                                (< (+ index 2)
-                                   (length glob-segments))))
-                   (setq current-regexp
-                         (concat current-regexp
-                                 lsp-path-regexp)))
-                 (setq prev-segment-was-globstar nil))))
-           glob-segments)
-          current-regexp)))))
-
-;; See https://github.com/emacs-lsp/lsp-mode/issues/2365
-(defun lsp-glob-unbrace-at-top-level (glob-pattern)
-  "If GLOB-PATTERN does not start with a brace, return a singleton list
-containing GLOB-PATTERN.
-
-If GLOB-PATTERN does start with a brace, return a list of the
-comma-separated globs within the top-level braces."
-  (if (not (string-prefix-p "{" glob-pattern))
-      (list glob-pattern)
-    (lsp-split-glob-pattern (substring glob-pattern 1 -1) ?\,)))
-
-(defun lsp-glob-convert-to-wrapped-regexp (glob-pattern)
-  "Convert GLOB-PATTERN to a regexp wrapped with the beginning-
-and end-of-string meta-characters."
-  (concat "\\`" (lsp--glob-to-regexp (string-trim glob-pattern)) "\\'"))
-
-(defun lsp-glob-to-regexps (glob-pattern)
-  "Convert a GLOB-PATTERN to a list of Elisp regexps."
-  (when-let*
-      ((glob-pattern (cond ((hash-table-p glob-pattern)
-                            (ht-get glob-pattern "pattern"))
-                           ((stringp glob-pattern) glob-pattern)
-                           (t (error "Unknown glob-pattern type: %s" glob-pattern))))
-       (trimmed-pattern (string-trim glob-pattern))
-       (top-level-unbraced-patterns (lsp-glob-unbrace-at-top-level trimmed-pattern)))
-    (seq-map #'lsp-glob-convert-to-wrapped-regexp
-             top-level-unbraced-patterns)))
-
-
-
-(defvar lsp-mode-menu)
-
-(defun lsp-mouse-click (event)
-  (interactive "e")
-  (let* ((ec (event-start event))
-         (choice (x-popup-menu event lsp-mode-menu))
-         (action (lookup-key lsp-mode-menu (apply 'vector choice))))
-
-    (select-window (posn-window ec))
-
-    (unless (and (region-active-p) (eq action 'lsp-execute-code-action))
-      (goto-char (posn-point ec)))
-    (run-with-idle-timer
-     0.001 nil
-     (lambda ()
-       (cl-labels ((check (value) (not (null value))))
-         (when choice
-           (call-interactively action)))))))
-
-(defvar lsp-mode-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map (kbd "C-<down-mouse-1>") #'lsp-find-definition-mouse)
-    (define-key map (kbd "C-<mouse-1>") #'ignore)
-    (define-key map (kbd "<mouse-3>") #'lsp-mouse-click)
-    (define-key map (kbd "C-S-SPC") #'lsp-signature-activate)
-    (when lsp-keymap-prefix
-      (define-key map (kbd lsp-keymap-prefix) lsp-command-map))
-    map)
-  "Keymap for `lsp-mode'.")
-
-(define-minor-mode lsp-mode "Mode for LSP interaction."
-  :keymap lsp-mode-map
-  :lighter
-  (" LSP["
-   (lsp--buffer-workspaces
-    (:eval (mapconcat #'lsp--workspace-print lsp--buffer-workspaces "]["))
-    (:propertize "Disconnected" face warning))
-   "]")
-  :group 'lsp-mode
-  (when (and lsp-mode (not lsp--buffer-workspaces) (not lsp--buffer-deferred))
-    ;; fire up `lsp' when someone calls `lsp-mode' instead of `lsp'
-    (lsp)))
-
-(defvar lsp-mode-menu
-  (easy-menu-create-menu
-   nil
-   `(["Go to definition" lsp-find-definition
-      :active (lsp-feature? "textDocument/definition")]
-     ["Find references" lsp-find-references
-      :active (lsp-feature? "textDocument/references")]
-     ["Find implementations" lsp-find-implementation
-      :active (lsp-feature? "textDocument/implementation")]
-     ["Find declarations" lsp-find-declaration
-      :active (lsp-feature? "textDocument/declaration")]
-     ["Go to type declaration" lsp-find-type-definition
-      :active (lsp-feature? "textDocument/typeDefinition")]
-     "--"
-     ["Describe" lsp-describe-thing-at-point]
-     ["Code action" lsp-execute-code-action]
-     ["Format" lsp-format-buffer]
-     ["Highlight references" lsp-document-highlight]
-     ["Type Hierarchy" lsp-java-type-hierarchy
-      :visible (lsp-can-execute-command? "java.navigate.resolveTypeHierarchy")]
-     ["Type Hierarchy" lsp-treemacs-type-hierarchy
-      :visible (and (not (lsp-can-execute-command? "java.navigate.resolveTypeHierarchy"))
-                    (functionp 'lsp-treemacs-type-hierarchy)
-                    (lsp-feature? "textDocument/typeHierarchy"))]
-     ["Call Hierarchy" lsp-treemacs-call-hierarchy
-      :visible (and (functionp 'lsp-treemacs-call-hierarchy)
-                    (lsp-feature? "textDocument/callHierarchy"))]
-     ["Rename" lsp-rename
-      :active (lsp-feature? "textDocument/rename")]
-     "--"
-     ("Session"
-      ["View logs" lsp-workspace-show-log]
-      ["Describe" lsp-describe-session]
-      ["Shutdown" lsp-shutdown-workspace]
-      ["Restart" lsp-restart-workspace])
-     ("Workspace Folders"
-      ["Add" lsp-workspace-folders-add]
-      ["Remove" lsp-workspace-folders-remove]
-      ["Open" lsp-workspace-folders-open])
-     ("Toggle features"
-      ["Lenses" lsp-lens-mode]
-      ["Headerline breadcrumb" lsp-headerline-breadcrumb-mode]
-      ["Modeline code actions" lsp-modeline-code-actions-mode]
-      ["Modeline diagnostics" lsp-modeline-diagnostics-mode])
-     "---"
-     ("Debug"
-      :active (bound-and-true-p dap-ui-mode)
-      :filter ,(lambda (_)
-                 (and (boundp 'dap-ui-menu-items)
-                      (nthcdr 3 dap-ui-menu-items))))))
-  "Menu for lsp-mode.")
-
-(defalias 'make-lsp-client 'make-lsp--client)
-
-(cl-defstruct lsp--registered-capability
-  (id "")
-  (method " ")
-  (options nil))
-
-;; A ‘lsp--workspace’ object represents exactly one language server process.
-(cl-defstruct lsp--workspace
-  ;; the `ewoc' object for displaying I/O to and from the server
-  (ewoc nil)
-
-  ;; ‘server-capabilities’ is a hash table of the language server capabilities.
-  ;; It is the hash table representation of a LSP ServerCapabilities structure;
-  ;; cf. https://microsoft.github.io/language-server-protocol/specification#initialize.
-  (server-capabilities nil)
-
-  ;; ‘registered-server-capabilities’ is a list of hash tables that represent
-  ;; dynamically-registered Registration objects.  See
-  ;; https://microsoft.github.io/language-server-protocol/specification#client_registerCapability.
-  (registered-server-capabilities nil)
-
-  ;; ‘root’ is a directory name or a directory file name for the workspace
-  ;; root.  ‘lsp-mode’ passes this directory to the ‘initialize’ method of the
-  ;; language server; see
-  ;; https://microsoft.github.io/language-server-protocol/specification#initialize.
-  (root nil)
-
-  ;; ‘client’ is the ‘lsp--client’ object associated with this workspace.
-  (client nil)
-
-  ;; ‘host-root’ contains the host root info as derived from `file-remote-p'. It
-  ;; used to derive the file path in `lsp--uri-to-path' when using tramp
-  ;; connection.
-  (host-root nil)
-
-  ;; ‘proc’ is a process object; it may represent a regular process, a pipe, or
-  ;; a network connection.  ‘lsp-mode’ communicates with ‘proc’ using the
-  ;; language server protocol.  ‘proc’ corresponds to the COMMUNICATION-PROCESS
-  ;; element of the return value of the client’s ‘get-root’ field, which see.
-  (proc nil)
-
-  ;; ‘proc’ is a process object; it must represent a regular process, not a
-  ;; pipe or network process.  It represents the actual server process that
-  ;; corresponds to this workspace.  ‘cmd-proc’ corresponds to the
-  ;; COMMAND-PROCESS element of the return value of the client’s ‘get-root’
-  ;; field, which see.
-  (cmd-proc nil)
-
-  ;; ‘buffers’ is a list of buffers associated with this workspace.
-  (buffers nil)
-
-  ;; if semantic tokens is enabled, `semantic-tokens-faces' contains
-  ;; one face (or nil) for each token type supported by the language server.
-  (semantic-tokens-faces nil)
-
-  ;; If semantic highlighting is enabled, `semantic-tokens-modifier-faces'
-  ;; contains one face (or nil) for each modifier type supported by the language
-  ;; server
-  (semantic-tokens-modifier-faces nil)
-
-  ;; Extra client capabilities provided by third-party packages using
-  ;; `lsp-register-client-capabilities'. It's value is an alist of (PACKAGE-NAME
-  ;; . CAPS), where PACKAGE-NAME is a symbol of the third-party package name,
-  ;; and CAPS is either a plist of the client capabilities, or a function that
-  ;; takes no argument and returns a plist of the client capabilities or nil.
-  (extra-client-capabilities nil)
-
-  ;; Workspace status
-  (status nil)
-
-  ;; ‘metadata’ is a generic storage for workspace specific data. It is
-  ;; accessed via `lsp-workspace-set-metadata' and `lsp-workspace-set-metadata'
-  (metadata (make-hash-table :test 'equal))
-
-  ;; contains all the file notification watches that have been created for the
-  ;; current workspace in format filePath->file notification handle.
-  (watches (make-hash-table :test 'equal))
-
-  ;; list of workspace folders
-  (workspace-folders nil)
-
-  ;; ‘last-id’ the last request id for the current workspace.
-  (last-id 0)
-
-  ;; ‘status-string’ allows extensions to specify custom status string based on
-  ;; the Language Server specific messages.
-  (status-string nil)
-
-  ;; ‘shutdown-action’ flag used to mark that workspace should not be restarted (e.g. it
-  ;; was stopped).
-  shutdown-action
-
-  ;; ‘diagnostics’ a hashmap with workspace diagnostics.
-  (diagnostics (make-hash-table :test 'equal))
-
-  ;; contains all the workDone progress tokens that have been created
-  ;; for the current workspace.
-  (work-done-tokens (make-hash-table :test 'equal)))
-
-
-(cl-defstruct lsp-session
-  ;; contains the folders that are part of the current session
-  folders
-  ;; contains the folders that must not be imported in the current workspace.
-  folders-blocklist
-  ;; contains the list of folders that must be imported in a project in case of
-  ;; multi root LSP server.
-  (server-id->folders (make-hash-table :test 'equal))
-  ;; folder to list of the servers that are associated with the folder.
-  (folder->servers (make-hash-table :test 'equal))
-  ;; ‘metadata’ is a generic storage for workspace specific data. It is
-  ;; accessed via `lsp-workspace-set-metadata' and `lsp-workspace-set-metadata'
-  (metadata (make-hash-table :test 'equal)))
-
-(defun lsp-workspace-status (status-string &optional workspace)
-  "Set current workspace status to STATUS-STRING.
-If WORKSPACE is not specified defaults to lsp--cur-workspace."
-  (let ((status-string (when status-string (replace-regexp-in-string "%" "%%" status-string))))
-    (setf (lsp--workspace-status-string (or workspace lsp--cur-workspace)) status-string)))
-
-(defun lsp-session-set-metadata (key value &optional _workspace)
-  "Associate KEY with VALUE in the WORKSPACE metadata.
-If WORKSPACE is not provided current workspace will be used."
-  (puthash key value (lsp-session-metadata (lsp-session))))
-
-(defalias 'lsp-workspace-set-metadata 'lsp-session-set-metadata)
-
-(defun lsp-session-get-metadata (key &optional _workspace)
-  "Lookup KEY in WORKSPACE metadata.
-If WORKSPACE is not provided current workspace will be used."
-  (gethash key (lsp-session-metadata (lsp-session))))
-
-(defalias 'lsp-workspace-get-metadata 'lsp-session-get-metadata)
-
-(defun lsp-workspace-set-work-done-token (token value workspace)
-  "Associate TOKEN with VALUE in the WORKSPACE work-done-tokens."
-  (puthash token value (lsp--workspace-work-done-tokens workspace)))
-
-(defun lsp-workspace-get-work-done-token (token workspace)
-  "Lookup TOKEN in the WORKSPACE work-done-tokens."
-  (gethash token (lsp--workspace-work-done-tokens workspace)))
-
-(defun lsp-workspace-rem-work-done-token (token workspace)
-  "Remove TOKEN from the WORKSPACE work-done-tokens."
-  (remhash token (lsp--workspace-work-done-tokens workspace)))
-
-
-(defun lsp--make-notification (method &optional params)
-  "Create notification body for method METHOD and parameters PARAMS."
-  (list :jsonrpc "2.0" :method method :params params))
-
-(defalias 'lsp--make-request 'lsp--make-notification)
-(defalias 'lsp-make-request 'lsp--make-notification)
-
-(defun lsp--make-response (id result)
-  "Create response for REQUEST with RESULT."
-  `(:jsonrpc "2.0" :id ,id :result ,result))
-
-(defun lsp-make-notification (method &optional params)
-  "Create notification body for method METHOD and parameters PARAMS."
-  (lsp--make-notification method params))
-
-(defmacro lsp--json-serialize (params)
-  (if (progn
-        (require 'json)
-        (fboundp 'json-serialize))
-      `(json-serialize ,params
-                       :null-object nil
-                       :false-object :json-false)
-    `(let ((json-false :json-false))
-       (json-encode ,params))))
-
-(defun lsp--make-message (params)
-  "Create a LSP message from PARAMS, after encoding it to a JSON string."
-  (let ((body (lsp--json-serialize params)))
-    (concat "Content-Length: "
-            (number-to-string (1+ (string-bytes body)))
-            "\r\n\r\n"
-            body
-            "\n")))
-
-(cl-defstruct lsp--log-entry timestamp process-time type method id body)
-
-(defun lsp--make-log-entry (method id body type &optional process-time)
-  "Create an outgoing log object from BODY with method METHOD and id ID.
-If ID is non-nil, then the body is assumed to be a notification.
-TYPE can either be `incoming' or `outgoing'"
-  (cl-assert (memq type '(incoming-req outgoing-req incoming-notif
-                                       outgoing-notif incoming-resp
-                                       outgoing-resp)))
-  (make-lsp--log-entry
-   :timestamp (format-time-string "%I:%M:%S %p")
-   :process-time process-time
-   :method method
-   :id id
-   :type type
-   :body body))
-
-(defun lsp--log-font-lock-json (body)
-  "Font lock JSON BODY."
-  (with-temp-buffer
-    (insert body)
-    ;; We set the temp buffer file-name extension to .json and call `set-auto-mode'
-    ;; so the users configured json mode is used which could be
-    ;; `json-mode', `json-ts-mode', `jsonian-mode', etc.
-    (let ((buffer-file-name "lsp-log.json"))
-      (delay-mode-hooks
-        (set-auto-mode)
-        (if (fboundp 'font-lock-ensure)
-            (font-lock-ensure)
-          (with-no-warnings
-            (font-lock-fontify-buffer)))))
-    (buffer-string)))
-
-(defun lsp--log-entry-pp (entry)
-  (cl-assert (lsp--log-entry-p entry))
-  (pcase-let (((cl-struct lsp--log-entry timestamp method id type process-time
-                          body)
-               entry)
-              (json-false :json-false)
-              (json-encoding-pretty-print t)
-              (str nil))
-    (setq str
-          (concat (format "[Trace - %s] " timestamp)
-                  (pcase type
-                    ('incoming-req (format "Received request '%s - (%s)." method id))
-                    ('outgoing-req (format "Sending request '%s - (%s)'." method id))
-
-                    ('incoming-notif (format "Received notification '%s'." method))
-                    ('outgoing-notif (format "Sending notification '%s'." method))
-
-                    ('incoming-resp (format "Received response '%s - (%s)' in %dms."
-                                            method id process-time))
-                    ('outgoing-resp
-                     (format
-                      "Sending response '%s - (%s)'. Processing request took %dms"
-                      method id process-time)))
-                  "\n"
-                  (if (memq type '(incoming-resp ougoing-resp))
-                      "Result: "
-                    "Params: ")
-                  (lsp--log-font-lock-json (json-encode body))
-                  "\n\n\n"))
-    (setq str (propertize str 'mouse-face 'highlight 'read-only t))
-    (insert str)))
-
-(defvar-local lsp--log-io-ewoc nil)
-
-(defun lsp--get-create-io-ewoc (workspace)
-  (if (and (lsp--workspace-ewoc workspace)
-           (buffer-live-p (ewoc-buffer (lsp--workspace-ewoc workspace))))
-      (lsp--workspace-ewoc workspace)
-    (with-current-buffer (lsp--get-log-buffer-create workspace)
-      (unless (eq 'lsp-log-io-mode major-mode) (lsp-log-io-mode))
-      (setq-local window-point-insertion-type t)
-      (setq lsp--log-io-ewoc (ewoc-create #'lsp--log-entry-pp nil nil t))
-      (setf (lsp--workspace-ewoc workspace) lsp--log-io-ewoc))
-    (lsp--workspace-ewoc workspace)))
-
-(defun lsp--ewoc-count (ewoc)
-  (let* ((count 0)
-         (count-fn (lambda (_) (setq count (1+ count)))))
-    (ewoc-map count-fn ewoc)
-    count))
-
-(defun lsp--log-entry-new (entry workspace)
-  (let* ((ewoc (lsp--get-create-io-ewoc workspace))
-         (count (and (not (eq lsp-io-messages-max t)) (lsp--ewoc-count ewoc)))
-         (node (if (or (eq lsp-io-messages-max t)
-                       (>= lsp-io-messages-max count))
-                   nil
-                 (ewoc-nth ewoc (1- lsp-io-messages-max))))
-         (prev nil)
-         (inhibit-read-only t))
-    (while node
-      (setq prev (ewoc-prev ewoc node))
-      (ewoc-delete ewoc node)
-      (setq node prev))
-    (ewoc-enter-last ewoc entry)))
-
-(defun lsp--send-notification (body)
-  "Send BODY as a notification to the language server."
-  (lsp-foreach-workspace
-   (when (lsp--log-io-p (plist-get body :method))
-     (lsp--log-entry-new (lsp--make-log-entry
-                          (plist-get body :method)
-                          nil (plist-get body :params) 'outgoing-notif)
-                         lsp--cur-workspace))
-   (lsp--send-no-wait body
-                      (lsp--workspace-proc lsp--cur-workspace))))
-
-(defalias 'lsp-send-notification 'lsp--send-notification)
-
-(defun lsp-notify (method params)
-  "Send notification METHOD with PARAMS."
-  (lsp--send-notification (lsp--make-notification method params)))
-
-(defun lsp--cur-workspace-check ()
-  "Check whether buffer lsp workspace(s) are set."
-  (cl-assert (lsp-workspaces) nil
-             "No language server(s) is associated with this buffer."))
-
-(defun lsp--send-request (body &optional no-wait no-merge)
-  "Send BODY as a request to the language server, get the response.
-If NO-WAIT is non-nil, don't synchronously wait for a response.
-If NO-MERGE is non-nil, don't merge the results but return an
-alist mapping workspace->result."
-  (lsp-request (plist-get body :method)
-               (plist-get body :params)
-               :no-wait no-wait
-               :no-merge no-merge))
-
-(defalias 'lsp-send-request 'lsp--send-request
-  "Send BODY as a request to the language server and return the response
-synchronously.
-\n(fn BODY)")
-
-(cl-defun lsp-request (method params &key no-wait no-merge)
-  "Send request METHOD with PARAMS.
-If NO-MERGE is non-nil, don't merge the results but return alist
-workspace->result.
-If NO-WAIT is non-nil send the request as notification."
-  (if no-wait
-      (lsp-notify method params)
-    (let* ((send-time (float-time))
-           ;; max time by which we must get a response
-           (expected-time
-            (and
-             lsp-response-timeout
-             (+ send-time lsp-response-timeout)))
-           resp-result resp-error done?)
-      (unwind-protect
-          (progn
-            (lsp-request-async method params
-                               (lambda (res) (setf resp-result (or res :finished)) (throw 'lsp-done '_))
-                               :error-handler (lambda (err) (setf resp-error err) (throw 'lsp-done '_))
-                               :no-merge no-merge
-                               :mode 'detached
-                               :cancel-token :sync-request)
-            (while (not (or resp-error resp-result))
-              (if (functionp 'json-rpc-connection)
-                  (catch 'lsp-done (sit-for 0.01))
-                (catch 'lsp-done
-                  (accept-process-output
-                   nil
-                   (if expected-time (- expected-time send-time) 1))))
-              (setq send-time (float-time))
-              (when (and expected-time (< expected-time send-time))
-                (error "Timeout while waiting for response.  Method: %s" method)))
-            (setq done? t)
-            (cond
-             ((eq resp-result :finished) nil)
-             (resp-result resp-result)
-             ((lsp-json-error? resp-error) (error (lsp:json-error-message resp-error)))
-             ((lsp-json-error? (cl-first resp-error))
-              (error (lsp:json-error-message (cl-first resp-error))))))
-        (unless done?
-          (lsp-cancel-request-by-token :sync-request))))))
-
-(cl-defun lsp-request-while-no-input (method params)
-  "Send request METHOD with PARAMS and waits until there is no input.
-Return same value as `lsp--while-no-input' and respecting `non-essential'."
-  (if (or non-essential (not lsp-request-while-no-input-may-block))
-      (let* ((send-time (float-time))
-             ;; max time by which we must get a response
-             (expected-time
-              (and
-               lsp-response-timeout
-               (+ send-time lsp-response-timeout)))
-             resp-result resp-error done?)
-        (unwind-protect
-            (progn
-              (lsp-request-async method params
-                                 (lambda (res) (setf resp-result (or res :finished)) (throw 'lsp-done '_))
-                                 :error-handler (lambda (err) (setf resp-error err) (throw 'lsp-done '_))
-                                 :mode 'detached
-                                 :cancel-token :sync-request)
-              (while (not (or resp-error resp-result (input-pending-p)))
-                (catch 'lsp-done
-                  (sit-for
-                   (if expected-time (- expected-time send-time) 1)))
-                (setq send-time (float-time))
-                (when (and expected-time (< expected-time send-time))
-                  (error "Timeout while waiting for response.  Method: %s" method)))
-              (setq done? (or resp-error resp-result))
-              (cond
-               ((eq resp-result :finished) nil)
-               (resp-result resp-result)
-               ((lsp-json-error? resp-error) (error (lsp:json-error-message resp-error)))
-               ((lsp-json-error? (cl-first resp-error))
-                (error (lsp:json-error-message (cl-first resp-error))))))
-          (unless done?
-            (lsp-cancel-request-by-token :sync-request))
-          (when (and (input-pending-p) lsp--throw-on-input)
-            (throw 'input :interrupted))))
-    (lsp-request method params)))
-
-(defvar lsp--cancelable-requests (ht))
-
-(cl-defun lsp-request-async (method params callback
-                                    &key mode error-handler cancel-handler no-merge cancel-token)
-  "Send METHOD with PARAMS as a request to the language server.
-Call CALLBACK with the response received from the server
-asynchronously.
-MODE determines when the callback will be called depending on the
-condition of the original buffer.  It could be:
-- `detached' which means that the callback will be executed no
-matter what has happened to the buffer.
-- `alive' - the callback will be executed only if the buffer from
-which the call was executed is still alive.
-- `current' the callback will be executed only if the original buffer
-is still selected.
-- `tick' - the callback will be executed only if the buffer was not modified.
-- `unchanged' - the callback will be executed only if the buffer hasn't
-changed and if the buffer is not modified.
-
-ERROR-HANDLER will be called in case the request has failed.
-CANCEL-HANDLER will be called in case the request is being canceled.
-If NO-MERGE is non-nil, don't merge the results but return alist
-workspace->result.
-CANCEL-TOKEN is the token that can be used to cancel request."
-  (lsp--send-request-async `(:jsonrpc "2.0" :method ,method :params ,params)
-                           callback mode error-handler cancel-handler no-merge cancel-token))
-
-(defun lsp--create-request-cancel (id workspaces hook buf method cancel-callback)
-  (lambda (&rest _)
-    (unless (and (equal 'post-command-hook hook)
-                 (equal (current-buffer) buf))
-      (lsp--request-cleanup-hooks id)
-      (with-lsp-workspaces workspaces
-        (lsp--cancel-request id)
-        (when cancel-callback (funcall cancel-callback)))
-      (lsp-log "Cancelling %s(%s) in hook %s" method id hook))))
-
-(defun lsp--create-async-callback
-    (callback method no-merge workspaces)
-  "Create async handler expecting COUNT results, merge them and call CALLBACK.
-MODE determines when the callback will be called depending on the
-condition of the original buffer. METHOD is the invoked method.
-If NO-MERGE is non-nil, don't merge the results but return alist
-workspace->result. ID is the request id."
-  (let (results errors)
-    (lambda (result)
-      (push (cons lsp--cur-workspace result)
-            (if (eq result :error) errors results))
-      (when (and (not (eq (length errors) (length workspaces)))
-                 (eq (+ (length errors) (length results)) (length workspaces)))
-        (funcall callback
-                 (if no-merge
-                     results
-                   (lsp--merge-results (-map #'cl-rest results) method)))))))
-
-(defcustom lsp-default-create-error-handler-fn nil
-  "Default error handler customization.
-Handler should give METHOD as argument and return function of one argument
-ERROR."
-  :type 'function
-  :group 'lsp-mode
-  :package-version '(lsp-mode . "9.0.0"))
-
-(defun lsp--create-default-error-handler (method)
-  "Default error handler.
-METHOD is the executed method."
-  (if lsp-default-create-error-handler-fn
-      (funcall lsp-default-create-error-handler-fn method)
-    (lambda (error)
-      (lsp--warn "%s" (or (lsp--error-string error)
-                          (format "%s Request has failed" method))))))
-
-(defvar lsp--request-cleanup-hooks (ht))
-
-(defun lsp--request-cleanup-hooks (request-id)
-  (when-let ((cleanup-function (gethash request-id lsp--request-cleanup-hooks)))
-    (funcall cleanup-function)
-    (remhash request-id lsp--request-cleanup-hooks)))
-
-(defun lsp-cancel-request-by-token (cancel-token)
-  "Cancel request using CANCEL-TOKEN."
-  (-when-let ((request-id . workspaces) (gethash cancel-token lsp--cancelable-requests))
-    (with-lsp-workspaces workspaces
-      (lsp--cancel-request request-id))
-    (remhash cancel-token lsp--cancelable-requests)
-    (lsp--request-cleanup-hooks request-id)))
-
-(defun lsp--send-request-async (body callback
-                                     &optional mode error-callback cancel-callback
-                                     no-merge cancel-token)
-  "Send BODY as a request to the language server.
-Call CALLBACK with the response received from the server
-asynchronously.
-MODE determines when the callback will be called depending on the
-condition of the original buffer.  It could be:
-- `detached' which means that the callback will be executed no
-matter what has happened to the buffer.
-- `alive' - the callback will be executed only if the buffer from
-which the call was executed is still alive.
-- `current' the callback will be executed only if the original buffer
-is still selected.
-- `tick' - the callback will be executed only if the buffer was not modified.
-- `unchanged' - the callback will be executed only if the buffer hasn't
-changed and if the buffer is not modified.
-
-ERROR-CALLBACK will be called in case the request has failed.
-CANCEL-CALLBACK will be called in case the request is being canceled.
-If NO-MERGE is non-nil, don't merge the results but return alist
-workspace->result.
-CANCEL-TOKEN is the token that can be used to cancel request."
-  (when cancel-token
-    (lsp-cancel-request-by-token cancel-token))
-
-  (if-let ((target-workspaces (lsp--find-workspaces-for body)))
-      (let* ((start-time (current-time))
-             (method (plist-get body :method))
-             (id (cl-incf lsp-last-id))
-             (buf (current-buffer))
-             (cancel-callback (when cancel-callback
-                                (pcase mode
-                                  ((or 'alive 'tick 'unchanged)
-                                   (lambda ()
-                                     (with-current-buffer buf
-                                       (funcall cancel-callback))))
-                                  (_ cancel-callback))))
-             ;; calculate what are the (hook . local) pairs which will cancel
-             ;; the request
-             (hooks (pcase mode
-                      ('alive     '((kill-buffer-hook . t)))
-                      ('tick      '((kill-buffer-hook . t) (after-change-functions . t)))
-                      ('unchanged '((after-change-functions . t) (post-command-hook . nil)))
-                      ('current   '((post-command-hook . nil)))))
-             ;; note: lambdas in emacs can be compared but we should make sure
-             ;; that all of the captured arguments are the same - in our case
-             ;; `lsp--create-request-cancel' will return the same lambda when
-             ;; called with the same params.
-             (cleanup-hooks
-              (lambda () (mapc
-                          (-lambda ((hook . local))
-                            (if local
-                                (when (buffer-live-p buf)
-                                  (with-current-buffer buf
-                                    (remove-hook hook
-                                                 (lsp--create-request-cancel
-                                                  id target-workspaces hook buf method cancel-callback)
-                                                 t)))
-                              (remove-hook hook (lsp--create-request-cancel
-                                                 id target-workspaces hook buf method cancel-callback))))
-                          hooks)
-                (remhash cancel-token lsp--cancelable-requests)))
-             (callback (pcase mode
-                         ((or 'alive 'tick 'unchanged) (lambda (&rest args)
-                                                         (with-current-buffer buf
-                                                           (apply callback args))))
-                         (_ callback)))
-             (callback (lsp--create-async-callback callback
-                                                   method
-                                                   no-merge
-                                                   target-workspaces))
-             (callback (lambda (result)
-                         (lsp--request-cleanup-hooks id)
-                         (funcall callback result)))
-             (error-callback (lsp--create-async-callback
-                              (or error-callback
-                                  (lsp--create-default-error-handler method))
-                              method
-                              nil
-                              target-workspaces))
-             (error-callback (lambda (error)
-                               (funcall callback :error)
-                               (lsp--request-cleanup-hooks id)
-                               (funcall error-callback error)))
-             (body (plist-put body :id id)))
-
-        ;; cancel request in any of the hooks
-        (mapc (-lambda ((hook . local))
-                (add-hook hook
-                          (lsp--create-request-cancel
-                           id target-workspaces hook buf method cancel-callback)
-                          nil local))
-              hooks)
-        (puthash id cleanup-hooks lsp--request-cleanup-hooks)
-
-        (setq lsp--last-active-workspaces target-workspaces)
-
-        (when cancel-token
-          (puthash cancel-token (cons id target-workspaces) lsp--cancelable-requests))
-
-        (seq-doseq (workspace target-workspaces)
-          (when (lsp--log-io-p method)
-            (lsp--log-entry-new (lsp--make-log-entry method id
-                                                     (plist-get body :params)
-                                                     'outgoing-req)
-                                workspace))
-          (puthash id
-                   (list callback error-callback method start-time (current-time))
-                   (-> workspace
-                       (lsp--workspace-client)
-                       (lsp--client-response-handlers)))
-          (lsp--send-no-wait body (lsp--workspace-proc workspace)))
-        body)
-    (error "The connected server(s) does not support method %s.
-To find out what capabilities support your server use `M-x lsp-describe-session'
-and expand the capabilities section"
-           (plist-get body :method))))
-
-;; deprecated, use lsp-request-async.
-(defalias 'lsp-send-request-async 'lsp--send-request-async)
-(make-obsolete 'lsp-send-request-async 'lsp-request-async "lsp-mode 7.0.1")
-
-;; Clean up the entire state of lsp mode when Emacs is killed, to get rid of any
-;; pending language servers.
-(add-hook 'kill-emacs-hook #'lsp--global-teardown)
-
-(defun lsp--global-teardown ()
-  "Unload working workspaces."
-  (lsp-foreach-workspace (lsp--shutdown-workspace)))
-
-(defun lsp--shutdown-workspace (&optional restart)
-  "Shut down the language server process for ‘lsp--cur-workspace’."
-  (with-demoted-errors "LSP error: %S"
-    (let ((lsp-response-timeout 0.5))
-      (condition-case err
-          (lsp-request "shutdown" nil)
-        (error (lsp--error "%s" err))))
-    (lsp-notify "exit" nil))
-  (setf (lsp--workspace-shutdown-action lsp--cur-workspace) (or (and restart 'restart) 'shutdown))
-  (lsp--uninitialize-workspace))
-
-(defcustom lsp-inlay-hint-enable nil
-  "If non-nil it will enable inlay hints."
-  :type 'boolean
-  :group 'lsp-mode
-  :package-version '(lsp-mode . "9.0.0"))
-
-(defun lsp--uninitialize-workspace ()
-  "Cleanup buffer state.
-When a workspace is shut down, by request or from just
-disappearing, unset all the variables related to it."
-  (-let [(&lsp-wks 'cmd-proc 'buffers) lsp--cur-workspace]
-    (lsp-process-kill cmd-proc)
-    (mapc (lambda (buf)
-            (when (lsp-buffer-live-p buf)
-              (lsp-with-current-buffer buf
-                                       (lsp-managed-mode -1))))
-          buffers)
-    (lsp-diagnostics--workspace-cleanup lsp--cur-workspace)))
-
-(defun lsp--client-capabilities (&optional custom-capabilities)
-  "Return the client capabilities appending CUSTOM-CAPABILITIES."
-  (append
-   `((general . ((positionEncodings . ["utf-32", "utf-16"])))
-     (workspace . ((workspaceEdit . ((documentChanges . t)
-                                     (resourceOperations . ["create" "rename" "delete"])))
-                   (applyEdit . t)
-                   (symbol . ((symbolKind . ((valueSet . ,(apply 'vector (number-sequence 1 26)))))))
-                   (executeCommand . ((dynamicRegistration . :json-false)))
-                   ,@(when lsp-enable-file-watchers '((didChangeWatchedFiles . ((dynamicRegistration . t)))))
-                   (workspaceFolders . t)
-                   (configuration . t)
-                   ,@(when lsp-semantic-tokens-enable
-                       `((semanticTokens . ((refreshSupport . ,(or (and (boundp 'lsp-semantic-tokens-honor-refresh-requests)
-                                                                        lsp-semantic-tokens-honor-refresh-requests)
-                                                                   :json-false))))))
-                   ,@(when lsp-lens-enable '((codeLens . ((refreshSupport . t)))))
-                   ,@(when lsp-inlay-hint-enable '((inlayHint . ((refreshSupport . :json-false)))))
-                   (fileOperations . ((didCreate . :json-false)
-                                      (willCreate . :json-false)
-                                      (didRename . t)
-                                      (willRename . t)
-                                      (didDelete . :json-false)
-                                      (willDelete . :json-false)))))
-     (textDocument . ((declaration . ((dynamicRegistration . t)
-                                      (linkSupport . t)))
-                      (definition . ((dynamicRegistration . t)
-                                     (linkSupport . t)))
-                      (references . ((dynamicRegistration . t)))
-                      (implementation . ((dynamicRegistration . t)
-                                         (linkSupport . t)))
-                      (typeDefinition . ((dynamicRegistration . t)
-                                         (linkSupport . t)))
-                      (synchronization . ((willSave . t) (didSave . t) (willSaveWaitUntil . t)))
-                      (documentSymbol . ((symbolKind . ((valueSet . ,(apply 'vector (number-sequence 1 26)))))
-                                         (hierarchicalDocumentSymbolSupport . t)))
-                      (formatting . ((dynamicRegistration . t)))
-                      (rangeFormatting . ((dynamicRegistration . t)))
-                      (onTypeFormatting . ((dynamicRegistration . t)))
-                      ,@(when (and lsp-semantic-tokens-enable
-                                   (functionp 'lsp--semantic-tokens-capabilities))
-                          (lsp--semantic-tokens-capabilities))
-                      (rename . ((dynamicRegistration . t) (prepareSupport . t)))
-                      (codeAction . ((dynamicRegistration . t)
-                                     (isPreferredSupport . t)
-                                     (codeActionLiteralSupport . ((codeActionKind . ((valueSet . [""
-                                                                                                  "quickfix"
-                                                                                                  "refactor"
-                                                                                                  "refactor.extract"
-                                                                                                  "refactor.inline"
-                                                                                                  "refactor.rewrite"
-                                                                                                  "source"
-                                                                                                  "source.organizeImports"])))))
-                                     (resolveSupport . ((properties . ["edit" "command"])))
-                                     (dataSupport . t)))
-                      (completion . ((completionItem . ((snippetSupport . ,(cond
-                                                                            ((and lsp-enable-snippet (not (fboundp 'yas-minor-mode)))
-                                                                             (lsp--warn (concat
-                                                                                         "Yasnippet is not installed, but `lsp-enable-snippet' is set to `t'. "
-                                                                                         "You must either install yasnippet, or disable snippet support."))
-                                                                             :json-false)
-                                                                            (lsp-enable-snippet t)
-                                                                            (t :json-false)))
-                                                        (documentationFormat . ["markdown" "plaintext"])
-                                                        ;; Remove this after jdtls support resolveSupport
-                                                        (resolveAdditionalTextEditsSupport . t)
-                                                        (insertReplaceSupport . t)
-                                                        (deprecatedSupport . t)
-                                                        (resolveSupport
-                                                         . ((properties . ["documentation"
-                                                                           "detail"
-                                                                           "additionalTextEdits"
-                                                                           "command"])))
-                                                        (insertTextModeSupport . ((valueSet . [1 2])))))
-                                     (contextSupport . t)
-                                     (dynamicRegistration . t)))
-                      (signatureHelp . ((signatureInformation . ((parameterInformation . ((labelOffsetSupport . t)))))
-                                        (dynamicRegistration . t)))
-                      (documentLink . ((dynamicRegistration . t)
-                                       (tooltipSupport . t)))
-                      (hover . ((contentFormat . ["markdown" "plaintext"])
-                                (dynamicRegistration . t)))
-                      ,@(when lsp-enable-folding
-                          `((foldingRange . ((dynamicRegistration . t)
-                                             ,@(when lsp-folding-range-limit
-                                                 `((rangeLimit . ,lsp-folding-range-limit)))
-                                             ,@(when lsp-folding-line-folding-only
-                                                 `((lineFoldingOnly . t)))))))
-                      (selectionRange . ((dynamicRegistration . t)))
-                      (callHierarchy . ((dynamicRegistration . :json-false)))
-                      (typeHierarchy . ((dynamicRegistration . t)))
-                      (publishDiagnostics . ((relatedInformation . t)
-                                             (tagSupport . ((valueSet . [1 2])))
-                                             (versionSupport . t)))
-                      (diagnostic . ((dynamicRegistration . :json-false)
-                                     (relatedDocumentSupport . :json-false)))
-                      (linkedEditingRange . ((dynamicRegistration . t)))))
-     (window . ((workDoneProgress . t)
-                (showDocument . ((support . t))))))
-   custom-capabilities))
-
-(defun lsp-find-roots-for-workspace (workspace session)
-  "Get all roots for the WORKSPACE."
-  (-filter #'identity (ht-map (lambda (folder workspaces)
-                                (when (-contains? workspaces workspace)
-                                  folder))
-                              (lsp-session-folder->servers session))))
-
-(defun lsp-session-watches (&optional session)
-  "Get watches created for SESSION."
-  (or (gethash "__watches" (lsp-session-metadata (or session (lsp-session))))
-      (-let [res (make-hash-table :test 'equal)]
-        (puthash "__watches" res (lsp-session-metadata (or session (lsp-session))))
-        res)))
-
-(defun lsp--file-process-event (session root-folder event)
-  "Process file event."
-  (let* ((changed-file (cl-third event))
-         (rel-changed-file (f-relative changed-file root-folder))
-         (event-numeric-kind (alist-get (cl-second event) lsp--file-change-type))
-         (bit-position (1- event-numeric-kind))
-         (watch-bit (ash 1 bit-position)))
-    (->>
-     session
-     lsp-session-folder->servers
-     (gethash root-folder)
-     (seq-do (lambda (workspace)
-               (when (->>
-                      workspace
-                      lsp--workspace-registered-server-capabilities
-                      (-any?
-                       (lambda (capability)
-                         (and
-                          (equal (lsp--registered-capability-method capability)
-                                 "workspace/didChangeWatchedFiles")
-                          (->>
-                           capability
-                           lsp--registered-capability-options
-                           (lsp:did-change-watched-files-registration-options-watchers)
-                           (seq-find
-                            (-lambda ((fs-watcher &as &FileSystemWatcher :glob-pattern :kind? :_cachedRegexp cached-regexp))
-                              (when (or (null kind?)
-                                        (> (logand kind? watch-bit) 0))
-                                (-let [regexes (or cached-regexp
-                                                   (let ((regexp (lsp-glob-to-regexps glob-pattern)))
-                                                     (lsp-put fs-watcher :_cachedRegexp regexp)
-                                                     regexp))]
-                                  (-any? (lambda (re)
-                                           (or (string-match re changed-file)
-                                               (string-match re rel-changed-file)))
-                                         regexes))))))))))
-                 (with-lsp-workspace workspace
-                   (lsp-notify
-                    "workspace/didChangeWatchedFiles"
-                    `((changes . [((type . ,event-numeric-kind)
-                                   (uri . ,(lsp--path-to-uri changed-file)))]))))))))))
-
-(lsp-defun lsp--server-register-capability ((&Registration :method :id :register-options?))
-  "Register capability REG."
-  (when (and lsp-enable-file-watchers
-             (equal method "workspace/didChangeWatchedFiles"))
-    (-let* ((created-watches (lsp-session-watches (lsp-session)))
-            (root-folders (cl-set-difference
-                           (lsp-find-roots-for-workspace lsp--cur-workspace (lsp-session))
-                           (ht-keys created-watches))))
-      ;; create watch for each root folder without such
-      (dolist (folder root-folders)
-        (let* ((watch (make-lsp-watch :root-directory folder))
-               (ignored-things (lsp--get-ignored-regexes-for-workspace-root folder))
-               (ignored-files-regex-list (car ignored-things))
-               (ignored-directories-regex-list (cadr ignored-things)))
-          (puthash folder watch created-watches)
-          (lsp-watch-root-folder (file-truename folder)
-                                 (-partial #'lsp--file-process-event (lsp-session) folder)
-                                 ignored-files-regex-list
-                                 ignored-directories-regex-list
-                                 watch
-                                 t)))))
-
-  (push
-   (make-lsp--registered-capability :id id :method method :options register-options?)
-   (lsp--workspace-registered-server-capabilities lsp--cur-workspace)))
-
-(defmacro lsp--with-workspace-temp-buffer (workspace-root &rest body)
-  "With a temp-buffer under `WORKSPACE-ROOT' and evaluate `BODY', useful to
-access dir-local variables."
-  (declare (indent 1) (debug t))
-  `(with-temp-buffer
-     ;; Set the buffer's name to something under the root so that we can hack the local variables
-     ;; This file doesn't need to exist and will not be created due to this.
-     (setq-local buffer-file-name (expand-file-name "lsp-mode-temp" (expand-file-name ,workspace-root)))
-     (hack-local-variables)
-     (prog1 ,@body
-       (setq-local buffer-file-name nil))))
-
-(defun lsp--get-ignored-regexes-for-workspace-root (workspace-root)
-  "Return a list of the form
-(lsp-file-watch-ignored-files lsp-file-watch-ignored-directories) for the given
-WORKSPACE-ROOT."
-  ;; The intent of this function is to provide per-root workspace-level customization of the
-  ;; lsp-file-watch-ignored-directories and lsp-file-watch-ignored-files variables.
-  (lsp--with-workspace-temp-buffer workspace-root
-    (list lsp-file-watch-ignored-files (lsp-file-watch-ignored-directories))))
-
-
-(defun lsp--cleanup-hanging-watches ()
-  "Cleanup watches in case there are no more workspaces that are interested
-in that particular folder."
-  (let* ((session (lsp-session))
-         (watches (lsp-session-watches session)))
-    (dolist (watched-folder (ht-keys watches))
-      (when (-none? (lambda (workspace)
-                      (with-lsp-workspace workspace
-                        (lsp--registered-capability "workspace/didChangeWatchedFiles")))
-                    (gethash watched-folder (lsp-session-folder->servers (lsp-session))))
-        (lsp-log "Cleaning up watches for folder %s. There is no workspace watching this folder..." watched-folder)
-        (lsp-kill-watch (gethash watched-folder watches))
-        (remhash watched-folder watches)))))
-
-(lsp-defun lsp--server-unregister-capability ((&Unregistration :id :method))
-  "Unregister capability UNREG."
-  (setf (lsp--workspace-registered-server-capabilities lsp--cur-workspace)
-        (seq-remove (lambda (e) (equal (lsp--registered-capability-id e) id))
-                    (lsp--workspace-registered-server-capabilities lsp--cur-workspace)))
-  (when (equal method "workspace/didChangeWatchedFiles")
-    (lsp--cleanup-hanging-watches)))
-
-(defun lsp--server-capabilities ()
-  "Return the capabilities of the language server associated with the buffer."
-  (->> (lsp-workspaces)
-       (-keep #'lsp--workspace-server-capabilities)
-       (apply #'lsp-merge)))
-
-(defun lsp--send-open-close-p ()
-  "Return whether open and close notifications should be sent to the server."
-  (let ((sync (lsp:server-capabilities-text-document-sync? (lsp--server-capabilities))))
-    (or (memq sync '(1 2))
-        (lsp:text-document-sync-options-open-close? sync))))
-
-(defun lsp--send-will-save-p ()
-  "Return whether willSave notifications should be sent to the server."
-  (-> (lsp--server-capabilities)
-      (lsp:server-capabilities-text-document-sync?)
-      (lsp:text-document-sync-options-will-save?)))
-
-(defun lsp--send-will-save-wait-until-p ()
-  "Return whether willSaveWaitUntil notifications should be sent to the server."
-  (-> (lsp--server-capabilities)
-      (lsp:server-capabilities-text-document-sync?)
-      (lsp:text-document-sync-options-will-save-wait-until?)))
-
-(defun lsp--send-did-save-p ()
-  "Return whether didSave notifications should be sent to the server."
-  (let ((sync (lsp:server-capabilities-text-document-sync? (lsp--server-capabilities))))
-    (or (memq sync '(1 2))
-        (lsp:text-document-sync-options-save? sync))))
-
-(defun lsp--save-include-text-p ()
-  "Return whether save notifications should include the text document's contents."
-  (->> (lsp--server-capabilities)
-       (lsp:server-capabilities-text-document-sync?)
-       (lsp:text-document-sync-options-save?)
-       (lsp:text-document-save-registration-options-include-text?)))
-
-(defun lsp--send-will-rename-files-p (path)
-  "Return whether willRenameFiles request should be sent to the server.
-If any filters, checks if it applies for PATH."
-  (let* ((will-rename (-> (lsp--server-capabilities)
-                          (lsp:server-capabilities-workspace?)
-                          (lsp:workspace-server-capabilities-file-operations?)
-                          (lsp:workspace-file-operations-will-rename?)))
-         (filters (seq-into (lsp:file-operation-registration-options-filters will-rename) 'list)))
-    (and will-rename
-         (or (seq-empty-p filters)
-             (-any? (-lambda ((&FileOperationFilter :scheme? :pattern (&FileOperationPattern :glob)))
-                      (-let [regexes (lsp-glob-to-regexps glob)]
-                        (and (or (not scheme?)
-                                 (string-prefix-p scheme? (lsp--path-to-uri path)))
-                             (-any? (lambda (re)
-                                      (string-match re path))
-                                    regexes))))
-                    filters)))))
-
-(defun lsp--send-did-rename-files-p ()
-  "Return whether didRenameFiles notification should be sent to the server."
-  (-> (lsp--server-capabilities)
-      (lsp:server-capabilities-workspace?)
-      (lsp:workspace-server-capabilities-file-operations?)
-      (lsp:workspace-file-operations-did-rename?)))
-
-(declare-function project-roots "ext:project" (project) t)
-(declare-function project-root "ext:project" (project) t)
-
-(defun lsp--suggest-project-root ()
-  "Get project root."
-  (or
-   (when (fboundp 'projectile-project-root)
-     (condition-case nil
-         (projectile-project-root)
-       (error nil)))
-   (when (fboundp 'project-current)
-     (when-let ((project (project-current)))
-       (if (fboundp 'project-root)
-           (project-root project)
-         (car (with-no-warnings
-                (project-roots project))))))
-   default-directory))
-
-(defun lsp--read-from-file (file)
-  "Read FILE content."
-  (when (file-exists-p file)
-    (cl-first (read-from-string (f-read-text file 'utf-8)))))
-
-(defun lsp--persist (file-name to-persist)
-  "Persist TO-PERSIST in FILE-NAME.
-
-This function creates the parent directories if they don't exist
-yet."
-  (let ((print-length nil)
-        (print-level nil))
-    ;; Create all parent directories:
-    (make-directory (f-parent file-name) t)
-    (f-write-text (prin1-to-string to-persist) 'utf-8 file-name)))
-
-(defun lsp-workspace-folders-add (project-root)
-  "Add PROJECT-ROOT to the list of workspace folders."
-  (interactive
-   (list (read-directory-name "Select folder to add: "
-                              (or (lsp--suggest-project-root) default-directory) nil t)))
-  (cl-pushnew (lsp-f-canonical project-root)
-              (lsp-session-folders (lsp-session)) :test 'equal)
-  (lsp--persist-session (lsp-session))
-
-  (run-hook-with-args 'lsp-workspace-folders-changed-functions (list project-root) nil))
-
-(defun lsp-workspace-folders-remove (project-root)
-  "Remove PROJECT-ROOT from the list of workspace folders."
-  (interactive (list (completing-read "Select folder to remove: "
-                                      (lsp-session-folders (lsp-session))
-                                      nil t nil nil
-                                      (lsp-find-session-folder (lsp-session) default-directory))))
-
-  (setq project-root (lsp-f-canonical project-root))
-
-  ;; send remove folder to each multiroot workspace associated with the folder
-  (dolist (wks (->> (lsp-session)
-                    (lsp-session-folder->servers)
-                    (gethash project-root)
-                    (--filter (lsp--client-multi-root (lsp--workspace-client it)))))
-    (with-lsp-workspace wks
-      (lsp-notify "workspace/didChangeWorkspaceFolders"
-                  (lsp-make-did-change-workspace-folders-params
-                   :event (lsp-make-workspace-folders-change-event
-                           :removed (vector (lsp-make-workspace-folder
-                                             :uri (lsp--path-to-uri project-root)
-                                             :name (f-filename project-root)))
-                           :added [])))))
-
-  ;; turn off servers in the removed directory
-  (let* ((session (lsp-session))
-         (folder->servers (lsp-session-folder->servers session))
-         (server-id->folders (lsp-session-server-id->folders session))
-         (workspaces (gethash project-root folder->servers)))
-
-    (remhash project-root folder->servers)
-
-    ;; turn off the servers without root folders
-    (dolist (workspace workspaces)
-      (when (--none? (-contains? it workspace) (ht-values folder->servers))
-        (lsp--info "Shutdown %s since folder %s is removed..."
-                   (lsp--workspace-print workspace) project-root)
-        (with-lsp-workspace workspace (lsp--shutdown-workspace))))
-
-    (setf (lsp-session-folders session)
-          (-remove-item project-root (lsp-session-folders session)))
-
-    (ht-aeach (puthash key
-                       (-remove-item project-root value)
-                       server-id->folders)
-              server-id->folders)
-    (lsp--persist-session (lsp-session)))
-
-  (run-hook-with-args 'lsp-workspace-folders-changed-functions nil (list project-root)))
-
-(defun lsp-workspace-blocklist-remove (project-root)
-  "Remove PROJECT-ROOT from the workspace blocklist."
-  (interactive (list (completing-read "Select folder to remove:"
-                                      (lsp-session-folders-blocklist (lsp-session))
-                                      nil t)))
-  (setf (lsp-session-folders-blocklist (lsp-session))
-        (delete project-root
-                (lsp-session-folders-blocklist (lsp-session))))
-  (lsp--persist-session (lsp-session)))
-
-(define-obsolete-function-alias 'lsp-workspace-folders-switch
-  'lsp-workspace-folders-open "lsp-mode 6.1")
-
-(defun lsp-workspace-folders-open (project-root)
-  "Open the directory located at PROJECT-ROOT"
-  (interactive (list (completing-read "Open folder: "
-                                      (lsp-session-folders (lsp-session))
-                                      nil t)))
-  (find-file project-root))
-
-(defun lsp--maybe-enable-signature-help (trigger-characters)
-  (let ((ch last-command-event))
-    (when (cl-find ch trigger-characters :key #'string-to-char)
-      (lsp-signature-activate))))
-
-(defun lsp--on-type-formatting-handler-create ()
-  (when-let ((provider (lsp--capability-for-method "textDocument/onTypeFormatting" )))
-    (-let [(&DocumentOnTypeFormattingOptions :more-trigger-character?
-                                             :first-trigger-character) provider]
-      (lambda ()
-        (lsp--on-type-formatting first-trigger-character
-                                 more-trigger-character?)))))
-
-(defun lsp--update-on-type-formatting-hook (&optional cleanup?)
-  (let ((on-type-formatting-handler (lsp--on-type-formatting-handler-create)))
-    (cond
-     ((and lsp-enable-on-type-formatting on-type-formatting-handler (not cleanup?))
-      (add-hook 'post-self-insert-hook on-type-formatting-handler nil t))
-     ((or cleanup?
-          (not lsp-enable-on-type-formatting))
-      (remove-hook 'post-self-insert-hook on-type-formatting-handler t)))))
-
-(defun lsp--signature-help-handler-create ()
-  (-when-let ((&SignatureHelpOptions? :trigger-characters?)
-              (lsp--capability-for-method "textDocument/signatureHelp"))
-    (lambda ()
-      (lsp--maybe-enable-signature-help trigger-characters?))))
-
-(defun lsp--update-signature-help-hook (&optional cleanup?)
-  (let ((signature-help-handler (lsp--signature-help-handler-create)))
-    (cond
-     ((and (or (equal lsp-signature-auto-activate t)
-               (memq :on-trigger-char lsp-signature-auto-activate))
-           signature-help-handler
-           (not cleanup?))
-      (add-hook 'post-self-insert-hook signature-help-handler nil t))
-
-     ((or cleanup?
-          (not (or (equal lsp-signature-auto-activate t)
-                   (memq :on-trigger-char lsp-signature-auto-activate))))
-      (remove-hook 'post-self-insert-hook signature-help-handler t)))))
-
-(defun lsp--after-set-visited-file-name ()
-  (lsp-disconnect)
-  (lsp))
-
-;; TODO remove those eldoc workarounds when dropping support for Emacs 27
-;; https://github.com/emacs-lsp/lsp-mode/issues/3295#issuecomment-1308994099
-(defvar eldoc-documentation-default) ; CI
-(when (< emacs-major-version 28)
-  (unless (boundp 'eldoc-documentation-functions)
-    (load "eldoc" nil 'nomessage))
-  (when (memq (default-value 'eldoc-documentation-function) '(nil ignore))
-    ;; actually `eldoc-documentation-strategy', but CI was failing
-    (setq-default eldoc-documentation-function 'eldoc-documentation-default)))
-
-(define-minor-mode lsp-managed-mode
-  "Mode for source buffers managed by lsp-mode."
-  :lighter nil
-  (cond
-   (lsp-managed-mode
-    (when (lsp-feature? "textDocument/hover")
-      (add-hook 'eldoc-documentation-functions #'lsp-eldoc-function nil t)
-      (eldoc-mode 1))
-
-    (add-hook 'after-change-functions #'lsp-on-change nil t)
-    (add-hook 'after-revert-hook #'lsp-on-revert nil t)
-    (add-hook 'after-save-hook #'lsp-on-save nil t)
-    (add-hook 'auto-save-hook #'lsp--on-auto-save nil t)
-    (add-hook 'before-change-functions #'lsp-before-change nil t)
-    (add-hook 'before-save-hook #'lsp--before-save nil t)
-    (add-hook 'kill-buffer-hook #'lsp--text-document-did-close nil t)
-    (add-hook 'post-command-hook #'lsp--post-command nil t)
-
-    (lsp--update-on-type-formatting-hook)
-    (lsp--update-signature-help-hook)
-
-    (when lsp-enable-xref
-      (add-hook 'xref-backend-functions #'lsp--xref-backend nil t))
-
-    (lsp-configure-buffer)
-
-    ;; make sure we turn off lsp-mode in case major mode changes, because major
-    ;; mode change will wipe the buffer locals.
-    (add-hook 'change-major-mode-hook #'lsp-disconnect nil t)
-    (add-hook 'after-set-visited-file-name-hook #'lsp--after-set-visited-file-name nil t)
-
-    (let ((buffer (lsp-current-buffer)))
-      (run-with-idle-timer
-       0.0 nil
-       (lambda ()
-         (when (lsp-buffer-live-p buffer)
-           (lsp-with-current-buffer buffer
-             (lsp--on-change-debounce buffer)
-             (lsp--on-idle buffer)))))))
-   (t
-    (lsp-unconfig-buffer)
-
-    (remove-hook 'eldoc-documentation-functions #'lsp-eldoc-function t)
-    (remove-hook 'post-command-hook #'lsp--post-command t)
-    (remove-hook 'after-change-functions #'lsp-on-change t)
-    (remove-hook 'after-revert-hook #'lsp-on-revert t)
-    (remove-hook 'after-save-hook #'lsp-on-save t)
-    (remove-hook 'auto-save-hook #'lsp--on-auto-save t)
-    (remove-hook 'before-change-functions #'lsp-before-change t)
-    (remove-hook 'before-save-hook #'lsp--before-save t)
-    (remove-hook 'kill-buffer-hook #'lsp--text-document-did-close t)
-
-    (lsp--update-on-type-formatting-hook :cleanup)
-    (lsp--update-signature-help-hook :cleanup)
-
-    (when lsp--on-idle-timer
-      (cancel-timer lsp--on-idle-timer)
-      (setq lsp--on-idle-timer nil))
-
-    (remove-hook 'lsp-on-idle-hook #'lsp--document-links t)
-    (remove-hook 'lsp-on-idle-hook #'lsp--document-highlight t)
-
-    (lsp--remove-overlays 'lsp-highlight)
-    (lsp--remove-overlays 'lsp-links)
-
-    (remove-hook 'xref-backend-functions #'lsp--xref-backend t)
-    (remove-hook 'change-major-mode-hook #'lsp-disconnect t)
-    (remove-hook 'after-set-visited-file-name-hook #'lsp--after-set-visited-file-name t)
-    (setq-local lsp-buffer-uri nil))))
-
-(defun lsp-configure-buffer ()
-  "Configure LSP features for current buffer."
-  ;; make sure the core is running in the context of all available workspaces
-  ;; to avoid misconfiguration in case we are running in `with-lsp-workspace' context
-  (let ((lsp--buffer-workspaces (cond
-                                 (lsp--buffer-workspaces)
-                                 (lsp--cur-workspace (list lsp--cur-workspace))))
-        lsp--cur-workspace)
-    (when lsp-auto-configure
-      (lsp--auto-configure)
-
-      (when (and lsp-enable-text-document-color
-                 (lsp-feature? "textDocument/documentColor"))
-        (add-hook 'lsp-on-change-hook #'lsp--document-color nil t))
-
-      (when (and lsp-enable-imenu
-                 (lsp-feature? "textDocument/documentSymbol"))
-        (lsp-enable-imenu))
-
-      (when (and lsp-enable-indentation
-                 (lsp-feature? "textDocument/rangeFormatting"))
-        (add-function :override (local 'indent-region-function) #'lsp-format-region))
-
-      (when (and lsp-enable-symbol-highlighting
-                 (lsp-feature? "textDocument/documentHighlight"))
-        (add-hook 'lsp-on-idle-hook #'lsp--document-highlight nil t))
-
-      (when (and lsp-enable-links
-                 (lsp-feature? "textDocument/documentLink"))
-        (add-hook 'lsp-on-idle-hook #'lsp--document-links nil t))
-
-      (when (and lsp-inlay-hint-enable
-                 (lsp-feature? "textDocument/inlayHint"))
-        (lsp-inlay-hints-mode))
-
-      (when (and lsp-enable-dap-auto-configure
-                 (functionp 'dap-mode))
-        (dap-auto-configure-mode 1)))
-    (run-hooks 'lsp-configure-hook)))
-
-(defun lsp-unconfig-buffer ()
-  "Unconfigure LSP features for buffer."
-  (lsp--remove-overlays 'lsp-color)
-
-  (when (advice-function-member-p 'lsp--imenu-create-index imenu-create-index-function)
-    (remove-function (local 'imenu-create-index-function) #'lsp--imenu-create-index)
-    (setq-local imenu-menubar-modified-tick 0)
-    (setq-local imenu--index-alist nil)
-    (imenu--cleanup))
-
-  (remove-function (local 'indent-region-function) #'lsp-format-region)
-
-  (remove-hook 'lsp-on-change-hook #'lsp--document-color t)
-  (remove-hook 'lsp-on-idle-hook #'lsp--document-highlight t)
-  (remove-hook 'lsp-on-idle-hook #'lsp--document-links t)
-
-  (when (and lsp-enable-dap-auto-configure
-             (functionp 'dap-mode))
-    (dap-auto-configure-mode -1))
-
-  (run-hooks 'lsp-unconfigure-hook))
-
-(defun lsp--buffer-content ()
-  (lsp-save-restriction-and-excursion
-    (or (lsp-virtual-buffer-call :buffer-string)
-        (buffer-substring-no-properties (point-min)
-                                        (point-max)))))
-
-(defun lsp--text-document-did-open ()
-  "`document/didOpen' event."
-  (run-hooks 'lsp-before-open-hook)
-  (when (and lsp-auto-touch-files
-             (not (f-exists? (lsp--uri-to-path (lsp--buffer-uri)))))
-    (lsp--info "Saving file '%s' because it is not present on the disk." (lsp--buffer-uri))
-    (save-buffer))
-
-  (setq lsp--cur-version (or lsp--cur-version 0))
-  (cl-pushnew (lsp-current-buffer) (lsp--workspace-buffers lsp--cur-workspace))
-  (lsp-notify
-   "textDocument/didOpen"
-   (list :textDocument
-         (list :uri (lsp--buffer-uri)
-               :languageId (lsp-buffer-language)
-               :version lsp--cur-version
-               :text (lsp--buffer-content))))
-
-  (lsp-managed-mode 1)
-
-  (lsp-diagnostics--request-pull-diagnostics lsp--cur-workspace)
-
-  (run-hooks 'lsp-after-open-hook)
-  (when-let ((client (-some-> lsp--cur-workspace (lsp--workspace-client))))
-    (-some-> (lsp--client-after-open-fn client)
-      (funcall))
-    (-some-> (format "lsp-%s-after-open-hook" (lsp--client-server-id client))
-      (intern-soft)
-      (run-hooks))))
-
-(defun lsp--text-document-identifier ()
-  "Make TextDocumentIdentifier."
-  (list :uri (lsp--buffer-uri)))
-
-(defun lsp--versioned-text-document-identifier ()
-  "Make VersionedTextDocumentIdentifier."
-  (plist-put (lsp--text-document-identifier) :version lsp--cur-version))
-
-(defun lsp--cur-line (&optional point)
-  (1- (line-number-at-pos point)))
-
-(defun lsp--cur-position ()
-  "Make a Position object for the current point."
-  (or (lsp-virtual-buffer-call :cur-position)
-      (lsp-save-restriction-and-excursion
-        (list :line (lsp--cur-line)
-              :character (- (point) (line-beginning-position))))))
-
-(defun lsp--point-to-position (point)
-  "Convert POINT to Position."
-  (lsp-save-restriction-and-excursion
-    (goto-char point)
-    (lsp--cur-position)))
-
-(defun lsp--range (start end)
-  "Make Range body from START and END."
-  ;; make sure start and end are Position objects
-  (list :start start :end end))
-
-(defun lsp--region-to-range (start end)
-  "Make Range object for the current region."
-  (lsp--range (lsp--point-to-position start)
-              (lsp--point-to-position end)))
-
-(defun lsp--region-or-line ()
-  "The active region or the current line."
-  (if (use-region-p)
-      (lsp--region-to-range (region-beginning) (region-end))
-    (lsp--region-to-range (line-beginning-position) (line-end-position))))
-
-(defun lsp--check-document-changes-version (document-changes)
-  "Verify that DOCUMENT-CHANGES have the proper version."
-  (unless (seq-every-p
-           (-lambda ((&TextDocumentEdit :text-document))
-             (or
-              (not text-document)
-              (let* ((filename (-> text-document
-                                   lsp:versioned-text-document-identifier-uri
-                                   lsp--uri-to-path))
-                     (version (lsp:versioned-text-document-identifier-version? text-document)))
-                (with-current-buffer (find-file-noselect filename)
-                  (or (null version) (zerop version) (= -1 version)
-                      (equal version lsp--cur-version))))))
-           document-changes)
-    (error "Document changes cannot be applied due to different document version")))
-
-(defun lsp--apply-workspace-edit (workspace-edit &optional operation)
-  "Apply the WorkspaceEdit object WORKSPACE-EDIT.
-OPERATION is symbol representing the source of this text edit."
-  (-let (((&WorkspaceEdit :document-changes? :changes?) workspace-edit))
-    (if-let ((document-changes (seq-reverse document-changes?)))
-        (progn
-          (lsp--check-document-changes-version document-changes)
-          (->> document-changes
-               (seq-filter (-lambda ((&CreateFile :kind)) (equal kind "create")))
-               (seq-do (lambda (change) (lsp--apply-text-document-edit change operation))))
-          (->> document-changes
-               (seq-filter (-lambda ((&CreateFile :kind))
-                             (and (or (not kind) (equal kind "edit"))
-                                  (not (equal kind "create")))))
-               (seq-do (lambda (change) (lsp--apply-text-document-edit change operation))))
-          (->> document-changes
-               (seq-filter (-lambda ((&CreateFile :kind))
-                             (and (not (or (not kind) (equal kind "edit")))
-                                  (not (equal kind "create")))))
-               (seq-do (lambda (change) (lsp--apply-text-document-edit change operation)))))
-      (lsp-map
-       (lambda (uri text-edits)
-         (with-current-buffer (-> uri lsp--uri-to-path find-file-noselect)
-           (lsp--apply-text-edits text-edits operation)))
-       changes?))))
-
-(defmacro lsp-with-filename (file &rest body)
-  "Execute BODY with FILE as a context.
-Need to handle the case when FILE indicates virtual buffer."
-  (declare (indent 1) (debug t))
-  `(if-let ((lsp--virtual-buffer (get-text-property 0 'lsp-virtual-buffer ,file)))
-       (lsp-with-current-buffer lsp--virtual-buffer
-         ,@body)
-     ,@body))
-
-(defun lsp--apply-text-document-edit (edit &optional operation)
-  "Apply the TextDocumentEdit object EDIT.
-OPERATION is symbol representing the source of this text edit.
-If the file is not being visited by any buffer, it is opened with
-`find-file-noselect'.
-Because lsp-mode does not store previous document versions, the edit is only
-applied if the version of the textDocument matches the version of the
-corresponding file.
-
-interface TextDocumentEdit {
-  textDocument: VersionedTextDocumentIdentifier;
-  edits: TextEdit[];
-}"
-  (pcase (lsp:edit-kind edit)
-    ("create" (-let* (((&CreateFile :uri :options?) edit)
-                      (file-name (lsp--uri-to-path uri)))
-                (mkdir (f-dirname file-name) t)
-                (f-touch file-name)
-                (when (lsp:create-file-options-overwrite? options?)
-                  (f-write-text "" nil file-name))
-                (find-file-noselect file-name)))
-    ("delete" (-let (((&DeleteFile :uri :options? (&DeleteFileOptions? :recursive?)) edit))
-                (f-delete (lsp--uri-to-path uri) recursive?)))
-    ("rename" (-let* (((&RenameFile :old-uri :new-uri :options? (&RenameFileOptions? :overwrite?)) edit)
-                      (old-file-name (lsp--uri-to-path old-uri))
-                      (new-file-name (lsp--uri-to-path new-uri))
-                      (buf (find-buffer-visiting old-file-name)))
-                (when buf
-                  (lsp-with-current-buffer buf
-                    (save-buffer)
-                    (lsp--text-document-did-close)))
-                (mkdir (f-dirname new-file-name) t)
-                (rename-file old-file-name new-file-name overwrite?)
-                (when buf
-                  (lsp-with-current-buffer buf
-                    (set-buffer-modified-p nil)
-                    (setq lsp-buffer-uri nil)
-                    (set-visited-file-name new-file-name)
-                    (lsp)))))
-    (_ (let ((file-name (->> edit
-                             (lsp:text-document-edit-text-document)
-                             (lsp:versioned-text-document-identifier-uri)
-                             (lsp--uri-to-path))))
-         (lsp-with-current-buffer (find-buffer-visiting file-name)
-           (lsp-with-filename file-name
-             (lsp--apply-text-edits (lsp:text-document-edit-edits edit) operation)))))))
-
-(lsp-defun lsp--position-compare ((&Position :line left-line
-                                             :character left-character)
-                                  (&Position :line right-line
-                                             :character right-character))
-  "Return t if position LEFT is greater than RIGHT."
-  (if (= left-line right-line)
-      (> left-character right-character)
-    (> left-line right-line)))
-
-(lsp-defun lsp-point-in-range? (position (&Range :start :end))
-  "Returns if POINT is in RANGE."
-  (not (or (lsp--position-compare start position)
-           (lsp--position-compare position end))))
-
-(lsp-defun lsp--position-equal ((&Position :line left-line
-                                           :character left-character)
-                                (&Position :line right-line
-                                           :character right-character))
-  "Return whether LEFT and RIGHT positions are equal."
-  (and (= left-line right-line)
-       (= left-character right-character)))
-
-(lsp-defun lsp--text-edit-sort-predicate ((&TextEdit :range (&Range :start left-start :end left-end))
-                                          (&TextEdit :range (&Range :start right-start :end right-end)))
-  (if (lsp--position-equal left-start right-start)
-      (lsp--position-compare left-end right-end)
-    (lsp--position-compare left-start right-start)))
-
-(lsp-defun lsp--apply-text-edit ((edit &as &TextEdit :range (&RangeToPoint :start :end) :new-text))
-  "Apply the edits described in the TextEdit object in TEXT-EDIT."
-  (setq new-text (s-replace "\r" "" (or new-text "")))
-  (lsp:set-text-edit-new-text edit new-text)
-  (goto-char start)
-  (delete-region start end)
-  (insert new-text))
-
-;; WORKAROUND: typescript-language might send -1 when applying code actions.
-;; see https://github.com/emacs-lsp/lsp-mode/issues/1582
-(lsp-defun lsp--fix-point ((point &as &Position :character :line))
-  (-doto point
-    (lsp:set-position-line (max 0 line))
-    (lsp:set-position-character (max 0 character))))
-
-(lsp-defun lsp--apply-text-edit-replace-buffer-contents ((edit &as
-                                                               &TextEdit
-                                                               :range (&Range :start :end)
-                                                               :new-text))
-  "Apply the edits described in the TextEdit object in TEXT-EDIT.
-The method uses `replace-buffer-contents'."
-  (setq new-text (s-replace "\r" "" (or new-text "")))
-  (lsp:set-text-edit-new-text edit new-text)
-  (-let* ((source (current-buffer))
-          ((beg . end) (lsp--range-to-region (lsp-make-range :start (lsp--fix-point start)
-                                                             :end (lsp--fix-point end)))))
-    (with-temp-buffer
-      (insert new-text)
-      (let ((temp (current-buffer)))
-        (with-current-buffer source
-          (save-excursion
-            (save-restriction
-              (narrow-to-region beg end)
-
-              ;; On emacs versions < 26.2,
-              ;; `replace-buffer-contents' is buggy - it calls
-              ;; change functions with invalid arguments - so we
-              ;; manually call the change functions here.
-              ;;
-              ;; See emacs bugs #32237, #32278:
-              ;; https://debbugs.gnu.org/cgi/bugreport.cgi?bug=32237
-              ;; https://debbugs.gnu.org/cgi/bugreport.cgi?bug=32278
-              (let ((inhibit-modification-hooks t)
-                    (length (- end beg)))
-                (run-hook-with-args 'before-change-functions
-                                    beg end)
-                (replace-buffer-contents temp)
-                (run-hook-with-args 'after-change-functions
-                                    beg (+ beg (length new-text))
-                                    length)))))))))
-
-(defun lsp--to-yasnippet-snippet (snippet)
-  "Convert LSP SNIPPET to yasnippet snippet."
-  ;; LSP snippet doesn't escape "{" and "`", but yasnippet requires escaping it.
-  (replace-regexp-in-string (rx (or bos (not (any "$" "\\"))) (group (or "{" "`")))
-                            (rx "\\" (backref 1))
-                            snippet
-                            nil nil 1))
-
-(defvar-local lsp-enable-relative-indentation nil
-  "Enable relative indentation when insert texts, snippets ...
-from language server.")
-
-(defun lsp--expand-snippet (snippet &optional start end expand-env)
-  "Wrapper of `yas-expand-snippet' with all of it arguments.
-The snippet will be convert to LSP style and indent according to
-LSP server result."
-  (require 'yasnippet nil t)
-  (let* ((inhibit-field-text-motion t)
-         (yas-wrap-around-region nil)
-         (yas-indent-line 'none)
-         (yas-also-auto-indent-first-line nil))
-    (yas-expand-snippet
-     (lsp--to-yasnippet-snippet snippet)
-     start end expand-env)))
-
-(defun lsp--indent-lines (start end &optional insert-text-mode?)
-  "Indent from START to END based on INSERT-TEXT-MODE? value.
-- When INSERT-TEXT-MODE? is provided
-  - if it's `lsp/insert-text-mode-as-it', do no editor indentation.
-  - if it's `lsp/insert-text-mode-adjust-indentation', adjust leading
-    whitespaces to match the line where text is inserted.
-- When it's not provided, using `indent-line-function' for each line."
-  (save-excursion
-    (goto-char end)
-    (let* ((end-line (line-number-at-pos))
-           (offset (save-excursion
-                     (goto-char start)
-                     (current-indentation)))
-           (indent-line-function
-            (cond ((equal insert-text-mode? lsp/insert-text-mode-as-it)
-                   #'ignore)
-                  ((or (equal insert-text-mode? lsp/insert-text-mode-adjust-indentation)
-                       lsp-enable-relative-indentation
-                       ;; Indenting snippets is extremely slow in `org-mode' buffers
-                       ;; since it has to calculate indentation based on SRC block
-                       ;; position.  Thus we use relative indentation as default.
-                       (derived-mode-p 'org-mode))
-                   (lambda () (save-excursion
-                                (beginning-of-line)
-                                (indent-to-column offset))))
-                  (t indent-line-function))))
-      (goto-char start)
-      (forward-line)
-      (while (and (not (eobp))
-                  (<= (line-number-at-pos) end-line))
-        (funcall indent-line-function)
-        (forward-line)))))
-
-(defun lsp--apply-text-edits (edits &optional operation)
-  "Apply the EDITS described in the TextEdit[] object.
-OPERATION is symbol representing the source of this text edit."
-  (unless (seq-empty-p edits)
-    (atomic-change-group
-      (run-hooks 'lsp-before-apply-edits-hook)
-      (let* ((change-group (prepare-change-group))
-             (howmany (length edits))
-             (message (format "Applying %s edits to `%s' ..." howmany (current-buffer)))
-             (_ (lsp--info message))
-             (reporter (make-progress-reporter message 0 howmany))
-             (done 0)
-             (apply-edit (if (not lsp--virtual-buffer)
-                             #'lsp--apply-text-edit-replace-buffer-contents
-                           #'lsp--apply-text-edit)))
-        (unwind-protect
-            (->> edits
-                 ;; We sort text edits so as to apply edits that modify latter
-                 ;; parts of the document first. Furthermore, because the LSP
-                 ;; spec dictates that: "If multiple inserts have the same
-                 ;; position, the order in the array defines which edit to
-                 ;; apply first."  We reverse the initial list and sort stably
-                 ;; to make sure the order among edits with the same position
-                 ;; is preserved.
-                 (nreverse)
-                 (seq-sort #'lsp--text-edit-sort-predicate)
-                 (mapc (lambda (edit)
-                         (progress-reporter-update reporter (cl-incf done))
-                         (funcall apply-edit edit)
-                         (when (lsp:snippet-text-edit-insert-text-format? edit)
-                           (-when-let ((&SnippetTextEdit :range (&RangeToPoint :start)
-                                                         :insert-text-format? :new-text) edit)
-                             (when (eq insert-text-format? lsp/insert-text-format-snippet)
-                               ;; No `save-excursion' needed since expand snippet will change point anyway
-                               (goto-char (+ start (length new-text)))
-                               (lsp--indent-lines start (point))
-                               (lsp--expand-snippet new-text start (point)))))
-                         (run-hook-with-args 'lsp-after-apply-edits-hook operation))))
-          (undo-amalgamate-change-group change-group)
-          (progress-reporter-done reporter))))))
-
-(defun lsp--create-apply-text-edits-handlers ()
-  "Create (handler cleanup-fn) for applying text edits in async request.
-Only works when mode is `tick or `alive."
-  (let* (first-edited
-         (func (lambda (start &rest _)
-                 (setq first-edited (if first-edited
-                                        (min start first-edited)
-                                      start)))))
-    (add-hook 'before-change-functions func nil t)
-    (list
-     (lambda (edits)
-       (if (and first-edited
-                (seq-find (-lambda ((&TextEdit :range (&RangeToPoint :end)))
-                            ;; Text edit region is overlapped
-                            (> end first-edited))
-                          edits))
-           (lsp--warn "TextEdits will not be applied since document has been modified before of them.")
-         (lsp--apply-text-edits edits 'completion-cleanup)))
-     (lambda ()
-       (remove-hook 'before-change-functions func t)))))
-
-(defun lsp--capability (cap &optional capabilities)
-  "Get the value of capability CAP.  If CAPABILITIES is non-nil, use them instead."
-  (when (stringp cap)
-    (setq cap (intern (concat ":" cap))))
-
-  (lsp-get (or capabilities
-               (lsp--server-capabilities))
-           cap))
-
-(defun lsp--registered-capability (method)
-  "Check whether there is workspace providing METHOD."
-  (->> (lsp-workspaces)
-       (--keep (seq-find (lambda (reg)
-                           (equal (lsp--registered-capability-method reg) method))
-                         (lsp--workspace-registered-server-capabilities it)))
-       cl-first))
-
-(defun lsp--capability-for-method (method)
-  "Get the value of capability for METHOD."
-  (-let* ((reqs (cdr (assoc method lsp-method-requirements)))
-          ((&plist :capability) reqs))
-    (or (and capability (lsp--capability capability))
-        (-some-> (lsp--registered-capability method)
-          (lsp--registered-capability-options)))))
-
-(defvar-local lsp--before-change-vals nil
-  "Store the positions from the `lsp-before-change' function call, for
-validation and use in the `lsp-on-change' function.")
-
-(defun lsp--text-document-content-change-event (start end length)
-  "Make a TextDocumentContentChangeEvent body for START to END, of length LENGTH."
-  ;; So (47 54 0) means add    7 chars starting at pos 47
-  ;; must become
-  ;;   {"range":{"start":{"line":5,"character":6}
-  ;;             ,"end" :{"line":5,"character":6}}
-  ;;             ,"rangeLength":0
-  ;;             ,"text":"\nbb = 5"}
-  ;;
-  ;; And (47 47 7) means delete 7 chars starting at pos 47
-  ;; must become
-  ;;   {"range":{"start":{"line":6,"character":0}
-  ;;            ,"end"  :{"line":7,"character":0}}
-  ;;            ,"rangeLength":7
-  ;;            ,"text":""}
-  ;;
-  ;; (208 221 3) means delete 3 chars starting at pos 208, and replace them with
-  ;; 13 chars. So it must become
-  ;;   {"range":{"start":{"line":5,"character":8}
-  ;;             ,"end" :{"line":5,"character":11}}
-  ;;             ,"rangeLength":3
-  ;;             ,"text":"new-chars-xxx"}
-  ;;
-
-  ;; Adding text:
-  ;;   lsp-before-change:(start,end)=(33,33)
-  ;;   lsp-on-change:(start,end,length)=(33,34,0)
-  ;;
-  ;; Changing text:
-  ;;   lsp-before-change:(start,end)=(208,211)
-  ;;   lsp-on-change:(start,end,length)=(208,221,3)
-  ;;
-  ;; Deleting text:
-  ;;   lsp-before-change:(start,end)=(19,27)
-  ;;   lsp-on-change:(start,end,length)=(19,19,8)
-  (if (zerop length)
-      ;; Adding something only, work from start only
-      `( :range ,(lsp--range
-                  (lsp--point-to-position start)
-                  (lsp--point-to-position start))
-         :rangeLength 0
-         :text ,(buffer-substring-no-properties start end))
-
-    (if (eq start end)
-        ;; Deleting something only
-        (if (lsp--bracketed-change-p start length)
-            ;; The before-change value is bracketed, use it
-            `( :range ,(lsp--range
-                        (lsp--point-to-position start)
-                        (plist-get lsp--before-change-vals :end-pos))
-               :rangeLength ,length
-               :text "")
-          ;; If the change is not bracketed, send a full change event instead.
-          (lsp--full-change-event))
-
-      ;; Deleting some things, adding others
-      (if (lsp--bracketed-change-p start length)
-          ;; The before-change value is valid, use it
-          `( :range ,(lsp--range
-                      (lsp--point-to-position start)
-                      (plist-get lsp--before-change-vals :end-pos))
-             :rangeLength ,length
-             :text ,(buffer-substring-no-properties start end))
-        (lsp--full-change-event)))))
-
-(defun lsp--bracketed-change-p (start length)
-  "If the before and after positions are the same, and the length
-is the size of the start range, we are probably good."
-  (-let [(&plist :end before-end :start before-start) lsp--before-change-vals]
-    (and (eq start before-start)
-         (eq length (- before-end before-start)))))
-
-(defun lsp--full-change-event ()
-  `(:text ,(lsp--buffer-content)))
-
-(defun lsp-before-change (start end)
-  "Executed before a file is changed.
-Added to `before-change-functions'."
-  ;; Note:
-  ;;
-  ;; This variable holds a list of functions to call when Emacs is about to
-  ;; modify a buffer. Each function gets two arguments, the beginning and end of
-  ;; the region that is about to change, represented as integers. The buffer
-  ;; that is about to change is always the current buffer when the function is
-  ;; called.
-  ;;
-  ;; WARNING:
-  ;;
-  ;; Do not expect the before-change hooks and the after-change hooks be called
-  ;; in balanced pairs around each buffer change. Also don't expect the
-  ;; before-change hooks to be called for every chunk of text Emacs is about to
-  ;; delete. These hooks are provided on the assumption that Lisp programs will
-  ;; use either before- or the after-change hooks, but not both, and the
-  ;; boundaries of the region where the changes happen might include more than
-  ;; just the actual changed text, or even lump together several changes done
-  ;; piecemeal.
-  (save-match-data
-    (lsp-save-restriction-and-excursion
-      (setq lsp--before-change-vals
-            (list :start start
-                  :end end
-                  :end-pos (lsp--point-to-position end))))))
-
-(defun lsp--flush-delayed-changes ()
-  (let ((inhibit-quit t))
-    (when lsp--delay-timer
-      (cancel-timer lsp--delay-timer))
-    (mapc (-lambda ((workspace buffer document change))
-            (with-current-buffer buffer
-              (with-lsp-workspace workspace
-                (lsp-notify "textDocument/didChange"
-                            (list :textDocument document
-                                  :contentChanges (vector change))))))
-          (prog1 (nreverse lsp--delayed-requests)
-            (setq lsp--delayed-requests nil)))))
-
-(defun lsp--workspace-sync-method (workspace)
-  (let ((sync (-> workspace
-                  (lsp--workspace-server-capabilities)
-                  (lsp:server-capabilities-text-document-sync?))))
-    (if (lsp-text-document-sync-options? sync)
-        (lsp:text-document-sync-options-change? sync)
-      sync)))
-
-(defun lsp-on-change (start end length &optional content-change-event-fn)
-  "Executed when a file is changed.
-Added to `after-change-functions'."
-  ;; Note:
-  ;;
-  ;; Each function receives three arguments: the beginning and end of the region
-  ;; just changed, and the length of the text that existed before the change.
-  ;; All three arguments are integers. The buffer that has been changed is
-  ;; always the current buffer when the function is called.
-  ;;
-  ;; The length of the old text is the difference between the buffer positions
-  ;; before and after that text as it was before the change. As for the
-  ;; changed text, its length is simply the difference between the first two
-  ;; arguments.
-  ;;
-  ;; So (47 54 0) means add    7 chars starting at pos 47
-  ;; So (47 47 7) means delete 7 chars starting at pos 47
-  (save-match-data
-    (let ((inhibit-quit t)
-          ;; make sure that `lsp-on-change' is called in multi-workspace context
-          ;; see #2901
-          lsp--cur-workspace)
-      ;; A (revert-buffer) call with the 'preserve-modes parameter (eg, as done
-      ;; by auto-revert-mode) will cause this handler to get called with a nil
-      ;; buffer-file-name. We need the buffer-file-name to send notifications;
-      ;; so we skip handling revert-buffer-caused changes and instead handle
-      ;; reverts separately in lsp-on-revert
-      (when (not revert-buffer-in-progress-p)
-        (cl-incf lsp--cur-version)
-        (mapc
-         (lambda (workspace)
-           (pcase (or lsp-document-sync-method
-                      (lsp--workspace-sync-method workspace))
-             (1
-              (if lsp-debounce-full-sync-notifications
-                  (setq lsp--delayed-requests
-                        (->> lsp--delayed-requests
-                             (-remove (-lambda ((_ buffer))
-                                        (equal (current-buffer) buffer)))
-                             (cons (list workspace
-                                         (current-buffer)
-                                         (lsp--versioned-text-document-identifier)
-                                         (lsp--full-change-event)))))
-                (with-lsp-workspace workspace
-                  (lsp-notify "textDocument/didChange"
-                              (list :contentChanges (vector (lsp--full-change-event))
-                                    :textDocument (lsp--versioned-text-document-identifier)))
-                  (lsp-diagnostics--request-pull-diagnostics workspace))))
-             (2
-              (with-lsp-workspace workspace
-                (lsp-notify
-                 "textDocument/didChange"
-                 (list :textDocument (lsp--versioned-text-document-identifier)
-                       :contentChanges (vector
-                                        (if content-change-event-fn
-                                            (funcall content-change-event-fn start end length)
-                                          (lsp--text-document-content-change-event
-                                           start end length)))))
-                (lsp-diagnostics--request-pull-diagnostics workspace)))))
-         (lsp-workspaces))
-        (when lsp--delay-timer (cancel-timer lsp--delay-timer))
-        (setq lsp--delay-timer (run-with-idle-timer
-                                lsp-debounce-full-sync-notifications-interval
-                                nil
-                                #'lsp--flush-delayed-changes))
-        ;; force cleanup overlays after each change
-        (lsp--remove-overlays 'lsp-highlight)
-        (lsp--after-change (current-buffer))))))
-
-
-
-;; facilities for on change hooks. We do not want to make lsp calls on each
-;; change event so we add debounce to avoid flooding the server with events.
-;; Additionally, we want to have a mechanism for stopping the server calls in
-;; particular cases like, e. g. when performing completion.
-
-(defvar lsp-inhibit-lsp-hooks nil
-  "Flag to control.")
-
-(defcustom lsp-on-change-hook nil
-  "Hooks to run when buffer has changed."
-  :type 'hook
-  :group 'lsp-mode)
-
-(defcustom lsp-idle-delay 0.500
-  "Debounce interval for `after-change-functions'."
-  :type 'number
-  :group 'lsp-mode)
-
-(defcustom lsp-on-idle-hook nil
-  "Hooks to run after `lsp-idle-delay'."
-  :type 'hook
-  :group 'lsp-mode)
-
-(defun lsp--idle-reschedule (buffer)
-  (when lsp--on-idle-timer
-    (cancel-timer lsp--on-idle-timer))
-
-  (setq lsp--on-idle-timer (run-with-idle-timer
-                            lsp-idle-delay
-                            nil
-                            #'lsp--on-idle
-                            buffer)))
-
-(defun lsp--post-command ()
-  (lsp--cleanup-highlights-if-needed)
-  (lsp--idle-reschedule (current-buffer)))
-
-(defun lsp--on-idle (buffer)
-  "Start post command loop."
-  (when (and (buffer-live-p buffer)
-             (equal buffer (current-buffer))
-             (not lsp-inhibit-lsp-hooks)
-             lsp-managed-mode)
-    (run-hooks 'lsp-on-idle-hook)))
-
-(defun lsp--on-change-debounce (buffer)
-  (when (and (buffer-live-p buffer)
-             (equal buffer (current-buffer))
-             (not lsp-inhibit-lsp-hooks)
-             lsp-managed-mode)
-    (run-hooks 'lsp-on-change-hook)))
-
-(defun lsp--after-change (buffer)
-  "Called after most textDocument/didChange events."
-  (setq lsp--signature-last-index nil
-        lsp--signature-last nil)
-
-  ;; cleanup diagnostics
-  (when lsp-diagnostic-clean-after-change
-    (dolist (workspace (lsp-workspaces))
-      (-let [diagnostics (lsp--workspace-diagnostics workspace)]
-        (remhash (lsp--fix-path-casing (buffer-file-name)) diagnostics))))
-
-  (when (fboundp 'lsp--semantic-tokens-refresh-if-enabled)
-    (lsp--semantic-tokens-refresh-if-enabled buffer))
-  (when lsp--on-change-timer
-    (cancel-timer lsp--on-change-timer))
-  (setq lsp--on-change-timer (run-with-idle-timer
-                              lsp-idle-delay
-                              nil
-                              #'lsp--on-change-debounce
-                              buffer))
-  (lsp--idle-reschedule buffer))
-
-
-(defcustom lsp-trim-trailing-whitespace t
-  "Trim trailing whitespace on a line."
-  :group 'lsp-mode
-  :type 'boolean)
-
-(defcustom lsp-insert-final-newline t
-  "Insert a newline character at the end of the file if one does not exist."
-  :group 'lsp-mode
-  :type 'boolean)
-
-(defcustom lsp-trim-final-newlines t
-  "Trim all newlines after the final newline at the end of the file."
-  :group 'lsp-mode
-  :type 'boolean)
-
-
-(defun lsp--on-type-formatting (first-trigger-characters more-trigger-characters)
-  "Self insert handling.
-Applies on type formatting."
-  (let ((ch last-command-event))
-    (when (or (eq (string-to-char first-trigger-characters) ch)
-              (cl-find ch more-trigger-characters :key #'string-to-char))
-      (lsp-request-async "textDocument/onTypeFormatting"
-                         (lsp-make-document-on-type-formatting-params
-                          :text-document (lsp--text-document-identifier)
-                          :options (lsp-make-formatting-options
-                                    :tab-size (symbol-value (lsp--get-indent-width major-mode))
-                                    :insert-spaces (lsp-json-bool (not indent-tabs-mode))
-                                    :trim-trailing-whitespace? (lsp-json-bool lsp-trim-trailing-whitespace)
-                                    :insert-final-newline? (lsp-json-bool lsp-insert-final-newline)
-                                    :trim-final-newlines? (lsp-json-bool lsp-trim-final-newlines))
-                          :ch (char-to-string ch)
-                          :position (lsp--cur-position))
-                         (lambda (data) (lsp--apply-text-edits data 'format))
-                         :mode 'tick))))
-
-
-;; links
-(defun lsp--document-links ()
-  (when (lsp-feature? "textDocument/documentLink")
-    (lsp-request-async
-     "textDocument/documentLink"
-     `(:textDocument ,(lsp--text-document-identifier))
-     (lambda (links)
-       (lsp--remove-overlays 'lsp-link)
-       (seq-do
-        (-lambda ((link &as &DocumentLink :range (&Range :start :end)))
-          (-doto (make-button (lsp--position-to-point start)
-                              (lsp--position-to-point end)
-                              'action (lsp--document-link-keymap link)
-                              'keymap (let ((map (make-sparse-keymap)))
-                                        (define-key map [M-return] 'push-button)
-                                        (define-key map [mouse-2] 'push-button)
-                                        map)
-                              'help-echo "mouse-2, M-RET: Visit this link")
-            (overlay-put 'lsp-link t)))
-        links))
-     :mode 'unchanged)))
-
-(defun lsp--document-link-handle-target (url)
-  (let* ((parsed-url (url-generic-parse-url (url-unhex-string url)))
-         (type (url-type parsed-url)))
-    (pcase type
-      ("file"
-       (xref-push-marker-stack)
-       (find-file (lsp--uri-to-path url))
-       (-when-let ((_ line column) (s-match (rx "#" (group (1+ num)) (or "," "#") (group (1+ num))) url))
-         (goto-char (lsp--position-to-point
-                     (lsp-make-position :character (1- (string-to-number column))
-                                        :line (1- (string-to-number line)))))))
-      ((or "http" "https") (browse-url url))
-      (type (if-let ((handler (lsp--get-uri-handler type)))
-                (funcall handler url)
-              (signal 'lsp-file-scheme-not-supported (list url)))))))
-
-(lsp-defun lsp--document-link-keymap ((link &as &DocumentLink :target?))
-  (if target?
-      (lambda (_)
-        (interactive)
-        (lsp--document-link-handle-target target?))
-    (lambda (_)
-      (interactive)
-      (when (lsp:document-link-registration-options-resolve-provider?
-             (lsp--capability-for-method "textDocument/documentLink"))
-        (lsp-request-async
-         "documentLink/resolve"
-         link
-         (-lambda ((&DocumentLink :target?))
-           (lsp--document-link-handle-target target?)))))))
-
-
-
-(defcustom lsp-warn-no-matched-clients t
-  "Whether to show messages when there are no supported clients."
-  :group 'lsp-mode
-  :type 'boolean)
-
-(defun lsp-buffer-language--configured-id ()
-  "Return nil when not registered."
-  (->> lsp-language-id-configuration
-       (-first
-        (-lambda ((mode-or-pattern . language))
-          (cond
-           ((and (stringp mode-or-pattern)
-                 (s-matches? mode-or-pattern (buffer-file-name)))
-            language)
-           ((eq mode-or-pattern major-mode) language))))
-       cl-rest))
-
-(defvar-local lsp--buffer-language nil
-  "Locally cached returned value of `lsp-buffer-language'.")
-
-(defun lsp-buffer-language ()
-  "Get language corresponding current buffer."
-  (or lsp--buffer-language
-      (let* ((configured-language (lsp-buffer-language--configured-id)))
-        (setq lsp--buffer-language
-              (or configured-language
-                  ;; ensure non-nil
-                  (string-remove-suffix "-mode" (symbol-name major-mode))))
-        (when (and lsp-warn-no-matched-clients
-                   (null configured-language))
-          (lsp-warn "Unable to calculate the languageId for buffer `%s'. \
-Take a look at `lsp-language-id-configuration'. The `major-mode' is %s"
-                    (buffer-name)
-                    major-mode))
-        lsp--buffer-language)))
-
-(defun lsp-activate-on (&rest languages)
-  "Returns language activation function.
-The function will return t when the `lsp-buffer-language' returns
-one of the LANGUAGES."
-  (lambda (_file-name _mode)
-    (-contains? languages (lsp-buffer-language))))
-
-(defun lsp-workspace-root (&optional path)
-  "Find the workspace root for the current file or PATH."
-  (-when-let* ((file-name (or path (buffer-file-name)))
-               (file-name (lsp-f-canonical file-name)))
-    (->> (lsp-session)
-         (lsp-session-folders)
-         (--filter (and (lsp--files-same-host it file-name)
-                        (or (lsp-f-ancestor-of? it file-name)
-                            (equal it file-name))))
-         (--max-by (> (length it) (length other))))))
-
-(defun lsp-on-revert ()
-  "Executed when a file is reverted.
-Added to `after-revert-hook'."
-  (let ((n (buffer-size))
-        (revert-buffer-in-progress-p nil))
-    (lsp-on-change 0 n n)))
-
-(defun lsp--text-document-did-close (&optional keep-workspace-alive)
-  "Executed when the file is closed, added to `kill-buffer-hook'.
-
-If KEEP-WORKSPACE-ALIVE is non-nil, do not shutdown the workspace
-if it's closing the last buffer in the workspace."
-  (lsp-foreach-workspace
-   (cl-callf2 delq (lsp-current-buffer) (lsp--workspace-buffers lsp--cur-workspace))
-   (with-demoted-errors "Error sending didClose notification in ‘lsp--text-document-did-close’: %S"
-     (lsp-notify "textDocument/didClose"
-                 `(:textDocument ,(lsp--text-document-identifier))))
-   (when (and (not lsp-keep-workspace-alive)
-              (not keep-workspace-alive)
-              (not (lsp--workspace-buffers lsp--cur-workspace)))
-     (lsp--shutdown-workspace))))
-
-(defun lsp--will-save-text-document-params (reason)
-  (list :textDocument (lsp--text-document-identifier)
-        :reason reason))
-
-(defun lsp--before-save ()
-  "Before save handler."
-  (with-demoted-errors "Error in ‘lsp--before-save’: %S"
-    (let ((params (lsp--will-save-text-document-params 1)))
-      (when (lsp--send-will-save-p)
-        (lsp-notify "textDocument/willSave" params))
-      (when (and (lsp--send-will-save-wait-until-p) lsp-before-save-edits)
-        (let ((lsp-response-timeout 0.1))
-          (condition-case nil
-              (lsp--apply-text-edits
-               (lsp-request "textDocument/willSaveWaitUntil"
-                            params)
-               'before-save)
-            (error)))))))
-
-(defun lsp--on-auto-save ()
-  "Handler for auto-save."
-  (when (lsp--send-will-save-p)
-    (with-demoted-errors "Error in ‘lsp--on-auto-save’: %S"
-      (lsp-notify "textDocument/willSave" (lsp--will-save-text-document-params 2)))))
-
-(defun lsp--text-document-did-save ()
-  "Executed when the file is closed, added to `after-save-hook''."
-  (when (lsp--send-did-save-p)
-    (with-demoted-errors "Error on ‘lsp--text-document-did-save: %S’"
-      (lsp-notify "textDocument/didSave"
-                  `( :textDocument ,(lsp--versioned-text-document-identifier)
-                     ,@(when (lsp--save-include-text-p)
-                         (list :text (lsp--buffer-content))))))))
-
-(defun lsp--text-document-position-params (&optional identifier position)
-  "Make TextDocumentPositionParams for the current point in the current document.
-If IDENTIFIER and POSITION are non-nil, they will be used as the document
-identifier and the position respectively."
-  (list :textDocument (or identifier (lsp--text-document-identifier))
-        :position (or position (lsp--cur-position))))
-
-(defun lsp--get-buffer-diagnostics ()
-  "Return buffer diagnostics."
-  (gethash (or
-            (plist-get lsp--virtual-buffer :buffer-file-name)
-            (lsp--fix-path-casing (buffer-file-name)))
-           (lsp-diagnostics t)))
-
-(defun lsp-cur-line-diagnostics ()
-  "Return any diagnostics that apply to the current line."
-  (-let [(&plist :start (&plist :line start) :end (&plist :line end)) (lsp--region-or-line)]
-    (cl-coerce (-filter
-                (-lambda ((&Diagnostic :range (&Range :start (&Position :line))))
-                  (and (>= line start) (<= line end)))
-                (lsp--get-buffer-diagnostics))
-               'vector)))
-
-(lsp-defun lsp-range-overlapping?((left &as &Range :start left-start :end left-end)
-                                  (right &as &Range :start right-start :end right-end))
-  (or (lsp-point-in-range? right-start left)
-      (lsp-point-in-range? right-end left)
-      (lsp-point-in-range? left-start right)
-      (lsp-point-in-range? left-end right)))
-
-(defun lsp-make-position-1 (position)
-  (lsp-make-position :line (plist-get position :line)
-                     :character (plist-get position :character)))
-
-(defun lsp-cur-possition-diagnostics ()
-  "Return any diagnostics that apply to the current line."
-  (-let* ((start (if (use-region-p) (region-beginning) (point)))
-          (end (if (use-region-p) (region-end) (point)))
-          (current-range (lsp-make-range :start (lsp-make-position-1 (lsp-point-to-position start))
-                                         :end (lsp-make-position-1 (lsp-point-to-position end)))))
-    (->> (lsp--get-buffer-diagnostics)
-         (-filter
-          (-lambda ((&Diagnostic :range))
-            (lsp-range-overlapping? range current-range)))
-         (apply 'vector))))
-
-(defalias 'lsp--cur-line-diagnotics 'lsp-cur-line-diagnostics)
-
-(defun lsp--extract-line-from-buffer (pos)
-  "Return the line pointed to by POS (a Position object) in the current buffer."
-  (let* ((point (lsp--position-to-point pos))
-         (inhibit-field-text-motion t))
-    (save-excursion
-      (goto-char point)
-      (buffer-substring (line-beginning-position) (line-end-position)))))
-
-(lsp-defun lsp--xref-make-item (filename (&Range :start (start &as &Position :character start-char :line start-line)
-                                                 :end (end &as &Position :character end-char)))
-  "Return a xref-item from a RANGE in FILENAME."
-  (let* ((line (lsp--extract-line-from-buffer start))
-         (len (length line)))
-    (add-face-text-property (max (min start-char len) 0)
-                            (max (min end-char len) 0)
-                            'xref-match t line)
-    ;; LINE is nil when FILENAME is not being current visited by any buffer.
-    (xref-make-match (or line filename)
-                     (xref-make-file-location
-                      filename
-                      (lsp-translate-line (1+ start-line))
-                      (lsp-translate-column start-char))
-                     (- end-char start-char))))
-
-(defun lsp--location-uri (loc)
-  (if (lsp-location? loc)
-      (lsp:location-uri loc)
-    (lsp:location-link-target-uri loc)))
-
-(lsp-defun lsp-goto-location ((loc &as &Location :uri :range (&Range :start)))
-  "Go to location."
-  (let ((path (lsp--uri-to-path uri)))
-    (if (f-exists? path)
-        (with-current-buffer (find-file path)
-          (goto-char (lsp--position-to-point start)))
-      (error "There is no file %s" path))))
-
-(defun lsp--location-range (loc)
-  (if (lsp-location? loc)
-      (lsp:location-range loc)
-    (lsp:location-link-target-selection-range loc)))
-
-(defun lsp--locations-to-xref-items (locations)
-  "Return a list of `xref-item' given LOCATIONS, which can be of
-type Location, LocationLink, Location[] or LocationLink[]."
-  (setq locations
-        (pcase locations
-          ((seq (or (lsp-interface Location)
-                    (lsp-interface LocationLink)))
-           (append locations nil))
-          ((or (lsp-interface Location)
-               (lsp-interface LocationLink))
-           (list locations))))
-
-  (cl-labels ((get-xrefs-in-file
-               (file-locs)
-               (-let [(filename . matches) file-locs]
-                 (condition-case err
-                     (let ((visiting (find-buffer-visiting filename))
-                           (fn (lambda (loc)
-                                 (lsp-with-filename filename
-                                   (lsp--xref-make-item filename
-                                                        (lsp--location-range loc))))))
-                       (if visiting
-                           (with-current-buffer visiting
-                             (seq-map fn matches))
-                         (when (file-readable-p filename)
-                           (with-temp-buffer
-                             (insert-file-contents-literally filename)
-                             (seq-map fn matches)))))
-                   (error (lsp-warn "Failed to process xref entry for filename '%s': %s"
-                                    filename (error-message-string err)))
-                   (file-error (lsp-warn "Failed to process xref entry, file-error, '%s': %s"
-                                         filename (error-message-string err)))))))
-
-    (->> locations
-         (seq-sort #'lsp--location-before-p)
-         (seq-group-by (-compose #'lsp--uri-to-path #'lsp--location-uri))
-         (seq-map #'get-xrefs-in-file)
-         (apply #'nconc))))
-
-(defun lsp--location-before-p (left right)
-  "Sort first by file, then by line, then by column."
-  (let ((left-uri (lsp--location-uri left))
-        (right-uri (lsp--location-uri right)))
-    (if (not (string= left-uri right-uri))
-        (string< left-uri right-uri)
-      (-let (((&Range :start left-start) (lsp--location-range left))
-             ((&Range :start right-start) (lsp--location-range right)))
-        (lsp--position-compare right-start left-start)))))
-
-(defun lsp--make-reference-params (&optional td-position exclude-declaration)
-  "Make a ReferenceParam object.
-If TD-POSITION is non-nil, use it as TextDocumentPositionParams object instead.
-If EXCLUDE-DECLARATION is non-nil, request the server to include declarations."
-  (let ((json-false :json-false))
-    (plist-put (or td-position (lsp--text-document-position-params))
-               :context `(:includeDeclaration ,(lsp-json-bool (not exclude-declaration))))))
-
-(defun lsp--cancel-request (id)
-  "Cancel request with ID in all workspaces."
-  (lsp-foreach-workspace
-   (->> lsp--cur-workspace lsp--workspace-client lsp--client-response-handlers (remhash id))
-   (lsp-notify "$/cancelRequest" `(:id ,id))))
-
-(defvar-local lsp--hover-saved-bounds nil)
-
-(defun lsp-eldoc-function (cb &rest _ignored)
-  "`lsp-mode' eldoc function to display hover info (based on `textDocument/hover')."
-  (if (and lsp--hover-saved-bounds
-           (lsp--point-in-bounds-p lsp--hover-saved-bounds))
-      lsp--eldoc-saved-message
-    (setq lsp--hover-saved-bounds nil
-          lsp--eldoc-saved-message nil)
-    (if (looking-at-p "[[:space:]\n]")
-        (setq lsp--eldoc-saved-message nil) ; And returns nil.
-      (when (and lsp-eldoc-enable-hover (lsp-feature? "textDocument/hover"))
-        (lsp-request-async
-         "textDocument/hover"
-         (lsp--text-document-position-params)
-         (-lambda ((hover &as &Hover? :range? :contents))
-           (setq lsp--hover-saved-bounds (when range?
-                                           (lsp--range-to-region range?)))
-           (funcall cb (setq lsp--eldoc-saved-message
-                             (when contents
-                               (lsp--render-on-hover-content
-                                contents
-                                lsp-eldoc-render-all)))))
-         :error-handler #'ignore
-         :mode 'tick
-         :cancel-token :eldoc-hover)))))
-
-(defun lsp--point-on-highlight? ()
-  (-some? (lambda (overlay)
-            (overlay-get overlay 'lsp-highlight))
-          (overlays-at (point))))
-
-(defun lsp--cleanup-highlights-if-needed ()
-  (when (and lsp-enable-symbol-highlighting
-             lsp--have-document-highlights
-             (not (lsp--point-on-highlight?)))
-    (lsp--remove-overlays 'lsp-highlight)
-    (setq lsp--have-document-highlights nil)
-    (lsp-cancel-request-by-token :highlights)))
-
-(defvar-local lsp--symbol-bounds-of-last-highlight-invocation nil
-  "The bounds of the symbol from which `lsp--document-highlight'
-  most recently requested highlights.")
-
-(defun lsp--document-highlight ()
-  (when (lsp-feature? "textDocument/documentHighlight")
-    (let ((curr-sym-bounds (bounds-of-thing-at-point 'symbol)))
-      (unless (or (looking-at-p "[[:space:]\n]")
-                  (not lsp-enable-symbol-highlighting)
-                  (and lsp--have-document-highlights
-                       curr-sym-bounds
-                       (equal curr-sym-bounds
-                              lsp--symbol-bounds-of-last-highlight-invocation)))
-        (setq lsp--symbol-bounds-of-last-highlight-invocation
-              curr-sym-bounds)
-        (lsp-request-async "textDocument/documentHighlight"
-                           (lsp--text-document-position-params)
-                           #'lsp--document-highlight-callback
-                           :mode 'tick
-                           :cancel-token :highlights)))))
-
-(defun lsp--help-open-link (&rest _)
-  "Open markdown link at point via mouse or keyboard."
-  (interactive "P")
-  (let ((buffer-list-update-hook nil))
-    (-let [(buffer point) (if-let* ((valid (and (listp last-input-event)
-                                                (eq (car last-input-event) 'mouse-2)))
-                                    (event (cadr last-input-event))
-                                    (win (posn-window event))
-                                    (buffer (window-buffer win)))
-                              `(,buffer ,(posn-point event))
-                            `(,(current-buffer) ,(point)))]
-      (with-current-buffer buffer
-        (when-let* ((face (get-text-property point 'face))
-                    (url (or (and (eq face 'markdown-link-face)
-                                  (get-text-property point 'help-echo))
-                             (and (memq face '(markdown-url-face markdown-plain-url-face))
-                                  (nth 3 (markdown-link-at-pos point))))))
-          (lsp--document-link-handle-target url))))))
-
-(defvar lsp-help-mode-map
-  (-doto (make-sparse-keymap)
-    (define-key [remap markdown-follow-link-at-point] #'lsp--help-open-link))
-  "Keymap for `lsp-help-mode'.")
-
-(define-derived-mode lsp-help-mode help-mode "LspHelp"
-  "Major mode for displaying lsp help.")
-
-(defun lsp-describe-thing-at-point ()
-  "Display the type signature and documentation of the thing at point."
-  (interactive)
-  (let ((contents (-some->> (lsp--text-document-position-params)
-                    (lsp--make-request "textDocument/hover")
-                    (lsp--send-request)
-                    (lsp:hover-contents))))
-    (if (and contents (not (equal contents "")))
-        (let ((lsp-help-buf-name "*lsp-help*"))
-          (with-current-buffer (get-buffer-create lsp-help-buf-name)
-            (delay-mode-hooks
-              (lsp-help-mode)
-              (with-help-window lsp-help-buf-name
-                (insert (string-trim-right (lsp--render-on-hover-content contents t)))))
-            (run-mode-hooks)))
-      (lsp--info "No content at point."))))
-
-(defun lsp--point-in-bounds-p (bounds)
-  "Return whether the current point is within BOUNDS."
-  (and (<= (car bounds) (point)) (< (point) (cdr bounds))))
-
-(defun lsp-get-renderer (language)
-  "Get renderer for LANGUAGE."
-  (lambda (str)
-    (lsp--render-string str language)))
-
-(defun lsp--setup-markdown (mode)
-  "Setup the ‘markdown-mode’ in the frame.
-MODE is the mode used in the parent frame."
-  (make-local-variable 'markdown-code-lang-modes)
-  (dolist (mark (alist-get mode lsp-custom-markup-modes))
-    (add-to-list 'markdown-code-lang-modes (cons mark mode)))
-  (setq-local markdown-fontify-code-blocks-natively t)
-  (setq-local markdown-fontify-code-block-default-mode mode)
-  (setq-local markdown-hide-markup t)
-
-  ;; Render some common HTML entities.
-  ;; This should really happen in markdown-mode instead,
-  ;; but it doesn't, so we do it here for now.
-  (setq prettify-symbols-alist
-        (cl-loop for i from 0 to 255
-                 collect (cons (format "&#x%02X;" i) i)))
-  (push '("&lt;" . ?<) prettify-symbols-alist)
-  (push '("&gt;" . ?>) prettify-symbols-alist)
-  (push '("&amp;" . ?&) prettify-symbols-alist)
-  (push '("&nbsp;" . ? ) prettify-symbols-alist)
-  (setq prettify-symbols-compose-predicate
-        (lambda (_start _end _match) t))
-  (prettify-symbols-mode 1))
-
-(defvar lsp-help-link-keymap
-  (let ((map (make-sparse-keymap)))
-    (define-key map [mouse-2] #'lsp--help-open-link)
-    (define-key map "\r" #'lsp--help-open-link)
-    map)
-  "Keymap active on links in *lsp-help* mode.")
-
-(defun lsp--fix-markdown-links ()
-  (let ((inhibit-read-only t)
-        (inhibit-modification-hooks t)
-        (prop))
-    (save-restriction
-      (goto-char (point-min))
-      (while (setq prop (markdown-find-next-prop 'face))
-        (let ((end (or (next-single-property-change (car prop) 'face)
-                       (point-max))))
-          (when (memq (get-text-property (car prop) 'face)
-                      '(markdown-link-face
-                        markdown-url-face
-                        markdown-plain-url-face))
-            (add-text-properties (car prop) end
-                                 (list 'button t
-                                       'category 'lsp-help-link
-                                       'follow-link t
-                                       'keymap lsp-help-link-keymap)))
-          (goto-char end))))))
-
-(defun lsp--buffer-string-visible ()
-  "Return visible buffer string.
-Stolen from `org-copy-visible'."
-  (let ((temp (generate-new-buffer " *temp*"))
-        (beg (point-min))
-        (end (point-max)))
-    (while (/= beg end)
-      (when (get-char-property beg 'invisible)
-        (setq beg (next-single-char-property-change beg 'invisible nil end)))
-      (let* ((next (next-single-char-property-change beg 'invisible nil end))
-             (substring (buffer-substring beg next)))
-        (with-current-buffer temp (insert substring))
-        ;; (setq result (concat result substring))
-        (setq beg next)))
-    (setq deactivate-mark t)
-    (prog1 (with-current-buffer temp
-             (s-chop-suffix "\n" (buffer-string)))
-      (kill-buffer temp))))
-
-(defvar lsp-buffer-major-mode nil
-  "Holds the major mode when fontification function is running.
-See #2588")
-
-(defvar view-inhibit-help-message)
-
-(defun lsp--render-markdown ()
-  "Render markdown."
-
-  (let ((markdown-enable-math nil))
-    (goto-char (point-min))
-    (while (re-search-forward
-            (rx (and "\\" (group (or "\\" "`" "*" "_" ":" "/"
-                                     "{" "}" "[" "]" "(" ")"
-                                     "#" "+" "-" "." "!" "|"))))
-            nil t)
-      (replace-match (rx (backref 1))))
-
-    ;; markdown-mode v2.3 does not yet provide gfm-view-mode
-    (if (fboundp 'gfm-view-mode)
-        (let ((view-inhibit-help-message t))
-          (gfm-view-mode))
-      (gfm-mode))
-
-    (lsp--setup-markdown lsp-buffer-major-mode)))
-
-(defvar lsp--display-inline-image-alist
-  '((lsp--render-markdown
-     (:regexp
-      "!\\[.*?\\](data:image/[a-zA-Z]+;base64,\\([A-Za-z0-9+/\n]+?=*?\\)\\(|[^)]+\\)?)"
-      :sexp
-      (create-image
-       (base64-decode-string
-        (buffer-substring-no-properties (match-beginning 1) (match-end 1)))
-       nil t))))
-  "Replaced string regexp and function returning image.
-Each element should have the form (MODE . (PROPERTY-LIST...)).
-MODE (car) is function which is defined in `lsp-language-id-configuration'.
-Cdr should be list of PROPERTY-LIST.
-
-Each PROPERTY-LIST should have properties:
-:regexp  Regexp which determines what string is relpaced to image.
-         You should also get information of image, by parenthesis constructs.
-         By default, all matched string is replaced to image, but you can
-         change index of replaced string by keyword :replaced-index.
-
-:sexp    Return image when evaluated. You can use information of regexp
-         by using (match-beggining N), (match-end N) or (match-substring N).
-
-In addition, each can have property:
-:replaced-index  Determine index which is used to replace regexp to image.
-                 The value means first argument of `match-beginning' and
-                 `match-end'. If omitted, interpreted as index 0.")
-
-(defcustom lsp-display-inline-image t
-  "Showing inline image or not."
-  :group 'lsp-mode
-  :type 'boolean)
-
-(defcustom lsp-enable-suggest-server-download t
-  "When non-nil enable server downloading suggestions."
-  :group 'lsp-mode
-  :type 'boolean
-  :package-version '(lsp-mode . "9.0.0"))
-
-(defcustom lsp-auto-register-remote-clients t
-  "When non-nil register remote when registering the local one."
-  :group 'lsp-mode
-  :type 'boolean
-  :package-version '(lsp-mode . "9.0.0"))
-
-(defun lsp--display-inline-image (mode)
-  "Add image property if available."
-  (let ((plist-list (cdr (assq mode lsp--display-inline-image-alist))))
-    (when (and (display-images-p) lsp-display-inline-image)
-      (cl-loop
-       for plist in plist-list
-       with regexp with replaced-index
-       do
-       (setq regexp (plist-get plist :regexp))
-       (setq replaced-index (or (plist-get plist :replaced-index) 0))
-
-       (font-lock-remove-keywords nil (list regexp replaced-index))
-       (let ((inhibit-read-only t))
-         (save-excursion
-           (goto-char (point-min))
-           (while (re-search-forward regexp nil t)
-             (set-text-properties
-              (match-beginning replaced-index) (match-end replaced-index)
-              nil)
-             (add-text-properties
-              (match-beginning replaced-index) (match-end replaced-index)
-              `(display ,(eval (plist-get plist :sexp)))))))))))
-
-(defun lsp--fontlock-with-mode (str mode)
-  "Fontlock STR with MODE."
-  (let ((lsp-buffer-major-mode major-mode))
-    (with-temp-buffer
-      (with-demoted-errors "Error during doc rendering: %s"
-        (insert str)
-        (delay-mode-hooks (funcall mode))
-        (cl-flet ((window-body-width () lsp-window-body-width))
-          ;; This can go wrong in some cases, and the fontification would
-          ;; not work as expected.
-          ;;
-          ;; See #2984
-          (ignore-errors (font-lock-ensure))
-          (lsp--display-inline-image mode)
-          (when (eq mode 'lsp--render-markdown)
-            (lsp--fix-markdown-links))))
-      (lsp--buffer-string-visible))))
-
-(defun lsp--render-string (str language)
-  "Render STR using `major-mode' corresponding to LANGUAGE.
-When language is nil render as markup if `markdown-mode' is loaded."
-  (setq str (s-replace "\r" "" (or str "")))
-  (if-let* ((modes (-keep (-lambda ((mode . lang))
-                            (when (and (equal lang language) (functionp mode))
-                              mode))
-                          lsp-language-id-configuration))
-            (mode (car (or (member major-mode modes) modes))))
-      (lsp--fontlock-with-mode str mode)
-    str))
-
-(defun lsp--render-element (content)
-  "Render CONTENT element."
-  (let ((inhibit-message t))
-    (or
-     (pcase content
-       ((lsp-interface MarkedString :value :language)
-        (lsp--render-string value language))
-       ((lsp-interface MarkupContent :value :kind)
-        (lsp--render-string value kind))
-       ;; plain string
-       ((pred stringp) (lsp--render-string content "markdown"))
-       ((pred null) "")
-       (_ (error "Failed to handle %s" content)))
-     "")))
-
-(defun lsp--create-unique-string-fn ()
-  (let (elements)
-    (lambda (element)
-      (let ((count (cl-count element elements :test #'string=)))
-        (prog1 (if (zerop count)
-                   element
-                 (format "%s (%s)" element count))
-          (push element elements))))))
-
-(defun lsp--select-action (actions)
-  "Select an action to execute from ACTIONS."
-  (cond
-   ((seq-empty-p actions) (signal 'lsp-no-code-actions nil))
-   ((and (eq (seq-length actions) 1) lsp-auto-execute-action)
-    (lsp-seq-first actions))
-   (t (let ((completion-ignore-case t))
-        (lsp--completing-read "Select code action: "
-                              (seq-into actions 'list)
-                              (-compose (lsp--create-unique-string-fn)
-                                        #'lsp:code-action-title)
-                              nil t)))))
-
-(defun lsp--workspace-server-id (workspace)
-  "Return the server ID of WORKSPACE."
-  (-> workspace lsp--workspace-client lsp--client-server-id))
-
-(defun lsp--handle-rendered-for-echo-area (contents)
-  "Return a single line from RENDERED, appropriate for display in the echo area."
-  (pcase (lsp-workspaces)
-    (`(,workspace)
-     (lsp-clients-extract-signature-on-hover contents (lsp--workspace-server-id workspace)))
-    ;; For projects with multiple active workspaces we also default to
-    ;; render the first line.
-    (_ (lsp-clients-extract-signature-on-hover contents nil))))
-
-(cl-defmethod lsp-clients-extract-signature-on-hover (contents _server-id)
-  "Extract a representative line from CONTENTS, to show in the echo area."
-  (car (s-lines (s-trim (lsp--render-element contents)))))
-
-(defun lsp--render-on-hover-content (contents render-all)
-  "Render the content received from `document/onHover' request.
-CONTENTS  - MarkedString | MarkedString[] | MarkupContent
-RENDER-ALL - nil if only the signature should be rendered."
-  (cond
-   ((lsp-markup-content? contents)
-    ;; MarkupContent.
-    ;; It tends to be long and is not suitable to display fully in the echo area.
-    ;; Just display the first line which is typically the signature.
-    (if render-all
-        (lsp--render-element contents)
-      (lsp--handle-rendered-for-echo-area contents)))
-   ((and (stringp contents) (not (string-match-p "\n" contents)))
-    ;; If the contents is a single string containing a single line,
-    ;; render it always.
-    (lsp--render-element contents))
-   (t
-    ;; MarkedString -> MarkedString[]
-    (when (or (lsp-marked-string? contents) (stringp contents))
-      (setq contents (list contents)))
-    ;; Consider the signature consisting of the elements who have a renderable
-    ;; "language" property. When render-all is nil, ignore other elements.
-    (string-join
-     (seq-map
-      #'lsp--render-element
-      (if render-all
-          contents
-        ;; Only render contents that have an available renderer.
-        (seq-take
-         (seq-filter
-          (-andfn #'lsp-marked-string?
-                  (-compose #'lsp-get-renderer #'lsp:marked-string-language))
-          contents)
-         1)))
-     (if (bound-and-true-p page-break-lines-mode)
-         "\n\n"
-       "\n")))))
-
-
-
-(defvar lsp-signature-mode-map
-  (-doto (make-sparse-keymap)
-    (define-key (kbd "M-n") #'lsp-signature-next)
-    (define-key (kbd "M-p") #'lsp-signature-previous)
-    (define-key (kbd "M-a") #'lsp-signature-toggle-full-docs)
-    (define-key (kbd "C-c C-k") #'lsp-signature-stop)
-    (define-key (kbd "C-g") #'lsp-signature-stop))
-  "Keymap for `lsp-signature-mode'.")
-
-(define-minor-mode lsp-signature-mode
-  "Mode used to show signature popup."
-  :keymap lsp-signature-mode-map
-  :lighter ""
-  :group 'lsp-mode)
-
-(defun lsp-signature-stop ()
-  "Stop showing current signature help."
-  (interactive)
-  (lsp-cancel-request-by-token :signature)
-  (remove-hook 'post-command-hook #'lsp-signature)
-  (funcall lsp-signature-function nil)
-  (lsp-signature-mode -1))
-
-(declare-function page-break-lines--update-display-tables "ext:page-break-lines")
-
-(defun lsp--setup-page-break-mode-if-present ()
-  "Enable `page-break-lines-mode' in current buffer."
-  (when (fboundp 'page-break-lines-mode)
-    (page-break-lines-mode)
-    ;; force page-break-lines-mode to update the display tables.
-    (page-break-lines--update-display-tables)))
-
-(defun lsp-lv-message (message)
-  (add-hook 'lv-window-hook #'lsp--setup-page-break-mode-if-present)
-  (if message
-      (progn
-        (setq lsp--signature-last-buffer (current-buffer))
-        (let ((lv-force-update t))
-          (lv-message "%s" message)))
-    (lv-delete-window)
-    (remove-hook 'lv-window-hook #'lsp--setup-page-break-mode-if-present)))
-
-(declare-function posframe-show "ext:posframe")
-(declare-function posframe-hide "ext:posframe")
-(declare-function posframe-poshandler-point-bottom-left-corner-upward "ext:posframe")
-
-(defface lsp-signature-posframe
-  '((t :inherit tooltip))
-  "Background and foreground for `lsp-signature-posframe'."
-  :group 'lsp-mode)
-
-(defvar lsp-signature-posframe-params
-  (list :poshandler #'posframe-poshandler-point-bottom-left-corner-upward
-        :height 10
-        :width 60
-        :border-width 1
-        :min-width 60)
-  "Params for signature and `posframe-show'.")
-
-(defun lsp-signature-posframe (str)
-  "Use posframe to show the STR signatureHelp string."
-  (if str
-      (apply #'posframe-show
-             (with-current-buffer (get-buffer-create " *lsp-signature*")
-               (erase-buffer)
-               (insert str)
-               (visual-line-mode 1)
-               (lsp--setup-page-break-mode-if-present)
-               (current-buffer))
-             (append
-              lsp-signature-posframe-params
-              (list :position (point)
-                    :background-color (face-attribute 'lsp-signature-posframe :background nil t)
-                    :foreground-color (face-attribute 'lsp-signature-posframe :foreground nil t)
-                    :border-color (face-attribute 'font-lock-comment-face :foreground nil t))))
-    (posframe-hide " *lsp-signature*")))
-
-(defun lsp--handle-signature-update (signature)
-  (let ((message
-         (if (lsp-signature-help? signature)
-             (lsp--signature->message signature)
-           (mapconcat #'lsp--signature->message signature "\n"))))
-    (if (s-present? message)
-        (funcall lsp-signature-function message)
-      (lsp-signature-stop))))
-
-(defun lsp-signature-activate ()
-  "Activate signature help.
-It will show up only if current point has signature help."
-  (interactive)
-  (setq lsp--signature-last nil
-        lsp--signature-last-index nil
-        lsp--signature-last-buffer (current-buffer))
-  (add-hook 'post-command-hook #'lsp-signature)
-  (lsp-signature-mode t))
-
-(defcustom lsp-signature-cycle t
-  "Whether `lsp-signature-next' and prev should cycle."
-  :type 'boolean
-  :group 'lsp-mode)
-
-(defun lsp-signature-next ()
-  "Show next signature."
-  (interactive)
-  (let ((nsigs (length (lsp:signature-help-signatures lsp--signature-last))))
-    (when (and lsp--signature-last-index
-               lsp--signature-last
-               (or lsp-signature-cycle (< (1+ lsp--signature-last-index) nsigs)))
-      (setq lsp--signature-last-index (% (1+ lsp--signature-last-index) nsigs))
-      (funcall lsp-signature-function (lsp--signature->message lsp--signature-last)))))
-
-(defun lsp-signature-previous ()
-  "Next signature."
-  (interactive)
-  (when (and lsp--signature-last-index
-             lsp--signature-last
-             (or lsp-signature-cycle (not (zerop lsp--signature-last-index))))
-    (setq lsp--signature-last-index (1- (if (zerop lsp--signature-last-index)
-                                            (length (lsp:signature-help-signatures lsp--signature-last))
-                                          lsp--signature-last-index)))
-    (funcall lsp-signature-function (lsp--signature->message lsp--signature-last))))
-
-(defun lsp-signature-toggle-full-docs ()
-  "Toggle full/partial signature documentation."
-  (interactive)
-  (let ((all? (not (numberp lsp-signature-doc-lines))))
-    (setq lsp-signature-doc-lines (if all?
-                                      (or (car-safe lsp-signature-doc-lines)
-                                          20)
-                                    (list lsp-signature-doc-lines))))
-  (lsp-signature-activate))
-
-(defun lsp--signature->message (signature-help)
-  "Generate eldoc message from SIGNATURE-HELP response."
-  (setq lsp--signature-last signature-help)
-
-  (when (and signature-help (not (seq-empty-p (lsp:signature-help-signatures signature-help))))
-    (-let* (((&SignatureHelp :active-signature?
-                             :active-parameter?
-                             :signatures) signature-help)
-            (active-signature? (or lsp--signature-last-index active-signature? 0))
-            (_ (setq lsp--signature-last-index active-signature?))
-            ((signature &as &SignatureInformation? :label :parameters?) (seq-elt signatures active-signature?))
-            (prefix (if (= (length signatures) 1)
-                        ""
-                      (concat (propertize (format " %s/%s"
-                                                  (1+ active-signature?)
-                                                  (length signatures))
-                                          'face 'success)
-                              " ")))
-            (method-docs (when
-                             (and lsp-signature-render-documentation
-                                  (or (not (numberp lsp-signature-doc-lines)) (< 0 lsp-signature-doc-lines)))
-                           (let ((docs (lsp--render-element
-                                        (lsp:parameter-information-documentation? signature))))
-                             (when (s-present? docs)
-                               (concat
-                                "\n"
-                                (if (fboundp 'page-break-lines-mode)
-                                    "\n"
-                                  "")
-                                (if (and (numberp lsp-signature-doc-lines)
-                                         (> (length (s-lines docs)) lsp-signature-doc-lines))
-                                    (concat (s-join "\n" (-take lsp-signature-doc-lines (s-lines docs)))
-                                            (propertize "\nTruncated..." 'face 'highlight))
-                                  docs)))))))
-      (when (and active-parameter? (not (seq-empty-p parameters?)))
-        (-when-let* ((param (when (and (< -1 active-parameter? (length parameters?)))
-                              (seq-elt parameters? active-parameter?)))
-                     (selected-param-label (let ((label (lsp:parameter-information-label param)))
-                                             (if (stringp label) label (append label nil))))
-                     (start (if (stringp selected-param-label)
-                                (s-index-of selected-param-label label)
-                              (cl-first selected-param-label)))
-                     (end (if (stringp selected-param-label)
-                              (+ start (length selected-param-label))
-                            (cl-second selected-param-label))))
-          (add-face-text-property start end 'eldoc-highlight-function-argument nil label)))
-      (concat prefix label method-docs))))
-
-(defun lsp-signature ()
-  "Display signature info (based on `textDocument/signatureHelp')"
-  (if (and lsp--signature-last-buffer
-           (not (equal (current-buffer) lsp--signature-last-buffer)))
-      (lsp-signature-stop)
-    (lsp-request-async "textDocument/signatureHelp"
-                       (lsp--text-document-position-params)
-                       #'lsp--handle-signature-update
-                       :cancel-token :signature)))
-
-
-(defcustom lsp-overlay-document-color-char "■"
-  "Display the char represent the document color in overlay"
-  :type 'string
-  :group 'lsp-mode)
-
-;; color presentation
-(defun lsp--color-create-interactive-command (color range)
-  (lambda ()
-    (interactive)
-    (-let [(&ColorPresentation? :text-edit?
-                                :additional-text-edits?)
-           (lsp--completing-read
-            "Select color presentation: "
-            (lsp-request
-             "textDocument/colorPresentation"
-             `( :textDocument ,(lsp--text-document-identifier)
-                :color ,color
-                :range ,range))
-            #'lsp:color-presentation-label
-            nil
-            t)]
-      (when text-edit?
-        (lsp--apply-text-edit text-edit?))
-      (when additional-text-edits?
-        (lsp--apply-text-edits additional-text-edits? 'color-presentation)))))
-
-(defun lsp--number->color (number)
-  (let ((result (format "%x"
-                        (round (* (or number 0) 255.0)))))
-    (if (= 1 (length result))
-        (concat "0" result)
-      result)))
-
-(defun lsp--document-color ()
-  "Document color handler."
-  (when (lsp-feature? "textDocument/documentColor")
-    (lsp-request-async
-     "textDocument/documentColor"
-     `(:textDocument ,(lsp--text-document-identifier))
-     (lambda (result)
-       (lsp--remove-overlays 'lsp-color)
-       (seq-do
-        (-lambda ((&ColorInformation :color (color &as &Color :red :green :blue)
-                                     :range))
-          (-let* (((beg . end) (lsp--range-to-region range))
-                  (overlay (make-overlay beg end))
-                  (command (lsp--color-create-interactive-command color range)))
-            (overlay-put overlay 'lsp-color t)
-            (overlay-put overlay 'evaporate t)
-            (overlay-put overlay
-                         'before-string
-                         (propertize
-                          lsp-overlay-document-color-char
-                          'face `((:foreground ,(format
-                                                 "#%s%s%s"
-                                                 (lsp--number->color red)
-                                                 (lsp--number->color green)
-                                                 (lsp--number->color blue))))
-                          'action command
-                          'mouse-face 'lsp-lens-mouse-face
-                          'local-map (-doto (make-sparse-keymap)
-                                       (define-key [mouse-1] command))))))
-        result))
-     :mode 'unchanged
-     :cancel-token :document-color-token)))
-
-
-
-(defun lsp--action-trigger-parameter-hints (_command)
-  "Handler for editor.action.triggerParameterHints."
-  (when (member :on-server-request lsp-signature-auto-activate)
-    (lsp-signature-activate)))
-
-(defun lsp--action-trigger-suggest (_command)
-  "Handler for editor.action.triggerSuggest."
-  (cond
-   ((and (bound-and-true-p company-mode)
-         (fboundp 'company-auto-begin)
-         (fboundp 'company-post-command))
-    (run-at-time 0 nil
-                 (lambda ()
-                   (let ((this-command 'company-idle-begin)
-                         (company-minimum-prefix-length 0))
-                     (company-auto-begin)
-                     (company-post-command)))))
-   (t
-    (completion-at-point))))
-
-(defconst lsp--default-action-handlers
-  (ht ("editor.action.triggerParameterHints" #'lsp--action-trigger-parameter-hints)
-      ("editor.action.triggerSuggest" #'lsp--action-trigger-suggest))
-  "Default action handlers.")
-
-(defun lsp--find-action-handler (command)
-  "Find action handler for particular COMMAND."
-  (or
-   (--some (-some->> it
-             (lsp--workspace-client)
-             (lsp--client-action-handlers)
-             (gethash command))
-           (lsp-workspaces))
-   (gethash command lsp--default-action-handlers)))
-
-(defun lsp--text-document-code-action-params (&optional kind)
-  "Code action params."
-  (list :textDocument (lsp--text-document-identifier)
-        :range (if (use-region-p)
-                   (lsp--region-to-range (region-beginning) (region-end))
-                 (lsp--region-to-range (point) (point)))
-        :context `( :diagnostics ,(lsp-cur-possition-diagnostics)
-                    ,@(when kind (list :only (vector kind))))))
-
-(defun lsp-code-actions-at-point (&optional kind)
-  "Retrieve the code actions for the active region or the current line.
-It will filter by KIND if non nil."
-  (lsp-request "textDocument/codeAction" (lsp--text-document-code-action-params kind)))
-
-(defun lsp-execute-code-action-by-kind (command-kind)
-  "Execute code action by COMMAND-KIND."
-  (if-let ((action (->> (lsp-get-or-calculate-code-actions command-kind)
-                        (-filter (-lambda ((&CodeAction :kind?))
-                                   (and kind? (s-prefix? command-kind kind?))))
-                        lsp--select-action)))
-      (lsp-execute-code-action action)
-    (signal 'lsp-no-code-actions '(command-kind))))
-
-(defalias 'lsp-get-or-calculate-code-actions 'lsp-code-actions-at-point)
-
-(lsp-defun lsp--execute-command ((action &as &Command :command :arguments?))
-  "Parse and execute a code ACTION represented as a Command LSP type."
-  (let ((server-id (->> (lsp-workspaces)
-                        (cl-first)
-                        (or lsp--cur-workspace)
-                        (lsp--workspace-client)
-                        (lsp--client-server-id))))
-    (condition-case nil
-        (with-no-warnings
-          (lsp-execute-command server-id (intern command) arguments?))
-      (cl-no-applicable-method
-       (if-let ((action-handler (lsp--find-action-handler command)))
-           (funcall action-handler action)
-         (lsp-send-execute-command command arguments?))))))
-
-(lsp-defun lsp-execute-code-action ((action &as &CodeAction :command? :edit?))
-  "Execute code action ACTION. For example, when text under the
-caret has a suggestion to apply a fix from an lsp-server, calling
-this function will do so.
-If ACTION is not set it will be selected from `lsp-code-actions-at-point'.
-Request codeAction/resolve for more info if server supports."
-  (interactive (list (lsp--select-action (lsp-code-actions-at-point))))
-  (if (and (lsp-feature? "codeAction/resolve")
-           (not command?)
-           (not edit?))
-      (lsp--execute-code-action (lsp-request "codeAction/resolve" action))
-    (lsp--execute-code-action action)))
-
-(lsp-defun lsp--execute-code-action ((action &as &CodeAction :command? :edit?))
-  "Execute code action ACTION."
-  (when edit?
-    (lsp--apply-workspace-edit edit? 'code-action))
-
-  (cond
-   ((stringp command?) (lsp--execute-command action))
-   ((lsp-command? command?) (progn
-                              (when-let ((action-filter (->> (lsp-workspaces)
-                                                             (cl-first)
-                                                             (or lsp--cur-workspace)
-                                                             (lsp--workspace-client)
-                                                             (lsp--client-action-filter))))
-                                (funcall action-filter command?))
-                              (lsp--execute-command command?)))))
-
-(lsp-defun lsp-fix-code-action-booleans ((&Command :arguments?) boolean-action-arguments)
-  "Patch incorrect boolean argument values in the provided `CodeAction' command
-in place, based on the BOOLEAN-ACTION-ARGUMENTS list. The values
-in this list can be either symbols or lists of symbols that
-represent paths to boolean arguments in code actions:
-
-> (lsp-fix-code-action-booleans command `(:foo :bar (:some :nested :boolean)))
-
-When there are available code actions, the server sends
-`lsp-mode' a list of possible command names and arguments as
-JSON. `lsp-mode' parses all boolean false values as `nil'. As a
-result code action arguments containing falsy values don't
-roundtrip correctly because `lsp-mode' will end up sending null
-values back to the client. This list makes it possible to
-selectively transform `nil' values back into `:json-false'."
-  (seq-doseq (path boolean-action-arguments)
-    (seq-doseq (args arguments?)
-      (lsp--fix-nested-boolean args (if (listp path) path (list path))))))
-
-(defun lsp--fix-nested-boolean (structure path)
-  "Traverse STRUCTURE using the paths from the PATH list, changing the value to
-`:json-false' if it was `nil'. PATH should be a list containing
-one or more symbols, and STRUCTURE should be compatible with
-`lsp-member?', `lsp-get', and `lsp-put'."
-  (let ((key (car path))
-        (rest (cdr path)))
-    (if (null rest)
-        ;; `lsp-put' returns `nil' both when the key doesn't exist and when the
-        ;; value is `nil', so we need to explicitly check its presence here
-        (when (and (lsp-member? structure key) (not (lsp-get structure key)))
-          (lsp-put structure key :json-false))
-      ;; If `key' does not exist, then we'll silently ignore it
-      (when-let ((child (lsp-get structure key)))
-        (lsp--fix-nested-boolean child rest)))))
-
-(defvar lsp--formatting-indent-alist
-  ;; Taken from `dtrt-indent-mode'
-  '(
-    (ada-mode                   . ada-indent)                       ; Ada
-    (ada-ts-mode                . ada-ts-mode-indent-offset)
-    (c++-mode                   . c-basic-offset)                   ; C++
-    (c++-ts-mode                . c-ts-mode-indent-offset)
-    (c-mode                     . c-basic-offset)                   ; C
-    (c-ts-mode                  . c-ts-mode-indent-offset)
-    (cperl-mode                 . cperl-indent-level)               ; Perl
-    (crystal-mode               . crystal-indent-level)             ; Crystal (Ruby)
-    (csharp-mode                . c-basic-offset)                   ; C#
-    (csharp-tree-sitter-mode    . csharp-tree-sitter-indent-offset) ; C#
-    (csharp-ts-mode             . csharp-ts-mode-indent-offset)     ; C# (tree-sitter, Emacs29)
-    (css-mode                   . css-indent-offset)                ; CSS
-    (d-mode                     . c-basic-offset)                   ; D
-    (enh-ruby-mode              . enh-ruby-indent-level)            ; Ruby
-    (erlang-mode                . erlang-indent-level)              ; Erlang
-    (ess-mode                   . ess-indent-offset)                ; ESS (R)
-    (go-ts-mode                 . go-ts-mode-indent-offset)
-    (gpr-mode                   . gpr-indent-offset)                ; GNAT Project
-    (gpr-ts-mode                . gpr-ts-mode-indent-offset)
-    (hack-mode                  . hack-indent-offset)               ; Hack
-    (java-mode                  . c-basic-offset)                   ; Java
-    (java-ts-mode               . java-ts-mode-indent-offset)
-    (jde-mode                   . c-basic-offset)                   ; Java (JDE)
-    (js-mode                    . js-indent-level)                  ; JavaScript
-    (js-ts-mode                 . js-indent-level)
-    (js2-mode                   . js2-basic-offset)                 ; JavaScript-IDE
-    (js3-mode                   . js3-indent-level)                 ; JavaScript-IDE
-    (json-mode                  . js-indent-level)                  ; JSON
-    (json-ts-mode               . json-ts-mode-indent-offset)
-    (lua-mode                   . lua-indent-level)                 ; Lua
-    (lua-ts-mode                . lua-ts-indent-offset)
-    (nxml-mode                  . nxml-child-indent)                ; XML
-    (objc-mode                  . c-basic-offset)                   ; Objective C
-    (pascal-mode                . pascal-indent-level)              ; Pascal
-    (perl-mode                  . perl-indent-level)                ; Perl
-    (php-mode                   . c-basic-offset)                   ; PHP
-    (php-ts-mode                . php-ts-mode-indent-offset)        ; PHP
-    (powershell-mode            . powershell-indent)                ; PowerShell
-    (powershell-ts-mode         . powershell-ts-mode-indent-offset) ; PowerShell
-    (raku-mode                  . raku-indent-offset)               ; Perl6/Raku
-    (ruby-mode                  . ruby-indent-level)                ; Ruby
-    (rust-mode                  . rust-indent-offset)               ; Rust
-    (rust-ts-mode               . rust-ts-mode-indent-offset)
-    (rustic-mode                . rustic-indent-offset)             ; Rust
-    (scala-mode                 . scala-indent:step)                ; Scala
-    (sgml-mode                  . sgml-basic-offset)                ; SGML
-    (sh-mode                    . sh-basic-offset)                  ; Shell Script
-    (toml-ts-mode               . toml-ts-mode-indent-offset)
-    (typescript-mode            . typescript-indent-level)          ; Typescript
-    (typescript-ts-mode         . typescript-ts-mode-indent-offset) ; Typescript (tree-sitter, Emacs29)
-    (yaml-mode                  . yaml-indent-offset)               ; YAML
-    (yang-mode                  . c-basic-offset)                   ; YANG (yang-mode)
-
-    (default                    . standard-indent))                 ; default fallback
-  "A mapping from `major-mode' to its indent variable.")
-
-(defun lsp--get-indent-width (mode)
-  "Get indentation offset for MODE."
-  (or (alist-get mode lsp--formatting-indent-alist)
-      (lsp--get-indent-width (or (get mode 'derived-mode-parent) 'default))))
-
-(defun lsp--make-document-formatting-params ()
-  "Create document formatting params."
-  (lsp-make-document-formatting-params
-   :text-document (lsp--text-document-identifier)
-   :options (lsp-make-formatting-options
-             :tab-size (symbol-value (lsp--get-indent-width major-mode))
-             :insert-spaces (lsp-json-bool (not indent-tabs-mode))
-             :trim-trailing-whitespace? (lsp-json-bool lsp-trim-trailing-whitespace)
-             :insert-final-newline? (lsp-json-bool lsp-insert-final-newline)
-             :trim-final-newlines? (lsp-json-bool lsp-trim-final-newlines))))
-
-(defun lsp-format-buffer ()
-  "Ask the server to format this document."
-  (interactive "*")
-  (cond ((lsp-feature? "textDocument/formatting")
-         (let ((edits (lsp-request "textDocument/formatting"
-                                   (lsp--make-document-formatting-params))))
-           (if (seq-empty-p edits)
-               (lsp--info "No formatting changes provided")
-             (lsp--apply-text-edits edits 'format))))
-        ((lsp-feature? "textDocument/rangeFormatting")
-         (save-restriction
-           (widen)
-           (lsp-format-region (point-min) (point-max))))
-        (t (signal 'lsp-capability-not-supported (list "documentFormattingProvider")))))
-
-(defun lsp-format-region (s e)
-  "Ask the server to format the region, or if none is selected, the current line."
-  (interactive "r")
-  (let ((edits (lsp-request
-                "textDocument/rangeFormatting"
-                (lsp--make-document-range-formatting-params s e))))
-    (if (seq-empty-p edits)
-        (lsp--info "No formatting changes provided")
-      (lsp--apply-text-edits edits 'format))))
-
-(defmacro lsp-make-interactive-code-action (func-name code-action-kind)
-  "Define an interactive function FUNC-NAME that attempts to
-execute a CODE-ACTION-KIND action."
-  `(defun ,(intern (concat "lsp-" (symbol-name func-name))) ()
-     ,(format "Perform the %s code action, if available." code-action-kind)
-     (interactive)
-     ;; Even when `lsp-auto-execute-action' is nil, it still makes sense to
-     ;; auto-execute here: the user has specified exactly what they want.
-     (let ((lsp-auto-execute-action t))
-       (condition-case nil
-           (lsp-execute-code-action-by-kind ,code-action-kind)
-         (lsp-no-code-actions
-          (when (called-interactively-p 'any)
-            (lsp--info ,(format "%s action not available" code-action-kind))))))))
-
-(lsp-make-interactive-code-action organize-imports "source.organizeImports")
-
-(defun lsp--make-document-range-formatting-params (start end)
-  "Make DocumentRangeFormattingParams for selected region."
-  (lsp:set-document-range-formatting-params-range (lsp--make-document-formatting-params)
-                                                  (lsp--region-to-range start end)))
-
-(defconst lsp--highlight-kind-face
-  '((1 . lsp-face-highlight-textual)
-    (2 . lsp-face-highlight-read)
-    (3 . lsp-face-highlight-write)))
-
-(defun lsp--remove-overlays (name)
-  (save-restriction
-    (widen)
-    (remove-overlays (point-min) (point-max) name t)))
-
-(defun lsp-document-highlight ()
-  "Highlight all relevant references to the symbol under point."
-  (interactive)
-  (lsp--remove-overlays 'lsp-highlight) ;; clear any previous highlights
-  (setq lsp--have-document-highlights nil
-        lsp--symbol-bounds-of-last-highlight-invocation nil)
-  (let ((lsp-enable-symbol-highlighting t))
-    (lsp--document-highlight)))
-
-(defun lsp--document-highlight-callback (highlights)
-  "Create a callback to process the reply of a
-`textDocument/documentHighlight' message for the buffer BUF.
-A reference is highlighted only if it is visible in a window."
-  (lsp--remove-overlays 'lsp-highlight)
-
-  (let* ((wins-visible-pos (-map (lambda (win)
-                                   (cons (1- (line-number-at-pos (window-start win) t))
-                                         (1+ (line-number-at-pos (window-end win) t))))
-                                 (get-buffer-window-list nil nil 'visible))))
-    (setq lsp--have-document-highlights t)
-    (-map
-     (-lambda ((&DocumentHighlight :range (&Range :start (start &as &Position :line start-line)
-                                                  :end (end &as &Position :line end-line))
-                                   :kind?))
-       (-map
-        (-lambda ((start-window . end-window))
-          ;; Make the overlay only if the reference is visible
-          (when (and (> (1+ start-line) start-window)
-                     (< (1+ end-line) end-window))
-            (let ((start-point (lsp--position-to-point start))
-                  (end-point (lsp--position-to-point end)))
-              (when (not (and lsp-symbol-highlighting-skip-current
-                              (<= start-point (point) end-point)))
-                (-doto (make-overlay start-point end-point)
-                  (overlay-put 'face (cdr (assq (or kind? 1) lsp--highlight-kind-face)))
-                  (overlay-put 'lsp-highlight t))))))
-        wins-visible-pos))
-     highlights)))
-
-(defcustom lsp-symbol-kinds
-  '((1 . "File")
-    (2 . "Module")
-    (3 . "Namespace")
-    (4 . "Package")
-    (5 . "Class")
-    (6 . "Method")
-    (7 . "Property")
-    (8 . "Field")
-    (9 . "Constructor")
-    (10 . "Enum")
-    (11 . "Interface")
-    (12 . "Function")
-    (13 . "Variable")
-    (14 . "Constant")
-    (15 . "String")
-    (16 . "Number")
-    (17 . "Boolean")
-    (18 . "Array")
-    (19 . "Object")
-    (20 . "Key")
-    (21 . "Null")
-    (22 . "Enum Member")
-    (23 . "Struct")
-    (24 . "Event")
-    (25 . "Operator")
-    (26 . "Type Parameter"))
-  "Alist mapping SymbolKinds to human-readable strings.
-Various Symbol objects in the LSP protocol have an integral type,
-specifying what they are. This alist maps such type integrals to
-readable representations of them. See
-`https://microsoft.github.io/language-server-protocol/specifications/specification-current/',
-namespace SymbolKind."
-  :group 'lsp-mode
-  :type '(alist :key-type integer :value-type string))
-(defalias 'lsp--symbol-kind 'lsp-symbol-kinds)
-
-(lsp-defun lsp--symbol-information-to-xref
-  ((&SymbolInformation :kind :name
-                       :location (&Location :uri :range (&Range :start
-                                                                (&Position :line :character)))))
-  "Return a `xref-item' from SYMBOL information."
-  (xref-make (format "[%s] %s" (alist-get kind lsp-symbol-kinds) name)
-             (xref-make-file-location (lsp--uri-to-path uri)
-                                      line
-                                      character)))
-
-(defun lsp--get-document-symbols ()
-  "Get document symbols.
-
-If the buffer has not been modified since symbols were last
-retrieved, simply return the latest result.
-
-Else, if the request was initiated by Imenu updating its menu-bar
-entry, perform it asynchronously; i.e., give Imenu the latest
-result and then force a refresh when a new one is available.
-
-Else (e.g., due to interactive use of `imenu' or `xref'),
-perform the request synchronously."
-  (if (= (buffer-chars-modified-tick) lsp--document-symbols-tick)
-      lsp--document-symbols
-    (let ((method "textDocument/documentSymbol")
-          (params `(:textDocument ,(lsp--text-document-identifier)))
-          (tick (buffer-chars-modified-tick)))
-      (if (not lsp--document-symbols-request-async)
-          (prog1
-              (setq lsp--document-symbols (lsp-request method params))
-            (setq lsp--document-symbols-tick tick))
-        (lsp-request-async method params
-                           (lambda (document-symbols)
-                             (setq lsp--document-symbols document-symbols
-                                   lsp--document-symbols-tick tick)
-                             (lsp--imenu-refresh))
-                           :mode 'alive
-                           :cancel-token :document-symbols)
-        lsp--document-symbols))))
-
-(advice-add 'imenu-update-menubar :around
-            (lambda (oldfun &rest r)
-              (let ((lsp--document-symbols-request-async t))
-                (apply oldfun r))))
-
-(defun lsp--document-symbols->document-symbols-hierarchy (document-symbols current-position)
-  "Convert DOCUMENT-SYMBOLS to symbols hierarchy on CURRENT-POSITION."
-  (-let (((symbol &as &DocumentSymbol? :children?)
-          (seq-find (-lambda ((&DocumentSymbol :range))
-                      (lsp-point-in-range? current-position range))
-                    document-symbols)))
-    (if children?
-        (cons symbol (lsp--document-symbols->document-symbols-hierarchy children? current-position))
-      (when symbol
-        (list symbol)))))
-
-(lsp-defun lsp--symbol-information->document-symbol ((&SymbolInformation :name :kind :location :container-name? :deprecated?))
-  "Convert a SymbolInformation to a DocumentInformation"
-  (lsp-make-document-symbol :name name
-                            :kind kind
-                            :range (lsp:location-range location)
-                            :children? nil
-                            :deprecated? deprecated?
-                            :selection-range (lsp:location-range location)
-                            :detail? container-name?))
-
-(defun lsp--symbols-informations->document-symbols-hierarchy (symbols-informations current-position)
-  "Convert SYMBOLS-INFORMATIONS to symbols hierarchy on CURRENT-POSITION."
-  (--> symbols-informations
-    (-keep (-lambda ((symbol &as &SymbolInformation :location (&Location :range)))
-             (when (lsp-point-in-range? current-position range)
-               (lsp--symbol-information->document-symbol symbol)))
-           it)
-    (sort it (-lambda ((&DocumentSymbol :range (&Range :start a-start-position :end a-end-position))
-                       (&DocumentSymbol :range (&Range :start b-start-position :end b-end-position)))
-               (and (lsp--position-compare b-start-position a-start-position)
-                    (lsp--position-compare a-end-position b-end-position))))))
-
-(defun lsp--symbols->document-symbols-hierarchy (symbols)
-  "Convert SYMBOLS to symbols-hierarchy."
-  (when-let ((first-symbol (lsp-seq-first symbols)))
-    (let ((cur-position (lsp-make-position :line (plist-get (lsp--cur-position) :line)
-                                           :character (plist-get (lsp--cur-position) :character))))
-      (if (lsp-symbol-information? first-symbol)
-          (lsp--symbols-informations->document-symbols-hierarchy symbols cur-position)
-        (lsp--document-symbols->document-symbols-hierarchy symbols cur-position)))))
-
-(defun lsp--xref-backend () 'xref-lsp)
-
-(cl-defmethod xref-backend-identifier-at-point ((_backend (eql xref-lsp)))
-  (propertize (or (thing-at-point 'symbol) "")
-              'identifier-at-point t))
-
-(defun lsp--xref-elements-index (symbols path)
-  (-mapcat
-   (-lambda (sym)
-     (pcase-exhaustive sym
-       ((lsp-interface DocumentSymbol :name :children? :selection-range (lsp-interface Range :start))
-        (cons (cons (concat path name)
-                    (lsp--position-to-point start))
-              (lsp--xref-elements-index children? (concat path name " / "))))
-       ((lsp-interface SymbolInformation :name :location (lsp-interface Location :range (lsp-interface Range :start)))
-        (list (cons (concat path name)
-                    (lsp--position-to-point start))))))
-   symbols))
-
-(defvar-local lsp--symbols-cache nil)
-
-(cl-defmethod xref-backend-identifier-completion-table ((_backend (eql xref-lsp)))
-  (if (lsp--find-workspaces-for "textDocument/documentSymbol")
-      (progn
-        (setq lsp--symbols-cache (lsp--xref-elements-index
-                                  (lsp--get-document-symbols) nil))
-        lsp--symbols-cache)
-    (list (propertize (or (thing-at-point 'symbol) "")
-                      'identifier-at-point t))))
-
-(cl-defmethod xref-backend-definitions ((_backend (eql xref-lsp)) identifier)
-  (save-excursion
-    (unless (get-text-property 0 'identifier-at-point identifier)
-      (goto-char (cl-rest (or (assoc identifier lsp--symbols-cache)
-                              (user-error "Unable to find symbol %s in current document" identifier)))))
-    (lsp--locations-to-xref-items (lsp-request "textDocument/definition"
-                                               (lsp--text-document-position-params)))))
-
-(cl-defmethod xref-backend-references ((_backend (eql xref-lsp)) identifier)
-  (save-excursion
-    (unless (get-text-property 0 'identifier-at-point identifier)
-      (goto-char (cl-rest (or (assoc identifier lsp--symbols-cache)
-                              (user-error "Unable to find symbol %s" identifier)))))
-    (lsp--locations-to-xref-items (lsp-request "textDocument/references"
-                                               (lsp--make-reference-params nil lsp-references-exclude-definition)))))
-
-(cl-defmethod xref-backend-apropos ((_backend (eql xref-lsp)) pattern)
-  (seq-map #'lsp--symbol-information-to-xref
-           (lsp-request "workspace/symbol" `(:query ,pattern))))
-
-(defcustom lsp-rename-use-prepare t
-  "Whether `lsp-rename' should do a prepareRename first.
-For some language servers, textDocument/prepareRename might be
-too slow, in which case this variable may be set to nil.
-`lsp-rename' will then use `thing-at-point' `symbol' to determine
-the symbol to rename at point."
-  :group 'lsp-mode
-  :type 'boolean)
-
-(defun lsp--get-symbol-to-rename ()
-  "Get a symbol to rename and placeholder at point.
-Returns a cons ((START . END) . PLACEHOLDER?), and nil if
-renaming is generally supported but cannot be done at point.
-START and END are the bounds of the identifiers being renamed,
-while PLACEHOLDER?, is either nil or a string suggested by the
-language server as the initial input of a new-name prompt."
-  (unless (lsp-feature? "textDocument/rename")
-    (error "The connected server(s) doesn't support renaming"))
-  (if (and lsp-rename-use-prepare (lsp-feature? "textDocument/prepareRename"))
-      (when-let ((response
-                  (lsp-request "textDocument/prepareRename"
-                               (lsp--text-document-position-params))))
-        (let* ((bounds (lsp--range-to-region
-                        (if (lsp-range? response)
-                            response
-                          (lsp:prepare-rename-result-range response))))
-               (placeholder
-                (and (not (lsp-range? response))
-                     (lsp:prepare-rename-result-placeholder response))))
-          (cons bounds placeholder)))
-    (when-let ((bounds (bounds-of-thing-at-point 'symbol)))
-      (cons bounds nil))))
-
-(defface lsp-face-rename '((t :underline t))
-  "Face used to highlight the identifier being renamed.
-Renaming can be done using `lsp-rename'."
-  :group 'lsp-mode)
-
-(defface lsp-rename-placeholder-face '((t :inherit font-lock-variable-name-face))
-  "Face used to display the rename placeholder in.
-When calling `lsp-rename' interactively, this will be the face of
-the new name."
-  :group 'lsp-mode)
-
-(defvar lsp-rename-history '()
-  "History for `lsp--read-rename'.")
-
-(defun lsp--read-rename (at-point)
-  "Read a new name for a `lsp-rename' at `point' from the user.
-AT-POINT shall be a structure as returned by
-`lsp--get-symbol-to-rename'.
-
-Returns a string, which should be the new name for the identifier
-at point. If renaming cannot be done at point (as determined from
-AT-POINT), throw a `user-error'.
-
-This function is for use in `lsp-rename' only, and shall not be
-relied upon."
-  (unless at-point
-    (user-error "`lsp-rename' is invalid here"))
-  (-let* ((((start . end) . placeholder?) at-point)
-          ;; Do the `buffer-substring' first to not include `lsp-face-rename'
-          (rename-me (buffer-substring start end))
-          (placeholder (or placeholder? rename-me))
-          (placeholder (propertize placeholder 'face 'lsp-rename-placeholder-face))
-
-          overlay)
-    ;; We need unwind protect, as the user might cancel here, causing the
-    ;; overlay to linger.
-    (unwind-protect
-        (progn
-          (setq overlay (make-overlay start end))
-          (overlay-put overlay 'face 'lsp-face-rename)
-
-          (read-string (format "Rename %s to: " rename-me) placeholder
-                       'lsp-rename-history))
-      (and overlay (delete-overlay overlay)))))
-
-(defun lsp-rename (newname)
-  "Rename the symbol (and all references to it) under point to NEWNAME."
-  (interactive (list (lsp--read-rename (lsp--get-symbol-to-rename))))
-  (when-let ((edits (lsp-request "textDocument/rename"
-                                 `( :textDocument ,(lsp--text-document-identifier)
-                                    :position ,(lsp--cur-position)
-                                    :newName ,newname))))
-    (lsp--apply-workspace-edit edits 'rename)))
-
-(defun lsp--on-rename-file (old-func old-name new-name &optional ok-if-already-exists?)
-  "Advice around function `rename-file'.
-Applies OLD-FUNC with OLD-NAME, NEW-NAME and OK-IF-ALREADY-EXISTS?.
-
-This advice sends workspace/willRenameFiles before renaming file
-to check if server wants to apply any workspaceEdits after renamed."
-  (if (and lsp-apply-edits-after-file-operations
-           (lsp--send-will-rename-files-p old-name))
-      (let ((params (lsp-make-rename-files-params
-                     :files (vector (lsp-make-file-rename
-                                     :oldUri (lsp--path-to-uri old-name)
-                                     :newUri (lsp--path-to-uri new-name))))))
-        (when-let ((edits (lsp-request "workspace/willRenameFiles" params)))
-          (lsp--apply-workspace-edit edits 'rename-file)
-          (funcall old-func old-name new-name ok-if-already-exists?)
-          (when (lsp--send-did-rename-files-p)
-            (lsp-notify "workspace/didRenameFiles" params))))
-    (funcall old-func old-name new-name ok-if-already-exists?)))
-
-(advice-add 'rename-file :around #'lsp--on-rename-file)
-
-(defcustom lsp-xref-force-references nil
-  "If non-nil threat everything as references(e. g. jump if only one item.)"
-  :group 'lsp-mode
-  :type 'boolean)
-
-(defun lsp-show-xrefs (xrefs display-action references?)
-  (unless (region-active-p) (push-mark nil t))
-  (if (boundp 'xref-show-definitions-function)
-      (with-no-warnings
-        (xref-push-marker-stack)
-        (funcall (if (and references? (not lsp-xref-force-references))
-                     xref-show-xrefs-function
-                   xref-show-definitions-function)
-                 (-const xrefs)
-                 `((window . ,(selected-window))
-                   (display-action . ,display-action)
-                   ,(if (and references? (not lsp-xref-force-references))
-                        `(auto-jump . ,xref-auto-jump-to-first-xref)
-                      `(auto-jump . ,xref-auto-jump-to-first-definition)))))
-    (xref--show-xrefs xrefs display-action)))
-
-(cl-defmethod seq-empty-p ((ht hash-table))
-  "Function `seq-empty-p' for hash-table."
-  (hash-table-empty-p ht))
-
-(cl-defun lsp-find-locations (method &optional extra &key display-action references?)
-  "Send request named METHOD and get cross references of the symbol under point.
-EXTRA is a plist of extra parameters.
-REFERENCES? t when METHOD returns references."
-  (let ((loc (lsp-request method
-                          (append (lsp--text-document-position-params) extra))))
-    (if (seq-empty-p loc)
-        (lsp--error "Not found for: %s" (or (thing-at-point 'symbol t) ""))
-      (lsp-show-xrefs (lsp--locations-to-xref-items loc) display-action references?))))
-
-(cl-defun lsp-find-declaration (&key display-action)
-  "Find declarations of the symbol under point."
-  (interactive)
-  (lsp-find-locations "textDocument/declaration" nil :display-action display-action))
-
-(cl-defun lsp-find-definition (&key display-action)
-  "Find definitions of the symbol under point."
-  (interactive)
-  (lsp-find-locations "textDocument/definition" nil :display-action display-action))
-
-(defun lsp-find-definition-mouse (click)
-  "Click to start `lsp-find-definition' at clicked point."
-  (interactive "e")
-  (let* ((ec (event-start click))
-         (p1 (posn-point ec))
-         (w1 (posn-window ec)))
-    (select-window w1)
-    (goto-char p1)
-    (lsp-find-definition)))
-
-(cl-defun lsp-find-implementation (&key display-action)
-  "Find implementations of the symbol under point."
-  (interactive)
-  (lsp-find-locations "textDocument/implementation"
-                      nil
-                      :display-action display-action
-                      :references? t))
-
-(cl-defun lsp-find-references (&optional exclude-declaration &key display-action)
-  "Find references of the symbol under point."
-  (interactive "P")
-  (lsp-find-locations "textDocument/references"
-                      (list :context `(:includeDeclaration ,(lsp-json-bool (not (or exclude-declaration lsp-references-exclude-definition)))))
-                      :display-action display-action
-                      :references? t))
-
-(cl-defun lsp-find-type-definition (&key display-action)
-  "Find type definitions of the symbol under point."
-  (interactive)
-  (lsp-find-locations "textDocument/typeDefinition" nil :display-action display-action))
-
-(defalias 'lsp-find-custom #'lsp-find-locations)
-(defalias 'lsp-goto-implementation #'lsp-find-implementation)
-(defalias 'lsp-goto-type-definition #'lsp-find-type-definition)
-
-(with-eval-after-load 'evil
-  (evil-set-command-property 'lsp-find-definition :jump t)
-  (evil-set-command-property 'lsp-find-implementation :jump t)
-  (evil-set-command-property 'lsp-find-references :jump t)
-  (evil-set-command-property 'lsp-find-type-definition :jump t))
-
-(defun lsp--workspace-method-supported? (check-command method capability workspace)
-  (with-lsp-workspace workspace
-    (if check-command
-        (funcall check-command workspace)
-      (or
-       (when capability (lsp--capability capability))
-       (lsp--registered-capability method)
-       (and (not capability) (not check-command))))))
-
-(defun lsp-disable-method-for-server (method server-id)
-  "Disable METHOD for SERVER-ID."
-  (cl-callf
-      (lambda (reqs)
-        (-let (((&plist :check-command :capability) reqs))
-          (list :check-command
-                (lambda (workspace)
-                  (unless (-> workspace
-                              lsp--workspace-client
-                              lsp--client-server-id
-                              (eq server-id))
-                    (lsp--workspace-method-supported? check-command
-                                                      method
-                                                      capability
-                                                      workspace))))))
-      (alist-get method lsp-method-requirements nil nil 'string=)))
-
-(defun lsp--find-workspaces-for (msg-or-method)
-  "Find all workspaces in the current project that can handle MSG."
-  (let ((method (if (stringp msg-or-method)
-                    msg-or-method
-                  (plist-get msg-or-method :method))))
-    (-if-let (reqs (cdr (assoc method lsp-method-requirements)))
-        (-let (((&plist :capability :check-command) reqs))
-          (-filter
-           (-partial #'lsp--workspace-method-supported?
-                     check-command method capability)
-           (lsp-workspaces)))
-      (lsp-workspaces))))
-
-(defun lsp-can-execute-command? (command-name)
-  "Returns non-nil if current language server(s) can execute COMMAND-NAME.
-The command is executed via `workspace/executeCommand'"
-  (cl-position
-   command-name
-   (lsp:execute-command-options-commands
-    (lsp:server-capabilities-execute-command-provider?
-     (lsp--server-capabilities)))
-   :test #'equal))
-
-(defalias 'lsp-feature? 'lsp--find-workspaces-for)
-
-(cl-defmethod lsp-execute-command (_server _command _arguments)
-  "Dispatch COMMAND execution."
-  (signal 'cl-no-applicable-method nil))
-
-(defun lsp-workspace-command-execute (command &optional args)
-  "Execute workspace COMMAND with ARGS."
-  (condition-case-unless-debug err
-      (let ((params (if args
-                        (list :command command :arguments args)
-                      (list :command command))))
-        (lsp-request "workspace/executeCommand" params))
-    (error
-     (error "`workspace/executeCommand' with `%s' failed.\n\n%S"
-            command err))))
-
-(defun lsp-send-execute-command (command &optional args)
-  "Create and send a `workspace/executeCommand' message having command COMMAND
-and optional ARGS."
-  (lsp-workspace-command-execute command args))
-
-(defalias 'lsp-point-to-position #'lsp--point-to-position)
-(defalias 'lsp-text-document-identifier #'lsp--text-document-identifier)
-(defalias 'lsp--send-execute-command #'lsp-send-execute-command)
-(defalias 'lsp-on-open #'lsp--text-document-did-open)
-(defalias 'lsp-on-save #'lsp--text-document-did-save)
-
-(defun lsp--set-configuration (settings)
-  "Set the SETTINGS for the lsp server."
-  (lsp-notify "workspace/didChangeConfiguration" `(:settings ,settings)))
-
-(defun lsp-current-buffer ()
-  (or lsp--virtual-buffer
-      (current-buffer)))
-
-(defun lsp-buffer-live-p (buffer-id)
-  (if-let ((buffer-live (plist-get buffer-id :buffer-live?)))
-      (funcall buffer-live buffer-id)
-    (buffer-live-p buffer-id)))
-
-(defun lsp--on-set-visited-file-name (old-func &rest args)
-  "Advice around function `set-visited-file-name'.
-
-This advice sends textDocument/didClose for the old file and
-textDocument/didOpen for the new file."
-  (when lsp--cur-workspace
-    (lsp--text-document-did-close t))
-  (prog1 (apply old-func args)
-    (when lsp--cur-workspace
-      (lsp--text-document-did-open))))
-
-(advice-add 'set-visited-file-name :around #'lsp--on-set-visited-file-name)
-
-(defcustom lsp-flush-delayed-changes-before-next-message t
-  "If non-nil send the document changes update before sending other messages.
-
-If nil, and `lsp-debounce-full-sync-notifications' is non-nil,
- change notifications will be throttled by
- `lsp-debounce-full-sync-notifications-interval' regardless of
- other messages."
-  :group 'lsp-mode
-  :type 'boolean)
-
-(defvar lsp--not-flushing-delayed-changes t)
-
-(defun lsp--send-no-wait (message proc)
-  "Send MESSAGE to PROC without waiting for further output."
-
-  (when (and lsp--not-flushing-delayed-changes
-             lsp-flush-delayed-changes-before-next-message)
-    (let ((lsp--not-flushing-delayed-changes nil))
-      (lsp--flush-delayed-changes)))
-  (lsp-process-send proc message))
-
-(define-error 'lsp-parse-error
-  "Error parsing message from language server" 'lsp-error)
-(define-error 'lsp-unknown-message-type
-  "Unknown message type" '(lsp-error lsp-parse-error))
-(define-error 'lsp-unknown-json-rpc-version
-  "Unknown JSON-RPC protocol version" '(lsp-error lsp-parse-error))
-(define-error 'lsp-no-content-length
-  "Content-Length header missing in message" '(lsp-error lsp-parse-error))
-(define-error 'lsp-invalid-header-name
-  "Invalid header name" '(lsp-error lsp-parse-error))
-
-;;  id  method
-;;   x    x     request
-;;   x    .     response
-;;   .    x     notification
-(defun lsp--get-message-type (json-data)
-  "Get the message type from JSON-DATA."
-  (if (lsp:json-message-id? json-data)
-      (if (lsp:json-message-error? json-data)
-          'response-error
-        (if (lsp:json-message-method? json-data)
-            'request
-          'response))
-    'notification))
-
-(defconst lsp--default-notification-handlers
-  (ht ("window/showMessage" #'lsp--window-show-message)
-      ("window/logMessage" #'lsp--window-log-message)
-      ("window/showInputBox" #'lsp--window-show-input-box)
-      ("window/showQuickPick" #'lsp--window-show-quick-pick)
-      ("textDocument/publishDiagnostics" #'lsp--on-diagnostics)
-      ("textDocument/diagnosticsEnd" #'ignore)
-      ("textDocument/diagnosticsBegin" #'ignore)
-      ("telemetry/event" #'ignore)
-      ("$/progress" (lambda (workspace params)
-                      (funcall lsp-progress-function workspace params)))))
-
-(lsp-defun lsp--on-notification (workspace (&JSONNotification :params :method))
-  "Call the appropriate handler for NOTIFICATION."
-  (-let ((client (lsp--workspace-client workspace)))
-    (when (lsp--log-io-p method)
-      (lsp--log-entry-new (lsp--make-log-entry method nil params 'incoming-notif)
-                          lsp--cur-workspace))
-    (if-let ((handler (or (gethash method (lsp--client-notification-handlers client))
-                          (gethash method lsp--default-notification-handlers))))
-        (funcall handler workspace params)
-      (when (and method (not (string-prefix-p "$" method)))
-        (lsp-warn "Unknown notification: %s" method)))))
-
-(lsp-defun lsp--build-workspace-configuration-response ((&ConfigurationParams :items))
-  "Get section configuration.
-PARAMS are the `workspace/configuration' request params"
-  (->> items
-       (-map (-lambda ((&ConfigurationItem :section?))
-               (-let* ((path-parts (split-string section? "\\."))
-                       (path-without-last (s-join "." (-slice path-parts 0 -1)))
-                       (path-parts-len (length path-parts)))
-                 (cond
-                  ((<= path-parts-len 1)
-                   (ht-get (lsp-configuration-section section?)
-                           (car-safe path-parts)
-                           (ht-create)))
-                  ((> path-parts-len 1)
-                   (when-let ((section (lsp-configuration-section path-without-last))
-                              (keys path-parts))
-                     (while (and keys section)
-                       (setf section (ht-get section (pop keys))))
-                     section))))))
-       (apply #'vector)))
-
-(defun lsp--ms-since (timestamp)
-  "Integer number of milliseconds since TIMESTAMP.  Fractions discarded."
-  (floor (* 1000 (float-time (time-since timestamp)))))
-
-(defun lsp--send-request-response (workspace recv-time request response)
-  "Send the RESPONSE for REQUEST in WORKSPACE and log if needed."
-  (-let* (((&JSONResponse :params :method :id) request)
-          (process (lsp--workspace-proc workspace))
-          (response (lsp--make-response id response))
-          (req-entry (and lsp-log-io
-                          (lsp--make-log-entry method id params 'incoming-req)))
-          (resp-entry (and lsp-log-io
-                           (lsp--make-log-entry method id response 'outgoing-resp
-                                                (lsp--ms-since recv-time)))))
-    ;; Send response to the server.
-    (when (lsp--log-io-p method)
-      (lsp--log-entry-new req-entry workspace)
-      (lsp--log-entry-new resp-entry workspace))
-    (lsp--send-no-wait response process)))
-
-(lsp-defun lsp--on-request (workspace (request &as &JSONRequest :params :method))
-  "Call the appropriate handler for REQUEST, and send the return value to the
-server. WORKSPACE is the active workspace."
-  (-let* ((recv-time (current-time))
-          (client (lsp--workspace-client workspace))
-          (buffers (lsp--workspace-buffers workspace))
-          handler
-          (response (cond
-                     ((setq handler (gethash method (lsp--client-request-handlers client) nil))
-                      (funcall handler workspace params))
-                     ((setq handler (gethash method (lsp--client-async-request-handlers client) nil))
-                      (funcall handler workspace params
-                               (-partial #'lsp--send-request-response
-                                         workspace recv-time request))
-                      'delay-response)
-                     ((equal method "client/registerCapability")
-                      (mapc #'lsp--server-register-capability
-                            (lsp:registration-params-registrations params))
-                      (mapc (lambda (buf)
-                              (when (lsp-buffer-live-p buf)
-                                (lsp-with-current-buffer buf
-                                  (lsp-unconfig-buffer)
-                                  (lsp-configure-buffer))))
-                            buffers)
-                      nil)
-                     ((equal method "window/showMessageRequest")
-                      (let ((choice (lsp--window-log-message-request params)))
-                        `(:title ,choice)))
-                     ((equal method "window/showDocument")
-                      (let ((success? (lsp--window-show-document params)))
-                        (lsp-make-show-document-result :success (or success?
-                                                                    :json-false))))
-                     ((equal method "client/unregisterCapability")
-                      (mapc #'lsp--server-unregister-capability
-                            (lsp:unregistration-params-unregisterations params))
-                      (mapc (lambda (buf)
-                              (when (lsp-buffer-live-p buf)
-                                (lsp-with-current-buffer buf
-                                  (lsp-unconfig-buffer)
-                                  (lsp-configure-buffer))))
-                            buffers)
-                      nil)
-                     ((equal method "workspace/applyEdit")
-                      (list :applied (condition-case err
-                                         (prog1 t
-                                           (lsp--apply-workspace-edit (lsp:apply-workspace-edit-params-edit params) 'server-requested))
-                                       (error
-                                        (lsp--error "Failed to apply edits with message %s"
-                                                    (error-message-string err))
-                                        :json-false))))
-                     ((equal method "workspace/configuration")
-                      (with-lsp-workspace workspace
-                        (if-let ((buf (car buffers)))
-                            (lsp-with-current-buffer buf
-                              (lsp--build-workspace-configuration-response params))
-                          (lsp--with-workspace-temp-buffer (lsp--workspace-root workspace)
-                            (lsp--build-workspace-configuration-response params)))))
-                     ((equal method "workspace/workspaceFolders")
-                      (let ((folders (or (-> workspace
-                                             (lsp--workspace-client)
-                                             (lsp--client-server-id)
-                                             (gethash (lsp-session-server-id->folders (lsp-session))))
-                                         (lsp-session-folders (lsp-session)))))
-                        (->> folders
-                             (-distinct)
-                             (-map (lambda (folder)
-                                     (list :uri (lsp--path-to-uri folder))))
-                             (apply #'vector))))
-                     ((equal method "window/workDoneProgress/create")
-                      nil ;; no specific reply, no processing required
-                      )
-                     ((equal method "workspace/semanticTokens/refresh")
-                      (when (and lsp-semantic-tokens-enable
-                                 (fboundp 'lsp--semantic-tokens-on-refresh))
-                        (lsp--semantic-tokens-on-refresh workspace))
-                      nil)
-                     ((equal method "workspace/codeLens/refresh")
-                      (when (and lsp-lens-enable
-                                 (fboundp 'lsp--lens-on-refresh))
-                        (lsp--lens-on-refresh workspace))
-                      nil)
-                     (t (lsp-warn "Unknown request method: %s" method) nil))))
-    ;; Send response to the server.
-    (unless (eq response 'delay-response)
-      (lsp--send-request-response workspace recv-time request response))))
-
-(lsp-defun lsp--error-string ((&JSONError :message :code))
-  "Format ERR as a user friendly string."
-  (format "Error from the Language Server: %s (%s)"
-          message
-          (or (car (alist-get code lsp--errors)) "Unknown error")))
-
-(defun lsp--get-body-length (headers)
-  (let ((content-length (cdr (assoc "Content-Length" headers))))
-    (if content-length
-        (string-to-number content-length)
-
-      ;; This usually means either the server or our parser is
-      ;; screwed up with a previous Content-Length
-      (error "No Content-Length header"))))
-
-(defun lsp--parse-header (s)
-  "Parse string S as a LSP (KEY . VAL) header."
-  (let ((pos (string-match "\:" s))
-        key val)
-    (unless pos
-      (signal 'lsp-invalid-header-name (list s)))
-    (setq key (substring s 0 pos)
-          val (s-trim-left (substring s (+ 1 pos))))
-    (when (equal key "Content-Length")
-      (cl-assert (cl-loop for c across val
-                          when (or (> c ?9) (< c ?0)) return nil
-                          finally return t)
-                 nil (format "Invalid Content-Length value: %s" val)))
-    (cons key val)))
-
-(defmacro lsp--read-json (str)
-  "Read json string STR."
-  (if (progn
-        (require 'json)
-        (fboundp 'json-parse-string))
-      `(json-parse-string ,str
-                          :object-type (if lsp-use-plists
-                                           'plist
-                                         'hash-table)
-                          :null-object nil
-                          :false-object nil)
-    `(let ((json-array-type 'vector)
-           (json-object-type (if lsp-use-plists
-                                 'plist
-                               'hash-table))
-           (json-false nil))
-       (json-read-from-string ,str))))
-
-(defmacro lsp-json-read-buffer ()
-  "Read json from the current buffer."
-  (if (progn
-        (require 'json)
-        (fboundp 'json-parse-buffer))
-      `(json-parse-buffer :object-type (if lsp-use-plists
-                                           'plist
-                                         'hash-table)
-                          :null-object nil
-                          :false-object nil)
-    `(let ((json-array-type 'vector)
-           (json-object-type (if lsp-use-plists
-                                 'plist
-                               'hash-table))
-           (json-false nil))
-       (json-read))))
-
-(defun lsp--read-json-file (file-path)
-  "Read json file."
-  (-> file-path
-    (f-read-text)
-    (lsp--read-json)))
-
-(defun lsp--parser-on-message (json-data workspace)
-  "Called when the parser P read a complete MSG from the server."
-  (with-demoted-errors "Error processing message %S."
-    (with-lsp-workspace workspace
-      (let* ((client (lsp--workspace-client workspace))
-             (id (--when-let (lsp:json-response-id json-data)
-                   (if (stringp it) (string-to-number it) it)))
-             (data (lsp:json-response-result json-data)))
-        (pcase (lsp--get-message-type json-data)
-          ('response
-           (cl-assert id)
-           (-let [(callback _ method _ before-send) (gethash id (lsp--client-response-handlers client))]
-             (when (lsp--log-io-p method)
-               (lsp--log-entry-new
-                (lsp--make-log-entry method id data 'incoming-resp
-                                     (lsp--ms-since before-send))
-                workspace))
-             (when callback
-               (remhash id (lsp--client-response-handlers client))
-               (funcall callback (lsp:json-response-result json-data)))))
-          ('response-error
-           (cl-assert id)
-           (-let [(_ callback method _ before-send) (gethash id (lsp--client-response-handlers client))]
-             (when (lsp--log-io-p method)
-               (lsp--log-entry-new
-                (lsp--make-log-entry method id (lsp:json-response-error-error json-data)
-                                     'incoming-resp (lsp--ms-since before-send))
-                workspace))
-             (when callback
-               (remhash id (lsp--client-response-handlers client))
-               (funcall callback (lsp:json-response-error-error json-data)))))
-          ('notification
-           (lsp--on-notification workspace json-data))
-          ('request (lsp--on-request workspace json-data)))))))
-
-(defun lsp--create-filter-function (workspace)
-  "Make filter for the workspace."
-  (let ((body-received 0)
-        leftovers body-length body chunk)
-    (lambda (_proc input)
-      (setf chunk (if (s-blank? leftovers)
-                      input
-                    (concat leftovers input)))
-
-      (let (messages)
-        (while (not (s-blank? chunk))
-          (if (not body-length)
-              ;; Read headers
-              (if-let ((body-sep-pos (string-match-p "\r\n\r\n" chunk)))
-                  ;; We've got all the headers, handle them all at once:
-                  (setf body-length (lsp--get-body-length
-                                     (mapcar #'lsp--parse-header
-                                             (split-string
-                                              (substring-no-properties chunk
-                                                                       (or (string-match-p "Content-Length" chunk)
-                                                                           (error "Unable to find Content-Length header."))
-                                                                       body-sep-pos)
-                                              "\r\n")))
-                        body-received 0
-                        leftovers nil
-                        chunk (substring-no-properties chunk (+ body-sep-pos 4)))
-
-                ;; Haven't found the end of the headers yet. Save everything
-                ;; for when the next chunk arrives and await further input.
-                (setf leftovers chunk
-                      chunk nil))
-            (let* ((chunk-length (string-bytes chunk))
-                   (left-to-receive (- body-length body-received))
-                   (this-body (if (< left-to-receive chunk-length)
-                                  (prog1 (substring-no-properties chunk 0 left-to-receive)
-                                    (setf chunk (substring-no-properties chunk left-to-receive)))
-                                (prog1 chunk
-                                  (setf chunk nil))))
-                   (body-bytes (string-bytes this-body)))
-              (push this-body body)
-              (setf body-received (+ body-received body-bytes))
-              (when (>= chunk-length left-to-receive)
-                (condition-case err
-                    (with-temp-buffer
-                      (apply #'insert
-                             (nreverse
-                              (prog1 body
-                                (setf leftovers nil
-                                      body-length nil
-                                      body-received nil
-                                      body nil))))
-                      (decode-coding-region (point-min)
-                                            (point-max)
-                                            'utf-8)
-                      (goto-char (point-min))
-                      (push (lsp-json-read-buffer) messages))
-
-                  (error
-                   (lsp-warn "Failed to parse the following chunk:\n'''\n%s\n'''\nwith message %s"
-                             (concat leftovers input)
-                             err)))))))
-        (mapc (lambda (msg)
-                (lsp--parser-on-message msg workspace))
-              (nreverse messages))))))
-
-(defvar-local lsp--line-col-to-point-hash-table nil
-  "Hash table with keys (line . col) and values that are either point positions
-or markers.")
-
-(defcustom lsp-imenu-detailed-outline t
-  "Whether `lsp-imenu' should include signatures.
-This will be ignored if the server doesn't provide the necessary
-information, for example if it doesn't support DocumentSymbols."
-  :group 'lsp-imenu
-  :type 'boolean)
-
-(defcustom lsp-imenu-hide-parent-details t
-  "Whether `lsp-imenu' should hide signatures of parent nodes."
-  :group 'lsp-imenu
-  :type 'boolean)
-
-(defface lsp-details-face '((t :height 0.8 :inherit shadow))
-  "Used to display additional information throughout `lsp'.
-Things like line numbers, signatures, ... are considered
-additional information. Often, additional faces are defined that
-inherit from this face by default, like `lsp-signature-face', and
-they may be customized for finer control."
-  :group 'lsp-mode)
-
-(defface lsp-signature-face '((t :inherit lsp-details-face))
-  "Used to display signatures in `imenu', ...."
-  :group 'lsp-mode)
-
-(lsp-defun lsp-render-symbol ((&DocumentSymbol :name :detail? :deprecated?)
-                              show-detail?)
-  "Render INPUT0, an `&DocumentSymbol', to a string.
-If SHOW-DETAIL? is set, make use of its `:detail?' field (often
-the signature)."
-  (let ((detail (and show-detail? (s-present? detail?)
-                     (propertize (concat " " (s-trim-left detail?))
-                                 'face 'lsp-signature-face)))
-        (name (if deprecated?
-                  (propertize name 'face 'lsp-face-semhl-deprecated) name)))
-    (concat name detail)))
-
-(lsp-defun lsp-render-symbol-information ((&SymbolInformation :name :deprecated? :container-name?)
-                                          separator)
-  "Render a piece of SymbolInformation.
-Handle :deprecated?. If SEPARATOR is non-nil, the
-symbol's (optional) parent, SEPARATOR and the symbol itself are
-concatenated."
-  (when (and separator container-name? (not (string-empty-p container-name?)))
-    (setq name (concat name separator container-name?)))
-  (if deprecated? (propertize name 'face 'lsp-face-semhl-deprecated) name))
-
-(defun lsp--symbol-to-imenu-elem (sym)
-  "Convert SYM to imenu element.
-
-SYM is a SymbolInformation message.
-
-Return a cons cell (full-name . start-point)."
-  (let ((start-point (ht-get lsp--line-col-to-point-hash-table
-                             (lsp--get-line-and-col sym))))
-    (cons (lsp-render-symbol-information
-           sym (and lsp-imenu-show-container-name
-                    lsp-imenu-container-name-separator))
-          start-point)))
-
-(lsp-defun lsp--symbol-to-hierarchical-imenu-elem ((sym &as &DocumentSymbol :children?))
-  "Convert SYM to hierarchical imenu elements.
-
-SYM is a DocumentSymbol message.
-
-Return cons cell (\"symbol-name (symbol-kind)\" . start-point) if
-SYM doesn't have any children. Otherwise return a cons cell with
-an alist
-
-  (\"symbol-name\" . ((\"(symbol-kind)\" . start-point)
-                    cons-cells-from-children))"
-  (let ((filtered-children (lsp--imenu-filter-symbols children?))
-        (signature (lsp-render-symbol sym lsp-imenu-detailed-outline)))
-    (if (seq-empty-p filtered-children)
-        (cons signature
-              (ht-get lsp--line-col-to-point-hash-table
-                      (lsp--get-line-and-col sym)))
-      (cons signature
-            (lsp--imenu-create-hierarchical-index filtered-children)))))
-
-(lsp-defun lsp--symbol-ignore ((&SymbolInformation :kind))
-  "Determine if SYM is for the current document and is to be shown."
-  ;; It's a SymbolInformation or DocumentSymbol, which is always in the
-  ;; current buffer file.
-  (and lsp-imenu-index-symbol-kinds
-       (numberp kind)
-       (let ((clamped-kind (if (< 0 kind (length lsp/symbol-kind-lookup))
-                               kind
-                             0)))
-         (not (memql (aref lsp/symbol-kind-lookup clamped-kind)
-                     lsp-imenu-index-symbol-kinds)))))
-
-(lsp-defun lsp--get-symbol-type ((&SymbolInformation :kind))
-  "The string name of the kind of SYM."
-  (alist-get kind lsp-symbol-kinds "Other"))
-
-(defun lsp--get-line-and-col (sym)
-  "Obtain the line and column corresponding to SYM."
-  (-let* ((location (lsp:symbol-information-location sym))
-          (name-range (or (and location (lsp:location-range location))
-                          (lsp:document-symbol-selection-range sym)))
-          ((&Range :start (&Position :line :character)) name-range))
-    (cons line character)))
-
-(defun lsp--collect-lines-and-cols (symbols)
-  "Return a sorted list ((line . col) ...) of the locations of SYMBOLS."
-  (let ((stack (mapcar 'identity symbols))
-        line-col-list)
-    (while stack
-      (let ((sym (pop stack)))
-        (push (lsp--get-line-and-col sym) line-col-list)
-        (unless (seq-empty-p (lsp:document-symbol-children? sym))
-          (setf stack (nconc (lsp--imenu-filter-symbols (lsp:document-symbol-children? sym)) stack)))))
-    (-sort #'lsp--line-col-comparator line-col-list)))
-
-(defun lsp--convert-line-col-to-points-batch (line-col-list)
-  "Convert a sorted list of positions from line-column
-representation to point representation."
-  (let ((line-col-to-point-map (ht-create))
-        (inhibit-field-text-motion t)
-        (curr-line 0))
-    (lsp-save-restriction-and-excursion
-      (goto-char (point-min))
-      (cl-loop for (line . col) in line-col-list do
-               (forward-line (- line curr-line))
-               (setq curr-line line)
-               (let ((line-end (line-end-position)))
-                 (if (or (not col) (> col (- line-end (point))))
-                     (goto-char line-end)
-                   (forward-char col)))
-               (ht-set! line-col-to-point-map (cons line col) (if imenu-use-markers
-                                                                  (point-marker)
-                                                                (point)))))
-    line-col-to-point-map))
-
-(cl-defun lsp--line-col-comparator ((l1 . c1) (l2 . c2))
-  (or (< l1 l2)
-      (and (= l1 l2)
-           (cond ((and c1 c2)
-                  (< c1 c2))
-                 (c1 t)))))
-
-(defun lsp-imenu-create-uncategorized-index (symbols)
-  "Create imenu index from document SYMBOLS.
-This function, unlike `lsp-imenu-create-categorized-index', does
-not categorize by type, but instead returns an `imenu' index
-corresponding to the symbol hierarchy returned by the server
-directly."
-  (let* ((lsp--line-col-to-point-hash-table (-> symbols
-                                                lsp--collect-lines-and-cols
-                                                lsp--convert-line-col-to-points-batch)))
-    (if (lsp--imenu-hierarchical-p symbols)
-        (lsp--imenu-create-hierarchical-index symbols)
-      (lsp--imenu-create-non-hierarchical-index symbols))))
-
-(defcustom lsp-imenu-symbol-kinds
-  '((1 . "Files")
-    (2 . "Modules")
-    (3 . "Namespaces")
-    (4 . "Packages")
-    (5 . "Classes")
-    (6 . "Methods")
-    (7 . "Properties")
-    (8 . "Fields")
-    (9 . "Constructors")
-    (10 . "Enums")
-    (11 . "Interfaces")
-    (12 . "Functions")
-    (13 . "Variables")
-    (14 . "Constants")
-    (15 . "Strings")
-    (16 . "Numbers")
-    (17 . "Booleans")
-    (18 . "Arrays")
-    (19 . "Objects")
-    (20 . "Keys")
-    (21 . "Nulls")
-    (22 . "Enum Members")
-    (23 . "Structs")
-    (24 . "Events")
-    (25 . "Operators")
-    (26 . "Type Parameters"))
-  "`lsp-symbol-kinds', but only used by `imenu'.
-A new variable is needed, as it is `imenu' convention to use
-pluralized categories, which `lsp-symbol-kinds' doesn't. If the
-non-pluralized names are preferred, this can be set to
-`lsp-symbol-kinds'."
-  :type '(alist :key-type integer :value-type string))
-
-(defun lsp--imenu-kind->name (kind)
-  (alist-get kind lsp-imenu-symbol-kinds "?"))
-
-(defun lsp-imenu-create-top-level-categorized-index (symbols)
-  "Create an `imenu' index categorizing SYMBOLS by type.
-Only root symbols are categorized.
-
-See `lsp-symbol-kinds' to customize the category naming. SYMBOLS
-shall be a list of DocumentSymbols or SymbolInformation."
-  (mapcan
-   (-lambda ((type . symbols))
-     (let ((cat (lsp--imenu-kind->name type))
-           (symbols (lsp-imenu-create-uncategorized-index symbols)))
-       ;; If there is no :kind (this is being defensive), or we couldn't look it
-       ;; up, just display the symbols inline, without categories.
-       (if cat (list (cons cat symbols)) symbols)))
-   (sort (seq-group-by #'lsp:document-symbol-kind symbols)
-         (-lambda ((kinda) (kindb)) (< kinda kindb)))))
-
-(lsp-defun lsp--symbol->imenu ((sym &as &DocumentSymbol :selection-range (&RangeToPoint :start)))
-  "Convert an `&DocumentSymbol' to an `imenu' entry."
-  (cons (lsp-render-symbol sym lsp-imenu-detailed-outline) start))
-
-(defun lsp--imenu-create-categorized-index-1 (symbols)
-  "Returns an `imenu' index from SYMBOLS categorized by type.
-The result looks like this: ((\"Variables\" . (...)))."
-  (->>
-   symbols
-   (mapcan
-    (-lambda ((sym &as &DocumentSymbol :kind :children?))
-      (if (seq-empty-p children?)
-          (list (list kind (lsp--symbol->imenu sym)))
-        (let ((parent (lsp-render-symbol sym (and lsp-imenu-detailed-outline
-                                                  (not lsp-imenu-hide-parent-details)))))
-          (cons
-           (list kind (lsp--symbol->imenu sym))
-           (mapcar (-lambda ((type .  imenu-items))
-                     (list type (cons parent (mapcan #'cdr imenu-items))))
-                   (-group-by #'car (lsp--imenu-create-categorized-index-1 children?))))))))
-   (-group-by #'car)
-   (mapcar
-    (-lambda ((kind . syms))
-      (cons kind (mapcan #'cdr syms))))))
-
-(defun lsp--imenu-create-categorized-index (symbols)
-  (let ((syms (lsp--imenu-create-categorized-index-1 symbols)))
-    (dolist (sym syms)
-      (setcar sym (lsp--imenu-kind->name (car sym))))
-    syms))
-
-(lsp-defun lsp--symbol-information->imenu ((sym &as &SymbolInformation :location (&Location :range (&RangeToPoint :start))))
-  (cons (lsp-render-symbol-information sym nil) start))
-
-(defun lsp--imenu-create-categorized-index-flat (symbols)
-  "Create a kind-categorized index for SymbolInformation."
-  (mapcar (-lambda ((kind . syms))
-            (cons (lsp--imenu-kind->name kind)
-                  (mapcan (-lambda ((parent . children))
-                            (let ((children (mapcar #'lsp--symbol-information->imenu children)))
-                              (if parent (list (cons parent children)) children)))
-                          (-group-by #'lsp:symbol-information-container-name? syms))))
-          (seq-group-by #'lsp:symbol-information-kind symbols)))
-
-(defun lsp-imenu-create-categorized-index (symbols)
-  (if (lsp--imenu-hierarchical-p symbols)
-      (lsp--imenu-create-categorized-index symbols)
-    (lsp--imenu-create-categorized-index-flat symbols)))
-
-(defcustom lsp-imenu-index-function #'lsp-imenu-create-uncategorized-index
-  "Function that should create an `imenu' index.
-It will be called with a list of SymbolInformation or
-DocumentSymbols, whose first level is already filtered. It shall
-then return an appropriate `imenu' index (see
-`imenu-create-index-function').
-
-Note that this interface is not stable, and subject to change any
-time."
-  :group 'lsp-imenu
-  :type '(radio
-          (const :tag "Categorize by type"
-                 lsp-imenu-create-categorized-index)
-          (const :tag "Categorize root symbols by type"
-                 lsp-imenu-create-top-level-categorized-index)
-          (const :tag "Uncategorized, inline entries"
-                 lsp-imenu-create-uncategorized-index)
-          (function :tag "Custom function")))
-
-(defun lsp--imenu-create-index ()
-  "Create an `imenu' index based on the language server.
-Respects `lsp-imenu-index-function'."
-  (let ((symbols (lsp--imenu-filter-symbols (lsp--get-document-symbols))))
-    (funcall lsp-imenu-index-function symbols)))
-
-(defun lsp--imenu-filter-symbols (symbols)
-  "Filter out unsupported symbols from SYMBOLS."
-  (seq-remove #'lsp--symbol-ignore symbols))
-
-(defun lsp--imenu-hierarchical-p (symbols)
-  "Determine whether any element in SYMBOLS has children."
-  (seq-some #'lsp-document-symbol? symbols))
-
-(defun lsp--imenu-create-non-hierarchical-index (symbols)
-  "Create imenu index for non-hierarchical SYMBOLS.
-
-SYMBOLS are a list of DocumentSymbol messages.
-
-Return a nested alist keyed by symbol names. e.g.
-
-   ((\"SomeClass\" (\"(Class)\" . 10)
-                 (\"someField (Field)\" . 20)
-                 (\"someFunction (Function)\" . 25)
-                 (\"SomeSubClass\" (\"(Class)\" . 30)
-                                  (\"someSubField (Field)\" . 35))
-    (\"someFunction (Function)\" . 40))"
-  (seq-map (lambda (nested-alist)
-             (cons (car nested-alist)
-                   (seq-map #'lsp--symbol-to-imenu-elem (cdr nested-alist))))
-           (seq-group-by #'lsp--get-symbol-type symbols)))
-
-(defun lsp--imenu-create-hierarchical-index (symbols)
-  "Create imenu index for hierarchical SYMBOLS.
-
-SYMBOLS are a list of DocumentSymbol messages.
-
-Return a nested alist keyed by symbol names. e.g.
-
-   ((\"SomeClass\" (\"(Class)\" . 10)
-                 (\"someField (Field)\" . 20)
-                 (\"someFunction (Function)\" . 25)
-                 (\"SomeSubClass\" (\"(Class)\" . 30)
-                                  (\"someSubField (Field)\" . 35))
-    (\"someFunction (Function)\" . 40))"
-  (seq-map #'lsp--symbol-to-hierarchical-imenu-elem
-           (seq-sort #'lsp--imenu-symbol-lessp symbols)))
-
-(defun lsp--imenu-symbol-lessp (sym1 sym2)
-  (let* ((compare-results (mapcar (lambda (method)
-                                    (funcall (alist-get method lsp--imenu-compare-function-alist)
-                                             sym1 sym2))
-                                  lsp-imenu-sort-methods))
-         (result (seq-find (lambda (result)
-                             (not (= result 0)))
-                           compare-results
-                           0)))
-    (and (numberp result) (< result 0))))
-
-(lsp-defun lsp--imenu-compare-kind ((&SymbolInformation :kind left)
-                                    (&SymbolInformation :kind right))
-  "Compare SYM1 and SYM2 by kind."
-  (- left right))
-
-(defun lsp--imenu-compare-line-col (sym1 sym2)
-  (if (lsp--line-col-comparator
-       (lsp--get-line-and-col sym1)
-       (lsp--get-line-and-col sym2))
-      -1
-    1))
-
-(lsp-defun lsp--imenu-compare-name ((&SymbolInformation :name name1)
-                                    (&SymbolInformation :name name2))
-  "Compare SYM1 and SYM2 by name."
-  (let ((result (compare-strings name1 0 (length name1) name2 0 (length name2))))
-    (if (numberp result) result 0)))
-
-(defun lsp--imenu-refresh ()
-  "Force Imenu to refresh itself."
-  (imenu--menubar-select imenu--rescan-item))
-
-(defun lsp-enable-imenu ()
-  "Use lsp-imenu for the current buffer."
-  (imenu--cleanup)
-  (add-function :override (local 'imenu-create-index-function) #'lsp--imenu-create-index)
-  (setq-local imenu-menubar-modified-tick -1)
-  (setq-local imenu--index-alist nil)
-  (when menu-bar-mode
-    (lsp--imenu-refresh)))
-
-(defun lsp-resolve-final-command (command &optional test?)
-  "Resolve final function COMMAND."
-  (let* ((command (lsp-resolve-value command))
-         (command (cl-etypecase command
-                    (list
-                     (cl-assert (seq-every-p (apply-partially #'stringp) command) nil
-                                "Invalid command list")
-                     command)
-                    (string (list command)))))
-    (if (and (file-remote-p default-directory) (not test?))
-        (list shell-file-name "-c"
-              (string-join (cons "stty raw > /dev/null;"
-                                 (mapcar #'shell-quote-argument command))
-                           " "))
-      command)))
-
-(defun lsp-server-present? (final-command)
-  "Check whether FINAL-COMMAND is present."
-  (let ((binary-found? (executable-find (cl-first final-command) t)))
-    (if binary-found?
-        (lsp-log "Command \"%s\" is present on the path." (s-join " " final-command))
-      (lsp-log "Command \"%s\" is not present on the path." (s-join " " final-command)))
-    binary-found?))
-
-(defun lsp--value-to-string (value)
-  "Convert VALUE to a string that can be set as value in an environment
-variable."
-  (cond
-   ((stringp value) value)
-   ((booleanp value) (if value
-                         "1"
-                       "0"))
-   ((and (sequencep value)
-         (seq-every-p #'stringp value)) (string-join value ":"))
-   (t (user-error "Only strings, booleans, and sequences of strings are supported as environment variables"))))
-
-(defun lsp--compute-process-environment (environment-fn)
-  "Append a list of KEY=VALUE from the alist ENVIRONMENT to `process-environment'.
-Ignore non-boolean keys whose value is nil."
-  (let ((environment (if environment-fn
-                         (funcall environment-fn)
-                       nil)))
-    (-flatten (cons (cl-loop for (key . value) in environment
-                             if (or (eval value)
-                                    (eq (get value 'custom-type) 'boolean))
-                             collect (concat key "=" (lsp--value-to-string
-                                                      (eval value))))
-                    process-environment))))
-
-(defun lsp--default-directory-for-connection (&optional path)
-  "Return path to be used for the working directory of a LSP process.
-
-If `lsp-use-workspace-root-for-server-default-directory' is
-non-nil, uses `lsp-workspace-root' to find the directory
-corresponding to PATH, else returns `default-directory'."
-  (if lsp-use-workspace-root-for-server-default-directory
-      (lsp-workspace-root path)
-    default-directory))
-
-(defun lsp--fix-remote-cmd (program)
-  "Helper for `lsp-stdio-connection'.
-Originally coppied from eglot."
-
-  (if (file-remote-p default-directory)
-      (list shell-file-name "-c"
-            (string-join (cons "stty raw > /dev/null;"
-                               (mapcar #'shell-quote-argument program))
-                         " "))
-    program))
-
-(defvar tramp-use-ssh-controlmaster-options)
-(defvar tramp-ssh-controlmaster-options)
-
-(defun lsp-stdio-connection (command &optional test-command)
-  "Returns a connection property list using COMMAND.
-COMMAND can be: A string, denoting the command to launch the
-language server. A list of strings, denoting an executable with
-its command line arguments. A function, that either returns a
-string or a list of strings. In all cases, the launched language
-server should send and receive messages on standard I/O.
-TEST-COMMAND is a function with no arguments which returns
-whether the command is present or not. When not specified
-`lsp-mode' will check whether the first element of the list
-returned by COMMAND is available via `executable-find'"
-  (cl-check-type command (or string
-                             function
-                             (and list
-                                  (satisfies (lambda (l)
-                                               (seq-every-p (lambda (el)
-                                                              (stringp el))
-                                                            l))))))
-  (list :connect (lambda (filter sentinel name environment-fn workspace)
-                   (if (and (functionp 'json-rpc-connection)
-                            (not (file-remote-p default-directory)))
-                       (lsp-json-rpc-connection workspace (lsp-resolve-final-command command))
-                     (let ((final-command (lsp-resolve-final-command command))
-                           (process-name (generate-new-buffer-name name))
-                           (process-environment
-                            (lsp--compute-process-environment environment-fn)))
-                       (let* ((stderr-buf (get-buffer-create (format "*%s::stderr*" process-name)))
-                              (default-directory (lsp--default-directory-for-connection))
-                              (tramp-use-ssh-controlmaster-options 'suppress)
-                              (tramp-ssh-controlmaster-options "-o ControlMaster=no -o ControlPath=none")
-                              (proc (make-process
-                                     :name process-name
-                                     :connection-type 'pipe
-                                     :buffer (format "*%s*" process-name)
-                                     :coding 'no-conversion
-                                     :command final-command
-                                     :filter filter
-                                     :sentinel sentinel
-                                     :stderr stderr-buf
-                                     :noquery t
-                                     :file-handler t)))
-                         (set-process-query-on-exit-flag proc nil)
-                         (set-process-query-on-exit-flag (get-buffer-process stderr-buf) nil)
-                         (with-current-buffer (get-buffer stderr-buf)
-                           ;; Make the *NAME::stderr* buffer buffer-read-only, q to bury, etc.
-                           (special-mode))
-                         (cons proc proc)))))
-        :test? (or
-                test-command
-                (lambda ()
-                  (lsp-server-present? (lsp-resolve-final-command command t))))))
-
-(defun lsp--open-network-stream (host port name)
-  "Open network stream to HOST:PORT.
-  NAME will be passed to `open-network-stream'.
-  RETRY-COUNT is the number of the retries.
-  SLEEP-INTERVAL is the sleep interval between each retry."
-  (let* ((retries 0)
-         (sleep-interval 0.01)
-         (number-of-retries (/ lsp-tcp-connection-timeout sleep-interval))
-         connection)
-    (while (and (not connection) (< retries number-of-retries))
-      (condition-case err
-          (setq connection (open-network-stream name nil host port
-                                                :type 'plain
-                                                :coding 'no-conversion))
-        (file-error
-         (let ((inhibit-message t))
-           (lsp--warn "Failed to connect to %s:%s with error message %s"
-                      host
-                      port
-                      (error-message-string err))
-           (sleep-for sleep-interval)
-           (cl-incf retries)))))
-    (or connection (error "Port %s was never taken. Consider increasing `lsp-tcp-connection-timeout'." port))))
-
-(defun lsp--port-available (host port)
-  "Return non-nil if HOST and PORT are available."
-  (condition-case _err
-      (delete-process (open-network-stream "*connection-test*" nil host port :type 'plain))
-    (file-error t)))
-
-(defun lsp--find-available-port (host starting-port)
-  "Find available port on HOST starting from STARTING-PORT."
-  (let ((port starting-port))
-    (while (not (lsp--port-available host port))
-      (cl-incf port))
-    port))
-
-(defun lsp-tcp-connection (command-fn)
-  "Returns a connection property list similar to `lsp-stdio-connection'.
-COMMAND-FN can only be a function that takes a single argument, a
-port number. It should return a command for launches a language server
-process listening for TCP connections on the provided port."
-  (cl-check-type command-fn function)
-  (list
-   :connect (lambda (filter sentinel name environment-fn _workspace)
-              (let* ((host "localhost")
-                     (port (lsp--find-available-port host (cl-incf lsp--tcp-port)))
-                     (command (funcall command-fn port))
-                     (final-command (if (consp command) command (list command)))
-                     (_ (unless (lsp-server-present? final-command)
-                          (user-error (format "Couldn't find executable %s" (cl-first final-command)))))
-                     (process-environment
-                      (lsp--compute-process-environment environment-fn))
-                     (proc (make-process :name name :connection-type 'pipe :coding 'no-conversion
-                                         :command final-command :sentinel sentinel :stderr (format "*%s::stderr*" name) :noquery t))
-                     (tcp-proc (lsp--open-network-stream host port (concat name "::tcp"))))
-
-                ;; TODO: Same :noquery issue (see above)
-                (set-process-query-on-exit-flag proc nil)
-                (set-process-query-on-exit-flag tcp-proc nil)
-                (set-process-filter tcp-proc filter)
-                (cons tcp-proc proc)))
-   :test? (lambda () (lsp-server-present? (funcall command-fn 0)))))
-
-(defalias 'lsp-tcp-server 'lsp-tcp-server-command)
-
-(defun lsp-tcp-server-command (command-fn)
-  "Create tcp server connection.
-In this mode Emacs is TCP server and the language server connects
-to it. COMMAND is function with one parameter(the port) and it
-should return the command to start the LS server."
-  (cl-check-type command-fn function)
-  (list
-   :connect (lambda (filter sentinel name environment-fn _workspace)
-              (let* (tcp-client-connection
-                     (tcp-server (make-network-process :name (format "*tcp-server-%s*" name)
-                                                       :buffer (format "*tcp-server-%s*" name)
-                                                       :family 'ipv4
-                                                       :service lsp--tcp-server-port
-                                                       :sentinel (lambda (proc _string)
-                                                                   (lsp-log "Language server %s is connected." name)
-                                                                   (setf tcp-client-connection proc))
-                                                       :server 't))
-                     (port (process-contact tcp-server :service))
-                     (final-command (funcall command-fn port))
-                     (process-environment
-                      (lsp--compute-process-environment environment-fn))
-                     (cmd-proc (make-process :name name
-                                             :connection-type 'pipe
-                                             :coding 'no-conversion
-                                             :command final-command
-                                             :stderr (format "*tcp-server-%s*::stderr" name)
-                                             :noquery t)))
-                (let ((retries 0))
-                  ;; wait for the client to connect (we sit-for 500 ms, so have to double lsp--tcp-server-wait-seconds)
-                  (while (and (not tcp-client-connection) (< retries (* 2 lsp--tcp-server-wait-seconds)))
-                    (lsp--info "Waiting for connection for %s, retries: %s" name retries)
-                    (sit-for 0.500)
-                    (cl-incf retries)))
-
-                (unless tcp-client-connection
-                  (condition-case nil (delete-process tcp-server) (error))
-                  (condition-case nil (delete-process cmd-proc) (error))
-                  (error "Failed to create connection to %s on port %s" name port))
-                (lsp--info "Successfully connected to %s" name)
-
-                (set-process-query-on-exit-flag cmd-proc nil)
-                (set-process-query-on-exit-flag tcp-client-connection nil)
-                (set-process-query-on-exit-flag tcp-server nil)
-
-                (set-process-filter tcp-client-connection filter)
-                (set-process-sentinel tcp-client-connection sentinel)
-                (cons tcp-client-connection cmd-proc)))
-   :test? (lambda () (lsp-server-present? (funcall command-fn 0)))))
-
-(defalias 'lsp-tramp-connection 'lsp-stdio-connection)
-
-(defun lsp--auto-configure ()
-  "Autoconfigure `company', `flycheck', `lsp-ui', etc if they are installed."
-  (when (functionp 'lsp-ui-mode)
-    (lsp-ui-mode))
-
-  (if lsp-headerline-breadcrumb-enable
-      (add-hook 'lsp-configure-hook 'lsp-headerline-breadcrumb-mode)
-    (remove-hook 'lsp-configure-hook 'lsp-headerline-breadcrumb-mode))
-  (if lsp-modeline-code-actions-enable
-      (add-hook 'lsp-configure-hook 'lsp-modeline-code-actions-mode)
-    (remove-hook 'lsp-configure-hook 'lsp-modeline-code-actions-mode))
-  (if lsp-modeline-diagnostics-enable
-      (add-hook 'lsp-configure-hook 'lsp-modeline-diagnostics-mode)
-    (remove-hook 'lsp-configure-hook 'lsp-modeline-diagnostics-mode))
-  (if lsp-modeline-workspace-status-enable
-      (add-hook 'lsp-configure-hook 'lsp-modeline-workspace-status-mode)
-    (remove-hook 'lsp-configure-hook 'lsp-modeline-workspace-status-mode))
-  (if lsp-lens-enable
-      (add-hook 'lsp-configure-hook 'lsp-lens--enable)
-    (remove-hook 'lsp-configure-hook 'lsp-lens--enable))
-  (if lsp-semantic-tokens-enable
-      (add-hook 'lsp-configure-hook 'lsp-semantic-tokens--enable)
-    (remove-hook 'lsp-configure-hook 'lsp-semantic-tokens--enable))
-
-  ;; yas-snippet config
-  (setq-local yas-inhibit-overlay-modification-protection t))
-
-(defun lsp--restart-if-needed (workspace)
-  "Handler restart for WORKSPACE."
-  (when (or (eq lsp-restart 'auto-restart)
-            (eq (lsp--workspace-shutdown-action workspace) 'restart)
-            (and (eq lsp-restart 'interactive)
-                 (let ((query (format
-                               "Server %s exited (check corresponding stderr buffer for details). Do you want to restart it?"
-                               (lsp--workspace-print workspace))))
-                   (y-or-n-p query))))
-    (--each (lsp--workspace-buffers workspace)
-      (when (lsp-buffer-live-p it)
-        (lsp-with-current-buffer it
-          (if lsp--buffer-deferred
-              (lsp-deferred)
-            (lsp--info "Restarting LSP in buffer %s" (buffer-name))
-            (lsp)))))))
-
-(defun lsp--update-key (table key fn)
-  "Apply FN on value corresponding to KEY in TABLE."
-  (let ((existing-value (gethash key table)))
-    (if-let ((new-value (funcall fn existing-value)))
-        (puthash key new-value table)
-      (remhash key table))))
-
-(defun lsp--process-sentinel (workspace process exit-str)
-  "Create the sentinel for WORKSPACE."
-  (unless (process-live-p process)
-    (lsp--handle-process-exit workspace exit-str)))
-
-(defun lsp--handle-process-exit (workspace exit-str)
-  (let* ((folder->workspaces (lsp-session-folder->servers (lsp-session)))
-         (proc (lsp--workspace-proc workspace)))
-    (lsp--warn "%s has exited (%s)"
-               (lsp-process-name proc)
-               (string-trim-right (or exit-str "")))
-    (with-lsp-workspace workspace
-      ;; Clean workspace related data in each of the buffers
-      ;; in the workspace.
-      (--each (lsp--workspace-buffers workspace)
-        (when (lsp-buffer-live-p it)
-          (lsp-with-current-buffer it
-            (setq lsp--buffer-workspaces (delete workspace lsp--buffer-workspaces))
-            (lsp--uninitialize-workspace)
-            (lsp--spinner-stop)
-            (lsp--remove-overlays 'lsp-highlight))))
-
-      ;; Cleanup session from references to the closed workspace.
-      (--each (hash-table-keys folder->workspaces)
-        (lsp--update-key folder->workspaces it (apply-partially 'delete workspace)))
-
-      (lsp-process-cleanup proc))
-
-    (run-hook-with-args 'lsp-after-uninitialized-functions workspace)
-
-    (if (eq (lsp--workspace-shutdown-action workspace) 'shutdown)
-        (lsp--info "Workspace %s shutdown." (lsp--workspace-print workspace))
-      (lsp--restart-if-needed workspace))
-    (lsp--cleanup-hanging-watches)))
-
-(defun lsp-workspace-folders (workspace)
-  "Return all folders associated with WORKSPACE."
-  (let (result)
-    (->> (lsp-session)
-         (lsp-session-folder->servers)
-         (maphash (lambda (folder workspaces)
-                    (when (-contains? workspaces workspace)
-                      (push folder result)))))
-    result))
-
-(defun lsp--start-workspace (session client-template root &optional initialization-options)
-  "Create new workspace for CLIENT-TEMPLATE with project root ROOT.
-INITIALIZATION-OPTIONS are passed to initialize function.
-SESSION is the active session."
-  (lsp--spinner-start)
-  (-let* ((default-directory root)
-          (client (copy-lsp--client client-template))
-          (workspace (make-lsp--workspace
-                      :root root
-                      :client client
-                      :status 'starting
-                      :buffers (list (lsp-current-buffer))
-                      :host-root (file-remote-p root)))
-          ((&lsp-cln 'server-id 'environment-fn 'new-connection 'custom-capabilities
-                     'multi-root 'initialized-fn) client)
-          ((proc . cmd-proc) (funcall
-                              (or (plist-get new-connection :connect)
-                                  (user-error "Client %s is configured incorrectly" client))
-                              (lsp--create-filter-function workspace)
-                              (apply-partially #'lsp--process-sentinel workspace)
-                              (format "%s" server-id)
-                              environment-fn
-                              workspace))
-          (workspace-folders (gethash server-id (lsp-session-server-id->folders session))))
-    (setf (lsp--workspace-proc workspace) proc
-          (lsp--workspace-cmd-proc workspace) cmd-proc)
-
-    ;; update (lsp-session-folder->servers) depending on whether we are starting
-    ;; multi/single folder workspace
-    (mapc (lambda (project-root)
-            (->> session
-                 (lsp-session-folder->servers)
-                 (gethash project-root)
-                 (cl-pushnew workspace)))
-          (or workspace-folders (list root)))
-
-    (with-lsp-workspace workspace
-      (run-hooks 'lsp-before-initialize-hook)
-      (lsp-request-async
-       "initialize"
-       (append
-        (list :processId (unless (file-remote-p (buffer-file-name))
-                           (emacs-pid))
-              :rootPath (lsp-file-local-name (expand-file-name root))
-              :clientInfo (list :name "emacs"
-                                :version (emacs-version))
-              :rootUri (lsp--path-to-uri root)
-              :capabilities (lsp--client-capabilities custom-capabilities)
-              :initializationOptions initialization-options
-              :workDoneToken "1")
-        (when lsp-server-trace
-          (list :trace lsp-server-trace))
-        (when multi-root
-          (->> workspace-folders
-               (-distinct)
-               (-map (lambda (folder)
-                       (list :uri (lsp--path-to-uri folder)
-                             :name (f-filename folder))))
-               (apply 'vector)
-               (list :workspaceFolders))))
-       (-lambda ((&InitializeResult :capabilities))
-         ;; we know that Rust Analyzer will send {} which will be parsed as null
-         ;; when using plists
-         (when (equal 'rust-analyzer server-id)
-           (-> capabilities
-               (lsp:server-capabilities-text-document-sync?)
-               (lsp:set-text-document-sync-options-save? t)))
-
-         (setf (lsp--workspace-server-capabilities workspace) capabilities
-               (lsp--workspace-status workspace) 'initialized)
-
-         (with-lsp-workspace workspace
-           (lsp-notify "initialized" lsp--empty-ht))
-
-         (when initialized-fn (funcall initialized-fn workspace))
-
-         (cl-callf2 -filter #'lsp-buffer-live-p (lsp--workspace-buffers workspace))
-         (->> workspace
-              (lsp--workspace-buffers)
-              (mapc (lambda (buffer)
-                      (lsp-with-current-buffer buffer
-                        (lsp--open-in-workspace workspace)))))
-
-         (with-lsp-workspace workspace
-           (run-hooks 'lsp-after-initialize-hook))
-         (lsp--info "%s initialized successfully in folders: %s"
-                    (lsp--workspace-print workspace)
-                    (lsp-workspace-folders workspace)))
-       :mode 'detached))
-    workspace))
-
-(defun lsp--load-default-session ()
-  "Load default session."
-  (setq lsp--session (or (condition-case err
-                             (lsp--read-from-file lsp-session-file)
-                           (error (lsp--error "Failed to parse the session %s, starting with clean one."
-                                              (error-message-string err))
-                                  nil))
-                         (make-lsp-session))))
-
-(defun lsp-session ()
-  "Get the session associated with the current buffer."
-  (or lsp--session (setq lsp--session (lsp--load-default-session))))
-
-(defun lsp--client-disabled-p (buffer-major-mode client)
-  (seq-some
-   (lambda (entry)
-     (pcase entry
-       ((pred symbolp) (eq entry client))
-       (`(,mode . ,client-or-list)
-        (and (eq mode buffer-major-mode)
-             (if (listp client-or-list)
-                 (memq client client-or-list)
-               (eq client client-or-list))))))
-   lsp-disabled-clients))
-
-
-;; download server
-
-(defcustom lsp-server-install-dir (expand-file-name
-                                   (locate-user-emacs-file (f-join ".cache" "lsp")))
-  "Directory in which the servers will be installed."
-  :risky t
-  :type 'directory
-  :package-version '(lsp-mode . "6.3")
-  :group 'lsp-mode)
-
-(defcustom lsp-verify-signature t
-  "Whether to check GPG signatures of downloaded files."
-  :type 'boolean
-  :package-version '(lsp-mode . "8.0.0")
-  :group 'lsp-mode)
-
-(defvar lsp--dependencies (ht))
-
-(defun lsp-dependency (name &rest definitions)
-  "Used to specify a language server DEPENDENCY, the server
-executable or other required file path. Typically, the
-DEPENDENCY is found by locating it on the system path using
-`executable-find'.
-
-You can explicitly call lsp-dependency in your environment to
-specify the absolute path to the DEPENDENCY. For example, the
-typescript-language-server requires both the server and the
-typescript compiler. If you have installed them in a team shared
-read-only location, you can instruct lsp-mode to use them via
-
- (eval-after-load `lsp-mode
-   `(progn
-      (require lsp-javascript)
-      (lsp-dependency typescript-language-server (:system ,tls-exe))
-      (lsp-dependency typescript (:system ,ts-js))))
-
-where tls-exe is the absolute path to the typescript-language-server
-executable and ts-js is the absolute path to the typescript compiler
-JavaScript file, tsserver.js (the *.js is required for Windows)."
-  (ht-set lsp--dependencies name definitions))
-
-(defun lsp--server-binary-present? (client)
-  (unless (equal (lsp--client-server-id client) 'lsp-pwsh)
-    (condition-case ()
-        (-some-> client lsp--client-new-connection (plist-get :test?) funcall)
-      (error nil)
-      (args-out-of-range nil))))
-
-(define-minor-mode lsp-installation-buffer-mode
-  "Mode used in *lsp-installation* buffers.
-It can be used to set-up keybindings, etc. Disabling this mode
-detaches the installation buffer from commands like
-`lsp-select-installation-buffer'."
-  :init-value nil
-  :lighter nil)
-
-(defface lsp-installation-finished-buffer-face '((t :foreground "orange"))
-  "Face used for finished installation buffers.
-Used in `lsp-select-installation-buffer'."
-  :group 'lsp-mode)
-
-(defface lsp-installation-buffer-face '((t :foreground "green"))
-  "Face used for installation buffers still in progress.
-Used in `lsp-select-installation-buffer'."
-  :group 'lsp-mode)
-
-(defun lsp--installation-buffer? (buf)
-  "Check whether BUF is an `lsp-async-start-process' buffer."
-  (buffer-local-value 'lsp-installation-buffer-mode buf))
-
-(defun lsp-select-installation-buffer (&optional show-finished)
-  "Interactively choose an installation buffer.
-If SHOW-FINISHED is set, leftover (finished) installation buffers
-are still shown."
-  (interactive "P")
-  (let ((bufs (--filter (and (lsp--installation-buffer? it)
-                             (or show-finished (get-buffer-process it)))
-                        (buffer-list))))
-    (pcase bufs
-      (`nil (user-error "No installation buffers"))
-      (`(,buf) (pop-to-buffer buf))
-      (bufs (pop-to-buffer (completing-read "Select installation buffer: "
-                                            (--map (propertize (buffer-name it) 'face
-                                                               (if (get-buffer-process it)
-                                                                   'lsp-installation-buffer-face
-                                                                 'lsp-installation-finished-buffer-face))
-                                                   bufs)))))))
-
-(defun lsp-cleanup-installation-buffers ()
-  "Delete finished *lsp-installation* buffers."
-  (interactive)
-  (dolist (buf (buffer-list))
-    (when (and (lsp--installation-buffer? buf) (not (get-buffer-process buf)))
-      (kill-buffer buf))))
-
-(defun lsp--download-status ()
-  (-some--> #'lsp--client-download-in-progress?
-    (lsp--filter-clients it)
-    (-map (-compose #'symbol-name #'lsp--client-server-id) it)
-    (format "%s" it)
-    (propertize it 'face 'success)
-    (format " Installing following servers: %s" it)
-    (propertize it
-                'local-map (make-mode-line-mouse-map
-                            'mouse-1 #'lsp-select-installation-buffer)
-                'mouse-face 'highlight)))
-
-(defun lsp--install-server-internal (client &optional update?)
-  (unless (lsp--client-download-server-fn client)
-    (user-error "There is no automatic installation for `%s', you have to install it manually following lsp-mode's documentation."
-                (lsp--client-server-id client)))
-
-  (setf (lsp--client-download-in-progress? client) t)
-  (add-to-list 'global-mode-string '(t (:eval (lsp--download-status))))
-  (cl-flet ((done
-             (success? &optional error-message)
-             ;; run with idle timer to make sure the lsp command is executed in
-             ;; the main thread, see #2739.
-             (run-with-timer
-              0.0
-              nil
-              (lambda ()
-                (-let [(&lsp-cln 'server-id 'buffers) client]
-                  (setf (lsp--client-download-in-progress? client) nil
-                        (lsp--client-buffers client) nil)
-                  (if success?
-                      (lsp--info "Server %s downloaded, auto-starting in %s buffers." server-id
-                                 (length buffers))
-                    (lsp--error "Server %s install process failed with the following error message: %s.
-Check `*lsp-install*' and `*lsp-log*' buffer."
-                                server-id
-                                error-message))
-                  (seq-do
-                   (lambda (buffer)
-                     (when (lsp-buffer-live-p buffer)
-                       (lsp-with-current-buffer buffer
-                         (cl-callf2 -remove-item '(t (:eval (lsp--download-status)))
-                                    global-mode-string)
-                         (when success? (lsp)))))
-                   buffers)
-                  (unless (lsp--filter-clients #'lsp--client-download-in-progress?)
-                    (cl-callf2 -remove-item '(t (:eval (lsp--download-status)))
-                               global-mode-string)))))))
-    (lsp--info "Download %s started." (lsp--client-server-id client))
-    (condition-case err
-        (funcall
-         (lsp--client-download-server-fn client)
-         client
-         (lambda () (done t))
-         (lambda (msg) (done nil msg))
-         update?)
-      (error
-       (done nil (error-message-string err))))))
-
-(defun lsp--require-packages ()
-  "Load `lsp-client-packages' if needed."
-  (when (and lsp-auto-configure (not lsp--client-packages-required))
-    (seq-do (lambda (package)
-              ;; loading client is slow and `lsp' can be called repeatedly
-              (unless (featurep package)
-                (require package nil t)))
-            lsp-client-packages)
-    (setq lsp--client-packages-required t)))
-
-;;;###autoload
-(defun lsp-install-server (update? &optional server-id)
-  "Interactively install or re-install server.
-When prefix UPDATE? is t force installation even if the server is present."
-  (interactive "P")
-  (lsp--require-packages)
-  (let* ((chosen-client (or (gethash server-id lsp-clients)
-                            (lsp--completing-read
-                             "Select server to install/re-install: "
-                             (or (->> lsp-clients
-                                      (ht-values)
-                                      (-filter (-andfn
-                                                (-not #'lsp--client-download-in-progress?)
-                                                #'lsp--client-download-server-fn)))
-                                 (user-error "There are no servers with automatic installation"))
-                             (lambda (client)
-                               (let ((server-name (-> client lsp--client-server-id symbol-name)))
-                                 (if (lsp--server-binary-present? client)
-                                     (concat server-name " (Already installed)")
-                                   server-name)))
-                             nil
-                             t)))
-         (update? (or update?
-                      (and (not (lsp--client-download-in-progress? chosen-client))
-                           (lsp--server-binary-present? chosen-client)))))
-    (lsp--install-server-internal chosen-client update?)))
-
-;;;###autoload
-(defun lsp-uninstall-server (dir)
-  "Delete a LSP server from `lsp-server-install-dir'."
-  (interactive
-   (list (read-directory-name "Uninstall LSP server: " (f-slash lsp-server-install-dir))))
-  (unless (file-directory-p dir)
-    (user-error "Couldn't find %s directory" dir))
-  (delete-directory dir 'recursive)
-  (message "Server `%s' uninstalled." (file-name-nondirectory (directory-file-name dir))))
-
-;;;###autoload
-(defun lsp-uninstall-servers ()
-  "Uninstall all installed servers."
-  (interactive)
-  (let* ((dir lsp-server-install-dir)
-         (servers (ignore-errors
-                    (directory-files dir t
-                                     directory-files-no-dot-files-regexp))))
-    (if (or (not (file-directory-p dir)) (zerop (length servers)))
-        (user-error "No servers to uninstall")
-      (when (yes-or-no-p
-             (format "Servers to uninstall: %d (%s), proceed? "
-                     (length servers)
-                     (mapconcat (lambda (server)
-                                  (file-name-nondirectory (directory-file-name server)))
-                                servers " ")))
-        (mapc #'lsp-uninstall-server servers)
-        (message "All servers uninstalled")))))
-
-;;;###autoload
-(defun lsp-update-server (&optional server-id)
-  "Interactively update (reinstall) a server."
-  (interactive)
-  (lsp--require-packages)
-  (let ((chosen-client (or (gethash server-id lsp-clients)
-                           (lsp--completing-read
-                            "Select server to update (if not on the list, probably you need to `lsp-install-server`): "
-                            (or (->> lsp-clients
-                                     (ht-values)
-                                     (-filter (-andfn
-                                               (-not #'lsp--client-download-in-progress?)
-                                               #'lsp--client-download-server-fn
-                                               #'lsp--server-binary-present?)))
-                                (user-error "There are no servers to update"))
-                            (lambda (client)
-                              (-> client lsp--client-server-id symbol-name))
-                            nil
-                            t))))
-    (lsp--install-server-internal chosen-client t)))
-
-;;;###autoload
-(defun lsp-update-servers ()
-  "Update (reinstall) all installed servers."
-  (interactive)
-  (lsp--require-packages)
-  (mapc (lambda (client) (lsp--install-server-internal client t))
-        (-filter (-andfn
-                  (-not #'lsp--client-download-in-progress?)
-                  #'lsp--client-download-server-fn
-                  #'lsp--server-binary-present?) (hash-table-values lsp-clients))))
-
-;;;###autoload
-(defun lsp-ensure-server (server-id)
-  "Ensure server SERVER-ID"
-  (lsp--require-packages)
-  (if-let ((client (gethash server-id lsp-clients)))
-      (unless (lsp--server-binary-present? client)
-        (lsp--info "Server `%s' is not preset, installing..." server-id)
-        (lsp-install-server nil server-id))
-    (warn "Unable to find server registration with id %s" server-id)))
-
-(defun lsp-async-start-process (callback error-callback &rest command)
-  "Start async process COMMAND with CALLBACK and ERROR-CALLBACK."
-  (let ((name (cl-first command)))
-    (with-current-buffer (compilation-start (mapconcat #'shell-quote-argument (-filter (lambda (cmd)
-                                                                                         (not (null cmd)))
-                                                                                       command)
-                                                       " ") t
-                                            (lambda (&rest _)
-                                              (generate-new-buffer-name (format "*lsp-install: %s*" name))))
-      (lsp-installation-buffer-mode +1)
-      (view-mode +1)
-      (add-hook
-       'compilation-finish-functions
-       (lambda (_buf status)
-         (if (string= "finished\n" status)
-             (condition-case err
-                 (funcall callback)
-               (error
-                (funcall error-callback (error-message-string err))))
-           (funcall error-callback (s-trim-right status))))
-       nil t))))
-
-(defun lsp-resolve-value (value)
-  "Resolve VALUE's value.
-If it is function - call it.
-If it is a variable - return it's value
-Otherwise returns value itself."
-  (cond
-   ((functionp value) (funcall value))
-   ((and (symbolp value) (boundp value)) (symbol-value value))
-   (value)))
-
-(defvar lsp-deps-providers
-  (list :npm (list :path #'lsp--npm-dependency-path
-                   :install #'lsp--npm-dependency-install)
-        :cargo (list :path #'lsp--cargo-dependency-path
-                     :install #'lsp--cargo-dependency-install)
-        :system (list :path #'lsp--system-path)
-        :download (list :path #'lsp-download-path
-                        :install #'lsp-download-install)))
-
-(defun lsp--system-path (path)
-  "If PATH is absolute and exists return it as is. Otherwise,
-return the absolute path to the executable defined by PATH or
-nil."
-  ;; For node.js 'sub-packages' PATH may point to a *.js file. Consider the
-  ;; typescript-language-server. When lsp invokes the server, lsp needs to
-  ;; supply the path to the typescript compiler, tsserver.js, as an argument. To
-  ;; make code platform independent, one must pass the absolute path to the
-  ;; tsserver.js file (Windows requires a *.js file - see help on the JavaScript
-  ;; child process spawn command that is invoked by the
-  ;; typescript-language-server). This is why we check for existence and not
-  ;; that the path is executable.
-  (let ((path (lsp-resolve-value path)))
-    (cond
-     ((and (f-absolute? path)
-           (f-exists? path))
-      path)
-     ((executable-find path t) path))))
-
-(defun lsp-package-path (dependency)
-  "Path to the DEPENDENCY each of the registered providers."
-  (let (path)
-    (-first (-lambda ((provider . rest))
-              (setq path (-some-> lsp-deps-providers
-                           (plist-get provider)
-                           (plist-get :path)
-                           (apply rest))))
-            (gethash dependency lsp--dependencies))
-    path))
-
-(defun lsp-package-ensure (dependency callback error-callback)
-  "Asynchronously ensure a package."
-  (or (-first (-lambda ((provider . rest))
-                (-some-> lsp-deps-providers
-                  (plist-get provider)
-                  (plist-get :install)
-                  (apply (cl-list* callback error-callback rest))))
-              (gethash dependency lsp--dependencies))
-      (funcall error-callback (format "Unable to find a way to install %s" dependency))))
-
-
-;; npm handling
-
-;; https://docs.npmjs.com/files/folders#executables
-(cl-defun lsp--npm-dependency-path (&key package path &allow-other-keys)
-  "Return npm dependency PATH for PACKAGE."
-  (let ((path (executable-find
-               (f-join lsp-server-install-dir "npm" package
-                       (cond ((eq system-type 'windows-nt) "")
-                             (t "bin"))
-                       path)
-               t)))
-    (unless (and path (f-exists? path))
-      (error "The package %s is not installed.  Unable to find %s" package path))
-    path))
-
-(cl-defun lsp--npm-dependency-install (callback error-callback &key package &allow-other-keys)
-  (if-let ((npm-binary (executable-find "npm")))
-      (progn
-        ;; Explicitly `make-directory' to work around NPM bug in
-        ;; versions 7.0.0 through 7.4.1. See
-        ;; https://github.com/emacs-lsp/lsp-mode/issues/2364 for
-        ;; discussion.
-        (make-directory (f-join lsp-server-install-dir "npm" package "lib") 'parents)
-        (lsp-async-start-process (lambda ()
-                                   (if (string-empty-p
-                                        (string-trim (shell-command-to-string
-                                                      (mapconcat #'shell-quote-argument `(,npm-binary "view" ,package "peerDependencies") " "))))
-                                       (funcall callback)
-                                     (let ((default-directory (f-dirname (car (last (directory-files-recursively (f-join lsp-server-install-dir "npm" package) "package.json")))))
-                                           (process-environment (append '("npm_config_yes=true") process-environment))) ;; Disable prompting for older versions of npx
-                                       (when (f-dir-p default-directory)
-                                         (lsp-async-start-process callback
-                                                                  error-callback
-                                                                  (executable-find "npx")
-                                                                  "npm-install-peers")))))
-                                 error-callback
-                                 npm-binary
-                                 "-g"
-                                 "--prefix"
-                                 (f-join lsp-server-install-dir "npm" package)
-                                 "install"
-                                 package))
-    (lsp-log "Unable to install %s via `npm' because it is not present" package)
-    nil))
-
-
-;; Cargo dependency handling
-(cl-defun lsp--cargo-dependency-path (&key package path &allow-other-keys)
-  (let ((path (executable-find
-               (f-join lsp-server-install-dir
-                       "cargo"
-                       package
-                       "bin"
-                       path)
-               t)))
-    (unless (and path (f-exists? path))
-      (error "The package %s is not installed.  Unable to find %s" package path))
-    path))
-
-(cl-defun lsp--cargo-dependency-install (callback error-callback &key package git &allow-other-keys)
-  (if-let ((cargo-binary (executable-find "cargo")))
-      (lsp-async-start-process
-       callback
-       error-callback
-       cargo-binary
-       "install"
-       package
-       (when git
-         "--git")
-       git
-       "--root"
-       (f-join lsp-server-install-dir "cargo" package))
-    (lsp-log "Unable to install %s via `cargo' because it is not present" package)
-    nil))
-
-
-
-;; Download URL handling
-(cl-defun lsp-download-install (callback error-callback &key url asc-url pgp-key store-path decompress &allow-other-keys)
-  (let* ((url (lsp-resolve-value url))
-         (store-path (lsp-resolve-value store-path))
-         ;; (decompress (lsp-resolve-value decompress))
-         (download-path
-          (pcase decompress
-            (:gzip (concat store-path ".gz"))
-            (:zip (concat store-path ".zip"))
-            (:targz (concat store-path ".tar.gz"))
-            (`nil store-path)
-            (_ (error ":decompress must be `:gzip', `:zip', `:targz' or `nil'")))))
-    (make-thread
-     (lambda ()
-       (condition-case err
-           (progn
-             (when (f-exists? download-path)
-               (f-delete download-path))
-             (when (f-exists? store-path)
-               (f-delete store-path))
-             (lsp--info "Starting to download %s to %s..." url download-path)
-             (mkdir (f-parent download-path) t)
-             (url-copy-file url download-path)
-             (lsp--info "Finished downloading %s..." download-path)
-             (when (and lsp-verify-signature asc-url pgp-key)
-               (if (executable-find epg-gpg-program)
-                   (let ((asc-download-path (concat download-path ".asc"))
-                         (context (epg-make-context))
-                         (fingerprint)
-                         (signature))
-                     (when (f-exists? asc-download-path)
-                       (f-delete asc-download-path))
-                     (lsp--info "Starting to download %s to %s..." asc-url asc-download-path)
-                     (url-copy-file asc-url asc-download-path)
-                     (lsp--info "Finished downloading %s..." asc-download-path)
-                     (epg-import-keys-from-string context pgp-key)
-                     (setq fingerprint (epg-import-status-fingerprint
-                                        (car
-                                         (epg-import-result-imports
-                                          (epg-context-result-for context 'import)))))
-                     (lsp--info "Verifying signature %s..." asc-download-path)
-                     (epg-verify-file context asc-download-path download-path)
-                     (setq signature (car (epg-context-result-for context 'verify)))
-                     (unless (and
-                              (eq (epg-signature-status signature) 'good)
-                              (equal (epg-signature-fingerprint signature) fingerprint))
-                       (error "Failed to verify GPG signature: %s" (epg-signature-to-string signature))))
-                 (lsp--warn "GPG is not installed, skipping the signature check.")))
-             (when decompress
-               (lsp--info "Decompressing %s..." download-path)
-               (pcase decompress
-                 (:gzip
-                  (lsp-gunzip download-path))
-                 (:zip (lsp-unzip download-path (f-parent store-path)))
-                 (:targz (lsp-tar-gz-decompress download-path (f-parent store-path))))
-               (lsp--info "Decompressed %s..." store-path))
-             (funcall callback))
-         (error (funcall error-callback err)))))))
-
-(cl-defun lsp-download-path (&key store-path binary-path set-executable? &allow-other-keys)
-  "Download URL and store it into STORE-PATH.
-
-SET-EXECUTABLE? when non-nil change the executable flags of
-STORE-PATH to make it executable. BINARY-PATH can be specified
-when the binary to start does not match the name of the
-archive (e.g. when the archive has multiple files)"
-  (let ((store-path (or (lsp-resolve-value binary-path)
-                        (lsp-resolve-value store-path))))
-    (cond
-     ((executable-find store-path) store-path)
-     ((and set-executable? (f-exists? store-path))
-      (set-file-modes store-path #o0700)
-      store-path)
-     ((f-exists? store-path) store-path))))
-
-(defun lsp--find-latest-gh-release-url (url regex)
-  "Fetch the latest version in the releases given by URL by using REGEX."
-  (let ((url-request-method "GET"))
-    (with-current-buffer (url-retrieve-synchronously url)
-      (goto-char (point-min))
-      (re-search-forward "\n\n" nil 'noerror)
-      (delete-region (point-min) (point))
-      (let* ((json-result (lsp-json-read-buffer)))
-        (message "Latest version found: %s" (lsp-get json-result :tag_name))
-        (--> json-result
-             (lsp-get it :assets)
-             (seq-find (lambda (entry) (string-match-p regex (lsp-get entry :name))) it)
-             (lsp-get it :browser_download_url))))))
-
-;; unzip
-
-(defconst lsp-ext-pwsh-script "powershell -noprofile -noninteractive \
--nologo -ex bypass -command Expand-Archive -path '%s' -dest '%s'"
-  "Powershell script to unzip file.")
-
-(defconst lsp-ext-unzip-script "bash -c 'mkdir -p %2$s && unzip -qq -o %1$s -d %2$s'"
-  "Unzip script to unzip file.")
-
-(defcustom lsp-unzip-script (lambda ()
-                              (cond ((and (eq system-type 'windows-nt)
-                                          (executable-find "powershell"))
-                                     lsp-ext-pwsh-script)
-                                    ((executable-find "unzip") lsp-ext-unzip-script)
-                                    ((executable-find "powershell") lsp-ext-pwsh-script)
-                                    (t nil)))
-  "The script to unzip."
-  :group 'lsp-mode
-  :type 'string
-  :package-version '(lsp-mode . "8.0.0"))
-
-(defun lsp-unzip (zip-file dest)
-  "Unzip ZIP-FILE to DEST."
-  (unless lsp-unzip-script
-    (error "Unable to find `unzip' or `powershell' on the path, please customize `lsp-unzip-script'"))
-  (shell-command (format (lsp-resolve-value lsp-unzip-script) zip-file dest)))
-
-;; gunzip
-
-(defconst lsp-ext-gunzip-script "gzip -d %1$s"
-  "Script to decompress a gzippped file with gzip.")
-
-(defcustom lsp-gunzip-script (lambda ()
-                               (cond ((executable-find "gzip") lsp-ext-gunzip-script)
-                                     (t nil)))
-  "The script to decompress a gzipped file.
-Should be a format string with one argument for the file to be decompressed
-in place."
-  :group 'lsp-mode
-  :type 'string
-  :package-version '(lsp-mode . "8.0.0"))
-
-(defun lsp-gunzip (gz-file)
-  "Decompress GZ-FILE in place."
-  (unless lsp-gunzip-script
-    (error "Unable to find `gzip' on the path, please either customize `lsp-gunzip-script' or manually decompress %s" gz-file))
-  (shell-command (format (lsp-resolve-value lsp-gunzip-script) gz-file)))
-
-;; tar.gz decompression
-
-(defconst lsp-ext-tar-script "bash -c 'mkdir -p %2$s; tar xf %1$s --directory=%2$s'"
-  "Script to decompress a .tar.gz file.")
-
-(defcustom lsp-tar-script (lambda ()
-                            (cond ((executable-find "tar") lsp-ext-tar-script)
-                                  (t nil)))
-  "The script to decompress a .tar.gz file.
-Should be a format string with one argument for the file to be decompressed
-in place."
-  :group 'lsp-mode
-  :type 'string)
-
-(defun lsp-tar-gz-decompress (targz-file dest)
-  "Decompress TARGZ-FILE in DEST."
-  (unless lsp-tar-script
-    (error "Unable to find `tar' on the path, please either customize `lsp-tar-script' or manually decompress %s" targz-file))
-  (shell-command (format (lsp-resolve-value lsp-tar-script) targz-file dest)))
-
-
-;; VSCode marketplace
-
-(defcustom lsp-vscode-ext-url
-  "https://marketplace.visualstudio.com/_apis/public/gallery/publishers/%s/vsextensions/%s/%s/vspackage%s"
-  "Vscode extension template url."
-  :group 'lsp-mode
-  :type 'string
-  :package-version '(lsp-mode . "8.0.0"))
-
-(defun lsp-vscode-extension-url (publisher name version &optional targetPlatform)
-  "Return the URL to vscode extension.
-PUBLISHER is the extension publisher.
-NAME is the name of the extension.
-VERSION is the version of the extension.
-TARGETPLATFORM is the targetPlatform of the extension."
-  (format lsp-vscode-ext-url publisher name version (or targetPlatform "")))
-
-
-
-;; Queueing prompts
-
-(defvar lsp--question-queue nil
-  "List of questions yet to be asked by `lsp-ask-question'.")
-
-(defun lsp-ask-question (question options callback)
-  "Prompt the user to answer the QUESTION with one of the OPTIONS from the
-minibuffer. Once the user selects an option, the CALLBACK function will be
-called, passing the selected option to it.
-
-If the user is currently being shown a question, the question will be stored in
-`lsp--question-queue', and will be asked once the user has answered the current
-question."
-  (add-to-list 'lsp--question-queue `(("question" . ,question)
-                                      ("options" . ,options)
-                                      ("callback" . ,callback)) t)
-  (when (eq (length lsp--question-queue) 1)
-    (lsp--process-question-queue)))
-
-(defun lsp--process-question-queue ()
-  "Take the first question from `lsp--question-queue', process it, then process
-the next question until the queue is empty."
-  (-let* (((&alist "question" "options" "callback") (car lsp--question-queue))
-          (answer (completing-read question options nil t)))
-    (pop lsp--question-queue)
-    (funcall callback answer)
-    (when lsp--question-queue
-      (lsp--process-question-queue))))
-
-(defun lsp--supports-buffer? (client)
-  (and
-   ;; both file and client remote or both local
-   (eq (---truthy? (file-remote-p (buffer-file-name)))
-       (---truthy? (lsp--client-remote? client)))
-
-   ;; activation function or major-mode match.
-   (if-let ((activation-fn (lsp--client-activation-fn client)))
-       (funcall activation-fn (buffer-file-name) major-mode)
-     (-contains? (lsp--client-major-modes client) major-mode))
-
-   ;; check whether it is enabled if `lsp-enabled-clients' is not null
-   (or (null lsp-enabled-clients)
-       (or (member (lsp--client-server-id client) lsp-enabled-clients)
-           (ignore (lsp--info "Client %s is not in lsp-enabled-clients"
-                              (lsp--client-server-id client)))))
-
-   ;; check whether it is not disabled.
-   (not (lsp--client-disabled-p major-mode (lsp--client-server-id client)))))
-
-(defun lsp--filter-clients (pred)
-  (->> lsp-clients hash-table-values (-filter pred)))
-
-(defun lsp--find-clients ()
-  "Find clients which can handle current buffer."
-  (-when-let (matching-clients (lsp--filter-clients (-andfn #'lsp--supports-buffer?
-                                                            #'lsp--server-binary-present?)))
-    (lsp-log "Found the following clients for %s: %s"
-             (buffer-file-name)
-             (s-join ", "
-                     (-map (lambda (client)
-                             (format "(server-id %s, priority %s)"
-                                     (lsp--client-server-id client)
-                                     (lsp--client-priority client)))
-                           matching-clients)))
-    (-let* (((add-on-clients main-clients) (-separate #'lsp--client-add-on? matching-clients))
-            (selected-clients (if-let ((main-client (and main-clients
-                                                         (--max-by (> (lsp--client-priority it)
-                                                                      (lsp--client-priority other))
-                                                                   main-clients))))
-                                  (cons main-client add-on-clients)
-                                add-on-clients)))
-      (lsp-log "The following clients were selected based on priority: %s"
-               (s-join ", "
-                       (-map (lambda (client)
-                               (format "(server-id %s, priority %s)"
-                                       (lsp--client-server-id client)
-                                       (lsp--client-priority client)))
-                             selected-clients)))
-      selected-clients)))
-
-(defun lsp-workspace-remove-all-folders()
-  "Delete all lsp tracked folders."
-  (interactive)
-  (--each (lsp-session-folders (lsp-session))
-    (lsp-workspace-folders-remove it)))
-
-(defun lsp-register-client (client)
-  "Registers LSP client CLIENT."
-  (let ((client-id (lsp--client-server-id client)))
-    (puthash client-id client lsp-clients)
-    (setplist (intern (format "lsp-%s-after-open-hook" client-id))
-              `( standard-value (nil) custom-type hook
-                 custom-package-version (lsp-mode . "7.0.1")
-                 variable-documentation ,(format "Hooks to run after `%s' server is run." client-id)
-                 custom-requests nil)))
-  (when (and lsp-auto-register-remote-clients
-             (not (lsp--client-remote? client)))
-    (let ((remote-client (copy-lsp--client client)))
-      (setf (lsp--client-remote? remote-client) t
-            (lsp--client-server-id remote-client) (intern
-                                                   (format "%s-tramp"
-                                                           (lsp--client-server-id client)))
-            ;; disable automatic download
-            (lsp--client-download-server-fn remote-client) nil)
-      (lsp-register-client remote-client))))
-
-(defun lsp--create-initialization-options (_session client)
-  "Create initialization-options from SESSION and CLIENT.
-Add workspace folders depending on server being multiroot and
-session workspace folder configuration for the server."
-  (let* ((initialization-options-or-fn (lsp--client-initialization-options client)))
-    (if (functionp initialization-options-or-fn)
-        (funcall initialization-options-or-fn)
-      initialization-options-or-fn)))
-
-(defvar lsp-client-settings (make-hash-table :test 'equal)
-  "For internal use, any external users please use
-  `lsp-register-custom-settings' function instead")
-
-(defun lsp-register-custom-settings (props)
-  "Register PROPS.
-PROPS is list of triple (path value boolean?) where PATH is the path to the
-property; VALUE can be a literal value, symbol to be evaluated, or either a
-function or lambda function to be called without arguments; BOOLEAN? is an
-optional flag that should be non-nil for boolean settings, when it is nil the
-property will be ignored if the VALUE is nil.
-
-Example: `(lsp-register-custom-settings `((\"foo.bar.buzz.enabled\" t t)))'
-\(note the double parentheses)"
-  (mapc
-   (-lambda ((path . rest))
-     (puthash path rest lsp-client-settings))
-   props))
-
-(defun lsp-region-text (region)
-  "Get the text for REGION in current buffer."
-  (-let (((start . end) (lsp--range-to-region region)))
-    (buffer-substring-no-properties start end)))
-
-(defun lsp-ht-set (tbl paths value)
-  "Set nested hash table value.
-TBL - a hash table, PATHS is the path to the nested VALUE."
-  (pcase paths
-    (`(,path) (ht-set! tbl path value))
-    (`(,path . ,rst) (let ((nested-tbl (or (gethash path tbl)
-                                           (let ((temp-tbl (ht)))
-                                             (ht-set! tbl path temp-tbl)
-                                             temp-tbl))))
-                       (lsp-ht-set nested-tbl rst value)))))
-
-;; sections
-
-(defalias 'defcustom-lsp 'lsp-defcustom)
-
-(defmacro lsp-defcustom (symbol standard doc &rest args)
-  "Defines `lsp-mode' server property."
-  (declare (doc-string 3) (debug (name body))
-           (indent defun))
-  (let ((path (plist-get args :lsp-path))
-        (setter (intern (concat (symbol-name symbol) "--set"))))
-    (cl-remf args :lsp-path)
-    `(progn
-       (lsp-register-custom-settings
-        (quote ((,path ,symbol ,(equal ''boolean (plist-get args :type))))))
-
-       (defcustom ,symbol ,standard ,doc ,@args)
-
-       ;; Use a variable watcher instead of registering a `defcustom'
-       ;; setter since `hack-local-variables' is not aware of custom
-       ;; setters and won't invoke them.
-
-       (defun ,setter (sym val op _where)
-         (when (eq op 'set)
-           (lsp--set-custom-property sym val ,path)))
-
-       (add-variable-watcher ',symbol #',setter))))
-
-(defun lsp--set-custom-property (sym val path)
-  (set sym val)
-  (let ((section (cl-first (s-split "\\." path))))
-    (mapc (lambda (workspace)
-            (when (-contains? (lsp--client-synchronize-sections (lsp--workspace-client workspace))
-                              section)
-              (with-lsp-workspace workspace
-                (lsp--set-configuration (lsp-configuration-section section)))))
-          (lsp--session-workspaces (lsp-session)))))
-
-(defun lsp-configuration-section (section)
-  "Get settings for SECTION."
-  (let ((ret (ht-create)))
-    (maphash (-lambda (path (variable boolean?))
-               (when (s-matches? (concat (regexp-quote section) "\\..*") path)
-                 (let* ((symbol-value (-> variable
-                                          lsp-resolve-value
-                                          lsp-resolve-value))
-                        (value (if (and boolean? (not symbol-value))
-                                   :json-false
-                                 symbol-value)))
-                   (when (or boolean? value)
-                     (lsp-ht-set ret (s-split "\\." path) value)))))
-             lsp-client-settings)
-    ret))
-
-
-(defun lsp--start-connection (session client project-root)
-  "Initiates connection created from CLIENT for PROJECT-ROOT.
-SESSION is the active session."
-  (when (lsp--client-multi-root client)
-    (cl-pushnew project-root (gethash (lsp--client-server-id client)
-                                      (lsp-session-server-id->folders session))))
-  (run-hook-with-args 'lsp-workspace-folders-changed-functions (list project-root) nil)
-
-  (unwind-protect
-      (lsp--start-workspace session client project-root (lsp--create-initialization-options session client))
-    (lsp--spinner-stop)))
-
-;; lsp-log-io-mode
-
-(defvar lsp-log-io-mode-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map (kbd "M-n") #'lsp-log-io-next)
-    (define-key map (kbd "M-p") #'lsp-log-io-prev)
-    (define-key map (kbd "k") #'lsp--erase-log-buffer)
-    (define-key map (kbd "K") #'lsp--erase-session-log-buffers)
-    map)
-  "Keymap for lsp log buffer mode.")
-
-(define-derived-mode lsp-log-io-mode special-mode "LspLogIo"
-  "Special mode for viewing IO logs.")
-
-(defun lsp-workspace-show-log (workspace)
-  "Display the log buffer of WORKSPACE."
-  (interactive
-   (list (if lsp-log-io
-             (if (eq (length (lsp-workspaces)) 1)
-                 (cl-first (lsp-workspaces))
-               (lsp--completing-read "Workspace: " (lsp-workspaces)
-                                     #'lsp--workspace-print nil t))
-           (user-error "IO logging is disabled"))))
-  (pop-to-buffer (lsp--get-log-buffer-create workspace)))
-
-(defalias 'lsp-switch-to-io-log-buffer 'lsp-workspace-show-log)
-
-(defun lsp--get-log-buffer-create (workspace)
-  "Return the lsp log buffer of WORKSPACE, creating a new one if needed."
-  (let* ((server-id (-> workspace lsp--workspace-client lsp--client-server-id symbol-name))
-         (pid (-> workspace lsp--workspace-cmd-proc lsp-process-id)))
-    (get-buffer-create (format "*lsp-log: %s:%s*" server-id pid))))
-
-(defun lsp--erase-log-buffer (&optional all)
-  "Delete contents of current lsp log buffer.
-When ALL is t, erase all log buffers of the running session."
-  (interactive)
-  (let* ((workspaces (lsp--session-workspaces (lsp-session)))
-         (current-log-buffer (current-buffer)))
-    (dolist (w workspaces)
-      (let ((b (lsp--get-log-buffer-create w)))
-        (when (or all (eq b current-log-buffer))
-          (with-current-buffer b
-            (let ((inhibit-read-only t))
-              (erase-buffer))))))))
-
-(defun lsp--erase-session-log-buffers ()
-  "Erase log buffers of the running session."
-  (interactive)
-  (lsp--erase-log-buffer t))
-
-(defun lsp-log-io-next (arg)
-  "Move to next log entry."
-  (interactive "P")
-  (ewoc-goto-next lsp--log-io-ewoc (or arg 1)))
-
-(defun lsp-log-io-prev (arg)
-  "Move to previous log entry."
-  (interactive "P")
-  (ewoc-goto-prev lsp--log-io-ewoc (or arg 1)))
-
-
-
-(cl-defmethod lsp-process-id ((process process))
-  (process-id process))
-
-(cl-defmethod lsp-process-name ((process process)) (process-name process))
-
-(cl-defmethod lsp-process-status ((process process)) (process-status process))
-
-(cl-defmethod lsp-process-kill ((process process))
-  (when (process-live-p process)
-    (kill-process process)))
-
-(cl-defmethod lsp-process-send ((process process) message)
-  (condition-case err
-      (process-send-string process (lsp--make-message message))
-    (error (lsp--error "Sending to process failed with the following error: %s"
-                       (error-message-string err)))))
-
-(cl-defmethod lsp-process-cleanup (process)
-  ;; Kill standard error buffer only if the process exited normally.
-  ;; Leave it intact otherwise for debugging purposes.
-  (let ((buffer (-> process process-name get-buffer)))
-    (when (and (eq (process-status process) 'exit)
-               (zerop (process-exit-status process))
-               (buffer-live-p buffer))
-      (kill-buffer buffer))))
-
-
-;; native JSONRPC
-
-(declare-function json-rpc "ext:json")
-(declare-function json-rpc-connection "ext:json")
-(declare-function json-rpc-send "ext:json")
-(declare-function json-rpc-shutdown "ext:json")
-(declare-function json-rpc-stderr "ext:json")
-(declare-function json-rpc-pid "ext:json")
-
-(defvar lsp-json-rpc-thread nil)
-(defvar lsp-json-rpc-queue nil)
-(defvar lsp-json-rpc-done nil)
-(defvar lsp-json-rpc-mutex (make-mutex))
-(defvar lsp-json-rpc-condition (make-condition-variable lsp-json-rpc-mutex))
-
-(defun lsp-json-rpc-process-queue ()
-  (while (not lsp-json-rpc-done)
-    (while lsp-json-rpc-queue
-      (-let (((proc . message) (pop lsp-json-rpc-queue)))
-        (json-rpc-send
-         proc message
-         :null-object nil
-         :false-object :json-false)))
-    (with-mutex lsp-json-rpc-mutex
-      (condition-wait lsp-json-rpc-condition))))
-
-(cl-defmethod lsp-process-id (process) (json-rpc-pid process))
-
-(cl-defmethod lsp-process-name (_process) "TBD")
-
-(cl-defmethod lsp-process-kill (process) (json-rpc-shutdown process))
-
-(cl-defmethod lsp-process-send (proc message)
-  (unless lsp-json-rpc-thread
-    (with-current-buffer (get-buffer-create " *json-rpc*")
-      (setq lsp-json-rpc-thread (make-thread #'lsp-json-rpc-process-queue "*json-rpc-queue*"))))
-
-  (with-mutex lsp-json-rpc-mutex
-    (setq lsp-json-rpc-queue (append lsp-json-rpc-queue
-                                     (list (cons proc message))))
-    (condition-notify lsp-json-rpc-condition)))
-
-(cl-defmethod lsp-process-cleanup (_proc))
-
-(defun lsp-json-rpc-connection (workspace command)
-  (let ((con (apply #'json-rpc-connection command))
-        (object-type (if lsp-use-plists 'plist 'hash-table)))
-    (with-current-buffer (get-buffer-create " *json-rpc*")
-      (make-thread
-       (lambda ()
-         (json-rpc
-          con
-          (lambda (result err done)
-            (run-with-timer
-             0.0
-             nil
-             (lambda ()
-               (cond
-                (result (lsp--parser-on-message result workspace))
-                (err (warn "Json parsing failed with the following error: %s" err))
-                (done (lsp--handle-process-exit workspace ""))))))
-          :object-type object-type
-          :null-object nil
-          :false-object nil))
-       "*json-rpc-connection*"))
-    (cons con con)))
-
-(defun lsp-json-rpc-stderr ()
-  (interactive)
-  (--when-let (pcase (lsp-workspaces)
-                (`nil (user-error "There are no active servers in the current buffer"))
-                (`(,workspace) workspace)
-                (workspaces (lsp--completing-read "Select server: "
-                                                  workspaces
-                                                  'lsp--workspace-print nil t)))
-    (let ((content (json-rpc-stderr (lsp--workspace-cmd-proc it)))
-          (buffer (format "*stderr-%s*" (lsp--workspace-print it)) ))
-      (with-current-buffer (get-buffer-create buffer)
-        (with-help-window buffer
-          (insert content))))))
-
-
-(defun lsp--workspace-print (workspace)
-  "Visual representation WORKSPACE."
-  (let* ((proc (lsp--workspace-cmd-proc workspace))
-         (status (lsp--workspace-status workspace))
-         (server-id (-> workspace lsp--workspace-client lsp--client-server-id symbol-name))
-         (pid (lsp-process-id proc)))
-
-    (if (eq 'initialized status)
-        (format "%s:%s" server-id pid)
-      (format "%s:%s/%s" server-id pid status))))
-
-(defun lsp--map-tree-widget (m)
-  "Build `tree-widget' from a hash-table or plist M."
-  (when (lsp-structure-p m)
-    (let (nodes)
-      (lsp-map (lambda (k v)
-                 (push `(tree-widget
-                         :tag ,(if (lsp-structure-p v)
-                                   (format "%s:" k)
-                                 (format "%s: %s" k
-                                         (propertize (format "%s" v)
-                                                     'face
-                                                     'font-lock-string-face)))
-                         :open t
-                         ,@(lsp--map-tree-widget v))
-                       nodes))
-               m)
-      nodes)))
-
-(defun lsp-buffer-name (buffer-id)
-  (if-let ((buffer-name (plist-get buffer-id :buffer-name)))
-      (funcall buffer-name buffer-id)
-    (buffer-name buffer-id)))
-
-(defun lsp--render-workspace (workspace)
-  "Tree node representation of WORKSPACE."
-  `(tree-widget :tag ,(lsp--workspace-print workspace)
-                :open t
-                (tree-widget :tag ,(propertize "Buffers" 'face 'font-lock-function-name-face)
-                             :open t
-                             ,@(->> workspace
-                                    (lsp--workspace-buffers)
-                                    (--map `(tree-widget
-                                             :tag ,(when (lsp-buffer-live-p it)
-                                                     (let ((buffer-name (lsp-buffer-name it)))
-                                                       (if (lsp-with-current-buffer it buffer-read-only)
-                                                           (propertize buffer-name 'face 'font-lock-constant-face)
-                                                         buffer-name)))))))
-                (tree-widget :tag ,(propertize "Capabilities" 'face 'font-lock-function-name-face)
-                             ,@(-> workspace lsp--workspace-server-capabilities lsp--map-tree-widget))))
-
-(define-derived-mode lsp-browser-mode special-mode "LspBrowser"
-  "Define mode for displaying lsp sessions."
-  (setq-local display-buffer-base-action '(nil . ((inhibit-same-window . t)))))
-
-(defun lsp-describe-session ()
-  "Describes current `lsp-session'."
-  (interactive)
-  (let ((session (lsp-session))
-        (buf (get-buffer-create "*lsp session*"))
-        (root (lsp-workspace-root)))
-    (with-current-buffer buf
-      (lsp-browser-mode)
-      (let ((inhibit-read-only t))
-        (erase-buffer)
-        (--each (lsp-session-folders session)
-          (widget-create
-           `(tree-widget
-             :tag ,(propertize it 'face 'font-lock-keyword-face)
-             :open t
-             ,@(->> session
-                    (lsp-session-folder->servers)
-                    (gethash it)
-                    (-map 'lsp--render-workspace)))))))
-    (pop-to-buffer buf)
-    (goto-char (point-min))
-    (cl-loop for tag = (widget-get (widget-get (widget-at) :node) :tag)
-             until (or (and root (string= tag root)) (eobp))
-             do (goto-char (next-overlay-change (point))))))
-
-(defun lsp--session-workspaces (session)
-  "Get all workspaces that are part of the SESSION."
-  (-> session lsp-session-folder->servers hash-table-values -flatten -uniq))
-
-(defun lsp--find-multiroot-workspace (session client project-root)
-  "Look for a multiroot connection in SESSION created from CLIENT for
-PROJECT-ROOT and BUFFER-MAJOR-MODE."
-  (when (lsp--client-multi-root client)
-    (-when-let (multi-root-workspace (->> session
-                                          (lsp--session-workspaces)
-                                          (--first (eq (-> it lsp--workspace-client lsp--client-server-id)
-                                                       (lsp--client-server-id client)))))
-      (with-lsp-workspace multi-root-workspace
-        (lsp-notify "workspace/didChangeWorkspaceFolders"
-                    (lsp-make-did-change-workspace-folders-params
-                     :event (lsp-make-workspace-folders-change-event
-                             :added (vector (lsp-make-workspace-folder
-                                             :uri (lsp--path-to-uri project-root)
-                                             :name (f-filename project-root)))
-                             :removed []))))
-
-      (->> session (lsp-session-folder->servers) (gethash project-root) (cl-pushnew multi-root-workspace))
-      (->> session (lsp-session-server-id->folders) (gethash (lsp--client-server-id client)) (cl-pushnew project-root))
-
-      (lsp--persist-session session)
-
-      (lsp--info "Opened folder %s in workspace %s" project-root (lsp--workspace-print multi-root-workspace))
-      (lsp--open-in-workspace multi-root-workspace)
-
-      multi-root-workspace)))
-
-(defun lsp--ensure-lsp-servers (session clients project-root ignore-multi-folder)
-  "Ensure that SESSION contain server CLIENTS created for PROJECT-ROOT.
-IGNORE-MULTI-FOLDER to ignore multi folder server."
-  (-map (lambda (client)
-          (or
-           (lsp--find-workspace session client project-root)
-           (unless ignore-multi-folder
-             (lsp--find-multiroot-workspace session client project-root))
-           (lsp--start-connection session client project-root)))
-        clients))
-
-(defun lsp--spinner-stop ()
-  "Stop the spinner in case all of the workspaces are started."
-  (when (--all? (eq (lsp--workspace-status it) 'initialized)
-                lsp--buffer-workspaces)
-    (spinner-stop)))
-
-(defun lsp--open-in-workspace (workspace)
-  "Open in existing WORKSPACE."
-  (if (eq 'initialized (lsp--workspace-status workspace))
-      ;; when workspace is initialized just call document did open.
-      (progn
-        (with-lsp-workspace workspace
-          (when-let ((before-document-open-fn (-> workspace
-                                                  lsp--workspace-client
-                                                  lsp--client-before-file-open-fn)))
-            (funcall before-document-open-fn workspace))
-          (lsp--text-document-did-open))
-        (lsp--spinner-stop))
-    ;; when it is not initialized
-    (lsp--spinner-start)
-    (cl-pushnew (lsp-current-buffer) (lsp--workspace-buffers workspace))))
-
-(defun lsp--find-workspace (session client project-root)
-  "Find server connection created with CLIENT in SESSION for PROJECT-ROOT."
-  (when-let ((workspace (->> session
-                             (lsp-session-folder->servers)
-                             (gethash project-root)
-                             (--first (eql (-> it lsp--workspace-client lsp--client-server-id)
-                                           (lsp--client-server-id client))))))
-    (lsp--open-in-workspace workspace)
-    workspace))
-
-(defun lsp--read-char (prompt &optional options)
-  "Wrapper for `read-char-from-minibuffer' if Emacs +27.
-Fallback to `read-key' otherwise.
-PROMPT is the message and OPTIONS the available options."
-  (if (fboundp 'read-char-from-minibuffer)
-      (read-char-from-minibuffer prompt options)
-    (read-key prompt)))
-
-(defun lsp--find-root-interactively (session)
-  "Find project interactively.
-Returns nil if the project should not be added to the current SESSION."
-  (condition-case nil
-      (let* ((project-root-suggestion (or (lsp--suggest-project-root) default-directory))
-             (action (lsp--read-char
-                      (format
-                       "%s is not part of any project.
-
-%s ==> Import project root %s
-%s ==> Import project by selecting root directory interactively
-%s ==> Import project at current directory %s
-%s ==> Do not ask again for the current project by adding %s to lsp-session-folders-blocklist
-%s ==> Do not ask again for the current project by selecting ignore path interactively
-%s ==> Do nothing: ask again when opening other files from the current project
-
-Select action: "
-                       (propertize (buffer-name) 'face 'bold)
-                       (propertize "i" 'face 'success)
-                       (propertize project-root-suggestion 'face 'bold)
-                       (propertize "I" 'face 'success)
-                       (propertize "." 'face 'success)
-                       (propertize default-directory 'face 'bold)
-                       (propertize "d" 'face 'warning)
-                       (propertize project-root-suggestion 'face 'bold)
-                       (propertize "D" 'face 'warning)
-                       (propertize "n" 'face 'warning))
-                      '(?i ?\r ?I ?. ?d ?D ?n))))
-        (cl-case action
-          (?i project-root-suggestion)
-          (?\r project-root-suggestion)
-          (?I (read-directory-name "Select workspace folder to add: "
-                                   (or project-root-suggestion default-directory)
-                                   nil
-                                   t))
-          (?. default-directory)
-          (?d (push project-root-suggestion (lsp-session-folders-blocklist session))
-              (lsp--persist-session session)
-              nil)
-          (?D (push (read-directory-name "Select folder to blocklist: "
-                                         (or project-root-suggestion default-directory)
-                                         nil
-                                         t)
-                    (lsp-session-folders-blocklist session))
-              (lsp--persist-session session)
-              nil)
-          (t nil)))
-    (quit)))
-
-(declare-function tramp-file-name-host "ext:tramp" (file) t)
-(declare-function tramp-dissect-file-name "ext:tramp" (file &optional nodefault))
-
-(defun lsp--files-same-host (f1 f2)
-  "Predicate on whether or not two files are on the same host."
-  (or (not (or (file-remote-p f1) (file-remote-p f2)))
-      (and (file-remote-p f1)
-           (file-remote-p f2)
-           (progn (require 'tramp)
-                  (equal (tramp-file-name-host (tramp-dissect-file-name f1))
-                         (tramp-file-name-host (tramp-dissect-file-name f2)))))))
-
-(defun lsp-find-session-folder (session file-name)
-  "Look in the current SESSION for folder containing FILE-NAME."
-  (let ((file-name-canonical (lsp-f-canonical file-name)))
-    (->> session
-         (lsp-session-folders)
-         (--filter (and (lsp--files-same-host it file-name-canonical)
-                        (or (lsp-f-same? it file-name-canonical)
-                            (and (f-dir? it)
-                                 (lsp-f-ancestor-of? it file-name-canonical)))))
-         (--max-by (> (length it)
-                      (length other))))))
-
-(defun lsp-find-workspace (server-id &optional file-name)
-  "Find workspace for SERVER-ID for FILE-NAME."
-  (-when-let* ((session (lsp-session))
-               (folder->servers (lsp-session-folder->servers session))
-               (workspaces (if file-name
-                               (gethash (lsp-find-session-folder session file-name) folder->servers)
-                             (lsp--session-workspaces session))))
-
-    (--first (eq (lsp--client-server-id (lsp--workspace-client it)) server-id) workspaces)))
-
-(defun lsp--calculate-root (session file-name)
-  "Calculate project root for FILE-NAME in SESSION."
-  (and
-   (->> session
-        (lsp-session-folders-blocklist)
-        (--first (and (lsp--files-same-host it file-name)
-                      (lsp-f-ancestor-of? it file-name)
-                      (prog1 t
-                        (lsp--info "File %s is in blocklisted directory %s" file-name it))))
-        not)
-   (or
-    (when lsp-auto-guess-root
-      (lsp--suggest-project-root))
-    (unless lsp-guess-root-without-session
-      (lsp-find-session-folder session file-name))
-    (unless lsp-auto-guess-root
-      (when-let ((root-folder (lsp--find-root-interactively session)))
-        (if (or (not (f-equal? root-folder (expand-file-name "~/")))
-                (yes-or-no-p
-                 (concat
-                  (propertize "[WARNING] " 'face 'warning)
-                  "You are trying to import your home folder as project root. This may cause performance issue because some language servers (python, lua, etc) will try to scan all files under project root. To avoid that you may:
-
-1. Use `I' option from the interactive project import to select subfolder(e. g. `~/foo/bar' instead of `~/').
-2. If your file is under `~/' then create a subfolder and move that file in this folder.
-
-Type `No' to go back to project selection.
-Type `Yes' to confirm `HOME' as project root.
-Type `C-g' to cancel project import process and stop `lsp'")))
-            root-folder
-          (lsp--calculate-root session file-name)))))))
-
-(defun lsp--try-open-in-library-workspace ()
-  "Try opening current file as library file in any of the active workspace.
-The library folders are defined by each client for each of the active workspace."
-  (when-let ((workspace (->> (lsp-session)
-                             (lsp--session-workspaces)
-                             ;; Sort the last active workspaces first as they are more likely to be
-                             ;; the correct ones, especially when jumping to a definition.
-                             (-sort (lambda (a _b)
-                                      (-contains? lsp--last-active-workspaces a)))
-                             (--first
-                              (and (-> it lsp--workspace-client lsp--supports-buffer?)
-                                   (when-let ((library-folders-fn
-                                               (-> it lsp--workspace-client lsp--client-library-folders-fn)))
-                                     (-first (lambda (library-folder)
-                                               (lsp-f-ancestor-of? library-folder (buffer-file-name)))
-                                             (funcall library-folders-fn it))))))))
-    (lsp--open-in-workspace workspace)
-    (view-mode t)
-    (lsp--info "Opening read-only library file %s." (buffer-file-name))
-    (list workspace)))
-
-(defun lsp--persist-session (session)
-  "Persist SESSION to `lsp-session-file'."
-  (lsp--persist lsp-session-file (make-lsp-session
-                                  :folders (lsp-session-folders session)
-                                  :folders-blocklist (lsp-session-folders-blocklist session)
-                                  :server-id->folders (lsp-session-server-id->folders session))))
-
-(defun lsp--try-project-root-workspaces (ask-for-client ignore-multi-folder)
-  "Try create opening file as a project file.
-When IGNORE-MULTI-FOLDER is t the lsp mode will start new
-language server even if there is language server which can handle
-current language. When IGNORE-MULTI-FOLDER is nil current file
-will be opened in multi folder language server if there is
-such."
-  (-let ((session (lsp-session)))
-    (-if-let (clients (if ask-for-client
-                          (list (lsp--completing-read "Select server to start: "
-                                                      (ht-values lsp-clients)
-                                                      (-compose 'symbol-name 'lsp--client-server-id) nil t))
-                        (lsp--find-clients)))
-        (-if-let (project-root (-some-> session
-                                 (lsp--calculate-root (buffer-file-name))
-                                 (lsp-f-canonical)))
-            (progn
-              ;; update project roots if needed and persist the lsp session
-              (unless (-contains? (lsp-session-folders session) project-root)
-                (cl-pushnew project-root (lsp-session-folders session))
-                (lsp--persist-session session))
-              (lsp--ensure-lsp-servers session clients project-root ignore-multi-folder))
-          (lsp--warn "%s not in project or it is blocklisted." (buffer-name))
-          nil)
-      (lsp--warn "No LSP server for %s(check *lsp-log*)." major-mode)
-      nil)))
-
-(defun lsp-shutdown-workspace ()
-  "Shutdown language server."
-  (interactive)
-  (--when-let (pcase (lsp-workspaces)
-                (`nil (user-error "There are no active servers in the current buffer"))
-                (`(,workspace) (when (y-or-n-p (format "Are you sure you want to stop the server %s?"
-                                                       (lsp--workspace-print workspace)))
-                                 workspace))
-                (workspaces (lsp--completing-read "Select server: "
-                                                  workspaces
-                                                  'lsp--workspace-print nil t)))
-    (lsp-workspace-shutdown it)))
-
-(make-obsolete 'lsp-shutdown-workspace 'lsp-workspace-shutdown "lsp-mode 6.1")
-
-(defcustom lsp-auto-select-workspace t
-  "Shutdown or restart a single workspace.
-If set and the current buffer has only a single workspace
-associated with it, `lsp-shutdown-workspace' and
-`lsp-restart-workspace' will act on it without asking."
-  :type 'boolean
-  :group 'lsp-mode)
-
-(defun lsp--read-workspace ()
-  "Ask the user to select a workspace.
-Errors if there are none."
-  (pcase (lsp-workspaces)
-    (`nil (error "No workspaces associated with the current buffer"))
-    ((and `(,workspace) (guard lsp-auto-select-workspace)) workspace)
-    (workspaces (lsp--completing-read "Select workspace: " workspaces
-                                      #'lsp--workspace-print nil t))))
-
-(defun lsp-workspace-shutdown (workspace)
-  "Shut the workspace WORKSPACE and the language server associated with it"
-  (interactive (list (lsp--read-workspace)))
-  (lsp--warn "Stopping %s" (lsp--workspace-print workspace))
-  (with-lsp-workspace workspace (lsp--shutdown-workspace)))
-
-(defun lsp-disconnect ()
-  "Disconnect the buffer from the language server."
-  (interactive)
-  (lsp--text-document-did-close t)
-  (lsp-managed-mode -1)
-  (lsp-mode -1)
-  (setq lsp--buffer-workspaces nil)
-  (lsp--info "Disconnected"))
-
-(defun lsp-restart-workspace ()
-  (interactive)
-  (--when-let (pcase (lsp-workspaces)
-                (`nil (user-error "There are no active servers in the current buffer"))
-                (`(,workspace) workspace)
-                (workspaces (lsp--completing-read "Select server: "
-                                                  workspaces
-                                                  'lsp--workspace-print nil t)))
-    (lsp-workspace-restart it)))
-
-(make-obsolete 'lsp-restart-workspace 'lsp-workspace-restart "lsp-mode 6.1")
-
-(defun lsp-workspace-restart (workspace)
-  "Restart the workspace WORKSPACE and the language server associated with it"
-  (interactive (list (lsp--read-workspace)))
-  (lsp--warn "Restarting %s" (lsp--workspace-print workspace))
-  (with-lsp-workspace workspace (lsp--shutdown-workspace t)))
-
-;;;###autoload
-(defun lsp (&optional arg)
-  "Entry point for the server startup.
-When ARG is t the lsp mode will start new language server even if
-there is language server which can handle current language. When
-ARG is nil current file will be opened in multi folder language
-server if there is such. When `lsp' is called with prefix
-argument ask the user to select which language server to start."
-  (interactive "P")
-
-  (lsp--require-packages)
-
-  (when (buffer-file-name)
-    (let (clients
-          (matching-clients (lsp--filter-clients
-                             (-andfn #'lsp--supports-buffer?
-                                     #'lsp--server-binary-present?))))
-      (cond
-       (matching-clients
-        (when (setq lsp--buffer-workspaces
-                    (or (and
-                         ;; Don't open as library file if file is part of a project.
-                         (not (lsp-find-session-folder (lsp-session) (buffer-file-name)))
-                         (lsp--try-open-in-library-workspace))
-                        (lsp--try-project-root-workspaces (equal arg '(4))
-                                                          (and arg (not (equal arg 1))))))
-          (lsp-mode 1)
-          (when lsp-auto-configure (lsp--auto-configure))
-          (setq lsp-buffer-uri (lsp--buffer-uri))
-          (lsp--info "Connected to %s."
-                     (apply 'concat (--map (format "[%s %s]"
-                                                   (lsp--workspace-print it)
-                                                   (lsp--workspace-root it))
-                                           lsp--buffer-workspaces)))))
-       ;; look for servers which are currently being downloaded.
-       ((setq clients (lsp--filter-clients (-andfn #'lsp--supports-buffer?
-                                                   #'lsp--client-download-in-progress?)))
-        (lsp--info "There are language server(%s) installation in progress.
-The server(s) will be started in the buffer when it has finished."
-                   (-map #'lsp--client-server-id clients))
-        (seq-do (lambda (client)
-                  (cl-pushnew (current-buffer) (lsp--client-buffers client)))
-                clients))
-       ;; look for servers to install
-       ((setq clients (lsp--filter-clients
-                       (-andfn #'lsp--supports-buffer?
-                               (-const lsp-enable-suggest-server-download)
-                               #'lsp--client-download-server-fn
-                               (-not #'lsp--client-download-in-progress?))))
-        (let ((client (lsp--completing-read
-                       (concat "Unable to find installed server supporting this file. "
-                               "The following servers could be installed automatically: ")
-                       clients
-                       (-compose #'symbol-name #'lsp--client-server-id)
-                       nil
-                       t)))
-          (cl-pushnew (current-buffer) (lsp--client-buffers client))
-          (lsp--install-server-internal client)))
-       ;; ignore other warnings
-       ((not lsp-warn-no-matched-clients)
-        nil)
-       ;; automatic installation disabled
-       ((setq clients (unless matching-clients
-                        (lsp--filter-clients (-andfn #'lsp--supports-buffer?
-                                                     #'lsp--client-download-server-fn
-                                                     (-not (-const lsp-enable-suggest-server-download))
-                                                     (-not #'lsp--server-binary-present?)))))
-        (lsp--warn "The following servers support current file but automatic download is disabled: %s
-\(If you have already installed the server check *lsp-log*)."
-                   (mapconcat (lambda (client)
-                                (symbol-name (lsp--client-server-id client)))
-                              clients
-                              " ")))
-       ;; no clients present
-       ((setq clients (unless matching-clients
-                        (lsp--filter-clients (-andfn #'lsp--supports-buffer?
-                                                     (-not #'lsp--server-binary-present?)))))
-        (lsp--warn "The following servers support current file but do not have automatic installation: %s
-You may find the installation instructions at https://emacs-lsp.github.io/lsp-mode/page/languages.
-\(If you have already installed the server check *lsp-log*)."
-                   (mapconcat (lambda (client)
-                                (symbol-name (lsp--client-server-id client)))
-                              clients
-                              " ")))
-       ;; no matches
-       ((-> #'lsp--supports-buffer? lsp--filter-clients not)
-        (lsp--error "There are no language servers supporting current mode `%s' registered with `lsp-mode'.
-This issue might be caused by:
-1. The language you are trying to use does not have built-in support in `lsp-mode'. You must install the required support manually. Examples of this are `lsp-java' or `lsp-metals'.
-2. The language server that you expect to run is not configured to run for major mode `%s'. You may check that by checking the `:major-modes' that are passed to `lsp-register-client'.
-3. `lsp-mode' doesn't have any integration for the language behind `%s'. Refer to https://emacs-lsp.github.io/lsp-mode/page/languages and https://langserver.org/ .
-4. You are over `tramp'. In this case follow https://emacs-lsp.github.io/lsp-mode/page/remote/.
-5. You have disabled the `lsp-mode' clients for that file. (Check `lsp-enabled-clients' and `lsp-disabled-clients').
-You can customize `lsp-warn-no-matched-clients' to disable this message."
-                    major-mode major-mode major-mode))))))
-
-(defun lsp--buffer-visible-p ()
-  "Return non nil if current buffer is visible."
-  (or (buffer-modified-p) (get-buffer-window nil t)))
-
-(defun lsp--init-if-visible ()
-  "Run `lsp' for the current buffer if the buffer is visible.
-Returns non nil if `lsp' was run for the buffer."
-  (when (lsp--buffer-visible-p)
-    (remove-hook 'window-configuration-change-hook #'lsp--init-if-visible t)
-    (lsp)
-    t))
-
-;;;###autoload
-(defun lsp-deferred ()
-  "Entry point that defers server startup until buffer is visible.
-`lsp-deferred' will wait until the buffer is visible before invoking `lsp'.
-This avoids overloading the server with many files when starting Emacs."
-  ;; Workspace may not be initialized yet. Use a buffer local variable to
-  ;; remember that we deferred loading of this buffer.
-  (setq lsp--buffer-deferred t)
-  (let ((buffer (current-buffer)))
-    ;; Avoid false positives as desktop-mode restores buffers by deferring
-    ;; visibility check until the stack clears.
-    (run-with-idle-timer 0 nil (lambda ()
-                                 (when (buffer-live-p buffer)
-                                   (with-current-buffer buffer
-                                     (unless (lsp--init-if-visible)
-                                       (add-hook 'window-configuration-change-hook #'lsp--init-if-visible nil t))))))))
-
-
-
-(defvar lsp-file-truename-cache (ht))
-
-(defmacro lsp-with-cached-filetrue-name (&rest body)
-  "Executes BODY caching the `file-truename' calls."
-  `(let ((old-fn (symbol-function 'file-truename)))
-     (unwind-protect
-         (progn
-           (fset 'file-truename
-                 (lambda (file-name &optional counter prev-dirs)
-                   (or (gethash file-name lsp-file-truename-cache)
-                       (puthash file-name (apply old-fn (list file-name counter prev-dirs))
-                                lsp-file-truename-cache))))
-           ,@body)
-       (fset 'file-truename old-fn))))
-
-
-(defun lsp-virtual-buffer-call (key &rest args)
-  (when lsp--virtual-buffer
-    (when-let ((fn (plist-get lsp--virtual-buffer key)))
-      (apply fn args))))
-
-(defun lsp-translate-column (column)
-  "Translate COLUMN taking into account virtual buffers."
-  (or (lsp-virtual-buffer-call :real->virtual-char column)
-      column))
-
-(defun lsp-translate-line (line)
-  "Translate LINE taking into account virtual buffers."
-  (or (lsp-virtual-buffer-call :real->virtual-line line)
-      line))
-
-
-;; lsp internal validation.
-
-(defmacro lsp--doctor (&rest checks)
-  `(-let [buf (current-buffer)]
-     (with-current-buffer (get-buffer-create "*lsp-performance*")
-       (with-help-window (current-buffer)
-         ,@(-map (-lambda ((msg form))
-                   `(insert (format "%s: %s\n" ,msg
-                                    (let ((res (with-current-buffer buf
-                                                 ,form)))
-                                      (cond
-                                       ((eq res :optional) (propertize "OPTIONAL" 'face 'warning))
-                                       (res (propertize "OK" 'face 'success))
-                                       (t (propertize "ERROR" 'face 'error)))))))
-                 (-partition 2 checks))))))
-
-(define-obsolete-function-alias 'lsp-diagnose
-  'lsp-doctor "lsp-mode 8.0.0")
-
-(defun lsp-doctor ()
-  "Validate performance settings."
-  (interactive)
-  (lsp--doctor
-   "Checking for Native JSON support" (functionp 'json-serialize)
-   "Check emacs supports `read-process-output-max'" (boundp 'read-process-output-max)
-   "Check `read-process-output-max' default has been changed from 4k"
-   (and (boundp 'read-process-output-max)
-        (> read-process-output-max 4096))
-   "Byte compiled against Native JSON (recompile lsp-mode if failing when Native JSON available)"
-   (condition-case _err
-       (progn (lsp--make-message (list "a" "b"))
-              nil)
-     (error t))
-   "`gc-cons-threshold' increased?" (> gc-cons-threshold 800000)
-   "Using `plist' for deserialized objects? (refer to https://emacs-lsp.github.io/lsp-mode/page/performance/#use-plists-for-deserialization)" (or lsp-use-plists :optional)
-   "Using emacs 28+ with native compilation?"
-   (or (and (fboundp 'native-comp-available-p)
-            (native-comp-available-p))
-       :optional)))
-
-(declare-function package-version-join "ext:package")
-(declare-function package-desc-version "ext:package")
-(declare-function package--alist "ext:package")
-
-(defun lsp-version ()
-  "Return string describing current version of `lsp-mode'."
-  (interactive)
-  (unless (featurep 'package)
-    (require 'package))
-  (let ((ver (format "lsp-mode %s, Emacs %s, %s"
-                     (package-version-join
-                      (package-desc-version
-                       (car (alist-get 'lsp-mode (package--alist)))))
-                     emacs-version
-                     system-type)))
-    (if (called-interactively-p 'interactive)
-        (lsp--info "%s" ver)
-      ver)))
-
-
-
-;; org-mode/virtual-buffer
-
-(declare-function org-babel-get-src-block-info "ext:ob-core")
-(declare-function org-do-remove-indentation "ext:org-macs")
-(declare-function org-src-get-lang-mode "ext:org-src")
-(declare-function org-element-context "ext:org-element")
-
-(defun lsp--virtual-buffer-update-position ()
-  (-if-let (virtual-buffer (-first (-lambda ((&plist :in-range))
-                                     (funcall in-range))
-                                   lsp--virtual-buffer-connections))
-      (unless (equal virtual-buffer lsp--virtual-buffer)
-        (lsp-org))
-    (when lsp-managed-mode
-      (lsp-managed-mode -1)
-      (lsp-mode -1)
-      (setq lsp--buffer-workspaces nil)
-      (setq lsp--virtual-buffer nil)
-      (setq lsp-buffer-uri nil)
-
-      ;; force refresh of diagnostics
-      (run-hooks 'lsp-after-diagnostics-hook))))
-
-(defun lsp-virtual-buffer-on-change (start end length)
-  "Adjust on change event to be executed against the proper language server."
-  (let ((max-point (max end
-                        (or (plist-get lsp--before-change-vals :end) 0)
-                        (+ start length))))
-    (when-let ((virtual-buffer (-first (lambda (vb)
-                                         (let ((lsp--virtual-buffer vb))
-                                           (and (lsp-virtual-buffer-call :in-range start)
-                                                (lsp-virtual-buffer-call :in-range max-point))))
-                                       lsp--virtual-buffer-connections)))
-      (lsp-with-current-buffer virtual-buffer
-        (lsp-on-change start end length
-                       (lambda (&rest _)
-                         (list :range (lsp--range (list :character 0 :line 0)
-                                                  lsp--virtual-buffer-point-max)
-                               :text (lsp--buffer-content))))))))
-
-(defun lsp-virtual-buffer-before-change (start _end)
-  (when-let ((virtual-buffer (-first (lambda (vb)
-                                       (lsp-with-current-buffer vb
-                                         (lsp-virtual-buffer-call :in-range start)))
-                                     lsp--virtual-buffer-connections)))
-    (lsp-with-current-buffer virtual-buffer
-      (setq lsp--virtual-buffer-point-max
-            (lsp--point-to-position (lsp-virtual-buffer-call :last-point))))))
-
-(defun lsp-patch-on-change-event ()
-  (remove-hook 'after-change-functions #'lsp-on-change t)
-  (add-hook 'after-change-functions #'lsp-virtual-buffer-on-change nil t)
-  (add-hook 'before-change-functions #'lsp-virtual-buffer-before-change nil t))
-
-(defun lsp-kill-virtual-buffers ()
-  (mapc #'lsp-virtual-buffer-disconnect lsp--virtual-buffer-connections))
-
-(defun lsp--move-point-in-indentation (point indentation)
-  (save-excursion
-    (goto-char point)
-    (if (<= point (+ (line-beginning-position) indentation))
-        (line-beginning-position)
-      point)))
-
-(declare-function flycheck-checker-supports-major-mode-p "ext:flycheck")
-(declare-function flycheck-add-mode "ext:flycheck")
-(declare-function lsp-diagnostics-lsp-checker-if-needed "lsp-diagnostics")
-
-(defalias 'lsp-client-download-server-fn 'lsp--client-download-server-fn)
-
-(defun lsp-flycheck-add-mode (mode)
-  "Register flycheck support for MODE."
-  (lsp-diagnostics-lsp-checker-if-needed)
-  (unless (flycheck-checker-supports-major-mode-p 'lsp mode)
-    (flycheck-add-mode 'lsp mode)))
-
-(defun lsp-progress-spinner-type ()
-  "Retrieve the spinner type value, if value is not a symbol of `spinner-types
-defaults to `progress-bar."
-  (or (car (assoc lsp-progress-spinner-type spinner-types)) 'progress-bar))
-
-(defun lsp-org ()
-  (interactive)
-  (-if-let ((virtual-buffer &as &plist :workspaces) (-first (-lambda ((&plist :in-range))
-                                                              (funcall in-range))
-                                                            lsp--virtual-buffer-connections))
-      (unless (equal lsp--virtual-buffer virtual-buffer)
-        (setq lsp--buffer-workspaces workspaces)
-        (setq lsp--virtual-buffer virtual-buffer)
-        (setq lsp-buffer-uri nil)
-        (lsp-mode 1)
-        (lsp-managed-mode 1)
-        (lsp-patch-on-change-event))
-
-    (save-excursion
-      (-let* (virtual-buffer
-              (wcb (lambda (f)
-                     (with-current-buffer (plist-get virtual-buffer :buffer)
-                       (-let* (((&plist :major-mode :buffer-file-name
-                                        :goto-buffer :workspaces) virtual-buffer)
-                               (lsp--virtual-buffer virtual-buffer)
-                               (lsp--buffer-workspaces workspaces))
-                         (save-excursion
-                           (funcall goto-buffer)
-                           (funcall f))))))
-              ((&plist :begin :end :post-blank :language) (cl-second (org-element-context)))
-              ((&alist :tangle file-name) (cl-third (org-babel-get-src-block-info 'light)))
-
-              (file-name (if file-name
-                             (f-expand file-name)
-                           (user-error "You should specify file name in the src block header.")))
-              (begin-marker (progn
-                              (goto-char begin)
-                              (forward-line)
-                              (set-marker (make-marker) (point))))
-              (end-marker (progn
-                            (goto-char end)
-                            (forward-line (1- (- post-blank)))
-                            (set-marker (make-marker) (1+ (point)))))
-              (buf (current-buffer))
-              (src-block (buffer-substring-no-properties begin-marker
-                                                         (1- end-marker)))
-              (indentation (with-temp-buffer
-                             (insert src-block)
-
-                             (goto-char (point-min))
-                             (let ((indentation (current-indentation)))
-                               (plist-put lsp--virtual-buffer :indentation indentation)
-                               (org-do-remove-indentation)
-                               (goto-char (point-min))
-                               (- indentation (current-indentation))))))
-        (add-hook 'post-command-hook #'lsp--virtual-buffer-update-position nil t)
-
-        (when (fboundp 'flycheck-add-mode)
-          (lsp-flycheck-add-mode 'org-mode))
-
-        (setq lsp--virtual-buffer
-              (list
-               :in-range (lambda (&optional point)
-                           (<= begin-marker (or point (point)) (1- end-marker)))
-               :goto-buffer (lambda () (goto-char begin-marker))
-               :buffer-string
-               (lambda ()
-                 (let ((src-block (buffer-substring-no-properties
-                                   begin-marker
-                                   (1- end-marker))))
-                   (with-temp-buffer
-                     (insert src-block)
-
-                     (goto-char (point-min))
-                     (while (not (eobp))
-                       (delete-region (point) (if (> (+ (point) indentation) (line-end-position))
-                                                  (line-end-position)
-                                                (+ (point) indentation)))
-                       (forward-line))
-                     (buffer-substring-no-properties (point-min)
-                                                     (point-max)))))
-               :buffer buf
-               :begin begin-marker
-               :end end-marker
-               :indentation indentation
-               :last-point (lambda () (1- end-marker))
-               :cur-position (lambda ()
-                               (lsp-save-restriction-and-excursion
-                                 (list :line (- (lsp--cur-line)
-                                                (lsp--cur-line begin-marker))
-                                       :character (let ((character (- (point)
-                                                                      (line-beginning-position)
-                                                                      indentation)))
-                                                    (if (< character 0)
-                                                        0
-                                                      character)))))
-               :line/character->point (-lambda (line character)
-                                        (-let [inhibit-field-text-motion t]
-                                          (+ indentation
-                                             (lsp-save-restriction-and-excursion
-                                               (goto-char begin-marker)
-                                               (forward-line line)
-                                               (-let [line-end (line-end-position)]
-                                                 (if (> character (- line-end (point)))
-                                                     line-end
-                                                   (forward-char character)
-                                                   (point)))))))
-               :major-mode (org-src-get-lang-mode language)
-               :buffer-file-name file-name
-               :buffer-uri (lsp--path-to-uri file-name)
-               :with-current-buffer wcb
-               :buffer-live? (lambda (_) (buffer-live-p buf))
-               :buffer-name (lambda (_)
-                              (propertize (format "%s(%s:%s)%s"
-                                                  (buffer-name buf)
-                                                  begin-marker
-                                                  end-marker
-                                                  language)
-                                          'face 'italic))
-               :real->virtual-line (lambda (line)
-                                     (+ line (line-number-at-pos begin-marker) -1))
-               :real->virtual-char (lambda (char) (+ char indentation))
-               :cleanup (lambda ()
-                          (set-marker begin-marker nil)
-                          (set-marker end-marker nil))))
-        (setf virtual-buffer lsp--virtual-buffer)
-        (puthash file-name virtual-buffer lsp--virtual-buffer-mappings)
-        (push virtual-buffer lsp--virtual-buffer-connections)
-
-        ;; TODO: tangle only connected sections
-        (add-hook 'after-save-hook 'org-babel-tangle nil t)
-        (add-hook 'lsp-after-open-hook #'lsp-patch-on-change-event nil t)
-        (add-hook 'kill-buffer-hook #'lsp-kill-virtual-buffers nil t)
-
-        (setq lsp--buffer-workspaces
-              (lsp-with-current-buffer virtual-buffer
-                (lsp)
-                (plist-put virtual-buffer :workspaces (lsp-workspaces))
-                (lsp-workspaces)))))))
-
-(defun lsp-virtual-buffer-disconnect (virtual-buffer)
-  (interactive (list (or
-                      lsp--virtual-buffer
-                      (when lsp--virtual-buffer-connections
-                        (lsp--completing-read "Select virtual buffer to disconnect: "
-                                              lsp--virtual-buffer-connections
-                                              (-lambda ((&plist :buffer-file-name))
-                                                buffer-file-name))))))
-  (-if-let ((&plist :buffer-file-name file-name :cleanup) virtual-buffer)
-      (progn
-        (lsp-with-current-buffer virtual-buffer
-          (lsp--text-document-did-close))
-        (setq lsp--virtual-buffer-connections (-remove-item virtual-buffer lsp--virtual-buffer-connections))
-        (when (eq virtual-buffer lsp--virtual-buffer)
-          (setf lsp--virtual-buffer nil))
-        (when cleanup (funcall cleanup))
-        (remhash file-name lsp--virtual-buffer-mappings)
-
-        (lsp--virtual-buffer-update-position)
-        (lsp--info "Disconnected from buffer %s" file-name))
-    (lsp--error "Nothing to disconnect from?")))
-
-
-;; inlay hints
-
-(defface lsp-inlay-hint-face
-  '((t :inherit font-lock-comment-face))
-  "The face to use for the JavaScript inlays."
-  :group 'lsp-mode
-  :package-version '(lsp-mode . "9.0.0"))
-
-(defface lsp-inlay-hint-type-face
-  '((t :inherit lsp-inlay-hint-face))
-  "Face for inlay type hints (e.g. inferred variable types)."
-  :group 'lsp-mode
-  :package-version '(lsp-mode . "9.0.0"))
-
-(defcustom lsp-inlay-hint-type-format "%s"
-  "Format string for variable inlays (part of the inlay face)."
-  :type '(string :tag "String")
-  :group 'lsp-mode
-  :package-version '(lsp-mode . "9.0.0"))
-
-(defface lsp-inlay-hint-parameter-face
-  '((t :inherit lsp-inlay-hint-face))
-  "Face for inlay parameter hints (e.g. function parameter names at
-call-site)."
-  :group 'lsp-mode
-  :package-version '(lsp-mode . "9.0.0"))
-
-(defcustom lsp-inlay-hint-param-format "%s"
-  "Format string for parameter inlays (part of the inlay face)."
-  :type '(string :tag "String")
-  :group 'lsp-mode
-  :package-version '(lsp-mode . "9.0.0"))
-
-(defcustom lsp-update-inlay-hints-on-scroll t
-  "If non-nil update inlay hints immediately when scrolling or
-modifying window sizes."
-  :type 'boolean
-  :package-version '(lsp-mode . "9.0.0"))
-
-(defun lsp--format-inlay (text kind)
-  (cond
-   ((eql kind lsp/inlay-hint-kind-type-hint) (format lsp-inlay-hint-type-format text))
-   ((eql kind lsp/inlay-hint-kind-parameter-hint) (format lsp-inlay-hint-param-format text))
-   (t text)))
-
-(defun lsp--face-for-inlay (kind)
-  (cond
-   ((eql kind lsp/inlay-hint-kind-type-hint) 'lsp-inlay-hint-type-face)
-   ((eql kind lsp/inlay-hint-kind-parameter-hint) 'lsp-inlay-hint-parameter-face)
-   (t 'lsp-inlay-hint-face)))
-
-(defun lsp--update-inlay-hints-scroll-function (window start)
-  (lsp-update-inlay-hints start (window-end window t)))
-
-(defun lsp--update-inlay-hints ()
-  (lsp-update-inlay-hints (window-start) (window-end nil t)))
-
-(defun lsp--label-from-inlay-hints-response (label)
-  "Returns a string label built from an array of
-InlayHintLabelParts or the argument itself if it's already a
-string."
-  (cl-typecase label
-    (string label)
-    (vector
-     (string-join (mapcar (lambda (part)
-                            (-let (((&InlayHintLabelPart :value) part))
-                              value))
-                          label)))))
-
-(defun lsp-update-inlay-hints (start end)
-  (lsp-request-async
-   "textDocument/inlayHint"
-   (lsp-make-inlay-hints-params
-    :text-document (lsp--text-document-identifier)
-    :range (lsp-make-range :start
-                           (lsp-point-to-position start)
-                           :end
-                           (lsp-point-to-position end)))
-   (lambda (res)
-     (lsp--remove-overlays 'lsp-inlay-hint)
-     (dolist (hint res)
-       (-let* (((&InlayHint :label :position :kind? :padding-left? :padding-right?) hint)
-               (kind (or kind? lsp/inlay-hint-kind-type-hint))
-               (label (lsp--label-from-inlay-hints-response label))
-               (pos (lsp--position-to-point position))
-               (overlay (make-overlay pos pos nil 'front-advance 'end-advance)))
-         (when (stringp label)
-           (overlay-put overlay 'lsp-inlay-hint t)
-           (overlay-put overlay 'before-string
-                        (format "%s%s%s"
-                                (if padding-left? " " "")
-                                (propertize (lsp--format-inlay label kind)
-                                            'font-lock-face (lsp--face-for-inlay kind))
-                                (if padding-right? " " "")))))))
-   :mode 'tick))
-
-(define-minor-mode lsp-inlay-hints-mode
-  "Mode for displaying inlay hints."
-  :lighter nil
-  (cond
-   ((and lsp-inlay-hints-mode lsp--buffer-workspaces)
-    (add-hook 'lsp-on-idle-hook #'lsp--update-inlay-hints nil t)
-    (when lsp-update-inlay-hints-on-scroll
-      (add-to-list (make-local-variable 'window-scroll-functions)
-                   #'lsp--update-inlay-hints-scroll-function)))
-   (t
-    (lsp--remove-overlays 'lsp-inlay-hint)
-    (remove-hook 'lsp-on-idle-hook #'lsp--update-inlay-hints t)
-    (setf window-scroll-functions
-          (delete #'lsp--update-inlay-hints-scroll-function window-scroll-functions)))))
-
-
-
-;;;###autoload
-(defun lsp-start-plain ()
-  "Start `lsp-mode' using minimal configuration using the latest `melpa' version
-of the packages.
-
-In case the major-mode that you are using for "
-  (interactive)
-  (let ((start-plain (make-temp-file "plain" nil ".el")))
-    (url-copy-file "https://raw.githubusercontent.com/emacs-lsp/lsp-mode/master/scripts/lsp-start-plain.el"
-                   start-plain t)
-    (async-shell-command
-     (format "%s -q -l %s %s"
-             (expand-file-name invocation-name invocation-directory)
-             start-plain
-             (or (buffer-file-name) ""))
-     (generate-new-buffer " *lsp-start-plain*"))))
-
-
-
-(provide 'lsp-mode)
-;;; lsp-mode.el ends here
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-actionscript.el b/emacs/elpa/lsp-mode-20241003.636/lsp-actionscript.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-actionscript.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-actionscript.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-ada.el b/emacs/elpa/lsp-mode-20241003.636/lsp-ada.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-ada.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-ada.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-angular.el b/emacs/elpa/lsp-mode-20241003.636/lsp-angular.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-angular.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-angular.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-ansible.el b/emacs/elpa/lsp-mode-20241003.636/lsp-ansible.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-ansible.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-ansible.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-asm.el b/emacs/elpa/lsp-mode-20241003.636/lsp-asm.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-asm.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-asm.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-astro.el b/emacs/elpa/lsp-mode-20241003.636/lsp-astro.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-astro.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-astro.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-autotools.el b/emacs/elpa/lsp-mode-20241003.636/lsp-autotools.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-autotools.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-autotools.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-awk.el b/emacs/elpa/lsp-mode-20241003.636/lsp-awk.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-awk.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-awk.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-bash.el b/emacs/elpa/lsp-mode-20241003.636/lsp-bash.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-bash.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-bash.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-beancount.el b/emacs/elpa/lsp-mode-20241003.636/lsp-beancount.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-beancount.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-beancount.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-bufls.el b/emacs/elpa/lsp-mode-20241003.636/lsp-bufls.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-bufls.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-bufls.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-camel.el b/emacs/elpa/lsp-mode-20241003.636/lsp-camel.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-camel.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-camel.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-clangd.el b/emacs/elpa/lsp-mode-20241003.636/lsp-clangd.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-clangd.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-clangd.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-clojure.el b/emacs/elpa/lsp-mode-20241003.636/lsp-clojure.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-clojure.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-clojure.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-cmake.el b/emacs/elpa/lsp-mode-20241003.636/lsp-cmake.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-cmake.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-cmake.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-cobol.el b/emacs/elpa/lsp-mode-20241003.636/lsp-cobol.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-cobol.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-cobol.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-completion.el b/emacs/elpa/lsp-mode-20241003.636/lsp-completion.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-completion.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-completion.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-credo.el b/emacs/elpa/lsp-mode-20241003.636/lsp-credo.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-credo.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-credo.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-crystal.el b/emacs/elpa/lsp-mode-20241003.636/lsp-crystal.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-crystal.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-crystal.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-csharp.el b/emacs/elpa/lsp-mode-20241003.636/lsp-csharp.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-csharp.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-csharp.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-css.el b/emacs/elpa/lsp-mode-20241003.636/lsp-css.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-css.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-css.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-cucumber.el b/emacs/elpa/lsp-mode-20241003.636/lsp-cucumber.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-cucumber.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-cucumber.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-cypher.el b/emacs/elpa/lsp-mode-20241003.636/lsp-cypher.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-cypher.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-cypher.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-d.el b/emacs/elpa/lsp-mode-20241003.636/lsp-d.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-d.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-d.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-dhall.el b/emacs/elpa/lsp-mode-20241003.636/lsp-dhall.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-dhall.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-dhall.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-diagnostics.el b/emacs/elpa/lsp-mode-20241003.636/lsp-diagnostics.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-diagnostics.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-diagnostics.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-dired.el b/emacs/elpa/lsp-mode-20241003.636/lsp-dired.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-dired.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-dired.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-dockerfile.el b/emacs/elpa/lsp-mode-20241003.636/lsp-dockerfile.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-dockerfile.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-dockerfile.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-dot.el b/emacs/elpa/lsp-mode-20241003.636/lsp-dot.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-dot.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-dot.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-earthly.el b/emacs/elpa/lsp-mode-20241003.636/lsp-earthly.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-earthly.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-earthly.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-elixir.el b/emacs/elpa/lsp-mode-20241003.636/lsp-elixir.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-elixir.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-elixir.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-elm.el b/emacs/elpa/lsp-mode-20241003.636/lsp-elm.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-elm.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-elm.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-emmet.el b/emacs/elpa/lsp-mode-20241003.636/lsp-emmet.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-emmet.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-emmet.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-erlang.el b/emacs/elpa/lsp-mode-20241003.636/lsp-erlang.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-erlang.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-erlang.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-eslint.el b/emacs/elpa/lsp-mode-20241003.636/lsp-eslint.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-eslint.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-eslint.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-fortran.el b/emacs/elpa/lsp-mode-20241003.636/lsp-fortran.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-fortran.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-fortran.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-fsharp.el b/emacs/elpa/lsp-mode-20241003.636/lsp-fsharp.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-fsharp.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-fsharp.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-futhark.el b/emacs/elpa/lsp-mode-20241003.636/lsp-futhark.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-futhark.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-futhark.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-gdscript.el b/emacs/elpa/lsp-mode-20241003.636/lsp-gdscript.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-gdscript.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-gdscript.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-gleam.el b/emacs/elpa/lsp-mode-20241003.636/lsp-gleam.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-gleam.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-gleam.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-glsl.el b/emacs/elpa/lsp-mode-20241003.636/lsp-glsl.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-glsl.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-glsl.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20241003.636/lsp-go.el b/emacs/elpa/lsp-mode-20241003.636/lsp-go.el
@@ -0,0 +1,446 @@
+;;; lsp-go.el --- Go Client settings             -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2019  Muir Manders
+
+;; Author: Muir Manders <muir@mnd.rs>
+;; Keywords:
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; lsp-go client
+
+;;; Code:
+
+(require 'lsp-mode)
+(require 'lsp-completion)
+
+(defgroup lsp-go nil
+  "LSP support for the Go Programming Language, using the gopls language server."
+  :link '(url-link "https://github.com/golang/tools/blob/master/gopls/README.md")
+  :group 'lsp-mode
+  :package-version '(lsp-mode . "6.3.2"))
+
+(define-obsolete-variable-alias
+  'lsp-gopls-server-path
+  'lsp-go-gopls-server-path
+  "lsp-mode 7.0.1")
+
+(defcustom lsp-go-gopls-server-path "gopls"
+  "Path to gopls server binary."
+  :type 'string
+  :group 'lsp-go)
+
+(define-obsolete-variable-alias
+  'lsp-gopls-server-args
+  'lsp-go-gopls-server-args
+  "lsp-mode 7.0.1")
+
+(defcustom lsp-go-gopls-server-args '("-remote=auto")
+  "Extra CLI arguments for gopls."
+  :type '(repeat string)
+  :group 'lsp-go)
+
+(define-obsolete-variable-alias
+  'lsp-gopls-use-placeholders
+  'lsp-go-use-placeholders
+  "lsp-mode 7.0.1")
+
+(defcustom lsp-go-use-placeholders t
+  "Cause gopls to provide placeholder parameter snippets when
+completing function calls."
+  :type 'boolean
+  :group 'lsp-go)
+
+(define-obsolete-variable-alias
+  'lsp-gopls-build-flags
+  'lsp-go-build-flags
+  "lsp-mode 7.0.1")
+
+(defcustom lsp-go-build-flags []
+  "A vector of flags passed on to the build system when invoked,
+  applied to queries like `go list'."
+  :type '(lsp-repeatable-vector string)
+  :group 'lsp-go
+  :risky t
+  :package-version '(lsp-mode "6.2"))
+
+(define-obsolete-variable-alias
+  'lsp-gopls-env
+  'lsp-go-env
+  "lsp-mode 7.0.1")
+
+(defcustom lsp-go-env nil
+  "`gopls' has the unusual ability to set environment variables,
+  intended to affect the behavior of commands invoked by `gopls'
+  on the user's behalf. This variable takes a hash table of env
+  var names to desired values."
+  :type '(alist :key-type (symbol :tag "env var name") :value-type (string :tag "value"))
+  :group 'lsp-go
+  :risky t
+  :package-version '(lsp-mode "6.2"))
+
+(defcustom lsp-go-directory-filters []
+  "A vector of directory filters."
+  :link '(url-link "https://github.com/golang/tools/blob/67e49ef2d0f326051e22a4a55bdf9344ae1a8ed8/gopls/doc/settings.md#directoryfilters-string")
+  :group 'lsp-go
+  :type 'lsp-string-vector
+  :package-version '(lsp-mode "8.0.0"))
+
+(define-obsolete-variable-alias
+  'lsp-gopls-hover-kind
+  'lsp-go-hover-kind
+  "lsp-mode 7.0.1")
+
+(defcustom lsp-go-hover-kind "SynopsisDocumentation"
+  "`gopls' allows the end user to select the desired amount of
+  documentation returned during e.g. hover and thing-at-point
+  operations."
+  :type '(choice (const "SynopsisDocumentation")
+                 (const "NoDocumentation")
+                 (const "FullDocumentation")
+                 (const "SingleLine")
+                 (const "Structured"))
+  :group 'lsp-go
+  :risky t
+  :package-version '(lsp-mode "6.2"))
+
+(define-obsolete-variable-alias
+  'lsp-gopls-available-codelens
+  'lsp-go-available-codelenses
+  "lsp-mode 7.0.1")
+
+(define-obsolete-variable-alias
+  'lsp-go-available-codelens
+  'lsp-go-available-codelenses
+  "lsp-mode 7.0.1")
+
+(defvar lsp-go-available-codelenses
+  '(
+    (gc_details . "Toggle the calculation of gc annotations")
+    (generate . "Run `go generate` for a directory")
+    (regenerate_cgo . "Regenerate cgo definitions")
+    (test . "Run `go test` for a specific set of test or benchmark functions (legacy)")
+    (tidy . "Run `go mod tidy` for a module")
+    (upgrade_dependency . "Upgrade a dependency")
+    (vendor . "Runs `go mod vendor' for a module"))
+  "Available codelenses that can be further enabled or disabled
+  through `lsp-go-codelenses'.")
+
+(defun lsp-go--defcustom-available-as-alist-type (alist)
+  "Return a list for the `:type' field in `defcustom' used to populate an alist.
+
+The input ALIST has the form `((\"name\" . \"documentation sentence\") [...])'
+
+The returned type provides a tri-state that either:
+  - does not include the element in the alist
+  - sets element to false (actually, :json-false)
+  - sets element to true \(actually, t)"
+  (let ((list '()))
+    (dolist (v alist)
+      (push `(cons
+              :tag ,(cdr v)
+              (const :format "" ,(car v))
+              (choice (const :tag "Enable" t) (const :tag "Disable" :json-false)))
+            list))
+    (push 'set list)
+    list))
+
+(define-obsolete-variable-alias
+  'lsp-gopls-codelens
+  'lsp-go-codelenses
+  "lsp-mode 7.0.1")
+
+(define-obsolete-variable-alias
+  'lsp-go-codelens
+  'lsp-go-codelenses
+  "lsp-mode 7.0.1")
+
+(defcustom lsp-go-codelenses '((gc_details . :json-false)
+                               (generate . t)
+                               (regenerate_cgo . t)
+                               (tidy . t)
+                               (upgrade_dependency . t)
+                               (test . t)
+                               (vendor . t))
+  "Select what codelenses should be enabled or not.
+
+The codelenses can be found at https://github.com/golang/tools/blob/3fa0e8f87c1aae0a9adc2a63af1a1945d16d9359/internal/lsp/source/options.go#L106-L112."
+  :type (lsp-go--defcustom-available-as-alist-type lsp-go-available-codelenses)
+  :group 'lsp-go
+  :risky t
+  :package-version '(lsp-mode "7.0"))
+
+(define-obsolete-variable-alias
+  'lsp-clients-go-library-directories
+  'lsp-go-library-directories
+  "lsp-mode 7.0.1")
+
+(defcustom lsp-go-library-directories ["/usr"]
+  "List of directories which will be considered to be libraries."
+  :group 'lsp-go
+  :risky t
+  :type '(lsp-repeatable-vector string))
+
+(define-obsolete-variable-alias
+  'lsp-clients-go-library-directories-include-go-modules
+  'lsp-go-library-directories-include-go-modules
+  "lsp-mode 7.0.1")
+
+(defcustom lsp-go-library-directories-include-go-modules t
+  "Whether or not $GOPATH/pkg/mod should be included as a library directory."
+  :type 'boolean
+  :group 'lsp-go)
+
+(defun lsp-go--library-default-directories (_workspace)
+  "Calculate go library directories.
+
+If `lsp-go-library-directories-include-go-modules' is non-nil
+and the environment variable GOPATH is set this function will return
+$GOPATH/pkg/mod along with the value of
+`lsp-go-library-directories'."
+  (let ((library-dirs lsp-go-library-directories))
+    (when (and lsp-go-library-directories-include-go-modules
+               (or (and (not (file-remote-p default-directory)) (executable-find "go"))
+                   (and (version<= "27.0" emacs-version) (with-no-warnings (executable-find "go" (file-remote-p default-directory))))))
+      (with-temp-buffer
+        (when (zerop (process-file "go" nil t nil "env" "GOPATH"))
+          (setq library-dirs
+                (append
+                 library-dirs
+                 (list
+                  (concat
+                   (string-trim-right (buffer-substring (point-min) (point-max)))
+                   "/pkg/mod")))))))
+    (if (file-remote-p default-directory)
+        (mapcar (lambda (path) (concat (file-remote-p default-directory) path)) library-dirs)
+      library-dirs)))
+
+(defcustom lsp-go-link-target "pkg.go.dev"
+  "Which website to use for displaying Go documentation."
+  :type '(choice (const "pkg.go.dev")
+                 (const "godoc.org")
+                 (string :tag "A custom website"))
+  :group 'lsp-go
+  :package-version '(lsp-mode "7.0.1"))
+
+(defcustom lsp-go-links-in-hover t
+  "If non-nil, hover documentation includes links."
+  :type 'boolean
+  :group 'lsp-go
+  :package-version '(lsp-mode "8.0.0"))
+
+(defcustom lsp-go-use-gofumpt nil
+  "If non-nil, use gofumpt formatting."
+  :type 'boolean
+  :group 'lsp-go
+  :package-version '(lsp-mode "8.0.0"))
+
+(defcustom lsp-go-goimports-local ""
+  "Equivalent of the goimports -local flag, which puts imports beginning with
+ this string after third-party packages.  It should be the prefix of the import
+ path whose imports should be grouped separately."
+  :type 'string
+  :group 'lsp-go
+  :package-version '(lsp-mode "8.0.0"))
+
+(defcustom lsp-go-analyses nil
+  "Specify analyses that the user would like to enable or disable. A map of the
+  names of analysis passes that should be enabled/disabled. A full list of
+  analyzers that gopls uses can be found at
+  https://github.com/golang/tools/blob/master/gopls/doc/analyzers.md"
+  :type '(alist :key-type (string :tag "analyzer name") :value-type (boolean :tag "value"))
+  :group 'lsp-go
+  :risky t
+  :package-version '(lsp-mode "8.0.0"))
+
+(defcustom lsp-go-import-shortcut "Both"
+  "Specifies whether import statements should link to documentation or go to
+  definitions."
+  :type '(choice (const "Both")
+                 (const "Link")
+                 (const "Definition"))
+  :group 'lsp-go
+  :risky t
+  :package-version '(lsp-mode "8.0.0"))
+
+(defcustom lsp-go-symbol-matcher "FastFuzzy"
+  "Sets the algorithm that is used when finding workspace symbols."
+  :type '(choice (const "Fuzzy")
+                 (const "FastFuzzy")
+                 (const "CaseInsensitive")
+                 (const "CaseSensitive"))
+  :group 'lsp-go
+  :risky t
+  :package-version '(lsp-mode "8.0.0"))
+
+(defcustom lsp-go-symbol-style "Dynamic"
+  "Controls how symbols are qualified in symbol responses.
+
+  `Dynamic' uses whichever qualifier results in the highest scoring match for
+  the given symbol query. Here a `qualifier' is any `/' or '.' delimited suffix
+  of the fully qualified symbol. i.e. `to/pkg.Foo.Field' or just `Foo.Field'.
+
+  `Full' is fully qualified symbols, i.e. `path/to/pkg.Foo.Field'.
+
+  `Package' is package qualified symbols i.e. `pkg.Foo.Field'."
+  :type '(choice (const "Dynamic")
+                 (const "Full")
+                 (const "Package"))
+  :group 'lsp-go
+  :risky t
+  :package-version '(lsp-mode "8.0.0"))
+
+(defcustom lsp-go-template-extensions []
+  "The extensions of file names that are treated as template files.
+
+The extension is the part of the file name after the final dot."
+  :type '(lsp-repeatable-vector string)
+  :group 'lsp-go
+  :package-version '(lsp-mode "9.1"))
+
+(defcustom lsp-go-standalone-tags ["ignore"]
+  "Specifies a set of build constraints that identify individual Go
+source files that make up the entire main package of an
+executable."
+  :type '(lsp-repeatable-vector string)
+  :group 'lsp-go
+  :package-version '(lsp-mode "9.1"))
+
+(defcustom lsp-go-completion-budget "100ms"
+  "Soft latency goal for completion requests"
+  :type 'string
+  :group 'lsp-go
+  :package-version '(lsp-mode "9.1"))
+
+(defcustom lsp-go-matcher "Fuzzy"
+  "Sets the algorithm that is used when calculating completion candidates."
+  :type '(choice (const "CaseInsensitive")
+                 (const "CaseSensitive")
+                 (const "Fuzzy"))
+  :group 'lsp-go
+  :package-version '(lsp-mode "9.1"))
+
+(defcustom lsp-go-complete-function-calls t
+  "Enables function call completion.
+
+When completing a statement, or when a function return type
+matches the expected of the expression being completed,
+completion may suggest call expressions."
+  :type 'boolean
+  :group 'lsp-go
+  :package-version '(lsp-mode "9.1"))
+
+(defcustom lsp-go-diagnostics-delay "1s"
+  "Controls the amount of time that gopls waits after the most
+recent file modification before computing deep diagnostics."
+  :type 'string
+  :group 'lsp-go
+  :package-version '(lsp-mode "9.1"))
+
+(defcustom lsp-go-analysis-progress-reporting t
+  "Controls whether gopls sends progress notifications when
+construction of its index of analysis facts is taking a long
+time."
+  :type 'boolean
+  :group 'lsp-go
+  :package-version '(lsp-mode "9.1"))
+
+(defcustom lsp-go-symbol-scope "all"
+  "Controls which packages are searched for workspace/symbol
+requests.
+
+When the scope is \"workspace\", gopls searches only workspace
+packages.
+
+When the scope is \"all\", gopls searches all loaded packages,
+including dependencies and the standard library."
+  :type '(choice (const "all")
+                 (const "workspace"))
+  :group 'lsp-go
+  :package-version '(lsp-mode "9.1"))
+
+(defcustom lsp-go-verbose-output t
+  "Enables additional debug logging."
+  :type 'boolean
+  :group 'lsp-go
+  :package-version '(lsp-mode "9.1"))
+
+(lsp-register-custom-settings
+ '(("gopls.analyses" lsp-go-analyses)
+   ("gopls.analysisProgressReporting" lsp-go-analysis-progress-reporting t)
+   ("gopls.buildFlags" lsp-go-build-flags)
+   ("gopls.codelenses" lsp-go-codelenses)
+   ("gopls.completeFunctionCalls" lsp-go-complete-function-calls t)
+   ("gopls.completionBudget" lsp-go-completion-budget)
+   ("gopls.diagnosticsDelay" lsp-go-diagnostics-delay)
+   ("gopls.directoryFilters" lsp-go-directory-filters)
+   ("gopls.env" lsp-go-env)
+   ("gopls.gofumpt" lsp-go-use-gofumpt t)
+   ("gopls.hoverKind" lsp-go-hover-kind)
+   ("gopls.importShortcut" lsp-go-import-shortcut)
+   ("gopls.linkTarget" lsp-go-link-target)
+   ("gopls.linksInHover" lsp-go-links-in-hover t)
+   ("gopls.local" lsp-go-goimports-local)
+   ("gopls.matcher" lsp-go-matcher)
+   ("gopls.standaloneTags" lsp-go-standalone-tags)
+   ("gopls.symbolMatcher" lsp-go-symbol-matcher)
+   ("gopls.symbolScope" lsp-go-symbol-scope)
+   ("gopls.symbolStyle" lsp-go-symbol-style)
+   ("gopls.templateExtensions" lsp-go-template-extensions)
+   ("gopls.usePlaceholders" lsp-go-use-placeholders t)
+   ("gopls.verboseOutput" lsp-go-verbose-output t)))
+
+(defcustom lsp-go-server-wrapper-function
+  #'identity
+  "Function to wrap the language server process started by lsp-go.
+
+For example, you can pick a go binary provided by a repository's
+flake.nix file with:
+
+  (use-package nix-sandbox)
+  (defun my/nix--lsp-go-wrapper (args)
+    (if-let ((sandbox (nix-current-sandbox)))
+        (apply `nix-shell-command sandbox args)
+      args))
+  (setq lsp-go-server-path \"gopls\"
+        lsp-go-server-wrapper-function `my/nix--lsp-go-wrapper)"
+  :group 'lsp-go
+  :type '(choice
+          (function-item :tag "None" :value identity)
+          (function :tag "Custom function")))
+
+(defun lsp-go--server-command ()
+  "Command and arguments for launching the inferior language server process.
+These are assembled from the customizable variables `lsp-go-server-path'
+and `lsp-go-server-wrapper-function'."
+  (funcall lsp-go-server-wrapper-function (append (list lsp-go-gopls-server-path) lsp-go-gopls-server-args)))
+
+(lsp-register-client
+ (make-lsp-client :new-connection (lsp-stdio-connection 'lsp-go--server-command)
+                  :activation-fn (lsp-activate-on "go" "go.mod")
+                  :language-id "go"
+                  :priority 0
+                  :server-id 'gopls
+                  :completion-in-comments? t
+                  :library-folders-fn #'lsp-go--library-default-directories
+                  :after-open-fn (lambda ()
+                                   ;; https://github.com/golang/tools/commit/b2d8b0336
+                                   (setq-local lsp-completion-filter-on-incomplete nil))))
+
+(lsp-consistency-check lsp-go)
+
+(provide 'lsp-go)
+;;; lsp-go.el ends here
diff --git a/emacs/elpa/lsp-mode-20241003.636/lsp-go.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-go.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-golangci-lint.el b/emacs/elpa/lsp-mode-20241003.636/lsp-golangci-lint.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-golangci-lint.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-golangci-lint.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20241003.636/lsp-graphql.el b/emacs/elpa/lsp-mode-20241003.636/lsp-graphql.el
@@ -0,0 +1,79 @@
+;;; lsp-graphql.el --- lsp client for graphql        -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2021  Binbin Ye
+
+;; Author: Binbin Ye
+;; Keywords: lsp, graphql
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; Support for running graphql lsp.  Support multiple server running at the same time when editing tsx/jsx.
+
+;;; Code:
+
+(require 'lsp-mode)
+
+(lsp-dependency 'graphql-language-service-cli
+                '(:system "graphql-lsp")
+                '(:npm :package "graphql-language-service-cli"
+                       :path "graphql-lsp"))
+
+
+(defgroup lsp-graphql nil
+  "LSP support for the GraphQL, using the graphql-language-service-cli as language server."
+  :link '(url-link "https://github.com/graphql/graphiql/tree/main/packages/graphql-language-service-cli#readme")
+  :group 'lsp-mode)
+
+(defcustom lsp-clients-graphql-server-args '("server" "--method=stream")
+  "CLI arguments for graphql language server."
+  :type '(repeat string)
+  :risky t
+  :group 'lsp-graphql)
+
+(defcustom lsp-graphql-target-file-extensions '("ts" "js" "jsx" "tsx" "vue" "graphql" "graphqls" "gql")
+  "List of target file extensions for the GraphQL language server."
+  :type '(repeat string)
+  :group 'lsp-graphql)
+
+(defun lsp-graphql-activate-p (filename &optional _)
+  "Check if the GraphQL language server should be enabled based on FILENAME."
+  (let ((target-extensions (mapconcat 'identity lsp-graphql-target-file-extensions "\\|")))
+    (or (string-match-p (format "\\.%s\\'" target-extensions) filename)
+        (and (derived-mode-p 'js-mode 'js2-mode 'typescript-mode 'typescript-ts-mode)
+             (not (derived-mode-p 'json-mode))))))
+
+
+(lsp-register-client
+  (make-lsp-client :new-connection (lsp-stdio-connection (lambda()
+                                                           (cons (lsp-package-path 'graphql-language-service-cli)
+                                                                 lsp-clients-graphql-server-args)))
+                   :major-modes '(graphql-mode)
+                   :language-id "graphql"
+                   :server-id 'graphql-lsp
+                   :priority -3
+                   :add-on? t
+                   :multi-root t
+                   :activation-fn 'lsp-graphql-activate-p
+                   :download-server-fn (lambda (_client callback error-callback _update?)
+                                         (lsp-package-ensure
+                                          'graphql-language-service-cli
+                                          callback
+                                          error-callback))))
+
+(lsp-consistency-check lsp-graphql)
+
+(provide 'lsp-graphql)
+;;; lsp-graphql.el ends here
diff --git a/emacs/elpa/lsp-mode-20241003.636/lsp-graphql.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-graphql.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-groovy.el b/emacs/elpa/lsp-mode-20241003.636/lsp-groovy.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-groovy.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-groovy.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-hack.el b/emacs/elpa/lsp-mode-20241003.636/lsp-hack.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-hack.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-hack.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-haxe.el b/emacs/elpa/lsp-mode-20241003.636/lsp-haxe.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-haxe.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-haxe.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-headerline.el b/emacs/elpa/lsp-mode-20241003.636/lsp-headerline.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-headerline.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-headerline.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-html.el b/emacs/elpa/lsp-mode-20241003.636/lsp-html.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-html.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-html.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-hy.el b/emacs/elpa/lsp-mode-20241003.636/lsp-hy.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-hy.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-hy.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-icons.el b/emacs/elpa/lsp-mode-20241003.636/lsp-icons.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-icons.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-icons.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-ido.el b/emacs/elpa/lsp-mode-20241003.636/lsp-ido.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-ido.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-ido.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-idris.el b/emacs/elpa/lsp-mode-20241003.636/lsp-idris.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-idris.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-idris.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-iedit.el b/emacs/elpa/lsp-mode-20241003.636/lsp-iedit.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-iedit.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-iedit.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-javascript.el b/emacs/elpa/lsp-mode-20241003.636/lsp-javascript.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-javascript.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-javascript.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-jq.el b/emacs/elpa/lsp-mode-20241003.636/lsp-jq.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-jq.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-jq.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-json.el b/emacs/elpa/lsp-mode-20241003.636/lsp-json.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-json.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-json.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-jsonnet.el b/emacs/elpa/lsp-mode-20241003.636/lsp-jsonnet.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-jsonnet.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-jsonnet.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-kotlin.el b/emacs/elpa/lsp-mode-20241003.636/lsp-kotlin.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-kotlin.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-kotlin.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-lens.el b/emacs/elpa/lsp-mode-20241003.636/lsp-lens.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-lens.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-lens.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-lisp.el b/emacs/elpa/lsp-mode-20241003.636/lsp-lisp.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-lisp.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-lisp.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-lua.el b/emacs/elpa/lsp-mode-20241003.636/lsp-lua.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-lua.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-lua.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-magik.el b/emacs/elpa/lsp-mode-20241003.636/lsp-magik.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-magik.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-magik.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-markdown.el b/emacs/elpa/lsp-mode-20241003.636/lsp-markdown.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-markdown.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-markdown.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-marksman.el b/emacs/elpa/lsp-mode-20241003.636/lsp-marksman.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-marksman.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-marksman.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-mdx.el b/emacs/elpa/lsp-mode-20241003.636/lsp-mdx.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-mdx.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-mdx.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-meson.el b/emacs/elpa/lsp-mode-20241003.636/lsp-meson.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-meson.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-meson.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-mint.el b/emacs/elpa/lsp-mode-20241003.636/lsp-mint.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-mint.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-mint.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-mode-autoloads.el b/emacs/elpa/lsp-mode-20241003.636/lsp-mode-autoloads.el
diff --git a/emacs/elpa/lsp-mode-20241003.636/lsp-mode-pkg.el b/emacs/elpa/lsp-mode-20241003.636/lsp-mode-pkg.el
@@ -0,0 +1,15 @@
+;; -*- no-byte-compile: t; lexical-binding: nil -*-
+(define-package "lsp-mode" "20241003.636"
+  "LSP mode."
+  '((emacs         "27.1")
+    (dash          "2.18.0")
+    (f             "0.20.0")
+    (ht            "2.3")
+    (spinner       "1.7.3")
+    (markdown-mode "2.3")
+    (lv            "0")
+    (eldoc         "1.11"))
+  :url "https://github.com/emacs-lsp/lsp-mode"
+  :commit "52de586352de237951ee4cdd4a1351fa97e10c63"
+  :revdesc "52de586352de"
+  :keywords '("languages"))
diff --git a/emacs/elpa/lsp-mode-20241003.636/lsp-mode.el b/emacs/elpa/lsp-mode-20241003.636/lsp-mode.el
@@ -0,0 +1,9917 @@
+;;; lsp-mode.el --- LSP mode                              -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2020-2024 emacs-lsp maintainers
+
+;; Author: Vibhav Pant, Fangrui Song, Ivan Yonchovski
+;; Keywords: languages
+;; Package-Requires: ((emacs "27.1") (dash "2.18.0") (f "0.20.0") (ht "2.3") (spinner "1.7.3") (markdown-mode "2.3") (lv "0") (eldoc "1.11"))
+;; Package-Version: 20241003.636
+;; Package-Revision: 52de586352de
+
+;; URL: https://github.com/emacs-lsp/lsp-mode
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; Emacs client/library for the Language Server Protocol
+
+;;; Code:
+
+(require 'cl-generic)
+(require 'cl-lib)
+(require 'compile)
+(require 'dash)
+(require 'epg)
+(require 'ewoc)
+(require 'f)
+(require 'filenotify)
+(require 'files)
+(require 'ht)
+(require 'imenu)
+(require 'inline)
+(require 'json)
+(require 'lv)
+(require 'markdown-mode)
+(require 'network-stream)
+(require 'pcase)
+(require 'rx)
+(require 's)
+(require 'seq)
+(require 'spinner)
+(require 'subr-x)
+(require 'tree-widget)
+(require 'url-parse)
+(require 'url-util)
+(require 'widget)
+(require 'xref)
+(require 'minibuffer)
+(require 'help-mode)
+(require 'lsp-protocol)
+
+(defgroup lsp-mode nil
+  "Language Server Protocol client."
+  :group 'tools
+  :tag "Language Server (lsp-mode)")
+
+(declare-function evil-set-command-property "ext:evil-common")
+(declare-function projectile-project-root "ext:projectile")
+(declare-function yas-expand-snippet "ext:yasnippet")
+(declare-function dap-mode "ext:dap-mode")
+(declare-function dap-auto-configure-mode "ext:dap-mode")
+
+(defvar yas-inhibit-overlay-modification-protection)
+(defvar yas-indent-line)
+(defvar yas-wrap-around-region)
+(defvar yas-also-auto-indent-first-line)
+(defvar dap-auto-configure-mode)
+(defvar dap-ui-menu-items)
+(defvar company-minimum-prefix-length)
+
+(defconst lsp--message-type-face
+  `((1 . ,compilation-error-face)
+    (2 . ,compilation-warning-face)
+    (3 . ,compilation-message-face)
+    (4 . ,compilation-info-face)))
+
+(defconst lsp--errors
+  '((-32700 "Parse Error")
+    (-32600 "Invalid Request")
+    (-32601 "Method not Found")
+    (-32602 "Invalid Parameters")
+    (-32603 "Internal Error")
+    (-32099 "Server Start Error")
+    (-32000 "Server End Error")
+    (-32002 "Server Not Initialized")
+    (-32001 "Unknown Error Code")
+    (-32800 "Request Cancelled"))
+  "Alist of error codes to user friendly strings.")
+
+(defconst lsp--empty-ht (make-hash-table))
+
+(eval-and-compile
+  (defun dash-expand:&lsp-wks (key source)
+    `(,(intern-soft (format "lsp--workspace-%s" (eval key))) ,source))
+
+  (defun dash-expand:&lsp-cln (key source)
+    `(,(intern-soft (format "lsp--client-%s" (eval key))) ,source)))
+
+(define-obsolete-variable-alias 'lsp-print-io 'lsp-log-io "lsp-mode 6.1")
+
+(defcustom lsp-log-io nil
+  "If non-nil, log all messages from the language server to a *lsp-log* buffer."
+  :group 'lsp-mode
+  :type 'boolean)
+
+(defcustom lsp-log-io-allowlist-methods '()
+  "The methods to filter before print to lsp-log-io."
+  :group 'lsp-mode
+  :type '(repeat string)
+  :package-version '(lsp-mode . "9.0.0"))
+
+(defcustom lsp-log-max message-log-max
+  "Maximum number of lines to keep in the log buffer.
+If nil, disable message logging.  If t, log messages but don’t truncate
+the buffer when it becomes large."
+  :group 'lsp-mode
+  :type '(choice (const :tag "Disable" nil)
+                 (integer :tag "lines")
+                 (const :tag "Unlimited" t))
+  :package-version '(lsp-mode . "6.1"))
+
+(defcustom lsp-io-messages-max t
+  "Maximum number of messages that can be locked in a `lsp-io' buffer."
+  :group 'lsp-mode
+  :type '(choice (const :tag "Unlimited" t)
+                 (integer :tag "Messages"))
+  :package-version '(lsp-mode . "6.1"))
+
+(defcustom lsp-keep-workspace-alive t
+  "If non nil keep workspace alive when the last workspace buffer is closed."
+  :group 'lsp-mode
+  :type 'boolean)
+
+(defcustom lsp-enable-snippet t
+  "Enable/disable snippet completion support."
+  :group 'lsp-completion
+  :type 'boolean)
+
+(defcustom lsp-enable-folding t
+  "Enable/disable code folding support."
+  :group 'lsp-mode
+  :type 'boolean
+  :package-version '(lsp-mode . "6.1"))
+
+(define-obsolete-variable-alias 'lsp-enable-semantic-highlighting 'lsp-semantic-tokens-enable "lsp-mode 8.0.0")
+
+(defcustom lsp-semantic-tokens-enable nil
+  "Enable/disable support for semantic tokens.
+As defined by the Language Server Protocol 3.16."
+  :group 'lsp-semantic-tokens
+  :type 'boolean)
+
+(defcustom lsp-folding-range-limit nil
+  "The maximum number of folding ranges to receive from the language server."
+  :group 'lsp-mode
+  :type '(choice (const :tag "No limit." nil)
+                 (integer :tag "Number of lines."))
+  :package-version '(lsp-mode . "6.1"))
+
+(defcustom lsp-folding-line-folding-only nil
+  "If non-nil, only fold complete lines."
+  :group 'lsp-mode
+  :type 'boolean
+  :package-version '(lsp-mode . "6.1"))
+
+(defcustom lsp-client-packages
+  '( ccls lsp-actionscript lsp-ada lsp-angular lsp-ansible lsp-asm lsp-astro
+     lsp-autotools lsp-awk lsp-bash lsp-beancount lsp-bufls lsp-clangd
+     lsp-clojure lsp-cmake lsp-cobol lsp-credo lsp-crystal lsp-csharp lsp-css
+     lsp-cucumber lsp-cypher lsp-d lsp-dart lsp-dhall lsp-docker lsp-dockerfile
+     lsp-earthly lsp-elixir lsp-elm lsp-emmet lsp-erlang lsp-eslint lsp-fortran lsp-futhark
+     lsp-fsharp lsp-gdscript lsp-gleam lsp-glsl lsp-go lsp-golangci-lint lsp-grammarly
+     lsp-graphql lsp-groovy lsp-hack lsp-haskell lsp-haxe lsp-idris lsp-java
+     lsp-javascript lsp-jq lsp-json lsp-kotlin lsp-latex lsp-lisp lsp-ltex
+     lsp-lua lsp-magik lsp-markdown lsp-marksman lsp-mdx lsp-meson lsp-metals lsp-mint
+     lsp-mojo lsp-move lsp-mssql lsp-nginx lsp-nim lsp-nix lsp-nushell lsp-ocaml
+     lsp-openscad lsp-pascal lsp-perl lsp-perlnavigator lsp-php lsp-pls
+     lsp-purescript lsp-pwsh lsp-pyls lsp-pylsp lsp-pyright lsp-python-ms
+     lsp-qml lsp-r lsp-racket lsp-remark lsp-rf lsp-roslyn lsp-rubocop lsp-ruby-lsp
+     lsp-ruby-syntax-tree lsp-ruff lsp-rust lsp-semgrep lsp-shader
+     lsp-solargraph lsp-solidity lsp-sonarlint lsp-sorbet lsp-sourcekit
+     lsp-sql lsp-sqls lsp-steep lsp-svelte lsp-tailwindcss lsp-terraform
+     lsp-tex lsp-tilt lsp-toml lsp-trunk lsp-ttcn3 lsp-typeprof lsp-v
+     lsp-vala lsp-verilog lsp-vetur lsp-vhdl lsp-vimscript lsp-volar lsp-wgsl
+     lsp-xml lsp-yaml lsp-yang lsp-zig)
+  "List of the clients to be automatically required."
+  :group 'lsp-mode
+  :type '(repeat symbol))
+
+(defcustom lsp-progress-via-spinner t
+  "If non-nil, display LSP $/progress reports via a spinner in the modeline."
+  :group 'lsp-mode
+  :type 'boolean)
+
+(defcustom lsp-progress-spinner-type 'progress-bar
+  "Holds the type of spinner to be used in the mode-line.
+Takes a value accepted by `spinner-start'."
+  :group 'lsp-mode
+  :type `(choice :tag "Choose a spinner by name"
+                 ,@(mapcar (lambda (c) (list 'const (car c)))
+                           spinner-types)))
+
+(defvar-local lsp-use-workspace-root-for-server-default-directory nil
+  "Use `lsp-workspace-root' for `default-directory' when starting LSP process.")
+
+(defvar-local lsp--cur-workspace nil)
+
+(defvar-local lsp--cur-version 0)
+(defvar-local lsp--virtual-buffer-connections nil)
+(defvar-local lsp--virtual-buffer nil)
+(defvar lsp--virtual-buffer-mappings (ht))
+
+(defvar lsp--uri-file-prefix (pcase system-type
+                               (`windows-nt "file:///")
+                               (_ "file://"))
+  "Prefix for a file-uri.")
+
+(defvar-local lsp-buffer-uri nil
+  "If set, return it instead of calculating it using `buffer-file-name'.")
+
+(define-error 'lsp-error "Unknown lsp-mode error")
+(define-error 'lsp-empty-response-error
+  "Empty response from the language server" 'lsp-error)
+(define-error 'lsp-timed-out-error
+  "Timed out while waiting for a response from the language server" 'lsp-error)
+(define-error 'lsp-capability-not-supported
+  "Capability not supported by the language server" 'lsp-error)
+(define-error 'lsp-file-scheme-not-supported
+  "Unsupported file scheme" 'lsp-error)
+(define-error 'lsp-client-already-exists-error
+  "A client with this server-id already exists" 'lsp-error)
+(define-error 'lsp-no-code-actions
+  "No code actions" 'lsp-error)
+
+(defcustom lsp-auto-guess-root nil
+  "Automatically guess the project root using projectile/project.
+Do *not* use this setting unless you are familiar with `lsp-mode'
+internals and you are sure that all of your projects are
+following `projectile'/`project.el' conventions."
+  :group 'lsp-mode
+  :type 'boolean)
+
+(defcustom lsp-guess-root-without-session nil
+  "Ignore the session file when calculating the project root.
+You almost always want to set lsp-auto-guess-root too.
+Do *not* use this setting unless you are familiar with `lsp-mode'
+internals and you are sure that all of your projects are
+following `projectile'/`project.el' conventions."
+  :group 'lsp-mode
+  :type 'boolean)
+
+(defcustom lsp-restart 'interactive
+  "Defines how server-exited events must be handled."
+  :group 'lsp-mode
+  :type '(choice (const interactive)
+                 (const auto-restart)
+                 (const ignore)))
+
+(defcustom lsp-session-file (expand-file-name (locate-user-emacs-file ".lsp-session-v1"))
+  "File where session information is stored."
+  :group 'lsp-mode
+  :type 'file)
+
+(defcustom lsp-auto-configure t
+  "Auto configure `lsp-mode' main features.
+When set to t `lsp-mode' will auto-configure completion,
+code-actions, breadcrumb, `flycheck', `flymake', `imenu', symbol highlighting,
+lenses, links, and so on.
+
+For finer granularity you may use `lsp-enable-*' properties."
+  :group 'lsp-mode
+  :type 'boolean
+  :package-version '(lsp-mode . "6.1"))
+
+(defcustom lsp-disabled-clients nil
+  "A list of disabled/blocklisted clients.
+Each entry in the list can be either:
+a symbol, the server-id for the LSP client, or
+a cons pair (MAJOR-MODE . CLIENTS), where MAJOR-MODE is the major-mode,
+and CLIENTS is either a client or a list of clients.
+
+This option can also be used as a file- or directory-local variable to
+disable a language server for individual files or directories/projects
+respectively."
+  :group 'lsp-mode
+  :type '(repeat (symbol))
+  :safe 'listp
+  :package-version '(lsp-mode . "6.1"))
+
+(defvar lsp-clients (make-hash-table :test 'eql)
+  "Hash table server-id -> client.
+It contains all of the clients that are currently registered.")
+
+(defvar lsp-enabled-clients nil
+  "List of clients allowed to be used for projects.
+When nil, all registered clients are considered candidates.")
+
+(defvar lsp-last-id 0
+  "Last request id.")
+
+(defcustom lsp-before-initialize-hook nil
+  "List of functions to be called before a Language Server has been initialized
+for a new workspace."
+  :type 'hook
+  :group 'lsp-mode)
+
+(defcustom lsp-after-initialize-hook nil
+  "List of functions to be called after a Language Server has been initialized
+for a new workspace."
+  :type 'hook
+  :group 'lsp-mode)
+
+(defcustom lsp-before-open-hook nil
+  "List of functions to be called before a new file with LSP support is opened."
+  :type 'hook
+  :group 'lsp-mode)
+
+(defcustom lsp-after-open-hook nil
+  "List of functions to be called after a new file with LSP support is opened."
+  :type 'hook
+  :group 'lsp-mode)
+
+(defcustom lsp-enable-file-watchers t
+  "If non-nil lsp-mode will watch the files in the workspace if
+the server has requested that."
+  :type 'boolean
+  :group 'lsp-mode
+  :package-version '(lsp-mode . "6.1"))
+;;;###autoload(put 'lsp-enable-file-watchers 'safe-local-variable #'booleanp)
+
+(define-obsolete-variable-alias 'lsp-file-watch-ignored 'lsp-file-watch-ignored-directories "8.0.0")
+
+(defcustom lsp-file-watch-ignored-directories
+  '(; SCM tools
+    "[/\\\\]\\.git\\'"
+    "[/\\\\]\\.github\\'"
+    "[/\\\\]\\.gitlab\\'"
+    "[/\\\\]\\.circleci\\'"
+    "[/\\\\]\\.hg\\'"
+    "[/\\\\]\\.bzr\\'"
+    "[/\\\\]_darcs\\'"
+    "[/\\\\]\\.svn\\'"
+    "[/\\\\]_FOSSIL_\\'"
+    ;; IDE or build tools
+    "[/\\\\]\\.idea\\'"
+    "[/\\\\]\\.ensime_cache\\'"
+    "[/\\\\]\\.eunit\\'"
+    "[/\\\\]node_modules"
+    "[/\\\\]\\.yarn\\'"
+    "[/\\\\]\\.fslckout\\'"
+    "[/\\\\]\\.tox\\'"
+    "[/\\\\]\\.nox\\'"
+    "[/\\\\]dist\\'"
+    "[/\\\\]dist-newstyle\\'"
+    "[/\\\\]\\.stack-work\\'"
+    "[/\\\\]\\.bloop\\'"
+    "[/\\\\]\\.metals\\'"
+    "[/\\\\]target\\'"
+    "[/\\\\]\\.ccls-cache\\'"
+    "[/\\\\]\\.vs\\'"
+    "[/\\\\]\\.vscode\\'"
+    "[/\\\\]\\.venv\\'"
+    "[/\\\\]\\.mypy_cache\\'"
+    "[/\\\\]\\.pytest_cache\\'"
+    ;; Swift Package Manager
+    "[/\\\\]\\.build\\'"
+    ;; Python
+    "[/\\\\]__pycache__\\'"
+    ;; Autotools output
+    "[/\\\\]\\.deps\\'"
+    "[/\\\\]build-aux\\'"
+    "[/\\\\]autom4te.cache\\'"
+    "[/\\\\]\\.reference\\'"
+    ;; Bazel
+    "[/\\\\]bazel-[^/\\\\]+\\'"
+    ;; CSharp
+    "[/\\\\]\\.cache[/\\\\]lsp-csharp\\'"
+    "[/\\\\]\\.meta\\'"
+    "[/\\\\]\\.nuget\\'"
+    ;; Unity
+    "[/\\\\]Library\\'"
+    ;; Clojure
+    "[/\\\\]\\.lsp\\'"
+    "[/\\\\]\\.clj-kondo\\'"
+    "[/\\\\]\\.shadow-cljs\\'"
+    "[/\\\\]\\.babel_cache\\'"
+    "[/\\\\]\\.cpcache\\'"
+    "[/\\\\]\\checkouts\\'"
+    ;; Gradle
+    "[/\\\\]\\.gradle\\'"
+    ;; Maven
+    "[/\\\\]\\.m2\\'"
+    ;; .Net Core build-output
+    "[/\\\\]bin/Debug\\'"
+    "[/\\\\]obj\\'"
+    ;; OCaml and Dune
+    "[/\\\\]_opam\\'"
+    "[/\\\\]_build\\'"
+    ;; Elixir
+    "[/\\\\]\\.elixir_ls\\'"
+    ;; Elixir Credo
+    "[/\\\\]\\.elixir-tools\\'"
+    ;; terraform and terragrunt
+    "[/\\\\]\\.terraform\\'"
+    "[/\\\\]\\.terragrunt-cache\\'"
+    ;; nix-direnv
+    "[/\\\\]\\result"
+    "[/\\\\]\\result-bin"
+    "[/\\\\]\\.direnv\\'")
+  "List of regexps matching directory paths which won't be monitored when
+creating file watches. Customization of this variable is only honored at
+the global level or at a root of an lsp workspace."
+  :group 'lsp-mode
+  :type '(repeat string)
+  :package-version '(lsp-mode . "8.0.0"))
+
+(define-obsolete-function-alias 'lsp-file-watch-ignored 'lsp-file-watch-ignored-directories "7.0.1")
+
+(defun lsp-file-watch-ignored-directories ()
+  lsp-file-watch-ignored-directories)
+
+;; Allow lsp-file-watch-ignored-directories as a file or directory-local variable
+;;;###autoload(put 'lsp-file-watch-ignored-directories 'safe-local-variable 'lsp--string-listp)
+
+(defcustom lsp-file-watch-ignored-files
+  '(
+    ;; Flycheck tempfiles
+    "[/\\\\]flycheck_[^/\\\\]+\\'"
+    ;; lockfiles
+    "[/\\\\]\\.#[^/\\\\]+\\'"
+    ;; backup files
+    "[/\\\\][^/\\\\]+~\\'" )
+  "List of regexps matching files for which change events will
+not be sent to the server.
+
+This setting has no impact on whether a file-watch is created for
+a directory; it merely prevents notifications pertaining to
+matched files from being sent to the server.  To prevent a
+file-watch from being created for a directory, customize
+`lsp-file-watch-ignored-directories'
+
+Customization of this variable is only honored at the global
+level or at a root of an lsp workspace."
+  :group 'lsp-mode
+  :type '(repeat string)
+  :package-version '(lsp-mode . "8.0.0"))
+
+;; Allow lsp-file-watch-ignored-files as a file or directory-local variable
+;;;###autoload(put 'lsp-file-watch-ignored-files 'safe-local-variable 'lsp--string-listp)
+
+(defcustom lsp-after-uninitialized-functions nil
+  "List of functions to be called after a Language Server has been uninitialized."
+  :type 'hook
+  :group 'lsp-mode
+  :package-version '(lsp-mode . "6.3"))
+
+(defconst lsp--sync-full 1)
+(defconst lsp--sync-incremental 2)
+
+(defcustom lsp-debounce-full-sync-notifications t
+  "If non-nil debounce full sync events.
+This flag affects only servers which do not support incremental updates."
+  :type 'boolean
+  :group 'lsp-mode
+  :package-version '(lsp-mode . "6.1"))
+
+(defcustom lsp-debounce-full-sync-notifications-interval 1.0
+  "Time to wait before sending full sync synchronization after buffer modification."
+  :type 'float
+  :group 'lsp-mode
+  :package-version '(lsp-mode . "6.1"))
+
+(defvar lsp--stderr-index 0)
+
+(defvar lsp--delayed-requests nil)
+(defvar lsp--delay-timer nil)
+
+(defcustom lsp-document-sync-method nil
+  "How to sync the document with the language server."
+  :type '(choice (const :tag "Documents are synced by always sending the full content of the document." lsp--sync-full)
+                 (const :tag "Documents are synced by always sending incremental changes to the document." lsp--sync-incremental)
+                 (const :tag "Use the method recommended by the language server." nil))
+  :group 'lsp-mode)
+
+(defcustom lsp-auto-execute-action t
+  "Auto-execute single action."
+  :type 'boolean
+  :group 'lsp-mode)
+
+(defcustom lsp-enable-links t
+  "If non-nil, all references to links in a file will be made clickable, if
+supported by the language server."
+  :type 'boolean
+  :group 'lsp-mode
+  :package-version '(lsp-mode . "6.1"))
+
+(defcustom lsp-enable-imenu t
+  "If non-nil, automatically enable `imenu' integration when server provides
+`textDocument/documentSymbol'."
+  :type 'boolean
+  :group 'lsp-mode
+  :package-version '(lsp-mode . "6.2"))
+
+(defcustom lsp-enable-dap-auto-configure t
+  "If non-nil, enable `dap-auto-configure-mode`."
+  :type 'boolean
+  :group 'lsp-mode
+  :package-version '(lsp-mode . "7.0"))
+
+(defcustom lsp-eldoc-enable-hover t
+  "If non-nil, `eldoc' will display hover info when it is present."
+  :type 'boolean
+  :group 'lsp-mode)
+
+(defcustom lsp-eldoc-render-all nil
+  "Display all of the info returned by document/onHover.
+If this is set to nil, `eldoc' will show only the symbol information."
+  :type 'boolean
+  :group 'lsp-mode)
+
+(define-obsolete-variable-alias 'lsp-enable-completion-at-point
+  'lsp-completion-enable "lsp-mode 7.0.1")
+
+(defcustom lsp-completion-enable t
+  "Enable `completion-at-point' integration."
+  :type 'boolean
+  :group 'lsp-completion)
+
+(defcustom lsp-enable-symbol-highlighting t
+  "Highlight references of the symbol at point."
+  :type 'boolean
+  :group 'lsp-mode)
+
+(defcustom lsp-enable-xref t
+  "Enable xref integration."
+  :type 'boolean
+  :group 'lsp-mode)
+
+(defcustom lsp-references-exclude-definition nil
+  "If non-nil, exclude declarations when finding references."
+  :type 'boolean
+  :group 'lsp-mode)
+
+(defcustom lsp-enable-indentation t
+  "Indent regions using the file formatting functionality provided by the
+language server."
+  :type 'boolean
+  :group 'lsp-mode)
+
+(defcustom lsp-enable-on-type-formatting t
+  "Enable `textDocument/onTypeFormatting' integration."
+  :type 'boolean
+  :group 'lsp-mode)
+
+(defcustom lsp-enable-text-document-color t
+  "Enable `textDocument/documentColor' integration."
+  :type 'boolean
+  :group 'lsp-mode)
+
+(defcustom lsp-before-save-edits t
+  "If non-nil, `lsp-mode' will apply edits suggested by the language server
+before saving a document."
+  :type 'boolean
+  :group 'lsp-mode)
+
+(defcustom lsp-after-apply-edits-hook nil
+  "Hooks to run when text edit is applied.
+It contains the operation source."
+  :type 'hook
+  :group 'lsp-mode
+  :package-version '(lsp-mode . "8.0.0"))
+
+(defcustom lsp-apply-edits-after-file-operations t
+  "Whether to apply edits returned by server after file operations if any.
+Applicable only if server supports workspace.fileOperations for operations:
+`workspace/willRenameFiles', `workspace/willCreateFiles' and
+`workspace/willDeleteFiles'."
+  :group 'lsp-mode
+  :type 'boolean)
+
+(defcustom lsp-modeline-code-actions-enable t
+  "Whether to show code actions on modeline."
+  :type 'boolean
+  :group 'lsp-modeline)
+
+(defcustom lsp-modeline-diagnostics-enable t
+  "Whether to show diagnostics on modeline."
+  :type 'boolean
+  :group 'lsp-modeline)
+
+(defcustom lsp-modeline-workspace-status-enable t
+  "Whether to show workspace status on modeline."
+  :type 'boolean
+  :group 'lsp-modeline
+  :package-version '(lsp-mode . "8.0.0"))
+
+(defcustom lsp-headerline-breadcrumb-enable t
+  "Whether to enable breadcrumb on headerline."
+  :type 'boolean
+  :group 'lsp-headerline)
+
+(defcustom lsp-configure-hook nil
+  "Hooks to run when `lsp-configure-buffer' is called."
+  :type 'hook
+  :group 'lsp-mode)
+
+(defcustom lsp-unconfigure-hook nil
+  "Hooks to run when `lsp-unconfig-buffer' is called."
+  :type 'hook
+  :group 'lsp-mode)
+
+(defcustom lsp-after-diagnostics-hook nil
+  "Hooks to run after diagnostics are received.
+Note: it runs only if the receiving buffer is open. Use
+`lsp-diagnostics-updated-hook'if you want to be notified when
+diagnostics have changed."
+  :type 'hook
+  :group 'lsp-mode)
+
+(define-obsolete-variable-alias 'lsp-after-diagnostics-hook
+  'lsp-diagnostics-updated-hook "lsp-mode 6.4")
+
+(defcustom lsp-diagnostics-updated-hook nil
+  "Hooks to run after diagnostics are received."
+  :type 'hook
+  :group 'lsp-mode)
+
+(define-obsolete-variable-alias 'lsp-workspace-folders-changed-hook
+  'lsp-workspace-folders-changed-functions "lsp-mode 6.3")
+
+(defcustom lsp-workspace-folders-changed-functions nil
+  "Hooks to run after the folders has changed.
+The hook will receive two parameters list of added and removed folders."
+  :type 'hook
+  :group 'lsp-mode)
+
+(define-obsolete-variable-alias 'lsp-eldoc-hook 'eldoc-documentation-functions "lsp-mode 9.0.0")
+
+(defcustom lsp-before-apply-edits-hook nil
+  "Hooks to run before applying edits."
+  :type 'hook
+  :group 'lsp-mode)
+
+(defgroup lsp-imenu nil
+  "LSP Imenu."
+  :group 'lsp-mode
+  :tag "LSP Imenu")
+
+(defcustom lsp-imenu-show-container-name t
+  "Display the symbol's container name in an imenu entry."
+  :type 'boolean
+  :group 'lsp-imenu)
+
+(defcustom lsp-imenu-container-name-separator "/"
+  "Separator string to use to separate the container name from the symbol while
+displaying imenu entries."
+  :type 'string
+  :group 'lsp-imenu)
+
+(defcustom lsp-imenu-sort-methods '(kind name)
+  "How to sort the imenu items.
+
+The value is a list of `kind' `name' or `position'.  Priorities
+are determined by the index of the element."
+  :type '(repeat (choice (const name)
+                         (const position)
+                         (const kind)))
+  :group 'lsp-imenu)
+
+(defcustom lsp-imenu-index-symbol-kinds nil
+  "Which symbol kinds to show in imenu."
+  :type '(repeat (choice (const :tag "Miscellaneous" nil)
+                         (const :tag "File" File)
+                         (const :tag "Module" Module)
+                         (const :tag "Namespace" Namespace)
+                         (const :tag "Package" Package)
+                         (const :tag "Class" Class)
+                         (const :tag "Method" Method)
+                         (const :tag "Property" Property)
+                         (const :tag "Field" Field)
+                         (const :tag "Constructor" Constructor)
+                         (const :tag "Enum" Enum)
+                         (const :tag "Interface" Interface)
+                         (const :tag "Function" Function)
+                         (const :tag "Variable" Variable)
+                         (const :tag "Constant" Constant)
+                         (const :tag "String" String)
+                         (const :tag "Number" Number)
+                         (const :tag "Boolean" Boolean)
+                         (const :tag "Array" Array)
+                         (const :tag "Object" Object)
+                         (const :tag "Key" Key)
+                         (const :tag "Null" Null)
+                         (const :tag "Enum Member" EnumMember)
+                         (const :tag "Struct" Struct)
+                         (const :tag "Event" Event)
+                         (const :tag "Operator" Operator)
+                         (const :tag "Type Parameter" TypeParameter)))
+  :group 'lsp-imenu)
+
+;; vibhavp: Should we use a lower value (5)?
+(defcustom lsp-response-timeout 10
+  "Number of seconds to wait for a response from the language server before
+timing out. Nil if no timeout."
+  :type '(choice
+          (number :tag "Seconds")
+          (const :tag "No timeout" nil))
+  :group 'lsp-mode)
+
+(defcustom lsp-tcp-connection-timeout 2
+  "The timeout for tcp connection in seconds."
+  :type 'number
+  :group 'lsp-mode
+  :package-version '(lsp-mode . "6.2"))
+
+(defconst lsp--imenu-compare-function-alist
+  (list (cons 'name #'lsp--imenu-compare-name)
+        (cons 'kind #'lsp--imenu-compare-kind)
+        (cons 'position #'lsp--imenu-compare-line-col))
+  "An alist of (METHOD . FUNCTION).
+METHOD is one of the symbols accepted by
+`lsp-imenu-sort-methods'.
+
+FUNCTION takes two hash tables representing DocumentSymbol.  It
+returns a negative number, 0, or a positive number indicating
+whether the first parameter is less than, equal to, or greater
+than the second parameter.")
+
+(defcustom lsp-diagnostic-clean-after-change nil
+  "When non-nil, clean the diagnostics on change.
+
+Note that when that setting is nil, `lsp-mode' will show stale
+diagnostics until server publishes the new set of diagnostics"
+  :type 'boolean
+  :group 'lsp-diagnostics
+  :package-version '(lsp-mode . "7.0.1"))
+
+(defcustom lsp-server-trace nil
+  "Request tracing on the server side.
+The actual trace output at each level depends on the language server in use.
+Changes take effect only when a new session is started."
+  :type '(choice (const :tag "Disabled" "off")
+                 (const :tag "Messages only" "messages")
+                 (const :tag "Verbose" "verbose")
+                 (const :tag "Default (disabled)" nil))
+  :group 'lsp-mode
+  :package-version '(lsp-mode . "6.1"))
+
+(defcustom lsp-auto-touch-files t
+  "If non-nil ensure the files exist before sending
+`textDocument/didOpen' notification."
+  :type 'boolean
+  :group 'lsp-mode
+  :package-version '(lsp-mode . "9.0.0"))
+
+(defvar lsp-language-id-configuration
+  '(("\\(^CMakeLists\\.txt\\|\\.cmake\\)\\'" . "cmake")
+    ("\\(^Dockerfile\\(?:\\..*\\)?\\|\\.[Dd]ockerfile\\)\\'" . "dockerfile")
+    ("\\.astro$" . "astro")
+    ("\\.cs\\'" . "csharp")
+    ("\\.css$" . "css")
+    ("\\.cypher$" . "cypher")
+    ("Earthfile" . "earthfile")
+    ("\\.ebuild$" . "shellscript")
+    ("\\.go\\'" . "go")
+    ("\\.html$" . "html")
+    ("\\.hx$" . "haxe")
+    ("\\.hy$" . "hy")
+    ("\\.java\\'" . "java")
+    ("\\.jq$"  . "jq")
+    ("\\.js$" . "javascript")
+    ("\\.json$" . "json")
+    ("\\.jsonc$" . "jsonc")
+    ("\\.jsonnet$" . "jsonnet")
+    ("\\.jsx$" . "javascriptreact")
+    ("\\.lua$" . "lua")
+    ("\\.mdx\\'" . "mdx")
+    ("\\.nu$" . "nushell")
+    ("\\.php$" . "php")
+    ("\\.ps[dm]?1\\'" . "powershell")
+    ("\\.rs\\'" . "rust")
+    ("\\.spec\\'" . "rpm-spec")
+    ("\\.sql$" . "sql")
+    ("\\.svelte$" . "svelte")
+    ("\\.toml\\'" . "toml")
+    ("\\.ts$" . "typescript")
+    ("\\.tsx$" . "typescriptreact")
+    ("\\.ttcn3$" . "ttcn3")
+    ("\\.vue$" . "vue")
+    ("\\.xml$" . "xml")
+    ("\\ya?ml$" . "yaml")
+    ("^PKGBUILD$" . "shellscript")
+    ("^go\\.mod\\'" . "go.mod")
+    ("^settings\\.json$" . "jsonc")
+    ("^yang\\.settings$" . "jsonc")
+    ("^meson\\(_options\\.txt\\|\\.\\(build\\|format\\)\\)\\'" . "meson")
+    (ada-mode . "ada")
+    (ada-ts-mode . "ada")
+    (gpr-mode . "gpr")
+    (gpr-ts-mode . "gpr")
+    (awk-mode . "awk")
+    (awk-ts-mode . "awk")
+    (nxml-mode . "xml")
+    (sql-mode . "sql")
+    (vimrc-mode . "vim")
+    (vimscript-ts-mode . "vim")
+    (sh-mode . "shellscript")
+    (bash-ts-mode . "shellscript")
+    (ebuild-mode . "shellscript")
+    (pkgbuild-mode . "shellscript")
+    (envrc-file-mode . "shellscript")
+    (scala-mode . "scala")
+    (scala-ts-mode . "scala")
+    (julia-mode . "julia")
+    (julia-ts-mode . "julia")
+    (clojure-mode . "clojure")
+    (clojurec-mode . "clojure")
+    (clojurescript-mode . "clojurescript")
+    (clojure-ts-mode . "clojure")
+    (clojure-ts-clojurec-mode . "clojure")
+    (clojure-ts-clojurescript-mode . "clojurescript")
+    (java-mode . "java")
+    (java-ts-mode . "java")
+    (jdee-mode . "java")
+    (groovy-mode . "groovy")
+    (python-mode . "python")
+    (python-ts-mode . "python")
+    (cython-mode . "python")
+    ("\\(\\.mojo\\|\\.🔥\\)\\'" . "mojo")
+    (lsp--render-markdown . "markdown")
+    (move-mode . "move")
+    (rust-mode . "rust")
+    (rust-ts-mode . "rust")
+    (rustic-mode . "rust")
+    (kotlin-mode . "kotlin")
+    (kotlin-ts-mode . "kotlin")
+    (css-mode . "css")
+    (css-ts-mode . "css")
+    (less-mode . "less")
+    (less-css-mode . "less")
+    (lua-mode . "lua")
+    (lua-ts-mode . "lua")
+    (sass-mode . "sass")
+    (ssass-mode . "sass")
+    (scss-mode . "scss")
+    (scad-mode . "openscad")
+    (xml-mode . "xml")
+    (c-mode . "c")
+    (c-ts-mode . "c")
+    (c++-mode . "cpp")
+    (c++-ts-mode . "cpp")
+    (cuda-mode . "cuda")
+    (objc-mode . "objective-c")
+    (html-mode . "html")
+    (html-ts-mode . "html")
+    (sgml-mode . "html")
+    (mhtml-mode . "html")
+    (mint-mode . "mint")
+    (go-dot-mod-mode . "go.mod")
+    (go-mod-ts-mode . "go.mod")
+    (go-mode . "go")
+    (go-ts-mode . "go")
+    (graphql-mode . "graphql")
+    (haskell-mode . "haskell")
+    (haskell-ts-mode . "haskell")
+    (hack-mode . "hack")
+    (php-mode . "php")
+    (php-ts-mode . "php")
+    (powershell-mode . "powershell")
+    (powershell-mode . "PowerShell")
+    (powershell-ts-mode . "powershell")
+    (json-mode . "json")
+    (json-ts-mode . "json")
+    (jsonc-mode . "jsonc")
+    (rjsx-mode . "javascript")
+    (js2-mode . "javascript")
+    (js-mode . "javascript")
+    (js-ts-mode . "javascript")
+    (typescript-mode . "typescript")
+    (typescript-ts-mode . "typescript")
+    (tsx-ts-mode . "typescriptreact")
+    (svelte-mode . "svelte")
+    (fsharp-mode . "fsharp")
+    (reason-mode . "reason")
+    (caml-mode . "ocaml")
+    (tuareg-mode . "ocaml")
+    (futhark-mode . "futhark")
+    (swift-mode . "swift")
+    (elixir-mode . "elixir")
+    (elixir-ts-mode . "elixir")
+    (heex-ts-mode . "elixir")
+    (conf-javaprop-mode . "spring-boot-properties")
+    (yaml-mode . "yaml")
+    (yaml-ts-mode . "yaml")
+    (ruby-mode . "ruby")
+    (enh-ruby-mode . "ruby")
+    (ruby-ts-mode . "ruby")
+    (feature-mode . "cucumber")
+    (fortran-mode . "fortran")
+    (f90-mode . "fortran")
+    (elm-mode . "elm")
+    (dart-mode . "dart")
+    (erlang-mode . "erlang")
+    (dockerfile-mode . "dockerfile")
+    (dockerfile-ts-mode . "dockerfile")
+    (csharp-mode . "csharp")
+    (csharp-tree-sitter-mode . "csharp")
+    (csharp-ts-mode . "csharp")
+    (plain-tex-mode . "plaintex")
+    (context-mode . "context")
+    (cypher-mode . "cypher")
+    (latex-mode . "latex")
+    (LaTeX-mode . "latex")
+    (v-mode . "v")
+    (vhdl-mode . "vhdl")
+    (vhdl-ts-mode . "vhdl")
+    (verilog-mode . "verilog")
+    (terraform-mode . "terraform")
+    (ess-julia-mode . "julia")
+    (ess-r-mode . "r")
+    (crystal-mode . "crystal")
+    (nim-mode . "nim")
+    (dhall-mode . "dhall")
+    (cmake-mode . "cmake")
+    (cmake-ts-mode . "cmake")
+    (purescript-mode . "purescript")
+    (gdscript-mode . "gdscript")
+    (gdscript-ts-mode . "gdscript")
+    (perl-mode . "perl")
+    (cperl-mode . "perl")
+    (robot-mode . "robot")
+    (racket-mode . "racket")
+    (nix-mode . "nix")
+    (nix-ts-mode . "nix")
+    (prolog-mode . "prolog")
+    (vala-mode . "vala")
+    (actionscript-mode . "actionscript")
+    (d-mode . "d")
+    (zig-mode . "zig")
+    (text-mode . "plaintext")
+    (markdown-mode . "markdown")
+    (gfm-mode . "markdown")
+    (beancount-mode . "beancount")
+    (conf-toml-mode . "toml")
+    (toml-ts-mode . "toml")
+    (org-mode . "org")
+    (org-journal-mode . "org")
+    (nginx-mode . "nginx")
+    (magik-mode . "magik")
+    (magik-ts-mode . "magik")
+    (idris-mode . "idris")
+    (idris2-mode . "idris2")
+    (gleam-mode . "gleam")
+    (gleam-ts-mode . "gleam")
+    (graphviz-dot-mode . "dot")
+    (tiltfile-mode . "tiltfile")
+    (solidity-mode . "solidity")
+    (bibtex-mode . "bibtex")
+    (rst-mode . "restructuredtext")
+    (glsl-mode . "glsl")
+    (shader-mode . "shaderlab")
+    (wgsl-mode . "wgsl")
+    (jq-mode . "jq")
+    (jq-ts-mode . "jq")
+    (protobuf-mode . "protobuf")
+    (nushell-mode . "nushell")
+    (nushell-ts-mode . "nushell")
+    (meson-mode . "meson")
+    (yang-mode . "yang"))
+  "Language id configuration.")
+
+(defvar lsp--last-active-workspaces nil
+  "Keep track of last active workspace.
+We want to try the last workspace first when jumping into a library
+directory")
+
+(defvar lsp-method-requirements
+  '(("textDocument/callHierarchy" :capability :callHierarchyProvider)
+    ("textDocument/codeAction" :capability :codeActionProvider)
+    ("codeAction/resolve"
+     :check-command (lambda (workspace)
+                      (with-lsp-workspace workspace
+                        (lsp:code-action-options-resolve-provider?
+                         (lsp--capability-for-method "textDocument/codeAction")))))
+    ("textDocument/codeLens" :capability :codeLensProvider)
+    ("textDocument/completion" :capability :completionProvider)
+    ("completionItem/resolve"
+     :check-command (lambda (wk)
+                      (with-lsp-workspace wk
+                        (lsp:completion-options-resolve-provider?
+                         (lsp--capability-for-method "textDocument/completion")))))
+    ("textDocument/declaration" :capability :declarationProvider)
+    ("textDocument/definition" :capability :definitionProvider)
+    ("textDocument/documentColor" :capability :colorProvider)
+    ("textDocument/documentLink" :capability :documentLinkProvider)
+    ("textDocument/inlayHint" :capability :inlayHintProvider)
+    ("textDocument/documentHighlight" :capability :documentHighlightProvider)
+    ("textDocument/documentSymbol" :capability :documentSymbolProvider)
+    ("textDocument/foldingRange" :capability :foldingRangeProvider)
+    ("textDocument/formatting" :capability :documentFormattingProvider)
+    ("textDocument/hover" :capability :hoverProvider)
+    ("textDocument/implementation" :capability :implementationProvider)
+    ("textDocument/linkedEditingRange" :capability :linkedEditingRangeProvider)
+    ("textDocument/onTypeFormatting" :capability :documentOnTypeFormattingProvider)
+    ("textDocument/prepareRename"
+     :check-command (lambda (workspace)
+                      (with-lsp-workspace workspace
+                        (lsp:rename-options-prepare-provider?
+                         (lsp--capability-for-method "textDocument/rename")))))
+    ("textDocument/rangeFormatting" :capability :documentRangeFormattingProvider)
+    ("textDocument/references" :capability :referencesProvider)
+    ("textDocument/rename" :capability :renameProvider)
+    ("textDocument/selectionRange" :capability :selectionRangeProvider)
+    ("textDocument/semanticTokens" :capability :semanticTokensProvider)
+    ("textDocument/semanticTokensFull"
+     :check-command (lambda (workspace)
+                      (with-lsp-workspace workspace
+                        (lsp-get (lsp--capability :semanticTokensProvider) :full))))
+    ("textDocument/semanticTokensFull/Delta"
+     :check-command (lambda (workspace)
+                      (with-lsp-workspace workspace
+                        (let ((capFull (lsp-get (lsp--capability :semanticTokensProvider) :full)))
+                          (and (not (booleanp capFull)) (lsp-get capFull :delta))))))
+    ("textDocument/semanticTokensRangeProvider"
+     :check-command (lambda (workspace)
+                      (with-lsp-workspace workspace
+                        (lsp-get (lsp--capability :semanticTokensProvider) :range))))
+    ("textDocument/signatureHelp" :capability :signatureHelpProvider)
+    ("textDocument/typeDefinition" :capability :typeDefinitionProvider)
+    ("textDocument/typeHierarchy" :capability :typeHierarchyProvider)
+    ("textDocument/diagnostic" :capability :diagnosticProvider)
+    ("workspace/executeCommand" :capability :executeCommandProvider)
+    ("workspace/symbol" :capability :workspaceSymbolProvider))
+
+  "Map methods to requirements.
+It is used by request-sending functions to determine which server
+must be used for handling a particular message.")
+
+(defconst lsp--file-change-type
+  `((created . 1)
+    (changed . 2)
+    (deleted . 3)))
+
+(defconst lsp--watch-kind
+  `((create . 1)
+    (change . 2)
+    (delete . 4)))
+
+(defvar lsp-window-body-width 40
+  "Window body width when rendering doc.")
+
+(defface lsp-face-highlight-textual
+  '((t :inherit highlight))
+  "Face used for textual occurrences of symbols."
+  :group 'lsp-mode)
+
+(defface lsp-face-highlight-read
+  '((t :inherit highlight :underline t))
+  "Face used for highlighting symbols being read."
+  :group 'lsp-mode)
+
+(defface lsp-face-highlight-write
+  '((t :inherit highlight :weight bold))
+  "Face used for highlighting symbols being written to."
+  :group 'lsp-mode)
+
+(define-obsolete-variable-alias 'lsp-lens-auto-enable
+  'lsp-lens-enable "lsp-mode 7.0.1")
+
+(defcustom lsp-lens-enable t
+  "Auto enable lenses if server supports."
+  :group 'lsp-lens
+  :type 'boolean
+  :package-version '(lsp-mode . "6.3"))
+
+(defcustom lsp-symbol-highlighting-skip-current nil
+  "If non-nil skip current symbol when setting symbol highlights."
+  :group 'lsp-mode
+  :type 'boolean)
+
+(defcustom lsp-file-watch-threshold 1000
+  "Show warning if the files to watch are more than.
+Set to nil to disable the warning."
+  :type 'number
+  :group 'lsp-mode)
+;;;###autoload(put 'lsp-file-watch-threshold 'safe-local-variable (lambda (i) (or (numberp i) (not i))))
+
+(defvar lsp-custom-markup-modes
+  '((rust-mode "no_run" "rust,no_run" "rust,ignore" "rust,should_panic"))
+  "Mode to uses with markdown code blocks.
+They are added to `markdown-code-lang-modes'")
+
+(defcustom lsp-signature-render-documentation t
+  "Display signature documentation in `eldoc'."
+  :type 'boolean
+  :group 'lsp-mode
+  :package-version '(lsp-mode . "6.2"))
+
+(defcustom lsp-signature-auto-activate '(:on-trigger-char :on-server-request)
+  "Auto activate signature conditions."
+  :type '(repeat (choice (const :tag "On trigger chars pressed." :on-trigger-char)
+                         (const :tag "After selected completion." :after-completion)
+                         (const :tag "When the server has sent show signature help." :on-server-request)))
+  :group 'lsp-mode
+  :package-version '(lsp-mode . "6.2"))
+
+(defcustom lsp-signature-doc-lines 20
+  "If number, limit the number of lines to show in the docs."
+  :type 'number
+  :group 'lsp-mode
+  :package-version '(lsp-mode . "6.3"))
+
+(defcustom lsp-signature-function 'lsp-lv-message
+  "The function used for displaying signature info.
+It will be called with one param - the signature info. When
+called with nil the signature info must be cleared."
+  :type 'function
+  :group 'lsp-mode
+  :package-version '(lsp-mode . "6.3"))
+
+(defcustom lsp-keymap-prefix "s-l"
+  "LSP-mode keymap prefix."
+  :group 'lsp-mode
+  :type 'string
+  :package-version '(lsp-mode . "6.3"))
+
+(defvar-local lsp--buffer-workspaces ()
+  "List of the buffer workspaces.")
+
+(defvar-local lsp--buffer-deferred nil
+  "Whether buffer was loaded via `lsp-deferred'.")
+
+(defvar lsp--session nil
+  "Contain the `lsp-session' for the current Emacs instance.")
+
+(defvar lsp--tcp-port 10000)
+
+(defvar lsp--client-packages-required nil
+  "If nil, `lsp-client-packages' are yet to be required.")
+
+(defvar lsp--tcp-server-port 0
+  "The server socket which is opened when using `lsp-tcp-server' (a server
+socket is opened in Emacs and the language server connects to it).  The
+default value of 0 ensures that a random high port is used. Set it to a positive
+integer to use a specific port.")
+
+(defvar lsp--tcp-server-wait-seconds 10
+  "Wait this amount of time for the client to connect to our server socket
+when using `lsp-tcp-server'.")
+
+(defvar-local lsp--document-symbols nil
+  "The latest document symbols.")
+
+(defvar-local lsp--document-selection-range-cache nil
+  "The document selection cache.")
+
+(defvar-local lsp--document-symbols-request-async nil
+  "If non-nil, request document symbols asynchronously.")
+
+(defvar-local lsp--document-symbols-tick -1
+  "The value of `buffer-chars-modified-tick' when document
+  symbols were last retrieved.")
+
+(defvar-local lsp--have-document-highlights nil
+  "Set to `t' on symbol highlighting, cleared on
+`lsp--cleanup-highlights-if-needed'. Checking a separately
+defined flag is substantially faster than unconditionally
+calling `remove-overlays'.")
+
+;; Buffer local variable for storing number of lines.
+(defvar lsp--log-lines)
+
+(defvar-local lsp--eldoc-saved-message nil)
+
+(defvar lsp--on-change-timer nil)
+(defvar lsp--on-idle-timer nil)
+
+(defvar-local lsp--signature-last nil)
+(defvar-local lsp--signature-last-index nil)
+(defvar lsp--signature-last-buffer nil)
+
+(defvar-local lsp--virtual-buffer-point-max nil)
+
+(cl-defmethod lsp-execute-command (_server _command _arguments)
+  "Ask SERVER to execute COMMAND with ARGUMENTS.")
+
+(defun lsp-elt (sequence n)
+  "Return Nth element of SEQUENCE or nil if N is out of range."
+  (cond
+   ((listp sequence) (elt sequence n))
+   ((arrayp sequence)
+    (and (> (length sequence) n) (aref sequence n)))
+   (t (and (> (length sequence) n) (elt sequence n)))))
+
+;; define seq-first and seq-rest for older emacs
+(defun lsp-seq-first (sequence)
+  "Return the first element of SEQUENCE."
+  (lsp-elt sequence 0))
+
+(defun lsp-seq-rest (sequence)
+  "Return a sequence of the elements of SEQUENCE except the first one."
+  (seq-drop sequence 1))
+
+;;;###autoload
+(defun lsp--string-listp (sequence)
+  "Return t if all elements of SEQUENCE are strings, else nil."
+  (not (seq-find (lambda (x) (not (stringp x))) sequence)))
+
+(defun lsp--string-vector-p (candidate)
+  "Returns true if CANDIDATE is a vector data structure and
+every element of it is of type string, else nil."
+  (and
+   (vectorp candidate)
+   (seq-every-p #'stringp candidate)))
+
+(make-obsolete 'lsp--string-vector-p nil "lsp-mode 8.0.0")
+
+(defun lsp--editable-vector-match (widget value)
+  "Function for `lsp-editable-vector' :match."
+  ;; Value must be a list or a vector and all the members must match the type.
+  (and (or (listp value) (vectorp value))
+       (length (cdr (lsp--editable-vector-match-inline widget value)))))
+
+(defun lsp--editable-vector-match-inline (widget value)
+  "Value for `lsp-editable-vector' :match-inline."
+  (let ((type (nth 0 (widget-get widget :args)))
+        (ok t)
+        found)
+    (while (and value ok)
+      (let ((answer (widget-match-inline type value)))
+        (if answer
+            (let ((head (if (vectorp answer) (aref answer 0) (car answer)))
+                  (tail (if (vectorp answer) (seq-drop 1 answer) (cdr answer))))
+              (setq found (append found head)
+                    value tail))
+          (setq ok nil))))
+    (cons found value)))
+
+(defun lsp--editable-vector-value-to-external (_widget internal-value)
+  "Convert the internal list value to a vector."
+  (if (listp internal-value)
+      (apply 'vector internal-value)
+    internal-value))
+
+(defun lsp--editable-vector-value-to-internal (_widget external-value)
+  "Convert the external vector value to a list."
+  (if (vectorp external-value)
+      (append external-value nil)
+    external-value))
+
+(define-widget 'lsp--editable-vector 'editable-list
+  "A subclass of `editable-list' that accepts and returns a
+vector instead of a list."
+  :value-to-external 'lsp--editable-vector-value-to-external
+  :value-to-internal 'lsp--editable-vector-value-to-internal
+  :match 'lsp--editable-vector-match
+  :match-inline 'lsp--editable-vector-match-inline)
+
+(define-widget 'lsp-repeatable-vector 'lsp--editable-vector
+  "A variable length homogeneous vector."
+  :tag "Repeat"
+  :format "%{%t%}:\n%v%i\n")
+
+(define-widget 'lsp-string-vector 'lazy
+  "A vector of zero or more elements, every element of which is a string.
+Appropriate for any language-specific `defcustom' that needs to
+serialize as a JSON array of strings.
+
+Deprecated. Use `lsp-repeatable-vector' instead. "
+  :offset 4
+  :tag "Vector"
+  :type '(lsp-repeatable-vector string))
+
+(make-obsolete 'lsp-string-vector nil "lsp-mode 8.0.0")
+
+(defvar lsp--show-message t
+  "If non-nil, show debug message from `lsp-mode'.")
+
+(defun lsp--message  (format &rest args)
+  "Wrapper for `message'
+
+We `inhibit-message' the message when the cursor is in the
+minibuffer and when emacs version is before emacs 27 due to the
+fact that we often use `lsp--info', `lsp--warn' and `lsp--error'
+in async context and the call to these function is removing the
+minibuffer prompt. The issue with async messages is already fixed
+in emacs 27.
+
+See #2049"
+  (when lsp--show-message
+    (let ((inhibit-message (or inhibit-message
+                               (and (minibufferp)
+                                    (version< emacs-version "27.0")))))
+      (apply #'message format args))))
+
+(defun lsp--info (format &rest args)
+  "Display lsp info message with FORMAT with ARGS."
+  (lsp--message "%s :: %s" (propertize "LSP" 'face 'success) (apply #'format format args)))
+
+(defun lsp--warn (format &rest args)
+  "Display lsp warn message with FORMAT with ARGS."
+  (lsp--message "%s :: %s" (propertize "LSP" 'face 'warning) (apply #'format format args)))
+
+(defun lsp--error (format &rest args)
+  "Display lsp error message with FORMAT with ARGS."
+  (lsp--message "%s :: %s" (propertize "LSP" 'face 'error) (apply #'format format args)))
+
+(defun lsp-log (format &rest args)
+  "Log message to the ’*lsp-log*’ buffer.
+
+FORMAT and ARGS i the same as for `message'."
+  (when lsp-log-max
+    (let ((log-buffer (get-buffer "*lsp-log*"))
+          (inhibit-read-only t))
+      (unless log-buffer
+        (setq log-buffer (get-buffer-create "*lsp-log*"))
+        (with-current-buffer log-buffer
+          (buffer-disable-undo)
+          (view-mode 1)
+          (set (make-local-variable 'lsp--log-lines) 0)))
+      (with-current-buffer log-buffer
+        (save-excursion
+          (let* ((message (apply 'format format args))
+                 ;; Count newlines in message.
+                 (newlines (1+ (cl-loop with start = 0
+                                        for count from 0
+                                        while (string-match "\n" message start)
+                                        do (setq start (match-end 0))
+                                        finally return count))))
+            (goto-char (point-max))
+
+            ;; in case the buffer is not empty insert before last \n to preserve
+            ;; the point position(in case it is in the end)
+            (if (eq (point) (point-min))
+                (progn
+                  (insert "\n")
+                  (backward-char))
+              (backward-char)
+              (insert "\n"))
+            (insert message)
+
+            (setq lsp--log-lines (+ lsp--log-lines newlines))
+
+            (when (and (integerp lsp-log-max) (> lsp--log-lines lsp-log-max))
+              (let ((to-delete (- lsp--log-lines lsp-log-max)))
+                (goto-char (point-min))
+                (forward-line to-delete)
+                (delete-region (point-min) (point))
+                (setq lsp--log-lines lsp-log-max)))))))))
+
+(defalias 'lsp-message 'lsp-log)
+
+(defalias 'lsp-ht 'ht)
+
+(defalias 'lsp-file-local-name 'file-local-name)
+
+(defun lsp-f-canonical (file-name)
+  "Return the canonical FILE-NAME, without a trailing slash."
+  (directory-file-name (expand-file-name file-name)))
+
+(defalias 'lsp-canonical-file-name 'lsp-f-canonical)
+
+(defun lsp-f-same? (path-a path-b)
+  "Return t if PATH-A and PATH-B are references to the same file.
+Symlinks are not followed."
+  (when (and (f-exists? path-a)
+             (f-exists? path-b))
+    (equal
+     (lsp-f-canonical (directory-file-name (f-expand path-a)))
+     (lsp-f-canonical (directory-file-name (f-expand path-b))))))
+
+(defun lsp-f-parent (path)
+  "Return the parent directory to PATH.
+Symlinks are not followed."
+  (let ((parent (file-name-directory
+                 (directory-file-name (f-expand path default-directory)))))
+    (unless (lsp-f-same? path parent)
+      (if (f-relative? path)
+          (f-relative parent)
+        (directory-file-name parent)))))
+
+(defun lsp-f-ancestor-of? (path-a path-b)
+  "Return t if PATH-A is an ancestor of PATH-B.
+Symlinks are not followed."
+  (unless (lsp-f-same? path-a path-b)
+    (s-prefix? (concat (lsp-f-canonical path-a) (f-path-separator))
+               (lsp-f-canonical path-b))))
+
+(defun lsp--merge-results (results method)
+  "Merge RESULTS by filtering the empty hash-tables and merging
+the lists according to METHOD."
+  (pcase (--map (if (vectorp it)
+                    (append it nil) it)
+                (-filter #'identity results))
+    (`() ())
+    ;; only one result - simply return it
+    (`(,fst) fst)
+    ;; multiple results merge it based on strategy
+    (results
+     (pcase method
+       ("textDocument/hover" (pcase (seq-filter
+                                     (-compose #'not #'lsp-empty?)
+                                     results)
+                               (`(,hover) hover)
+                               (hovers (lsp-make-hover
+                                        :contents
+                                        (-mapcat
+                                         (-lambda ((&Hover :contents))
+                                           (if (and (sequencep contents)
+                                                    (not (stringp contents)))
+                                               (append contents ())
+                                             (list contents)))
+                                         hovers)))))
+       ("textDocument/completion"
+        (lsp-make-completion-list
+         :is-incomplete (seq-some
+                         #'lsp:completion-list-is-incomplete
+                         results)
+         :items (cl-mapcan (lambda (it) (append (if (lsp-completion-list? it)
+                                                    (lsp:completion-list-items it)
+                                                  it)
+                                                nil))
+                           results)))
+       ("completionItem/resolve"
+        (let ((item (cl-first results)))
+          (when-let ((details (seq-filter #'identity
+                                          (seq-map #'lsp:completion-item-detail? results))))
+            (lsp:set-completion-item-detail?
+             item
+             (string-join details " ")))
+          (when-let ((docs (seq-filter #'identity
+                                       (seq-map #'lsp:completion-item-documentation? results))))
+            (lsp:set-completion-item-documentation?
+             item
+             (lsp-make-markup-content
+              :kind (or (seq-some (lambda (it)
+                                    (when (equal (lsp:markup-content-kind it)
+                                                 lsp/markup-kind-markdown)
+                                      lsp/markup-kind-markdown))
+                                  docs)
+                        lsp/markup-kind-plain-text)
+              :value (string-join (seq-map (lambda (doc)
+                                             (or (lsp:markup-content-value doc)
+                                                 (and (stringp doc) doc)))
+                                           docs)
+                                  "\n"))))
+          (when-let ((edits (seq-filter #'identity
+                                        (seq-map #'lsp:completion-item-additional-text-edits? results))))
+            (lsp:set-completion-item-additional-text-edits?
+             item
+             (cl-mapcan (lambda (it) (if (seqp it) it (list it))) edits)))
+          item))
+       (_ (cl-mapcan (lambda (it) (if (seqp it) it (list it))) results))))))
+
+(defun lsp--spinner-start ()
+  "Start spinner indication."
+  (condition-case _err (spinner-start (lsp-progress-spinner-type)) (error)))
+
+(defun lsp--propertize (str type)
+  "Propertize STR as per TYPE."
+  (propertize str 'face (alist-get type lsp--message-type-face)))
+
+(defun lsp-workspaces ()
+  "Return the lsp workspaces associated with the current project."
+  (if lsp--cur-workspace (list lsp--cur-workspace) lsp--buffer-workspaces))
+
+(defun lsp--completing-read (prompt collection transform-fn &optional predicate
+                                    require-match initial-input
+                                    hist def inherit-input-method)
+  "Wrap `completing-read' to provide transformation function and disable sort.
+
+TRANSFORM-FN will be used to transform each of the items before displaying.
+
+PROMPT COLLECTION PREDICATE REQUIRE-MATCH INITIAL-INPUT HIST DEF
+INHERIT-INPUT-METHOD will be proxied to `completing-read' without changes."
+  (let* ((col (--map (cons (funcall transform-fn it) it) collection))
+         (completion (completing-read prompt
+                                      (lambda (string pred action)
+                                        (if (eq action 'metadata)
+                                            `(metadata (display-sort-function . identity))
+                                          (complete-with-action action col string pred)))
+                                      predicate require-match initial-input hist
+                                      def inherit-input-method)))
+    (cdr (assoc completion col))))
+
+(defconst lsp--system-arch (lambda ()
+                             (setq lsp--system-arch
+                                   (pcase system-type
+                                     ('windows-nt
+                                      (pcase system-configuration
+                                        ((rx bol "x86_64-") 'x64)
+                                        (_ 'x86)))
+                                     ('darwin
+                                      (pcase system-configuration
+                                        ((rx "aarch64-") 'arm64)
+                                        (_ 'x64)))
+                                     ('gnu/linux
+                                       (pcase system-configuration
+                                         ((rx bol "aarch64-") 'arm64)
+                                         ((rx bol "x86_64") 'x64)
+                                         ((rx bol (| "i386" "i886")) 'x32)))
+                                     (_
+                                      (pcase system-configuration
+                                        ((rx bol "x86_64") 'x64)
+                                        ((rx bol (| "i386" "i886")) 'x32))))))
+  "Return the system architecture of `Emacs'.
+Special values:
+  `x64'       64bit
+  `x32'       32bit
+  `arm64'     ARM 64bit")
+
+(defmacro lsp-with-current-buffer (buffer-id &rest body)
+  (declare (indent 1) (debug t))
+  `(if-let ((wcb (plist-get ,buffer-id :with-current-buffer)))
+       (with-lsp-workspaces (plist-get ,buffer-id :workspaces)
+         (funcall wcb (lambda () ,@body)))
+     (with-current-buffer ,buffer-id
+       ,@body)))
+
+(defvar lsp--throw-on-input nil
+  "Make `lsp-*-while-no-input' throws `input' on interrupted.")
+
+(defmacro lsp--catch (tag bodyform &rest handlers)
+  "Catch TAG thrown in BODYFORM.
+The return value from TAG will be handled in HANDLERS by `pcase'."
+  (declare (debug (form form &rest (pcase-PAT body))) (indent 2))
+  (let ((re-sym (make-symbol "re")))
+    `(let ((,re-sym (catch ,tag ,bodyform)))
+       (pcase ,re-sym
+         ,@handlers))))
+
+(defmacro lsp--while-no-input (&rest body)
+  "Wrap BODY in `while-no-input' and respecting `non-essential'.
+If `lsp--throw-on-input' is set, will throw if input is pending, else
+return value of `body' or nil if interrupted."
+  (declare (debug t) (indent 0))
+  `(if non-essential
+       (let ((res (while-no-input ,@body)))
+         (cond
+          ((and lsp--throw-on-input (equal res t))
+           (throw 'input :interrupted))
+          ((booleanp res) nil)
+          (t res)))
+     ,@body))
+
+;; A ‘lsp--client’ object describes the client-side behavior of a language
+;; server.  It is used to start individual server processes, each of which is
+;; represented by a ‘lsp--workspace’ object.  Client objects are normally
+;; created using ‘lsp-define-stdio-client’ or ‘lsp-define-tcp-client’.  Each
+;; workspace refers to exactly one client, but there can be multiple workspaces
+;; for a single client.
+(cl-defstruct lsp--client
+  ;; ‘language-id’ is a function that receives a buffer as a single argument
+  ;; and should return the language identifier for that buffer.  See
+  ;; https://microsoft.github.io/language-server-protocol/specification#textdocumentitem
+  ;; for a list of language identifiers.  Also consult the documentation for
+  ;; the language server represented by this client to find out what language
+  ;; identifiers it supports or expects.
+  (language-id nil)
+
+  ;; ‘add-on?’ when set to t the server will be started no matter whether there
+  ;; is another server handling the same mode.
+  (add-on? nil)
+  ;; ‘new-connection’ is a function that should start a language server process
+  ;; and return a cons (COMMAND-PROCESS . COMMUNICATION-PROCESS).
+  ;; COMMAND-PROCESS must be a process object representing the server process
+  ;; just started.  COMMUNICATION-PROCESS must be a process (including pipe and
+  ;; network processes) that ‘lsp-mode’ uses to communicate with the language
+  ;; server using the language server protocol.  COMMAND-PROCESS and
+  ;; COMMUNICATION-PROCESS may be the same process; in that case
+  ;; ‘new-connection’ may also return that process as a single
+  ;; object. ‘new-connection’ is called with two arguments, FILTER and
+  ;; SENTINEL.  FILTER should be used as process filter for
+  ;; COMMUNICATION-PROCESS, and SENTINEL should be used as process sentinel for
+  ;; COMMAND-PROCESS.
+  (new-connection nil)
+
+  ;; ‘ignore-regexps’ is a list of regexps.  When a data packet from the
+  ;; language server matches any of these regexps, it will be ignored.  This is
+  ;; intended for dealing with language servers that output non-protocol data.
+  (ignore-regexps nil)
+
+  ;; ‘ignore-messages’ is a list of regexps.  When a message from the language
+  ;; server matches any of these regexps, it will be ignored.  This is useful
+  ;; for filtering out unwanted messages; such as servers that send nonstandard
+  ;; message types, or extraneous log messages.
+  (ignore-messages nil)
+
+  ;; ‘notification-handlers’ is a hash table mapping notification method names
+  ;; (strings) to functions handling the respective notifications.  Upon
+  ;; receiving a notification, ‘lsp-mode’ will call the associated handler
+  ;; function passing two arguments, the ‘lsp--workspace’ object and the
+  ;; deserialized notification parameters.
+  (notification-handlers (make-hash-table :test 'equal))
+
+  ;; ‘request-handlers’ is a hash table mapping request method names
+  ;; (strings) to functions handling the respective notifications.  Upon
+  ;; receiving a request, ‘lsp-mode’ will call the associated handler function
+  ;; passing two arguments, the ‘lsp--workspace’ object and the deserialized
+  ;; request parameters.
+  (request-handlers (make-hash-table :test 'equal))
+
+  ;; ‘response-handlers’ is a hash table mapping integral JSON-RPC request
+  ;; identifiers for pending asynchronous requests to functions handling the
+  ;; respective responses.  Upon receiving a response from the language server,
+  ;; ‘lsp-mode’ will call the associated response handler function with a
+  ;; single argument, the deserialized response parameters.
+  (response-handlers (make-hash-table :test 'eql))
+
+  ;; ‘prefix-function’ is called for getting the prefix for completion.
+  ;; The function takes no parameter and returns a cons (start . end) representing
+  ;; the start and end bounds of the prefix. If it's not set, the client uses a
+  ;; default prefix function."
+  (prefix-function nil)
+
+  ;; Contains mapping of scheme to the function that is going to be used to load
+  ;; the file.
+  (uri-handlers (make-hash-table :test #'equal))
+
+  ;; ‘action-handlers’ is a hash table mapping action to a handler function. It
+  ;; can be used in `lsp-execute-code-action' to determine whether the action
+  ;; current client is interested in executing the action instead of sending it
+  ;; to the server.
+  (action-handlers (make-hash-table :test 'equal))
+
+  ;; `action-filter' can be set to a function that modifies any incoming
+  ;; `CodeAction' in place before it is executed. The return value is ignored.
+  ;; This can be used to patch up broken code action requests before they are
+  ;; sent back to the LSP server. See `lsp-fix-code-action-booleans' for an
+  ;; example of a function that can be useful here.
+  (action-filter nil)
+
+  ;; major modes supported by the client.
+  major-modes
+  ;; Function that will be called to decide if this language client
+  ;; should manage a particular buffer. The function will be passed
+  ;; the file name and major mode to inform the decision. Setting
+  ;; `activation-fn' will override `major-modes', if
+  ;; present.
+  activation-fn
+  ;; Break the tie when major-mode is supported by multiple clients.
+  (priority 0)
+  ;; Unique identifier for representing the client object.
+  server-id
+  ;; defines whether the client supports multi root workspaces.
+  multi-root
+  ;; Initialization options or a function that returns initialization options.
+  initialization-options
+  ;; `semantic-tokens-faces-overrides’ is a plist that can be used to extend, or
+  ;; completely replace, the faces used for semantic highlighting on a
+  ;; client-by-client basis.
+  ;;
+  ;; It recognizes four members, all of which are optional: `:types’ and
+  ;; `:modifiers’, respectively, should be face definition lists akin to
+  ;; `:lsp-semantic-token-faces’. If specified, each of these face lists will be
+  ;; merged with the default face definition list.
+  ;;
+  ;; Alternatively, if the plist members `:discard-default-types’ or
+  ;; `:discard-default-modifiers' are non-nil, the default `:type' or `:modifiers'
+  ;; face definitions will be replaced entirely by their respective overrides.
+  ;;
+  ;; For example, setting `:semantic-tokens-faces-overrides' to
+  ;; `(:types (("macro" . font-lock-keyword-face)))' will remap "macro" tokens from
+  ;; their default face `lsp-face-semhl-macro' to `font-lock-keyword-face'.
+  ;;
+  ;; `(:types (("macro" . font-lock-keyword-face) ("not-quite-a-macro" . some-face)))'
+  ;; will also remap "macro", but on top of that associate the fictional token type
+  ;; "not-quite-a-macro" with the face named `some-face'.
+  ;;
+  ;; `(:types (("macro" . font-lock-keyword-face))
+  ;;   :modifiers (("declaration" . lsp-face-semhl-interface))
+  ;;   :discard-default-types t
+  ;;   :discard-default-modifiers t)'
+  ;; will discard all default face definitions, hence leaving the client with
+  ;; only one token type "macro", mapped to `font-lock-keyword-face', and one
+  ;; modifier type "declaration", mapped to `lsp-face-semhl-interface'.
+  semantic-tokens-faces-overrides
+  ;; Provides support for registering LSP Server specific capabilities.
+  custom-capabilities
+  ;; Function which returns the folders that are considered to be not projects but library files.
+  ;; The function accepts one parameter currently active workspace.
+  ;; See: https://github.com/emacs-lsp/lsp-mode/issues/225.
+  library-folders-fn
+  ;; function which will be called when opening file in the workspace to perform
+  ;; client specific initialization. The function accepts one parameter
+  ;; currently active workspace.
+  before-file-open-fn
+  ;; Function which will be called right after a workspace has been initialized.
+  initialized-fn
+  ;; ‘remote?’ indicate whether the client can be used for LSP server over TRAMP.
+  (remote? nil)
+
+  ;; ‘completion-in-comments?’ t if the client supports completion in comments.
+  (completion-in-comments? nil)
+
+  ;; ‘path->uri-fn’ the function to use for path->uri conversion for the client.
+  (path->uri-fn nil)
+
+  ;; ‘uri->path-fn’ the function to use for uri->path conversion for the client.
+  (uri->path-fn nil)
+  ;; Function that returns an environment structure that will be used
+  ;; to set some environment variables when starting the language
+  ;; server process. These environment variables enable some
+  ;; additional features in the language server. The environment
+  ;; structure is an alist of the form (KEY . VALUE), where KEY is a
+  ;; string (regularly in all caps), and VALUE may be a string, a
+  ;; boolean, or a sequence of strings.
+  environment-fn
+
+  ;; ‘after-open-fn’ workspace after open specific hooks.
+  (after-open-fn nil)
+
+  ;; ‘async-request-handlers’ is a hash table mapping request method names
+  ;; (strings) to functions handling the respective requests that may take
+  ;; time to finish.  Upon receiving a request, ‘lsp-mode’ will call the
+  ;; associated handler function passing three arguments, the ‘lsp--workspace’
+  ;; object, the deserialized request parameters and the callback which accept
+  ;; result as its parameter.
+  (async-request-handlers (make-hash-table :test 'equal))
+  download-server-fn
+  download-in-progress?
+  buffers
+  synchronize-sections)
+
+(defun lsp-clients-executable-find (find-command &rest args)
+  "Finds an executable by invoking a search command.
+
+FIND-COMMAND is the executable finder that searches for the
+actual language server executable. ARGS is a list of arguments to
+give to FIND-COMMAND to find the language server.  Returns the
+output of FIND-COMMAND if it exits successfully, nil otherwise.
+
+Typical uses include finding an executable by invoking `find' in
+a project, finding LLVM commands on macOS with `xcrun', or
+looking up project-specific language servers for projects written
+in the various dynamic languages, e.g. `nvm', `pyenv' and `rbenv'
+etc."
+  (when-let* ((find-command-path (executable-find find-command))
+              (executable-path
+               (with-temp-buffer
+                 (when (zerop (apply 'call-process find-command-path nil t nil args))
+                   (buffer-substring-no-properties (point-min) (point-max))))))
+    (string-trim executable-path)))
+
+(defvar lsp--already-widened nil)
+
+(defmacro lsp-save-restriction-and-excursion (&rest form)
+  (declare (indent 0) (debug t))
+  `(if lsp--already-widened
+       (save-excursion ,@form)
+     (-let [lsp--already-widened t]
+       (save-restriction
+         (widen)
+         (save-excursion ,@form)))))
+
+;; from http://emacs.stackexchange.com/questions/8082/how-to-get-buffer-position-given-line-number-and-column-number
+(defun lsp--line-character-to-point (line character)
+  "Return the point for character CHARACTER on line LINE."
+  (or (lsp-virtual-buffer-call :line/character->point line character)
+      (let ((inhibit-field-text-motion t))
+        (lsp-save-restriction-and-excursion
+          (goto-char (point-min))
+          (forward-line line)
+          ;; server may send character position beyond the current line and we
+          ;; should fallback to line end.
+          (-let [line-end (line-end-position)]
+            (if (> character (- line-end (point)))
+                line-end
+              (forward-char character)
+              (point)))))))
+
+(lsp-defun lsp--position-to-point ((&Position :line :character))
+  "Convert `Position' object in PARAMS to a point."
+  (lsp--line-character-to-point line character))
+
+(lsp-defun lsp--range-to-region ((&RangeToPoint :start :end))
+  (cons start end))
+
+(lsp-defun lsp--range-text ((&RangeToPoint :start :end))
+  (buffer-substring start end))
+
+(lsp-defun lsp--find-wrapping-range ((&SelectionRange :parent? :range (&RangeToPoint :start :end)))
+  (cond
+   ((and
+     (region-active-p)
+     (<= start (region-beginning) end)
+     (<= start (region-end) end)
+     (or (not (= start (region-beginning)))
+         (not (= end (region-end)))))
+    (cons start end))
+   ((and (<= start (point) end)
+         (not (region-active-p)))
+    (cons start end))
+   (parent? (lsp--find-wrapping-range parent?))))
+
+(defun lsp--get-selection-range ()
+  (or
+   (-when-let ((cache . cache-tick) lsp--document-selection-range-cache)
+     (when (= cache-tick (buffer-modified-tick)) cache))
+   (let ((response (cl-first
+                    (lsp-request
+                     "textDocument/selectionRange"
+                     (list :textDocument (lsp--text-document-identifier)
+                           :positions (vector (lsp--cur-position)))))))
+     (setq lsp--document-selection-range-cache
+           (cons response (buffer-modified-tick)))
+     response)))
+
+(defun lsp-extend-selection ()
+  "Extend selection."
+  (interactive)
+  (unless (lsp-feature? "textDocument/selectionRange")
+    (signal 'lsp-capability-not-supported (list "selectionRangeProvider")))
+  (-when-let ((start . end) (lsp--find-wrapping-range (lsp--get-selection-range)))
+    (goto-char start)
+    (set-mark (point))
+    (goto-char end)
+    (exchange-point-and-mark)))
+
+(defun lsp-warn (message &rest args)
+  "Display a warning message made from (`format-message' MESSAGE ARGS...).
+This is equivalent to `display-warning', using `lsp-mode' as the type and
+`:warning' as the level."
+  (display-warning 'lsp-mode (apply #'format-message message args)))
+
+(defun lsp--get-uri-handler (scheme)
+  "Get uri handler for SCHEME in the current workspace."
+  (--some (gethash scheme (lsp--client-uri-handlers (lsp--workspace-client it)))
+          (or (lsp-workspaces) (lsp--session-workspaces (lsp-session)))))
+
+(defun lsp--fix-path-casing (path)
+  "On windows, downcases path because the windows file system is
+case-insensitive.
+
+On other systems, returns path without change."
+  (if (eq system-type 'windows-nt) (downcase path) path))
+
+(defun lsp--uri-to-path (uri)
+  "Convert URI to a file path."
+  (if-let ((fn (->> (lsp-workspaces)
+                    (-keep (-compose #'lsp--client-uri->path-fn #'lsp--workspace-client))
+                    (cl-first))))
+      (funcall fn uri)
+    (lsp--uri-to-path-1 uri)))
+
+(defun lsp-remap-path-if-needed (file-name)
+  (-if-let ((virtual-buffer &as &plist :buffer) (gethash file-name lsp--virtual-buffer-mappings))
+      (propertize (buffer-local-value 'buffer-file-name buffer)
+                  'lsp-virtual-buffer virtual-buffer)
+    file-name))
+
+(defun lsp--uri-to-path-1 (uri)
+  "Convert URI to a file path."
+  (let* ((url (url-generic-parse-url (url-unhex-string uri)))
+         (type (url-type url))
+         (target (url-target url))
+         (file
+          (concat (decode-coding-string (url-filename url)
+                                        (or locale-coding-system 'utf-8))
+                  (when (and target
+                             (not (s-match
+                                   (rx "#" (group (1+ num)) (or "," "#")
+                                       (group (1+ num))
+                                       string-end)
+                                   uri)))
+                    (concat "#" target))))
+         (file-name (if (and type (not (string= type "file")))
+                        (if-let ((handler (lsp--get-uri-handler type)))
+                            (funcall handler uri)
+                          uri)
+                      ;; `url-generic-parse-url' is buggy on windows:
+                      ;; https://github.com/emacs-lsp/lsp-mode/pull/265
+                      (or (and (eq system-type 'windows-nt)
+                               (eq (elt file 0) ?\/)
+                               (substring file 1))
+                          file))))
+    (->> file-name
+         (concat (-some #'lsp--workspace-host-root (lsp-workspaces)))
+         (lsp-remap-path-if-needed))))
+
+(defun lsp--buffer-uri ()
+  "Return URI of the current buffer."
+  (or lsp-buffer-uri
+      (plist-get lsp--virtual-buffer :buffer-uri)
+      (lsp--path-to-uri
+       (or (buffer-file-name) (buffer-file-name (buffer-base-buffer))))))
+
+(defun lsp-register-client-capabilities (&rest _args)
+  "Implemented only to make `company-lsp' happy.
+DELETE when `lsp-mode.el' is deleted.")
+
+(defconst lsp--url-path-allowed-chars
+  (url--allowed-chars (append '(?/) url-unreserved-chars))
+  "`url-unreserved-chars' with additional delim ?/.
+This set of allowed chars is enough for hexifying local file paths.")
+
+(defun lsp--path-to-uri-1 (path)
+  (concat lsp--uri-file-prefix
+          (--> path
+            (expand-file-name it)
+            (or (file-remote-p it 'localname t) it)
+            (url-hexify-string it lsp--url-path-allowed-chars))))
+
+(defun lsp--path-to-uri (path)
+  "Convert PATH to a uri."
+  (if-let ((uri-fn (->> (lsp-workspaces)
+                        (-keep (-compose #'lsp--client-path->uri-fn #'lsp--workspace-client))
+                        (cl-first))))
+      (funcall uri-fn path)
+    (lsp--path-to-uri-1 path)))
+
+(defun lsp--string-match-any (regex-list str)
+  "Return the first regex, if any, within REGEX-LIST matching STR."
+  (--first (string-match it str) regex-list))
+
+(cl-defstruct lsp-watch
+  (descriptors (make-hash-table :test 'equal))
+  root-directory)
+
+(defun lsp--folder-watch-callback (event callback watch ignored-files ignored-directories)
+  (let ((file-name (cl-third event))
+        (event-type (cl-second event)))
+    (cond
+     ((and (file-directory-p file-name)
+           (equal 'created event-type)
+           (not (lsp--string-match-any ignored-directories file-name)))
+
+      (lsp-watch-root-folder (file-truename file-name) callback ignored-files ignored-directories watch)
+
+      ;; process the files that are already present in
+      ;; the directory.
+      (->> (directory-files-recursively file-name ".*" t)
+           (seq-do (lambda (f)
+                     (unless (file-directory-p f)
+                       (funcall callback (list nil 'created f)))))))
+     ((and (memq event-type '(created deleted changed))
+           (not (file-directory-p file-name))
+           (not (lsp--string-match-any ignored-files file-name)))
+      (funcall callback event))
+     ((and (memq event-type '(renamed))
+           (not (file-directory-p file-name))
+           (not (lsp--string-match-any ignored-files file-name)))
+      (funcall callback `(,(cl-first event) deleted ,(cl-third event)))
+      (funcall callback `(,(cl-first event) created ,(cl-fourth event)))))))
+
+(defun lsp--ask-about-watching-big-repo (number-of-directories dir)
+  "Ask the user if they want to watch NUMBER-OF-DIRECTORIES from a repository DIR.
+This is useful when there is a lot of files in a repository, as
+that may slow Emacs down. Returns t if the user wants to watch
+the entire repository, nil otherwise."
+  (prog1
+      (yes-or-no-p
+       (format
+        "Watching all the files in %s would require adding watches to %s directories, so watching the repo may slow Emacs down.
+Do you want to watch all files in %s? "
+        dir
+        number-of-directories
+        dir))
+    (lsp--info
+     (concat "You can configure this warning with the `lsp-enable-file-watchers' "
+             "and `lsp-file-watch-threshold' variables"))))
+
+
+(defun lsp--path-is-watchable-directory (path dir ignored-directories)
+  "Figure out whether PATH (inside of DIR) is meant to have a file watcher set.
+IGNORED-DIRECTORIES is a list of regexes to filter out directories we don't
+want to watch."
+  (let
+      ((full-path (f-join dir path)))
+    (and (file-accessible-directory-p full-path)
+         (not (equal path "."))
+         (not (equal path ".."))
+         (not (lsp--string-match-any ignored-directories full-path)))))
+
+
+(defun lsp--all-watchable-directories (dir ignored-directories)
+  "Traverse DIR recursively returning a list of paths that should have watchers.
+IGNORED-DIRECTORIES will be used for exclusions"
+  (let* ((dir (if (f-symlink? dir)
+                  (file-truename dir)
+                dir)))
+    (apply #'nconc
+           ;; the directory itself is assumed to be part of the set
+           (list dir)
+           ;; collect all subdirectories that are watchable
+           (-map
+            (lambda (path) (lsp--all-watchable-directories (f-join dir path) ignored-directories))
+            ;; but only look at subdirectories that are watchable
+            (-filter (lambda (path) (lsp--path-is-watchable-directory path dir ignored-directories))
+                     (directory-files dir))))))
+
+(defun lsp-watch-root-folder (dir callback ignored-files ignored-directories &optional watch warn-big-repo?)
+  "Create recursive file notification watch in DIR.
+CALLBACK will be called when there are changes in any of
+the monitored files. WATCHES is a hash table directory->file
+notification handle which contains all of the watch that
+already have been created. Watches will not be created for
+any directory that matches any regex in IGNORED-DIRECTORIES.
+Watches will not be created for any file that matches any
+regex in IGNORED-FILES."
+  (let* ((dir (if (f-symlink? dir)
+                  (file-truename dir)
+                dir))
+         (watch (or watch (make-lsp-watch :root-directory dir)))
+         (dirs-to-watch (lsp--all-watchable-directories dir ignored-directories)))
+    (lsp-log "Creating watchers for following %s folders:\n  %s"
+             (length dirs-to-watch)
+             (s-join "\n  " dirs-to-watch))
+    (when (or
+           (not warn-big-repo?)
+           (not lsp-file-watch-threshold)
+           (let ((number-of-directories (length dirs-to-watch)))
+             (or
+              (< number-of-directories lsp-file-watch-threshold)
+              (condition-case nil
+                  (lsp--ask-about-watching-big-repo number-of-directories dir)
+                (quit)))))
+      (dolist (current-dir dirs-to-watch)
+        (condition-case err
+            (progn
+              (puthash
+               current-dir
+               (file-notify-add-watch current-dir
+                                      '(change)
+                                      (lambda (event)
+                                        (lsp--folder-watch-callback event callback watch ignored-files ignored-directories)))
+               (lsp-watch-descriptors watch)))
+          (error (lsp-log "Failed to create a watch for %s: message" (error-message-string err)))
+          (file-missing (lsp-log "Failed to create a watch for %s: message" (error-message-string err))))))
+    watch))
+
+(defun lsp-kill-watch (watch)
+  "Delete WATCH."
+  (-> watch lsp-watch-descriptors hash-table-values (-each #'file-notify-rm-watch))
+  (ht-clear! (lsp-watch-descriptors watch)))
+
+(defun lsp-json-bool (val)
+  "Convert VAL to JSON boolean."
+  (if val t :json-false))
+
+(defmacro with-lsp-workspace (workspace &rest body)
+  "Helper macro for invoking BODY in WORKSPACE context."
+  (declare (debug (form body))
+           (indent 1))
+  `(let ((lsp--cur-workspace ,workspace)) ,@body))
+
+(defmacro with-lsp-workspaces (workspaces &rest body)
+  "Helper macro for invoking BODY against multiple WORKSPACES."
+  (declare (debug (form body))
+           (indent 1))
+  `(let ((lsp--buffer-workspaces ,workspaces)) ,@body))
+
+
+
+(defmacro lsp-consistency-check (package)
+  `(defconst ,(intern (concat (symbol-name package)
+                              "-plist-value-when-compiled"))
+     (eval-when-compile lsp-use-plists)))
+
+
+;; loading code-workspace files
+
+;;;###autoload
+(defun lsp-load-vscode-workspace (file)
+  "Load vscode workspace from FILE"
+  (interactive "fSelect file to import: ")
+  (mapc #'lsp-workspace-folders-remove (lsp-session-folders (lsp-session)))
+
+  (let ((dir (f-dirname file)))
+    (->> file
+         (json-read-file)
+         (alist-get 'folders)
+         (-map (-lambda ((&alist 'path))
+                 (lsp-workspace-folders-add (expand-file-name path dir)))))))
+
+;;;###autoload
+(defun lsp-save-vscode-workspace (file)
+  "Save vscode workspace to FILE"
+  (interactive "FSelect file to save to: ")
+
+  (let ((json-encoding-pretty-print t))
+    (f-write-text (json-encode
+                   `((folders . ,(->> (lsp-session)
+                                      (lsp-session-folders)
+                                      (--map `((path . ,it)))))))
+                  'utf-8
+                  file)))
+
+
+(defmacro lsp-foreach-workspace (&rest body)
+  "Execute BODY for each of the current workspaces."
+  (declare (debug (form body)))
+  `(--map (with-lsp-workspace it ,@body) (lsp-workspaces)))
+
+(defmacro when-lsp-workspace (workspace &rest body)
+  "Helper macro for invoking BODY in WORKSPACE context if present."
+  (declare (debug (form body))
+           (indent 1))
+  `(when-let ((lsp--cur-workspace ,workspace)) ,@body))
+
+(lsp-defun lsp--window-show-quick-pick (_workspace (&ShowQuickPickParams :place-holder :can-pick-many :items))
+  (if-let* ((selectfunc (if can-pick-many #'completing-read-multiple #'completing-read))
+            (itemLabels (seq-map (-lambda ((item &as &QuickPickItem :label)) (format "%s" label))
+                                 items))
+            (result (funcall-interactively
+                     selectfunc
+                     (format "%s%s " place-holder (if can-pick-many " (* for all)" "")) itemLabels))
+            (choices (if (listp result)
+                         (if (equal result '("*"))
+                             itemLabels
+                           result)
+                       (list result))))
+      (vconcat (seq-filter #'identity (seq-map (-lambda ((item &as &QuickPickItem :label :user-data))
+                                                 (if (member label choices)
+                                                     (lsp-make-quick-pick-item :label label :picked t :user-data user-data)
+                                                   nil))
+                                               items)))))
+
+(lsp-defun lsp--window-show-input-box (_workspace (&ShowInputBoxParams :prompt :value?))
+  (read-string (format "%s: " prompt) (or value? "")))
+
+(lsp-defun lsp--window-show-message (_workspace (&ShowMessageRequestParams :message :type))
+  "Send the server's messages to log.
+PARAMS - the data sent from _WORKSPACE."
+  (funcall (cl-case type
+             (1 'lsp--error)
+             (2 'lsp--warn)
+             (t 'lsp--info))
+           "%s"
+           message))
+
+(lsp-defun lsp--window-log-message (workspace (&ShowMessageRequestParams :message :type))
+  "Send the server's messages to log.
+PARAMS - the data sent from WORKSPACE."
+  (ignore
+   (let ((client (lsp--workspace-client workspace)))
+     (when (or (not client)
+               (cl-notany (-rpartial #'string-match-p message)
+                          (lsp--client-ignore-messages client)))
+       (lsp-log "%s" (lsp--propertize message type))))))
+
+(lsp-defun lsp--window-log-message-request ((&ShowMessageRequestParams :message :type :actions?))
+  "Display a message request to user sending the user selection back to server."
+  (let* ((message (lsp--propertize message type))
+         (choices (seq-map #'lsp:message-action-item-title actions?)))
+    (if choices
+        (completing-read (concat message " ") (seq-into choices 'list) nil t)
+      (lsp-log message))))
+
+(lsp-defun lsp--window-show-document ((&ShowDocumentParams :uri :selection?))
+  "Show document URI in a buffer and go to SELECTION if any."
+  (let ((path (lsp--uri-to-path uri)))
+    (when (f-exists? path)
+      (with-current-buffer (find-file path)
+        (when selection?
+          (goto-char (lsp--position-to-point (lsp:range-start selection?))))
+        t))))
+
+(defcustom lsp-progress-prefix "⌛ "
+  "Progress prefix."
+  :group 'lsp-mode
+  :type 'string
+  :package-version '(lsp-mode . "8.0.0"))
+
+(defcustom lsp-progress-function #'lsp-on-progress-modeline
+  "Function for handling the progress notifications."
+  :group 'lsp-mode
+  :type '(choice
+          (const :tag "Use modeline" lsp-on-progress-modeline)
+          (const :tag "Legacy(uses either `progress-reporter' or `spinner' based on `lsp-progress-via-spinner')"
+                 lsp-on-progress-legacy)
+          (const :tag "Ignore" ignore)
+          (function :tag "Other function"))
+  :package-version '(lsp-mode . "8.0.0"))
+
+(defcustom lsp-request-while-no-input-may-block nil
+  "Have `lsp-request-while-no-input` block unless `non-essential` is t."
+  :group 'lsp-mode
+  :type 'boolean)
+
+(defun lsp--progress-status ()
+  "Returns the status of the progress for the current workspaces."
+  (-let ((progress-status
+          (s-join
+           "|"
+           (-keep
+            (lambda (workspace)
+              (let ((tokens (lsp--workspace-work-done-tokens workspace)))
+                (unless (ht-empty? tokens)
+                  (mapconcat
+                   (-lambda ((&WorkDoneProgressBegin :message? :title :percentage?))
+                     (concat (if percentage?
+                                 (if (numberp percentage?)
+                                     (format "%.0f%%%% " percentage?)
+                                   (format "%s%%%% " percentage?))
+                               "")
+                             (or message? title)))
+                   (ht-values tokens)
+                   "|"))))
+            (lsp-workspaces)))))
+    (unless (s-blank? progress-status)
+      (concat lsp-progress-prefix progress-status " "))))
+
+(lsp-defun lsp-on-progress-modeline (workspace (&ProgressParams :token :value
+                                                                (value &as &WorkDoneProgress :kind)))
+  "PARAMS contains the progress data.
+WORKSPACE is the workspace that contains the progress token."
+  (add-to-list 'global-mode-string '(t (:eval (lsp--progress-status))))
+  (pcase kind
+    ("begin" (lsp-workspace-set-work-done-token token value workspace))
+    ("report" (lsp-workspace-set-work-done-token token value workspace))
+    ("end" (lsp-workspace-rem-work-done-token token workspace)))
+  (force-mode-line-update))
+
+(lsp-defun lsp-on-progress-legacy (workspace (&ProgressParams :token :value
+                                                              (value &as &WorkDoneProgress :kind)))
+  "PARAMS contains the progress data.
+WORKSPACE is the workspace that contains the progress token."
+  (pcase kind
+    ("begin"
+     (-let* (((&WorkDoneProgressBegin :title :percentage?) value)
+             (reporter
+              (if lsp-progress-via-spinner
+                  (let* ((spinner-strings (alist-get (lsp-progress-spinner-type) spinner-types))
+                         ;; Set message as a tooltip for the spinner strings
+                         (propertized-strings
+                          (seq-map (lambda (string) (propertize string 'help-echo title))
+                                   spinner-strings))
+                         (spinner-type (vconcat propertized-strings)))
+                    ;; The progress relates to the server as a whole,
+                    ;; display it on all buffers.
+                    (mapcar (lambda (buffer)
+                              (lsp-with-current-buffer buffer
+                                (spinner-start spinner-type))
+                              buffer)
+                            (lsp--workspace-buffers workspace)))
+                (if percentage?
+                    (make-progress-reporter title 0 100 percentage?)
+                  ;; No percentage, just progress
+                  (make-progress-reporter title nil nil)))))
+       (lsp-workspace-set-work-done-token token reporter workspace)))
+    ("report"
+     (when-let ((reporter (lsp-workspace-get-work-done-token token workspace)))
+       (unless lsp-progress-via-spinner
+         (progress-reporter-update reporter (lsp:work-done-progress-report-percentage? value)))))
+
+    ("end"
+     (when-let ((reporter (lsp-workspace-get-work-done-token token workspace)))
+       (if lsp-progress-via-spinner
+           (mapc (lambda (buffer)
+                   (when (lsp-buffer-live-p buffer)
+                     (lsp-with-current-buffer buffer
+                       (spinner-stop))))
+                 reporter)
+         (progress-reporter-done reporter))
+       (lsp-workspace-rem-work-done-token token workspace)))))
+
+
+;; diagnostics
+
+(defvar lsp-diagnostic-filter nil
+  "A a function which will be called with
+  `&PublishDiagnosticsParams' and `workspace' which can be used
+  to filter out the diagnostics. The function should return
+  `&PublishDiagnosticsParams'.
+
+Common usecase are:
+1. Filter the diagnostics for a particular language server.
+2. Filter out the diagnostics under specific level.")
+
+(defvar lsp-diagnostic-stats (ht))
+
+(defun lsp-diagnostics (&optional current-workspace?)
+  "Return the diagnostics from all workspaces."
+  (or (pcase (if current-workspace?
+                 (lsp-workspaces)
+               (lsp--session-workspaces (lsp-session)))
+        (`() ())
+        (`(,workspace) (lsp--workspace-diagnostics workspace))
+        (`,workspaces (let ((result (make-hash-table :test 'equal)))
+                        (mapc (lambda (workspace)
+                                (->> workspace
+                                     (lsp--workspace-diagnostics)
+                                     (maphash (lambda (file-name diagnostics)
+                                                (puthash file-name
+                                                         (append (gethash file-name result) diagnostics)
+                                                         result)))))
+                              workspaces)
+                        result)))
+      (ht)))
+
+(defun lsp-diagnostics-stats-for (path)
+  "Get diagnostics statistics for PATH.
+The result format is vector [_ errors warnings infos hints] or nil."
+  (gethash (lsp--fix-path-casing path) lsp-diagnostic-stats))
+
+(defun lsp-diagnostics--request-pull-diagnostics (workspace)
+  "Request new diagnostics for the current file within WORKSPACE.
+This is only executed if the server supports pull diagnostics."
+  (when (lsp-feature? "textDocument/diagnostic")
+    (let ((path (lsp--fix-path-casing (buffer-file-name))))
+      (lsp-request-async "textDocument/diagnostic"
+                         (list :textDocument (lsp--text-document-identifier))
+                         (-lambda ((&DocumentDiagnosticReport :kind :items?))
+                           (lsp-diagnostics--apply-pull-diagnostics workspace path kind items?))
+                         :mode 'tick))))
+
+(defun lsp-diagnostics--update-path (path new-stats)
+  (let ((new-stats (copy-sequence new-stats))
+        (path (lsp--fix-path-casing (directory-file-name path))))
+    (if-let ((old-data (gethash path lsp-diagnostic-stats)))
+        (dotimes (idx 5)
+          (cl-callf + (aref old-data idx)
+            (aref new-stats idx)))
+      (puthash path new-stats lsp-diagnostic-stats))))
+
+(defun lsp-diagnostics--convert-and-update-path-stats (workspace path diagnostics)
+  (let ((path (lsp--fix-path-casing path))
+        (new-stats (make-vector 5 0)))
+    (mapc (-lambda ((&Diagnostic :severity?))
+            (cl-incf (aref new-stats (or severity? 1))))
+          diagnostics)
+    (when-let ((old-diags (gethash path (lsp--workspace-diagnostics workspace))))
+      (mapc (-lambda ((&Diagnostic :severity?))
+              (cl-decf (aref new-stats (or severity? 1))))
+            old-diags))
+    (lsp-diagnostics--update-path path new-stats)
+    (while (not (string= path (setf path (file-name-directory
+                                          (directory-file-name path)))))
+      (lsp-diagnostics--update-path path new-stats))))
+
+(lsp-defun lsp--on-diagnostics-update-stats (workspace
+                                             (&PublishDiagnosticsParams :uri :diagnostics))
+  (lsp-diagnostics--convert-and-update-path-stats workspace (lsp--uri-to-path uri) diagnostics))
+
+(defun lsp-diagnostics--apply-pull-diagnostics (workspace path kind diagnostics?)
+  "Update WORKSPACE diagnostics at PATH with DIAGNOSTICS?.
+Depends on KIND being a \\='full\\=' update."
+  (cond
+   ((equal kind "full")
+    ;; TODO support `lsp-diagnostic-filter'
+    ;; (the params types differ from the published diagnostics response)
+    (lsp-diagnostics--convert-and-update-path-stats workspace path diagnostics?)
+    (-let* ((lsp--virtual-buffer-mappings (ht))
+            (workspace-diagnostics (lsp--workspace-diagnostics workspace)))
+      (if (seq-empty-p diagnostics?)
+          (remhash path workspace-diagnostics)
+        (puthash path (append diagnostics? nil) workspace-diagnostics))
+      (run-hooks 'lsp-diagnostics-updated-hook)))
+    ((equal kind "unchanged") t)
+    (t (lsp--error "Unknown pull diagnostic result kind '%s'" kind))))
+
+(defun lsp--on-diagnostics (workspace params)
+  "Callback for textDocument/publishDiagnostics.
+interface PublishDiagnosticsParams {
+    uri: string;
+    diagnostics: Diagnostic[];
+}
+PARAMS contains the diagnostics data.
+WORKSPACE is the workspace that contains the diagnostics."
+  (when lsp-diagnostic-filter
+    (setf params (funcall lsp-diagnostic-filter params workspace)))
+
+  (lsp--on-diagnostics-update-stats workspace params)
+
+  (-let* (((&PublishDiagnosticsParams :uri :diagnostics) params)
+          (lsp--virtual-buffer-mappings (ht))
+          (file (lsp--fix-path-casing (lsp--uri-to-path uri)))
+          (workspace-diagnostics (lsp--workspace-diagnostics workspace)))
+
+    (if (seq-empty-p diagnostics)
+        (remhash file workspace-diagnostics)
+      (puthash file (append diagnostics nil) workspace-diagnostics))
+
+    (run-hooks 'lsp-diagnostics-updated-hook)))
+
+(defun lsp-diagnostics--workspace-cleanup (workspace)
+  (->> workspace
+       (lsp--workspace-diagnostics)
+       (maphash (lambda (key _)
+                  (lsp--on-diagnostics-update-stats
+                   workspace
+                   (lsp-make-publish-diagnostics-params
+                    :uri (lsp--path-to-uri key)
+                    :diagnostics [])))))
+  (clrhash (lsp--workspace-diagnostics workspace)))
+
+
+
+;; textDocument/foldingRange support
+
+(cl-defstruct lsp--folding-range beg end kind children)
+
+(defvar-local lsp--cached-folding-ranges nil)
+(defvar-local lsp--cached-nested-folding-ranges nil)
+
+(defun lsp--folding-range-width (range)
+  (- (lsp--folding-range-end range)
+     (lsp--folding-range-beg range)))
+
+(defun lsp--get-folding-ranges ()
+  "Get the folding ranges for the current buffer."
+  (unless (eq (buffer-chars-modified-tick) (car lsp--cached-folding-ranges))
+    (let* ((ranges (lsp-request "textDocument/foldingRange"
+                                `(:textDocument ,(lsp--text-document-identifier))))
+           (sorted-line-col-pairs (->> ranges
+                                       (cl-mapcan (-lambda ((&FoldingRange :start-line
+                                                                           :start-character?
+                                                                           :end-line
+                                                                           :end-character?))
+                                                    (list (cons start-line start-character?)
+                                                          (cons end-line end-character?))))
+                                       (-sort #'lsp--line-col-comparator)))
+           (line-col-to-point-map (lsp--convert-line-col-to-points-batch
+                                   sorted-line-col-pairs)))
+      (setq lsp--cached-folding-ranges
+            (cons (buffer-chars-modified-tick)
+                  (--> ranges
+                    (seq-map (-lambda ((range &as
+                                              &FoldingRange :start-line
+                                              :start-character?
+                                              :end-line
+                                              :end-character?
+                                              :kind?))
+                               (make-lsp--folding-range
+                                :beg (ht-get line-col-to-point-map
+                                             (cons start-line start-character?))
+                                :end (ht-get line-col-to-point-map
+                                             (cons end-line end-character?))
+                                :kind kind?))
+                             it)
+                    (seq-filter (lambda (folding-range)
+                                  (< (lsp--folding-range-beg folding-range)
+                                     (lsp--folding-range-end folding-range)))
+                                it)
+                    (seq-into it 'list)
+                    (delete-dups it))))))
+  (cdr lsp--cached-folding-ranges))
+
+(defun lsp--get-nested-folding-ranges ()
+  "Get a list of nested folding ranges for the current buffer."
+  (-let [(tick . _) lsp--cached-folding-ranges]
+    (if (and (eq tick (buffer-chars-modified-tick))
+             lsp--cached-nested-folding-ranges)
+        lsp--cached-nested-folding-ranges
+      (setq lsp--cached-nested-folding-ranges
+            (lsp--folding-range-build-trees (lsp--get-folding-ranges))))))
+
+(defun lsp--folding-range-build-trees (ranges)
+  (setq ranges (seq-sort #'lsp--range-before-p ranges))
+  (let* ((dummy-node (make-lsp--folding-range
+                      :beg most-negative-fixnum
+                      :end most-positive-fixnum))
+         (stack (list dummy-node)))
+    (dolist (range ranges)
+      (while (not (lsp--range-inside-p range (car stack)))
+        (pop stack))
+      (push range (lsp--folding-range-children (car stack)))
+      (push range stack))
+    (lsp--folding-range-children dummy-node)))
+
+(defun lsp--range-inside-p (r1 r2)
+  "Return non-nil if folding range R1 lies inside R2"
+  (and (>= (lsp--folding-range-beg r1) (lsp--folding-range-beg r2))
+       (<= (lsp--folding-range-end r1) (lsp--folding-range-end r2))))
+
+(defun lsp--range-before-p (r1 r2)
+  "Return non-nil if folding range R1 ends before R2"
+  ;; Ensure r1 comes before r2
+  (or (< (lsp--folding-range-beg r1)
+         (lsp--folding-range-beg r2))
+      ;; If beg(r1) == beg(r2) make sure r2 ends first
+      (and (= (lsp--folding-range-beg r1)
+              (lsp--folding-range-beg r2))
+           (< (lsp--folding-range-end r2)
+              (lsp--folding-range-end r1)))))
+
+(defun lsp--point-inside-range-p (point range)
+  "Return non-nil if POINT lies inside folding range RANGE."
+  (and (>= point (lsp--folding-range-beg range))
+       (<= point (lsp--folding-range-end range))))
+
+(cl-defun lsp--get-current-innermost-folding-range (&optional (point (point)))
+  "Return the innermost folding range POINT lies in."
+  (seq-reduce (lambda (innermost-range curr-range)
+                (if (and (lsp--point-inside-range-p point curr-range)
+                         (or (null innermost-range)
+                             (lsp--range-inside-p curr-range innermost-range)))
+                    curr-range
+                  innermost-range))
+              (lsp--get-folding-ranges)
+              nil))
+
+(cl-defun lsp--get-current-outermost-folding-range (&optional (point (point)))
+  "Return the outermost folding range POINT lies in."
+  (cdr (seq-reduce (-lambda ((best-pair &as outermost-width . _) curr-range)
+                     (let ((curr-width (lsp--folding-range-width curr-range)))
+                       (if (and (lsp--point-inside-range-p point curr-range)
+                                (or (null best-pair)
+                                    (> curr-width outermost-width)))
+                           (cons curr-width curr-range)
+                         best-pair)))
+                   (lsp--get-folding-ranges)
+                   nil)))
+
+(defun lsp--folding-range-at-point-bounds ()
+  (when (and lsp-enable-folding
+             (lsp-feature? "textDocument/foldingRange"))
+    (if-let ((range (lsp--get-current-innermost-folding-range)))
+        (cons (lsp--folding-range-beg range)
+              (lsp--folding-range-end range)))))
+(put 'lsp--folding-range 'bounds-of-thing-at-point
+     #'lsp--folding-range-at-point-bounds)
+
+(defun lsp--get-nearest-folding-range (&optional backward)
+  (let ((point (point))
+        (found nil))
+    (while (not
+            (or found
+                (if backward
+                    (<= point (point-min))
+                  (>= point (point-max)))))
+      (if backward (cl-decf point) (cl-incf point))
+      (setq found (lsp--get-current-innermost-folding-range point)))
+    found))
+
+(defun lsp--folding-range-at-point-forward-op (n)
+  (when (and lsp-enable-folding
+             (not (zerop n))
+             (lsp-feature? "textDocument/foldingRange"))
+    (cl-block break
+      (dotimes (_ (abs n))
+        (if-let ((range (lsp--get-nearest-folding-range (< n 0))))
+            (goto-char (if (< n 0)
+                           (lsp--folding-range-beg range)
+                         (lsp--folding-range-end range)))
+          (cl-return-from break))))))
+(put 'lsp--folding-range 'forward-op
+     #'lsp--folding-range-at-point-forward-op)
+
+(defun lsp--folding-range-at-point-beginning-op ()
+  (goto-char (car (lsp--folding-range-at-point-bounds))))
+(put 'lsp--folding-range 'beginning-op
+     #'lsp--folding-range-at-point-beginning-op)
+
+(defun lsp--folding-range-at-point-end-op ()
+  (goto-char (cdr (lsp--folding-range-at-point-bounds))))
+(put 'lsp--folding-range 'end-op
+     #'lsp--folding-range-at-point-end-op)
+
+(defun lsp--range-at-point-bounds ()
+  (or (lsp--folding-range-at-point-bounds)
+      (when-let ((range (and
+                         (lsp-feature? "textDocument/hover")
+                         (->> (lsp--text-document-position-params)
+                              (lsp-request "textDocument/hover")
+                              (lsp:hover-range?)))))
+        (lsp--range-to-region range))))
+
+;; A more general purpose "thing", useful for applications like focus.el
+(put 'lsp--range 'bounds-of-thing-at-point
+     #'lsp--range-at-point-bounds)
+
+(defun lsp--log-io-p (method)
+  "Return non nil if should log for METHOD."
+  (and lsp-log-io
+       (or (not lsp-log-io-allowlist-methods)
+           (member method lsp-log-io-allowlist-methods))))
+
+
+;; toggles
+
+(defun lsp-toggle-trace-io ()
+  "Toggle client-server protocol logging."
+  (interactive)
+  (setq lsp-log-io (not lsp-log-io))
+  (lsp--info "Server logging %s." (if lsp-log-io "enabled" "disabled")))
+
+(defun lsp-toggle-signature-auto-activate ()
+  "Toggle signature auto activate."
+  (interactive)
+  (setq lsp-signature-auto-activate
+        (unless lsp-signature-auto-activate '(:on-trigger-char)))
+  (lsp--info "Signature autoactivate %s." (if lsp-signature-auto-activate "enabled" "disabled"))
+  (lsp--update-signature-help-hook))
+
+(defun lsp-toggle-on-type-formatting ()
+  "Toggle on type formatting."
+  (interactive)
+  (setq lsp-enable-on-type-formatting (not lsp-enable-on-type-formatting))
+  (lsp--info "On type formatting is %s." (if lsp-enable-on-type-formatting "enabled" "disabled"))
+  (lsp--update-on-type-formatting-hook))
+
+(defun lsp-toggle-symbol-highlight ()
+  "Toggle symbol highlighting."
+  (interactive)
+  (setq lsp-enable-symbol-highlighting (not lsp-enable-symbol-highlighting))
+
+  (cond
+   ((and lsp-enable-symbol-highlighting
+         (lsp-feature? "textDocument/documentHighlight"))
+    (add-hook 'lsp-on-idle-hook #'lsp--document-highlight nil t)
+    (lsp--info "Symbol highlighting enabled in current buffer."))
+   ((not lsp-enable-symbol-highlighting)
+    (remove-hook 'lsp-on-idle-hook #'lsp--document-highlight t)
+    (lsp--remove-overlays 'lsp-highlight)
+    (lsp--info "Symbol highlighting disabled in current buffer."))))
+
+
+;; keybindings
+(defvar lsp--binding-descriptions nil
+  "List of key binding/short description pair.")
+
+(defmacro lsp-define-conditional-key (keymap key def desc cond &rest bindings)
+  "In KEYMAP, define key sequence KEY as DEF conditionally.
+This is like `define-key', except the definition disappears
+whenever COND evaluates to nil.
+DESC is the short-description for the binding.
+BINDINGS is a list of (key def desc cond)."
+  (declare (indent defun)
+           (debug (form form form form form &rest sexp)))
+  (->> (cl-list* key def desc cond bindings)
+       (-partition 4)
+       (-mapcat (-lambda ((key def desc cond))
+                  `((define-key ,keymap ,key
+                      '(menu-item
+                        ,(format "maybe-%s" def)
+                        ,def
+                        :filter
+                        (lambda (item)
+                          (when (with-current-buffer (or (when (buffer-live-p lsp--describe-buffer)
+                                                           lsp--describe-buffer)
+                                                         (current-buffer))
+                                  ,cond)
+                            item))))
+                    (when (stringp ,key)
+                      (setq lsp--binding-descriptions
+                            (append lsp--binding-descriptions '(,key ,desc)))))))
+       macroexp-progn))
+
+(defvar lsp--describe-buffer nil)
+
+(defun lsp-describe-buffer-bindings-advice (fn buffer &optional prefix menus)
+  (let ((lsp--describe-buffer buffer))
+    (funcall fn buffer prefix menus)))
+
+(advice-add 'describe-buffer-bindings
+            :around
+            #'lsp-describe-buffer-bindings-advice)
+
+(defun lsp--prepend-prefix (mappings)
+  (->> mappings
+       (-partition 2)
+       (-mapcat (-lambda ((key description))
+                  (list (concat lsp-keymap-prefix " " key)
+                        description)))))
+
+(defvar lsp-command-map
+  (-doto (make-sparse-keymap)
+    (lsp-define-conditional-key
+      ;; workspaces
+      "wD" lsp-disconnect "disconnect" (lsp-workspaces)
+      "wd" lsp-describe-session "describe session" t
+      "wq" lsp-workspace-shutdown "shutdown server" (lsp-workspaces)
+      "wr" lsp-workspace-restart "restart server" (lsp-workspaces)
+      "ws" lsp "start server" t
+
+      ;; formatting
+      "==" lsp-format-buffer "format buffer" (or (lsp-feature? "textDocument/rangeFormatting")
+                                                 (lsp-feature? "textDocument/formatting"))
+      "=r" lsp-format-region "format region" (lsp-feature? "textDocument/rangeFormatting")
+
+      ;; folders
+      "Fa" lsp-workspace-folders-add "add folder" t
+      "Fb" lsp-workspace-blocklist-remove "un-blocklist folder" t
+      "Fr" lsp-workspace-folders-remove "remove folder" t
+
+      ;; toggles
+      "TD" lsp-modeline-diagnostics-mode "toggle modeline diagnostics" (lsp-feature?
+                                                                        "textDocument/publishDiagnostics")
+      "TL" lsp-toggle-trace-io "toggle log io" t
+      "TS" lsp-ui-sideline-mode "toggle sideline" (featurep 'lsp-ui-sideline)
+      "TT" lsp-treemacs-sync-mode "toggle treemacs integration" (featurep 'lsp-treemacs)
+      "Ta" lsp-modeline-code-actions-mode "toggle modeline code actions" (lsp-feature?
+                                                                          "textDocument/codeAction")
+      "Tb" lsp-headerline-breadcrumb-mode "toggle breadcrumb" (lsp-feature?
+                                                               "textDocument/documentSymbol")
+      "Td" lsp-ui-doc-mode "toggle documentation popup" (featurep 'lsp-ui-doc)
+      "Tf" lsp-toggle-on-type-formatting "toggle on type formatting" (lsp-feature?
+                                                                      "textDocument/onTypeFormatting")
+      "Th" lsp-toggle-symbol-highlight "toggle highlighting" (lsp-feature? "textDocument/documentHighlight")
+      "Tl" lsp-lens-mode "toggle lenses" (lsp-feature? "textDocument/codeLens")
+      "Ts" lsp-toggle-signature-auto-activate "toggle signature" (lsp-feature? "textDocument/signatureHelp")
+
+      ;; goto
+      "ga" xref-find-apropos "find symbol in workspace" (lsp-feature? "workspace/symbol")
+      "gd" lsp-find-declaration "find declarations" (lsp-feature? "textDocument/declaration")
+      "ge" lsp-treemacs-errors-list "show errors" (fboundp 'lsp-treemacs-errors-list)
+      "gg" lsp-find-definition "find definitions" (lsp-feature? "textDocument/definition")
+      "gh" lsp-treemacs-call-hierarchy "call hierarchy" (and (lsp-feature? "callHierarchy/incomingCalls")
+                                                             (fboundp 'lsp-treemacs-call-hierarchy))
+      "gi" lsp-find-implementation "find implementations" (lsp-feature? "textDocument/implementation")
+      "gr" lsp-find-references "find references" (lsp-feature? "textDocument/references")
+      "gt" lsp-find-type-definition "find type definition" (lsp-feature? "textDocument/typeDefinition")
+
+      ;; help
+      "hg" lsp-ui-doc-glance "glance symbol" (and (featurep 'lsp-ui-doc)
+                                                  (lsp-feature? "textDocument/hover"))
+      "hh" lsp-describe-thing-at-point "describe symbol at point" (lsp-feature? "textDocument/hover")
+      "hs" lsp-signature-activate "signature help" (lsp-feature? "textDocument/signatureHelp")
+
+      ;; refactoring
+      "ro" lsp-organize-imports "organize imports" (lsp-feature? "textDocument/codeAction")
+      "rr" lsp-rename "rename" (lsp-feature? "textDocument/rename")
+
+      ;; actions
+      "aa" lsp-execute-code-action "code actions" (lsp-feature? "textDocument/codeAction")
+      "ah" lsp-document-highlight "highlight symbol" (lsp-feature? "textDocument/documentHighlight")
+      "al" lsp-avy-lens "lens" (and (bound-and-true-p lsp-lens-mode) (featurep 'avy))
+
+      ;; peeks
+      "Gg" lsp-ui-peek-find-definitions "peek definitions" (and (lsp-feature? "textDocument/definition")
+                                                                (fboundp 'lsp-ui-peek-find-definitions))
+      "Gi" lsp-ui-peek-find-implementation "peek implementations" (and
+                                                                   (fboundp 'lsp-ui-peek-find-implementation)
+                                                                   (lsp-feature? "textDocument/implementation"))
+      "Gr" lsp-ui-peek-find-references "peek references" (and (fboundp 'lsp-ui-peek-find-references)
+                                                              (lsp-feature? "textDocument/references"))
+      "Gs" lsp-ui-peek-find-workspace-symbol "peek workspace symbol" (and (fboundp
+                                                                           'lsp-ui-peek-find-workspace-symbol)
+                                                                          (lsp-feature? "workspace/symbol")))))
+
+
+;; which-key integration
+
+(declare-function which-key-add-major-mode-key-based-replacements "ext:which-key")
+(declare-function which-key-add-key-based-replacements "ext:which-key")
+
+(defun lsp-enable-which-key-integration (&optional all-modes)
+  "Adds descriptions for `lsp-mode-map' to `which-key-mode' for the current
+active `major-mode', or for all major modes when ALL-MODES is t."
+  (cl-flet ((which-key-fn (if all-modes
+                              'which-key-add-key-based-replacements
+                            (apply-partially 'which-key-add-major-mode-key-based-replacements major-mode))))
+    (apply
+     #'which-key-fn
+     (lsp--prepend-prefix
+      (cl-list*
+       ""    "lsp"
+       "w"   "workspaces"
+       "F"   "folders"
+       "="   "formatting"
+       "T"   "toggle"
+       "g"   "goto"
+       "h"   "help"
+       "r"   "refactor"
+       "a"   "code actions"
+       "G"   "peek"
+       lsp--binding-descriptions)))))
+
+
+;; Globbing syntax
+
+;; We port VSCode's glob-to-regexp code
+;; (https://github.com/Microsoft/vscode/blob/466da1c9013c624140f6d1473b23a870abc82d44/src/vs/base/common/glob.ts)
+;; since the LSP globbing syntax seems to be the same as that of
+;; VSCode.
+
+(defconst lsp-globstar "**"
+  "Globstar pattern.")
+
+(defconst lsp-glob-split ?/
+  "The character by which we split path components in a glob
+pattern.")
+
+(defconst lsp-path-regexp "[/\\\\]"
+  "Forward or backslash to be used as a path separator in
+computed regexps.")
+
+(defconst lsp-non-path-regexp "[^/\\\\]"
+  "A regexp matching anything other than a slash.")
+
+(defconst lsp-globstar-regexp
+  (format "\\(?:%s\\|%s+%s\\|%s%s+\\)*?"
+          lsp-path-regexp
+          lsp-non-path-regexp lsp-path-regexp
+          lsp-path-regexp lsp-non-path-regexp)
+  "Globstar in regexp form.")
+
+(defun lsp-split-glob-pattern (pattern split-char)
+  "Split PATTERN at SPLIT-CHAR while respecting braces and brackets."
+  (when pattern
+    (let ((segments nil)
+          (in-braces nil)
+          (in-brackets nil)
+          (current-segment ""))
+      (dolist (char (string-to-list pattern))
+        (cl-block 'exit-point
+          (if (eq char split-char)
+              (when (and (null in-braces)
+                         (null in-brackets))
+                (push current-segment segments)
+                (setq current-segment "")
+                (cl-return-from 'exit-point))
+            (pcase char
+              (?{
+               (setq in-braces t))
+              (?}
+               (setq in-braces nil))
+              (?\[
+               (setq in-brackets t))
+              (?\]
+               (setq in-brackets nil))))
+          (setq current-segment (concat current-segment
+                                        (char-to-string char)))))
+      (unless (string-empty-p current-segment)
+        (push current-segment segments))
+      (nreverse segments))))
+
+(defun lsp--glob-to-regexp (pattern)
+  "Helper function to convert a PATTERN from LSP's glob syntax to
+an Elisp regexp."
+  (if (string-empty-p pattern)
+      ""
+    (let ((current-regexp "")
+          (glob-segments (lsp-split-glob-pattern pattern lsp-glob-split)))
+      (if (-all? (lambda (segment) (eq segment lsp-globstar))
+                 glob-segments)
+          ".*"
+        (let ((prev-segment-was-globstar nil))
+          (seq-do-indexed
+           (lambda (segment index)
+             (if (string-equal segment lsp-globstar)
+                 (unless prev-segment-was-globstar
+                   (setq current-regexp (concat current-regexp
+                                                lsp-globstar-regexp))
+                   (setq prev-segment-was-globstar t))
+               (let ((in-braces nil)
+                     (brace-val "")
+                     (in-brackets nil)
+                     (bracket-val ""))
+                 (dolist (char (string-to-list segment))
+                   (cond
+                    ((and (not (char-equal char ?\}))
+                          in-braces)
+                     (setq brace-val (concat brace-val
+                                             (char-to-string char))))
+                    ((and in-brackets
+                          (or (not (char-equal char ?\]))
+                              (string-empty-p bracket-val)))
+                     (let ((curr (cond
+                                  ((char-equal char ?-)
+                                   "-")
+                                  ;; NOTE: ?\^ and ?^ are different characters
+                                  ((and (memq char '(?^ ?!))
+                                        (string-empty-p bracket-val))
+                                   "^")
+                                  ((char-equal char lsp-glob-split)
+                                   "")
+                                  (t
+                                   (regexp-quote (char-to-string char))))))
+                       (setq bracket-val (concat bracket-val curr))))
+                    (t
+                     (cl-case char
+                       (?{
+                        (setq in-braces t))
+                       (?\[
+                        (setq in-brackets t))
+                       (?}
+                        (let* ((choices (lsp-split-glob-pattern brace-val ?\,))
+                               (brace-regexp (concat "\\(?:"
+                                                     (mapconcat #'lsp--glob-to-regexp choices "\\|")
+                                                     "\\)")))
+                          (setq current-regexp (concat current-regexp
+                                                       brace-regexp))
+                          (setq in-braces nil)
+                          (setq brace-val "")))
+                       (?\]
+                        (setq current-regexp
+                              (concat current-regexp
+                                      "[" bracket-val "]"))
+                        (setq in-brackets nil)
+                        (setq bracket-val ""))
+                       (??
+                        (setq current-regexp
+                              (concat current-regexp
+                                      lsp-non-path-regexp)))
+                       (?*
+                        (setq current-regexp
+                              (concat current-regexp
+                                      lsp-non-path-regexp "*?")))
+                       (t
+                        (setq current-regexp
+                              (concat current-regexp
+                                      (regexp-quote (char-to-string char)))))))))
+                 (when (and (< index (1- (length glob-segments)))
+                            (or (not (string-equal (nth (1+ index) glob-segments)
+                                                   lsp-globstar))
+                                (< (+ index 2)
+                                   (length glob-segments))))
+                   (setq current-regexp
+                         (concat current-regexp
+                                 lsp-path-regexp)))
+                 (setq prev-segment-was-globstar nil))))
+           glob-segments)
+          current-regexp)))))
+
+;; See https://github.com/emacs-lsp/lsp-mode/issues/2365
+(defun lsp-glob-unbrace-at-top-level (glob-pattern)
+  "If GLOB-PATTERN does not start with a brace, return a singleton list
+containing GLOB-PATTERN.
+
+If GLOB-PATTERN does start with a brace, return a list of the
+comma-separated globs within the top-level braces."
+  (if (not (string-prefix-p "{" glob-pattern))
+      (list glob-pattern)
+    (lsp-split-glob-pattern (substring glob-pattern 1 -1) ?\,)))
+
+(defun lsp-glob-convert-to-wrapped-regexp (glob-pattern)
+  "Convert GLOB-PATTERN to a regexp wrapped with the beginning-
+and end-of-string meta-characters."
+  (concat "\\`" (lsp--glob-to-regexp (string-trim glob-pattern)) "\\'"))
+
+(defun lsp-glob-to-regexps (glob-pattern)
+  "Convert a GLOB-PATTERN to a list of Elisp regexps."
+  (when-let*
+      ((glob-pattern (cond ((hash-table-p glob-pattern)
+                            (ht-get glob-pattern "pattern"))
+                           ((stringp glob-pattern) glob-pattern)
+                           (t (error "Unknown glob-pattern type: %s" glob-pattern))))
+       (trimmed-pattern (string-trim glob-pattern))
+       (top-level-unbraced-patterns (lsp-glob-unbrace-at-top-level trimmed-pattern)))
+    (seq-map #'lsp-glob-convert-to-wrapped-regexp
+             top-level-unbraced-patterns)))
+
+
+
+(defvar lsp-mode-menu)
+
+(defun lsp-mouse-click (event)
+  (interactive "e")
+  (let* ((ec (event-start event))
+         (choice (x-popup-menu event lsp-mode-menu))
+         (action (lookup-key lsp-mode-menu (apply 'vector choice))))
+
+    (select-window (posn-window ec))
+
+    (unless (and (region-active-p) (eq action 'lsp-execute-code-action))
+      (goto-char (posn-point ec)))
+    (run-with-idle-timer
+     0.001 nil
+     (lambda ()
+       (cl-labels ((check (value) (not (null value))))
+         (when choice
+           (call-interactively action)))))))
+
+(defvar lsp-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map (kbd "C-<down-mouse-1>") #'lsp-find-definition-mouse)
+    (define-key map (kbd "C-<mouse-1>") #'ignore)
+    (define-key map (kbd "<mouse-3>") #'lsp-mouse-click)
+    (define-key map (kbd "C-S-SPC") #'lsp-signature-activate)
+    (when lsp-keymap-prefix
+      (define-key map (kbd lsp-keymap-prefix) lsp-command-map))
+    map)
+  "Keymap for `lsp-mode'.")
+
+(define-minor-mode lsp-mode "Mode for LSP interaction."
+  :keymap lsp-mode-map
+  :lighter
+  (" LSP["
+   (lsp--buffer-workspaces
+    (:eval (mapconcat #'lsp--workspace-print lsp--buffer-workspaces "]["))
+    (:propertize "Disconnected" face warning))
+   "]")
+  :group 'lsp-mode
+  (when (and lsp-mode (not lsp--buffer-workspaces) (not lsp--buffer-deferred))
+    ;; fire up `lsp' when someone calls `lsp-mode' instead of `lsp'
+    (lsp)))
+
+(defvar lsp-mode-menu
+  (easy-menu-create-menu
+   nil
+   `(["Go to definition" lsp-find-definition
+      :active (lsp-feature? "textDocument/definition")]
+     ["Find references" lsp-find-references
+      :active (lsp-feature? "textDocument/references")]
+     ["Find implementations" lsp-find-implementation
+      :active (lsp-feature? "textDocument/implementation")]
+     ["Find declarations" lsp-find-declaration
+      :active (lsp-feature? "textDocument/declaration")]
+     ["Go to type declaration" lsp-find-type-definition
+      :active (lsp-feature? "textDocument/typeDefinition")]
+     "--"
+     ["Describe" lsp-describe-thing-at-point]
+     ["Code action" lsp-execute-code-action]
+     ["Format" lsp-format-buffer]
+     ["Highlight references" lsp-document-highlight]
+     ["Type Hierarchy" lsp-java-type-hierarchy
+      :visible (lsp-can-execute-command? "java.navigate.resolveTypeHierarchy")]
+     ["Type Hierarchy" lsp-treemacs-type-hierarchy
+      :visible (and (not (lsp-can-execute-command? "java.navigate.resolveTypeHierarchy"))
+                    (functionp 'lsp-treemacs-type-hierarchy)
+                    (lsp-feature? "textDocument/typeHierarchy"))]
+     ["Call Hierarchy" lsp-treemacs-call-hierarchy
+      :visible (and (functionp 'lsp-treemacs-call-hierarchy)
+                    (lsp-feature? "textDocument/callHierarchy"))]
+     ["Rename" lsp-rename
+      :active (lsp-feature? "textDocument/rename")]
+     "--"
+     ("Session"
+      ["View logs" lsp-workspace-show-log]
+      ["Describe" lsp-describe-session]
+      ["Shutdown" lsp-shutdown-workspace]
+      ["Restart" lsp-restart-workspace])
+     ("Workspace Folders"
+      ["Add" lsp-workspace-folders-add]
+      ["Remove" lsp-workspace-folders-remove]
+      ["Open" lsp-workspace-folders-open])
+     ("Toggle features"
+      ["Lenses" lsp-lens-mode]
+      ["Headerline breadcrumb" lsp-headerline-breadcrumb-mode]
+      ["Modeline code actions" lsp-modeline-code-actions-mode]
+      ["Modeline diagnostics" lsp-modeline-diagnostics-mode])
+     "---"
+     ("Debug"
+      :active (bound-and-true-p dap-ui-mode)
+      :filter ,(lambda (_)
+                 (and (boundp 'dap-ui-menu-items)
+                      (nthcdr 3 dap-ui-menu-items))))))
+  "Menu for lsp-mode.")
+
+(defalias 'make-lsp-client 'make-lsp--client)
+
+(cl-defstruct lsp--registered-capability
+  (id "")
+  (method " ")
+  (options nil))
+
+;; A ‘lsp--workspace’ object represents exactly one language server process.
+(cl-defstruct lsp--workspace
+  ;; the `ewoc' object for displaying I/O to and from the server
+  (ewoc nil)
+
+  ;; ‘server-capabilities’ is a hash table of the language server capabilities.
+  ;; It is the hash table representation of a LSP ServerCapabilities structure;
+  ;; cf. https://microsoft.github.io/language-server-protocol/specification#initialize.
+  (server-capabilities nil)
+
+  ;; ‘registered-server-capabilities’ is a list of hash tables that represent
+  ;; dynamically-registered Registration objects.  See
+  ;; https://microsoft.github.io/language-server-protocol/specification#client_registerCapability.
+  (registered-server-capabilities nil)
+
+  ;; ‘root’ is a directory name or a directory file name for the workspace
+  ;; root.  ‘lsp-mode’ passes this directory to the ‘initialize’ method of the
+  ;; language server; see
+  ;; https://microsoft.github.io/language-server-protocol/specification#initialize.
+  (root nil)
+
+  ;; ‘client’ is the ‘lsp--client’ object associated with this workspace.
+  (client nil)
+
+  ;; ‘host-root’ contains the host root info as derived from `file-remote-p'. It
+  ;; used to derive the file path in `lsp--uri-to-path' when using tramp
+  ;; connection.
+  (host-root nil)
+
+  ;; ‘proc’ is a process object; it may represent a regular process, a pipe, or
+  ;; a network connection.  ‘lsp-mode’ communicates with ‘proc’ using the
+  ;; language server protocol.  ‘proc’ corresponds to the COMMUNICATION-PROCESS
+  ;; element of the return value of the client’s ‘get-root’ field, which see.
+  (proc nil)
+
+  ;; ‘proc’ is a process object; it must represent a regular process, not a
+  ;; pipe or network process.  It represents the actual server process that
+  ;; corresponds to this workspace.  ‘cmd-proc’ corresponds to the
+  ;; COMMAND-PROCESS element of the return value of the client’s ‘get-root’
+  ;; field, which see.
+  (cmd-proc nil)
+
+  ;; ‘buffers’ is a list of buffers associated with this workspace.
+  (buffers nil)
+
+  ;; if semantic tokens is enabled, `semantic-tokens-faces' contains
+  ;; one face (or nil) for each token type supported by the language server.
+  (semantic-tokens-faces nil)
+
+  ;; If semantic highlighting is enabled, `semantic-tokens-modifier-faces'
+  ;; contains one face (or nil) for each modifier type supported by the language
+  ;; server
+  (semantic-tokens-modifier-faces nil)
+
+  ;; Extra client capabilities provided by third-party packages using
+  ;; `lsp-register-client-capabilities'. It's value is an alist of (PACKAGE-NAME
+  ;; . CAPS), where PACKAGE-NAME is a symbol of the third-party package name,
+  ;; and CAPS is either a plist of the client capabilities, or a function that
+  ;; takes no argument and returns a plist of the client capabilities or nil.
+  (extra-client-capabilities nil)
+
+  ;; Workspace status
+  (status nil)
+
+  ;; ‘metadata’ is a generic storage for workspace specific data. It is
+  ;; accessed via `lsp-workspace-set-metadata' and `lsp-workspace-set-metadata'
+  (metadata (make-hash-table :test 'equal))
+
+  ;; contains all the file notification watches that have been created for the
+  ;; current workspace in format filePath->file notification handle.
+  (watches (make-hash-table :test 'equal))
+
+  ;; list of workspace folders
+  (workspace-folders nil)
+
+  ;; ‘last-id’ the last request id for the current workspace.
+  (last-id 0)
+
+  ;; ‘status-string’ allows extensions to specify custom status string based on
+  ;; the Language Server specific messages.
+  (status-string nil)
+
+  ;; ‘shutdown-action’ flag used to mark that workspace should not be restarted (e.g. it
+  ;; was stopped).
+  shutdown-action
+
+  ;; ‘diagnostics’ a hashmap with workspace diagnostics.
+  (diagnostics (make-hash-table :test 'equal))
+
+  ;; contains all the workDone progress tokens that have been created
+  ;; for the current workspace.
+  (work-done-tokens (make-hash-table :test 'equal)))
+
+
+(cl-defstruct lsp-session
+  ;; contains the folders that are part of the current session
+  folders
+  ;; contains the folders that must not be imported in the current workspace.
+  folders-blocklist
+  ;; contains the list of folders that must be imported in a project in case of
+  ;; multi root LSP server.
+  (server-id->folders (make-hash-table :test 'equal))
+  ;; folder to list of the servers that are associated with the folder.
+  (folder->servers (make-hash-table :test 'equal))
+  ;; ‘metadata’ is a generic storage for workspace specific data. It is
+  ;; accessed via `lsp-workspace-set-metadata' and `lsp-workspace-set-metadata'
+  (metadata (make-hash-table :test 'equal)))
+
+(defun lsp-workspace-status (status-string &optional workspace)
+  "Set current workspace status to STATUS-STRING.
+If WORKSPACE is not specified defaults to lsp--cur-workspace."
+  (let ((status-string (when status-string (replace-regexp-in-string "%" "%%" status-string))))
+    (setf (lsp--workspace-status-string (or workspace lsp--cur-workspace)) status-string)))
+
+(defun lsp-session-set-metadata (key value &optional _workspace)
+  "Associate KEY with VALUE in the WORKSPACE metadata.
+If WORKSPACE is not provided current workspace will be used."
+  (puthash key value (lsp-session-metadata (lsp-session))))
+
+(defalias 'lsp-workspace-set-metadata 'lsp-session-set-metadata)
+
+(defun lsp-session-get-metadata (key &optional _workspace)
+  "Lookup KEY in WORKSPACE metadata.
+If WORKSPACE is not provided current workspace will be used."
+  (gethash key (lsp-session-metadata (lsp-session))))
+
+(defalias 'lsp-workspace-get-metadata 'lsp-session-get-metadata)
+
+(defun lsp-workspace-set-work-done-token (token value workspace)
+  "Associate TOKEN with VALUE in the WORKSPACE work-done-tokens."
+  (puthash token value (lsp--workspace-work-done-tokens workspace)))
+
+(defun lsp-workspace-get-work-done-token (token workspace)
+  "Lookup TOKEN in the WORKSPACE work-done-tokens."
+  (gethash token (lsp--workspace-work-done-tokens workspace)))
+
+(defun lsp-workspace-rem-work-done-token (token workspace)
+  "Remove TOKEN from the WORKSPACE work-done-tokens."
+  (remhash token (lsp--workspace-work-done-tokens workspace)))
+
+
+(defun lsp--make-notification (method &optional params)
+  "Create notification body for method METHOD and parameters PARAMS."
+  (list :jsonrpc "2.0" :method method :params params))
+
+(defalias 'lsp--make-request 'lsp--make-notification)
+(defalias 'lsp-make-request 'lsp--make-notification)
+
+(defun lsp--make-response (id result)
+  "Create response for REQUEST with RESULT."
+  `(:jsonrpc "2.0" :id ,id :result ,result))
+
+(defun lsp-make-notification (method &optional params)
+  "Create notification body for method METHOD and parameters PARAMS."
+  (lsp--make-notification method params))
+
+(defmacro lsp--json-serialize (params)
+  (if (progn
+        (require 'json)
+        (fboundp 'json-serialize))
+      `(json-serialize ,params
+                       :null-object nil
+                       :false-object :json-false)
+    `(let ((json-false :json-false))
+       (json-encode ,params))))
+
+(defun lsp--make-message (params)
+  "Create a LSP message from PARAMS, after encoding it to a JSON string."
+  (let ((body (lsp--json-serialize params)))
+    (concat "Content-Length: "
+            (number-to-string (1+ (string-bytes body)))
+            "\r\n\r\n"
+            body
+            "\n")))
+
+(cl-defstruct lsp--log-entry timestamp process-time type method id body)
+
+(defun lsp--make-log-entry (method id body type &optional process-time)
+  "Create an outgoing log object from BODY with method METHOD and id ID.
+If ID is non-nil, then the body is assumed to be a notification.
+TYPE can either be `incoming' or `outgoing'"
+  (cl-assert (memq type '(incoming-req outgoing-req incoming-notif
+                                       outgoing-notif incoming-resp
+                                       outgoing-resp)))
+  (make-lsp--log-entry
+   :timestamp (format-time-string "%I:%M:%S %p")
+   :process-time process-time
+   :method method
+   :id id
+   :type type
+   :body body))
+
+(defun lsp--log-font-lock-json (body)
+  "Font lock JSON BODY."
+  (with-temp-buffer
+    (insert body)
+    ;; We set the temp buffer file-name extension to .json and call `set-auto-mode'
+    ;; so the users configured json mode is used which could be
+    ;; `json-mode', `json-ts-mode', `jsonian-mode', etc.
+    (let ((buffer-file-name "lsp-log.json"))
+      (delay-mode-hooks
+        (set-auto-mode)
+        (if (fboundp 'font-lock-ensure)
+            (font-lock-ensure)
+          (with-no-warnings
+            (font-lock-fontify-buffer)))))
+    (buffer-string)))
+
+(defun lsp--log-entry-pp (entry)
+  (cl-assert (lsp--log-entry-p entry))
+  (pcase-let (((cl-struct lsp--log-entry timestamp method id type process-time
+                          body)
+               entry)
+              (json-false :json-false)
+              (json-encoding-pretty-print t)
+              (str nil))
+    (setq str
+          (concat (format "[Trace - %s] " timestamp)
+                  (pcase type
+                    ('incoming-req (format "Received request '%s - (%s)." method id))
+                    ('outgoing-req (format "Sending request '%s - (%s)'." method id))
+
+                    ('incoming-notif (format "Received notification '%s'." method))
+                    ('outgoing-notif (format "Sending notification '%s'." method))
+
+                    ('incoming-resp (format "Received response '%s - (%s)' in %dms."
+                                            method id process-time))
+                    ('outgoing-resp
+                     (format
+                      "Sending response '%s - (%s)'. Processing request took %dms"
+                      method id process-time)))
+                  "\n"
+                  (if (memq type '(incoming-resp ougoing-resp))
+                      "Result: "
+                    "Params: ")
+                  (lsp--log-font-lock-json (json-encode body))
+                  "\n\n\n"))
+    (setq str (propertize str 'mouse-face 'highlight 'read-only t))
+    (insert str)))
+
+(defvar-local lsp--log-io-ewoc nil)
+
+(defun lsp--get-create-io-ewoc (workspace)
+  (if (and (lsp--workspace-ewoc workspace)
+           (buffer-live-p (ewoc-buffer (lsp--workspace-ewoc workspace))))
+      (lsp--workspace-ewoc workspace)
+    (with-current-buffer (lsp--get-log-buffer-create workspace)
+      (unless (eq 'lsp-log-io-mode major-mode) (lsp-log-io-mode))
+      (setq-local window-point-insertion-type t)
+      (setq lsp--log-io-ewoc (ewoc-create #'lsp--log-entry-pp nil nil t))
+      (setf (lsp--workspace-ewoc workspace) lsp--log-io-ewoc))
+    (lsp--workspace-ewoc workspace)))
+
+(defun lsp--ewoc-count (ewoc)
+  (let* ((count 0)
+         (count-fn (lambda (_) (setq count (1+ count)))))
+    (ewoc-map count-fn ewoc)
+    count))
+
+(defun lsp--log-entry-new (entry workspace)
+  (let* ((ewoc (lsp--get-create-io-ewoc workspace))
+         (count (and (not (eq lsp-io-messages-max t)) (lsp--ewoc-count ewoc)))
+         (node (if (or (eq lsp-io-messages-max t)
+                       (>= lsp-io-messages-max count))
+                   nil
+                 (ewoc-nth ewoc (1- lsp-io-messages-max))))
+         (prev nil)
+         (inhibit-read-only t))
+    (while node
+      (setq prev (ewoc-prev ewoc node))
+      (ewoc-delete ewoc node)
+      (setq node prev))
+    (ewoc-enter-last ewoc entry)))
+
+(defun lsp--send-notification (body)
+  "Send BODY as a notification to the language server."
+  (lsp-foreach-workspace
+   (when (lsp--log-io-p (plist-get body :method))
+     (lsp--log-entry-new (lsp--make-log-entry
+                          (plist-get body :method)
+                          nil (plist-get body :params) 'outgoing-notif)
+                         lsp--cur-workspace))
+   (lsp--send-no-wait body
+                      (lsp--workspace-proc lsp--cur-workspace))))
+
+(defalias 'lsp-send-notification 'lsp--send-notification)
+
+(defun lsp-notify (method params)
+  "Send notification METHOD with PARAMS."
+  (lsp--send-notification (lsp--make-notification method params)))
+
+(defun lsp--cur-workspace-check ()
+  "Check whether buffer lsp workspace(s) are set."
+  (cl-assert (lsp-workspaces) nil
+             "No language server(s) is associated with this buffer."))
+
+(defun lsp--send-request (body &optional no-wait no-merge)
+  "Send BODY as a request to the language server, get the response.
+If NO-WAIT is non-nil, don't synchronously wait for a response.
+If NO-MERGE is non-nil, don't merge the results but return an
+alist mapping workspace->result."
+  (lsp-request (plist-get body :method)
+               (plist-get body :params)
+               :no-wait no-wait
+               :no-merge no-merge))
+
+(defalias 'lsp-send-request 'lsp--send-request
+  "Send BODY as a request to the language server and return the response
+synchronously.
+\n(fn BODY)")
+
+(cl-defun lsp-request (method params &key no-wait no-merge)
+  "Send request METHOD with PARAMS.
+If NO-MERGE is non-nil, don't merge the results but return alist
+workspace->result.
+If NO-WAIT is non-nil send the request as notification."
+  (if no-wait
+      (lsp-notify method params)
+    (let* ((send-time (float-time))
+           ;; max time by which we must get a response
+           (expected-time
+            (and
+             lsp-response-timeout
+             (+ send-time lsp-response-timeout)))
+           resp-result resp-error done?)
+      (unwind-protect
+          (progn
+            (lsp-request-async method params
+                               (lambda (res) (setf resp-result (or res :finished)) (throw 'lsp-done '_))
+                               :error-handler (lambda (err) (setf resp-error err) (throw 'lsp-done '_))
+                               :no-merge no-merge
+                               :mode 'detached
+                               :cancel-token :sync-request)
+            (while (not (or resp-error resp-result))
+              (if (functionp 'json-rpc-connection)
+                  (catch 'lsp-done (sit-for 0.01))
+                (catch 'lsp-done
+                  (accept-process-output
+                   nil
+                   (if expected-time (- expected-time send-time) 1))))
+              (setq send-time (float-time))
+              (when (and expected-time (< expected-time send-time))
+                (error "Timeout while waiting for response.  Method: %s" method)))
+            (setq done? t)
+            (cond
+             ((eq resp-result :finished) nil)
+             (resp-result resp-result)
+             ((lsp-json-error? resp-error) (error (lsp:json-error-message resp-error)))
+             ((lsp-json-error? (cl-first resp-error))
+              (error (lsp:json-error-message (cl-first resp-error))))))
+        (unless done?
+          (lsp-cancel-request-by-token :sync-request))))))
+
+(cl-defun lsp-request-while-no-input (method params)
+  "Send request METHOD with PARAMS and waits until there is no input.
+Return same value as `lsp--while-no-input' and respecting `non-essential'."
+  (if (or non-essential (not lsp-request-while-no-input-may-block))
+      (let* ((send-time (float-time))
+             ;; max time by which we must get a response
+             (expected-time
+              (and
+               lsp-response-timeout
+               (+ send-time lsp-response-timeout)))
+             resp-result resp-error done?)
+        (unwind-protect
+            (progn
+              (lsp-request-async method params
+                                 (lambda (res) (setf resp-result (or res :finished)) (throw 'lsp-done '_))
+                                 :error-handler (lambda (err) (setf resp-error err) (throw 'lsp-done '_))
+                                 :mode 'detached
+                                 :cancel-token :sync-request)
+              (while (not (or resp-error resp-result (input-pending-p)))
+                (catch 'lsp-done
+                  (sit-for
+                   (if expected-time (- expected-time send-time) 1)))
+                (setq send-time (float-time))
+                (when (and expected-time (< expected-time send-time))
+                  (error "Timeout while waiting for response.  Method: %s" method)))
+              (setq done? (or resp-error resp-result))
+              (cond
+               ((eq resp-result :finished) nil)
+               (resp-result resp-result)
+               ((lsp-json-error? resp-error) (error (lsp:json-error-message resp-error)))
+               ((lsp-json-error? (cl-first resp-error))
+                (error (lsp:json-error-message (cl-first resp-error))))))
+          (unless done?
+            (lsp-cancel-request-by-token :sync-request))
+          (when (and (input-pending-p) lsp--throw-on-input)
+            (throw 'input :interrupted))))
+    (lsp-request method params)))
+
+(defvar lsp--cancelable-requests (ht))
+
+(cl-defun lsp-request-async (method params callback
+                                    &key mode error-handler cancel-handler no-merge cancel-token)
+  "Send METHOD with PARAMS as a request to the language server.
+Call CALLBACK with the response received from the server
+asynchronously.
+MODE determines when the callback will be called depending on the
+condition of the original buffer.  It could be:
+- `detached' which means that the callback will be executed no
+matter what has happened to the buffer.
+- `alive' - the callback will be executed only if the buffer from
+which the call was executed is still alive.
+- `current' the callback will be executed only if the original buffer
+is still selected.
+- `tick' - the callback will be executed only if the buffer was not modified.
+- `unchanged' - the callback will be executed only if the buffer hasn't
+changed and if the buffer is not modified.
+
+ERROR-HANDLER will be called in case the request has failed.
+CANCEL-HANDLER will be called in case the request is being canceled.
+If NO-MERGE is non-nil, don't merge the results but return alist
+workspace->result.
+CANCEL-TOKEN is the token that can be used to cancel request."
+  (lsp--send-request-async `(:jsonrpc "2.0" :method ,method :params ,params)
+                           callback mode error-handler cancel-handler no-merge cancel-token))
+
+(defun lsp--create-request-cancel (id workspaces hook buf method cancel-callback)
+  (lambda (&rest _)
+    (unless (and (equal 'post-command-hook hook)
+                 (equal (current-buffer) buf))
+      (lsp--request-cleanup-hooks id)
+      (with-lsp-workspaces workspaces
+        (lsp--cancel-request id)
+        (when cancel-callback (funcall cancel-callback)))
+      (lsp-log "Cancelling %s(%s) in hook %s" method id hook))))
+
+(defun lsp--create-async-callback
+    (callback method no-merge workspaces)
+  "Create async handler expecting COUNT results, merge them and call CALLBACK.
+MODE determines when the callback will be called depending on the
+condition of the original buffer. METHOD is the invoked method.
+If NO-MERGE is non-nil, don't merge the results but return alist
+workspace->result. ID is the request id."
+  (let (results errors)
+    (lambda (result)
+      (push (cons lsp--cur-workspace result)
+            (if (eq result :error) errors results))
+      (when (and (not (eq (length errors) (length workspaces)))
+                 (eq (+ (length errors) (length results)) (length workspaces)))
+        (funcall callback
+                 (if no-merge
+                     results
+                   (lsp--merge-results (-map #'cl-rest results) method)))))))
+
+(defcustom lsp-default-create-error-handler-fn nil
+  "Default error handler customization.
+Handler should give METHOD as argument and return function of one argument
+ERROR."
+  :type 'function
+  :group 'lsp-mode
+  :package-version '(lsp-mode . "9.0.0"))
+
+(defun lsp--create-default-error-handler (method)
+  "Default error handler.
+METHOD is the executed method."
+  (if lsp-default-create-error-handler-fn
+      (funcall lsp-default-create-error-handler-fn method)
+    (lambda (error)
+      (lsp--warn "%s" (or (lsp--error-string error)
+                          (format "%s Request has failed" method))))))
+
+(defvar lsp--request-cleanup-hooks (ht))
+
+(defun lsp--request-cleanup-hooks (request-id)
+  (when-let ((cleanup-function (gethash request-id lsp--request-cleanup-hooks)))
+    (funcall cleanup-function)
+    (remhash request-id lsp--request-cleanup-hooks)))
+
+(defun lsp-cancel-request-by-token (cancel-token)
+  "Cancel request using CANCEL-TOKEN."
+  (-when-let ((request-id . workspaces) (gethash cancel-token lsp--cancelable-requests))
+    (with-lsp-workspaces workspaces
+      (lsp--cancel-request request-id))
+    (remhash cancel-token lsp--cancelable-requests)
+    (lsp--request-cleanup-hooks request-id)))
+
+(defun lsp--send-request-async (body callback
+                                     &optional mode error-callback cancel-callback
+                                     no-merge cancel-token)
+  "Send BODY as a request to the language server.
+Call CALLBACK with the response received from the server
+asynchronously.
+MODE determines when the callback will be called depending on the
+condition of the original buffer.  It could be:
+- `detached' which means that the callback will be executed no
+matter what has happened to the buffer.
+- `alive' - the callback will be executed only if the buffer from
+which the call was executed is still alive.
+- `current' the callback will be executed only if the original buffer
+is still selected.
+- `tick' - the callback will be executed only if the buffer was not modified.
+- `unchanged' - the callback will be executed only if the buffer hasn't
+changed and if the buffer is not modified.
+
+ERROR-CALLBACK will be called in case the request has failed.
+CANCEL-CALLBACK will be called in case the request is being canceled.
+If NO-MERGE is non-nil, don't merge the results but return alist
+workspace->result.
+CANCEL-TOKEN is the token that can be used to cancel request."
+  (when cancel-token
+    (lsp-cancel-request-by-token cancel-token))
+
+  (if-let ((target-workspaces (lsp--find-workspaces-for body)))
+      (let* ((start-time (current-time))
+             (method (plist-get body :method))
+             (id (cl-incf lsp-last-id))
+             (buf (current-buffer))
+             (cancel-callback (when cancel-callback
+                                (pcase mode
+                                  ((or 'alive 'tick 'unchanged)
+                                   (lambda ()
+                                     (with-current-buffer buf
+                                       (funcall cancel-callback))))
+                                  (_ cancel-callback))))
+             ;; calculate what are the (hook . local) pairs which will cancel
+             ;; the request
+             (hooks (pcase mode
+                      ('alive     '((kill-buffer-hook . t)))
+                      ('tick      '((kill-buffer-hook . t) (after-change-functions . t)))
+                      ('unchanged '((after-change-functions . t) (post-command-hook . nil)))
+                      ('current   '((post-command-hook . nil)))))
+             ;; note: lambdas in emacs can be compared but we should make sure
+             ;; that all of the captured arguments are the same - in our case
+             ;; `lsp--create-request-cancel' will return the same lambda when
+             ;; called with the same params.
+             (cleanup-hooks
+              (lambda () (mapc
+                          (-lambda ((hook . local))
+                            (if local
+                                (when (buffer-live-p buf)
+                                  (with-current-buffer buf
+                                    (remove-hook hook
+                                                 (lsp--create-request-cancel
+                                                  id target-workspaces hook buf method cancel-callback)
+                                                 t)))
+                              (remove-hook hook (lsp--create-request-cancel
+                                                 id target-workspaces hook buf method cancel-callback))))
+                          hooks)
+                (remhash cancel-token lsp--cancelable-requests)))
+             (callback (pcase mode
+                         ((or 'alive 'tick 'unchanged) (lambda (&rest args)
+                                                         (with-current-buffer buf
+                                                           (apply callback args))))
+                         (_ callback)))
+             (callback (lsp--create-async-callback callback
+                                                   method
+                                                   no-merge
+                                                   target-workspaces))
+             (callback (lambda (result)
+                         (lsp--request-cleanup-hooks id)
+                         (funcall callback result)))
+             (error-callback (lsp--create-async-callback
+                              (or error-callback
+                                  (lsp--create-default-error-handler method))
+                              method
+                              nil
+                              target-workspaces))
+             (error-callback (lambda (error)
+                               (funcall callback :error)
+                               (lsp--request-cleanup-hooks id)
+                               (funcall error-callback error)))
+             (body (plist-put body :id id)))
+
+        ;; cancel request in any of the hooks
+        (mapc (-lambda ((hook . local))
+                (add-hook hook
+                          (lsp--create-request-cancel
+                           id target-workspaces hook buf method cancel-callback)
+                          nil local))
+              hooks)
+        (puthash id cleanup-hooks lsp--request-cleanup-hooks)
+
+        (setq lsp--last-active-workspaces target-workspaces)
+
+        (when cancel-token
+          (puthash cancel-token (cons id target-workspaces) lsp--cancelable-requests))
+
+        (seq-doseq (workspace target-workspaces)
+          (when (lsp--log-io-p method)
+            (lsp--log-entry-new (lsp--make-log-entry method id
+                                                     (plist-get body :params)
+                                                     'outgoing-req)
+                                workspace))
+          (puthash id
+                   (list callback error-callback method start-time (current-time))
+                   (-> workspace
+                       (lsp--workspace-client)
+                       (lsp--client-response-handlers)))
+          (lsp--send-no-wait body (lsp--workspace-proc workspace)))
+        body)
+    (error "The connected server(s) does not support method %s.
+To find out what capabilities support your server use `M-x lsp-describe-session'
+and expand the capabilities section"
+           (plist-get body :method))))
+
+;; deprecated, use lsp-request-async.
+(defalias 'lsp-send-request-async 'lsp--send-request-async)
+(make-obsolete 'lsp-send-request-async 'lsp-request-async "lsp-mode 7.0.1")
+
+;; Clean up the entire state of lsp mode when Emacs is killed, to get rid of any
+;; pending language servers.
+(add-hook 'kill-emacs-hook #'lsp--global-teardown)
+
+(defun lsp--global-teardown ()
+  "Unload working workspaces."
+  (lsp-foreach-workspace (lsp--shutdown-workspace)))
+
+(defun lsp--shutdown-workspace (&optional restart)
+  "Shut down the language server process for ‘lsp--cur-workspace’."
+  (with-demoted-errors "LSP error: %S"
+    (let ((lsp-response-timeout 0.5))
+      (condition-case err
+          (lsp-request "shutdown" nil)
+        (error (lsp--error "%s" err))))
+    (lsp-notify "exit" nil))
+  (setf (lsp--workspace-shutdown-action lsp--cur-workspace) (or (and restart 'restart) 'shutdown))
+  (lsp--uninitialize-workspace))
+
+(defcustom lsp-inlay-hint-enable nil
+  "If non-nil it will enable inlay hints."
+  :type 'boolean
+  :group 'lsp-mode
+  :package-version '(lsp-mode . "9.0.0"))
+
+(defun lsp--uninitialize-workspace ()
+  "Cleanup buffer state.
+When a workspace is shut down, by request or from just
+disappearing, unset all the variables related to it."
+  (-let [(&lsp-wks 'cmd-proc 'buffers) lsp--cur-workspace]
+    (lsp-process-kill cmd-proc)
+    (mapc (lambda (buf)
+            (when (lsp-buffer-live-p buf)
+              (lsp-with-current-buffer buf
+                                       (lsp-managed-mode -1))))
+          buffers)
+    (lsp-diagnostics--workspace-cleanup lsp--cur-workspace)))
+
+(defun lsp--client-capabilities (&optional custom-capabilities)
+  "Return the client capabilities appending CUSTOM-CAPABILITIES."
+  (append
+   `((general . ((positionEncodings . ["utf-32", "utf-16"])))
+     (workspace . ((workspaceEdit . ((documentChanges . t)
+                                     (resourceOperations . ["create" "rename" "delete"])))
+                   (applyEdit . t)
+                   (symbol . ((symbolKind . ((valueSet . ,(apply 'vector (number-sequence 1 26)))))))
+                   (executeCommand . ((dynamicRegistration . :json-false)))
+                   ,@(when lsp-enable-file-watchers '((didChangeWatchedFiles . ((dynamicRegistration . t)))))
+                   (workspaceFolders . t)
+                   (configuration . t)
+                   ,@(when lsp-semantic-tokens-enable
+                       `((semanticTokens . ((refreshSupport . ,(or (and (boundp 'lsp-semantic-tokens-honor-refresh-requests)
+                                                                        lsp-semantic-tokens-honor-refresh-requests)
+                                                                   :json-false))))))
+                   ,@(when lsp-lens-enable '((codeLens . ((refreshSupport . t)))))
+                   ,@(when lsp-inlay-hint-enable '((inlayHint . ((refreshSupport . :json-false)))))
+                   (fileOperations . ((didCreate . :json-false)
+                                      (willCreate . :json-false)
+                                      (didRename . t)
+                                      (willRename . t)
+                                      (didDelete . :json-false)
+                                      (willDelete . :json-false)))))
+     (textDocument . ((declaration . ((dynamicRegistration . t)
+                                      (linkSupport . t)))
+                      (definition . ((dynamicRegistration . t)
+                                     (linkSupport . t)))
+                      (references . ((dynamicRegistration . t)))
+                      (implementation . ((dynamicRegistration . t)
+                                         (linkSupport . t)))
+                      (typeDefinition . ((dynamicRegistration . t)
+                                         (linkSupport . t)))
+                      (synchronization . ((willSave . t) (didSave . t) (willSaveWaitUntil . t)))
+                      (documentSymbol . ((symbolKind . ((valueSet . ,(apply 'vector (number-sequence 1 26)))))
+                                         (hierarchicalDocumentSymbolSupport . t)))
+                      (formatting . ((dynamicRegistration . t)))
+                      (rangeFormatting . ((dynamicRegistration . t)))
+                      (onTypeFormatting . ((dynamicRegistration . t)))
+                      ,@(when (and lsp-semantic-tokens-enable
+                                   (functionp 'lsp--semantic-tokens-capabilities))
+                          (lsp--semantic-tokens-capabilities))
+                      (rename . ((dynamicRegistration . t) (prepareSupport . t)))
+                      (codeAction . ((dynamicRegistration . t)
+                                     (isPreferredSupport . t)
+                                     (codeActionLiteralSupport . ((codeActionKind . ((valueSet . [""
+                                                                                                  "quickfix"
+                                                                                                  "refactor"
+                                                                                                  "refactor.extract"
+                                                                                                  "refactor.inline"
+                                                                                                  "refactor.rewrite"
+                                                                                                  "source"
+                                                                                                  "source.organizeImports"])))))
+                                     (resolveSupport . ((properties . ["edit" "command"])))
+                                     (dataSupport . t)))
+                      (completion . ((completionItem . ((snippetSupport . ,(cond
+                                                                            ((and lsp-enable-snippet (not (fboundp 'yas-minor-mode)))
+                                                                             (lsp--warn (concat
+                                                                                         "Yasnippet is not installed, but `lsp-enable-snippet' is set to `t'. "
+                                                                                         "You must either install yasnippet, or disable snippet support."))
+                                                                             :json-false)
+                                                                            (lsp-enable-snippet t)
+                                                                            (t :json-false)))
+                                                        (documentationFormat . ["markdown" "plaintext"])
+                                                        ;; Remove this after jdtls support resolveSupport
+                                                        (resolveAdditionalTextEditsSupport . t)
+                                                        (insertReplaceSupport . t)
+                                                        (deprecatedSupport . t)
+                                                        (resolveSupport
+                                                         . ((properties . ["documentation"
+                                                                           "detail"
+                                                                           "additionalTextEdits"
+                                                                           "command"])))
+                                                        (insertTextModeSupport . ((valueSet . [1 2])))))
+                                     (contextSupport . t)
+                                     (dynamicRegistration . t)))
+                      (signatureHelp . ((signatureInformation . ((parameterInformation . ((labelOffsetSupport . t)))))
+                                        (dynamicRegistration . t)))
+                      (documentLink . ((dynamicRegistration . t)
+                                       (tooltipSupport . t)))
+                      (hover . ((contentFormat . ["markdown" "plaintext"])
+                                (dynamicRegistration . t)))
+                      ,@(when lsp-enable-folding
+                          `((foldingRange . ((dynamicRegistration . t)
+                                             ,@(when lsp-folding-range-limit
+                                                 `((rangeLimit . ,lsp-folding-range-limit)))
+                                             ,@(when lsp-folding-line-folding-only
+                                                 `((lineFoldingOnly . t)))))))
+                      (selectionRange . ((dynamicRegistration . t)))
+                      (callHierarchy . ((dynamicRegistration . :json-false)))
+                      (typeHierarchy . ((dynamicRegistration . t)))
+                      (publishDiagnostics . ((relatedInformation . t)
+                                             (tagSupport . ((valueSet . [1 2])))
+                                             (versionSupport . t)))
+                      (diagnostic . ((dynamicRegistration . :json-false)
+                                     (relatedDocumentSupport . :json-false)))
+                      (linkedEditingRange . ((dynamicRegistration . t)))))
+     (window . ((workDoneProgress . t)
+                (showDocument . ((support . t))))))
+   custom-capabilities))
+
+(defun lsp-find-roots-for-workspace (workspace session)
+  "Get all roots for the WORKSPACE."
+  (-filter #'identity (ht-map (lambda (folder workspaces)
+                                (when (-contains? workspaces workspace)
+                                  folder))
+                              (lsp-session-folder->servers session))))
+
+(defun lsp-session-watches (&optional session)
+  "Get watches created for SESSION."
+  (or (gethash "__watches" (lsp-session-metadata (or session (lsp-session))))
+      (-let [res (make-hash-table :test 'equal)]
+        (puthash "__watches" res (lsp-session-metadata (or session (lsp-session))))
+        res)))
+
+(defun lsp--file-process-event (session root-folder event)
+  "Process file event."
+  (let* ((changed-file (cl-third event))
+         (rel-changed-file (f-relative changed-file root-folder))
+         (event-numeric-kind (alist-get (cl-second event) lsp--file-change-type))
+         (bit-position (1- event-numeric-kind))
+         (watch-bit (ash 1 bit-position)))
+    (->>
+     session
+     lsp-session-folder->servers
+     (gethash root-folder)
+     (seq-do (lambda (workspace)
+               (when (->>
+                      workspace
+                      lsp--workspace-registered-server-capabilities
+                      (-any?
+                       (lambda (capability)
+                         (and
+                          (equal (lsp--registered-capability-method capability)
+                                 "workspace/didChangeWatchedFiles")
+                          (->>
+                           capability
+                           lsp--registered-capability-options
+                           (lsp:did-change-watched-files-registration-options-watchers)
+                           (seq-find
+                            (-lambda ((fs-watcher &as &FileSystemWatcher :glob-pattern :kind? :_cachedRegexp cached-regexp))
+                              (when (or (null kind?)
+                                        (> (logand kind? watch-bit) 0))
+                                (-let [regexes (or cached-regexp
+                                                   (let ((regexp (lsp-glob-to-regexps glob-pattern)))
+                                                     (lsp-put fs-watcher :_cachedRegexp regexp)
+                                                     regexp))]
+                                  (-any? (lambda (re)
+                                           (or (string-match re changed-file)
+                                               (string-match re rel-changed-file)))
+                                         regexes))))))))))
+                 (with-lsp-workspace workspace
+                   (lsp-notify
+                    "workspace/didChangeWatchedFiles"
+                    `((changes . [((type . ,event-numeric-kind)
+                                   (uri . ,(lsp--path-to-uri changed-file)))]))))))))))
+
+(lsp-defun lsp--server-register-capability ((&Registration :method :id :register-options?))
+  "Register capability REG."
+  (when (and lsp-enable-file-watchers
+             (equal method "workspace/didChangeWatchedFiles"))
+    (-let* ((created-watches (lsp-session-watches (lsp-session)))
+            (root-folders (cl-set-difference
+                           (lsp-find-roots-for-workspace lsp--cur-workspace (lsp-session))
+                           (ht-keys created-watches))))
+      ;; create watch for each root folder without such
+      (dolist (folder root-folders)
+        (let* ((watch (make-lsp-watch :root-directory folder))
+               (ignored-things (lsp--get-ignored-regexes-for-workspace-root folder))
+               (ignored-files-regex-list (car ignored-things))
+               (ignored-directories-regex-list (cadr ignored-things)))
+          (puthash folder watch created-watches)
+          (lsp-watch-root-folder (file-truename folder)
+                                 (-partial #'lsp--file-process-event (lsp-session) folder)
+                                 ignored-files-regex-list
+                                 ignored-directories-regex-list
+                                 watch
+                                 t)))))
+
+  (push
+   (make-lsp--registered-capability :id id :method method :options register-options?)
+   (lsp--workspace-registered-server-capabilities lsp--cur-workspace)))
+
+(defmacro lsp--with-workspace-temp-buffer (workspace-root &rest body)
+  "With a temp-buffer under `WORKSPACE-ROOT' and evaluate `BODY', useful to
+access dir-local variables."
+  (declare (indent 1) (debug t))
+  `(with-temp-buffer
+     ;; Set the buffer's name to something under the root so that we can hack the local variables
+     ;; This file doesn't need to exist and will not be created due to this.
+     (setq-local buffer-file-name (expand-file-name "lsp-mode-temp" (expand-file-name ,workspace-root)))
+     (hack-local-variables)
+     (prog1 ,@body
+       (setq-local buffer-file-name nil))))
+
+(defun lsp--get-ignored-regexes-for-workspace-root (workspace-root)
+  "Return a list of the form
+(lsp-file-watch-ignored-files lsp-file-watch-ignored-directories) for the given
+WORKSPACE-ROOT."
+  ;; The intent of this function is to provide per-root workspace-level customization of the
+  ;; lsp-file-watch-ignored-directories and lsp-file-watch-ignored-files variables.
+  (lsp--with-workspace-temp-buffer workspace-root
+    (list lsp-file-watch-ignored-files (lsp-file-watch-ignored-directories))))
+
+
+(defun lsp--cleanup-hanging-watches ()
+  "Cleanup watches in case there are no more workspaces that are interested
+in that particular folder."
+  (let* ((session (lsp-session))
+         (watches (lsp-session-watches session)))
+    (dolist (watched-folder (ht-keys watches))
+      (when (-none? (lambda (workspace)
+                      (with-lsp-workspace workspace
+                        (lsp--registered-capability "workspace/didChangeWatchedFiles")))
+                    (gethash watched-folder (lsp-session-folder->servers (lsp-session))))
+        (lsp-log "Cleaning up watches for folder %s. There is no workspace watching this folder..." watched-folder)
+        (lsp-kill-watch (gethash watched-folder watches))
+        (remhash watched-folder watches)))))
+
+(lsp-defun lsp--server-unregister-capability ((&Unregistration :id :method))
+  "Unregister capability UNREG."
+  (setf (lsp--workspace-registered-server-capabilities lsp--cur-workspace)
+        (seq-remove (lambda (e) (equal (lsp--registered-capability-id e) id))
+                    (lsp--workspace-registered-server-capabilities lsp--cur-workspace)))
+  (when (equal method "workspace/didChangeWatchedFiles")
+    (lsp--cleanup-hanging-watches)))
+
+(defun lsp--server-capabilities ()
+  "Return the capabilities of the language server associated with the buffer."
+  (->> (lsp-workspaces)
+       (-keep #'lsp--workspace-server-capabilities)
+       (apply #'lsp-merge)))
+
+(defun lsp--send-open-close-p ()
+  "Return whether open and close notifications should be sent to the server."
+  (let ((sync (lsp:server-capabilities-text-document-sync? (lsp--server-capabilities))))
+    (or (memq sync '(1 2))
+        (lsp:text-document-sync-options-open-close? sync))))
+
+(defun lsp--send-will-save-p ()
+  "Return whether willSave notifications should be sent to the server."
+  (-> (lsp--server-capabilities)
+      (lsp:server-capabilities-text-document-sync?)
+      (lsp:text-document-sync-options-will-save?)))
+
+(defun lsp--send-will-save-wait-until-p ()
+  "Return whether willSaveWaitUntil notifications should be sent to the server."
+  (-> (lsp--server-capabilities)
+      (lsp:server-capabilities-text-document-sync?)
+      (lsp:text-document-sync-options-will-save-wait-until?)))
+
+(defun lsp--send-did-save-p ()
+  "Return whether didSave notifications should be sent to the server."
+  (let ((sync (lsp:server-capabilities-text-document-sync? (lsp--server-capabilities))))
+    (or (memq sync '(1 2))
+        (lsp:text-document-sync-options-save? sync))))
+
+(defun lsp--save-include-text-p ()
+  "Return whether save notifications should include the text document's contents."
+  (->> (lsp--server-capabilities)
+       (lsp:server-capabilities-text-document-sync?)
+       (lsp:text-document-sync-options-save?)
+       (lsp:text-document-save-registration-options-include-text?)))
+
+(defun lsp--send-will-rename-files-p (path)
+  "Return whether willRenameFiles request should be sent to the server.
+If any filters, checks if it applies for PATH."
+  (let* ((will-rename (-> (lsp--server-capabilities)
+                          (lsp:server-capabilities-workspace?)
+                          (lsp:workspace-server-capabilities-file-operations?)
+                          (lsp:workspace-file-operations-will-rename?)))
+         (filters (seq-into (lsp:file-operation-registration-options-filters will-rename) 'list)))
+    (and will-rename
+         (or (seq-empty-p filters)
+             (-any? (-lambda ((&FileOperationFilter :scheme? :pattern (&FileOperationPattern :glob)))
+                      (-let [regexes (lsp-glob-to-regexps glob)]
+                        (and (or (not scheme?)
+                                 (string-prefix-p scheme? (lsp--path-to-uri path)))
+                             (-any? (lambda (re)
+                                      (string-match re path))
+                                    regexes))))
+                    filters)))))
+
+(defun lsp--send-did-rename-files-p ()
+  "Return whether didRenameFiles notification should be sent to the server."
+  (-> (lsp--server-capabilities)
+      (lsp:server-capabilities-workspace?)
+      (lsp:workspace-server-capabilities-file-operations?)
+      (lsp:workspace-file-operations-did-rename?)))
+
+(declare-function project-roots "ext:project" (project) t)
+(declare-function project-root "ext:project" (project) t)
+
+(defun lsp--suggest-project-root ()
+  "Get project root."
+  (or
+   (when (fboundp 'projectile-project-root)
+     (condition-case nil
+         (projectile-project-root)
+       (error nil)))
+   (when (fboundp 'project-current)
+     (when-let ((project (project-current)))
+       (if (fboundp 'project-root)
+           (project-root project)
+         (car (with-no-warnings
+                (project-roots project))))))
+   default-directory))
+
+(defun lsp--read-from-file (file)
+  "Read FILE content."
+  (when (file-exists-p file)
+    (cl-first (read-from-string (f-read-text file 'utf-8)))))
+
+(defun lsp--persist (file-name to-persist)
+  "Persist TO-PERSIST in FILE-NAME.
+
+This function creates the parent directories if they don't exist
+yet."
+  (let ((print-length nil)
+        (print-level nil))
+    ;; Create all parent directories:
+    (make-directory (f-parent file-name) t)
+    (f-write-text (prin1-to-string to-persist) 'utf-8 file-name)))
+
+(defun lsp-workspace-folders-add (project-root)
+  "Add PROJECT-ROOT to the list of workspace folders."
+  (interactive
+   (list (read-directory-name "Select folder to add: "
+                              (or (lsp--suggest-project-root) default-directory) nil t)))
+  (cl-pushnew (lsp-f-canonical project-root)
+              (lsp-session-folders (lsp-session)) :test 'equal)
+  (lsp--persist-session (lsp-session))
+
+  (run-hook-with-args 'lsp-workspace-folders-changed-functions (list project-root) nil))
+
+(defun lsp-workspace-folders-remove (project-root)
+  "Remove PROJECT-ROOT from the list of workspace folders."
+  (interactive (list (completing-read "Select folder to remove: "
+                                      (lsp-session-folders (lsp-session))
+                                      nil t nil nil
+                                      (lsp-find-session-folder (lsp-session) default-directory))))
+
+  (setq project-root (lsp-f-canonical project-root))
+
+  ;; send remove folder to each multiroot workspace associated with the folder
+  (dolist (wks (->> (lsp-session)
+                    (lsp-session-folder->servers)
+                    (gethash project-root)
+                    (--filter (lsp--client-multi-root (lsp--workspace-client it)))))
+    (with-lsp-workspace wks
+      (lsp-notify "workspace/didChangeWorkspaceFolders"
+                  (lsp-make-did-change-workspace-folders-params
+                   :event (lsp-make-workspace-folders-change-event
+                           :removed (vector (lsp-make-workspace-folder
+                                             :uri (lsp--path-to-uri project-root)
+                                             :name (f-filename project-root)))
+                           :added [])))))
+
+  ;; turn off servers in the removed directory
+  (let* ((session (lsp-session))
+         (folder->servers (lsp-session-folder->servers session))
+         (server-id->folders (lsp-session-server-id->folders session))
+         (workspaces (gethash project-root folder->servers)))
+
+    (remhash project-root folder->servers)
+
+    ;; turn off the servers without root folders
+    (dolist (workspace workspaces)
+      (when (--none? (-contains? it workspace) (ht-values folder->servers))
+        (lsp--info "Shutdown %s since folder %s is removed..."
+                   (lsp--workspace-print workspace) project-root)
+        (with-lsp-workspace workspace (lsp--shutdown-workspace))))
+
+    (setf (lsp-session-folders session)
+          (-remove-item project-root (lsp-session-folders session)))
+
+    (ht-aeach (puthash key
+                       (-remove-item project-root value)
+                       server-id->folders)
+              server-id->folders)
+    (lsp--persist-session (lsp-session)))
+
+  (run-hook-with-args 'lsp-workspace-folders-changed-functions nil (list project-root)))
+
+(defun lsp-workspace-blocklist-remove (project-root)
+  "Remove PROJECT-ROOT from the workspace blocklist."
+  (interactive (list (completing-read "Select folder to remove:"
+                                      (lsp-session-folders-blocklist (lsp-session))
+                                      nil t)))
+  (setf (lsp-session-folders-blocklist (lsp-session))
+        (delete project-root
+                (lsp-session-folders-blocklist (lsp-session))))
+  (lsp--persist-session (lsp-session)))
+
+(define-obsolete-function-alias 'lsp-workspace-folders-switch
+  'lsp-workspace-folders-open "lsp-mode 6.1")
+
+(defun lsp-workspace-folders-open (project-root)
+  "Open the directory located at PROJECT-ROOT"
+  (interactive (list (completing-read "Open folder: "
+                                      (lsp-session-folders (lsp-session))
+                                      nil t)))
+  (find-file project-root))
+
+(defun lsp--maybe-enable-signature-help (trigger-characters)
+  (let ((ch last-command-event))
+    (when (cl-find ch trigger-characters :key #'string-to-char)
+      (lsp-signature-activate))))
+
+(defun lsp--on-type-formatting-handler-create ()
+  (when-let ((provider (lsp--capability-for-method "textDocument/onTypeFormatting" )))
+    (-let [(&DocumentOnTypeFormattingOptions :more-trigger-character?
+                                             :first-trigger-character) provider]
+      (lambda ()
+        (lsp--on-type-formatting first-trigger-character
+                                 more-trigger-character?)))))
+
+(defun lsp--update-on-type-formatting-hook (&optional cleanup?)
+  (let ((on-type-formatting-handler (lsp--on-type-formatting-handler-create)))
+    (cond
+     ((and lsp-enable-on-type-formatting on-type-formatting-handler (not cleanup?))
+      (add-hook 'post-self-insert-hook on-type-formatting-handler nil t))
+     ((or cleanup?
+          (not lsp-enable-on-type-formatting))
+      (remove-hook 'post-self-insert-hook on-type-formatting-handler t)))))
+
+(defun lsp--signature-help-handler-create ()
+  (-when-let ((&SignatureHelpOptions? :trigger-characters?)
+              (lsp--capability-for-method "textDocument/signatureHelp"))
+    (lambda ()
+      (lsp--maybe-enable-signature-help trigger-characters?))))
+
+(defun lsp--update-signature-help-hook (&optional cleanup?)
+  (let ((signature-help-handler (lsp--signature-help-handler-create)))
+    (cond
+     ((and (or (equal lsp-signature-auto-activate t)
+               (memq :on-trigger-char lsp-signature-auto-activate))
+           signature-help-handler
+           (not cleanup?))
+      (add-hook 'post-self-insert-hook signature-help-handler nil t))
+
+     ((or cleanup?
+          (not (or (equal lsp-signature-auto-activate t)
+                   (memq :on-trigger-char lsp-signature-auto-activate))))
+      (remove-hook 'post-self-insert-hook signature-help-handler t)))))
+
+(defun lsp--after-set-visited-file-name ()
+  (lsp-disconnect)
+  (lsp))
+
+;; TODO remove those eldoc workarounds when dropping support for Emacs 27
+;; https://github.com/emacs-lsp/lsp-mode/issues/3295#issuecomment-1308994099
+(defvar eldoc-documentation-default) ; CI
+(when (< emacs-major-version 28)
+  (unless (boundp 'eldoc-documentation-functions)
+    (load "eldoc" nil 'nomessage))
+  (when (memq (default-value 'eldoc-documentation-function) '(nil ignore))
+    ;; actually `eldoc-documentation-strategy', but CI was failing
+    (setq-default eldoc-documentation-function 'eldoc-documentation-default)))
+
+(define-minor-mode lsp-managed-mode
+  "Mode for source buffers managed by lsp-mode."
+  :lighter nil
+  (cond
+   (lsp-managed-mode
+    (when (lsp-feature? "textDocument/hover")
+      (add-hook 'eldoc-documentation-functions #'lsp-eldoc-function nil t)
+      (eldoc-mode 1))
+
+    (add-hook 'after-change-functions #'lsp-on-change nil t)
+    (add-hook 'after-revert-hook #'lsp-on-revert nil t)
+    (add-hook 'after-save-hook #'lsp-on-save nil t)
+    (add-hook 'auto-save-hook #'lsp--on-auto-save nil t)
+    (add-hook 'before-change-functions #'lsp-before-change nil t)
+    (add-hook 'before-save-hook #'lsp--before-save nil t)
+    (add-hook 'kill-buffer-hook #'lsp--text-document-did-close nil t)
+    (add-hook 'post-command-hook #'lsp--post-command nil t)
+
+    (lsp--update-on-type-formatting-hook)
+    (lsp--update-signature-help-hook)
+
+    (when lsp-enable-xref
+      (add-hook 'xref-backend-functions #'lsp--xref-backend nil t))
+
+    (lsp-configure-buffer)
+
+    ;; make sure we turn off lsp-mode in case major mode changes, because major
+    ;; mode change will wipe the buffer locals.
+    (add-hook 'change-major-mode-hook #'lsp-disconnect nil t)
+    (add-hook 'after-set-visited-file-name-hook #'lsp--after-set-visited-file-name nil t)
+
+    (let ((buffer (lsp-current-buffer)))
+      (run-with-idle-timer
+       0.0 nil
+       (lambda ()
+         (when (lsp-buffer-live-p buffer)
+           (lsp-with-current-buffer buffer
+             (lsp--on-change-debounce buffer)
+             (lsp--on-idle buffer)))))))
+   (t
+    (lsp-unconfig-buffer)
+
+    (remove-hook 'eldoc-documentation-functions #'lsp-eldoc-function t)
+    (remove-hook 'post-command-hook #'lsp--post-command t)
+    (remove-hook 'after-change-functions #'lsp-on-change t)
+    (remove-hook 'after-revert-hook #'lsp-on-revert t)
+    (remove-hook 'after-save-hook #'lsp-on-save t)
+    (remove-hook 'auto-save-hook #'lsp--on-auto-save t)
+    (remove-hook 'before-change-functions #'lsp-before-change t)
+    (remove-hook 'before-save-hook #'lsp--before-save t)
+    (remove-hook 'kill-buffer-hook #'lsp--text-document-did-close t)
+
+    (lsp--update-on-type-formatting-hook :cleanup)
+    (lsp--update-signature-help-hook :cleanup)
+
+    (when lsp--on-idle-timer
+      (cancel-timer lsp--on-idle-timer)
+      (setq lsp--on-idle-timer nil))
+
+    (remove-hook 'lsp-on-idle-hook #'lsp--document-links t)
+    (remove-hook 'lsp-on-idle-hook #'lsp--document-highlight t)
+
+    (lsp--remove-overlays 'lsp-highlight)
+    (lsp--remove-overlays 'lsp-links)
+
+    (remove-hook 'xref-backend-functions #'lsp--xref-backend t)
+    (remove-hook 'change-major-mode-hook #'lsp-disconnect t)
+    (remove-hook 'after-set-visited-file-name-hook #'lsp--after-set-visited-file-name t)
+    (setq-local lsp-buffer-uri nil))))
+
+(defun lsp-configure-buffer ()
+  "Configure LSP features for current buffer."
+  ;; make sure the core is running in the context of all available workspaces
+  ;; to avoid misconfiguration in case we are running in `with-lsp-workspace' context
+  (let ((lsp--buffer-workspaces (cond
+                                 (lsp--buffer-workspaces)
+                                 (lsp--cur-workspace (list lsp--cur-workspace))))
+        lsp--cur-workspace)
+    (when lsp-auto-configure
+      (lsp--auto-configure)
+
+      (when (and lsp-enable-text-document-color
+                 (lsp-feature? "textDocument/documentColor"))
+        (add-hook 'lsp-on-change-hook #'lsp--document-color nil t))
+
+      (when (and lsp-enable-imenu
+                 (lsp-feature? "textDocument/documentSymbol"))
+        (lsp-enable-imenu))
+
+      (when (and lsp-enable-indentation
+                 (lsp-feature? "textDocument/rangeFormatting"))
+        (add-function :override (local 'indent-region-function) #'lsp-format-region))
+
+      (when (and lsp-enable-symbol-highlighting
+                 (lsp-feature? "textDocument/documentHighlight"))
+        (add-hook 'lsp-on-idle-hook #'lsp--document-highlight nil t))
+
+      (when (and lsp-enable-links
+                 (lsp-feature? "textDocument/documentLink"))
+        (add-hook 'lsp-on-idle-hook #'lsp--document-links nil t))
+
+      (when (and lsp-inlay-hint-enable
+                 (lsp-feature? "textDocument/inlayHint"))
+        (lsp-inlay-hints-mode))
+
+      (when (and lsp-enable-dap-auto-configure
+                 (functionp 'dap-mode))
+        (dap-auto-configure-mode 1)))
+    (run-hooks 'lsp-configure-hook)))
+
+(defun lsp-unconfig-buffer ()
+  "Unconfigure LSP features for buffer."
+  (lsp--remove-overlays 'lsp-color)
+
+  (when (advice-function-member-p 'lsp--imenu-create-index imenu-create-index-function)
+    (remove-function (local 'imenu-create-index-function) #'lsp--imenu-create-index)
+    (setq-local imenu-menubar-modified-tick 0)
+    (setq-local imenu--index-alist nil)
+    (imenu--cleanup))
+
+  (remove-function (local 'indent-region-function) #'lsp-format-region)
+
+  (remove-hook 'lsp-on-change-hook #'lsp--document-color t)
+  (remove-hook 'lsp-on-idle-hook #'lsp--document-highlight t)
+  (remove-hook 'lsp-on-idle-hook #'lsp--document-links t)
+
+  (when (and lsp-enable-dap-auto-configure
+             (functionp 'dap-mode))
+    (dap-auto-configure-mode -1))
+
+  (run-hooks 'lsp-unconfigure-hook))
+
+(defun lsp--buffer-content ()
+  (lsp-save-restriction-and-excursion
+    (or (lsp-virtual-buffer-call :buffer-string)
+        (buffer-substring-no-properties (point-min)
+                                        (point-max)))))
+
+(defun lsp--text-document-did-open ()
+  "`document/didOpen' event."
+  (run-hooks 'lsp-before-open-hook)
+  (when (and lsp-auto-touch-files
+             (not (f-exists? (lsp--uri-to-path (lsp--buffer-uri)))))
+    (lsp--info "Saving file '%s' because it is not present on the disk." (lsp--buffer-uri))
+    (save-buffer))
+
+  (setq lsp--cur-version (or lsp--cur-version 0))
+  (cl-pushnew (lsp-current-buffer) (lsp--workspace-buffers lsp--cur-workspace))
+  (lsp-notify
+   "textDocument/didOpen"
+   (list :textDocument
+         (list :uri (lsp--buffer-uri)
+               :languageId (lsp-buffer-language)
+               :version lsp--cur-version
+               :text (lsp--buffer-content))))
+
+  (lsp-managed-mode 1)
+
+  (lsp-diagnostics--request-pull-diagnostics lsp--cur-workspace)
+
+  (run-hooks 'lsp-after-open-hook)
+  (when-let ((client (-some-> lsp--cur-workspace (lsp--workspace-client))))
+    (-some-> (lsp--client-after-open-fn client)
+      (funcall))
+    (-some-> (format "lsp-%s-after-open-hook" (lsp--client-server-id client))
+      (intern-soft)
+      (run-hooks))))
+
+(defun lsp--text-document-identifier ()
+  "Make TextDocumentIdentifier."
+  (list :uri (lsp--buffer-uri)))
+
+(defun lsp--versioned-text-document-identifier ()
+  "Make VersionedTextDocumentIdentifier."
+  (plist-put (lsp--text-document-identifier) :version lsp--cur-version))
+
+(defun lsp--cur-line (&optional point)
+  (1- (line-number-at-pos point)))
+
+(defun lsp--cur-position ()
+  "Make a Position object for the current point."
+  (or (lsp-virtual-buffer-call :cur-position)
+      (lsp-save-restriction-and-excursion
+        (list :line (lsp--cur-line)
+              :character (- (point) (line-beginning-position))))))
+
+(defun lsp--point-to-position (point)
+  "Convert POINT to Position."
+  (lsp-save-restriction-and-excursion
+    (goto-char point)
+    (lsp--cur-position)))
+
+(defun lsp--range (start end)
+  "Make Range body from START and END."
+  ;; make sure start and end are Position objects
+  (list :start start :end end))
+
+(defun lsp--region-to-range (start end)
+  "Make Range object for the current region."
+  (lsp--range (lsp--point-to-position start)
+              (lsp--point-to-position end)))
+
+(defun lsp--region-or-line ()
+  "The active region or the current line."
+  (if (use-region-p)
+      (lsp--region-to-range (region-beginning) (region-end))
+    (lsp--region-to-range (line-beginning-position) (line-end-position))))
+
+(defun lsp--check-document-changes-version (document-changes)
+  "Verify that DOCUMENT-CHANGES have the proper version."
+  (unless (seq-every-p
+           (-lambda ((&TextDocumentEdit :text-document))
+             (or
+              (not text-document)
+              (let* ((filename (-> text-document
+                                   lsp:versioned-text-document-identifier-uri
+                                   lsp--uri-to-path))
+                     (version (lsp:versioned-text-document-identifier-version? text-document)))
+                (with-current-buffer (find-file-noselect filename)
+                  (or (null version) (zerop version) (= -1 version)
+                      (equal version lsp--cur-version))))))
+           document-changes)
+    (error "Document changes cannot be applied due to different document version")))
+
+(defun lsp--apply-workspace-edit (workspace-edit &optional operation)
+  "Apply the WorkspaceEdit object WORKSPACE-EDIT.
+OPERATION is symbol representing the source of this text edit."
+  (-let (((&WorkspaceEdit :document-changes? :changes?) workspace-edit))
+    (if-let ((document-changes (seq-reverse document-changes?)))
+        (progn
+          (lsp--check-document-changes-version document-changes)
+          (->> document-changes
+               (seq-filter (-lambda ((&CreateFile :kind)) (equal kind "create")))
+               (seq-do (lambda (change) (lsp--apply-text-document-edit change operation))))
+          (->> document-changes
+               (seq-filter (-lambda ((&CreateFile :kind))
+                             (and (or (not kind) (equal kind "edit"))
+                                  (not (equal kind "create")))))
+               (seq-do (lambda (change) (lsp--apply-text-document-edit change operation))))
+          (->> document-changes
+               (seq-filter (-lambda ((&CreateFile :kind))
+                             (and (not (or (not kind) (equal kind "edit")))
+                                  (not (equal kind "create")))))
+               (seq-do (lambda (change) (lsp--apply-text-document-edit change operation)))))
+      (lsp-map
+       (lambda (uri text-edits)
+         (with-current-buffer (-> uri lsp--uri-to-path find-file-noselect)
+           (lsp--apply-text-edits text-edits operation)))
+       changes?))))
+
+(defmacro lsp-with-filename (file &rest body)
+  "Execute BODY with FILE as a context.
+Need to handle the case when FILE indicates virtual buffer."
+  (declare (indent 1) (debug t))
+  `(if-let ((lsp--virtual-buffer (get-text-property 0 'lsp-virtual-buffer ,file)))
+       (lsp-with-current-buffer lsp--virtual-buffer
+         ,@body)
+     ,@body))
+
+(defun lsp--apply-text-document-edit (edit &optional operation)
+  "Apply the TextDocumentEdit object EDIT.
+OPERATION is symbol representing the source of this text edit.
+If the file is not being visited by any buffer, it is opened with
+`find-file-noselect'.
+Because lsp-mode does not store previous document versions, the edit is only
+applied if the version of the textDocument matches the version of the
+corresponding file.
+
+interface TextDocumentEdit {
+  textDocument: VersionedTextDocumentIdentifier;
+  edits: TextEdit[];
+}"
+  (pcase (lsp:edit-kind edit)
+    ("create" (-let* (((&CreateFile :uri :options?) edit)
+                      (file-name (lsp--uri-to-path uri)))
+                (mkdir (f-dirname file-name) t)
+                (f-touch file-name)
+                (when (lsp:create-file-options-overwrite? options?)
+                  (f-write-text "" nil file-name))
+                (find-file-noselect file-name)))
+    ("delete" (-let (((&DeleteFile :uri :options? (&DeleteFileOptions? :recursive?)) edit))
+                (f-delete (lsp--uri-to-path uri) recursive?)))
+    ("rename" (-let* (((&RenameFile :old-uri :new-uri :options? (&RenameFileOptions? :overwrite?)) edit)
+                      (old-file-name (lsp--uri-to-path old-uri))
+                      (new-file-name (lsp--uri-to-path new-uri))
+                      (buf (find-buffer-visiting old-file-name)))
+                (when buf
+                  (lsp-with-current-buffer buf
+                    (save-buffer)
+                    (lsp--text-document-did-close)))
+                (mkdir (f-dirname new-file-name) t)
+                (rename-file old-file-name new-file-name overwrite?)
+                (when buf
+                  (lsp-with-current-buffer buf
+                    (set-buffer-modified-p nil)
+                    (setq lsp-buffer-uri nil)
+                    (set-visited-file-name new-file-name)
+                    (lsp)))))
+    (_ (let ((file-name (->> edit
+                             (lsp:text-document-edit-text-document)
+                             (lsp:versioned-text-document-identifier-uri)
+                             (lsp--uri-to-path))))
+         (lsp-with-current-buffer (find-buffer-visiting file-name)
+           (lsp-with-filename file-name
+             (lsp--apply-text-edits (lsp:text-document-edit-edits edit) operation)))))))
+
+(lsp-defun lsp--position-compare ((&Position :line left-line
+                                             :character left-character)
+                                  (&Position :line right-line
+                                             :character right-character))
+  "Return t if position LEFT is greater than RIGHT."
+  (if (= left-line right-line)
+      (> left-character right-character)
+    (> left-line right-line)))
+
+(lsp-defun lsp-point-in-range? (position (&Range :start :end))
+  "Returns if POINT is in RANGE."
+  (not (or (lsp--position-compare start position)
+           (lsp--position-compare position end))))
+
+(lsp-defun lsp--position-equal ((&Position :line left-line
+                                           :character left-character)
+                                (&Position :line right-line
+                                           :character right-character))
+  "Return whether LEFT and RIGHT positions are equal."
+  (and (= left-line right-line)
+       (= left-character right-character)))
+
+(lsp-defun lsp--text-edit-sort-predicate ((&TextEdit :range (&Range :start left-start :end left-end))
+                                          (&TextEdit :range (&Range :start right-start :end right-end)))
+  (if (lsp--position-equal left-start right-start)
+      (lsp--position-compare left-end right-end)
+    (lsp--position-compare left-start right-start)))
+
+(lsp-defun lsp--apply-text-edit ((edit &as &TextEdit :range (&RangeToPoint :start :end) :new-text))
+  "Apply the edits described in the TextEdit object in TEXT-EDIT."
+  (setq new-text (s-replace "\r" "" (or new-text "")))
+  (lsp:set-text-edit-new-text edit new-text)
+  (goto-char start)
+  (delete-region start end)
+  (insert new-text))
+
+;; WORKAROUND: typescript-language might send -1 when applying code actions.
+;; see https://github.com/emacs-lsp/lsp-mode/issues/1582
+(lsp-defun lsp--fix-point ((point &as &Position :character :line))
+  (-doto point
+    (lsp:set-position-line (max 0 line))
+    (lsp:set-position-character (max 0 character))))
+
+(lsp-defun lsp--apply-text-edit-replace-buffer-contents ((edit &as
+                                                               &TextEdit
+                                                               :range (&Range :start :end)
+                                                               :new-text))
+  "Apply the edits described in the TextEdit object in TEXT-EDIT.
+The method uses `replace-buffer-contents'."
+  (setq new-text (s-replace "\r" "" (or new-text "")))
+  (lsp:set-text-edit-new-text edit new-text)
+  (-let* ((source (current-buffer))
+          ((beg . end) (lsp--range-to-region (lsp-make-range :start (lsp--fix-point start)
+                                                             :end (lsp--fix-point end)))))
+    (with-temp-buffer
+      (insert new-text)
+      (let ((temp (current-buffer)))
+        (with-current-buffer source
+          (save-excursion
+            (save-restriction
+              (narrow-to-region beg end)
+
+              ;; On emacs versions < 26.2,
+              ;; `replace-buffer-contents' is buggy - it calls
+              ;; change functions with invalid arguments - so we
+              ;; manually call the change functions here.
+              ;;
+              ;; See emacs bugs #32237, #32278:
+              ;; https://debbugs.gnu.org/cgi/bugreport.cgi?bug=32237
+              ;; https://debbugs.gnu.org/cgi/bugreport.cgi?bug=32278
+              (let ((inhibit-modification-hooks t)
+                    (length (- end beg)))
+                (run-hook-with-args 'before-change-functions
+                                    beg end)
+                (replace-buffer-contents temp)
+                (run-hook-with-args 'after-change-functions
+                                    beg (+ beg (length new-text))
+                                    length)))))))))
+
+(defun lsp--to-yasnippet-snippet (snippet)
+  "Convert LSP SNIPPET to yasnippet snippet."
+  ;; LSP snippet doesn't escape "{" and "`", but yasnippet requires escaping it.
+  (replace-regexp-in-string (rx (or bos (not (any "$" "\\"))) (group (or "{" "`")))
+                            (rx "\\" (backref 1))
+                            snippet
+                            nil nil 1))
+
+(defvar-local lsp-enable-relative-indentation nil
+  "Enable relative indentation when insert texts, snippets ...
+from language server.")
+
+(defun lsp--expand-snippet (snippet &optional start end expand-env)
+  "Wrapper of `yas-expand-snippet' with all of it arguments.
+The snippet will be convert to LSP style and indent according to
+LSP server result."
+  (require 'yasnippet nil t)
+  (let* ((inhibit-field-text-motion t)
+         (yas-wrap-around-region nil)
+         (yas-indent-line 'none)
+         (yas-also-auto-indent-first-line nil))
+    (yas-expand-snippet
+     (lsp--to-yasnippet-snippet snippet)
+     start end expand-env)))
+
+(defun lsp--indent-lines (start end &optional insert-text-mode?)
+  "Indent from START to END based on INSERT-TEXT-MODE? value.
+- When INSERT-TEXT-MODE? is provided
+  - if it's `lsp/insert-text-mode-as-it', do no editor indentation.
+  - if it's `lsp/insert-text-mode-adjust-indentation', adjust leading
+    whitespaces to match the line where text is inserted.
+- When it's not provided, using `indent-line-function' for each line."
+  (save-excursion
+    (goto-char end)
+    (let* ((end-line (line-number-at-pos))
+           (offset (save-excursion
+                     (goto-char start)
+                     (current-indentation)))
+           (indent-line-function
+            (cond ((equal insert-text-mode? lsp/insert-text-mode-as-it)
+                   #'ignore)
+                  ((or (equal insert-text-mode? lsp/insert-text-mode-adjust-indentation)
+                       lsp-enable-relative-indentation
+                       ;; Indenting snippets is extremely slow in `org-mode' buffers
+                       ;; since it has to calculate indentation based on SRC block
+                       ;; position.  Thus we use relative indentation as default.
+                       (derived-mode-p 'org-mode))
+                   (lambda () (save-excursion
+                                (beginning-of-line)
+                                (indent-to-column offset))))
+                  (t indent-line-function))))
+      (goto-char start)
+      (forward-line)
+      (while (and (not (eobp))
+                  (<= (line-number-at-pos) end-line))
+        (funcall indent-line-function)
+        (forward-line)))))
+
+(defun lsp--apply-text-edits (edits &optional operation)
+  "Apply the EDITS described in the TextEdit[] object.
+OPERATION is symbol representing the source of this text edit."
+  (unless (seq-empty-p edits)
+    (atomic-change-group
+      (run-hooks 'lsp-before-apply-edits-hook)
+      (let* ((change-group (prepare-change-group))
+             (howmany (length edits))
+             (message (format "Applying %s edits to `%s' ..." howmany (current-buffer)))
+             (_ (lsp--info message))
+             (reporter (make-progress-reporter message 0 howmany))
+             (done 0)
+             (apply-edit (if (not lsp--virtual-buffer)
+                             #'lsp--apply-text-edit-replace-buffer-contents
+                           #'lsp--apply-text-edit)))
+        (unwind-protect
+            (->> edits
+                 ;; We sort text edits so as to apply edits that modify latter
+                 ;; parts of the document first. Furthermore, because the LSP
+                 ;; spec dictates that: "If multiple inserts have the same
+                 ;; position, the order in the array defines which edit to
+                 ;; apply first."  We reverse the initial list and sort stably
+                 ;; to make sure the order among edits with the same position
+                 ;; is preserved.
+                 (nreverse)
+                 (seq-sort #'lsp--text-edit-sort-predicate)
+                 (mapc (lambda (edit)
+                         (progress-reporter-update reporter (cl-incf done))
+                         (funcall apply-edit edit)
+                         (when (lsp:snippet-text-edit-insert-text-format? edit)
+                           (-when-let ((&SnippetTextEdit :range (&RangeToPoint :start)
+                                                         :insert-text-format? :new-text) edit)
+                             (when (eq insert-text-format? lsp/insert-text-format-snippet)
+                               ;; No `save-excursion' needed since expand snippet will change point anyway
+                               (goto-char (+ start (length new-text)))
+                               (lsp--indent-lines start (point))
+                               (lsp--expand-snippet new-text start (point)))))
+                         (run-hook-with-args 'lsp-after-apply-edits-hook operation))))
+          (undo-amalgamate-change-group change-group)
+          (progress-reporter-done reporter))))))
+
+(defun lsp--create-apply-text-edits-handlers ()
+  "Create (handler cleanup-fn) for applying text edits in async request.
+Only works when mode is `tick or `alive."
+  (let* (first-edited
+         (func (lambda (start &rest _)
+                 (setq first-edited (if first-edited
+                                        (min start first-edited)
+                                      start)))))
+    (add-hook 'before-change-functions func nil t)
+    (list
+     (lambda (edits)
+       (if (and first-edited
+                (seq-find (-lambda ((&TextEdit :range (&RangeToPoint :end)))
+                            ;; Text edit region is overlapped
+                            (> end first-edited))
+                          edits))
+           (lsp--warn "TextEdits will not be applied since document has been modified before of them.")
+         (lsp--apply-text-edits edits 'completion-cleanup)))
+     (lambda ()
+       (remove-hook 'before-change-functions func t)))))
+
+(defun lsp--capability (cap &optional capabilities)
+  "Get the value of capability CAP.  If CAPABILITIES is non-nil, use them instead."
+  (when (stringp cap)
+    (setq cap (intern (concat ":" cap))))
+
+  (lsp-get (or capabilities
+               (lsp--server-capabilities))
+           cap))
+
+(defun lsp--registered-capability (method)
+  "Check whether there is workspace providing METHOD."
+  (->> (lsp-workspaces)
+       (--keep (seq-find (lambda (reg)
+                           (equal (lsp--registered-capability-method reg) method))
+                         (lsp--workspace-registered-server-capabilities it)))
+       cl-first))
+
+(defun lsp--capability-for-method (method)
+  "Get the value of capability for METHOD."
+  (-let* ((reqs (cdr (assoc method lsp-method-requirements)))
+          ((&plist :capability) reqs))
+    (or (and capability (lsp--capability capability))
+        (-some-> (lsp--registered-capability method)
+          (lsp--registered-capability-options)))))
+
+(defvar-local lsp--before-change-vals nil
+  "Store the positions from the `lsp-before-change' function call, for
+validation and use in the `lsp-on-change' function.")
+
+(defun lsp--text-document-content-change-event (start end length)
+  "Make a TextDocumentContentChangeEvent body for START to END, of length LENGTH."
+  ;; So (47 54 0) means add    7 chars starting at pos 47
+  ;; must become
+  ;;   {"range":{"start":{"line":5,"character":6}
+  ;;             ,"end" :{"line":5,"character":6}}
+  ;;             ,"rangeLength":0
+  ;;             ,"text":"\nbb = 5"}
+  ;;
+  ;; And (47 47 7) means delete 7 chars starting at pos 47
+  ;; must become
+  ;;   {"range":{"start":{"line":6,"character":0}
+  ;;            ,"end"  :{"line":7,"character":0}}
+  ;;            ,"rangeLength":7
+  ;;            ,"text":""}
+  ;;
+  ;; (208 221 3) means delete 3 chars starting at pos 208, and replace them with
+  ;; 13 chars. So it must become
+  ;;   {"range":{"start":{"line":5,"character":8}
+  ;;             ,"end" :{"line":5,"character":11}}
+  ;;             ,"rangeLength":3
+  ;;             ,"text":"new-chars-xxx"}
+  ;;
+
+  ;; Adding text:
+  ;;   lsp-before-change:(start,end)=(33,33)
+  ;;   lsp-on-change:(start,end,length)=(33,34,0)
+  ;;
+  ;; Changing text:
+  ;;   lsp-before-change:(start,end)=(208,211)
+  ;;   lsp-on-change:(start,end,length)=(208,221,3)
+  ;;
+  ;; Deleting text:
+  ;;   lsp-before-change:(start,end)=(19,27)
+  ;;   lsp-on-change:(start,end,length)=(19,19,8)
+  (if (zerop length)
+      ;; Adding something only, work from start only
+      `( :range ,(lsp--range
+                  (lsp--point-to-position start)
+                  (lsp--point-to-position start))
+         :rangeLength 0
+         :text ,(buffer-substring-no-properties start end))
+
+    (if (eq start end)
+        ;; Deleting something only
+        (if (lsp--bracketed-change-p start length)
+            ;; The before-change value is bracketed, use it
+            `( :range ,(lsp--range
+                        (lsp--point-to-position start)
+                        (plist-get lsp--before-change-vals :end-pos))
+               :rangeLength ,length
+               :text "")
+          ;; If the change is not bracketed, send a full change event instead.
+          (lsp--full-change-event))
+
+      ;; Deleting some things, adding others
+      (if (lsp--bracketed-change-p start length)
+          ;; The before-change value is valid, use it
+          `( :range ,(lsp--range
+                      (lsp--point-to-position start)
+                      (plist-get lsp--before-change-vals :end-pos))
+             :rangeLength ,length
+             :text ,(buffer-substring-no-properties start end))
+        (lsp--full-change-event)))))
+
+(defun lsp--bracketed-change-p (start length)
+  "If the before and after positions are the same, and the length
+is the size of the start range, we are probably good."
+  (-let [(&plist :end before-end :start before-start) lsp--before-change-vals]
+    (and (eq start before-start)
+         (eq length (- before-end before-start)))))
+
+(defun lsp--full-change-event ()
+  `(:text ,(lsp--buffer-content)))
+
+(defun lsp-before-change (start end)
+  "Executed before a file is changed.
+Added to `before-change-functions'."
+  ;; Note:
+  ;;
+  ;; This variable holds a list of functions to call when Emacs is about to
+  ;; modify a buffer. Each function gets two arguments, the beginning and end of
+  ;; the region that is about to change, represented as integers. The buffer
+  ;; that is about to change is always the current buffer when the function is
+  ;; called.
+  ;;
+  ;; WARNING:
+  ;;
+  ;; Do not expect the before-change hooks and the after-change hooks be called
+  ;; in balanced pairs around each buffer change. Also don't expect the
+  ;; before-change hooks to be called for every chunk of text Emacs is about to
+  ;; delete. These hooks are provided on the assumption that Lisp programs will
+  ;; use either before- or the after-change hooks, but not both, and the
+  ;; boundaries of the region where the changes happen might include more than
+  ;; just the actual changed text, or even lump together several changes done
+  ;; piecemeal.
+  (save-match-data
+    (lsp-save-restriction-and-excursion
+      (setq lsp--before-change-vals
+            (list :start start
+                  :end end
+                  :end-pos (lsp--point-to-position end))))))
+
+(defun lsp--flush-delayed-changes ()
+  (let ((inhibit-quit t))
+    (when lsp--delay-timer
+      (cancel-timer lsp--delay-timer))
+    (mapc (-lambda ((workspace buffer document change))
+            (with-current-buffer buffer
+              (with-lsp-workspace workspace
+                (lsp-notify "textDocument/didChange"
+                            (list :textDocument document
+                                  :contentChanges (vector change))))))
+          (prog1 (nreverse lsp--delayed-requests)
+            (setq lsp--delayed-requests nil)))))
+
+(defun lsp--workspace-sync-method (workspace)
+  (let ((sync (-> workspace
+                  (lsp--workspace-server-capabilities)
+                  (lsp:server-capabilities-text-document-sync?))))
+    (if (lsp-text-document-sync-options? sync)
+        (lsp:text-document-sync-options-change? sync)
+      sync)))
+
+(defun lsp-on-change (start end length &optional content-change-event-fn)
+  "Executed when a file is changed.
+Added to `after-change-functions'."
+  ;; Note:
+  ;;
+  ;; Each function receives three arguments: the beginning and end of the region
+  ;; just changed, and the length of the text that existed before the change.
+  ;; All three arguments are integers. The buffer that has been changed is
+  ;; always the current buffer when the function is called.
+  ;;
+  ;; The length of the old text is the difference between the buffer positions
+  ;; before and after that text as it was before the change. As for the
+  ;; changed text, its length is simply the difference between the first two
+  ;; arguments.
+  ;;
+  ;; So (47 54 0) means add    7 chars starting at pos 47
+  ;; So (47 47 7) means delete 7 chars starting at pos 47
+  (save-match-data
+    (let ((inhibit-quit t)
+          ;; make sure that `lsp-on-change' is called in multi-workspace context
+          ;; see #2901
+          lsp--cur-workspace)
+      ;; A (revert-buffer) call with the 'preserve-modes parameter (eg, as done
+      ;; by auto-revert-mode) will cause this handler to get called with a nil
+      ;; buffer-file-name. We need the buffer-file-name to send notifications;
+      ;; so we skip handling revert-buffer-caused changes and instead handle
+      ;; reverts separately in lsp-on-revert
+      (when (not revert-buffer-in-progress-p)
+        (cl-incf lsp--cur-version)
+        (mapc
+         (lambda (workspace)
+           (pcase (or lsp-document-sync-method
+                      (lsp--workspace-sync-method workspace))
+             (1
+              (if lsp-debounce-full-sync-notifications
+                  (setq lsp--delayed-requests
+                        (->> lsp--delayed-requests
+                             (-remove (-lambda ((_ buffer))
+                                        (equal (current-buffer) buffer)))
+                             (cons (list workspace
+                                         (current-buffer)
+                                         (lsp--versioned-text-document-identifier)
+                                         (lsp--full-change-event)))))
+                (with-lsp-workspace workspace
+                  (lsp-notify "textDocument/didChange"
+                              (list :contentChanges (vector (lsp--full-change-event))
+                                    :textDocument (lsp--versioned-text-document-identifier)))
+                  (lsp-diagnostics--request-pull-diagnostics workspace))))
+             (2
+              (with-lsp-workspace workspace
+                (lsp-notify
+                 "textDocument/didChange"
+                 (list :textDocument (lsp--versioned-text-document-identifier)
+                       :contentChanges (vector
+                                        (if content-change-event-fn
+                                            (funcall content-change-event-fn start end length)
+                                          (lsp--text-document-content-change-event
+                                           start end length)))))
+                (lsp-diagnostics--request-pull-diagnostics workspace)))))
+         (lsp-workspaces))
+        (when lsp--delay-timer (cancel-timer lsp--delay-timer))
+        (setq lsp--delay-timer (run-with-idle-timer
+                                lsp-debounce-full-sync-notifications-interval
+                                nil
+                                #'lsp--flush-delayed-changes))
+        ;; force cleanup overlays after each change
+        (lsp--remove-overlays 'lsp-highlight)
+        (lsp--after-change (current-buffer))))))
+
+
+
+;; facilities for on change hooks. We do not want to make lsp calls on each
+;; change event so we add debounce to avoid flooding the server with events.
+;; Additionally, we want to have a mechanism for stopping the server calls in
+;; particular cases like, e. g. when performing completion.
+
+(defvar lsp-inhibit-lsp-hooks nil
+  "Flag to control.")
+
+(defcustom lsp-on-change-hook nil
+  "Hooks to run when buffer has changed."
+  :type 'hook
+  :group 'lsp-mode)
+
+(defcustom lsp-idle-delay 0.500
+  "Debounce interval for `after-change-functions'."
+  :type 'number
+  :group 'lsp-mode)
+
+(defcustom lsp-on-idle-hook nil
+  "Hooks to run after `lsp-idle-delay'."
+  :type 'hook
+  :group 'lsp-mode)
+
+(defun lsp--idle-reschedule (buffer)
+  (when lsp--on-idle-timer
+    (cancel-timer lsp--on-idle-timer))
+
+  (setq lsp--on-idle-timer (run-with-idle-timer
+                            lsp-idle-delay
+                            nil
+                            #'lsp--on-idle
+                            buffer)))
+
+(defun lsp--post-command ()
+  (lsp--cleanup-highlights-if-needed)
+  (lsp--idle-reschedule (current-buffer)))
+
+(defun lsp--on-idle (buffer)
+  "Start post command loop."
+  (when (and (buffer-live-p buffer)
+             (equal buffer (current-buffer))
+             (not lsp-inhibit-lsp-hooks)
+             lsp-managed-mode)
+    (run-hooks 'lsp-on-idle-hook)))
+
+(defun lsp--on-change-debounce (buffer)
+  (when (and (buffer-live-p buffer)
+             (equal buffer (current-buffer))
+             (not lsp-inhibit-lsp-hooks)
+             lsp-managed-mode)
+    (run-hooks 'lsp-on-change-hook)))
+
+(defun lsp--after-change (buffer)
+  "Called after most textDocument/didChange events."
+  (setq lsp--signature-last-index nil
+        lsp--signature-last nil)
+
+  ;; cleanup diagnostics
+  (when lsp-diagnostic-clean-after-change
+    (dolist (workspace (lsp-workspaces))
+      (-let [diagnostics (lsp--workspace-diagnostics workspace)]
+        (remhash (lsp--fix-path-casing (buffer-file-name)) diagnostics))))
+
+  (when (fboundp 'lsp--semantic-tokens-refresh-if-enabled)
+    (lsp--semantic-tokens-refresh-if-enabled buffer))
+  (when lsp--on-change-timer
+    (cancel-timer lsp--on-change-timer))
+  (setq lsp--on-change-timer (run-with-idle-timer
+                              lsp-idle-delay
+                              nil
+                              #'lsp--on-change-debounce
+                              buffer))
+  (lsp--idle-reschedule buffer))
+
+
+(defcustom lsp-trim-trailing-whitespace t
+  "Trim trailing whitespace on a line."
+  :group 'lsp-mode
+  :type 'boolean)
+
+(defcustom lsp-insert-final-newline t
+  "Insert a newline character at the end of the file if one does not exist."
+  :group 'lsp-mode
+  :type 'boolean)
+
+(defcustom lsp-trim-final-newlines t
+  "Trim all newlines after the final newline at the end of the file."
+  :group 'lsp-mode
+  :type 'boolean)
+
+
+(defun lsp--on-type-formatting (first-trigger-characters more-trigger-characters)
+  "Self insert handling.
+Applies on type formatting."
+  (let ((ch last-command-event))
+    (when (or (eq (string-to-char first-trigger-characters) ch)
+              (cl-find ch more-trigger-characters :key #'string-to-char))
+      (lsp-request-async "textDocument/onTypeFormatting"
+                         (lsp-make-document-on-type-formatting-params
+                          :text-document (lsp--text-document-identifier)
+                          :options (lsp-make-formatting-options
+                                    :tab-size (symbol-value (lsp--get-indent-width major-mode))
+                                    :insert-spaces (lsp-json-bool (not indent-tabs-mode))
+                                    :trim-trailing-whitespace? (lsp-json-bool lsp-trim-trailing-whitespace)
+                                    :insert-final-newline? (lsp-json-bool lsp-insert-final-newline)
+                                    :trim-final-newlines? (lsp-json-bool lsp-trim-final-newlines))
+                          :ch (char-to-string ch)
+                          :position (lsp--cur-position))
+                         (lambda (data) (lsp--apply-text-edits data 'format))
+                         :mode 'tick))))
+
+
+;; links
+(defun lsp--document-links ()
+  (when (lsp-feature? "textDocument/documentLink")
+    (lsp-request-async
+     "textDocument/documentLink"
+     `(:textDocument ,(lsp--text-document-identifier))
+     (lambda (links)
+       (lsp--remove-overlays 'lsp-link)
+       (seq-do
+        (-lambda ((link &as &DocumentLink :range (&Range :start :end)))
+          (-doto (make-button (lsp--position-to-point start)
+                              (lsp--position-to-point end)
+                              'action (lsp--document-link-keymap link)
+                              'keymap (let ((map (make-sparse-keymap)))
+                                        (define-key map [M-return] 'push-button)
+                                        (define-key map [mouse-2] 'push-button)
+                                        map)
+                              'help-echo "mouse-2, M-RET: Visit this link")
+            (overlay-put 'lsp-link t)))
+        links))
+     :mode 'unchanged)))
+
+(defun lsp--document-link-handle-target (url)
+  (let* ((parsed-url (url-generic-parse-url (url-unhex-string url)))
+         (type (url-type parsed-url)))
+    (pcase type
+      ("file"
+       (xref-push-marker-stack)
+       (find-file (lsp--uri-to-path url))
+       (-when-let ((_ line column) (s-match (rx "#" (group (1+ num)) (or "," "#") (group (1+ num))) url))
+         (goto-char (lsp--position-to-point
+                     (lsp-make-position :character (1- (string-to-number column))
+                                        :line (1- (string-to-number line)))))))
+      ((or "http" "https") (browse-url url))
+      (type (if-let ((handler (lsp--get-uri-handler type)))
+                (funcall handler url)
+              (signal 'lsp-file-scheme-not-supported (list url)))))))
+
+(lsp-defun lsp--document-link-keymap ((link &as &DocumentLink :target?))
+  (if target?
+      (lambda (_)
+        (interactive)
+        (lsp--document-link-handle-target target?))
+    (lambda (_)
+      (interactive)
+      (when (lsp:document-link-registration-options-resolve-provider?
+             (lsp--capability-for-method "textDocument/documentLink"))
+        (lsp-request-async
+         "documentLink/resolve"
+         link
+         (-lambda ((&DocumentLink :target?))
+           (lsp--document-link-handle-target target?)))))))
+
+
+
+(defcustom lsp-warn-no-matched-clients t
+  "Whether to show messages when there are no supported clients."
+  :group 'lsp-mode
+  :type 'boolean)
+
+(defun lsp-buffer-language--configured-id ()
+  "Return nil when not registered."
+  (->> lsp-language-id-configuration
+       (-first
+        (-lambda ((mode-or-pattern . language))
+          (cond
+           ((and (stringp mode-or-pattern)
+                 (s-matches? mode-or-pattern (buffer-file-name)))
+            language)
+           ((eq mode-or-pattern major-mode) language))))
+       cl-rest))
+
+(defvar-local lsp--buffer-language nil
+  "Locally cached returned value of `lsp-buffer-language'.")
+
+(defun lsp-buffer-language ()
+  "Get language corresponding current buffer."
+  (or lsp--buffer-language
+      (let* ((configured-language (lsp-buffer-language--configured-id)))
+        (setq lsp--buffer-language
+              (or configured-language
+                  ;; ensure non-nil
+                  (string-remove-suffix "-mode" (symbol-name major-mode))))
+        (when (and lsp-warn-no-matched-clients
+                   (null configured-language))
+          (lsp-warn "Unable to calculate the languageId for buffer `%s'. \
+Take a look at `lsp-language-id-configuration'. The `major-mode' is %s"
+                    (buffer-name)
+                    major-mode))
+        lsp--buffer-language)))
+
+(defun lsp-activate-on (&rest languages)
+  "Returns language activation function.
+The function will return t when the `lsp-buffer-language' returns
+one of the LANGUAGES."
+  (lambda (_file-name _mode)
+    (-contains? languages (lsp-buffer-language))))
+
+(defun lsp-workspace-root (&optional path)
+  "Find the workspace root for the current file or PATH."
+  (-when-let* ((file-name (or path (buffer-file-name)))
+               (file-name (lsp-f-canonical file-name)))
+    (->> (lsp-session)
+         (lsp-session-folders)
+         (--filter (and (lsp--files-same-host it file-name)
+                        (or (lsp-f-ancestor-of? it file-name)
+                            (equal it file-name))))
+         (--max-by (> (length it) (length other))))))
+
+(defun lsp-on-revert ()
+  "Executed when a file is reverted.
+Added to `after-revert-hook'."
+  (let ((n (buffer-size))
+        (revert-buffer-in-progress-p nil))
+    (lsp-on-change 0 n n)))
+
+(defun lsp--text-document-did-close (&optional keep-workspace-alive)
+  "Executed when the file is closed, added to `kill-buffer-hook'.
+
+If KEEP-WORKSPACE-ALIVE is non-nil, do not shutdown the workspace
+if it's closing the last buffer in the workspace."
+  (lsp-foreach-workspace
+   (cl-callf2 delq (lsp-current-buffer) (lsp--workspace-buffers lsp--cur-workspace))
+   (with-demoted-errors "Error sending didClose notification in ‘lsp--text-document-did-close’: %S"
+     (lsp-notify "textDocument/didClose"
+                 `(:textDocument ,(lsp--text-document-identifier))))
+   (when (and (not lsp-keep-workspace-alive)
+              (not keep-workspace-alive)
+              (not (lsp--workspace-buffers lsp--cur-workspace)))
+     (lsp--shutdown-workspace))))
+
+(defun lsp--will-save-text-document-params (reason)
+  (list :textDocument (lsp--text-document-identifier)
+        :reason reason))
+
+(defun lsp--before-save ()
+  "Before save handler."
+  (with-demoted-errors "Error in ‘lsp--before-save’: %S"
+    (let ((params (lsp--will-save-text-document-params 1)))
+      (when (lsp--send-will-save-p)
+        (lsp-notify "textDocument/willSave" params))
+      (when (and (lsp--send-will-save-wait-until-p) lsp-before-save-edits)
+        (let ((lsp-response-timeout 0.1))
+          (condition-case nil
+              (lsp--apply-text-edits
+               (lsp-request "textDocument/willSaveWaitUntil"
+                            params)
+               'before-save)
+            (error)))))))
+
+(defun lsp--on-auto-save ()
+  "Handler for auto-save."
+  (when (lsp--send-will-save-p)
+    (with-demoted-errors "Error in ‘lsp--on-auto-save’: %S"
+      (lsp-notify "textDocument/willSave" (lsp--will-save-text-document-params 2)))))
+
+(defun lsp--text-document-did-save ()
+  "Executed when the file is closed, added to `after-save-hook''."
+  (when (lsp--send-did-save-p)
+    (with-demoted-errors "Error on ‘lsp--text-document-did-save: %S’"
+      (lsp-notify "textDocument/didSave"
+                  `( :textDocument ,(lsp--versioned-text-document-identifier)
+                     ,@(when (lsp--save-include-text-p)
+                         (list :text (lsp--buffer-content))))))))
+
+(defun lsp--text-document-position-params (&optional identifier position)
+  "Make TextDocumentPositionParams for the current point in the current document.
+If IDENTIFIER and POSITION are non-nil, they will be used as the document
+identifier and the position respectively."
+  (list :textDocument (or identifier (lsp--text-document-identifier))
+        :position (or position (lsp--cur-position))))
+
+(defun lsp--get-buffer-diagnostics ()
+  "Return buffer diagnostics."
+  (gethash (or
+            (plist-get lsp--virtual-buffer :buffer-file-name)
+            (lsp--fix-path-casing (buffer-file-name)))
+           (lsp-diagnostics t)))
+
+(defun lsp-cur-line-diagnostics ()
+  "Return any diagnostics that apply to the current line."
+  (-let [(&plist :start (&plist :line start) :end (&plist :line end)) (lsp--region-or-line)]
+    (cl-coerce (-filter
+                (-lambda ((&Diagnostic :range (&Range :start (&Position :line))))
+                  (and (>= line start) (<= line end)))
+                (lsp--get-buffer-diagnostics))
+               'vector)))
+
+(lsp-defun lsp-range-overlapping?((left &as &Range :start left-start :end left-end)
+                                  (right &as &Range :start right-start :end right-end))
+  (or (lsp-point-in-range? right-start left)
+      (lsp-point-in-range? right-end left)
+      (lsp-point-in-range? left-start right)
+      (lsp-point-in-range? left-end right)))
+
+(defun lsp-make-position-1 (position)
+  (lsp-make-position :line (plist-get position :line)
+                     :character (plist-get position :character)))
+
+(defun lsp-cur-possition-diagnostics ()
+  "Return any diagnostics that apply to the current line."
+  (-let* ((start (if (use-region-p) (region-beginning) (point)))
+          (end (if (use-region-p) (region-end) (point)))
+          (current-range (lsp-make-range :start (lsp-make-position-1 (lsp-point-to-position start))
+                                         :end (lsp-make-position-1 (lsp-point-to-position end)))))
+    (->> (lsp--get-buffer-diagnostics)
+         (-filter
+          (-lambda ((&Diagnostic :range))
+            (lsp-range-overlapping? range current-range)))
+         (apply 'vector))))
+
+(defalias 'lsp--cur-line-diagnotics 'lsp-cur-line-diagnostics)
+
+(defun lsp--extract-line-from-buffer (pos)
+  "Return the line pointed to by POS (a Position object) in the current buffer."
+  (let* ((point (lsp--position-to-point pos))
+         (inhibit-field-text-motion t))
+    (save-excursion
+      (goto-char point)
+      (buffer-substring (line-beginning-position) (line-end-position)))))
+
+(lsp-defun lsp--xref-make-item (filename (&Range :start (start &as &Position :character start-char :line start-line)
+                                                 :end (end &as &Position :character end-char)))
+  "Return a xref-item from a RANGE in FILENAME."
+  (let* ((line (lsp--extract-line-from-buffer start))
+         (len (length line)))
+    (add-face-text-property (max (min start-char len) 0)
+                            (max (min end-char len) 0)
+                            'xref-match t line)
+    ;; LINE is nil when FILENAME is not being current visited by any buffer.
+    (xref-make-match (or line filename)
+                     (xref-make-file-location
+                      filename
+                      (lsp-translate-line (1+ start-line))
+                      (lsp-translate-column start-char))
+                     (- end-char start-char))))
+
+(defun lsp--location-uri (loc)
+  (if (lsp-location? loc)
+      (lsp:location-uri loc)
+    (lsp:location-link-target-uri loc)))
+
+(lsp-defun lsp-goto-location ((loc &as &Location :uri :range (&Range :start)))
+  "Go to location."
+  (let ((path (lsp--uri-to-path uri)))
+    (if (f-exists? path)
+        (with-current-buffer (find-file path)
+          (goto-char (lsp--position-to-point start)))
+      (error "There is no file %s" path))))
+
+(defun lsp--location-range (loc)
+  (if (lsp-location? loc)
+      (lsp:location-range loc)
+    (lsp:location-link-target-selection-range loc)))
+
+(defun lsp--locations-to-xref-items (locations)
+  "Return a list of `xref-item' given LOCATIONS, which can be of
+type Location, LocationLink, Location[] or LocationLink[]."
+  (setq locations
+        (pcase locations
+          ((seq (or (lsp-interface Location)
+                    (lsp-interface LocationLink)))
+           (append locations nil))
+          ((or (lsp-interface Location)
+               (lsp-interface LocationLink))
+           (list locations))))
+
+  (cl-labels ((get-xrefs-in-file
+               (file-locs)
+               (-let [(filename . matches) file-locs]
+                 (condition-case err
+                     (let ((visiting (find-buffer-visiting filename))
+                           (fn (lambda (loc)
+                                 (lsp-with-filename filename
+                                   (lsp--xref-make-item filename
+                                                        (lsp--location-range loc))))))
+                       (if visiting
+                           (with-current-buffer visiting
+                             (seq-map fn matches))
+                         (when (file-readable-p filename)
+                           (with-temp-buffer
+                             (insert-file-contents-literally filename)
+                             (seq-map fn matches)))))
+                   (error (lsp-warn "Failed to process xref entry for filename '%s': %s"
+                                    filename (error-message-string err)))
+                   (file-error (lsp-warn "Failed to process xref entry, file-error, '%s': %s"
+                                         filename (error-message-string err)))))))
+
+    (->> locations
+         (seq-sort #'lsp--location-before-p)
+         (seq-group-by (-compose #'lsp--uri-to-path #'lsp--location-uri))
+         (seq-map #'get-xrefs-in-file)
+         (apply #'nconc))))
+
+(defun lsp--location-before-p (left right)
+  "Sort first by file, then by line, then by column."
+  (let ((left-uri (lsp--location-uri left))
+        (right-uri (lsp--location-uri right)))
+    (if (not (string= left-uri right-uri))
+        (string< left-uri right-uri)
+      (-let (((&Range :start left-start) (lsp--location-range left))
+             ((&Range :start right-start) (lsp--location-range right)))
+        (lsp--position-compare right-start left-start)))))
+
+(defun lsp--make-reference-params (&optional td-position exclude-declaration)
+  "Make a ReferenceParam object.
+If TD-POSITION is non-nil, use it as TextDocumentPositionParams object instead.
+If EXCLUDE-DECLARATION is non-nil, request the server to include declarations."
+  (let ((json-false :json-false))
+    (plist-put (or td-position (lsp--text-document-position-params))
+               :context `(:includeDeclaration ,(lsp-json-bool (not exclude-declaration))))))
+
+(defun lsp--cancel-request (id)
+  "Cancel request with ID in all workspaces."
+  (lsp-foreach-workspace
+   (->> lsp--cur-workspace lsp--workspace-client lsp--client-response-handlers (remhash id))
+   (lsp-notify "$/cancelRequest" `(:id ,id))))
+
+(defvar-local lsp--hover-saved-bounds nil)
+
+(defun lsp-eldoc-function (cb &rest _ignored)
+  "`lsp-mode' eldoc function to display hover info (based on `textDocument/hover')."
+  (if (and lsp--hover-saved-bounds
+           (lsp--point-in-bounds-p lsp--hover-saved-bounds))
+      lsp--eldoc-saved-message
+    (setq lsp--hover-saved-bounds nil
+          lsp--eldoc-saved-message nil)
+    (if (looking-at-p "[[:space:]\n]")
+        (setq lsp--eldoc-saved-message nil) ; And returns nil.
+      (when (and lsp-eldoc-enable-hover (lsp-feature? "textDocument/hover"))
+        (lsp-request-async
+         "textDocument/hover"
+         (lsp--text-document-position-params)
+         (-lambda ((hover &as &Hover? :range? :contents))
+           (setq lsp--hover-saved-bounds (when range?
+                                           (lsp--range-to-region range?)))
+           (funcall cb (setq lsp--eldoc-saved-message
+                             (when contents
+                               (lsp--render-on-hover-content
+                                contents
+                                lsp-eldoc-render-all)))))
+         :error-handler #'ignore
+         :mode 'tick
+         :cancel-token :eldoc-hover)))))
+
+(defun lsp--point-on-highlight? ()
+  (-some? (lambda (overlay)
+            (overlay-get overlay 'lsp-highlight))
+          (overlays-at (point))))
+
+(defun lsp--cleanup-highlights-if-needed ()
+  (when (and lsp-enable-symbol-highlighting
+             lsp--have-document-highlights
+             (not (lsp--point-on-highlight?)))
+    (lsp--remove-overlays 'lsp-highlight)
+    (setq lsp--have-document-highlights nil)
+    (lsp-cancel-request-by-token :highlights)))
+
+(defvar-local lsp--symbol-bounds-of-last-highlight-invocation nil
+  "The bounds of the symbol from which `lsp--document-highlight'
+  most recently requested highlights.")
+
+(defun lsp--document-highlight ()
+  (when (lsp-feature? "textDocument/documentHighlight")
+    (let ((curr-sym-bounds (bounds-of-thing-at-point 'symbol)))
+      (unless (or (looking-at-p "[[:space:]\n]")
+                  (not lsp-enable-symbol-highlighting)
+                  (and lsp--have-document-highlights
+                       curr-sym-bounds
+                       (equal curr-sym-bounds
+                              lsp--symbol-bounds-of-last-highlight-invocation)))
+        (setq lsp--symbol-bounds-of-last-highlight-invocation
+              curr-sym-bounds)
+        (lsp-request-async "textDocument/documentHighlight"
+                           (lsp--text-document-position-params)
+                           #'lsp--document-highlight-callback
+                           :mode 'tick
+                           :cancel-token :highlights)))))
+
+(defun lsp--help-open-link (&rest _)
+  "Open markdown link at point via mouse or keyboard."
+  (interactive "P")
+  (let ((buffer-list-update-hook nil))
+    (-let [(buffer point) (if-let* ((valid (and (listp last-input-event)
+                                                (eq (car last-input-event) 'mouse-2)))
+                                    (event (cadr last-input-event))
+                                    (win (posn-window event))
+                                    (buffer (window-buffer win)))
+                              `(,buffer ,(posn-point event))
+                            `(,(current-buffer) ,(point)))]
+      (with-current-buffer buffer
+        (when-let* ((face (get-text-property point 'face))
+                    (url (or (and (eq face 'markdown-link-face)
+                                  (get-text-property point 'help-echo))
+                             (and (memq face '(markdown-url-face markdown-plain-url-face))
+                                  (nth 3 (markdown-link-at-pos point))))))
+          (lsp--document-link-handle-target url))))))
+
+(defvar lsp-help-mode-map
+  (-doto (make-sparse-keymap)
+    (define-key [remap markdown-follow-link-at-point] #'lsp--help-open-link))
+  "Keymap for `lsp-help-mode'.")
+
+(define-derived-mode lsp-help-mode help-mode "LspHelp"
+  "Major mode for displaying lsp help.")
+
+(defun lsp-describe-thing-at-point ()
+  "Display the type signature and documentation of the thing at point."
+  (interactive)
+  (let ((contents (-some->> (lsp--text-document-position-params)
+                    (lsp--make-request "textDocument/hover")
+                    (lsp--send-request)
+                    (lsp:hover-contents))))
+    (if (and contents (not (equal contents "")))
+        (let ((lsp-help-buf-name "*lsp-help*"))
+          (with-current-buffer (get-buffer-create lsp-help-buf-name)
+            (delay-mode-hooks
+              (lsp-help-mode)
+              (with-help-window lsp-help-buf-name
+                (insert (string-trim-right (lsp--render-on-hover-content contents t)))))
+            (run-mode-hooks)))
+      (lsp--info "No content at point."))))
+
+(defun lsp--point-in-bounds-p (bounds)
+  "Return whether the current point is within BOUNDS."
+  (and (<= (car bounds) (point)) (< (point) (cdr bounds))))
+
+(defun lsp-get-renderer (language)
+  "Get renderer for LANGUAGE."
+  (lambda (str)
+    (lsp--render-string str language)))
+
+(defun lsp--setup-markdown (mode)
+  "Setup the ‘markdown-mode’ in the frame.
+MODE is the mode used in the parent frame."
+  (make-local-variable 'markdown-code-lang-modes)
+  (dolist (mark (alist-get mode lsp-custom-markup-modes))
+    (add-to-list 'markdown-code-lang-modes (cons mark mode)))
+  (setq-local markdown-fontify-code-blocks-natively t)
+  (setq-local markdown-fontify-code-block-default-mode mode)
+  (setq-local markdown-hide-markup t)
+
+  ;; Render some common HTML entities.
+  ;; This should really happen in markdown-mode instead,
+  ;; but it doesn't, so we do it here for now.
+  (setq prettify-symbols-alist
+        (cl-loop for i from 0 to 255
+                 collect (cons (format "&#x%02X;" i) i)))
+  (push '("&lt;" . ?<) prettify-symbols-alist)
+  (push '("&gt;" . ?>) prettify-symbols-alist)
+  (push '("&amp;" . ?&) prettify-symbols-alist)
+  (push '("&nbsp;" . ? ) prettify-symbols-alist)
+  (setq prettify-symbols-compose-predicate
+        (lambda (_start _end _match) t))
+  (prettify-symbols-mode 1))
+
+(defvar lsp-help-link-keymap
+  (let ((map (make-sparse-keymap)))
+    (define-key map [mouse-2] #'lsp--help-open-link)
+    (define-key map "\r" #'lsp--help-open-link)
+    map)
+  "Keymap active on links in *lsp-help* mode.")
+
+(defun lsp--fix-markdown-links ()
+  (let ((inhibit-read-only t)
+        (inhibit-modification-hooks t)
+        (prop))
+    (save-restriction
+      (goto-char (point-min))
+      (while (setq prop (markdown-find-next-prop 'face))
+        (let ((end (or (next-single-property-change (car prop) 'face)
+                       (point-max))))
+          (when (memq (get-text-property (car prop) 'face)
+                      '(markdown-link-face
+                        markdown-url-face
+                        markdown-plain-url-face))
+            (add-text-properties (car prop) end
+                                 (list 'button t
+                                       'category 'lsp-help-link
+                                       'follow-link t
+                                       'keymap lsp-help-link-keymap)))
+          (goto-char end))))))
+
+(defun lsp--buffer-string-visible ()
+  "Return visible buffer string.
+Stolen from `org-copy-visible'."
+  (let ((temp (generate-new-buffer " *temp*"))
+        (beg (point-min))
+        (end (point-max)))
+    (while (/= beg end)
+      (when (get-char-property beg 'invisible)
+        (setq beg (next-single-char-property-change beg 'invisible nil end)))
+      (let* ((next (next-single-char-property-change beg 'invisible nil end))
+             (substring (buffer-substring beg next)))
+        (with-current-buffer temp (insert substring))
+        ;; (setq result (concat result substring))
+        (setq beg next)))
+    (setq deactivate-mark t)
+    (prog1 (with-current-buffer temp
+             (s-chop-suffix "\n" (buffer-string)))
+      (kill-buffer temp))))
+
+(defvar lsp-buffer-major-mode nil
+  "Holds the major mode when fontification function is running.
+See #2588")
+
+(defvar view-inhibit-help-message)
+
+(defun lsp--render-markdown ()
+  "Render markdown."
+
+  (let ((markdown-enable-math nil))
+    (goto-char (point-min))
+    (while (re-search-forward
+            (rx (and "\\" (group (or "\\" "`" "*" "_" ":" "/"
+                                     "{" "}" "[" "]" "(" ")"
+                                     "#" "+" "-" "." "!" "|"))))
+            nil t)
+      (replace-match (rx (backref 1))))
+
+    ;; markdown-mode v2.3 does not yet provide gfm-view-mode
+    (if (fboundp 'gfm-view-mode)
+        (let ((view-inhibit-help-message t))
+          (gfm-view-mode))
+      (gfm-mode))
+
+    (lsp--setup-markdown lsp-buffer-major-mode)))
+
+(defvar lsp--display-inline-image-alist
+  '((lsp--render-markdown
+     (:regexp
+      "!\\[.*?\\](data:image/[a-zA-Z]+;base64,\\([A-Za-z0-9+/\n]+?=*?\\)\\(|[^)]+\\)?)"
+      :sexp
+      (create-image
+       (base64-decode-string
+        (buffer-substring-no-properties (match-beginning 1) (match-end 1)))
+       nil t))))
+  "Replaced string regexp and function returning image.
+Each element should have the form (MODE . (PROPERTY-LIST...)).
+MODE (car) is function which is defined in `lsp-language-id-configuration'.
+Cdr should be list of PROPERTY-LIST.
+
+Each PROPERTY-LIST should have properties:
+:regexp  Regexp which determines what string is relpaced to image.
+         You should also get information of image, by parenthesis constructs.
+         By default, all matched string is replaced to image, but you can
+         change index of replaced string by keyword :replaced-index.
+
+:sexp    Return image when evaluated. You can use information of regexp
+         by using (match-beggining N), (match-end N) or (match-substring N).
+
+In addition, each can have property:
+:replaced-index  Determine index which is used to replace regexp to image.
+                 The value means first argument of `match-beginning' and
+                 `match-end'. If omitted, interpreted as index 0.")
+
+(defcustom lsp-display-inline-image t
+  "Showing inline image or not."
+  :group 'lsp-mode
+  :type 'boolean)
+
+(defcustom lsp-enable-suggest-server-download t
+  "When non-nil enable server downloading suggestions."
+  :group 'lsp-mode
+  :type 'boolean
+  :package-version '(lsp-mode . "9.0.0"))
+
+(defcustom lsp-auto-register-remote-clients t
+  "When non-nil register remote when registering the local one."
+  :group 'lsp-mode
+  :type 'boolean
+  :package-version '(lsp-mode . "9.0.0"))
+
+(defun lsp--display-inline-image (mode)
+  "Add image property if available."
+  (let ((plist-list (cdr (assq mode lsp--display-inline-image-alist))))
+    (when (and (display-images-p) lsp-display-inline-image)
+      (cl-loop
+       for plist in plist-list
+       with regexp with replaced-index
+       do
+       (setq regexp (plist-get plist :regexp))
+       (setq replaced-index (or (plist-get plist :replaced-index) 0))
+
+       (font-lock-remove-keywords nil (list regexp replaced-index))
+       (let ((inhibit-read-only t))
+         (save-excursion
+           (goto-char (point-min))
+           (while (re-search-forward regexp nil t)
+             (set-text-properties
+              (match-beginning replaced-index) (match-end replaced-index)
+              nil)
+             (add-text-properties
+              (match-beginning replaced-index) (match-end replaced-index)
+              `(display ,(eval (plist-get plist :sexp)))))))))))
+
+(defun lsp--fontlock-with-mode (str mode)
+  "Fontlock STR with MODE."
+  (let ((lsp-buffer-major-mode major-mode))
+    (with-temp-buffer
+      (with-demoted-errors "Error during doc rendering: %s"
+        (insert str)
+        (delay-mode-hooks (funcall mode))
+        (cl-flet ((window-body-width () lsp-window-body-width))
+          ;; This can go wrong in some cases, and the fontification would
+          ;; not work as expected.
+          ;;
+          ;; See #2984
+          (ignore-errors (font-lock-ensure))
+          (lsp--display-inline-image mode)
+          (when (eq mode 'lsp--render-markdown)
+            (lsp--fix-markdown-links))))
+      (lsp--buffer-string-visible))))
+
+(defun lsp--render-string (str language)
+  "Render STR using `major-mode' corresponding to LANGUAGE.
+When language is nil render as markup if `markdown-mode' is loaded."
+  (setq str (s-replace "\r" "" (or str "")))
+  (if-let* ((modes (-keep (-lambda ((mode . lang))
+                            (when (and (equal lang language) (functionp mode))
+                              mode))
+                          lsp-language-id-configuration))
+            (mode (car (or (member major-mode modes) modes))))
+      (lsp--fontlock-with-mode str mode)
+    str))
+
+(defun lsp--render-element (content)
+  "Render CONTENT element."
+  (let ((inhibit-message t))
+    (or
+     (pcase content
+       ((lsp-interface MarkedString :value :language)
+        (lsp--render-string value language))
+       ((lsp-interface MarkupContent :value :kind)
+        (lsp--render-string value kind))
+       ;; plain string
+       ((pred stringp) (lsp--render-string content "markdown"))
+       ((pred null) "")
+       (_ (error "Failed to handle %s" content)))
+     "")))
+
+(defun lsp--create-unique-string-fn ()
+  (let (elements)
+    (lambda (element)
+      (let ((count (cl-count element elements :test #'string=)))
+        (prog1 (if (zerop count)
+                   element
+                 (format "%s (%s)" element count))
+          (push element elements))))))
+
+(defun lsp--select-action (actions)
+  "Select an action to execute from ACTIONS."
+  (cond
+   ((seq-empty-p actions) (signal 'lsp-no-code-actions nil))
+   ((and (eq (seq-length actions) 1) lsp-auto-execute-action)
+    (lsp-seq-first actions))
+   (t (let ((completion-ignore-case t))
+        (lsp--completing-read "Select code action: "
+                              (seq-into actions 'list)
+                              (-compose (lsp--create-unique-string-fn)
+                                        #'lsp:code-action-title)
+                              nil t)))))
+
+(defun lsp--workspace-server-id (workspace)
+  "Return the server ID of WORKSPACE."
+  (-> workspace lsp--workspace-client lsp--client-server-id))
+
+(defun lsp--handle-rendered-for-echo-area (contents)
+  "Return a single line from RENDERED, appropriate for display in the echo area."
+  (pcase (lsp-workspaces)
+    (`(,workspace)
+     (lsp-clients-extract-signature-on-hover contents (lsp--workspace-server-id workspace)))
+    ;; For projects with multiple active workspaces we also default to
+    ;; render the first line.
+    (_ (lsp-clients-extract-signature-on-hover contents nil))))
+
+(cl-defmethod lsp-clients-extract-signature-on-hover (contents _server-id)
+  "Extract a representative line from CONTENTS, to show in the echo area."
+  (car (s-lines (s-trim (lsp--render-element contents)))))
+
+(defun lsp--render-on-hover-content (contents render-all)
+  "Render the content received from `document/onHover' request.
+CONTENTS  - MarkedString | MarkedString[] | MarkupContent
+RENDER-ALL - nil if only the signature should be rendered."
+  (cond
+   ((lsp-markup-content? contents)
+    ;; MarkupContent.
+    ;; It tends to be long and is not suitable to display fully in the echo area.
+    ;; Just display the first line which is typically the signature.
+    (if render-all
+        (lsp--render-element contents)
+      (lsp--handle-rendered-for-echo-area contents)))
+   ((and (stringp contents) (not (string-match-p "\n" contents)))
+    ;; If the contents is a single string containing a single line,
+    ;; render it always.
+    (lsp--render-element contents))
+   (t
+    ;; MarkedString -> MarkedString[]
+    (when (or (lsp-marked-string? contents) (stringp contents))
+      (setq contents (list contents)))
+    ;; Consider the signature consisting of the elements who have a renderable
+    ;; "language" property. When render-all is nil, ignore other elements.
+    (string-join
+     (seq-map
+      #'lsp--render-element
+      (if render-all
+          contents
+        ;; Only render contents that have an available renderer.
+        (seq-take
+         (seq-filter
+          (-andfn #'lsp-marked-string?
+                  (-compose #'lsp-get-renderer #'lsp:marked-string-language))
+          contents)
+         1)))
+     (if (bound-and-true-p page-break-lines-mode)
+         "\n\n"
+       "\n")))))
+
+
+
+(defvar lsp-signature-mode-map
+  (-doto (make-sparse-keymap)
+    (define-key (kbd "M-n") #'lsp-signature-next)
+    (define-key (kbd "M-p") #'lsp-signature-previous)
+    (define-key (kbd "M-a") #'lsp-signature-toggle-full-docs)
+    (define-key (kbd "C-c C-k") #'lsp-signature-stop)
+    (define-key (kbd "C-g") #'lsp-signature-stop))
+  "Keymap for `lsp-signature-mode'.")
+
+(define-minor-mode lsp-signature-mode
+  "Mode used to show signature popup."
+  :keymap lsp-signature-mode-map
+  :lighter ""
+  :group 'lsp-mode)
+
+(defun lsp-signature-stop ()
+  "Stop showing current signature help."
+  (interactive)
+  (lsp-cancel-request-by-token :signature)
+  (remove-hook 'post-command-hook #'lsp-signature)
+  (funcall lsp-signature-function nil)
+  (lsp-signature-mode -1))
+
+(declare-function page-break-lines--update-display-tables "ext:page-break-lines")
+
+(defun lsp--setup-page-break-mode-if-present ()
+  "Enable `page-break-lines-mode' in current buffer."
+  (when (fboundp 'page-break-lines-mode)
+    (page-break-lines-mode)
+    ;; force page-break-lines-mode to update the display tables.
+    (page-break-lines--update-display-tables)))
+
+(defun lsp-lv-message (message)
+  (add-hook 'lv-window-hook #'lsp--setup-page-break-mode-if-present)
+  (if message
+      (progn
+        (setq lsp--signature-last-buffer (current-buffer))
+        (let ((lv-force-update t))
+          (lv-message "%s" message)))
+    (lv-delete-window)
+    (remove-hook 'lv-window-hook #'lsp--setup-page-break-mode-if-present)))
+
+(declare-function posframe-show "ext:posframe")
+(declare-function posframe-hide "ext:posframe")
+(declare-function posframe-poshandler-point-bottom-left-corner-upward "ext:posframe")
+
+(defface lsp-signature-posframe
+  '((t :inherit tooltip))
+  "Background and foreground for `lsp-signature-posframe'."
+  :group 'lsp-mode)
+
+(defvar lsp-signature-posframe-params
+  (list :poshandler #'posframe-poshandler-point-bottom-left-corner-upward
+        :height 10
+        :width 60
+        :border-width 1
+        :min-width 60)
+  "Params for signature and `posframe-show'.")
+
+(defun lsp-signature-posframe (str)
+  "Use posframe to show the STR signatureHelp string."
+  (if str
+      (apply #'posframe-show
+             (with-current-buffer (get-buffer-create " *lsp-signature*")
+               (erase-buffer)
+               (insert str)
+               (visual-line-mode 1)
+               (lsp--setup-page-break-mode-if-present)
+               (current-buffer))
+             (append
+              lsp-signature-posframe-params
+              (list :position (point)
+                    :background-color (face-attribute 'lsp-signature-posframe :background nil t)
+                    :foreground-color (face-attribute 'lsp-signature-posframe :foreground nil t)
+                    :border-color (face-attribute 'font-lock-comment-face :foreground nil t))))
+    (posframe-hide " *lsp-signature*")))
+
+(defun lsp--handle-signature-update (signature)
+  (let ((message
+         (if (lsp-signature-help? signature)
+             (lsp--signature->message signature)
+           (mapconcat #'lsp--signature->message signature "\n"))))
+    (if (s-present? message)
+        (funcall lsp-signature-function message)
+      (lsp-signature-stop))))
+
+(defun lsp-signature-activate ()
+  "Activate signature help.
+It will show up only if current point has signature help."
+  (interactive)
+  (setq lsp--signature-last nil
+        lsp--signature-last-index nil
+        lsp--signature-last-buffer (current-buffer))
+  (add-hook 'post-command-hook #'lsp-signature)
+  (lsp-signature-mode t))
+
+(defcustom lsp-signature-cycle t
+  "Whether `lsp-signature-next' and prev should cycle."
+  :type 'boolean
+  :group 'lsp-mode)
+
+(defun lsp-signature-next ()
+  "Show next signature."
+  (interactive)
+  (let ((nsigs (length (lsp:signature-help-signatures lsp--signature-last))))
+    (when (and lsp--signature-last-index
+               lsp--signature-last
+               (or lsp-signature-cycle (< (1+ lsp--signature-last-index) nsigs)))
+      (setq lsp--signature-last-index (% (1+ lsp--signature-last-index) nsigs))
+      (funcall lsp-signature-function (lsp--signature->message lsp--signature-last)))))
+
+(defun lsp-signature-previous ()
+  "Next signature."
+  (interactive)
+  (when (and lsp--signature-last-index
+             lsp--signature-last
+             (or lsp-signature-cycle (not (zerop lsp--signature-last-index))))
+    (setq lsp--signature-last-index (1- (if (zerop lsp--signature-last-index)
+                                            (length (lsp:signature-help-signatures lsp--signature-last))
+                                          lsp--signature-last-index)))
+    (funcall lsp-signature-function (lsp--signature->message lsp--signature-last))))
+
+(defun lsp-signature-toggle-full-docs ()
+  "Toggle full/partial signature documentation."
+  (interactive)
+  (let ((all? (not (numberp lsp-signature-doc-lines))))
+    (setq lsp-signature-doc-lines (if all?
+                                      (or (car-safe lsp-signature-doc-lines)
+                                          20)
+                                    (list lsp-signature-doc-lines))))
+  (lsp-signature-activate))
+
+(defun lsp--signature->message (signature-help)
+  "Generate eldoc message from SIGNATURE-HELP response."
+  (setq lsp--signature-last signature-help)
+
+  (when (and signature-help (not (seq-empty-p (lsp:signature-help-signatures signature-help))))
+    (-let* (((&SignatureHelp :active-signature?
+                             :active-parameter?
+                             :signatures) signature-help)
+            (active-signature? (or lsp--signature-last-index active-signature? 0))
+            (_ (setq lsp--signature-last-index active-signature?))
+            ((signature &as &SignatureInformation? :label :parameters?) (seq-elt signatures active-signature?))
+            (prefix (if (= (length signatures) 1)
+                        ""
+                      (concat (propertize (format " %s/%s"
+                                                  (1+ active-signature?)
+                                                  (length signatures))
+                                          'face 'success)
+                              " ")))
+            (method-docs (when
+                             (and lsp-signature-render-documentation
+                                  (or (not (numberp lsp-signature-doc-lines)) (< 0 lsp-signature-doc-lines)))
+                           (let ((docs (lsp--render-element
+                                        (lsp:parameter-information-documentation? signature))))
+                             (when (s-present? docs)
+                               (concat
+                                "\n"
+                                (if (fboundp 'page-break-lines-mode)
+                                    "\n"
+                                  "")
+                                (if (and (numberp lsp-signature-doc-lines)
+                                         (> (length (s-lines docs)) lsp-signature-doc-lines))
+                                    (concat (s-join "\n" (-take lsp-signature-doc-lines (s-lines docs)))
+                                            (propertize "\nTruncated..." 'face 'highlight))
+                                  docs)))))))
+      (when (and active-parameter? (not (seq-empty-p parameters?)))
+        (-when-let* ((param (when (and (< -1 active-parameter? (length parameters?)))
+                              (seq-elt parameters? active-parameter?)))
+                     (selected-param-label (let ((label (lsp:parameter-information-label param)))
+                                             (if (stringp label) label (append label nil))))
+                     (start (if (stringp selected-param-label)
+                                (s-index-of selected-param-label label)
+                              (cl-first selected-param-label)))
+                     (end (if (stringp selected-param-label)
+                              (+ start (length selected-param-label))
+                            (cl-second selected-param-label))))
+          (add-face-text-property start end 'eldoc-highlight-function-argument nil label)))
+      (concat prefix label method-docs))))
+
+(defun lsp-signature ()
+  "Display signature info (based on `textDocument/signatureHelp')"
+  (if (and lsp--signature-last-buffer
+           (not (equal (current-buffer) lsp--signature-last-buffer)))
+      (lsp-signature-stop)
+    (lsp-request-async "textDocument/signatureHelp"
+                       (lsp--text-document-position-params)
+                       #'lsp--handle-signature-update
+                       :cancel-token :signature)))
+
+
+(defcustom lsp-overlay-document-color-char "■"
+  "Display the char represent the document color in overlay"
+  :type 'string
+  :group 'lsp-mode)
+
+;; color presentation
+(defun lsp--color-create-interactive-command (color range)
+  (lambda ()
+    (interactive)
+    (-let [(&ColorPresentation? :text-edit?
+                                :additional-text-edits?)
+           (lsp--completing-read
+            "Select color presentation: "
+            (lsp-request
+             "textDocument/colorPresentation"
+             `( :textDocument ,(lsp--text-document-identifier)
+                :color ,color
+                :range ,range))
+            #'lsp:color-presentation-label
+            nil
+            t)]
+      (when text-edit?
+        (lsp--apply-text-edit text-edit?))
+      (when additional-text-edits?
+        (lsp--apply-text-edits additional-text-edits? 'color-presentation)))))
+
+(defun lsp--number->color (number)
+  (let ((result (format "%x"
+                        (round (* (or number 0) 255.0)))))
+    (if (= 1 (length result))
+        (concat "0" result)
+      result)))
+
+(defun lsp--document-color ()
+  "Document color handler."
+  (when (lsp-feature? "textDocument/documentColor")
+    (lsp-request-async
+     "textDocument/documentColor"
+     `(:textDocument ,(lsp--text-document-identifier))
+     (lambda (result)
+       (lsp--remove-overlays 'lsp-color)
+       (seq-do
+        (-lambda ((&ColorInformation :color (color &as &Color :red :green :blue)
+                                     :range))
+          (-let* (((beg . end) (lsp--range-to-region range))
+                  (overlay (make-overlay beg end))
+                  (command (lsp--color-create-interactive-command color range)))
+            (overlay-put overlay 'lsp-color t)
+            (overlay-put overlay 'evaporate t)
+            (overlay-put overlay
+                         'before-string
+                         (propertize
+                          lsp-overlay-document-color-char
+                          'face `((:foreground ,(format
+                                                 "#%s%s%s"
+                                                 (lsp--number->color red)
+                                                 (lsp--number->color green)
+                                                 (lsp--number->color blue))))
+                          'action command
+                          'mouse-face 'lsp-lens-mouse-face
+                          'local-map (-doto (make-sparse-keymap)
+                                       (define-key [mouse-1] command))))))
+        result))
+     :mode 'unchanged
+     :cancel-token :document-color-token)))
+
+
+
+(defun lsp--action-trigger-parameter-hints (_command)
+  "Handler for editor.action.triggerParameterHints."
+  (when (member :on-server-request lsp-signature-auto-activate)
+    (lsp-signature-activate)))
+
+(defun lsp--action-trigger-suggest (_command)
+  "Handler for editor.action.triggerSuggest."
+  (cond
+   ((and (bound-and-true-p company-mode)
+         (fboundp 'company-auto-begin)
+         (fboundp 'company-post-command))
+    (run-at-time 0 nil
+                 (lambda ()
+                   (let ((this-command 'company-idle-begin)
+                         (company-minimum-prefix-length 0))
+                     (company-auto-begin)
+                     (company-post-command)))))
+   (t
+    (completion-at-point))))
+
+(defconst lsp--default-action-handlers
+  (ht ("editor.action.triggerParameterHints" #'lsp--action-trigger-parameter-hints)
+      ("editor.action.triggerSuggest" #'lsp--action-trigger-suggest))
+  "Default action handlers.")
+
+(defun lsp--find-action-handler (command)
+  "Find action handler for particular COMMAND."
+  (or
+   (--some (-some->> it
+             (lsp--workspace-client)
+             (lsp--client-action-handlers)
+             (gethash command))
+           (lsp-workspaces))
+   (gethash command lsp--default-action-handlers)))
+
+(defun lsp--text-document-code-action-params (&optional kind)
+  "Code action params."
+  (list :textDocument (lsp--text-document-identifier)
+        :range (if (use-region-p)
+                   (lsp--region-to-range (region-beginning) (region-end))
+                 (lsp--region-to-range (point) (point)))
+        :context `( :diagnostics ,(lsp-cur-possition-diagnostics)
+                    ,@(when kind (list :only (vector kind))))))
+
+(defun lsp-code-actions-at-point (&optional kind)
+  "Retrieve the code actions for the active region or the current line.
+It will filter by KIND if non nil."
+  (lsp-request "textDocument/codeAction" (lsp--text-document-code-action-params kind)))
+
+(defun lsp-execute-code-action-by-kind (command-kind)
+  "Execute code action by COMMAND-KIND."
+  (if-let ((action (->> (lsp-get-or-calculate-code-actions command-kind)
+                        (-filter (-lambda ((&CodeAction :kind?))
+                                   (and kind? (s-prefix? command-kind kind?))))
+                        lsp--select-action)))
+      (lsp-execute-code-action action)
+    (signal 'lsp-no-code-actions '(command-kind))))
+
+(defalias 'lsp-get-or-calculate-code-actions 'lsp-code-actions-at-point)
+
+(lsp-defun lsp--execute-command ((action &as &Command :command :arguments?))
+  "Parse and execute a code ACTION represented as a Command LSP type."
+  (let ((server-id (->> (lsp-workspaces)
+                        (cl-first)
+                        (or lsp--cur-workspace)
+                        (lsp--workspace-client)
+                        (lsp--client-server-id))))
+    (condition-case nil
+        (with-no-warnings
+          (lsp-execute-command server-id (intern command) arguments?))
+      (cl-no-applicable-method
+       (if-let ((action-handler (lsp--find-action-handler command)))
+           (funcall action-handler action)
+         (lsp-send-execute-command command arguments?))))))
+
+(lsp-defun lsp-execute-code-action ((action &as &CodeAction :command? :edit?))
+  "Execute code action ACTION. For example, when text under the
+caret has a suggestion to apply a fix from an lsp-server, calling
+this function will do so.
+If ACTION is not set it will be selected from `lsp-code-actions-at-point'.
+Request codeAction/resolve for more info if server supports."
+  (interactive (list (lsp--select-action (lsp-code-actions-at-point))))
+  (if (and (lsp-feature? "codeAction/resolve")
+           (not command?)
+           (not edit?))
+      (lsp--execute-code-action (lsp-request "codeAction/resolve" action))
+    (lsp--execute-code-action action)))
+
+(lsp-defun lsp--execute-code-action ((action &as &CodeAction :command? :edit?))
+  "Execute code action ACTION."
+  (when edit?
+    (lsp--apply-workspace-edit edit? 'code-action))
+
+  (cond
+   ((stringp command?) (lsp--execute-command action))
+   ((lsp-command? command?) (progn
+                              (when-let ((action-filter (->> (lsp-workspaces)
+                                                             (cl-first)
+                                                             (or lsp--cur-workspace)
+                                                             (lsp--workspace-client)
+                                                             (lsp--client-action-filter))))
+                                (funcall action-filter command?))
+                              (lsp--execute-command command?)))))
+
+(lsp-defun lsp-fix-code-action-booleans ((&Command :arguments?) boolean-action-arguments)
+  "Patch incorrect boolean argument values in the provided `CodeAction' command
+in place, based on the BOOLEAN-ACTION-ARGUMENTS list. The values
+in this list can be either symbols or lists of symbols that
+represent paths to boolean arguments in code actions:
+
+> (lsp-fix-code-action-booleans command `(:foo :bar (:some :nested :boolean)))
+
+When there are available code actions, the server sends
+`lsp-mode' a list of possible command names and arguments as
+JSON. `lsp-mode' parses all boolean false values as `nil'. As a
+result code action arguments containing falsy values don't
+roundtrip correctly because `lsp-mode' will end up sending null
+values back to the client. This list makes it possible to
+selectively transform `nil' values back into `:json-false'."
+  (seq-doseq (path boolean-action-arguments)
+    (seq-doseq (args arguments?)
+      (lsp--fix-nested-boolean args (if (listp path) path (list path))))))
+
+(defun lsp--fix-nested-boolean (structure path)
+  "Traverse STRUCTURE using the paths from the PATH list, changing the value to
+`:json-false' if it was `nil'. PATH should be a list containing
+one or more symbols, and STRUCTURE should be compatible with
+`lsp-member?', `lsp-get', and `lsp-put'."
+  (let ((key (car path))
+        (rest (cdr path)))
+    (if (null rest)
+        ;; `lsp-put' returns `nil' both when the key doesn't exist and when the
+        ;; value is `nil', so we need to explicitly check its presence here
+        (when (and (lsp-member? structure key) (not (lsp-get structure key)))
+          (lsp-put structure key :json-false))
+      ;; If `key' does not exist, then we'll silently ignore it
+      (when-let ((child (lsp-get structure key)))
+        (lsp--fix-nested-boolean child rest)))))
+
+(defvar lsp--formatting-indent-alist
+  ;; Taken from `dtrt-indent-mode'
+  '(
+    (ada-mode                   . ada-indent)                       ; Ada
+    (ada-ts-mode                . ada-ts-mode-indent-offset)
+    (c++-mode                   . c-basic-offset)                   ; C++
+    (c++-ts-mode                . c-ts-mode-indent-offset)
+    (c-mode                     . c-basic-offset)                   ; C
+    (c-ts-mode                  . c-ts-mode-indent-offset)
+    (cperl-mode                 . cperl-indent-level)               ; Perl
+    (crystal-mode               . crystal-indent-level)             ; Crystal (Ruby)
+    (csharp-mode                . c-basic-offset)                   ; C#
+    (csharp-tree-sitter-mode    . csharp-tree-sitter-indent-offset) ; C#
+    (csharp-ts-mode             . csharp-ts-mode-indent-offset)     ; C# (tree-sitter, Emacs29)
+    (css-mode                   . css-indent-offset)                ; CSS
+    (d-mode                     . c-basic-offset)                   ; D
+    (enh-ruby-mode              . enh-ruby-indent-level)            ; Ruby
+    (erlang-mode                . erlang-indent-level)              ; Erlang
+    (ess-mode                   . ess-indent-offset)                ; ESS (R)
+    (go-ts-mode                 . go-ts-mode-indent-offset)
+    (gpr-mode                   . gpr-indent-offset)                ; GNAT Project
+    (gpr-ts-mode                . gpr-ts-mode-indent-offset)
+    (hack-mode                  . hack-indent-offset)               ; Hack
+    (java-mode                  . c-basic-offset)                   ; Java
+    (java-ts-mode               . java-ts-mode-indent-offset)
+    (jde-mode                   . c-basic-offset)                   ; Java (JDE)
+    (js-mode                    . js-indent-level)                  ; JavaScript
+    (js-ts-mode                 . js-indent-level)
+    (js2-mode                   . js2-basic-offset)                 ; JavaScript-IDE
+    (js3-mode                   . js3-indent-level)                 ; JavaScript-IDE
+    (json-mode                  . js-indent-level)                  ; JSON
+    (json-ts-mode               . json-ts-mode-indent-offset)
+    (lua-mode                   . lua-indent-level)                 ; Lua
+    (lua-ts-mode                . lua-ts-indent-offset)
+    (nxml-mode                  . nxml-child-indent)                ; XML
+    (objc-mode                  . c-basic-offset)                   ; Objective C
+    (pascal-mode                . pascal-indent-level)              ; Pascal
+    (perl-mode                  . perl-indent-level)                ; Perl
+    (php-mode                   . c-basic-offset)                   ; PHP
+    (php-ts-mode                . php-ts-mode-indent-offset)        ; PHP
+    (powershell-mode            . powershell-indent)                ; PowerShell
+    (powershell-ts-mode         . powershell-ts-mode-indent-offset) ; PowerShell
+    (raku-mode                  . raku-indent-offset)               ; Perl6/Raku
+    (ruby-mode                  . ruby-indent-level)                ; Ruby
+    (rust-mode                  . rust-indent-offset)               ; Rust
+    (rust-ts-mode               . rust-ts-mode-indent-offset)
+    (rustic-mode                . rustic-indent-offset)             ; Rust
+    (scala-mode                 . scala-indent:step)                ; Scala
+    (sgml-mode                  . sgml-basic-offset)                ; SGML
+    (sh-mode                    . sh-basic-offset)                  ; Shell Script
+    (toml-ts-mode               . toml-ts-mode-indent-offset)
+    (typescript-mode            . typescript-indent-level)          ; Typescript
+    (typescript-ts-mode         . typescript-ts-mode-indent-offset) ; Typescript (tree-sitter, Emacs29)
+    (yaml-mode                  . yaml-indent-offset)               ; YAML
+    (yang-mode                  . c-basic-offset)                   ; YANG (yang-mode)
+
+    (default                    . standard-indent))                 ; default fallback
+  "A mapping from `major-mode' to its indent variable.")
+
+(defun lsp--get-indent-width (mode)
+  "Get indentation offset for MODE."
+  (or (alist-get mode lsp--formatting-indent-alist)
+      (lsp--get-indent-width (or (get mode 'derived-mode-parent) 'default))))
+
+(defun lsp--make-document-formatting-params ()
+  "Create document formatting params."
+  (lsp-make-document-formatting-params
+   :text-document (lsp--text-document-identifier)
+   :options (lsp-make-formatting-options
+             :tab-size (symbol-value (lsp--get-indent-width major-mode))
+             :insert-spaces (lsp-json-bool (not indent-tabs-mode))
+             :trim-trailing-whitespace? (lsp-json-bool lsp-trim-trailing-whitespace)
+             :insert-final-newline? (lsp-json-bool lsp-insert-final-newline)
+             :trim-final-newlines? (lsp-json-bool lsp-trim-final-newlines))))
+
+(defun lsp-format-buffer ()
+  "Ask the server to format this document."
+  (interactive "*")
+  (cond ((lsp-feature? "textDocument/formatting")
+         (let ((edits (lsp-request "textDocument/formatting"
+                                   (lsp--make-document-formatting-params))))
+           (if (seq-empty-p edits)
+               (lsp--info "No formatting changes provided")
+             (lsp--apply-text-edits edits 'format))))
+        ((lsp-feature? "textDocument/rangeFormatting")
+         (save-restriction
+           (widen)
+           (lsp-format-region (point-min) (point-max))))
+        (t (signal 'lsp-capability-not-supported (list "documentFormattingProvider")))))
+
+(defun lsp-format-region (s e)
+  "Ask the server to format the region, or if none is selected, the current line."
+  (interactive "r")
+  (let ((edits (lsp-request
+                "textDocument/rangeFormatting"
+                (lsp--make-document-range-formatting-params s e))))
+    (if (seq-empty-p edits)
+        (lsp--info "No formatting changes provided")
+      (lsp--apply-text-edits edits 'format))))
+
+(defmacro lsp-make-interactive-code-action (func-name code-action-kind)
+  "Define an interactive function FUNC-NAME that attempts to
+execute a CODE-ACTION-KIND action."
+  `(defun ,(intern (concat "lsp-" (symbol-name func-name))) ()
+     ,(format "Perform the %s code action, if available." code-action-kind)
+     (interactive)
+     ;; Even when `lsp-auto-execute-action' is nil, it still makes sense to
+     ;; auto-execute here: the user has specified exactly what they want.
+     (let ((lsp-auto-execute-action t))
+       (condition-case nil
+           (lsp-execute-code-action-by-kind ,code-action-kind)
+         (lsp-no-code-actions
+          (when (called-interactively-p 'any)
+            (lsp--info ,(format "%s action not available" code-action-kind))))))))
+
+(lsp-make-interactive-code-action organize-imports "source.organizeImports")
+
+(defun lsp--make-document-range-formatting-params (start end)
+  "Make DocumentRangeFormattingParams for selected region."
+  (lsp:set-document-range-formatting-params-range (lsp--make-document-formatting-params)
+                                                  (lsp--region-to-range start end)))
+
+(defconst lsp--highlight-kind-face
+  '((1 . lsp-face-highlight-textual)
+    (2 . lsp-face-highlight-read)
+    (3 . lsp-face-highlight-write)))
+
+(defun lsp--remove-overlays (name)
+  (save-restriction
+    (widen)
+    (remove-overlays (point-min) (point-max) name t)))
+
+(defun lsp-document-highlight ()
+  "Highlight all relevant references to the symbol under point."
+  (interactive)
+  (lsp--remove-overlays 'lsp-highlight) ;; clear any previous highlights
+  (setq lsp--have-document-highlights nil
+        lsp--symbol-bounds-of-last-highlight-invocation nil)
+  (let ((lsp-enable-symbol-highlighting t))
+    (lsp--document-highlight)))
+
+(defun lsp--document-highlight-callback (highlights)
+  "Create a callback to process the reply of a
+`textDocument/documentHighlight' message for the buffer BUF.
+A reference is highlighted only if it is visible in a window."
+  (lsp--remove-overlays 'lsp-highlight)
+
+  (let* ((wins-visible-pos (-map (lambda (win)
+                                   (cons (1- (line-number-at-pos (window-start win) t))
+                                         (1+ (line-number-at-pos (window-end win) t))))
+                                 (get-buffer-window-list nil nil 'visible))))
+    (setq lsp--have-document-highlights t)
+    (-map
+     (-lambda ((&DocumentHighlight :range (&Range :start (start &as &Position :line start-line)
+                                                  :end (end &as &Position :line end-line))
+                                   :kind?))
+       (-map
+        (-lambda ((start-window . end-window))
+          ;; Make the overlay only if the reference is visible
+          (when (and (> (1+ start-line) start-window)
+                     (< (1+ end-line) end-window))
+            (let ((start-point (lsp--position-to-point start))
+                  (end-point (lsp--position-to-point end)))
+              (when (not (and lsp-symbol-highlighting-skip-current
+                              (<= start-point (point) end-point)))
+                (-doto (make-overlay start-point end-point)
+                  (overlay-put 'face (cdr (assq (or kind? 1) lsp--highlight-kind-face)))
+                  (overlay-put 'lsp-highlight t))))))
+        wins-visible-pos))
+     highlights)))
+
+(defcustom lsp-symbol-kinds
+  '((1 . "File")
+    (2 . "Module")
+    (3 . "Namespace")
+    (4 . "Package")
+    (5 . "Class")
+    (6 . "Method")
+    (7 . "Property")
+    (8 . "Field")
+    (9 . "Constructor")
+    (10 . "Enum")
+    (11 . "Interface")
+    (12 . "Function")
+    (13 . "Variable")
+    (14 . "Constant")
+    (15 . "String")
+    (16 . "Number")
+    (17 . "Boolean")
+    (18 . "Array")
+    (19 . "Object")
+    (20 . "Key")
+    (21 . "Null")
+    (22 . "Enum Member")
+    (23 . "Struct")
+    (24 . "Event")
+    (25 . "Operator")
+    (26 . "Type Parameter"))
+  "Alist mapping SymbolKinds to human-readable strings.
+Various Symbol objects in the LSP protocol have an integral type,
+specifying what they are. This alist maps such type integrals to
+readable representations of them. See
+`https://microsoft.github.io/language-server-protocol/specifications/specification-current/',
+namespace SymbolKind."
+  :group 'lsp-mode
+  :type '(alist :key-type integer :value-type string))
+(defalias 'lsp--symbol-kind 'lsp-symbol-kinds)
+
+(lsp-defun lsp--symbol-information-to-xref
+  ((&SymbolInformation :kind :name
+                       :location (&Location :uri :range (&Range :start
+                                                                (&Position :line :character)))))
+  "Return a `xref-item' from SYMBOL information."
+  (xref-make (format "[%s] %s" (alist-get kind lsp-symbol-kinds) name)
+             (xref-make-file-location (lsp--uri-to-path uri)
+                                      line
+                                      character)))
+
+(defun lsp--get-document-symbols ()
+  "Get document symbols.
+
+If the buffer has not been modified since symbols were last
+retrieved, simply return the latest result.
+
+Else, if the request was initiated by Imenu updating its menu-bar
+entry, perform it asynchronously; i.e., give Imenu the latest
+result and then force a refresh when a new one is available.
+
+Else (e.g., due to interactive use of `imenu' or `xref'),
+perform the request synchronously."
+  (if (= (buffer-chars-modified-tick) lsp--document-symbols-tick)
+      lsp--document-symbols
+    (let ((method "textDocument/documentSymbol")
+          (params `(:textDocument ,(lsp--text-document-identifier)))
+          (tick (buffer-chars-modified-tick)))
+      (if (not lsp--document-symbols-request-async)
+          (prog1
+              (setq lsp--document-symbols (lsp-request method params))
+            (setq lsp--document-symbols-tick tick))
+        (lsp-request-async method params
+                           (lambda (document-symbols)
+                             (setq lsp--document-symbols document-symbols
+                                   lsp--document-symbols-tick tick)
+                             (lsp--imenu-refresh))
+                           :mode 'alive
+                           :cancel-token :document-symbols)
+        lsp--document-symbols))))
+
+(advice-add 'imenu-update-menubar :around
+            (lambda (oldfun &rest r)
+              (let ((lsp--document-symbols-request-async t))
+                (apply oldfun r))))
+
+(defun lsp--document-symbols->document-symbols-hierarchy (document-symbols current-position)
+  "Convert DOCUMENT-SYMBOLS to symbols hierarchy on CURRENT-POSITION."
+  (-let (((symbol &as &DocumentSymbol? :children?)
+          (seq-find (-lambda ((&DocumentSymbol :range))
+                      (lsp-point-in-range? current-position range))
+                    document-symbols)))
+    (if children?
+        (cons symbol (lsp--document-symbols->document-symbols-hierarchy children? current-position))
+      (when symbol
+        (list symbol)))))
+
+(lsp-defun lsp--symbol-information->document-symbol ((&SymbolInformation :name :kind :location :container-name? :deprecated?))
+  "Convert a SymbolInformation to a DocumentInformation"
+  (lsp-make-document-symbol :name name
+                            :kind kind
+                            :range (lsp:location-range location)
+                            :children? nil
+                            :deprecated? deprecated?
+                            :selection-range (lsp:location-range location)
+                            :detail? container-name?))
+
+(defun lsp--symbols-informations->document-symbols-hierarchy (symbols-informations current-position)
+  "Convert SYMBOLS-INFORMATIONS to symbols hierarchy on CURRENT-POSITION."
+  (--> symbols-informations
+    (-keep (-lambda ((symbol &as &SymbolInformation :location (&Location :range)))
+             (when (lsp-point-in-range? current-position range)
+               (lsp--symbol-information->document-symbol symbol)))
+           it)
+    (sort it (-lambda ((&DocumentSymbol :range (&Range :start a-start-position :end a-end-position))
+                       (&DocumentSymbol :range (&Range :start b-start-position :end b-end-position)))
+               (and (lsp--position-compare b-start-position a-start-position)
+                    (lsp--position-compare a-end-position b-end-position))))))
+
+(defun lsp--symbols->document-symbols-hierarchy (symbols)
+  "Convert SYMBOLS to symbols-hierarchy."
+  (when-let ((first-symbol (lsp-seq-first symbols)))
+    (let ((cur-position (lsp-make-position :line (plist-get (lsp--cur-position) :line)
+                                           :character (plist-get (lsp--cur-position) :character))))
+      (if (lsp-symbol-information? first-symbol)
+          (lsp--symbols-informations->document-symbols-hierarchy symbols cur-position)
+        (lsp--document-symbols->document-symbols-hierarchy symbols cur-position)))))
+
+(defun lsp--xref-backend () 'xref-lsp)
+
+(cl-defmethod xref-backend-identifier-at-point ((_backend (eql xref-lsp)))
+  (propertize (or (thing-at-point 'symbol) "")
+              'identifier-at-point t))
+
+(defun lsp--xref-elements-index (symbols path)
+  (-mapcat
+   (-lambda (sym)
+     (pcase-exhaustive sym
+       ((lsp-interface DocumentSymbol :name :children? :selection-range (lsp-interface Range :start))
+        (cons (cons (concat path name)
+                    (lsp--position-to-point start))
+              (lsp--xref-elements-index children? (concat path name " / "))))
+       ((lsp-interface SymbolInformation :name :location (lsp-interface Location :range (lsp-interface Range :start)))
+        (list (cons (concat path name)
+                    (lsp--position-to-point start))))))
+   symbols))
+
+(defvar-local lsp--symbols-cache nil)
+
+(cl-defmethod xref-backend-identifier-completion-table ((_backend (eql xref-lsp)))
+  (if (lsp--find-workspaces-for "textDocument/documentSymbol")
+      (progn
+        (setq lsp--symbols-cache (lsp--xref-elements-index
+                                  (lsp--get-document-symbols) nil))
+        lsp--symbols-cache)
+    (list (propertize (or (thing-at-point 'symbol) "")
+                      'identifier-at-point t))))
+
+(cl-defmethod xref-backend-definitions ((_backend (eql xref-lsp)) identifier)
+  (save-excursion
+    (unless (get-text-property 0 'identifier-at-point identifier)
+      (goto-char (cl-rest (or (assoc identifier lsp--symbols-cache)
+                              (user-error "Unable to find symbol %s in current document" identifier)))))
+    (lsp--locations-to-xref-items (lsp-request "textDocument/definition"
+                                               (lsp--text-document-position-params)))))
+
+(cl-defmethod xref-backend-references ((_backend (eql xref-lsp)) identifier)
+  (save-excursion
+    (unless (get-text-property 0 'identifier-at-point identifier)
+      (goto-char (cl-rest (or (assoc identifier lsp--symbols-cache)
+                              (user-error "Unable to find symbol %s" identifier)))))
+    (lsp--locations-to-xref-items (lsp-request "textDocument/references"
+                                               (lsp--make-reference-params nil lsp-references-exclude-definition)))))
+
+(cl-defmethod xref-backend-apropos ((_backend (eql xref-lsp)) pattern)
+  (seq-map #'lsp--symbol-information-to-xref
+           (lsp-request "workspace/symbol" `(:query ,pattern))))
+
+(defcustom lsp-rename-use-prepare t
+  "Whether `lsp-rename' should do a prepareRename first.
+For some language servers, textDocument/prepareRename might be
+too slow, in which case this variable may be set to nil.
+`lsp-rename' will then use `thing-at-point' `symbol' to determine
+the symbol to rename at point."
+  :group 'lsp-mode
+  :type 'boolean)
+
+(defun lsp--get-symbol-to-rename ()
+  "Get a symbol to rename and placeholder at point.
+Returns a cons ((START . END) . PLACEHOLDER?), and nil if
+renaming is generally supported but cannot be done at point.
+START and END are the bounds of the identifiers being renamed,
+while PLACEHOLDER?, is either nil or a string suggested by the
+language server as the initial input of a new-name prompt."
+  (unless (lsp-feature? "textDocument/rename")
+    (error "The connected server(s) doesn't support renaming"))
+  (if (and lsp-rename-use-prepare (lsp-feature? "textDocument/prepareRename"))
+      (when-let ((response
+                  (lsp-request "textDocument/prepareRename"
+                               (lsp--text-document-position-params))))
+        (let* ((bounds (lsp--range-to-region
+                        (if (lsp-range? response)
+                            response
+                          (lsp:prepare-rename-result-range response))))
+               (placeholder
+                (and (not (lsp-range? response))
+                     (lsp:prepare-rename-result-placeholder response))))
+          (cons bounds placeholder)))
+    (when-let ((bounds (bounds-of-thing-at-point 'symbol)))
+      (cons bounds nil))))
+
+(defface lsp-face-rename '((t :underline t))
+  "Face used to highlight the identifier being renamed.
+Renaming can be done using `lsp-rename'."
+  :group 'lsp-mode)
+
+(defface lsp-rename-placeholder-face '((t :inherit font-lock-variable-name-face))
+  "Face used to display the rename placeholder in.
+When calling `lsp-rename' interactively, this will be the face of
+the new name."
+  :group 'lsp-mode)
+
+(defvar lsp-rename-history '()
+  "History for `lsp--read-rename'.")
+
+(defun lsp--read-rename (at-point)
+  "Read a new name for a `lsp-rename' at `point' from the user.
+AT-POINT shall be a structure as returned by
+`lsp--get-symbol-to-rename'.
+
+Returns a string, which should be the new name for the identifier
+at point. If renaming cannot be done at point (as determined from
+AT-POINT), throw a `user-error'.
+
+This function is for use in `lsp-rename' only, and shall not be
+relied upon."
+  (unless at-point
+    (user-error "`lsp-rename' is invalid here"))
+  (-let* ((((start . end) . placeholder?) at-point)
+          ;; Do the `buffer-substring' first to not include `lsp-face-rename'
+          (rename-me (buffer-substring start end))
+          (placeholder (or placeholder? rename-me))
+          (placeholder (propertize placeholder 'face 'lsp-rename-placeholder-face))
+
+          overlay)
+    ;; We need unwind protect, as the user might cancel here, causing the
+    ;; overlay to linger.
+    (unwind-protect
+        (progn
+          (setq overlay (make-overlay start end))
+          (overlay-put overlay 'face 'lsp-face-rename)
+
+          (read-string (format "Rename %s to: " rename-me) placeholder
+                       'lsp-rename-history))
+      (and overlay (delete-overlay overlay)))))
+
+(defun lsp-rename (newname)
+  "Rename the symbol (and all references to it) under point to NEWNAME."
+  (interactive (list (lsp--read-rename (lsp--get-symbol-to-rename))))
+  (when-let ((edits (lsp-request "textDocument/rename"
+                                 `( :textDocument ,(lsp--text-document-identifier)
+                                    :position ,(lsp--cur-position)
+                                    :newName ,newname))))
+    (lsp--apply-workspace-edit edits 'rename)))
+
+(defun lsp--on-rename-file (old-func old-name new-name &optional ok-if-already-exists?)
+  "Advice around function `rename-file'.
+Applies OLD-FUNC with OLD-NAME, NEW-NAME and OK-IF-ALREADY-EXISTS?.
+
+This advice sends workspace/willRenameFiles before renaming file
+to check if server wants to apply any workspaceEdits after renamed."
+  (if (and lsp-apply-edits-after-file-operations
+           (lsp--send-will-rename-files-p old-name))
+      (let ((params (lsp-make-rename-files-params
+                     :files (vector (lsp-make-file-rename
+                                     :oldUri (lsp--path-to-uri old-name)
+                                     :newUri (lsp--path-to-uri new-name))))))
+        (when-let ((edits (lsp-request "workspace/willRenameFiles" params)))
+          (lsp--apply-workspace-edit edits 'rename-file)
+          (funcall old-func old-name new-name ok-if-already-exists?)
+          (when (lsp--send-did-rename-files-p)
+            (lsp-notify "workspace/didRenameFiles" params))))
+    (funcall old-func old-name new-name ok-if-already-exists?)))
+
+(advice-add 'rename-file :around #'lsp--on-rename-file)
+
+(defcustom lsp-xref-force-references nil
+  "If non-nil threat everything as references(e. g. jump if only one item.)"
+  :group 'lsp-mode
+  :type 'boolean)
+
+(defun lsp-show-xrefs (xrefs display-action references?)
+  (unless (region-active-p) (push-mark nil t))
+  (if (boundp 'xref-show-definitions-function)
+      (with-no-warnings
+        (xref-push-marker-stack)
+        (funcall (if (and references? (not lsp-xref-force-references))
+                     xref-show-xrefs-function
+                   xref-show-definitions-function)
+                 (-const xrefs)
+                 `((window . ,(selected-window))
+                   (display-action . ,display-action)
+                   ,(if (and references? (not lsp-xref-force-references))
+                        `(auto-jump . ,xref-auto-jump-to-first-xref)
+                      `(auto-jump . ,xref-auto-jump-to-first-definition)))))
+    (xref--show-xrefs xrefs display-action)))
+
+(cl-defmethod seq-empty-p ((ht hash-table))
+  "Function `seq-empty-p' for hash-table."
+  (hash-table-empty-p ht))
+
+(cl-defun lsp-find-locations (method &optional extra &key display-action references?)
+  "Send request named METHOD and get cross references of the symbol under point.
+EXTRA is a plist of extra parameters.
+REFERENCES? t when METHOD returns references."
+  (let ((loc (lsp-request method
+                          (append (lsp--text-document-position-params) extra))))
+    (if (seq-empty-p loc)
+        (lsp--error "Not found for: %s" (or (thing-at-point 'symbol t) ""))
+      (lsp-show-xrefs (lsp--locations-to-xref-items loc) display-action references?))))
+
+(cl-defun lsp-find-declaration (&key display-action)
+  "Find declarations of the symbol under point."
+  (interactive)
+  (lsp-find-locations "textDocument/declaration" nil :display-action display-action))
+
+(cl-defun lsp-find-definition (&key display-action)
+  "Find definitions of the symbol under point."
+  (interactive)
+  (lsp-find-locations "textDocument/definition" nil :display-action display-action))
+
+(defun lsp-find-definition-mouse (click)
+  "Click to start `lsp-find-definition' at clicked point."
+  (interactive "e")
+  (let* ((ec (event-start click))
+         (p1 (posn-point ec))
+         (w1 (posn-window ec)))
+    (select-window w1)
+    (goto-char p1)
+    (lsp-find-definition)))
+
+(cl-defun lsp-find-implementation (&key display-action)
+  "Find implementations of the symbol under point."
+  (interactive)
+  (lsp-find-locations "textDocument/implementation"
+                      nil
+                      :display-action display-action
+                      :references? t))
+
+(cl-defun lsp-find-references (&optional exclude-declaration &key display-action)
+  "Find references of the symbol under point."
+  (interactive "P")
+  (lsp-find-locations "textDocument/references"
+                      (list :context `(:includeDeclaration ,(lsp-json-bool (not (or exclude-declaration lsp-references-exclude-definition)))))
+                      :display-action display-action
+                      :references? t))
+
+(cl-defun lsp-find-type-definition (&key display-action)
+  "Find type definitions of the symbol under point."
+  (interactive)
+  (lsp-find-locations "textDocument/typeDefinition" nil :display-action display-action))
+
+(defalias 'lsp-find-custom #'lsp-find-locations)
+(defalias 'lsp-goto-implementation #'lsp-find-implementation)
+(defalias 'lsp-goto-type-definition #'lsp-find-type-definition)
+
+(with-eval-after-load 'evil
+  (evil-set-command-property 'lsp-find-definition :jump t)
+  (evil-set-command-property 'lsp-find-implementation :jump t)
+  (evil-set-command-property 'lsp-find-references :jump t)
+  (evil-set-command-property 'lsp-find-type-definition :jump t))
+
+(defun lsp--workspace-method-supported? (check-command method capability workspace)
+  (with-lsp-workspace workspace
+    (if check-command
+        (funcall check-command workspace)
+      (or
+       (when capability (lsp--capability capability))
+       (lsp--registered-capability method)
+       (and (not capability) (not check-command))))))
+
+(defun lsp-disable-method-for-server (method server-id)
+  "Disable METHOD for SERVER-ID."
+  (cl-callf
+      (lambda (reqs)
+        (-let (((&plist :check-command :capability) reqs))
+          (list :check-command
+                (lambda (workspace)
+                  (unless (-> workspace
+                              lsp--workspace-client
+                              lsp--client-server-id
+                              (eq server-id))
+                    (lsp--workspace-method-supported? check-command
+                                                      method
+                                                      capability
+                                                      workspace))))))
+      (alist-get method lsp-method-requirements nil nil 'string=)))
+
+(defun lsp--find-workspaces-for (msg-or-method)
+  "Find all workspaces in the current project that can handle MSG."
+  (let ((method (if (stringp msg-or-method)
+                    msg-or-method
+                  (plist-get msg-or-method :method))))
+    (-if-let (reqs (cdr (assoc method lsp-method-requirements)))
+        (-let (((&plist :capability :check-command) reqs))
+          (-filter
+           (-partial #'lsp--workspace-method-supported?
+                     check-command method capability)
+           (lsp-workspaces)))
+      (lsp-workspaces))))
+
+(defun lsp-can-execute-command? (command-name)
+  "Returns non-nil if current language server(s) can execute COMMAND-NAME.
+The command is executed via `workspace/executeCommand'"
+  (cl-position
+   command-name
+   (lsp:execute-command-options-commands
+    (lsp:server-capabilities-execute-command-provider?
+     (lsp--server-capabilities)))
+   :test #'equal))
+
+(defalias 'lsp-feature? 'lsp--find-workspaces-for)
+
+(cl-defmethod lsp-execute-command (_server _command _arguments)
+  "Dispatch COMMAND execution."
+  (signal 'cl-no-applicable-method nil))
+
+(defun lsp-workspace-command-execute (command &optional args)
+  "Execute workspace COMMAND with ARGS."
+  (condition-case-unless-debug err
+      (let ((params (if args
+                        (list :command command :arguments args)
+                      (list :command command))))
+        (lsp-request "workspace/executeCommand" params))
+    (error
+     (error "`workspace/executeCommand' with `%s' failed.\n\n%S"
+            command err))))
+
+(defun lsp-send-execute-command (command &optional args)
+  "Create and send a `workspace/executeCommand' message having command COMMAND
+and optional ARGS."
+  (lsp-workspace-command-execute command args))
+
+(defalias 'lsp-point-to-position #'lsp--point-to-position)
+(defalias 'lsp-text-document-identifier #'lsp--text-document-identifier)
+(defalias 'lsp--send-execute-command #'lsp-send-execute-command)
+(defalias 'lsp-on-open #'lsp--text-document-did-open)
+(defalias 'lsp-on-save #'lsp--text-document-did-save)
+
+(defun lsp--set-configuration (settings)
+  "Set the SETTINGS for the lsp server."
+  (lsp-notify "workspace/didChangeConfiguration" `(:settings ,settings)))
+
+(defun lsp-current-buffer ()
+  (or lsp--virtual-buffer
+      (current-buffer)))
+
+(defun lsp-buffer-live-p (buffer-id)
+  (if-let ((buffer-live (plist-get buffer-id :buffer-live?)))
+      (funcall buffer-live buffer-id)
+    (buffer-live-p buffer-id)))
+
+(defun lsp--on-set-visited-file-name (old-func &rest args)
+  "Advice around function `set-visited-file-name'.
+
+This advice sends textDocument/didClose for the old file and
+textDocument/didOpen for the new file."
+  (when lsp--cur-workspace
+    (lsp--text-document-did-close t))
+  (prog1 (apply old-func args)
+    (when lsp--cur-workspace
+      (lsp--text-document-did-open))))
+
+(advice-add 'set-visited-file-name :around #'lsp--on-set-visited-file-name)
+
+(defcustom lsp-flush-delayed-changes-before-next-message t
+  "If non-nil send the document changes update before sending other messages.
+
+If nil, and `lsp-debounce-full-sync-notifications' is non-nil,
+ change notifications will be throttled by
+ `lsp-debounce-full-sync-notifications-interval' regardless of
+ other messages."
+  :group 'lsp-mode
+  :type 'boolean)
+
+(defvar lsp--not-flushing-delayed-changes t)
+
+(defun lsp--send-no-wait (message proc)
+  "Send MESSAGE to PROC without waiting for further output."
+
+  (when (and lsp--not-flushing-delayed-changes
+             lsp-flush-delayed-changes-before-next-message)
+    (let ((lsp--not-flushing-delayed-changes nil))
+      (lsp--flush-delayed-changes)))
+  (lsp-process-send proc message))
+
+(define-error 'lsp-parse-error
+  "Error parsing message from language server" 'lsp-error)
+(define-error 'lsp-unknown-message-type
+  "Unknown message type" '(lsp-error lsp-parse-error))
+(define-error 'lsp-unknown-json-rpc-version
+  "Unknown JSON-RPC protocol version" '(lsp-error lsp-parse-error))
+(define-error 'lsp-no-content-length
+  "Content-Length header missing in message" '(lsp-error lsp-parse-error))
+(define-error 'lsp-invalid-header-name
+  "Invalid header name" '(lsp-error lsp-parse-error))
+
+;;  id  method
+;;   x    x     request
+;;   x    .     response
+;;   .    x     notification
+(defun lsp--get-message-type (json-data)
+  "Get the message type from JSON-DATA."
+  (if (lsp:json-message-id? json-data)
+      (if (lsp:json-message-error? json-data)
+          'response-error
+        (if (lsp:json-message-method? json-data)
+            'request
+          'response))
+    'notification))
+
+(defconst lsp--default-notification-handlers
+  (ht ("window/showMessage" #'lsp--window-show-message)
+      ("window/logMessage" #'lsp--window-log-message)
+      ("window/showInputBox" #'lsp--window-show-input-box)
+      ("window/showQuickPick" #'lsp--window-show-quick-pick)
+      ("textDocument/publishDiagnostics" #'lsp--on-diagnostics)
+      ("textDocument/diagnosticsEnd" #'ignore)
+      ("textDocument/diagnosticsBegin" #'ignore)
+      ("telemetry/event" #'ignore)
+      ("$/progress" (lambda (workspace params)
+                      (funcall lsp-progress-function workspace params)))))
+
+(lsp-defun lsp--on-notification (workspace (&JSONNotification :params :method))
+  "Call the appropriate handler for NOTIFICATION."
+  (-let ((client (lsp--workspace-client workspace)))
+    (when (lsp--log-io-p method)
+      (lsp--log-entry-new (lsp--make-log-entry method nil params 'incoming-notif)
+                          lsp--cur-workspace))
+    (if-let ((handler (or (gethash method (lsp--client-notification-handlers client))
+                          (gethash method lsp--default-notification-handlers))))
+        (funcall handler workspace params)
+      (when (and method (not (string-prefix-p "$" method)))
+        (lsp-warn "Unknown notification: %s" method)))))
+
+(lsp-defun lsp--build-workspace-configuration-response ((&ConfigurationParams :items))
+  "Get section configuration.
+PARAMS are the `workspace/configuration' request params"
+  (->> items
+       (-map (-lambda ((&ConfigurationItem :section?))
+               (-let* ((path-parts (split-string section? "\\."))
+                       (path-without-last (s-join "." (-slice path-parts 0 -1)))
+                       (path-parts-len (length path-parts)))
+                 (cond
+                  ((<= path-parts-len 1)
+                   (ht-get (lsp-configuration-section section?)
+                           (car-safe path-parts)
+                           (ht-create)))
+                  ((> path-parts-len 1)
+                   (when-let ((section (lsp-configuration-section path-without-last))
+                              (keys path-parts))
+                     (while (and keys section)
+                       (setf section (ht-get section (pop keys))))
+                     section))))))
+       (apply #'vector)))
+
+(defun lsp--ms-since (timestamp)
+  "Integer number of milliseconds since TIMESTAMP.  Fractions discarded."
+  (floor (* 1000 (float-time (time-since timestamp)))))
+
+(defun lsp--send-request-response (workspace recv-time request response)
+  "Send the RESPONSE for REQUEST in WORKSPACE and log if needed."
+  (-let* (((&JSONResponse :params :method :id) request)
+          (process (lsp--workspace-proc workspace))
+          (response (lsp--make-response id response))
+          (req-entry (and lsp-log-io
+                          (lsp--make-log-entry method id params 'incoming-req)))
+          (resp-entry (and lsp-log-io
+                           (lsp--make-log-entry method id response 'outgoing-resp
+                                                (lsp--ms-since recv-time)))))
+    ;; Send response to the server.
+    (when (lsp--log-io-p method)
+      (lsp--log-entry-new req-entry workspace)
+      (lsp--log-entry-new resp-entry workspace))
+    (lsp--send-no-wait response process)))
+
+(lsp-defun lsp--on-request (workspace (request &as &JSONRequest :params :method))
+  "Call the appropriate handler for REQUEST, and send the return value to the
+server. WORKSPACE is the active workspace."
+  (-let* ((recv-time (current-time))
+          (client (lsp--workspace-client workspace))
+          (buffers (lsp--workspace-buffers workspace))
+          handler
+          (response (cond
+                     ((setq handler (gethash method (lsp--client-request-handlers client) nil))
+                      (funcall handler workspace params))
+                     ((setq handler (gethash method (lsp--client-async-request-handlers client) nil))
+                      (funcall handler workspace params
+                               (-partial #'lsp--send-request-response
+                                         workspace recv-time request))
+                      'delay-response)
+                     ((equal method "client/registerCapability")
+                      (mapc #'lsp--server-register-capability
+                            (lsp:registration-params-registrations params))
+                      (mapc (lambda (buf)
+                              (when (lsp-buffer-live-p buf)
+                                (lsp-with-current-buffer buf
+                                  (lsp-unconfig-buffer)
+                                  (lsp-configure-buffer))))
+                            buffers)
+                      nil)
+                     ((equal method "window/showMessageRequest")
+                      (let ((choice (lsp--window-log-message-request params)))
+                        `(:title ,choice)))
+                     ((equal method "window/showDocument")
+                      (let ((success? (lsp--window-show-document params)))
+                        (lsp-make-show-document-result :success (or success?
+                                                                    :json-false))))
+                     ((equal method "client/unregisterCapability")
+                      (mapc #'lsp--server-unregister-capability
+                            (lsp:unregistration-params-unregisterations params))
+                      (mapc (lambda (buf)
+                              (when (lsp-buffer-live-p buf)
+                                (lsp-with-current-buffer buf
+                                  (lsp-unconfig-buffer)
+                                  (lsp-configure-buffer))))
+                            buffers)
+                      nil)
+                     ((equal method "workspace/applyEdit")
+                      (list :applied (condition-case err
+                                         (prog1 t
+                                           (lsp--apply-workspace-edit (lsp:apply-workspace-edit-params-edit params) 'server-requested))
+                                       (error
+                                        (lsp--error "Failed to apply edits with message %s"
+                                                    (error-message-string err))
+                                        :json-false))))
+                     ((equal method "workspace/configuration")
+                      (with-lsp-workspace workspace
+                        (if-let ((buf (car buffers)))
+                            (lsp-with-current-buffer buf
+                              (lsp--build-workspace-configuration-response params))
+                          (lsp--with-workspace-temp-buffer (lsp--workspace-root workspace)
+                            (lsp--build-workspace-configuration-response params)))))
+                     ((equal method "workspace/workspaceFolders")
+                      (let ((folders (or (-> workspace
+                                             (lsp--workspace-client)
+                                             (lsp--client-server-id)
+                                             (gethash (lsp-session-server-id->folders (lsp-session))))
+                                         (lsp-session-folders (lsp-session)))))
+                        (->> folders
+                             (-distinct)
+                             (-map (lambda (folder)
+                                     (list :uri (lsp--path-to-uri folder))))
+                             (apply #'vector))))
+                     ((equal method "window/workDoneProgress/create")
+                      nil ;; no specific reply, no processing required
+                      )
+                     ((equal method "workspace/semanticTokens/refresh")
+                      (when (and lsp-semantic-tokens-enable
+                                 (fboundp 'lsp--semantic-tokens-on-refresh))
+                        (lsp--semantic-tokens-on-refresh workspace))
+                      nil)
+                     ((equal method "workspace/codeLens/refresh")
+                      (when (and lsp-lens-enable
+                                 (fboundp 'lsp--lens-on-refresh))
+                        (lsp--lens-on-refresh workspace))
+                      nil)
+                     (t (lsp-warn "Unknown request method: %s" method) nil))))
+    ;; Send response to the server.
+    (unless (eq response 'delay-response)
+      (lsp--send-request-response workspace recv-time request response))))
+
+(lsp-defun lsp--error-string ((&JSONError :message :code))
+  "Format ERR as a user friendly string."
+  (format "Error from the Language Server: %s (%s)"
+          message
+          (or (car (alist-get code lsp--errors)) "Unknown error")))
+
+(defun lsp--get-body-length (headers)
+  (let ((content-length (cdr (assoc "Content-Length" headers))))
+    (if content-length
+        (string-to-number content-length)
+
+      ;; This usually means either the server or our parser is
+      ;; screwed up with a previous Content-Length
+      (error "No Content-Length header"))))
+
+(defun lsp--parse-header (s)
+  "Parse string S as a LSP (KEY . VAL) header."
+  (let ((pos (string-match "\:" s))
+        key val)
+    (unless pos
+      (signal 'lsp-invalid-header-name (list s)))
+    (setq key (substring s 0 pos)
+          val (s-trim-left (substring s (+ 1 pos))))
+    (when (equal key "Content-Length")
+      (cl-assert (cl-loop for c across val
+                          when (or (> c ?9) (< c ?0)) return nil
+                          finally return t)
+                 nil (format "Invalid Content-Length value: %s" val)))
+    (cons key val)))
+
+(defmacro lsp--read-json (str)
+  "Read json string STR."
+  (if (progn
+        (require 'json)
+        (fboundp 'json-parse-string))
+      `(json-parse-string ,str
+                          :object-type (if lsp-use-plists
+                                           'plist
+                                         'hash-table)
+                          :null-object nil
+                          :false-object nil)
+    `(let ((json-array-type 'vector)
+           (json-object-type (if lsp-use-plists
+                                 'plist
+                               'hash-table))
+           (json-false nil))
+       (json-read-from-string ,str))))
+
+(defmacro lsp-json-read-buffer ()
+  "Read json from the current buffer."
+  (if (progn
+        (require 'json)
+        (fboundp 'json-parse-buffer))
+      `(json-parse-buffer :object-type (if lsp-use-plists
+                                           'plist
+                                         'hash-table)
+                          :null-object nil
+                          :false-object nil)
+    `(let ((json-array-type 'vector)
+           (json-object-type (if lsp-use-plists
+                                 'plist
+                               'hash-table))
+           (json-false nil))
+       (json-read))))
+
+(defun lsp--read-json-file (file-path)
+  "Read json file."
+  (-> file-path
+    (f-read-text)
+    (lsp--read-json)))
+
+(defun lsp--parser-on-message (json-data workspace)
+  "Called when the parser P read a complete MSG from the server."
+  (with-demoted-errors "Error processing message %S."
+    (with-lsp-workspace workspace
+      (let* ((client (lsp--workspace-client workspace))
+             (id (--when-let (lsp:json-response-id json-data)
+                   (if (stringp it) (string-to-number it) it)))
+             (data (lsp:json-response-result json-data)))
+        (pcase (lsp--get-message-type json-data)
+          ('response
+           (cl-assert id)
+           (-let [(callback _ method _ before-send) (gethash id (lsp--client-response-handlers client))]
+             (when (lsp--log-io-p method)
+               (lsp--log-entry-new
+                (lsp--make-log-entry method id data 'incoming-resp
+                                     (lsp--ms-since before-send))
+                workspace))
+             (when callback
+               (remhash id (lsp--client-response-handlers client))
+               (funcall callback (lsp:json-response-result json-data)))))
+          ('response-error
+           (cl-assert id)
+           (-let [(_ callback method _ before-send) (gethash id (lsp--client-response-handlers client))]
+             (when (lsp--log-io-p method)
+               (lsp--log-entry-new
+                (lsp--make-log-entry method id (lsp:json-response-error-error json-data)
+                                     'incoming-resp (lsp--ms-since before-send))
+                workspace))
+             (when callback
+               (remhash id (lsp--client-response-handlers client))
+               (funcall callback (lsp:json-response-error-error json-data)))))
+          ('notification
+           (lsp--on-notification workspace json-data))
+          ('request (lsp--on-request workspace json-data)))))))
+
+(defun lsp--create-filter-function (workspace)
+  "Make filter for the workspace."
+  (let ((body-received 0)
+        leftovers body-length body chunk)
+    (lambda (_proc input)
+      (setf chunk (if (s-blank? leftovers)
+                      input
+                    (concat leftovers input)))
+
+      (let (messages)
+        (while (not (s-blank? chunk))
+          (if (not body-length)
+              ;; Read headers
+              (if-let ((body-sep-pos (string-match-p "\r\n\r\n" chunk)))
+                  ;; We've got all the headers, handle them all at once:
+                  (setf body-length (lsp--get-body-length
+                                     (mapcar #'lsp--parse-header
+                                             (split-string
+                                              (substring-no-properties chunk
+                                                                       (or (string-match-p "Content-Length" chunk)
+                                                                           (error "Unable to find Content-Length header."))
+                                                                       body-sep-pos)
+                                              "\r\n")))
+                        body-received 0
+                        leftovers nil
+                        chunk (substring-no-properties chunk (+ body-sep-pos 4)))
+
+                ;; Haven't found the end of the headers yet. Save everything
+                ;; for when the next chunk arrives and await further input.
+                (setf leftovers chunk
+                      chunk nil))
+            (let* ((chunk-length (string-bytes chunk))
+                   (left-to-receive (- body-length body-received))
+                   (this-body (if (< left-to-receive chunk-length)
+                                  (prog1 (substring-no-properties chunk 0 left-to-receive)
+                                    (setf chunk (substring-no-properties chunk left-to-receive)))
+                                (prog1 chunk
+                                  (setf chunk nil))))
+                   (body-bytes (string-bytes this-body)))
+              (push this-body body)
+              (setf body-received (+ body-received body-bytes))
+              (when (>= chunk-length left-to-receive)
+                (condition-case err
+                    (with-temp-buffer
+                      (apply #'insert
+                             (nreverse
+                              (prog1 body
+                                (setf leftovers nil
+                                      body-length nil
+                                      body-received nil
+                                      body nil))))
+                      (decode-coding-region (point-min)
+                                            (point-max)
+                                            'utf-8)
+                      (goto-char (point-min))
+                      (push (lsp-json-read-buffer) messages))
+
+                  (error
+                   (lsp-warn "Failed to parse the following chunk:\n'''\n%s\n'''\nwith message %s"
+                             (concat leftovers input)
+                             err)))))))
+        (mapc (lambda (msg)
+                (lsp--parser-on-message msg workspace))
+              (nreverse messages))))))
+
+(defvar-local lsp--line-col-to-point-hash-table nil
+  "Hash table with keys (line . col) and values that are either point positions
+or markers.")
+
+(defcustom lsp-imenu-detailed-outline t
+  "Whether `lsp-imenu' should include signatures.
+This will be ignored if the server doesn't provide the necessary
+information, for example if it doesn't support DocumentSymbols."
+  :group 'lsp-imenu
+  :type 'boolean)
+
+(defcustom lsp-imenu-hide-parent-details t
+  "Whether `lsp-imenu' should hide signatures of parent nodes."
+  :group 'lsp-imenu
+  :type 'boolean)
+
+(defface lsp-details-face '((t :height 0.8 :inherit shadow))
+  "Used to display additional information throughout `lsp'.
+Things like line numbers, signatures, ... are considered
+additional information. Often, additional faces are defined that
+inherit from this face by default, like `lsp-signature-face', and
+they may be customized for finer control."
+  :group 'lsp-mode)
+
+(defface lsp-signature-face '((t :inherit lsp-details-face))
+  "Used to display signatures in `imenu', ...."
+  :group 'lsp-mode)
+
+(lsp-defun lsp-render-symbol ((&DocumentSymbol :name :detail? :deprecated?)
+                              show-detail?)
+  "Render INPUT0, an `&DocumentSymbol', to a string.
+If SHOW-DETAIL? is set, make use of its `:detail?' field (often
+the signature)."
+  (let ((detail (and show-detail? (s-present? detail?)
+                     (propertize (concat " " (s-trim-left detail?))
+                                 'face 'lsp-signature-face)))
+        (name (if deprecated?
+                  (propertize name 'face 'lsp-face-semhl-deprecated) name)))
+    (concat name detail)))
+
+(lsp-defun lsp-render-symbol-information ((&SymbolInformation :name :deprecated? :container-name?)
+                                          separator)
+  "Render a piece of SymbolInformation.
+Handle :deprecated?. If SEPARATOR is non-nil, the
+symbol's (optional) parent, SEPARATOR and the symbol itself are
+concatenated."
+  (when (and separator container-name? (not (string-empty-p container-name?)))
+    (setq name (concat name separator container-name?)))
+  (if deprecated? (propertize name 'face 'lsp-face-semhl-deprecated) name))
+
+(defun lsp--symbol-to-imenu-elem (sym)
+  "Convert SYM to imenu element.
+
+SYM is a SymbolInformation message.
+
+Return a cons cell (full-name . start-point)."
+  (let ((start-point (ht-get lsp--line-col-to-point-hash-table
+                             (lsp--get-line-and-col sym))))
+    (cons (lsp-render-symbol-information
+           sym (and lsp-imenu-show-container-name
+                    lsp-imenu-container-name-separator))
+          start-point)))
+
+(lsp-defun lsp--symbol-to-hierarchical-imenu-elem ((sym &as &DocumentSymbol :children?))
+  "Convert SYM to hierarchical imenu elements.
+
+SYM is a DocumentSymbol message.
+
+Return cons cell (\"symbol-name (symbol-kind)\" . start-point) if
+SYM doesn't have any children. Otherwise return a cons cell with
+an alist
+
+  (\"symbol-name\" . ((\"(symbol-kind)\" . start-point)
+                    cons-cells-from-children))"
+  (let ((filtered-children (lsp--imenu-filter-symbols children?))
+        (signature (lsp-render-symbol sym lsp-imenu-detailed-outline)))
+    (if (seq-empty-p filtered-children)
+        (cons signature
+              (ht-get lsp--line-col-to-point-hash-table
+                      (lsp--get-line-and-col sym)))
+      (cons signature
+            (lsp--imenu-create-hierarchical-index filtered-children)))))
+
+(lsp-defun lsp--symbol-ignore ((&SymbolInformation :kind))
+  "Determine if SYM is for the current document and is to be shown."
+  ;; It's a SymbolInformation or DocumentSymbol, which is always in the
+  ;; current buffer file.
+  (and lsp-imenu-index-symbol-kinds
+       (numberp kind)
+       (let ((clamped-kind (if (< 0 kind (length lsp/symbol-kind-lookup))
+                               kind
+                             0)))
+         (not (memql (aref lsp/symbol-kind-lookup clamped-kind)
+                     lsp-imenu-index-symbol-kinds)))))
+
+(lsp-defun lsp--get-symbol-type ((&SymbolInformation :kind))
+  "The string name of the kind of SYM."
+  (alist-get kind lsp-symbol-kinds "Other"))
+
+(defun lsp--get-line-and-col (sym)
+  "Obtain the line and column corresponding to SYM."
+  (-let* ((location (lsp:symbol-information-location sym))
+          (name-range (or (and location (lsp:location-range location))
+                          (lsp:document-symbol-selection-range sym)))
+          ((&Range :start (&Position :line :character)) name-range))
+    (cons line character)))
+
+(defun lsp--collect-lines-and-cols (symbols)
+  "Return a sorted list ((line . col) ...) of the locations of SYMBOLS."
+  (let ((stack (mapcar 'identity symbols))
+        line-col-list)
+    (while stack
+      (let ((sym (pop stack)))
+        (push (lsp--get-line-and-col sym) line-col-list)
+        (unless (seq-empty-p (lsp:document-symbol-children? sym))
+          (setf stack (nconc (lsp--imenu-filter-symbols (lsp:document-symbol-children? sym)) stack)))))
+    (-sort #'lsp--line-col-comparator line-col-list)))
+
+(defun lsp--convert-line-col-to-points-batch (line-col-list)
+  "Convert a sorted list of positions from line-column
+representation to point representation."
+  (let ((line-col-to-point-map (ht-create))
+        (inhibit-field-text-motion t)
+        (curr-line 0))
+    (lsp-save-restriction-and-excursion
+      (goto-char (point-min))
+      (cl-loop for (line . col) in line-col-list do
+               (forward-line (- line curr-line))
+               (setq curr-line line)
+               (let ((line-end (line-end-position)))
+                 (if (or (not col) (> col (- line-end (point))))
+                     (goto-char line-end)
+                   (forward-char col)))
+               (ht-set! line-col-to-point-map (cons line col) (if imenu-use-markers
+                                                                  (point-marker)
+                                                                (point)))))
+    line-col-to-point-map))
+
+(cl-defun lsp--line-col-comparator ((l1 . c1) (l2 . c2))
+  (or (< l1 l2)
+      (and (= l1 l2)
+           (cond ((and c1 c2)
+                  (< c1 c2))
+                 (c1 t)))))
+
+(defun lsp-imenu-create-uncategorized-index (symbols)
+  "Create imenu index from document SYMBOLS.
+This function, unlike `lsp-imenu-create-categorized-index', does
+not categorize by type, but instead returns an `imenu' index
+corresponding to the symbol hierarchy returned by the server
+directly."
+  (let* ((lsp--line-col-to-point-hash-table (-> symbols
+                                                lsp--collect-lines-and-cols
+                                                lsp--convert-line-col-to-points-batch)))
+    (if (lsp--imenu-hierarchical-p symbols)
+        (lsp--imenu-create-hierarchical-index symbols)
+      (lsp--imenu-create-non-hierarchical-index symbols))))
+
+(defcustom lsp-imenu-symbol-kinds
+  '((1 . "Files")
+    (2 . "Modules")
+    (3 . "Namespaces")
+    (4 . "Packages")
+    (5 . "Classes")
+    (6 . "Methods")
+    (7 . "Properties")
+    (8 . "Fields")
+    (9 . "Constructors")
+    (10 . "Enums")
+    (11 . "Interfaces")
+    (12 . "Functions")
+    (13 . "Variables")
+    (14 . "Constants")
+    (15 . "Strings")
+    (16 . "Numbers")
+    (17 . "Booleans")
+    (18 . "Arrays")
+    (19 . "Objects")
+    (20 . "Keys")
+    (21 . "Nulls")
+    (22 . "Enum Members")
+    (23 . "Structs")
+    (24 . "Events")
+    (25 . "Operators")
+    (26 . "Type Parameters"))
+  "`lsp-symbol-kinds', but only used by `imenu'.
+A new variable is needed, as it is `imenu' convention to use
+pluralized categories, which `lsp-symbol-kinds' doesn't. If the
+non-pluralized names are preferred, this can be set to
+`lsp-symbol-kinds'."
+  :type '(alist :key-type integer :value-type string))
+
+(defun lsp--imenu-kind->name (kind)
+  (alist-get kind lsp-imenu-symbol-kinds "?"))
+
+(defun lsp-imenu-create-top-level-categorized-index (symbols)
+  "Create an `imenu' index categorizing SYMBOLS by type.
+Only root symbols are categorized.
+
+See `lsp-symbol-kinds' to customize the category naming. SYMBOLS
+shall be a list of DocumentSymbols or SymbolInformation."
+  (mapcan
+   (-lambda ((type . symbols))
+     (let ((cat (lsp--imenu-kind->name type))
+           (symbols (lsp-imenu-create-uncategorized-index symbols)))
+       ;; If there is no :kind (this is being defensive), or we couldn't look it
+       ;; up, just display the symbols inline, without categories.
+       (if cat (list (cons cat symbols)) symbols)))
+   (sort (seq-group-by #'lsp:document-symbol-kind symbols)
+         (-lambda ((kinda) (kindb)) (< kinda kindb)))))
+
+(lsp-defun lsp--symbol->imenu ((sym &as &DocumentSymbol :selection-range (&RangeToPoint :start)))
+  "Convert an `&DocumentSymbol' to an `imenu' entry."
+  (cons (lsp-render-symbol sym lsp-imenu-detailed-outline) start))
+
+(defun lsp--imenu-create-categorized-index-1 (symbols)
+  "Returns an `imenu' index from SYMBOLS categorized by type.
+The result looks like this: ((\"Variables\" . (...)))."
+  (->>
+   symbols
+   (mapcan
+    (-lambda ((sym &as &DocumentSymbol :kind :children?))
+      (if (seq-empty-p children?)
+          (list (list kind (lsp--symbol->imenu sym)))
+        (let ((parent (lsp-render-symbol sym (and lsp-imenu-detailed-outline
+                                                  (not lsp-imenu-hide-parent-details)))))
+          (cons
+           (list kind (lsp--symbol->imenu sym))
+           (mapcar (-lambda ((type .  imenu-items))
+                     (list type (cons parent (mapcan #'cdr imenu-items))))
+                   (-group-by #'car (lsp--imenu-create-categorized-index-1 children?))))))))
+   (-group-by #'car)
+   (mapcar
+    (-lambda ((kind . syms))
+      (cons kind (mapcan #'cdr syms))))))
+
+(defun lsp--imenu-create-categorized-index (symbols)
+  (let ((syms (lsp--imenu-create-categorized-index-1 symbols)))
+    (dolist (sym syms)
+      (setcar sym (lsp--imenu-kind->name (car sym))))
+    syms))
+
+(lsp-defun lsp--symbol-information->imenu ((sym &as &SymbolInformation :location (&Location :range (&RangeToPoint :start))))
+  (cons (lsp-render-symbol-information sym nil) start))
+
+(defun lsp--imenu-create-categorized-index-flat (symbols)
+  "Create a kind-categorized index for SymbolInformation."
+  (mapcar (-lambda ((kind . syms))
+            (cons (lsp--imenu-kind->name kind)
+                  (mapcan (-lambda ((parent . children))
+                            (let ((children (mapcar #'lsp--symbol-information->imenu children)))
+                              (if parent (list (cons parent children)) children)))
+                          (-group-by #'lsp:symbol-information-container-name? syms))))
+          (seq-group-by #'lsp:symbol-information-kind symbols)))
+
+(defun lsp-imenu-create-categorized-index (symbols)
+  (if (lsp--imenu-hierarchical-p symbols)
+      (lsp--imenu-create-categorized-index symbols)
+    (lsp--imenu-create-categorized-index-flat symbols)))
+
+(defcustom lsp-imenu-index-function #'lsp-imenu-create-uncategorized-index
+  "Function that should create an `imenu' index.
+It will be called with a list of SymbolInformation or
+DocumentSymbols, whose first level is already filtered. It shall
+then return an appropriate `imenu' index (see
+`imenu-create-index-function').
+
+Note that this interface is not stable, and subject to change any
+time."
+  :group 'lsp-imenu
+  :type '(radio
+          (const :tag "Categorize by type"
+                 lsp-imenu-create-categorized-index)
+          (const :tag "Categorize root symbols by type"
+                 lsp-imenu-create-top-level-categorized-index)
+          (const :tag "Uncategorized, inline entries"
+                 lsp-imenu-create-uncategorized-index)
+          (function :tag "Custom function")))
+
+(defun lsp--imenu-create-index ()
+  "Create an `imenu' index based on the language server.
+Respects `lsp-imenu-index-function'."
+  (let ((symbols (lsp--imenu-filter-symbols (lsp--get-document-symbols))))
+    (funcall lsp-imenu-index-function symbols)))
+
+(defun lsp--imenu-filter-symbols (symbols)
+  "Filter out unsupported symbols from SYMBOLS."
+  (seq-remove #'lsp--symbol-ignore symbols))
+
+(defun lsp--imenu-hierarchical-p (symbols)
+  "Determine whether any element in SYMBOLS has children."
+  (seq-some #'lsp-document-symbol? symbols))
+
+(defun lsp--imenu-create-non-hierarchical-index (symbols)
+  "Create imenu index for non-hierarchical SYMBOLS.
+
+SYMBOLS are a list of DocumentSymbol messages.
+
+Return a nested alist keyed by symbol names. e.g.
+
+   ((\"SomeClass\" (\"(Class)\" . 10)
+                 (\"someField (Field)\" . 20)
+                 (\"someFunction (Function)\" . 25)
+                 (\"SomeSubClass\" (\"(Class)\" . 30)
+                                  (\"someSubField (Field)\" . 35))
+    (\"someFunction (Function)\" . 40))"
+  (seq-map (lambda (nested-alist)
+             (cons (car nested-alist)
+                   (seq-map #'lsp--symbol-to-imenu-elem (cdr nested-alist))))
+           (seq-group-by #'lsp--get-symbol-type symbols)))
+
+(defun lsp--imenu-create-hierarchical-index (symbols)
+  "Create imenu index for hierarchical SYMBOLS.
+
+SYMBOLS are a list of DocumentSymbol messages.
+
+Return a nested alist keyed by symbol names. e.g.
+
+   ((\"SomeClass\" (\"(Class)\" . 10)
+                 (\"someField (Field)\" . 20)
+                 (\"someFunction (Function)\" . 25)
+                 (\"SomeSubClass\" (\"(Class)\" . 30)
+                                  (\"someSubField (Field)\" . 35))
+    (\"someFunction (Function)\" . 40))"
+  (seq-map #'lsp--symbol-to-hierarchical-imenu-elem
+           (seq-sort #'lsp--imenu-symbol-lessp symbols)))
+
+(defun lsp--imenu-symbol-lessp (sym1 sym2)
+  (let* ((compare-results (mapcar (lambda (method)
+                                    (funcall (alist-get method lsp--imenu-compare-function-alist)
+                                             sym1 sym2))
+                                  lsp-imenu-sort-methods))
+         (result (seq-find (lambda (result)
+                             (not (= result 0)))
+                           compare-results
+                           0)))
+    (and (numberp result) (< result 0))))
+
+(lsp-defun lsp--imenu-compare-kind ((&SymbolInformation :kind left)
+                                    (&SymbolInformation :kind right))
+  "Compare SYM1 and SYM2 by kind."
+  (- left right))
+
+(defun lsp--imenu-compare-line-col (sym1 sym2)
+  (if (lsp--line-col-comparator
+       (lsp--get-line-and-col sym1)
+       (lsp--get-line-and-col sym2))
+      -1
+    1))
+
+(lsp-defun lsp--imenu-compare-name ((&SymbolInformation :name name1)
+                                    (&SymbolInformation :name name2))
+  "Compare SYM1 and SYM2 by name."
+  (let ((result (compare-strings name1 0 (length name1) name2 0 (length name2))))
+    (if (numberp result) result 0)))
+
+(defun lsp--imenu-refresh ()
+  "Force Imenu to refresh itself."
+  (imenu--menubar-select imenu--rescan-item))
+
+(defun lsp-enable-imenu ()
+  "Use lsp-imenu for the current buffer."
+  (imenu--cleanup)
+  (add-function :override (local 'imenu-create-index-function) #'lsp--imenu-create-index)
+  (setq-local imenu-menubar-modified-tick -1)
+  (setq-local imenu--index-alist nil)
+  (when menu-bar-mode
+    (lsp--imenu-refresh)))
+
+(defun lsp-resolve-final-command (command &optional test?)
+  "Resolve final function COMMAND."
+  (let* ((command (lsp-resolve-value command))
+         (command (cl-etypecase command
+                    (list
+                     (cl-assert (seq-every-p (apply-partially #'stringp) command) nil
+                                "Invalid command list")
+                     command)
+                    (string (list command)))))
+    (if (and (file-remote-p default-directory) (not test?))
+        (list shell-file-name "-c"
+              (string-join (cons "stty raw > /dev/null;"
+                                 (mapcar #'shell-quote-argument command))
+                           " "))
+      command)))
+
+(defun lsp-server-present? (final-command)
+  "Check whether FINAL-COMMAND is present."
+  (let ((binary-found? (executable-find (cl-first final-command) t)))
+    (if binary-found?
+        (lsp-log "Command \"%s\" is present on the path." (s-join " " final-command))
+      (lsp-log "Command \"%s\" is not present on the path." (s-join " " final-command)))
+    binary-found?))
+
+(defun lsp--value-to-string (value)
+  "Convert VALUE to a string that can be set as value in an environment
+variable."
+  (cond
+   ((stringp value) value)
+   ((booleanp value) (if value
+                         "1"
+                       "0"))
+   ((and (sequencep value)
+         (seq-every-p #'stringp value)) (string-join value ":"))
+   (t (user-error "Only strings, booleans, and sequences of strings are supported as environment variables"))))
+
+(defun lsp--compute-process-environment (environment-fn)
+  "Append a list of KEY=VALUE from the alist ENVIRONMENT to `process-environment'.
+Ignore non-boolean keys whose value is nil."
+  (let ((environment (if environment-fn
+                         (funcall environment-fn)
+                       nil)))
+    (-flatten (cons (cl-loop for (key . value) in environment
+                             if (or (eval value)
+                                    (eq (get value 'custom-type) 'boolean))
+                             collect (concat key "=" (lsp--value-to-string
+                                                      (eval value))))
+                    process-environment))))
+
+(defun lsp--default-directory-for-connection (&optional path)
+  "Return path to be used for the working directory of a LSP process.
+
+If `lsp-use-workspace-root-for-server-default-directory' is
+non-nil, uses `lsp-workspace-root' to find the directory
+corresponding to PATH, else returns `default-directory'."
+  (if lsp-use-workspace-root-for-server-default-directory
+      (lsp-workspace-root path)
+    default-directory))
+
+(defun lsp--fix-remote-cmd (program)
+  "Helper for `lsp-stdio-connection'.
+Originally coppied from eglot."
+
+  (if (file-remote-p default-directory)
+      (list shell-file-name "-c"
+            (string-join (cons "stty raw > /dev/null;"
+                               (mapcar #'shell-quote-argument program))
+                         " "))
+    program))
+
+(defvar tramp-use-ssh-controlmaster-options)
+(defvar tramp-ssh-controlmaster-options)
+
+(defun lsp-stdio-connection (command &optional test-command)
+  "Returns a connection property list using COMMAND.
+COMMAND can be: A string, denoting the command to launch the
+language server. A list of strings, denoting an executable with
+its command line arguments. A function, that either returns a
+string or a list of strings. In all cases, the launched language
+server should send and receive messages on standard I/O.
+TEST-COMMAND is a function with no arguments which returns
+whether the command is present or not. When not specified
+`lsp-mode' will check whether the first element of the list
+returned by COMMAND is available via `executable-find'"
+  (cl-check-type command (or string
+                             function
+                             (and list
+                                  (satisfies (lambda (l)
+                                               (seq-every-p (lambda (el)
+                                                              (stringp el))
+                                                            l))))))
+  (list :connect (lambda (filter sentinel name environment-fn workspace)
+                   (if (and (functionp 'json-rpc-connection)
+                            (not (file-remote-p default-directory)))
+                       (lsp-json-rpc-connection workspace (lsp-resolve-final-command command))
+                     (let ((final-command (lsp-resolve-final-command command))
+                           (process-name (generate-new-buffer-name name))
+                           (process-environment
+                            (lsp--compute-process-environment environment-fn)))
+                       (let* ((stderr-buf (get-buffer-create (format "*%s::stderr*" process-name)))
+                              (default-directory (lsp--default-directory-for-connection))
+                              (tramp-use-ssh-controlmaster-options 'suppress)
+                              (tramp-ssh-controlmaster-options "-o ControlMaster=no -o ControlPath=none")
+                              (proc (make-process
+                                     :name process-name
+                                     :connection-type 'pipe
+                                     :buffer (format "*%s*" process-name)
+                                     :coding 'no-conversion
+                                     :command final-command
+                                     :filter filter
+                                     :sentinel sentinel
+                                     :stderr stderr-buf
+                                     :noquery t
+                                     :file-handler t)))
+                         (set-process-query-on-exit-flag proc nil)
+                         (set-process-query-on-exit-flag (get-buffer-process stderr-buf) nil)
+                         (with-current-buffer (get-buffer stderr-buf)
+                           ;; Make the *NAME::stderr* buffer buffer-read-only, q to bury, etc.
+                           (special-mode))
+                         (cons proc proc)))))
+        :test? (or
+                test-command
+                (lambda ()
+                  (lsp-server-present? (lsp-resolve-final-command command t))))))
+
+(defun lsp--open-network-stream (host port name)
+  "Open network stream to HOST:PORT.
+  NAME will be passed to `open-network-stream'.
+  RETRY-COUNT is the number of the retries.
+  SLEEP-INTERVAL is the sleep interval between each retry."
+  (let* ((retries 0)
+         (sleep-interval 0.01)
+         (number-of-retries (/ lsp-tcp-connection-timeout sleep-interval))
+         connection)
+    (while (and (not connection) (< retries number-of-retries))
+      (condition-case err
+          (setq connection (open-network-stream name nil host port
+                                                :type 'plain
+                                                :coding 'no-conversion))
+        (file-error
+         (let ((inhibit-message t))
+           (lsp--warn "Failed to connect to %s:%s with error message %s"
+                      host
+                      port
+                      (error-message-string err))
+           (sleep-for sleep-interval)
+           (cl-incf retries)))))
+    (or connection (error "Port %s was never taken. Consider increasing `lsp-tcp-connection-timeout'." port))))
+
+(defun lsp--port-available (host port)
+  "Return non-nil if HOST and PORT are available."
+  (condition-case _err
+      (delete-process (open-network-stream "*connection-test*" nil host port :type 'plain))
+    (file-error t)))
+
+(defun lsp--find-available-port (host starting-port)
+  "Find available port on HOST starting from STARTING-PORT."
+  (let ((port starting-port))
+    (while (not (lsp--port-available host port))
+      (cl-incf port))
+    port))
+
+(defun lsp-tcp-connection (command-fn)
+  "Returns a connection property list similar to `lsp-stdio-connection'.
+COMMAND-FN can only be a function that takes a single argument, a
+port number. It should return a command for launches a language server
+process listening for TCP connections on the provided port."
+  (cl-check-type command-fn function)
+  (list
+   :connect (lambda (filter sentinel name environment-fn _workspace)
+              (let* ((host "localhost")
+                     (port (lsp--find-available-port host (cl-incf lsp--tcp-port)))
+                     (command (funcall command-fn port))
+                     (final-command (if (consp command) command (list command)))
+                     (_ (unless (lsp-server-present? final-command)
+                          (user-error (format "Couldn't find executable %s" (cl-first final-command)))))
+                     (process-environment
+                      (lsp--compute-process-environment environment-fn))
+                     (proc (make-process :name name :connection-type 'pipe :coding 'no-conversion
+                                         :command final-command :sentinel sentinel :stderr (format "*%s::stderr*" name) :noquery t))
+                     (tcp-proc (lsp--open-network-stream host port (concat name "::tcp"))))
+
+                ;; TODO: Same :noquery issue (see above)
+                (set-process-query-on-exit-flag proc nil)
+                (set-process-query-on-exit-flag tcp-proc nil)
+                (set-process-filter tcp-proc filter)
+                (cons tcp-proc proc)))
+   :test? (lambda () (lsp-server-present? (funcall command-fn 0)))))
+
+(defalias 'lsp-tcp-server 'lsp-tcp-server-command)
+
+(defun lsp-tcp-server-command (command-fn)
+  "Create tcp server connection.
+In this mode Emacs is TCP server and the language server connects
+to it. COMMAND is function with one parameter(the port) and it
+should return the command to start the LS server."
+  (cl-check-type command-fn function)
+  (list
+   :connect (lambda (filter sentinel name environment-fn _workspace)
+              (let* (tcp-client-connection
+                     (tcp-server (make-network-process :name (format "*tcp-server-%s*" name)
+                                                       :buffer (format "*tcp-server-%s*" name)
+                                                       :family 'ipv4
+                                                       :service lsp--tcp-server-port
+                                                       :sentinel (lambda (proc _string)
+                                                                   (lsp-log "Language server %s is connected." name)
+                                                                   (setf tcp-client-connection proc))
+                                                       :server 't))
+                     (port (process-contact tcp-server :service))
+                     (final-command (funcall command-fn port))
+                     (process-environment
+                      (lsp--compute-process-environment environment-fn))
+                     (cmd-proc (make-process :name name
+                                             :connection-type 'pipe
+                                             :coding 'no-conversion
+                                             :command final-command
+                                             :stderr (format "*tcp-server-%s*::stderr" name)
+                                             :noquery t)))
+                (let ((retries 0))
+                  ;; wait for the client to connect (we sit-for 500 ms, so have to double lsp--tcp-server-wait-seconds)
+                  (while (and (not tcp-client-connection) (< retries (* 2 lsp--tcp-server-wait-seconds)))
+                    (lsp--info "Waiting for connection for %s, retries: %s" name retries)
+                    (sit-for 0.500)
+                    (cl-incf retries)))
+
+                (unless tcp-client-connection
+                  (condition-case nil (delete-process tcp-server) (error))
+                  (condition-case nil (delete-process cmd-proc) (error))
+                  (error "Failed to create connection to %s on port %s" name port))
+                (lsp--info "Successfully connected to %s" name)
+
+                (set-process-query-on-exit-flag cmd-proc nil)
+                (set-process-query-on-exit-flag tcp-client-connection nil)
+                (set-process-query-on-exit-flag tcp-server nil)
+
+                (set-process-filter tcp-client-connection filter)
+                (set-process-sentinel tcp-client-connection sentinel)
+                (cons tcp-client-connection cmd-proc)))
+   :test? (lambda () (lsp-server-present? (funcall command-fn 0)))))
+
+(defalias 'lsp-tramp-connection 'lsp-stdio-connection)
+
+(defun lsp--auto-configure ()
+  "Autoconfigure `company', `flycheck', `lsp-ui', etc if they are installed."
+  (when (functionp 'lsp-ui-mode)
+    (lsp-ui-mode))
+
+  (if lsp-headerline-breadcrumb-enable
+      (add-hook 'lsp-configure-hook 'lsp-headerline-breadcrumb-mode)
+    (remove-hook 'lsp-configure-hook 'lsp-headerline-breadcrumb-mode))
+  (if lsp-modeline-code-actions-enable
+      (add-hook 'lsp-configure-hook 'lsp-modeline-code-actions-mode)
+    (remove-hook 'lsp-configure-hook 'lsp-modeline-code-actions-mode))
+  (if lsp-modeline-diagnostics-enable
+      (add-hook 'lsp-configure-hook 'lsp-modeline-diagnostics-mode)
+    (remove-hook 'lsp-configure-hook 'lsp-modeline-diagnostics-mode))
+  (if lsp-modeline-workspace-status-enable
+      (add-hook 'lsp-configure-hook 'lsp-modeline-workspace-status-mode)
+    (remove-hook 'lsp-configure-hook 'lsp-modeline-workspace-status-mode))
+  (if lsp-lens-enable
+      (add-hook 'lsp-configure-hook 'lsp-lens--enable)
+    (remove-hook 'lsp-configure-hook 'lsp-lens--enable))
+  (if lsp-semantic-tokens-enable
+      (add-hook 'lsp-configure-hook 'lsp-semantic-tokens--enable)
+    (remove-hook 'lsp-configure-hook 'lsp-semantic-tokens--enable))
+
+  ;; yas-snippet config
+  (setq-local yas-inhibit-overlay-modification-protection t))
+
+(defun lsp--restart-if-needed (workspace)
+  "Handler restart for WORKSPACE."
+  (when (or (eq lsp-restart 'auto-restart)
+            (eq (lsp--workspace-shutdown-action workspace) 'restart)
+            (and (eq lsp-restart 'interactive)
+                 (let ((query (format
+                               "Server %s exited (check corresponding stderr buffer for details). Do you want to restart it?"
+                               (lsp--workspace-print workspace))))
+                   (y-or-n-p query))))
+    (--each (lsp--workspace-buffers workspace)
+      (when (lsp-buffer-live-p it)
+        (lsp-with-current-buffer it
+          (if lsp--buffer-deferred
+              (lsp-deferred)
+            (lsp--info "Restarting LSP in buffer %s" (buffer-name))
+            (lsp)))))))
+
+(defun lsp--update-key (table key fn)
+  "Apply FN on value corresponding to KEY in TABLE."
+  (let ((existing-value (gethash key table)))
+    (if-let ((new-value (funcall fn existing-value)))
+        (puthash key new-value table)
+      (remhash key table))))
+
+(defun lsp--process-sentinel (workspace process exit-str)
+  "Create the sentinel for WORKSPACE."
+  (unless (process-live-p process)
+    (lsp--handle-process-exit workspace exit-str)))
+
+(defun lsp--handle-process-exit (workspace exit-str)
+  (let* ((folder->workspaces (lsp-session-folder->servers (lsp-session)))
+         (proc (lsp--workspace-proc workspace)))
+    (lsp--warn "%s has exited (%s)"
+               (lsp-process-name proc)
+               (string-trim-right (or exit-str "")))
+    (with-lsp-workspace workspace
+      ;; Clean workspace related data in each of the buffers
+      ;; in the workspace.
+      (--each (lsp--workspace-buffers workspace)
+        (when (lsp-buffer-live-p it)
+          (lsp-with-current-buffer it
+            (setq lsp--buffer-workspaces (delete workspace lsp--buffer-workspaces))
+            (lsp--uninitialize-workspace)
+            (lsp--spinner-stop)
+            (lsp--remove-overlays 'lsp-highlight))))
+
+      ;; Cleanup session from references to the closed workspace.
+      (--each (hash-table-keys folder->workspaces)
+        (lsp--update-key folder->workspaces it (apply-partially 'delete workspace)))
+
+      (lsp-process-cleanup proc))
+
+    (run-hook-with-args 'lsp-after-uninitialized-functions workspace)
+
+    (if (eq (lsp--workspace-shutdown-action workspace) 'shutdown)
+        (lsp--info "Workspace %s shutdown." (lsp--workspace-print workspace))
+      (lsp--restart-if-needed workspace))
+    (lsp--cleanup-hanging-watches)))
+
+(defun lsp-workspace-folders (workspace)
+  "Return all folders associated with WORKSPACE."
+  (let (result)
+    (->> (lsp-session)
+         (lsp-session-folder->servers)
+         (maphash (lambda (folder workspaces)
+                    (when (-contains? workspaces workspace)
+                      (push folder result)))))
+    result))
+
+(defun lsp--start-workspace (session client-template root &optional initialization-options)
+  "Create new workspace for CLIENT-TEMPLATE with project root ROOT.
+INITIALIZATION-OPTIONS are passed to initialize function.
+SESSION is the active session."
+  (lsp--spinner-start)
+  (-let* ((default-directory root)
+          (client (copy-lsp--client client-template))
+          (workspace (make-lsp--workspace
+                      :root root
+                      :client client
+                      :status 'starting
+                      :buffers (list (lsp-current-buffer))
+                      :host-root (file-remote-p root)))
+          ((&lsp-cln 'server-id 'environment-fn 'new-connection 'custom-capabilities
+                     'multi-root 'initialized-fn) client)
+          ((proc . cmd-proc) (funcall
+                              (or (plist-get new-connection :connect)
+                                  (user-error "Client %s is configured incorrectly" client))
+                              (lsp--create-filter-function workspace)
+                              (apply-partially #'lsp--process-sentinel workspace)
+                              (format "%s" server-id)
+                              environment-fn
+                              workspace))
+          (workspace-folders (gethash server-id (lsp-session-server-id->folders session))))
+    (setf (lsp--workspace-proc workspace) proc
+          (lsp--workspace-cmd-proc workspace) cmd-proc)
+
+    ;; update (lsp-session-folder->servers) depending on whether we are starting
+    ;; multi/single folder workspace
+    (mapc (lambda (project-root)
+            (->> session
+                 (lsp-session-folder->servers)
+                 (gethash project-root)
+                 (cl-pushnew workspace)))
+          (or workspace-folders (list root)))
+
+    (with-lsp-workspace workspace
+      (run-hooks 'lsp-before-initialize-hook)
+      (lsp-request-async
+       "initialize"
+       (append
+        (list :processId (unless (file-remote-p (buffer-file-name))
+                           (emacs-pid))
+              :rootPath (lsp-file-local-name (expand-file-name root))
+              :clientInfo (list :name "emacs"
+                                :version (emacs-version))
+              :rootUri (lsp--path-to-uri root)
+              :capabilities (lsp--client-capabilities custom-capabilities)
+              :initializationOptions initialization-options
+              :workDoneToken "1")
+        (when lsp-server-trace
+          (list :trace lsp-server-trace))
+        (when multi-root
+          (->> workspace-folders
+               (-distinct)
+               (-map (lambda (folder)
+                       (list :uri (lsp--path-to-uri folder)
+                             :name (f-filename folder))))
+               (apply 'vector)
+               (list :workspaceFolders))))
+       (-lambda ((&InitializeResult :capabilities))
+         ;; we know that Rust Analyzer will send {} which will be parsed as null
+         ;; when using plists
+         (when (equal 'rust-analyzer server-id)
+           (-> capabilities
+               (lsp:server-capabilities-text-document-sync?)
+               (lsp:set-text-document-sync-options-save? t)))
+
+         (setf (lsp--workspace-server-capabilities workspace) capabilities
+               (lsp--workspace-status workspace) 'initialized)
+
+         (with-lsp-workspace workspace
+           (lsp-notify "initialized" lsp--empty-ht))
+
+         (when initialized-fn (funcall initialized-fn workspace))
+
+         (cl-callf2 -filter #'lsp-buffer-live-p (lsp--workspace-buffers workspace))
+         (->> workspace
+              (lsp--workspace-buffers)
+              (mapc (lambda (buffer)
+                      (lsp-with-current-buffer buffer
+                        (lsp--open-in-workspace workspace)))))
+
+         (with-lsp-workspace workspace
+           (run-hooks 'lsp-after-initialize-hook))
+         (lsp--info "%s initialized successfully in folders: %s"
+                    (lsp--workspace-print workspace)
+                    (lsp-workspace-folders workspace)))
+       :mode 'detached))
+    workspace))
+
+(defun lsp--load-default-session ()
+  "Load default session."
+  (setq lsp--session (or (condition-case err
+                             (lsp--read-from-file lsp-session-file)
+                           (error (lsp--error "Failed to parse the session %s, starting with clean one."
+                                              (error-message-string err))
+                                  nil))
+                         (make-lsp-session))))
+
+(defun lsp-session ()
+  "Get the session associated with the current buffer."
+  (or lsp--session (setq lsp--session (lsp--load-default-session))))
+
+(defun lsp--client-disabled-p (buffer-major-mode client)
+  (seq-some
+   (lambda (entry)
+     (pcase entry
+       ((pred symbolp) (eq entry client))
+       (`(,mode . ,client-or-list)
+        (and (eq mode buffer-major-mode)
+             (if (listp client-or-list)
+                 (memq client client-or-list)
+               (eq client client-or-list))))))
+   lsp-disabled-clients))
+
+
+;; download server
+
+(defcustom lsp-server-install-dir (expand-file-name
+                                   (locate-user-emacs-file (f-join ".cache" "lsp")))
+  "Directory in which the servers will be installed."
+  :risky t
+  :type 'directory
+  :package-version '(lsp-mode . "6.3")
+  :group 'lsp-mode)
+
+(defcustom lsp-verify-signature t
+  "Whether to check GPG signatures of downloaded files."
+  :type 'boolean
+  :package-version '(lsp-mode . "8.0.0")
+  :group 'lsp-mode)
+
+(defvar lsp--dependencies (ht))
+
+(defun lsp-dependency (name &rest definitions)
+  "Used to specify a language server DEPENDENCY, the server
+executable or other required file path. Typically, the
+DEPENDENCY is found by locating it on the system path using
+`executable-find'.
+
+You can explicitly call lsp-dependency in your environment to
+specify the absolute path to the DEPENDENCY. For example, the
+typescript-language-server requires both the server and the
+typescript compiler. If you have installed them in a team shared
+read-only location, you can instruct lsp-mode to use them via
+
+ (eval-after-load `lsp-mode
+   `(progn
+      (require lsp-javascript)
+      (lsp-dependency typescript-language-server (:system ,tls-exe))
+      (lsp-dependency typescript (:system ,ts-js))))
+
+where tls-exe is the absolute path to the typescript-language-server
+executable and ts-js is the absolute path to the typescript compiler
+JavaScript file, tsserver.js (the *.js is required for Windows)."
+  (ht-set lsp--dependencies name definitions))
+
+(defun lsp--server-binary-present? (client)
+  (unless (equal (lsp--client-server-id client) 'lsp-pwsh)
+    (condition-case ()
+        (-some-> client lsp--client-new-connection (plist-get :test?) funcall)
+      (error nil)
+      (args-out-of-range nil))))
+
+(define-minor-mode lsp-installation-buffer-mode
+  "Mode used in *lsp-installation* buffers.
+It can be used to set-up keybindings, etc. Disabling this mode
+detaches the installation buffer from commands like
+`lsp-select-installation-buffer'."
+  :init-value nil
+  :lighter nil)
+
+(defface lsp-installation-finished-buffer-face '((t :foreground "orange"))
+  "Face used for finished installation buffers.
+Used in `lsp-select-installation-buffer'."
+  :group 'lsp-mode)
+
+(defface lsp-installation-buffer-face '((t :foreground "green"))
+  "Face used for installation buffers still in progress.
+Used in `lsp-select-installation-buffer'."
+  :group 'lsp-mode)
+
+(defun lsp--installation-buffer? (buf)
+  "Check whether BUF is an `lsp-async-start-process' buffer."
+  (buffer-local-value 'lsp-installation-buffer-mode buf))
+
+(defun lsp-select-installation-buffer (&optional show-finished)
+  "Interactively choose an installation buffer.
+If SHOW-FINISHED is set, leftover (finished) installation buffers
+are still shown."
+  (interactive "P")
+  (let ((bufs (--filter (and (lsp--installation-buffer? it)
+                             (or show-finished (get-buffer-process it)))
+                        (buffer-list))))
+    (pcase bufs
+      (`nil (user-error "No installation buffers"))
+      (`(,buf) (pop-to-buffer buf))
+      (bufs (pop-to-buffer (completing-read "Select installation buffer: "
+                                            (--map (propertize (buffer-name it) 'face
+                                                               (if (get-buffer-process it)
+                                                                   'lsp-installation-buffer-face
+                                                                 'lsp-installation-finished-buffer-face))
+                                                   bufs)))))))
+
+(defun lsp-cleanup-installation-buffers ()
+  "Delete finished *lsp-installation* buffers."
+  (interactive)
+  (dolist (buf (buffer-list))
+    (when (and (lsp--installation-buffer? buf) (not (get-buffer-process buf)))
+      (kill-buffer buf))))
+
+(defun lsp--download-status ()
+  (-some--> #'lsp--client-download-in-progress?
+    (lsp--filter-clients it)
+    (-map (-compose #'symbol-name #'lsp--client-server-id) it)
+    (format "%s" it)
+    (propertize it 'face 'success)
+    (format " Installing following servers: %s" it)
+    (propertize it
+                'local-map (make-mode-line-mouse-map
+                            'mouse-1 #'lsp-select-installation-buffer)
+                'mouse-face 'highlight)))
+
+(defun lsp--install-server-internal (client &optional update?)
+  (unless (lsp--client-download-server-fn client)
+    (user-error "There is no automatic installation for `%s', you have to install it manually following lsp-mode's documentation."
+                (lsp--client-server-id client)))
+
+  (setf (lsp--client-download-in-progress? client) t)
+  (add-to-list 'global-mode-string '(t (:eval (lsp--download-status))))
+  (cl-flet ((done
+             (success? &optional error-message)
+             ;; run with idle timer to make sure the lsp command is executed in
+             ;; the main thread, see #2739.
+             (run-with-timer
+              0.0
+              nil
+              (lambda ()
+                (-let [(&lsp-cln 'server-id 'buffers) client]
+                  (setf (lsp--client-download-in-progress? client) nil
+                        (lsp--client-buffers client) nil)
+                  (if success?
+                      (lsp--info "Server %s downloaded, auto-starting in %s buffers." server-id
+                                 (length buffers))
+                    (lsp--error "Server %s install process failed with the following error message: %s.
+Check `*lsp-install*' and `*lsp-log*' buffer."
+                                server-id
+                                error-message))
+                  (seq-do
+                   (lambda (buffer)
+                     (when (lsp-buffer-live-p buffer)
+                       (lsp-with-current-buffer buffer
+                         (cl-callf2 -remove-item '(t (:eval (lsp--download-status)))
+                                    global-mode-string)
+                         (when success? (lsp)))))
+                   buffers)
+                  (unless (lsp--filter-clients #'lsp--client-download-in-progress?)
+                    (cl-callf2 -remove-item '(t (:eval (lsp--download-status)))
+                               global-mode-string)))))))
+    (lsp--info "Download %s started." (lsp--client-server-id client))
+    (condition-case err
+        (funcall
+         (lsp--client-download-server-fn client)
+         client
+         (lambda () (done t))
+         (lambda (msg) (done nil msg))
+         update?)
+      (error
+       (done nil (error-message-string err))))))
+
+(defun lsp--require-packages ()
+  "Load `lsp-client-packages' if needed."
+  (when (and lsp-auto-configure (not lsp--client-packages-required))
+    (seq-do (lambda (package)
+              ;; loading client is slow and `lsp' can be called repeatedly
+              (unless (featurep package)
+                (require package nil t)))
+            lsp-client-packages)
+    (setq lsp--client-packages-required t)))
+
+;;;###autoload
+(defun lsp-install-server (update? &optional server-id)
+  "Interactively install or re-install server.
+When prefix UPDATE? is t force installation even if the server is present."
+  (interactive "P")
+  (lsp--require-packages)
+  (let* ((chosen-client (or (gethash server-id lsp-clients)
+                            (lsp--completing-read
+                             "Select server to install/re-install: "
+                             (or (->> lsp-clients
+                                      (ht-values)
+                                      (-filter (-andfn
+                                                (-not #'lsp--client-download-in-progress?)
+                                                #'lsp--client-download-server-fn)))
+                                 (user-error "There are no servers with automatic installation"))
+                             (lambda (client)
+                               (let ((server-name (-> client lsp--client-server-id symbol-name)))
+                                 (if (lsp--server-binary-present? client)
+                                     (concat server-name " (Already installed)")
+                                   server-name)))
+                             nil
+                             t)))
+         (update? (or update?
+                      (and (not (lsp--client-download-in-progress? chosen-client))
+                           (lsp--server-binary-present? chosen-client)))))
+    (lsp--install-server-internal chosen-client update?)))
+
+;;;###autoload
+(defun lsp-uninstall-server (dir)
+  "Delete a LSP server from `lsp-server-install-dir'."
+  (interactive
+   (list (read-directory-name "Uninstall LSP server: " (f-slash lsp-server-install-dir))))
+  (unless (file-directory-p dir)
+    (user-error "Couldn't find %s directory" dir))
+  (delete-directory dir 'recursive)
+  (message "Server `%s' uninstalled." (file-name-nondirectory (directory-file-name dir))))
+
+;;;###autoload
+(defun lsp-uninstall-servers ()
+  "Uninstall all installed servers."
+  (interactive)
+  (let* ((dir lsp-server-install-dir)
+         (servers (ignore-errors
+                    (directory-files dir t
+                                     directory-files-no-dot-files-regexp))))
+    (if (or (not (file-directory-p dir)) (zerop (length servers)))
+        (user-error "No servers to uninstall")
+      (when (yes-or-no-p
+             (format "Servers to uninstall: %d (%s), proceed? "
+                     (length servers)
+                     (mapconcat (lambda (server)
+                                  (file-name-nondirectory (directory-file-name server)))
+                                servers " ")))
+        (mapc #'lsp-uninstall-server servers)
+        (message "All servers uninstalled")))))
+
+;;;###autoload
+(defun lsp-update-server (&optional server-id)
+  "Interactively update (reinstall) a server."
+  (interactive)
+  (lsp--require-packages)
+  (let ((chosen-client (or (gethash server-id lsp-clients)
+                           (lsp--completing-read
+                            "Select server to update (if not on the list, probably you need to `lsp-install-server`): "
+                            (or (->> lsp-clients
+                                     (ht-values)
+                                     (-filter (-andfn
+                                               (-not #'lsp--client-download-in-progress?)
+                                               #'lsp--client-download-server-fn
+                                               #'lsp--server-binary-present?)))
+                                (user-error "There are no servers to update"))
+                            (lambda (client)
+                              (-> client lsp--client-server-id symbol-name))
+                            nil
+                            t))))
+    (lsp--install-server-internal chosen-client t)))
+
+;;;###autoload
+(defun lsp-update-servers ()
+  "Update (reinstall) all installed servers."
+  (interactive)
+  (lsp--require-packages)
+  (mapc (lambda (client) (lsp--install-server-internal client t))
+        (-filter (-andfn
+                  (-not #'lsp--client-download-in-progress?)
+                  #'lsp--client-download-server-fn
+                  #'lsp--server-binary-present?) (hash-table-values lsp-clients))))
+
+;;;###autoload
+(defun lsp-ensure-server (server-id)
+  "Ensure server SERVER-ID"
+  (lsp--require-packages)
+  (if-let ((client (gethash server-id lsp-clients)))
+      (unless (lsp--server-binary-present? client)
+        (lsp--info "Server `%s' is not preset, installing..." server-id)
+        (lsp-install-server nil server-id))
+    (warn "Unable to find server registration with id %s" server-id)))
+
+(defun lsp-async-start-process (callback error-callback &rest command)
+  "Start async process COMMAND with CALLBACK and ERROR-CALLBACK."
+  (let ((name (cl-first command)))
+    (with-current-buffer (compilation-start (mapconcat #'shell-quote-argument (-filter (lambda (cmd)
+                                                                                         (not (null cmd)))
+                                                                                       command)
+                                                       " ") t
+                                            (lambda (&rest _)
+                                              (generate-new-buffer-name (format "*lsp-install: %s*" name))))
+      (lsp-installation-buffer-mode +1)
+      (view-mode +1)
+      (add-hook
+       'compilation-finish-functions
+       (lambda (_buf status)
+         (if (string= "finished\n" status)
+             (condition-case err
+                 (funcall callback)
+               (error
+                (funcall error-callback (error-message-string err))))
+           (funcall error-callback (s-trim-right status))))
+       nil t))))
+
+(defun lsp-resolve-value (value)
+  "Resolve VALUE's value.
+If it is function - call it.
+If it is a variable - return it's value
+Otherwise returns value itself."
+  (cond
+   ((functionp value) (funcall value))
+   ((and (symbolp value) (boundp value)) (symbol-value value))
+   (value)))
+
+(defvar lsp-deps-providers
+  (list :npm (list :path #'lsp--npm-dependency-path
+                   :install #'lsp--npm-dependency-install)
+        :cargo (list :path #'lsp--cargo-dependency-path
+                     :install #'lsp--cargo-dependency-install)
+        :system (list :path #'lsp--system-path)
+        :download (list :path #'lsp-download-path
+                        :install #'lsp-download-install)))
+
+(defun lsp--system-path (path)
+  "If PATH is absolute and exists return it as is. Otherwise,
+return the absolute path to the executable defined by PATH or
+nil."
+  ;; For node.js 'sub-packages' PATH may point to a *.js file. Consider the
+  ;; typescript-language-server. When lsp invokes the server, lsp needs to
+  ;; supply the path to the typescript compiler, tsserver.js, as an argument. To
+  ;; make code platform independent, one must pass the absolute path to the
+  ;; tsserver.js file (Windows requires a *.js file - see help on the JavaScript
+  ;; child process spawn command that is invoked by the
+  ;; typescript-language-server). This is why we check for existence and not
+  ;; that the path is executable.
+  (let ((path (lsp-resolve-value path)))
+    (cond
+     ((and (f-absolute? path)
+           (f-exists? path))
+      path)
+     ((executable-find path t) path))))
+
+(defun lsp-package-path (dependency)
+  "Path to the DEPENDENCY each of the registered providers."
+  (let (path)
+    (-first (-lambda ((provider . rest))
+              (setq path (-some-> lsp-deps-providers
+                           (plist-get provider)
+                           (plist-get :path)
+                           (apply rest))))
+            (gethash dependency lsp--dependencies))
+    path))
+
+(defun lsp-package-ensure (dependency callback error-callback)
+  "Asynchronously ensure a package."
+  (or (-first (-lambda ((provider . rest))
+                (-some-> lsp-deps-providers
+                  (plist-get provider)
+                  (plist-get :install)
+                  (apply (cl-list* callback error-callback rest))))
+              (gethash dependency lsp--dependencies))
+      (funcall error-callback (format "Unable to find a way to install %s" dependency))))
+
+
+;; npm handling
+
+;; https://docs.npmjs.com/files/folders#executables
+(cl-defun lsp--npm-dependency-path (&key package path &allow-other-keys)
+  "Return npm dependency PATH for PACKAGE."
+  (let ((path (executable-find
+               (f-join lsp-server-install-dir "npm" package
+                       (cond ((eq system-type 'windows-nt) "")
+                             (t "bin"))
+                       path)
+               t)))
+    (unless (and path (f-exists? path))
+      (error "The package %s is not installed.  Unable to find %s" package path))
+    path))
+
+(cl-defun lsp--npm-dependency-install (callback error-callback &key package &allow-other-keys)
+  (if-let ((npm-binary (executable-find "npm")))
+      (progn
+        ;; Explicitly `make-directory' to work around NPM bug in
+        ;; versions 7.0.0 through 7.4.1. See
+        ;; https://github.com/emacs-lsp/lsp-mode/issues/2364 for
+        ;; discussion.
+        (make-directory (f-join lsp-server-install-dir "npm" package "lib") 'parents)
+        (lsp-async-start-process (lambda ()
+                                   (if (string-empty-p
+                                        (string-trim (shell-command-to-string
+                                                      (mapconcat #'shell-quote-argument `(,npm-binary "view" ,package "peerDependencies") " "))))
+                                       (funcall callback)
+                                     (let ((default-directory (f-dirname (car (last (directory-files-recursively (f-join lsp-server-install-dir "npm" package) "package.json")))))
+                                           (process-environment (append '("npm_config_yes=true") process-environment))) ;; Disable prompting for older versions of npx
+                                       (when (f-dir-p default-directory)
+                                         (lsp-async-start-process callback
+                                                                  error-callback
+                                                                  (executable-find "npx")
+                                                                  "npm-install-peers")))))
+                                 error-callback
+                                 npm-binary
+                                 "-g"
+                                 "--prefix"
+                                 (f-join lsp-server-install-dir "npm" package)
+                                 "install"
+                                 package))
+    (lsp-log "Unable to install %s via `npm' because it is not present" package)
+    nil))
+
+
+;; Cargo dependency handling
+(cl-defun lsp--cargo-dependency-path (&key package path &allow-other-keys)
+  (let ((path (executable-find
+               (f-join lsp-server-install-dir
+                       "cargo"
+                       package
+                       "bin"
+                       path)
+               t)))
+    (unless (and path (f-exists? path))
+      (error "The package %s is not installed.  Unable to find %s" package path))
+    path))
+
+(cl-defun lsp--cargo-dependency-install (callback error-callback &key package git &allow-other-keys)
+  (if-let ((cargo-binary (executable-find "cargo")))
+      (lsp-async-start-process
+       callback
+       error-callback
+       cargo-binary
+       "install"
+       package
+       (when git
+         "--git")
+       git
+       "--root"
+       (f-join lsp-server-install-dir "cargo" package))
+    (lsp-log "Unable to install %s via `cargo' because it is not present" package)
+    nil))
+
+
+
+;; Download URL handling
+(cl-defun lsp-download-install (callback error-callback &key url asc-url pgp-key store-path decompress &allow-other-keys)
+  (let* ((url (lsp-resolve-value url))
+         (store-path (lsp-resolve-value store-path))
+         ;; (decompress (lsp-resolve-value decompress))
+         (download-path
+          (pcase decompress
+            (:gzip (concat store-path ".gz"))
+            (:zip (concat store-path ".zip"))
+            (:targz (concat store-path ".tar.gz"))
+            (`nil store-path)
+            (_ (error ":decompress must be `:gzip', `:zip', `:targz' or `nil'")))))
+    (make-thread
+     (lambda ()
+       (condition-case err
+           (progn
+             (when (f-exists? download-path)
+               (f-delete download-path))
+             (when (f-exists? store-path)
+               (f-delete store-path))
+             (lsp--info "Starting to download %s to %s..." url download-path)
+             (mkdir (f-parent download-path) t)
+             (url-copy-file url download-path)
+             (lsp--info "Finished downloading %s..." download-path)
+             (when (and lsp-verify-signature asc-url pgp-key)
+               (if (executable-find epg-gpg-program)
+                   (let ((asc-download-path (concat download-path ".asc"))
+                         (context (epg-make-context))
+                         (fingerprint)
+                         (signature))
+                     (when (f-exists? asc-download-path)
+                       (f-delete asc-download-path))
+                     (lsp--info "Starting to download %s to %s..." asc-url asc-download-path)
+                     (url-copy-file asc-url asc-download-path)
+                     (lsp--info "Finished downloading %s..." asc-download-path)
+                     (epg-import-keys-from-string context pgp-key)
+                     (setq fingerprint (epg-import-status-fingerprint
+                                        (car
+                                         (epg-import-result-imports
+                                          (epg-context-result-for context 'import)))))
+                     (lsp--info "Verifying signature %s..." asc-download-path)
+                     (epg-verify-file context asc-download-path download-path)
+                     (setq signature (car (epg-context-result-for context 'verify)))
+                     (unless (and
+                              (eq (epg-signature-status signature) 'good)
+                              (equal (epg-signature-fingerprint signature) fingerprint))
+                       (error "Failed to verify GPG signature: %s" (epg-signature-to-string signature))))
+                 (lsp--warn "GPG is not installed, skipping the signature check.")))
+             (when decompress
+               (lsp--info "Decompressing %s..." download-path)
+               (pcase decompress
+                 (:gzip
+                  (lsp-gunzip download-path))
+                 (:zip (lsp-unzip download-path (f-parent store-path)))
+                 (:targz (lsp-tar-gz-decompress download-path (f-parent store-path))))
+               (lsp--info "Decompressed %s..." store-path))
+             (funcall callback))
+         (error (funcall error-callback err)))))))
+
+(cl-defun lsp-download-path (&key store-path binary-path set-executable? &allow-other-keys)
+  "Download URL and store it into STORE-PATH.
+
+SET-EXECUTABLE? when non-nil change the executable flags of
+STORE-PATH to make it executable. BINARY-PATH can be specified
+when the binary to start does not match the name of the
+archive (e.g. when the archive has multiple files)"
+  (let ((store-path (or (lsp-resolve-value binary-path)
+                        (lsp-resolve-value store-path))))
+    (cond
+     ((executable-find store-path) store-path)
+     ((and set-executable? (f-exists? store-path))
+      (set-file-modes store-path #o0700)
+      store-path)
+     ((f-exists? store-path) store-path))))
+
+(defun lsp--find-latest-gh-release-url (url regex)
+  "Fetch the latest version in the releases given by URL by using REGEX."
+  (let ((url-request-method "GET"))
+    (with-current-buffer (url-retrieve-synchronously url)
+      (goto-char (point-min))
+      (re-search-forward "\n\n" nil 'noerror)
+      (delete-region (point-min) (point))
+      (let* ((json-result (lsp-json-read-buffer)))
+        (message "Latest version found: %s" (lsp-get json-result :tag_name))
+        (--> json-result
+             (lsp-get it :assets)
+             (seq-find (lambda (entry) (string-match-p regex (lsp-get entry :name))) it)
+             (lsp-get it :browser_download_url))))))
+
+;; unzip
+
+(defconst lsp-ext-pwsh-script "powershell -noprofile -noninteractive \
+-nologo -ex bypass -command Expand-Archive -path '%s' -dest '%s'"
+  "Powershell script to unzip file.")
+
+(defconst lsp-ext-unzip-script "bash -c 'mkdir -p %2$s && unzip -qq -o %1$s -d %2$s'"
+  "Unzip script to unzip file.")
+
+(defcustom lsp-unzip-script (lambda ()
+                              (cond ((and (eq system-type 'windows-nt)
+                                          (executable-find "powershell"))
+                                     lsp-ext-pwsh-script)
+                                    ((executable-find "unzip") lsp-ext-unzip-script)
+                                    ((executable-find "powershell") lsp-ext-pwsh-script)
+                                    (t nil)))
+  "The script to unzip."
+  :group 'lsp-mode
+  :type 'string
+  :package-version '(lsp-mode . "8.0.0"))
+
+(defun lsp-unzip (zip-file dest)
+  "Unzip ZIP-FILE to DEST."
+  (unless lsp-unzip-script
+    (error "Unable to find `unzip' or `powershell' on the path, please customize `lsp-unzip-script'"))
+  (shell-command (format (lsp-resolve-value lsp-unzip-script) zip-file dest)))
+
+;; gunzip
+
+(defconst lsp-ext-gunzip-script "gzip -d %1$s"
+  "Script to decompress a gzippped file with gzip.")
+
+(defcustom lsp-gunzip-script (lambda ()
+                               (cond ((executable-find "gzip") lsp-ext-gunzip-script)
+                                     (t nil)))
+  "The script to decompress a gzipped file.
+Should be a format string with one argument for the file to be decompressed
+in place."
+  :group 'lsp-mode
+  :type 'string
+  :package-version '(lsp-mode . "8.0.0"))
+
+(defun lsp-gunzip (gz-file)
+  "Decompress GZ-FILE in place."
+  (unless lsp-gunzip-script
+    (error "Unable to find `gzip' on the path, please either customize `lsp-gunzip-script' or manually decompress %s" gz-file))
+  (shell-command (format (lsp-resolve-value lsp-gunzip-script) gz-file)))
+
+;; tar.gz decompression
+
+(defconst lsp-ext-tar-script "bash -c 'mkdir -p %2$s; tar xf %1$s --directory=%2$s'"
+  "Script to decompress a .tar.gz file.")
+
+(defcustom lsp-tar-script (lambda ()
+                            (cond ((executable-find "tar") lsp-ext-tar-script)
+                                  (t nil)))
+  "The script to decompress a .tar.gz file.
+Should be a format string with one argument for the file to be decompressed
+in place."
+  :group 'lsp-mode
+  :type 'string)
+
+(defun lsp-tar-gz-decompress (targz-file dest)
+  "Decompress TARGZ-FILE in DEST."
+  (unless lsp-tar-script
+    (error "Unable to find `tar' on the path, please either customize `lsp-tar-script' or manually decompress %s" targz-file))
+  (shell-command (format (lsp-resolve-value lsp-tar-script) targz-file dest)))
+
+
+;; VSCode marketplace
+
+(defcustom lsp-vscode-ext-url
+  "https://marketplace.visualstudio.com/_apis/public/gallery/publishers/%s/vsextensions/%s/%s/vspackage%s"
+  "Vscode extension template url."
+  :group 'lsp-mode
+  :type 'string
+  :package-version '(lsp-mode . "8.0.0"))
+
+(defun lsp-vscode-extension-url (publisher name version &optional targetPlatform)
+  "Return the URL to vscode extension.
+PUBLISHER is the extension publisher.
+NAME is the name of the extension.
+VERSION is the version of the extension.
+TARGETPLATFORM is the targetPlatform of the extension."
+  (format lsp-vscode-ext-url publisher name version (or targetPlatform "")))
+
+
+
+;; Queueing prompts
+
+(defvar lsp--question-queue nil
+  "List of questions yet to be asked by `lsp-ask-question'.")
+
+(defun lsp-ask-question (question options callback)
+  "Prompt the user to answer the QUESTION with one of the OPTIONS from the
+minibuffer. Once the user selects an option, the CALLBACK function will be
+called, passing the selected option to it.
+
+If the user is currently being shown a question, the question will be stored in
+`lsp--question-queue', and will be asked once the user has answered the current
+question."
+  (add-to-list 'lsp--question-queue `(("question" . ,question)
+                                      ("options" . ,options)
+                                      ("callback" . ,callback)) t)
+  (when (eq (length lsp--question-queue) 1)
+    (lsp--process-question-queue)))
+
+(defun lsp--process-question-queue ()
+  "Take the first question from `lsp--question-queue', process it, then process
+the next question until the queue is empty."
+  (-let* (((&alist "question" "options" "callback") (car lsp--question-queue))
+          (answer (completing-read question options nil t)))
+    (pop lsp--question-queue)
+    (funcall callback answer)
+    (when lsp--question-queue
+      (lsp--process-question-queue))))
+
+(defun lsp--supports-buffer? (client)
+  (and
+   ;; both file and client remote or both local
+   (eq (---truthy? (file-remote-p (buffer-file-name)))
+       (---truthy? (lsp--client-remote? client)))
+
+   ;; activation function or major-mode match.
+   (if-let ((activation-fn (lsp--client-activation-fn client)))
+       (funcall activation-fn (buffer-file-name) major-mode)
+     (-contains? (lsp--client-major-modes client) major-mode))
+
+   ;; check whether it is enabled if `lsp-enabled-clients' is not null
+   (or (null lsp-enabled-clients)
+       (or (member (lsp--client-server-id client) lsp-enabled-clients)
+           (ignore (lsp--info "Client %s is not in lsp-enabled-clients"
+                              (lsp--client-server-id client)))))
+
+   ;; check whether it is not disabled.
+   (not (lsp--client-disabled-p major-mode (lsp--client-server-id client)))))
+
+(defun lsp--filter-clients (pred)
+  (->> lsp-clients hash-table-values (-filter pred)))
+
+(defun lsp--find-clients ()
+  "Find clients which can handle current buffer."
+  (-when-let (matching-clients (lsp--filter-clients (-andfn #'lsp--supports-buffer?
+                                                            #'lsp--server-binary-present?)))
+    (lsp-log "Found the following clients for %s: %s"
+             (buffer-file-name)
+             (s-join ", "
+                     (-map (lambda (client)
+                             (format "(server-id %s, priority %s)"
+                                     (lsp--client-server-id client)
+                                     (lsp--client-priority client)))
+                           matching-clients)))
+    (-let* (((add-on-clients main-clients) (-separate #'lsp--client-add-on? matching-clients))
+            (selected-clients (if-let ((main-client (and main-clients
+                                                         (--max-by (> (lsp--client-priority it)
+                                                                      (lsp--client-priority other))
+                                                                   main-clients))))
+                                  (cons main-client add-on-clients)
+                                add-on-clients)))
+      (lsp-log "The following clients were selected based on priority: %s"
+               (s-join ", "
+                       (-map (lambda (client)
+                               (format "(server-id %s, priority %s)"
+                                       (lsp--client-server-id client)
+                                       (lsp--client-priority client)))
+                             selected-clients)))
+      selected-clients)))
+
+(defun lsp-workspace-remove-all-folders()
+  "Delete all lsp tracked folders."
+  (interactive)
+  (--each (lsp-session-folders (lsp-session))
+    (lsp-workspace-folders-remove it)))
+
+(defun lsp-register-client (client)
+  "Registers LSP client CLIENT."
+  (let ((client-id (lsp--client-server-id client)))
+    (puthash client-id client lsp-clients)
+    (setplist (intern (format "lsp-%s-after-open-hook" client-id))
+              `( standard-value (nil) custom-type hook
+                 custom-package-version (lsp-mode . "7.0.1")
+                 variable-documentation ,(format "Hooks to run after `%s' server is run." client-id)
+                 custom-requests nil)))
+  (when (and lsp-auto-register-remote-clients
+             (not (lsp--client-remote? client)))
+    (let ((remote-client (copy-lsp--client client)))
+      (setf (lsp--client-remote? remote-client) t
+            (lsp--client-server-id remote-client) (intern
+                                                   (format "%s-tramp"
+                                                           (lsp--client-server-id client)))
+            ;; disable automatic download
+            (lsp--client-download-server-fn remote-client) nil)
+      (lsp-register-client remote-client))))
+
+(defun lsp--create-initialization-options (_session client)
+  "Create initialization-options from SESSION and CLIENT.
+Add workspace folders depending on server being multiroot and
+session workspace folder configuration for the server."
+  (let* ((initialization-options-or-fn (lsp--client-initialization-options client)))
+    (if (functionp initialization-options-or-fn)
+        (funcall initialization-options-or-fn)
+      initialization-options-or-fn)))
+
+(defvar lsp-client-settings (make-hash-table :test 'equal)
+  "For internal use, any external users please use
+  `lsp-register-custom-settings' function instead")
+
+(defun lsp-register-custom-settings (props)
+  "Register PROPS.
+PROPS is list of triple (path value boolean?) where PATH is the path to the
+property; VALUE can be a literal value, symbol to be evaluated, or either a
+function or lambda function to be called without arguments; BOOLEAN? is an
+optional flag that should be non-nil for boolean settings, when it is nil the
+property will be ignored if the VALUE is nil.
+
+Example: `(lsp-register-custom-settings `((\"foo.bar.buzz.enabled\" t t)))'
+\(note the double parentheses)"
+  (mapc
+   (-lambda ((path . rest))
+     (puthash path rest lsp-client-settings))
+   props))
+
+(defun lsp-region-text (region)
+  "Get the text for REGION in current buffer."
+  (-let (((start . end) (lsp--range-to-region region)))
+    (buffer-substring-no-properties start end)))
+
+(defun lsp-ht-set (tbl paths value)
+  "Set nested hash table value.
+TBL - a hash table, PATHS is the path to the nested VALUE."
+  (pcase paths
+    (`(,path) (ht-set! tbl path value))
+    (`(,path . ,rst) (let ((nested-tbl (or (gethash path tbl)
+                                           (let ((temp-tbl (ht)))
+                                             (ht-set! tbl path temp-tbl)
+                                             temp-tbl))))
+                       (lsp-ht-set nested-tbl rst value)))))
+
+;; sections
+
+(defalias 'defcustom-lsp 'lsp-defcustom)
+
+(defmacro lsp-defcustom (symbol standard doc &rest args)
+  "Defines `lsp-mode' server property."
+  (declare (doc-string 3) (debug (name body))
+           (indent defun))
+  (let ((path (plist-get args :lsp-path))
+        (setter (intern (concat (symbol-name symbol) "--set"))))
+    (cl-remf args :lsp-path)
+    `(progn
+       (lsp-register-custom-settings
+        (quote ((,path ,symbol ,(equal ''boolean (plist-get args :type))))))
+
+       (defcustom ,symbol ,standard ,doc ,@args)
+
+       ;; Use a variable watcher instead of registering a `defcustom'
+       ;; setter since `hack-local-variables' is not aware of custom
+       ;; setters and won't invoke them.
+
+       (defun ,setter (sym val op _where)
+         (when (eq op 'set)
+           (lsp--set-custom-property sym val ,path)))
+
+       (add-variable-watcher ',symbol #',setter))))
+
+(defun lsp--set-custom-property (sym val path)
+  (set sym val)
+  (let ((section (cl-first (s-split "\\." path))))
+    (mapc (lambda (workspace)
+            (when (-contains? (lsp--client-synchronize-sections (lsp--workspace-client workspace))
+                              section)
+              (with-lsp-workspace workspace
+                (lsp--set-configuration (lsp-configuration-section section)))))
+          (lsp--session-workspaces (lsp-session)))))
+
+(defun lsp-configuration-section (section)
+  "Get settings for SECTION."
+  (let ((ret (ht-create)))
+    (maphash (-lambda (path (variable boolean?))
+               (when (s-matches? (concat (regexp-quote section) "\\..*") path)
+                 (let* ((symbol-value (-> variable
+                                          lsp-resolve-value
+                                          lsp-resolve-value))
+                        (value (if (and boolean? (not symbol-value))
+                                   :json-false
+                                 symbol-value)))
+                   (when (or boolean? value)
+                     (lsp-ht-set ret (s-split "\\." path) value)))))
+             lsp-client-settings)
+    ret))
+
+
+(defun lsp--start-connection (session client project-root)
+  "Initiates connection created from CLIENT for PROJECT-ROOT.
+SESSION is the active session."
+  (when (lsp--client-multi-root client)
+    (cl-pushnew project-root (gethash (lsp--client-server-id client)
+                                      (lsp-session-server-id->folders session))))
+  (run-hook-with-args 'lsp-workspace-folders-changed-functions (list project-root) nil)
+
+  (unwind-protect
+      (lsp--start-workspace session client project-root (lsp--create-initialization-options session client))
+    (lsp--spinner-stop)))
+
+;; lsp-log-io-mode
+
+(defvar lsp-log-io-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map (kbd "M-n") #'lsp-log-io-next)
+    (define-key map (kbd "M-p") #'lsp-log-io-prev)
+    (define-key map (kbd "k") #'lsp--erase-log-buffer)
+    (define-key map (kbd "K") #'lsp--erase-session-log-buffers)
+    map)
+  "Keymap for lsp log buffer mode.")
+
+(define-derived-mode lsp-log-io-mode special-mode "LspLogIo"
+  "Special mode for viewing IO logs.")
+
+(defun lsp-workspace-show-log (workspace)
+  "Display the log buffer of WORKSPACE."
+  (interactive
+   (list (if lsp-log-io
+             (if (eq (length (lsp-workspaces)) 1)
+                 (cl-first (lsp-workspaces))
+               (lsp--completing-read "Workspace: " (lsp-workspaces)
+                                     #'lsp--workspace-print nil t))
+           (user-error "IO logging is disabled"))))
+  (pop-to-buffer (lsp--get-log-buffer-create workspace)))
+
+(defalias 'lsp-switch-to-io-log-buffer 'lsp-workspace-show-log)
+
+(defun lsp--get-log-buffer-create (workspace)
+  "Return the lsp log buffer of WORKSPACE, creating a new one if needed."
+  (let* ((server-id (-> workspace lsp--workspace-client lsp--client-server-id symbol-name))
+         (pid (-> workspace lsp--workspace-cmd-proc lsp-process-id)))
+    (get-buffer-create (format "*lsp-log: %s:%s*" server-id pid))))
+
+(defun lsp--erase-log-buffer (&optional all)
+  "Delete contents of current lsp log buffer.
+When ALL is t, erase all log buffers of the running session."
+  (interactive)
+  (let* ((workspaces (lsp--session-workspaces (lsp-session)))
+         (current-log-buffer (current-buffer)))
+    (dolist (w workspaces)
+      (let ((b (lsp--get-log-buffer-create w)))
+        (when (or all (eq b current-log-buffer))
+          (with-current-buffer b
+            (let ((inhibit-read-only t))
+              (erase-buffer))))))))
+
+(defun lsp--erase-session-log-buffers ()
+  "Erase log buffers of the running session."
+  (interactive)
+  (lsp--erase-log-buffer t))
+
+(defun lsp-log-io-next (arg)
+  "Move to next log entry."
+  (interactive "P")
+  (ewoc-goto-next lsp--log-io-ewoc (or arg 1)))
+
+(defun lsp-log-io-prev (arg)
+  "Move to previous log entry."
+  (interactive "P")
+  (ewoc-goto-prev lsp--log-io-ewoc (or arg 1)))
+
+
+
+(cl-defmethod lsp-process-id ((process process))
+  (process-id process))
+
+(cl-defmethod lsp-process-name ((process process)) (process-name process))
+
+(cl-defmethod lsp-process-status ((process process)) (process-status process))
+
+(cl-defmethod lsp-process-kill ((process process))
+  (when (process-live-p process)
+    (kill-process process)))
+
+(cl-defmethod lsp-process-send ((process process) message)
+  (condition-case err
+      (process-send-string process (lsp--make-message message))
+    (error (lsp--error "Sending to process failed with the following error: %s"
+                       (error-message-string err)))))
+
+(cl-defmethod lsp-process-cleanup (process)
+  ;; Kill standard error buffer only if the process exited normally.
+  ;; Leave it intact otherwise for debugging purposes.
+  (let ((buffer (-> process process-name get-buffer)))
+    (when (and (eq (process-status process) 'exit)
+               (zerop (process-exit-status process))
+               (buffer-live-p buffer))
+      (kill-buffer buffer))))
+
+
+;; native JSONRPC
+
+(declare-function json-rpc "ext:json")
+(declare-function json-rpc-connection "ext:json")
+(declare-function json-rpc-send "ext:json")
+(declare-function json-rpc-shutdown "ext:json")
+(declare-function json-rpc-stderr "ext:json")
+(declare-function json-rpc-pid "ext:json")
+
+(defvar lsp-json-rpc-thread nil)
+(defvar lsp-json-rpc-queue nil)
+(defvar lsp-json-rpc-done nil)
+(defvar lsp-json-rpc-mutex (make-mutex))
+(defvar lsp-json-rpc-condition (make-condition-variable lsp-json-rpc-mutex))
+
+(defun lsp-json-rpc-process-queue ()
+  (while (not lsp-json-rpc-done)
+    (while lsp-json-rpc-queue
+      (-let (((proc . message) (pop lsp-json-rpc-queue)))
+        (json-rpc-send
+         proc message
+         :null-object nil
+         :false-object :json-false)))
+    (with-mutex lsp-json-rpc-mutex
+      (condition-wait lsp-json-rpc-condition))))
+
+(cl-defmethod lsp-process-id (process) (json-rpc-pid process))
+
+(cl-defmethod lsp-process-name (_process) "TBD")
+
+(cl-defmethod lsp-process-kill (process) (json-rpc-shutdown process))
+
+(cl-defmethod lsp-process-send (proc message)
+  (unless lsp-json-rpc-thread
+    (with-current-buffer (get-buffer-create " *json-rpc*")
+      (setq lsp-json-rpc-thread (make-thread #'lsp-json-rpc-process-queue "*json-rpc-queue*"))))
+
+  (with-mutex lsp-json-rpc-mutex
+    (setq lsp-json-rpc-queue (append lsp-json-rpc-queue
+                                     (list (cons proc message))))
+    (condition-notify lsp-json-rpc-condition)))
+
+(cl-defmethod lsp-process-cleanup (_proc))
+
+(defun lsp-json-rpc-connection (workspace command)
+  (let ((con (apply #'json-rpc-connection command))
+        (object-type (if lsp-use-plists 'plist 'hash-table)))
+    (with-current-buffer (get-buffer-create " *json-rpc*")
+      (make-thread
+       (lambda ()
+         (json-rpc
+          con
+          (lambda (result err done)
+            (run-with-timer
+             0.0
+             nil
+             (lambda ()
+               (cond
+                (result (lsp--parser-on-message result workspace))
+                (err (warn "Json parsing failed with the following error: %s" err))
+                (done (lsp--handle-process-exit workspace ""))))))
+          :object-type object-type
+          :null-object nil
+          :false-object nil))
+       "*json-rpc-connection*"))
+    (cons con con)))
+
+(defun lsp-json-rpc-stderr ()
+  (interactive)
+  (--when-let (pcase (lsp-workspaces)
+                (`nil (user-error "There are no active servers in the current buffer"))
+                (`(,workspace) workspace)
+                (workspaces (lsp--completing-read "Select server: "
+                                                  workspaces
+                                                  'lsp--workspace-print nil t)))
+    (let ((content (json-rpc-stderr (lsp--workspace-cmd-proc it)))
+          (buffer (format "*stderr-%s*" (lsp--workspace-print it)) ))
+      (with-current-buffer (get-buffer-create buffer)
+        (with-help-window buffer
+          (insert content))))))
+
+
+(defun lsp--workspace-print (workspace)
+  "Visual representation WORKSPACE."
+  (let* ((proc (lsp--workspace-cmd-proc workspace))
+         (status (lsp--workspace-status workspace))
+         (server-id (-> workspace lsp--workspace-client lsp--client-server-id symbol-name))
+         (pid (lsp-process-id proc)))
+
+    (if (eq 'initialized status)
+        (format "%s:%s" server-id pid)
+      (format "%s:%s/%s" server-id pid status))))
+
+(defun lsp--map-tree-widget (m)
+  "Build `tree-widget' from a hash-table or plist M."
+  (when (lsp-structure-p m)
+    (let (nodes)
+      (lsp-map (lambda (k v)
+                 (push `(tree-widget
+                         :tag ,(if (lsp-structure-p v)
+                                   (format "%s:" k)
+                                 (format "%s: %s" k
+                                         (propertize (format "%s" v)
+                                                     'face
+                                                     'font-lock-string-face)))
+                         :open t
+                         ,@(lsp--map-tree-widget v))
+                       nodes))
+               m)
+      nodes)))
+
+(defun lsp-buffer-name (buffer-id)
+  (if-let ((buffer-name (plist-get buffer-id :buffer-name)))
+      (funcall buffer-name buffer-id)
+    (buffer-name buffer-id)))
+
+(defun lsp--render-workspace (workspace)
+  "Tree node representation of WORKSPACE."
+  `(tree-widget :tag ,(lsp--workspace-print workspace)
+                :open t
+                (tree-widget :tag ,(propertize "Buffers" 'face 'font-lock-function-name-face)
+                             :open t
+                             ,@(->> workspace
+                                    (lsp--workspace-buffers)
+                                    (--map `(tree-widget
+                                             :tag ,(when (lsp-buffer-live-p it)
+                                                     (let ((buffer-name (lsp-buffer-name it)))
+                                                       (if (lsp-with-current-buffer it buffer-read-only)
+                                                           (propertize buffer-name 'face 'font-lock-constant-face)
+                                                         buffer-name)))))))
+                (tree-widget :tag ,(propertize "Capabilities" 'face 'font-lock-function-name-face)
+                             ,@(-> workspace lsp--workspace-server-capabilities lsp--map-tree-widget))))
+
+(define-derived-mode lsp-browser-mode special-mode "LspBrowser"
+  "Define mode for displaying lsp sessions."
+  (setq-local display-buffer-base-action '(nil . ((inhibit-same-window . t)))))
+
+(defun lsp-describe-session ()
+  "Describes current `lsp-session'."
+  (interactive)
+  (let ((session (lsp-session))
+        (buf (get-buffer-create "*lsp session*"))
+        (root (lsp-workspace-root)))
+    (with-current-buffer buf
+      (lsp-browser-mode)
+      (let ((inhibit-read-only t))
+        (erase-buffer)
+        (--each (lsp-session-folders session)
+          (widget-create
+           `(tree-widget
+             :tag ,(propertize it 'face 'font-lock-keyword-face)
+             :open t
+             ,@(->> session
+                    (lsp-session-folder->servers)
+                    (gethash it)
+                    (-map 'lsp--render-workspace)))))))
+    (pop-to-buffer buf)
+    (goto-char (point-min))
+    (cl-loop for tag = (widget-get (widget-get (widget-at) :node) :tag)
+             until (or (and root (string= tag root)) (eobp))
+             do (goto-char (next-overlay-change (point))))))
+
+(defun lsp--session-workspaces (session)
+  "Get all workspaces that are part of the SESSION."
+  (-> session lsp-session-folder->servers hash-table-values -flatten -uniq))
+
+(defun lsp--find-multiroot-workspace (session client project-root)
+  "Look for a multiroot connection in SESSION created from CLIENT for
+PROJECT-ROOT and BUFFER-MAJOR-MODE."
+  (when (lsp--client-multi-root client)
+    (-when-let (multi-root-workspace (->> session
+                                          (lsp--session-workspaces)
+                                          (--first (eq (-> it lsp--workspace-client lsp--client-server-id)
+                                                       (lsp--client-server-id client)))))
+      (with-lsp-workspace multi-root-workspace
+        (lsp-notify "workspace/didChangeWorkspaceFolders"
+                    (lsp-make-did-change-workspace-folders-params
+                     :event (lsp-make-workspace-folders-change-event
+                             :added (vector (lsp-make-workspace-folder
+                                             :uri (lsp--path-to-uri project-root)
+                                             :name (f-filename project-root)))
+                             :removed []))))
+
+      (->> session (lsp-session-folder->servers) (gethash project-root) (cl-pushnew multi-root-workspace))
+      (->> session (lsp-session-server-id->folders) (gethash (lsp--client-server-id client)) (cl-pushnew project-root))
+
+      (lsp--persist-session session)
+
+      (lsp--info "Opened folder %s in workspace %s" project-root (lsp--workspace-print multi-root-workspace))
+      (lsp--open-in-workspace multi-root-workspace)
+
+      multi-root-workspace)))
+
+(defun lsp--ensure-lsp-servers (session clients project-root ignore-multi-folder)
+  "Ensure that SESSION contain server CLIENTS created for PROJECT-ROOT.
+IGNORE-MULTI-FOLDER to ignore multi folder server."
+  (-map (lambda (client)
+          (or
+           (lsp--find-workspace session client project-root)
+           (unless ignore-multi-folder
+             (lsp--find-multiroot-workspace session client project-root))
+           (lsp--start-connection session client project-root)))
+        clients))
+
+(defun lsp--spinner-stop ()
+  "Stop the spinner in case all of the workspaces are started."
+  (when (--all? (eq (lsp--workspace-status it) 'initialized)
+                lsp--buffer-workspaces)
+    (spinner-stop)))
+
+(defun lsp--open-in-workspace (workspace)
+  "Open in existing WORKSPACE."
+  (if (eq 'initialized (lsp--workspace-status workspace))
+      ;; when workspace is initialized just call document did open.
+      (progn
+        (with-lsp-workspace workspace
+          (when-let ((before-document-open-fn (-> workspace
+                                                  lsp--workspace-client
+                                                  lsp--client-before-file-open-fn)))
+            (funcall before-document-open-fn workspace))
+          (lsp--text-document-did-open))
+        (lsp--spinner-stop))
+    ;; when it is not initialized
+    (lsp--spinner-start)
+    (cl-pushnew (lsp-current-buffer) (lsp--workspace-buffers workspace))))
+
+(defun lsp--find-workspace (session client project-root)
+  "Find server connection created with CLIENT in SESSION for PROJECT-ROOT."
+  (when-let ((workspace (->> session
+                             (lsp-session-folder->servers)
+                             (gethash project-root)
+                             (--first (eql (-> it lsp--workspace-client lsp--client-server-id)
+                                           (lsp--client-server-id client))))))
+    (lsp--open-in-workspace workspace)
+    workspace))
+
+(defun lsp--read-char (prompt &optional options)
+  "Wrapper for `read-char-from-minibuffer' if Emacs +27.
+Fallback to `read-key' otherwise.
+PROMPT is the message and OPTIONS the available options."
+  (if (fboundp 'read-char-from-minibuffer)
+      (read-char-from-minibuffer prompt options)
+    (read-key prompt)))
+
+(defun lsp--find-root-interactively (session)
+  "Find project interactively.
+Returns nil if the project should not be added to the current SESSION."
+  (condition-case nil
+      (let* ((project-root-suggestion (or (lsp--suggest-project-root) default-directory))
+             (action (lsp--read-char
+                      (format
+                       "%s is not part of any project.
+
+%s ==> Import project root %s
+%s ==> Import project by selecting root directory interactively
+%s ==> Import project at current directory %s
+%s ==> Do not ask again for the current project by adding %s to lsp-session-folders-blocklist
+%s ==> Do not ask again for the current project by selecting ignore path interactively
+%s ==> Do nothing: ask again when opening other files from the current project
+
+Select action: "
+                       (propertize (buffer-name) 'face 'bold)
+                       (propertize "i" 'face 'success)
+                       (propertize project-root-suggestion 'face 'bold)
+                       (propertize "I" 'face 'success)
+                       (propertize "." 'face 'success)
+                       (propertize default-directory 'face 'bold)
+                       (propertize "d" 'face 'warning)
+                       (propertize project-root-suggestion 'face 'bold)
+                       (propertize "D" 'face 'warning)
+                       (propertize "n" 'face 'warning))
+                      '(?i ?\r ?I ?. ?d ?D ?n))))
+        (cl-case action
+          (?i project-root-suggestion)
+          (?\r project-root-suggestion)
+          (?I (read-directory-name "Select workspace folder to add: "
+                                   (or project-root-suggestion default-directory)
+                                   nil
+                                   t))
+          (?. default-directory)
+          (?d (push project-root-suggestion (lsp-session-folders-blocklist session))
+              (lsp--persist-session session)
+              nil)
+          (?D (push (read-directory-name "Select folder to blocklist: "
+                                         (or project-root-suggestion default-directory)
+                                         nil
+                                         t)
+                    (lsp-session-folders-blocklist session))
+              (lsp--persist-session session)
+              nil)
+          (t nil)))
+    (quit)))
+
+(declare-function tramp-file-name-host "ext:tramp" (file) t)
+(declare-function tramp-dissect-file-name "ext:tramp" (file &optional nodefault))
+
+(defun lsp--files-same-host (f1 f2)
+  "Predicate on whether or not two files are on the same host."
+  (or (not (or (file-remote-p f1) (file-remote-p f2)))
+      (and (file-remote-p f1)
+           (file-remote-p f2)
+           (progn (require 'tramp)
+                  (equal (tramp-file-name-host (tramp-dissect-file-name f1))
+                         (tramp-file-name-host (tramp-dissect-file-name f2)))))))
+
+(defun lsp-find-session-folder (session file-name)
+  "Look in the current SESSION for folder containing FILE-NAME."
+  (let ((file-name-canonical (lsp-f-canonical file-name)))
+    (->> session
+         (lsp-session-folders)
+         (--filter (and (lsp--files-same-host it file-name-canonical)
+                        (or (lsp-f-same? it file-name-canonical)
+                            (and (f-dir? it)
+                                 (lsp-f-ancestor-of? it file-name-canonical)))))
+         (--max-by (> (length it)
+                      (length other))))))
+
+(defun lsp-find-workspace (server-id &optional file-name)
+  "Find workspace for SERVER-ID for FILE-NAME."
+  (-when-let* ((session (lsp-session))
+               (folder->servers (lsp-session-folder->servers session))
+               (workspaces (if file-name
+                               (gethash (lsp-find-session-folder session file-name) folder->servers)
+                             (lsp--session-workspaces session))))
+
+    (--first (eq (lsp--client-server-id (lsp--workspace-client it)) server-id) workspaces)))
+
+(defun lsp--calculate-root (session file-name)
+  "Calculate project root for FILE-NAME in SESSION."
+  (and
+   (->> session
+        (lsp-session-folders-blocklist)
+        (--first (and (lsp--files-same-host it file-name)
+                      (lsp-f-ancestor-of? it file-name)
+                      (prog1 t
+                        (lsp--info "File %s is in blocklisted directory %s" file-name it))))
+        not)
+   (or
+    (when lsp-auto-guess-root
+      (lsp--suggest-project-root))
+    (unless lsp-guess-root-without-session
+      (lsp-find-session-folder session file-name))
+    (unless lsp-auto-guess-root
+      (when-let ((root-folder (lsp--find-root-interactively session)))
+        (if (or (not (f-equal? root-folder (expand-file-name "~/")))
+                (yes-or-no-p
+                 (concat
+                  (propertize "[WARNING] " 'face 'warning)
+                  "You are trying to import your home folder as project root. This may cause performance issue because some language servers (python, lua, etc) will try to scan all files under project root. To avoid that you may:
+
+1. Use `I' option from the interactive project import to select subfolder(e. g. `~/foo/bar' instead of `~/').
+2. If your file is under `~/' then create a subfolder and move that file in this folder.
+
+Type `No' to go back to project selection.
+Type `Yes' to confirm `HOME' as project root.
+Type `C-g' to cancel project import process and stop `lsp'")))
+            root-folder
+          (lsp--calculate-root session file-name)))))))
+
+(defun lsp--try-open-in-library-workspace ()
+  "Try opening current file as library file in any of the active workspace.
+The library folders are defined by each client for each of the active workspace."
+  (when-let ((workspace (->> (lsp-session)
+                             (lsp--session-workspaces)
+                             ;; Sort the last active workspaces first as they are more likely to be
+                             ;; the correct ones, especially when jumping to a definition.
+                             (-sort (lambda (a _b)
+                                      (-contains? lsp--last-active-workspaces a)))
+                             (--first
+                              (and (-> it lsp--workspace-client lsp--supports-buffer?)
+                                   (when-let ((library-folders-fn
+                                               (-> it lsp--workspace-client lsp--client-library-folders-fn)))
+                                     (-first (lambda (library-folder)
+                                               (lsp-f-ancestor-of? library-folder (buffer-file-name)))
+                                             (funcall library-folders-fn it))))))))
+    (lsp--open-in-workspace workspace)
+    (view-mode t)
+    (lsp--info "Opening read-only library file %s." (buffer-file-name))
+    (list workspace)))
+
+(defun lsp--persist-session (session)
+  "Persist SESSION to `lsp-session-file'."
+  (lsp--persist lsp-session-file (make-lsp-session
+                                  :folders (lsp-session-folders session)
+                                  :folders-blocklist (lsp-session-folders-blocklist session)
+                                  :server-id->folders (lsp-session-server-id->folders session))))
+
+(defun lsp--try-project-root-workspaces (ask-for-client ignore-multi-folder)
+  "Try create opening file as a project file.
+When IGNORE-MULTI-FOLDER is t the lsp mode will start new
+language server even if there is language server which can handle
+current language. When IGNORE-MULTI-FOLDER is nil current file
+will be opened in multi folder language server if there is
+such."
+  (-let ((session (lsp-session)))
+    (-if-let (clients (if ask-for-client
+                          (list (lsp--completing-read "Select server to start: "
+                                                      (ht-values lsp-clients)
+                                                      (-compose 'symbol-name 'lsp--client-server-id) nil t))
+                        (lsp--find-clients)))
+        (-if-let (project-root (-some-> session
+                                 (lsp--calculate-root (buffer-file-name))
+                                 (lsp-f-canonical)))
+            (progn
+              ;; update project roots if needed and persist the lsp session
+              (unless (-contains? (lsp-session-folders session) project-root)
+                (cl-pushnew project-root (lsp-session-folders session))
+                (lsp--persist-session session))
+              (lsp--ensure-lsp-servers session clients project-root ignore-multi-folder))
+          (lsp--warn "%s not in project or it is blocklisted." (buffer-name))
+          nil)
+      (lsp--warn "No LSP server for %s(check *lsp-log*)." major-mode)
+      nil)))
+
+(defun lsp-shutdown-workspace ()
+  "Shutdown language server."
+  (interactive)
+  (--when-let (pcase (lsp-workspaces)
+                (`nil (user-error "There are no active servers in the current buffer"))
+                (`(,workspace) (when (y-or-n-p (format "Are you sure you want to stop the server %s?"
+                                                       (lsp--workspace-print workspace)))
+                                 workspace))
+                (workspaces (lsp--completing-read "Select server: "
+                                                  workspaces
+                                                  'lsp--workspace-print nil t)))
+    (lsp-workspace-shutdown it)))
+
+(make-obsolete 'lsp-shutdown-workspace 'lsp-workspace-shutdown "lsp-mode 6.1")
+
+(defcustom lsp-auto-select-workspace t
+  "Shutdown or restart a single workspace.
+If set and the current buffer has only a single workspace
+associated with it, `lsp-shutdown-workspace' and
+`lsp-restart-workspace' will act on it without asking."
+  :type 'boolean
+  :group 'lsp-mode)
+
+(defun lsp--read-workspace ()
+  "Ask the user to select a workspace.
+Errors if there are none."
+  (pcase (lsp-workspaces)
+    (`nil (error "No workspaces associated with the current buffer"))
+    ((and `(,workspace) (guard lsp-auto-select-workspace)) workspace)
+    (workspaces (lsp--completing-read "Select workspace: " workspaces
+                                      #'lsp--workspace-print nil t))))
+
+(defun lsp-workspace-shutdown (workspace)
+  "Shut the workspace WORKSPACE and the language server associated with it"
+  (interactive (list (lsp--read-workspace)))
+  (lsp--warn "Stopping %s" (lsp--workspace-print workspace))
+  (with-lsp-workspace workspace (lsp--shutdown-workspace)))
+
+(defun lsp-disconnect ()
+  "Disconnect the buffer from the language server."
+  (interactive)
+  (lsp--text-document-did-close t)
+  (lsp-managed-mode -1)
+  (lsp-mode -1)
+  (setq lsp--buffer-workspaces nil)
+  (lsp--info "Disconnected"))
+
+(defun lsp-restart-workspace ()
+  (interactive)
+  (--when-let (pcase (lsp-workspaces)
+                (`nil (user-error "There are no active servers in the current buffer"))
+                (`(,workspace) workspace)
+                (workspaces (lsp--completing-read "Select server: "
+                                                  workspaces
+                                                  'lsp--workspace-print nil t)))
+    (lsp-workspace-restart it)))
+
+(make-obsolete 'lsp-restart-workspace 'lsp-workspace-restart "lsp-mode 6.1")
+
+(defun lsp-workspace-restart (workspace)
+  "Restart the workspace WORKSPACE and the language server associated with it"
+  (interactive (list (lsp--read-workspace)))
+  (lsp--warn "Restarting %s" (lsp--workspace-print workspace))
+  (with-lsp-workspace workspace (lsp--shutdown-workspace t)))
+
+;;;###autoload
+(defun lsp (&optional arg)
+  "Entry point for the server startup.
+When ARG is t the lsp mode will start new language server even if
+there is language server which can handle current language. When
+ARG is nil current file will be opened in multi folder language
+server if there is such. When `lsp' is called with prefix
+argument ask the user to select which language server to start."
+  (interactive "P")
+
+  (lsp--require-packages)
+
+  (when (buffer-file-name)
+    (let (clients
+          (matching-clients (lsp--filter-clients
+                             (-andfn #'lsp--supports-buffer?
+                                     #'lsp--server-binary-present?))))
+      (cond
+       (matching-clients
+        (when (setq lsp--buffer-workspaces
+                    (or (and
+                         ;; Don't open as library file if file is part of a project.
+                         (not (lsp-find-session-folder (lsp-session) (buffer-file-name)))
+                         (lsp--try-open-in-library-workspace))
+                        (lsp--try-project-root-workspaces (equal arg '(4))
+                                                          (and arg (not (equal arg 1))))))
+          (lsp-mode 1)
+          (when lsp-auto-configure (lsp--auto-configure))
+          (setq lsp-buffer-uri (lsp--buffer-uri))
+          (lsp--info "Connected to %s."
+                     (apply 'concat (--map (format "[%s %s]"
+                                                   (lsp--workspace-print it)
+                                                   (lsp--workspace-root it))
+                                           lsp--buffer-workspaces)))))
+       ;; look for servers which are currently being downloaded.
+       ((setq clients (lsp--filter-clients (-andfn #'lsp--supports-buffer?
+                                                   #'lsp--client-download-in-progress?)))
+        (lsp--info "There are language server(%s) installation in progress.
+The server(s) will be started in the buffer when it has finished."
+                   (-map #'lsp--client-server-id clients))
+        (seq-do (lambda (client)
+                  (cl-pushnew (current-buffer) (lsp--client-buffers client)))
+                clients))
+       ;; look for servers to install
+       ((setq clients (lsp--filter-clients
+                       (-andfn #'lsp--supports-buffer?
+                               (-const lsp-enable-suggest-server-download)
+                               #'lsp--client-download-server-fn
+                               (-not #'lsp--client-download-in-progress?))))
+        (let ((client (lsp--completing-read
+                       (concat "Unable to find installed server supporting this file. "
+                               "The following servers could be installed automatically: ")
+                       clients
+                       (-compose #'symbol-name #'lsp--client-server-id)
+                       nil
+                       t)))
+          (cl-pushnew (current-buffer) (lsp--client-buffers client))
+          (lsp--install-server-internal client)))
+       ;; ignore other warnings
+       ((not lsp-warn-no-matched-clients)
+        nil)
+       ;; automatic installation disabled
+       ((setq clients (unless matching-clients
+                        (lsp--filter-clients (-andfn #'lsp--supports-buffer?
+                                                     #'lsp--client-download-server-fn
+                                                     (-not (-const lsp-enable-suggest-server-download))
+                                                     (-not #'lsp--server-binary-present?)))))
+        (lsp--warn "The following servers support current file but automatic download is disabled: %s
+\(If you have already installed the server check *lsp-log*)."
+                   (mapconcat (lambda (client)
+                                (symbol-name (lsp--client-server-id client)))
+                              clients
+                              " ")))
+       ;; no clients present
+       ((setq clients (unless matching-clients
+                        (lsp--filter-clients (-andfn #'lsp--supports-buffer?
+                                                     (-not #'lsp--server-binary-present?)))))
+        (lsp--warn "The following servers support current file but do not have automatic installation: %s
+You may find the installation instructions at https://emacs-lsp.github.io/lsp-mode/page/languages.
+\(If you have already installed the server check *lsp-log*)."
+                   (mapconcat (lambda (client)
+                                (symbol-name (lsp--client-server-id client)))
+                              clients
+                              " ")))
+       ;; no matches
+       ((-> #'lsp--supports-buffer? lsp--filter-clients not)
+        (lsp--error "There are no language servers supporting current mode `%s' registered with `lsp-mode'.
+This issue might be caused by:
+1. The language you are trying to use does not have built-in support in `lsp-mode'. You must install the required support manually. Examples of this are `lsp-java' or `lsp-metals'.
+2. The language server that you expect to run is not configured to run for major mode `%s'. You may check that by checking the `:major-modes' that are passed to `lsp-register-client'.
+3. `lsp-mode' doesn't have any integration for the language behind `%s'. Refer to https://emacs-lsp.github.io/lsp-mode/page/languages and https://langserver.org/ .
+4. You are over `tramp'. In this case follow https://emacs-lsp.github.io/lsp-mode/page/remote/.
+5. You have disabled the `lsp-mode' clients for that file. (Check `lsp-enabled-clients' and `lsp-disabled-clients').
+You can customize `lsp-warn-no-matched-clients' to disable this message."
+                    major-mode major-mode major-mode))))))
+
+(defun lsp--buffer-visible-p ()
+  "Return non nil if current buffer is visible."
+  (or (buffer-modified-p) (get-buffer-window nil t)))
+
+(defun lsp--init-if-visible ()
+  "Run `lsp' for the current buffer if the buffer is visible.
+Returns non nil if `lsp' was run for the buffer."
+  (when (lsp--buffer-visible-p)
+    (remove-hook 'window-configuration-change-hook #'lsp--init-if-visible t)
+    (lsp)
+    t))
+
+;;;###autoload
+(defun lsp-deferred ()
+  "Entry point that defers server startup until buffer is visible.
+`lsp-deferred' will wait until the buffer is visible before invoking `lsp'.
+This avoids overloading the server with many files when starting Emacs."
+  ;; Workspace may not be initialized yet. Use a buffer local variable to
+  ;; remember that we deferred loading of this buffer.
+  (setq lsp--buffer-deferred t)
+  (let ((buffer (current-buffer)))
+    ;; Avoid false positives as desktop-mode restores buffers by deferring
+    ;; visibility check until the stack clears.
+    (run-with-idle-timer 0 nil (lambda ()
+                                 (when (buffer-live-p buffer)
+                                   (with-current-buffer buffer
+                                     (unless (lsp--init-if-visible)
+                                       (add-hook 'window-configuration-change-hook #'lsp--init-if-visible nil t))))))))
+
+
+
+(defvar lsp-file-truename-cache (ht))
+
+(defmacro lsp-with-cached-filetrue-name (&rest body)
+  "Executes BODY caching the `file-truename' calls."
+  `(let ((old-fn (symbol-function 'file-truename)))
+     (unwind-protect
+         (progn
+           (fset 'file-truename
+                 (lambda (file-name &optional counter prev-dirs)
+                   (or (gethash file-name lsp-file-truename-cache)
+                       (puthash file-name (apply old-fn (list file-name counter prev-dirs))
+                                lsp-file-truename-cache))))
+           ,@body)
+       (fset 'file-truename old-fn))))
+
+
+(defun lsp-virtual-buffer-call (key &rest args)
+  (when lsp--virtual-buffer
+    (when-let ((fn (plist-get lsp--virtual-buffer key)))
+      (apply fn args))))
+
+(defun lsp-translate-column (column)
+  "Translate COLUMN taking into account virtual buffers."
+  (or (lsp-virtual-buffer-call :real->virtual-char column)
+      column))
+
+(defun lsp-translate-line (line)
+  "Translate LINE taking into account virtual buffers."
+  (or (lsp-virtual-buffer-call :real->virtual-line line)
+      line))
+
+
+;; lsp internal validation.
+
+(defmacro lsp--doctor (&rest checks)
+  `(-let [buf (current-buffer)]
+     (with-current-buffer (get-buffer-create "*lsp-performance*")
+       (with-help-window (current-buffer)
+         ,@(-map (-lambda ((msg form))
+                   `(insert (format "%s: %s\n" ,msg
+                                    (let ((res (with-current-buffer buf
+                                                 ,form)))
+                                      (cond
+                                       ((eq res :optional) (propertize "OPTIONAL" 'face 'warning))
+                                       (res (propertize "OK" 'face 'success))
+                                       (t (propertize "ERROR" 'face 'error)))))))
+                 (-partition 2 checks))))))
+
+(define-obsolete-function-alias 'lsp-diagnose
+  'lsp-doctor "lsp-mode 8.0.0")
+
+(defun lsp-doctor ()
+  "Validate performance settings."
+  (interactive)
+  (lsp--doctor
+   "Checking for Native JSON support" (functionp 'json-serialize)
+   "Check emacs supports `read-process-output-max'" (boundp 'read-process-output-max)
+   "Check `read-process-output-max' default has been changed from 4k"
+   (and (boundp 'read-process-output-max)
+        (> read-process-output-max 4096))
+   "Byte compiled against Native JSON (recompile lsp-mode if failing when Native JSON available)"
+   (condition-case _err
+       (progn (lsp--make-message (list "a" "b"))
+              nil)
+     (error t))
+   "`gc-cons-threshold' increased?" (> gc-cons-threshold 800000)
+   "Using `plist' for deserialized objects? (refer to https://emacs-lsp.github.io/lsp-mode/page/performance/#use-plists-for-deserialization)" (or lsp-use-plists :optional)
+   "Using emacs 28+ with native compilation?"
+   (or (and (fboundp 'native-comp-available-p)
+            (native-comp-available-p))
+       :optional)))
+
+(declare-function package-version-join "ext:package")
+(declare-function package-desc-version "ext:package")
+(declare-function package--alist "ext:package")
+
+(defun lsp-version ()
+  "Return string describing current version of `lsp-mode'."
+  (interactive)
+  (unless (featurep 'package)
+    (require 'package))
+  (let ((ver (format "lsp-mode %s, Emacs %s, %s"
+                     (package-version-join
+                      (package-desc-version
+                       (car (alist-get 'lsp-mode (package--alist)))))
+                     emacs-version
+                     system-type)))
+    (if (called-interactively-p 'interactive)
+        (lsp--info "%s" ver)
+      ver)))
+
+
+
+;; org-mode/virtual-buffer
+
+(declare-function org-babel-get-src-block-info "ext:ob-core")
+(declare-function org-do-remove-indentation "ext:org-macs")
+(declare-function org-src-get-lang-mode "ext:org-src")
+(declare-function org-element-context "ext:org-element")
+
+(defun lsp--virtual-buffer-update-position ()
+  (-if-let (virtual-buffer (-first (-lambda ((&plist :in-range))
+                                     (funcall in-range))
+                                   lsp--virtual-buffer-connections))
+      (unless (equal virtual-buffer lsp--virtual-buffer)
+        (lsp-org))
+    (when lsp-managed-mode
+      (lsp-managed-mode -1)
+      (lsp-mode -1)
+      (setq lsp--buffer-workspaces nil)
+      (setq lsp--virtual-buffer nil)
+      (setq lsp-buffer-uri nil)
+
+      ;; force refresh of diagnostics
+      (run-hooks 'lsp-after-diagnostics-hook))))
+
+(defun lsp-virtual-buffer-on-change (start end length)
+  "Adjust on change event to be executed against the proper language server."
+  (let ((max-point (max end
+                        (or (plist-get lsp--before-change-vals :end) 0)
+                        (+ start length))))
+    (when-let ((virtual-buffer (-first (lambda (vb)
+                                         (let ((lsp--virtual-buffer vb))
+                                           (and (lsp-virtual-buffer-call :in-range start)
+                                                (lsp-virtual-buffer-call :in-range max-point))))
+                                       lsp--virtual-buffer-connections)))
+      (lsp-with-current-buffer virtual-buffer
+        (lsp-on-change start end length
+                       (lambda (&rest _)
+                         (list :range (lsp--range (list :character 0 :line 0)
+                                                  lsp--virtual-buffer-point-max)
+                               :text (lsp--buffer-content))))))))
+
+(defun lsp-virtual-buffer-before-change (start _end)
+  (when-let ((virtual-buffer (-first (lambda (vb)
+                                       (lsp-with-current-buffer vb
+                                         (lsp-virtual-buffer-call :in-range start)))
+                                     lsp--virtual-buffer-connections)))
+    (lsp-with-current-buffer virtual-buffer
+      (setq lsp--virtual-buffer-point-max
+            (lsp--point-to-position (lsp-virtual-buffer-call :last-point))))))
+
+(defun lsp-patch-on-change-event ()
+  (remove-hook 'after-change-functions #'lsp-on-change t)
+  (add-hook 'after-change-functions #'lsp-virtual-buffer-on-change nil t)
+  (add-hook 'before-change-functions #'lsp-virtual-buffer-before-change nil t))
+
+(defun lsp-kill-virtual-buffers ()
+  (mapc #'lsp-virtual-buffer-disconnect lsp--virtual-buffer-connections))
+
+(defun lsp--move-point-in-indentation (point indentation)
+  (save-excursion
+    (goto-char point)
+    (if (<= point (+ (line-beginning-position) indentation))
+        (line-beginning-position)
+      point)))
+
+(declare-function flycheck-checker-supports-major-mode-p "ext:flycheck")
+(declare-function flycheck-add-mode "ext:flycheck")
+(declare-function lsp-diagnostics-lsp-checker-if-needed "lsp-diagnostics")
+
+(defalias 'lsp-client-download-server-fn 'lsp--client-download-server-fn)
+
+(defun lsp-flycheck-add-mode (mode)
+  "Register flycheck support for MODE."
+  (lsp-diagnostics-lsp-checker-if-needed)
+  (unless (flycheck-checker-supports-major-mode-p 'lsp mode)
+    (flycheck-add-mode 'lsp mode)))
+
+(defun lsp-progress-spinner-type ()
+  "Retrieve the spinner type value, if value is not a symbol of `spinner-types
+defaults to `progress-bar."
+  (or (car (assoc lsp-progress-spinner-type spinner-types)) 'progress-bar))
+
+(defun lsp-org ()
+  (interactive)
+  (-if-let ((virtual-buffer &as &plist :workspaces) (-first (-lambda ((&plist :in-range))
+                                                              (funcall in-range))
+                                                            lsp--virtual-buffer-connections))
+      (unless (equal lsp--virtual-buffer virtual-buffer)
+        (setq lsp--buffer-workspaces workspaces)
+        (setq lsp--virtual-buffer virtual-buffer)
+        (setq lsp-buffer-uri nil)
+        (lsp-mode 1)
+        (lsp-managed-mode 1)
+        (lsp-patch-on-change-event))
+
+    (save-excursion
+      (-let* (virtual-buffer
+              (wcb (lambda (f)
+                     (with-current-buffer (plist-get virtual-buffer :buffer)
+                       (-let* (((&plist :major-mode :buffer-file-name
+                                        :goto-buffer :workspaces) virtual-buffer)
+                               (lsp--virtual-buffer virtual-buffer)
+                               (lsp--buffer-workspaces workspaces))
+                         (save-excursion
+                           (funcall goto-buffer)
+                           (funcall f))))))
+              ((&plist :begin :end :post-blank :language) (cl-second (org-element-context)))
+              ((&alist :tangle file-name) (cl-third (org-babel-get-src-block-info 'light)))
+
+              (file-name (if file-name
+                             (f-expand file-name)
+                           (user-error "You should specify file name in the src block header.")))
+              (begin-marker (progn
+                              (goto-char begin)
+                              (forward-line)
+                              (set-marker (make-marker) (point))))
+              (end-marker (progn
+                            (goto-char end)
+                            (forward-line (1- (- post-blank)))
+                            (set-marker (make-marker) (1+ (point)))))
+              (buf (current-buffer))
+              (src-block (buffer-substring-no-properties begin-marker
+                                                         (1- end-marker)))
+              (indentation (with-temp-buffer
+                             (insert src-block)
+
+                             (goto-char (point-min))
+                             (let ((indentation (current-indentation)))
+                               (plist-put lsp--virtual-buffer :indentation indentation)
+                               (org-do-remove-indentation)
+                               (goto-char (point-min))
+                               (- indentation (current-indentation))))))
+        (add-hook 'post-command-hook #'lsp--virtual-buffer-update-position nil t)
+
+        (when (fboundp 'flycheck-add-mode)
+          (lsp-flycheck-add-mode 'org-mode))
+
+        (setq lsp--virtual-buffer
+              (list
+               :in-range (lambda (&optional point)
+                           (<= begin-marker (or point (point)) (1- end-marker)))
+               :goto-buffer (lambda () (goto-char begin-marker))
+               :buffer-string
+               (lambda ()
+                 (let ((src-block (buffer-substring-no-properties
+                                   begin-marker
+                                   (1- end-marker))))
+                   (with-temp-buffer
+                     (insert src-block)
+
+                     (goto-char (point-min))
+                     (while (not (eobp))
+                       (delete-region (point) (if (> (+ (point) indentation) (line-end-position))
+                                                  (line-end-position)
+                                                (+ (point) indentation)))
+                       (forward-line))
+                     (buffer-substring-no-properties (point-min)
+                                                     (point-max)))))
+               :buffer buf
+               :begin begin-marker
+               :end end-marker
+               :indentation indentation
+               :last-point (lambda () (1- end-marker))
+               :cur-position (lambda ()
+                               (lsp-save-restriction-and-excursion
+                                 (list :line (- (lsp--cur-line)
+                                                (lsp--cur-line begin-marker))
+                                       :character (let ((character (- (point)
+                                                                      (line-beginning-position)
+                                                                      indentation)))
+                                                    (if (< character 0)
+                                                        0
+                                                      character)))))
+               :line/character->point (-lambda (line character)
+                                        (-let [inhibit-field-text-motion t]
+                                          (+ indentation
+                                             (lsp-save-restriction-and-excursion
+                                               (goto-char begin-marker)
+                                               (forward-line line)
+                                               (-let [line-end (line-end-position)]
+                                                 (if (> character (- line-end (point)))
+                                                     line-end
+                                                   (forward-char character)
+                                                   (point)))))))
+               :major-mode (org-src-get-lang-mode language)
+               :buffer-file-name file-name
+               :buffer-uri (lsp--path-to-uri file-name)
+               :with-current-buffer wcb
+               :buffer-live? (lambda (_) (buffer-live-p buf))
+               :buffer-name (lambda (_)
+                              (propertize (format "%s(%s:%s)%s"
+                                                  (buffer-name buf)
+                                                  begin-marker
+                                                  end-marker
+                                                  language)
+                                          'face 'italic))
+               :real->virtual-line (lambda (line)
+                                     (+ line (line-number-at-pos begin-marker) -1))
+               :real->virtual-char (lambda (char) (+ char indentation))
+               :cleanup (lambda ()
+                          (set-marker begin-marker nil)
+                          (set-marker end-marker nil))))
+        (setf virtual-buffer lsp--virtual-buffer)
+        (puthash file-name virtual-buffer lsp--virtual-buffer-mappings)
+        (push virtual-buffer lsp--virtual-buffer-connections)
+
+        ;; TODO: tangle only connected sections
+        (add-hook 'after-save-hook 'org-babel-tangle nil t)
+        (add-hook 'lsp-after-open-hook #'lsp-patch-on-change-event nil t)
+        (add-hook 'kill-buffer-hook #'lsp-kill-virtual-buffers nil t)
+
+        (setq lsp--buffer-workspaces
+              (lsp-with-current-buffer virtual-buffer
+                (lsp)
+                (plist-put virtual-buffer :workspaces (lsp-workspaces))
+                (lsp-workspaces)))))))
+
+(defun lsp-virtual-buffer-disconnect (virtual-buffer)
+  (interactive (list (or
+                      lsp--virtual-buffer
+                      (when lsp--virtual-buffer-connections
+                        (lsp--completing-read "Select virtual buffer to disconnect: "
+                                              lsp--virtual-buffer-connections
+                                              (-lambda ((&plist :buffer-file-name))
+                                                buffer-file-name))))))
+  (-if-let ((&plist :buffer-file-name file-name :cleanup) virtual-buffer)
+      (progn
+        (lsp-with-current-buffer virtual-buffer
+          (lsp--text-document-did-close))
+        (setq lsp--virtual-buffer-connections (-remove-item virtual-buffer lsp--virtual-buffer-connections))
+        (when (eq virtual-buffer lsp--virtual-buffer)
+          (setf lsp--virtual-buffer nil))
+        (when cleanup (funcall cleanup))
+        (remhash file-name lsp--virtual-buffer-mappings)
+
+        (lsp--virtual-buffer-update-position)
+        (lsp--info "Disconnected from buffer %s" file-name))
+    (lsp--error "Nothing to disconnect from?")))
+
+
+;; inlay hints
+
+(defface lsp-inlay-hint-face
+  '((t :inherit font-lock-comment-face))
+  "The face to use for the JavaScript inlays."
+  :group 'lsp-mode
+  :package-version '(lsp-mode . "9.0.0"))
+
+(defface lsp-inlay-hint-type-face
+  '((t :inherit lsp-inlay-hint-face))
+  "Face for inlay type hints (e.g. inferred variable types)."
+  :group 'lsp-mode
+  :package-version '(lsp-mode . "9.0.0"))
+
+(defcustom lsp-inlay-hint-type-format "%s"
+  "Format string for variable inlays (part of the inlay face)."
+  :type '(string :tag "String")
+  :group 'lsp-mode
+  :package-version '(lsp-mode . "9.0.0"))
+
+(defface lsp-inlay-hint-parameter-face
+  '((t :inherit lsp-inlay-hint-face))
+  "Face for inlay parameter hints (e.g. function parameter names at
+call-site)."
+  :group 'lsp-mode
+  :package-version '(lsp-mode . "9.0.0"))
+
+(defcustom lsp-inlay-hint-param-format "%s"
+  "Format string for parameter inlays (part of the inlay face)."
+  :type '(string :tag "String")
+  :group 'lsp-mode
+  :package-version '(lsp-mode . "9.0.0"))
+
+(defcustom lsp-update-inlay-hints-on-scroll t
+  "If non-nil update inlay hints immediately when scrolling or
+modifying window sizes."
+  :type 'boolean
+  :package-version '(lsp-mode . "9.0.0"))
+
+(defun lsp--format-inlay (text kind)
+  (cond
+   ((eql kind lsp/inlay-hint-kind-type-hint) (format lsp-inlay-hint-type-format text))
+   ((eql kind lsp/inlay-hint-kind-parameter-hint) (format lsp-inlay-hint-param-format text))
+   (t text)))
+
+(defun lsp--face-for-inlay (kind)
+  (cond
+   ((eql kind lsp/inlay-hint-kind-type-hint) 'lsp-inlay-hint-type-face)
+   ((eql kind lsp/inlay-hint-kind-parameter-hint) 'lsp-inlay-hint-parameter-face)
+   (t 'lsp-inlay-hint-face)))
+
+(defun lsp--update-inlay-hints-scroll-function (window start)
+  (lsp-update-inlay-hints start (window-end window t)))
+
+(defun lsp--update-inlay-hints ()
+  (lsp-update-inlay-hints (window-start) (window-end nil t)))
+
+(defun lsp--label-from-inlay-hints-response (label)
+  "Returns a string label built from an array of
+InlayHintLabelParts or the argument itself if it's already a
+string."
+  (cl-typecase label
+    (string label)
+    (vector
+     (string-join (mapcar (lambda (part)
+                            (-let (((&InlayHintLabelPart :value) part))
+                              value))
+                          label)))))
+
+(defun lsp-update-inlay-hints (start end)
+  (lsp-request-async
+   "textDocument/inlayHint"
+   (lsp-make-inlay-hints-params
+    :text-document (lsp--text-document-identifier)
+    :range (lsp-make-range :start
+                           (lsp-point-to-position start)
+                           :end
+                           (lsp-point-to-position end)))
+   (lambda (res)
+     (lsp--remove-overlays 'lsp-inlay-hint)
+     (dolist (hint res)
+       (-let* (((&InlayHint :label :position :kind? :padding-left? :padding-right?) hint)
+               (kind (or kind? lsp/inlay-hint-kind-type-hint))
+               (label (lsp--label-from-inlay-hints-response label))
+               (pos (lsp--position-to-point position))
+               (overlay (make-overlay pos pos nil 'front-advance 'end-advance)))
+         (when (stringp label)
+           (overlay-put overlay 'lsp-inlay-hint t)
+           (overlay-put overlay 'before-string
+                        (format "%s%s%s"
+                                (if padding-left? " " "")
+                                (propertize (lsp--format-inlay label kind)
+                                            'font-lock-face (lsp--face-for-inlay kind))
+                                (if padding-right? " " "")))))))
+   :mode 'tick))
+
+(define-minor-mode lsp-inlay-hints-mode
+  "Mode for displaying inlay hints."
+  :lighter nil
+  (cond
+   ((and lsp-inlay-hints-mode lsp--buffer-workspaces)
+    (add-hook 'lsp-on-idle-hook #'lsp--update-inlay-hints nil t)
+    (when lsp-update-inlay-hints-on-scroll
+      (add-to-list (make-local-variable 'window-scroll-functions)
+                   #'lsp--update-inlay-hints-scroll-function)))
+   (t
+    (lsp--remove-overlays 'lsp-inlay-hint)
+    (remove-hook 'lsp-on-idle-hook #'lsp--update-inlay-hints t)
+    (setf window-scroll-functions
+          (delete #'lsp--update-inlay-hints-scroll-function window-scroll-functions)))))
+
+
+
+;;;###autoload
+(defun lsp-start-plain ()
+  "Start `lsp-mode' using minimal configuration using the latest `melpa' version
+of the packages.
+
+In case the major-mode that you are using for "
+  (interactive)
+  (let ((start-plain (make-temp-file "plain" nil ".el")))
+    (url-copy-file "https://raw.githubusercontent.com/emacs-lsp/lsp-mode/master/scripts/lsp-start-plain.el"
+                   start-plain t)
+    (async-shell-command
+     (format "%s -q -l %s %s"
+             (expand-file-name invocation-name invocation-directory)
+             start-plain
+             (or (buffer-file-name) ""))
+     (generate-new-buffer " *lsp-start-plain*"))))
+
+
+
+(provide 'lsp-mode)
+;;; lsp-mode.el ends here
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-mode.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-mode.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-modeline.el b/emacs/elpa/lsp-mode-20241003.636/lsp-modeline.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-modeline.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-modeline.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-mojo.el b/emacs/elpa/lsp-mode-20241003.636/lsp-mojo.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-mojo.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-mojo.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-move.el b/emacs/elpa/lsp-mode-20241003.636/lsp-move.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-move.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-move.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-nginx.el b/emacs/elpa/lsp-mode-20241003.636/lsp-nginx.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-nginx.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-nginx.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-nim.el b/emacs/elpa/lsp-mode-20241003.636/lsp-nim.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-nim.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-nim.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-nix.el b/emacs/elpa/lsp-mode-20241003.636/lsp-nix.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-nix.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-nix.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-nushell.el b/emacs/elpa/lsp-mode-20241003.636/lsp-nushell.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-nushell.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-nushell.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-ocaml.el b/emacs/elpa/lsp-mode-20241003.636/lsp-ocaml.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-ocaml.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-ocaml.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-openscad.el b/emacs/elpa/lsp-mode-20241003.636/lsp-openscad.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-openscad.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-openscad.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-perl.el b/emacs/elpa/lsp-mode-20241003.636/lsp-perl.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-perl.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-perl.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-perlnavigator.el b/emacs/elpa/lsp-mode-20241003.636/lsp-perlnavigator.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-perlnavigator.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-perlnavigator.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-php.el b/emacs/elpa/lsp-mode-20241003.636/lsp-php.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-php.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-php.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-pls.el b/emacs/elpa/lsp-mode-20241003.636/lsp-pls.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-pls.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-pls.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-prolog.el b/emacs/elpa/lsp-mode-20241003.636/lsp-prolog.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-prolog.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-prolog.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-protocol.el b/emacs/elpa/lsp-mode-20241003.636/lsp-protocol.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-protocol.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-protocol.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-purescript.el b/emacs/elpa/lsp-mode-20241003.636/lsp-purescript.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-purescript.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-purescript.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-pwsh.el b/emacs/elpa/lsp-mode-20241003.636/lsp-pwsh.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-pwsh.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-pwsh.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-pyls.el b/emacs/elpa/lsp-mode-20241003.636/lsp-pyls.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-pyls.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-pyls.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-pylsp.el b/emacs/elpa/lsp-mode-20241003.636/lsp-pylsp.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-pylsp.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-pylsp.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-qml.el b/emacs/elpa/lsp-mode-20241003.636/lsp-qml.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-qml.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-qml.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-r.el b/emacs/elpa/lsp-mode-20241003.636/lsp-r.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-r.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-r.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-racket.el b/emacs/elpa/lsp-mode-20241003.636/lsp-racket.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-racket.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-racket.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-remark.el b/emacs/elpa/lsp-mode-20241003.636/lsp-remark.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-remark.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-remark.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-rf.el b/emacs/elpa/lsp-mode-20241003.636/lsp-rf.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-rf.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-rf.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-roslyn.el b/emacs/elpa/lsp-mode-20241003.636/lsp-roslyn.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-roslyn.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-roslyn.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-rpm-spec.el b/emacs/elpa/lsp-mode-20241003.636/lsp-rpm-spec.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-rpm-spec.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-rpm-spec.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-rubocop.el b/emacs/elpa/lsp-mode-20241003.636/lsp-rubocop.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-rubocop.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-rubocop.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-ruby-lsp.el b/emacs/elpa/lsp-mode-20241003.636/lsp-ruby-lsp.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-ruby-lsp.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-ruby-lsp.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-ruby-syntax-tree.el b/emacs/elpa/lsp-mode-20241003.636/lsp-ruby-syntax-tree.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-ruby-syntax-tree.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-ruby-syntax-tree.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-ruff.el b/emacs/elpa/lsp-mode-20241003.636/lsp-ruff.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-ruff.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-ruff.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-rust.el b/emacs/elpa/lsp-mode-20241003.636/lsp-rust.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-rust.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-rust.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-semantic-tokens.el b/emacs/elpa/lsp-mode-20241003.636/lsp-semantic-tokens.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-semantic-tokens.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-semantic-tokens.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-semgrep.el b/emacs/elpa/lsp-mode-20241003.636/lsp-semgrep.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-semgrep.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-semgrep.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-sml.el b/emacs/elpa/lsp-mode-20241003.636/lsp-sml.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-sml.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-sml.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-solargraph.el b/emacs/elpa/lsp-mode-20241003.636/lsp-solargraph.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-solargraph.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-solargraph.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-solidity.el b/emacs/elpa/lsp-mode-20241003.636/lsp-solidity.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-solidity.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-solidity.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-sorbet.el b/emacs/elpa/lsp-mode-20241003.636/lsp-sorbet.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-sorbet.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-sorbet.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-sql.el b/emacs/elpa/lsp-mode-20241003.636/lsp-sql.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-sql.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-sql.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-sqls.el b/emacs/elpa/lsp-mode-20241003.636/lsp-sqls.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-sqls.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-sqls.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-steep.el b/emacs/elpa/lsp-mode-20241003.636/lsp-steep.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-steep.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-steep.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-svelte.el b/emacs/elpa/lsp-mode-20241003.636/lsp-svelte.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-svelte.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-svelte.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-terraform.el b/emacs/elpa/lsp-mode-20241003.636/lsp-terraform.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-terraform.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-terraform.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-tex.el b/emacs/elpa/lsp-mode-20241003.636/lsp-tex.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-tex.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-tex.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-tilt.el b/emacs/elpa/lsp-mode-20241003.636/lsp-tilt.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-tilt.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-tilt.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-toml.el b/emacs/elpa/lsp-mode-20241003.636/lsp-toml.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-toml.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-toml.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-trunk.el b/emacs/elpa/lsp-mode-20241003.636/lsp-trunk.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-trunk.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-trunk.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-ttcn3.el b/emacs/elpa/lsp-mode-20241003.636/lsp-ttcn3.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-ttcn3.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-ttcn3.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-typeprof.el b/emacs/elpa/lsp-mode-20241003.636/lsp-typeprof.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-typeprof.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-typeprof.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-v.el b/emacs/elpa/lsp-mode-20241003.636/lsp-v.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-v.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-v.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-vala.el b/emacs/elpa/lsp-mode-20241003.636/lsp-vala.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-vala.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-vala.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-verilog.el b/emacs/elpa/lsp-mode-20241003.636/lsp-verilog.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-verilog.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-verilog.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-vetur.el b/emacs/elpa/lsp-mode-20241003.636/lsp-vetur.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-vetur.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-vetur.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-vhdl.el b/emacs/elpa/lsp-mode-20241003.636/lsp-vhdl.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-vhdl.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-vhdl.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-vimscript.el b/emacs/elpa/lsp-mode-20241003.636/lsp-vimscript.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-vimscript.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-vimscript.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-volar.el b/emacs/elpa/lsp-mode-20241003.636/lsp-volar.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-volar.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-volar.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-wgsl.el b/emacs/elpa/lsp-mode-20241003.636/lsp-wgsl.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-wgsl.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-wgsl.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-xml.el b/emacs/elpa/lsp-mode-20241003.636/lsp-xml.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-xml.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-xml.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-yaml.el b/emacs/elpa/lsp-mode-20241003.636/lsp-yaml.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-yaml.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-yaml.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-yang.el b/emacs/elpa/lsp-mode-20241003.636/lsp-yang.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-yang.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-yang.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-zig.el b/emacs/elpa/lsp-mode-20241003.636/lsp-zig.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp-zig.elc b/emacs/elpa/lsp-mode-20241003.636/lsp-zig.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp.el b/emacs/elpa/lsp-mode-20241003.636/lsp.el
diff --git a/emacs/elpa/lsp-mode-20240930.1803/lsp.elc b/emacs/elpa/lsp-mode-20241003.636/lsp.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240930.1805/git-commit.elc b/emacs/elpa/magit-20240930.1805/git-commit.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240930.1805/magit-blame.el b/emacs/elpa/magit-20240930.1805/magit-blame.el
@@ -1,989 +0,0 @@
-;;; magit-blame.el --- Blame support for Magit  -*- lexical-binding:t -*-
-
-;; Copyright (C) 2008-2024 The Magit Project Contributors
-
-;; Author: Jonas Bernoulli <emacs.magit@jonas.bernoulli.dev>
-;; Maintainer: Jonas Bernoulli <emacs.magit@jonas.bernoulli.dev>
-
-;; SPDX-License-Identifier: GPL-3.0-or-later
-
-;; Magit is free software: you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-;;
-;; Magit is distributed in the hope that it will be useful, but WITHOUT
-;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-;; or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
-;; License for more details.
-;;
-;; You should have received a copy of the GNU General Public License
-;; along with Magit.  If not, see <https://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; Annotates each line in file-visiting buffer with information from
-;; the revision which last modified the line.
-
-;;; Code:
-
-(require 'magit)
-
-;;; Options
-
-(defgroup magit-blame nil
-  "Blame support for Magit."
-  :link '(info-link "(magit)Blaming")
-  :group 'magit-modes)
-
-(defcustom magit-blame-styles
-  '((headings
-     (heading-format   . "%-20a %C %s\n"))
-    (highlight
-     (highlight-face   . magit-blame-highlight))
-    (lines
-     (show-lines       . t)
-     (show-message     . t)))
-  "List of styles used to visualize blame information.
-
-The style used in the current buffer can be cycled from the blame
-popup.  Blame commands (except `magit-blame-echo') use the first
-style as the initial style when beginning to blame in a buffer.
-
-Each entry has the form (IDENT (KEY . VALUE)...).  IDENT has
-to be a symbol uniquely identifying the style.  The following
-KEYs are recognized:
-
- `show-lines'
-    Whether to prefix each chunk of lines with a thin line.
-    This has no effect if `heading-format' is non-nil.
- `show-message'
-    Whether to display a commit's summary line in the echo area
-    when crossing chunks.
- `highlight-face'
-    Face used to highlight the first line of each chunk.
-    If this is nil, then those lines are not highlighted.
- `heading-format'
-    String specifying the information to be shown above each
-    chunk of lines.  It must end with a newline character.
- `margin-format'
-    String specifying the information to be shown in the left
-    buffer margin.  It must NOT end with a newline character.
-    This can also be a list of formats used for the lines at
-    the same positions within the chunk.  If the chunk has
-    more lines than formats are specified, then the last is
-    repeated.  WARNING: Adding this key affects performance;
-    see the note at the end of this docstring.
- `margin-width'
-    Width of the margin, provided `margin-format' is non-nil.
- `margin-face'
-    Face used in the margin, provided `margin-format' is
-    non-nil.  This face is used in combination with the faces
-    that are specific to the used %-specs.  If this is nil,
-    then `magit-blame-margin' is used.
- `margin-body-face'
-    Face used in the margin for all but first line of a chunk.
-    This face is used in combination with the faces that are
-    specific to the used %-specs.  This can also be a list of
-    faces (usually one face), in which case only these faces
-    are used and the %-spec faces are ignored.  A good value
-    might be `(magit-blame-dimmed)'.  If this is nil, then
-    the same face as for the first line is used.
-
-The following %-specs can be used in `heading-format' and
-`margin-format':
-
-  %H    hash              using face `magit-blame-hash'
-  %s    summary           using face `magit-blame-summary'
-  %a    author            using face `magit-blame-name'
-  %A    author time       using face `magit-blame-date'
-  %c    committer         using face `magit-blame-name'
-  %C    committer time    using face `magit-blame-date'
-
-Additionally if `margin-format' ends with %f, then the string
-that is displayed in the margin is made at least `margin-width'
-characters wide, which may be desirable if the used face sets
-the background color.
-
-Blame information is displayed using overlays.  Such extensive
-use of overlays is known to slow down even basic operations, such
-as moving the cursor. To reduce the number of overlays the margin
-style had to be removed from the default value of this option.
-
-Note that the margin overlays are created even if another style
-is currently active.  This can only be prevented by not even
-defining a style that uses the margin.  If you want to use this
-style anyway, you can restore this definition, which used to be
-part of the default value:
-
-  (margin
-   (margin-format    . (\" %s%f\" \" %C %a\" \" %H\"))
-   (margin-width     . 42)
-   (margin-face      . magit-blame-margin)
-   (margin-body-face . (magit-blame-dimmed)))"
-  :package-version '(magit . "2.13.0")
-  :group 'magit-blame
-  :type 'string)
-
-(defcustom magit-blame-echo-style 'lines
-  "The blame visualization style used by `magit-blame-echo'.
-A symbol that has to be used as the identifier for one of the
-styles defined in `magit-blame-styles'."
-  :package-version '(magit . "2.13.0")
-  :group 'magit-blame
-  :type 'symbol)
-
-(defcustom magit-blame-time-format "%F %H:%M"
-  "Format for time strings in blame headings."
-  :group 'magit-blame
-  :type 'string)
-
-(defcustom magit-blame-read-only t
-  "Whether to initially make the blamed buffer read-only."
-  :package-version '(magit . "2.13.0")
-  :group 'magit-blame
-  :type 'boolean)
-
-(defcustom magit-blame-disable-modes '(fci-mode yascroll-bar-mode)
-  "List of modes not compatible with Magit-Blame mode.
-This modes are turned off when Magit-Blame mode is turned on,
-and then turned on again when turning off the latter."
-  :group 'magit-blame
-  :type '(repeat (symbol :tag "Mode")))
-
-(defcustom magit-blame-mode-lighter " Blame"
-  "The mode-line lighter of the Magit-Blame mode."
-  :group 'magit-blame
-  :type '(choice (const :tag "No lighter" "") string))
-
-(defcustom magit-blame-goto-chunk-hook
-  '(magit-blame-maybe-update-revision-buffer
-    magit-blame-maybe-show-message)
-  "Hook run after point entered another chunk."
-  :package-version '(magit . "2.13.0")
-  :group 'magit-blame
-  :type 'hook
-  :get #'magit-hook-custom-get
-  :options '(magit-blame-maybe-update-revision-buffer
-             magit-blame-maybe-show-message))
-
-;;; Faces
-
-(defface magit-blame-highlight
-  `((((class color) (background light))
-     ,@(and (>= emacs-major-version 27) '(:extend t))
-     :background "grey80"
-     :foreground "black")
-    (((class color) (background dark))
-     ,@(and (>= emacs-major-version 27) '(:extend t))
-     :background "grey25"
-     :foreground "white"))
-  "Face used for highlighting when blaming.
-Also see option `magit-blame-styles'."
-  :group 'magit-faces)
-
-(defface magit-blame-margin
-  '((t :inherit magit-blame-highlight
-       :weight normal
-       :slant normal))
-  "Face used for the blame margin by default when blaming.
-Also see option `magit-blame-styles'."
-  :group 'magit-faces)
-
-(defface magit-blame-dimmed
-  '((t :inherit magit-dimmed
-       :weight normal
-       :slant normal))
-  "Face used for the blame margin in some cases when blaming.
-Also see option `magit-blame-styles'."
-  :group 'magit-faces)
-
-(defface magit-blame-heading
-  `((t ,@(and (>= emacs-major-version 27) '(:extend t))
-       :inherit magit-blame-highlight
-       :weight normal
-       :slant normal))
-  "Face used for blame headings by default when blaming.
-Also see option `magit-blame-styles'."
-  :group 'magit-faces)
-
-(defface magit-blame-summary '((t nil))
-  "Face used for commit summaries when blaming."
-  :group 'magit-faces)
-
-(defface magit-blame-hash '((t nil))
-  "Face used for commit hashes when blaming."
-  :group 'magit-faces)
-
-(defface magit-blame-name '((t nil))
-  "Face used for author and committer names when blaming."
-  :group 'magit-faces)
-
-(defface magit-blame-date '((t nil))
-  "Face used for dates when blaming."
-  :group 'magit-faces)
-
-;;; Variables
-
-(defvar-local magit-blame-buffer-read-only nil)
-(defvar-local magit-blame-cache nil)
-(defvar-local magit-blame-disabled-modes nil)
-(defvar-local magit-blame-process nil)
-(defvar-local magit-blame-recursive-p nil)
-(defvar-local magit-blame-type nil)
-(defvar-local magit-blame-separator nil)
-(defvar-local magit-blame-previous-chunk nil)
-
-(defvar-local magit-blame--make-margin-overlays nil)
-(defvar-local magit-blame--style nil)
-
-;;; Chunks
-
-(defclass magit-blame-chunk ()
-  (;; <orig-rev> <orig-line> <final-line> <num-lines>
-   (orig-rev   :initarg :orig-rev)
-   (orig-line  :initarg :orig-line)
-   (final-line :initarg :final-line)
-   (num-lines  :initarg :num-lines)
-   ;; previous <prev-rev> <prev-file>
-   (prev-rev   :initform nil)
-   (prev-file  :initform nil)
-   ;; filename <orig-file>
-   (orig-file)))
-
-(defun magit-current-blame-chunk (&optional type noerror)
-  (or (and (not (and type (not (eq type magit-blame-type))))
-           (magit-blame-chunk-at (point)))
-      (and type
-           (let ((rev  (or magit-buffer-refname magit-buffer-revision))
-                 (file (and (not (derived-mode-p 'dired-mode))
-                            (magit-file-relative-name
-                             nil (not magit-buffer-file-name))))
-                 (line (format "%d,+1" (line-number-at-pos))))
-             (cond (file (with-temp-buffer
-                           (magit-with-toplevel
-                             (magit-git-insert
-                              "blame" "--porcelain"
-                              (if (memq magit-blame-type '(final removal))
-                                  (cons "--reverse" (magit-blame-arguments))
-                                (magit-blame-arguments))
-                              "-L" line rev "--" file)
-                             (goto-char (point-min))
-                             (if (eobp)
-                                 (unless noerror
-                                   (error "Cannot get blame chunk at eob"))
-                               (car (magit-blame--parse-chunk type))))))
-                   (noerror nil)
-                   ((error "Buffer does not visit a tracked file")))))))
-
-(defun magit-blame-chunk-at (pos)
-  (--some (overlay-get it 'magit-blame-chunk)
-          (overlays-at pos)))
-
-(defun magit-blame--overlay-at (&optional pos key)
-  (unless pos
-    (setq pos (point)))
-  (--first (overlay-get it (or key 'magit-blame-chunk))
-           (nconc (overlays-at pos)
-                  (overlays-in pos pos))))
-
-;;; Keymaps
-
-(defvar-keymap magit-blame-mode-map
-  :doc "Keymap for `magit-blame-mode'.
-Note that most blaming key bindings are defined
-in `magit-blame-read-only-mode-map' instead."
-  "C-c C-q" #'magit-blame-quit)
-
-(defvar-keymap magit-blame-read-only-mode-map
-  :doc "Keymap for `magit-blame-read-only-mode'."
-  "C-m" #'magit-show-commit
-  "p"   #'magit-blame-previous-chunk
-  "P"   #'magit-blame-previous-chunk-same-commit
-  "n"   #'magit-blame-next-chunk
-  "N"   #'magit-blame-next-chunk-same-commit
-  "b"   #'magit-blame-addition
-  "r"   #'magit-blame-removal
-  "f"   #'magit-blame-reverse
-  "B"   #'magit-blame
-  "c"   #'magit-blame-cycle-style
-  "q"   #'magit-blame-quit
-  "M-w" #'magit-blame-copy-hash
-  "SPC"   #'magit-diff-show-or-scroll-up
-  "S-SPC" #'magit-diff-show-or-scroll-down
-  "DEL"   #'magit-diff-show-or-scroll-down)
-
-;;; Modes
-;;;; Base Mode
-
-(define-minor-mode magit-blame-mode
-  "Display blame information inline."
-  :lighter magit-blame-mode-lighter
-  :interactive nil
-  (cond (magit-blame-mode
-         (unless arg
-           ;; Emacs < 28.1 doesn't support `:interactive'.
-           (setq magit-blame-mode nil)
-           (user-error
-            (concat "Don't call `magit-blame-mode' directly; "
-                    "instead use `magit-blame'")))
-         (add-hook 'after-save-hook     #'magit-blame--refresh t t)
-         (add-hook 'post-command-hook   #'magit-blame-goto-chunk-hook t t)
-         (add-hook 'before-revert-hook  #'magit-blame--remove-overlays t t)
-         (add-hook 'after-revert-hook   #'magit-blame--refresh t t)
-         (add-hook 'read-only-mode-hook #'magit-blame-toggle-read-only t t)
-         (setq magit-blame-buffer-read-only buffer-read-only)
-         (when (or magit-blame-read-only magit-buffer-file-name)
-           (read-only-mode 1))
-         (dolist (mode magit-blame-disable-modes)
-           (when (and (boundp mode) (symbol-value mode))
-             (funcall mode -1)
-             (push mode magit-blame-disabled-modes)))
-         (setq magit-blame-separator (magit-blame--format-separator))
-         (unless magit-blame--style
-           (setq magit-blame--style (car magit-blame-styles)))
-         (setq magit-blame--make-margin-overlays
-               (and (cl-find-if (lambda (style)
-                                  (assq 'margin-format (cdr style)))
-                                magit-blame-styles)))
-         (magit-blame--update-margin))
-        (t
-         (when (process-live-p magit-blame-process)
-           (kill-process magit-blame-process)
-           (while magit-blame-process
-             (sit-for 0.01))) ; avoid racing the sentinel
-         (remove-hook 'after-save-hook     #'magit-blame--refresh t)
-         (remove-hook 'post-command-hook   #'magit-blame-goto-chunk-hook t)
-         (remove-hook 'before-revert-hook  #'magit-blame--remove-overlays t)
-         (remove-hook 'after-revert-hook   #'magit-blame--refresh t)
-         (remove-hook 'read-only-mode-hook #'magit-blame-toggle-read-only t)
-         (unless magit-blame-buffer-read-only
-           (read-only-mode -1))
-         (magit-blame-read-only-mode -1)
-         (dolist (mode magit-blame-disabled-modes)
-           (funcall mode 1))
-         (kill-local-variable 'magit-blame-disabled-modes)
-         (kill-local-variable 'magit-blame-type)
-         (kill-local-variable 'magit-blame--style)
-         (magit-blame--update-margin)
-         (magit-blame--remove-overlays))))
-
-(defun magit-blame--refresh ()
-  (magit-blame--run (magit-blame-arguments)))
-
-(defun magit-blame-goto-chunk-hook ()
-  (let ((chunk (magit-blame-chunk-at (point))))
-    (when (cl-typep chunk 'magit-blame-chunk)
-      (unless (eq chunk magit-blame-previous-chunk)
-        (run-hooks 'magit-blame-goto-chunk-hook))
-      (setq magit-blame-previous-chunk chunk))))
-
-(defun magit-blame-toggle-read-only ()
-  (magit-blame-read-only-mode (if buffer-read-only 1 -1)))
-
-;;;; Read-Only Mode
-
-(define-minor-mode magit-blame-read-only-mode
-  "Provide keybindings for Magit-Blame mode.
-
-This minor-mode provides the key bindings for Magit-Blame mode,
-but only when Read-Only mode is also enabled because these key
-bindings would otherwise conflict badly with regular bindings.
-
-When both Magit-Blame mode and Read-Only mode are enabled, then
-this mode gets automatically enabled too and when one of these
-modes is toggled, then this mode also gets toggled automatically.
-
-\\{magit-blame-read-only-mode-map}")
-
-;;;; Kludges
-
-(defun magit-blame-put-keymap-before-view-mode ()
-  "Put `magit-blame-read-only-mode' ahead of `view-mode' in `minor-mode-map-alist'."
-  (when-let ((entry (assq 'magit-blame-read-only-mode
-                          (cl-member 'view-mode minor-mode-map-alist
-                                     :key #'car))))
-    (setq minor-mode-map-alist
-          (cons entry
-                (delq entry minor-mode-map-alist))))
-  (remove-hook 'view-mode-hook #'magit-blame-put-keymap-before-view-mode))
-
-(add-hook 'view-mode-hook #'magit-blame-put-keymap-before-view-mode)
-
-;;; Process
-
-(defun magit-blame--run (args)
-  (magit-with-toplevel
-    (unless magit-blame-mode
-      (magit-blame-mode 1))
-    (message "Blaming...")
-    (magit-blame-run-process
-     (or magit-buffer-refname magit-buffer-revision)
-     (magit-file-relative-name nil (not magit-buffer-file-name))
-     (if (memq magit-blame-type '(final removal))
-         (cons "--reverse" args)
-       args)
-     (list (line-number-at-pos (window-start))
-           (line-number-at-pos (1- (window-end nil t)))))
-    (set-process-sentinel magit-this-process
-                          #'magit-blame-process-quickstart-sentinel)))
-
-(defun magit-blame-run-process (revision file args &optional lines)
-  (let ((process (magit-parse-git-async
-                  "blame" "--incremental" args
-                  (and lines (list "-L" (apply #'format "%s,%s" lines)))
-                  revision "--" file)))
-    (set-process-filter   process #'magit-blame-process-filter)
-    (set-process-sentinel process #'magit-blame-process-sentinel)
-    (process-put process 'arguments (list revision file args))
-    (setq magit-blame-cache (make-hash-table :test #'equal))
-    (setq magit-blame-process process)))
-
-(defun magit-blame-process-quickstart-sentinel (process event)
-  (when (memq (process-status process) '(exit signal))
-    (magit-blame-process-sentinel process event t)
-    (magit-blame-assert-buffer process)
-    (with-current-buffer (process-get process 'command-buf)
-      (when magit-blame-mode
-        (let ((default-directory (magit-toplevel)))
-          (apply #'magit-blame-run-process
-                 (process-get process 'arguments)))))))
-
-(defun magit-blame-process-sentinel (process _event &optional quiet)
-  (let ((status (process-status process)))
-    (when (memq status '(exit signal))
-      (kill-buffer (process-buffer process))
-      (kill-buffer (process-get process 'stderr-buf))
-      (if (and (eq status 'exit)
-               (zerop (process-exit-status process)))
-          (unless quiet
-            (message "Blaming...done"))
-        (magit-blame-assert-buffer process)
-        (with-current-buffer (process-get process 'command-buf)
-          (if magit-blame-mode
-              (progn (magit-blame-mode -1)
-                     (message "Blaming...failed"))
-            (message "Blaming...aborted"))))
-      (kill-local-variable 'magit-blame-process))))
-
-(defun magit-blame-process-filter (process string)
-  (internal-default-process-filter process string)
-  (let ((buf  (process-get process 'command-buf))
-        (pos  (process-get process 'parsed))
-        (mark (process-mark process))
-        type cache)
-    (with-current-buffer buf
-      (setq type  magit-blame-type)
-      (setq cache magit-blame-cache))
-    (with-current-buffer (process-buffer process)
-      (goto-char pos)
-      (while (and (< (point) mark)
-                  (save-excursion (re-search-forward "^filename .+\n" nil t)))
-        (pcase-let* ((`(,chunk ,revinfo)
-                      (magit-blame--parse-chunk type))
-                     (rev (oref chunk orig-rev)))
-          (if revinfo
-              (puthash rev revinfo cache)
-            (setq revinfo
-                  (or (gethash rev cache)
-                      (puthash rev (magit-blame--commit-alist rev) cache))))
-          (magit-blame--make-overlays buf chunk revinfo))
-        (process-put process 'parsed (point))))))
-
-(defun magit-blame--parse-chunk (type)
-  (let (chunk revinfo)
-    (unless (looking-at "^\\(.\\{40,\\}\\) \\([0-9]+\\) \\([0-9]+\\) \\([0-9]+\\)")
-      (error "Blaming failed due to unexpected output: %s"
-             (buffer-substring-no-properties (point) (line-end-position))))
-    (with-slots (orig-rev orig-file prev-rev prev-file)
-        (setq chunk (magit-blame-chunk
-                     :orig-rev                     (match-string 1)
-                     :orig-line  (string-to-number (match-string 2))
-                     :final-line (string-to-number (match-string 3))
-                     :num-lines  (string-to-number (match-string 4))))
-      (forward-line)
-      (let (done)
-        (while (not done)
-          (cond ((looking-at "^filename \\(.+\\)")
-                 (setq done t)
-                 (setf orig-file (magit-decode-git-path (match-string 1))))
-                ((looking-at "^previous \\(.\\{40,\\}\\) \\(.+\\)")
-                 (setf prev-rev  (match-string 1))
-                 (setf prev-file (magit-decode-git-path (match-string 2))))
-                ((looking-at "^\\([^ ]+\\) \\(.+\\)")
-                 (push (cons (match-string 1)
-                             (match-string 2))
-                       revinfo)))
-          (forward-line)))
-      (when (and (eq type 'removal) prev-rev)
-        (cl-rotatef orig-rev  prev-rev)
-        (cl-rotatef orig-file prev-file)
-        (setq revinfo nil)))
-    (list chunk revinfo)))
-
-(defun magit-blame--commit-alist (rev)
-  (cl-mapcar 'cons
-             '("summary"
-               "author" "author-time" "author-tz"
-               "committer" "committer-time" "committer-tz")
-             (split-string (magit-rev-format "%s\v%an\v%ad\v%cn\v%cd" rev
-                                             "--date=format:%s\v%z")
-                           "\v")))
-
-(defun magit-blame-assert-buffer (process)
-  (unless (buffer-live-p (process-get process 'command-buf))
-    (kill-process process)
-    (user-error "Buffer being blamed has been killed")))
-
-;;; Display
-
-(defsubst magit-blame--style-get (key)
-  (cdr (assoc key (cdr magit-blame--style))))
-
-(defun magit-blame--make-overlays (buf chunk revinfo)
-  (with-current-buffer buf
-    (save-excursion
-      (save-restriction
-        (widen)
-        (let* ((line (oref chunk final-line))
-               (beg (magit-blame--line-beginning-position line))
-               (end (magit-blame--line-beginning-position
-                     (+ line (oref chunk num-lines))))
-               (before (magit-blame-chunk-at (1- beg))))
-          (when (and before
-                     (equal (oref before orig-rev)
-                            (oref chunk orig-rev)))
-            (setq beg (magit-blame--line-beginning-position
-                       (oset chunk final-line (oref before final-line))))
-            (cl-incf (oref chunk num-lines)
-                     (oref before num-lines)))
-          (magit-blame--remove-overlays beg end)
-          (when magit-blame--make-margin-overlays
-            (magit-blame--make-margin-overlays chunk revinfo beg end))
-          (magit-blame--make-heading-overlay chunk revinfo beg end)
-          (magit-blame--make-highlight-overlay chunk beg))))))
-
-(defun magit-blame--line-beginning-position (line)
-  (save-excursion
-    (goto-char (point-min))
-    (forward-line (1- line))
-    (point)))
-
-(defun magit-blame--make-margin-overlays (chunk revinfo beg end)
-  (save-excursion
-    (let ((line 0))
-      (goto-char beg)
-      (while (< (point) end)
-        (magit-blame--make-margin-overlay chunk revinfo line)
-        (forward-line)
-        (cl-incf line)))))
-
-(defun magit-blame--make-margin-overlay (chunk revinfo line)
-  (let* ((end (line-end-position))
-         ;; If possible avoid putting this on the first character
-         ;; of the line to avoid a conflict with the line overlay.
-         (beg (min (1+ (line-beginning-position)) end))
-         (ov  (make-overlay beg end)))
-    (overlay-put ov 'magit-blame-chunk chunk)
-    (overlay-put ov 'magit-blame-revinfo revinfo)
-    (overlay-put ov 'magit-blame-margin line)
-    (magit-blame--update-margin-overlay ov)))
-
-(defun magit-blame--make-heading-overlay (chunk revinfo beg end)
-  (let ((ov (make-overlay beg end)))
-    (overlay-put ov 'magit-blame-chunk chunk)
-    (overlay-put ov 'magit-blame-revinfo revinfo)
-    (overlay-put ov 'magit-blame-heading t)
-    (magit-blame--update-heading-overlay ov)))
-
-(defun magit-blame--make-highlight-overlay (chunk beg)
-  (let ((ov (make-overlay beg (save-excursion
-                                (goto-char beg)
-                                (1+ (line-end-position))))))
-    (overlay-put ov 'magit-blame-chunk chunk)
-    (overlay-put ov 'magit-blame-highlight t)
-    (magit-blame--update-highlight-overlay ov)))
-
-(defun magit-blame--update-margin ()
-  (setq left-margin-width (or (magit-blame--style-get 'margin-width) 0))
-  (set-window-buffer (selected-window) (current-buffer)))
-
-(defun magit-blame--update-overlays ()
-  (save-restriction
-    (widen)
-    (dolist (ov (overlays-in (point-min) (point-max)))
-      (cond ((overlay-get ov 'magit-blame-heading)
-             (magit-blame--update-heading-overlay ov))
-            ((overlay-get ov 'magit-blame-margin)
-             (magit-blame--update-margin-overlay ov))
-            ((overlay-get ov 'magit-blame-highlight)
-             (magit-blame--update-highlight-overlay ov))))))
-
-(defun magit-blame--update-margin-overlay (ov)
-  (overlay-put
-   ov 'before-string
-   (and (magit-blame--style-get 'margin-width)
-        (propertize
-         "o" 'display
-         (list (list 'margin 'left-margin)
-               (let ((line   (overlay-get ov 'magit-blame-margin))
-                     (format (magit-blame--style-get 'margin-format))
-                     (face   (magit-blame--style-get 'margin-face)))
-                 (magit-blame--format-string
-                  ov
-                  (or (and (atom format)
-                           format)
-                      (nth line format)
-                      (car (last format)))
-                  (or (and (not (zerop line))
-                           (magit-blame--style-get 'margin-body-face))
-                      face
-                      'magit-blame-margin))))))))
-
-(defun magit-blame--update-heading-overlay (ov)
-  (overlay-put
-   ov 'before-string
-   (if-let ((format (magit-blame--style-get 'heading-format)))
-       (magit-blame--format-string ov format 'magit-blame-heading)
-     (and (magit-blame--style-get 'show-lines)
-          (or (not (magit-blame--style-get 'margin-format))
-              (save-excursion
-                (goto-char (overlay-start ov))
-                ;; Special case of the special case described in
-                ;; `magit-blame--make-margin-overlay'.  For empty
-                ;; lines it is not possible to show both overlays
-                ;; without the line being too high.
-                (not (= (point) (line-end-position)))))
-          magit-blame-separator))))
-
-(defun magit-blame--update-highlight-overlay (ov)
-  (overlay-put ov 'font-lock-face (magit-blame--style-get 'highlight-face)))
-
-(defun magit-blame--format-string (ov format face)
-  (let* ((chunk   (overlay-get ov 'magit-blame-chunk))
-         (revinfo (overlay-get ov 'magit-blame-revinfo))
-         (key     (list format face))
-         (string  (cdr (assoc key revinfo))))
-    (unless string
-      (setq string
-            (and format
-                 (magit-blame--format-string-1 (oref chunk orig-rev)
-                                               revinfo format face)))
-      (nconc revinfo (list (cons key string))))
-    string))
-
-(defun magit-blame--format-string-1 (rev revinfo format face)
-  (let ((str
-         (if (string-match-p "\\`0\\{40,\\}\\'" rev)
-             (propertize (concat (if (string-prefix-p "\s" format) "\s" "")
-                                 "Not Yet Committed"
-                                 (if (string-suffix-p "\n" format) "\n" ""))
-                         'font-lock-face face)
-           (magit--format-spec
-            (propertize format 'font-lock-face face)
-            (cl-flet* ((p0 (s f)
-                         (propertize s 'font-lock-face
-                                     (if face
-                                         (if (listp face)
-                                             face
-                                           (list f face))
-                                       f)))
-                       (p1 (k f)
-                         (p0 (cdr (assoc k revinfo)) f))
-                       (p2 (k1 k2 f)
-                         (p0 (magit-blame--format-time-string
-                              (cdr (assoc k1 revinfo))
-                              (cdr (assoc k2 revinfo)))
-                             f)))
-              `((?H . ,(p0 rev         'magit-blame-hash))
-                (?s . ,(p1 "summary"   'magit-blame-summary))
-                (?a . ,(p1 "author"    'magit-blame-name))
-                (?c . ,(p1 "committer" 'magit-blame-name))
-                (?A . ,(p2 "author-time"    "author-tz"    'magit-blame-date))
-                (?C . ,(p2 "committer-time" "committer-tz" 'magit-blame-date))
-                (?f . "")))))))
-    (if-let ((width (and (string-suffix-p "%f" format)
-                         (magit-blame--style-get 'margin-width))))
-        (concat str
-                (propertize (make-string (max 0 (- width (length str))) ?\s)
-                            'font-lock-face face))
-      str)))
-
-(defun magit-blame--format-separator ()
-  (propertize
-   (concat (propertize "\s" 'display '(space :height (2)))
-           (propertize "\n" 'line-height t))
-   'font-lock-face `(:background
-                     ,(face-attribute 'magit-blame-heading
-                                      :background nil t)
-                     ,@(and (>= emacs-major-version 27) '(:extend t)))))
-
-(defun magit-blame--format-time-string (time tz)
-  (let* ((time-format (or (magit-blame--style-get 'time-format)
-                          magit-blame-time-format))
-         (tz-in-second (and (string-search "%z" time-format)
-                            (car (last (parse-time-string tz))))))
-    (format-time-string time-format
-                        (seconds-to-time (string-to-number time))
-                        tz-in-second)))
-
-(defun magit-blame--remove-overlays (&optional beg end)
-  (save-restriction
-    (widen)
-    (dolist (ov (overlays-in (or beg (point-min))
-                             (or end (point-max))))
-      (when (overlay-get ov 'magit-blame-chunk)
-        (delete-overlay ov)))))
-
-(defun magit-blame-maybe-show-message ()
-  (when (magit-blame--style-get 'show-message)
-    (let ((message-log-max 0))
-      (if-let ((msg (cdr (assoc "summary"
-                                (gethash (oref (magit-current-blame-chunk)
-                                               orig-rev)
-                                         magit-blame-cache)))))
-          (progn (set-text-properties 0 (length msg) nil msg)
-                 (message msg))
-        (message "Commit data not available yet.  Still blaming.")))))
-
-;;; Commands
-
-;;;###autoload (autoload 'magit-blame-echo "magit-blame" nil t)
-(transient-define-suffix magit-blame-echo (args)
-  "For each line show the revision in which it was added.
-Show the information about the chunk at point in the echo area
-when moving between chunks.  Unlike other blaming commands, do
-not turn on `read-only-mode'."
-  :if (lambda ()
-        (and buffer-file-name
-             (or (not magit-blame-mode)
-                 buffer-read-only)))
-  (interactive (list (magit-blame-arguments)))
-  (when magit-buffer-file-name
-    (user-error "Blob buffers aren't supported"))
-  (setq-local magit-blame--style
-              (assq magit-blame-echo-style magit-blame-styles))
-  (setq-local magit-blame-disable-modes
-              (cons 'eldoc-mode magit-blame-disable-modes))
-  (if (not magit-blame-mode)
-      (let ((magit-blame-read-only nil))
-        (magit-blame--pre-blame-assert 'addition)
-        (magit-blame--pre-blame-setup  'addition)
-        (magit-blame--run args))
-    (read-only-mode -1)
-    (magit-blame--update-overlays)))
-
-;;;###autoload (autoload 'magit-blame-addition "magit-blame" nil t)
-(transient-define-suffix magit-blame-addition (args)
-  "For each line show the revision in which it was added."
-  (interactive (list (magit-blame-arguments)))
-  (magit-blame--pre-blame-assert 'addition)
-  (magit-blame--pre-blame-setup  'addition)
-  (magit-blame--run args))
-
-;;;###autoload (autoload 'magit-blame-removal "magit-blame" nil t)
-(transient-define-suffix magit-blame-removal (args)
-  "For each line show the revision in which it was removed."
-  :if-nil 'buffer-file-name
-  (interactive (list (magit-blame-arguments)))
-  (unless magit-buffer-file-name
-    (user-error "Only blob buffers can be blamed in reverse"))
-  (magit-blame--pre-blame-assert 'removal)
-  (magit-blame--pre-blame-setup  'removal)
-  (magit-blame--run args))
-
-;;;###autoload (autoload 'magit-blame-reverse "magit-blame" nil t)
-(transient-define-suffix magit-blame-reverse (args)
-  "For each line show the last revision in which it still exists."
-  :if-nil 'buffer-file-name
-  (interactive (list (magit-blame-arguments)))
-  (unless magit-buffer-file-name
-    (user-error "Only blob buffers can be blamed in reverse"))
-  (magit-blame--pre-blame-assert 'final)
-  (magit-blame--pre-blame-setup  'final)
-  (magit-blame--run args))
-
-(defun magit-blame--pre-blame-assert (type)
-  (unless (magit-toplevel)
-    (magit--not-inside-repository-error))
-  (if (and magit-blame-mode
-           (eq type magit-blame-type))
-      (if-let ((chunk (magit-current-blame-chunk)))
-          (unless (oref chunk prev-rev)
-            (user-error "Chunk has no further history"))
-        (user-error "Commit data not available yet.  Still blaming."))
-    (unless (magit-file-relative-name nil (not magit-buffer-file-name))
-      (if buffer-file-name
-          (user-error "Buffer isn't visiting a tracked file")
-        (user-error "Buffer isn't visiting a file")))))
-
-(defun magit-blame--pre-blame-setup (type)
-  (when magit-blame-mode
-    (if (eq type magit-blame-type)
-        (let ((style magit-blame--style))
-          (magit-blame-visit-other-file)
-          (setq-local magit-blame--style style)
-          (setq-local magit-blame-recursive-p t)
-          ;; Set window-start for the benefit of quickstart.
-          (redisplay))
-      (magit-blame--remove-overlays)))
-  (setq magit-blame-type type))
-
-(defun magit-blame-visit-other-file ()
-  "Visit another blob related to the current chunk."
-  (interactive)
-  (with-slots (prev-rev prev-file orig-line)
-      (magit-current-blame-chunk)
-    (unless prev-rev
-      (user-error "Chunk has no further history"))
-    (magit-with-toplevel
-      (magit-find-file prev-rev prev-file))
-    ;; TODO Adjust line like magit-diff-visit-file.
-    (goto-char (point-min))
-    (forward-line (1- orig-line))))
-
-(defun magit-blame-visit-file ()
-  "Visit the blob related to the current chunk."
-  (interactive)
-  (with-slots (orig-rev orig-file orig-line)
-      (magit-current-blame-chunk)
-    (magit-with-toplevel
-      (magit-find-file orig-rev orig-file))
-    (goto-char (point-min))
-    (forward-line (1- orig-line))))
-
-(transient-define-suffix magit-blame-quit ()
-  "Turn off Magit-Blame mode.
-If the buffer was created during a recursive blame,
-then also kill the buffer."
-  :if-non-nil 'magit-blame-mode
-  (interactive)
-  (magit-blame-mode -1)
-  (when magit-blame-recursive-p
-    (kill-buffer)))
-
-(defun magit-blame-next-chunk ()
-  "Move to the next chunk."
-  (interactive)
-  (if-let ((next (next-single-char-property-change
-                  (point) 'magit-blame-chunk)))
-      (goto-char next)
-    (user-error "No more chunks")))
-
-(defun magit-blame-previous-chunk ()
-  "Move to the previous chunk."
-  (interactive)
-  (if-let ((prev (previous-single-char-property-change
-                  (point) 'magit-blame-chunk)))
-      (goto-char prev)
-    (user-error "No more chunks")))
-
-(defun magit-blame-next-chunk-same-commit (&optional previous)
-  "Move to the next chunk from the same commit.\n\n(fn)"
-  (interactive)
-  (if-let ((rev (oref (magit-current-blame-chunk) orig-rev)))
-      (let ((pos (point)) ov)
-        (save-excursion
-          (while (and (not ov)
-                      (not (= pos (if previous (point-min) (point-max))))
-                      (setq pos (funcall
-                                 (if previous
-                                     #'previous-single-char-property-change
-                                   #'next-single-char-property-change)
-                                 pos 'magit-blame-chunk)))
-            (when-let ((o (magit-blame--overlay-at pos)))
-              (when (equal (oref (magit-blame-chunk-at pos) orig-rev) rev)
-                (setq ov o)))))
-        (if ov
-            (goto-char (overlay-start ov))
-          (user-error "No more chunks from same commit")))
-    (user-error "This chunk hasn't been blamed yet")))
-
-(defun magit-blame-previous-chunk-same-commit ()
-  "Move to the previous chunk from the same commit."
-  (interactive)
-  (magit-blame-next-chunk-same-commit #'previous-single-char-property-change))
-
-(defun magit-blame-cycle-style ()
-  "Change how blame information is visualized.
-Cycle through the elements of option `magit-blame-styles'."
-  (interactive)
-  (setq magit-blame--style
-        (or (cadr (cl-member (car magit-blame--style)
-                             magit-blame-styles :key #'car))
-            (car magit-blame-styles)))
-  (magit-blame--update-margin)
-  (magit-blame--update-overlays))
-
-(defun magit-blame-copy-hash ()
-  "Save hash of the current chunk's commit to the kill ring.
-
-When the region is active, then save the region's content
-instead of the hash, like `kill-ring-save' would."
-  (interactive)
-  (if (use-region-p)
-      (call-interactively #'copy-region-as-kill)
-    (kill-new (message "%s" (oref (magit-current-blame-chunk) orig-rev)))))
-
-;;; Popup
-
-;;;###autoload (autoload 'magit-blame "magit-blame" nil t)
-(transient-define-prefix magit-blame ()
-  "Show the commits that added or removed lines in the visited file."
-  :man-page "git-blame"
-  :value '("-w")
-  ["Arguments"
-   ("-w" "Ignore whitespace" "-w")
-   ("-r" "Do not treat root commits as boundaries" "--root")
-   ("-P" "Follow only first parent" "--first-parent")
-   (magit-blame:-M)
-   (magit-blame:-C)]
-  ["Actions"
-   ("b" "Show commits adding lines" magit-blame-addition)
-   ("r" "Show commits removing lines" magit-blame-removal)
-   ("f" "Show last commits that still have lines" magit-blame-reverse)
-   ("m" "Blame echo" magit-blame-echo)
-   ("q" "Quit blaming" magit-blame-quit)]
-  ["Refresh"
-   :if-non-nil magit-blame-mode
-   ("c" "Cycle style" magit-blame-cycle-style :transient t)])
-
-(defun magit-blame-arguments ()
-  (transient-args 'magit-blame))
-
-(transient-define-argument magit-blame:-M ()
-  :description "Detect lines moved or copied within a file"
-  :class 'transient-option
-  :argument "-M"
-  :allow-empty t
-  :reader #'transient-read-number-N+)
-
-(transient-define-argument magit-blame:-C ()
-  :description "Detect lines moved or copied between files"
-  :class 'transient-option
-  :argument "-C"
-  :allow-empty t
-  :reader #'transient-read-number-N+)
-
-;;; Utilities
-
-(defun magit-blame-maybe-update-revision-buffer ()
-  (when-let* ((chunk  (magit-current-blame-chunk))
-              (commit (oref chunk orig-rev))
-              (buffer (magit-get-mode-buffer 'magit-revision-mode nil t)))
-    (if magit--update-revision-buffer
-        (setq magit--update-revision-buffer (list commit buffer))
-      (setq magit--update-revision-buffer (list commit buffer))
-      (run-with-idle-timer
-       magit-update-other-window-delay nil
-       (lambda ()
-         (pcase-let ((`(,rev ,buf) magit--update-revision-buffer))
-           (setq magit--update-revision-buffer nil)
-           (when (buffer-live-p buf)
-             (let ((magit-display-buffer-noselect t))
-               (apply #'magit-show-commit rev
-                      (magit-diff-arguments 'magit-revision-mode))))))))))
-
-;;; _
-(provide 'magit-blame)
-;;; magit-blame.el ends here
diff --git a/emacs/elpa/magit-20240930.1805/magit-blame.elc b/emacs/elpa/magit-20240930.1805/magit-blame.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240930.1805/magit-diff.elc b/emacs/elpa/magit-20240930.1805/magit-diff.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240930.1805/magit-git.el b/emacs/elpa/magit-20240930.1805/magit-git.el
@@ -1,2879 +0,0 @@
-;;; magit-git.el --- Git functionality  -*- lexical-binding:t -*-
-
-;; Copyright (C) 2008-2024 The Magit Project Contributors
-
-;; Author: Jonas Bernoulli <emacs.magit@jonas.bernoulli.dev>
-;; Maintainer: Jonas Bernoulli <emacs.magit@jonas.bernoulli.dev>
-
-;; SPDX-License-Identifier: GPL-3.0-or-later
-
-;; Magit is free software: you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-;;
-;; Magit is distributed in the hope that it will be useful, but WITHOUT
-;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-;; or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
-;; License for more details.
-;;
-;; You should have received a copy of the GNU General Public License
-;; along with Magit.  If not, see <https://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; This library implements wrappers for various Git plumbing commands.
-
-;;; Code:
-
-(require 'magit-base)
-
-(require 'format-spec)
-
-;; From `magit-branch'.
-(defvar magit-branch-prefer-remote-upstream)
-(defvar magit-published-branches)
-
-;; From `magit-margin'.
-(declare-function magit-maybe-make-margin-overlay "magit-margin" ())
-
-;; From `magit-mode'.
-(declare-function magit-get-mode-buffer "magit-mode"
-                  (mode &optional value frame))
-(declare-function magit-refresh "magit-mode" ())
-(defvar magit-buffer-diff-type)
-(defvar magit-buffer-diff-args)
-(defvar magit-buffer-file-name)
-(defvar magit-buffer-log-args)
-(defvar magit-buffer-log-files)
-(defvar magit-buffer-refname)
-(defvar magit-buffer-revision)
-
-;; From `magit-process'.
-(declare-function magit-call-git "magit-process" (&rest args))
-(declare-function magit-git "magit-process" (&rest args))
-(declare-function magit-process-buffer "magit-process" (&optional nodisplay))
-(declare-function magit-process-file "magit-process"
-                  (process &optional infile buffer display &rest args))
-(declare-function magit-process-git "magit-process" (destination &rest args))
-(declare-function magit-process-insert-section "magit-process"
-                  (pwd program args &optional errcode errlog))
-(defvar magit-this-error)
-(defvar magit-process-error-message-regexps)
-
-(eval-when-compile
-  (cl-pushnew 'orig-rev eieio--known-slot-names)
-  (cl-pushnew 'number eieio--known-slot-names))
-
-;;; Options
-
-;; For now this is shared between `magit-process' and `magit-git'.
-(defgroup magit-process nil
-  "Git and other external processes used by Magit."
-  :group 'magit)
-
-(defvar magit-git-environment
-  (list (format "INSIDE_EMACS=%s,magit" emacs-version))
-  "Prepended to `process-environment' while running git.")
-
-(defcustom magit-git-output-coding-system
-  (and (eq system-type 'windows-nt) 'utf-8)
-  "Coding system for receiving output from Git.
-
-If non-nil, the Git config value `i18n.logOutputEncoding' should
-be set via `magit-git-global-arguments' to value consistent with
-this."
-  :package-version '(magit . "2.9.0")
-  :group 'magit-process
-  :type '(choice (coding-system :tag "Coding system to decode Git output")
-                 (const :tag "Use system default" nil)))
-
-(defvar magit-git-w32-path-hack nil
-  "Alist of (EXE . (PATHENTRY)).
-This specifies what additional PATH setting needs to be added to
-the environment in order to run the non-wrapper git executables
-successfully.")
-
-(defcustom magit-git-executable
-  (or (and (eq system-type 'windows-nt)
-           ;; Avoid the wrappers "cmd/git.exe" and "cmd/git.cmd",
-           ;; which are much slower than using "bin/git.exe" directly.
-           (and-let* ((exec (executable-find "git")))
-             (ignore-errors
-               ;; Git for Windows 2.x provides cygpath so we can
-               ;; ask it for native paths.
-               (let* ((core-exe
-                       (car
-                        (process-lines
-                         exec "-c"
-                         "alias.X=!x() { which \"$1\" | cygpath -mf -; }; x"
-                         "X" "git")))
-                      (hack-entry (assoc core-exe magit-git-w32-path-hack))
-                      ;; Running the libexec/git-core executable
-                      ;; requires some extra PATH entries.
-                      (path-hack
-                       (list (concat "PATH="
-                                     (car (process-lines
-                                           exec "-c"
-                                           "alias.P=!cygpath -wp \"$PATH\""
-                                           "P"))))))
-                 ;; The defcustom STANDARD expression can be
-                 ;; evaluated many times, so make sure it is
-                 ;; idempotent.
-                 (if hack-entry
-                     (setcdr hack-entry path-hack)
-                   (push (cons core-exe path-hack) magit-git-w32-path-hack))
-                 core-exe))))
-      (and (eq system-type 'darwin)
-           (executable-find "git"))
-      "git")
-  "The Git executable used by Magit on the local host.
-On remote machines `magit-remote-git-executable' is used instead."
-  :package-version '(magit . "3.2.0")
-  :group 'magit-process
-  :type 'string)
-
-(defcustom magit-remote-git-executable "git"
-  "The Git executable used by Magit on remote machines.
-On the local host `magit-git-executable' is used instead.
-Consider customizing `tramp-remote-path' instead of this
-option."
-  :package-version '(magit . "3.2.0")
-  :group 'magit-process
-  :type 'string)
-
-(defcustom magit-git-global-arguments
-  `("--no-pager" "--literal-pathspecs"
-    "-c" "core.preloadindex=true"
-    "-c" "log.showSignature=false"
-    "-c" "color.ui=false"
-    "-c" "color.diff=false"
-    ,@(and (eq system-type 'windows-nt)
-           (list "-c" "i18n.logOutputEncoding=UTF-8")))
-  "Global Git arguments.
-
-The arguments set here are used every time the git executable is
-run as a subprocess.  They are placed right after the executable
-itself and before the git command - as in `git HERE... COMMAND
-REST'.  See the manpage `git(1)' for valid arguments.
-
-Be careful what you add here, especially if you are using Tramp
-to connect to servers with ancient Git versions.  Never remove
-anything that is part of the default value, unless you really
-know what you are doing.  And think very hard before adding
-something; it will be used every time Magit runs Git for any
-purpose."
-  :package-version '(magit . "2.9.0")
-  :group 'magit-commands
-  :group 'magit-process
-  :type '(repeat string))
-
-(defcustom magit-prefer-remote-upstream nil
-  "Whether to favor remote branches when reading the upstream branch.
-
-This controls whether commands that read a branch from the user
-and then set it as the upstream branch, offer a local or a remote
-branch as default completion candidate, when they have the choice.
-
-This affects all commands that use `magit-read-upstream-branch'
-or `magit-read-starting-point', which includes most commands
-that change the upstream and many that create new branches."
-  :package-version '(magit . "2.4.2")
-  :group 'magit-commands
-  :type 'boolean)
-
-(defcustom magit-list-refs-namespaces
-  '("refs/heads"
-    "refs/remotes"
-    "refs/tags"
-    "refs/pullreqs")
-  "List of ref namespaces considered when reading a ref.
-
-This controls the order of refs returned by `magit-list-refs',
-which is called by functions like `magit-list-branch-names' to
-generate the collection of refs."
-  :package-version '(magit . "3.1.0")
-  :group 'magit-commands
-  :type '(repeat string))
-
-(defcustom magit-list-refs-sortby nil
-  "How to sort the ref collection in the prompt.
-
-This affects commands that read a ref.  More specifically, it
-controls the order of refs returned by `magit-list-refs', which
-is called by functions like `magit-list-branch-names' to generate
-the collection of refs.  By default, refs are sorted according to
-their full refname (i.e., \"refs/...\").
-
-Any value accepted by the `--sort' flag of \"git for-each-ref\" can
-be used.  For example, \"-creatordate\" places refs with more
-recent committer or tagger dates earlier in the list.  A list of
-strings can also be given in order to pass multiple sort keys to
-\"git for-each-ref\".
-
-Note that, depending on the completion framework you use, this
-may not be sufficient to change the order in which the refs are
-displayed.  It only controls the order of the collection passed
-to `magit-completing-read' or, for commands that support reading
-multiple strings, `read-from-minibuffer'.  The completion
-framework ultimately determines how the collection is displayed."
-  :package-version '(magit . "2.11.0")
-  :group 'magit-miscellaneous
-  :type '(choice string (repeat string)))
-
-;;; Git
-
-(defvar magit-git-debug nil
-  "Whether to enable additional reporting of git errors.
-
-Magit basically calls git for one of these two reasons: for
-side-effects or to do something with its standard output.
-
-When git is run for side-effects then its output, including error
-messages, go into the process buffer which is shown when using \
-\\<magit-status-mode-map>\\[magit-process-buffer].
-
-When git's output is consumed in some way, then it would be too
-expensive to also insert it into this buffer, but when this
-option is non-nil and git returns with a non-zero exit status,
-then at least its standard error is inserted into this buffer.
-
-This is only intended for debugging purposes.  Do not enable this
-permanently, that would negatively affect performance.  Also note
-that just because git exits with a non-zero exit status and prints
-an error message that usually doesn't mean that it is an error as
-far as Magit is concerned, which is another reason we usually hide
-these error messages.  Whether some error message is relevant in
-the context of some unexpected behavior has to be judged on a case
-by case basis.
-
-The command `magit-toggle-git-debug' changes the value of this
-variable.
-
-Also see `magit-process-extreme-logging'.")
-
-(defun magit-toggle-git-debug ()
-  "Toggle whether additional git errors are reported.
-See info node `(magit)Debugging Tools' for more information."
-  (interactive)
-  (setq magit-git-debug (not magit-git-debug))
-  (message "Additional reporting of Git errors %s"
-           (if magit-git-debug "enabled" "disabled")))
-
-(defvar magit--refresh-cache nil)
-
-(defmacro magit--with-refresh-cache (key &rest body)
-  (declare (indent 1) (debug (form body)))
-  (let ((k (cl-gensym))
-        (hit (cl-gensym)))
-    `(if magit--refresh-cache
-         (let ((,k ,key))
-           (if-let ((,hit (assoc ,k (cdr magit--refresh-cache))))
-               (progn (cl-incf (caar magit--refresh-cache))
-                      (cdr ,hit))
-             (cl-incf (cdar magit--refresh-cache))
-             (let ((value ,(macroexp-progn body)))
-               (push (cons ,k value)
-                     (cdr magit--refresh-cache))
-               value)))
-       ,@body)))
-
-(defvar magit-with-editor-envvar "GIT_EDITOR"
-  "The environment variable exported by `magit-with-editor'.
-Set this to \"GIT_SEQUENCE_EDITOR\" if you do not want to use
-Emacs to edit commit messages but would like to do so to edit
-rebase sequences.")
-
-(defmacro magit-with-editor (&rest body)
-  "Like `with-editor*' but let-bind some more variables.
-Also respect the value of `magit-with-editor-envvar'."
-  (declare (indent 0) (debug (body)))
-  `(let ((magit-process-popup-time -1)
-         ;; The user may have customized `shell-file-name' to
-         ;; something which results in `w32-shell-dos-semantics' nil
-         ;; (which changes the quoting style used by
-         ;; `shell-quote-argument'), but Git for Windows expects shell
-         ;; quoting in the dos style.
-         (shell-file-name (if (and (eq system-type 'windows-nt)
-                                   ;; If we have Cygwin mount points,
-                                   ;; the git flavor is cygwin, so dos
-                                   ;; shell quoting is probably wrong.
-                                   (not magit-cygwin-mount-points))
-                              "cmdproxy"
-                            shell-file-name)))
-     (with-editor* magit-with-editor-envvar
-       ,@body)))
-
-(defmacro magit--with-temp-process-buffer (&rest body)
-  "Like `with-temp-buffer', but always propagate `process-environment'.
-When that var is buffer-local in the calling buffer, it is not
-propagated by `with-temp-buffer', so we explicitly ensure that
-happens, so that processes will be invoked consistently.  BODY is
-as for that macro."
-  (declare (indent 0) (debug (body)))
-  (let ((p (cl-gensym)))
-    `(let ((,p process-environment))
-       (with-temp-buffer
-         (setq-local process-environment ,p)
-         ,@body))))
-
-(defsubst magit-git-executable ()
-  "Return value of `magit-git-executable' or `magit-remote-git-executable'.
-The variable is chosen depending on whether `default-directory'
-is remote."
-  (if (file-remote-p default-directory)
-      magit-remote-git-executable
-    magit-git-executable))
-
-(defun magit-process-git-arguments (args)
-  "Prepare ARGS for a function that invokes Git.
-
-Magit has many specialized functions for running Git; they all
-pass arguments through this function before handing them to Git,
-to do the following.
-
-* Flatten ARGS, removing nil arguments.
-* Prepend `magit-git-global-arguments' to ARGS.
-* On w32 systems, encode to `w32-ansi-code-page'."
-  (setq args (append magit-git-global-arguments (flatten-tree args)))
-  (if (and (eq system-type 'windows-nt) (boundp 'w32-ansi-code-page))
-      ;; On w32, the process arguments *must* be encoded in the
-      ;; current code-page (see #3250).
-      (mapcar (lambda (arg)
-                (encode-coding-string
-                 arg (intern (format "cp%d" w32-ansi-code-page))))
-              args)
-    args))
-
-(defun magit-git-exit-code (&rest args)
-  "Execute Git with ARGS, returning its exit code."
-  (magit-process-git nil args))
-
-(defun magit-git-success (&rest args)
-  "Execute Git with ARGS, returning t if its exit code is 0."
-  (= (magit-git-exit-code args) 0))
-
-(defun magit-git-failure (&rest args)
-  "Execute Git with ARGS, returning t if its exit code is 1."
-  (= (magit-git-exit-code args) 1))
-
-(defun magit-git-string-p (&rest args)
-  "Execute Git with ARGS, returning the first line of its output.
-If the exit code isn't zero or if there is no output, then return
-nil.  Neither of these results is considered an error; if that is
-what you want, then use `magit-git-string-ng' instead.
-
-This is an experimental replacement for `magit-git-string', and
-still subject to major changes."
-  (magit--with-refresh-cache (cons default-directory args)
-    (magit--with-temp-process-buffer
-      (and (zerop (magit-process-git t args))
-           (not (bobp))
-           (progn
-             (goto-char (point-min))
-             (buffer-substring-no-properties (point) (line-end-position)))))))
-
-(defun magit-git-string-ng (&rest args)
-  "Execute Git with ARGS, returning the first line of its output.
-If the exit code isn't zero or if there is no output, then that
-is considered an error, but instead of actually signaling an
-error, return nil.  Additionally the output is put in the process
-buffer (creating it if necessary) and the error message is shown
-in the status buffer (provided it exists).
-
-This is an experimental replacement for `magit-git-string', and
-still subject to major changes.  Also see `magit-git-string-p'."
-  (magit--with-refresh-cache
-      (list default-directory 'magit-git-string-ng args)
-    (magit--with-temp-process-buffer
-      (let* ((args (magit-process-git-arguments args))
-             (status (magit-process-git t args)))
-        (if (zerop status)
-            (and (not (bobp))
-                 (progn
-                   (goto-char (point-min))
-                   (buffer-substring-no-properties
-                    (point) (line-end-position))))
-          (let ((buf (current-buffer)))
-            (with-current-buffer (magit-process-buffer t)
-              (magit-process-insert-section default-directory
-                                            magit-git-executable args
-                                            status buf)))
-          (when-let ((status-buf (magit-get-mode-buffer 'magit-status-mode)))
-            (let ((msg (magit--locate-error-message)))
-              (with-current-buffer status-buf
-                (setq magit-this-error msg))))
-          nil)))))
-
-(defun magit-git-str (&rest args)
-  "Execute Git with ARGS, returning the first line of its output.
-If there is no output, return nil.  If the output begins with a
-newline, return an empty string.  Like `magit-git-string' but
-ignore `magit-git-debug'."
-  (setq args (flatten-tree args))
-  (magit--with-refresh-cache (cons default-directory args)
-    (magit--with-temp-process-buffer
-      (magit-process-git (list t nil) args)
-      (unless (bobp)
-        (goto-char (point-min))
-        (buffer-substring-no-properties (point) (line-end-position))))))
-
-(defun magit-git-output (&rest args)
-  "Execute Git with ARGS, returning its output."
-  (setq args (flatten-tree args))
-  (magit--with-refresh-cache (cons default-directory args)
-    (magit--with-temp-process-buffer
-      (magit-process-git (list t nil) args)
-      (buffer-substring-no-properties (point-min) (point-max)))))
-
-(define-error 'magit-invalid-git-boolean "Not a Git boolean")
-
-(defun magit-git-true (&rest args)
-  "Execute Git with ARGS, returning t if it prints \"true\".
-If it prints \"false\", then return nil.  For any other output
-signal `magit-invalid-git-boolean'."
-  (pcase (magit-git-output args)
-    ((or "true"  "true\n")  t)
-    ((or "false" "false\n") nil)
-    (output (signal 'magit-invalid-git-boolean (list output)))))
-
-(defun magit-git-false (&rest args)
-  "Execute Git with ARGS, returning t if it prints \"false\".
-If it prints \"true\", then return nil.  For any other output
-signal `magit-invalid-git-boolean'."
-  (pcase (magit-git-output args)
-    ((or "true"  "true\n")  nil)
-    ((or "false" "false\n") t)
-    (output (signal 'magit-invalid-git-boolean (list output)))))
-
-(defun magit-git-config-p (variable &optional default)
-  "Return the boolean value of the Git variable VARIABLE.
-VARIABLE has to be specified as a string.  Return DEFAULT (which
-defaults to nil) if VARIABLE is unset.  If VARIABLE's value isn't
-a boolean, then raise an error."
-  (let ((args (list "config" "--bool" "--default" (if default "true" "false")
-                    variable)))
-    (magit--with-refresh-cache (cons default-directory args)
-      (magit--with-temp-process-buffer
-        (let ((status (magit-process-git t args))
-              (output (buffer-substring (point-min) (1- (point-max)))))
-          (if (zerop status)
-              (equal output "true")
-            (signal 'magit-invalid-git-boolean (list output))))))))
-
-(defun magit-git-insert (&rest args)
-  "Execute Git with ARGS, inserting its output at point.
-If Git exits with a non-zero exit status, then show a message and
-add a section in the respective process buffer."
-  (apply #'magit--git-insert nil args))
-
-(defun magit--git-insert (return-error &rest args)
-  (setq args (magit-process-git-arguments args))
-  (if (or return-error magit-git-debug)
-      (let (log)
-        (unwind-protect
-            (let (exit errmsg)
-              (setq log (make-temp-file "magit-stderr"))
-              (delete-file log)
-              (setq exit (magit-process-git (list t log) args))
-              (when (> exit 0)
-                (when (file-exists-p log)
-                  (with-temp-buffer
-                    (insert-file-contents log)
-                    (goto-char (point-max))
-                    (setq errmsg
-                          (if (functionp magit-git-debug)
-                              (funcall magit-git-debug (buffer-string))
-                            (magit--locate-error-message))))
-                  (unless return-error
-                    (let ((magit-git-debug nil))
-                      (with-current-buffer (magit-process-buffer t)
-                        (magit-process-insert-section default-directory
-                                                      magit-git-executable
-                                                      args exit log)))))
-                (unless return-error
-                  (if errmsg
-                      (message "%s" errmsg)
-                    (message "Git returned with exit-code %s" exit))))
-              (or errmsg exit))
-          (ignore-errors (delete-file log))))
-    (magit-process-git (list t nil) args)))
-
-(defun magit--locate-error-message ()
-  (goto-char (point-max))
-  (and (run-hook-wrapped 'magit-process-error-message-regexps
-                         (lambda (re) (re-search-backward re nil t)))
-       (match-string-no-properties 1)))
-
-(defun magit-git-string (&rest args)
-  "Execute Git with ARGS, returning the first line of its output.
-If there is no output, return nil.  If the output begins with a
-newline, return an empty string."
-  (setq args (flatten-tree args))
-  (magit--with-refresh-cache (cons default-directory args)
-    (magit--with-temp-process-buffer
-      (apply #'magit-git-insert args)
-      (unless (bobp)
-        (goto-char (point-min))
-        (buffer-substring-no-properties (point) (line-end-position))))))
-
-(defun magit-git-lines (&rest args)
-  "Execute Git with ARGS, returning its output as a list of lines.
-Empty lines anywhere in the output are omitted.
-
-If Git exits with a non-zero exit status, then report show a
-message and add a section in the respective process buffer."
-  (magit--with-temp-process-buffer
-    (apply #'magit-git-insert args)
-    (split-string (buffer-string) "\n" t)))
-
-(defun magit-git-items (&rest args)
-  "Execute Git with ARGS, returning its null-separated output as a list.
-Empty items anywhere in the output are omitted.
-
-If Git exits with a non-zero exit status, then report show a
-message and add a section in the respective process buffer."
-  (magit--with-temp-process-buffer
-    (apply #'magit-git-insert args)
-    (split-string (buffer-string) "\0" t)))
-
-(defvar magit--git-wash-keep-error nil) ; experimental
-
-(defun magit-git-wash (washer &rest args)
-  "Execute Git with ARGS, inserting washed output at point.
-Actually first insert the raw output at point.  If there is no
-output, call `magit-cancel-section'.  Otherwise temporarily narrow
-the buffer to the inserted text, move to its beginning, and then
-call function WASHER with ARGS as its sole argument."
-  (declare (indent 1))
-  (apply #'magit--git-wash washer magit--git-wash-keep-error args))
-
-(defun magit--git-wash (washer keep-error &rest args)
-  (declare (indent 2))
-  (setq args (flatten-tree args))
-  (let ((beg (point))
-        (exit (magit--git-insert keep-error args)))
-    (when (stringp exit)
-      (goto-char beg)
-      (insert (propertize exit 'face 'error))
-      (unless (bolp)
-        (insert "\n")))
-    (if (= (point) beg)
-        (magit-cancel-section)
-      (unless (bolp)
-        (insert "\n"))
-      (when (or (equal exit 0)
-                (eq keep-error 'wash-anyway))
-        (save-restriction
-          (narrow-to-region beg (point))
-          (goto-char beg)
-          (funcall washer args))
-        (when (or (= (point) beg)
-                  (= (point) (1+ beg)))
-          (magit-cancel-section))
-        (magit-maybe-make-margin-overlay)))
-    exit))
-
-(defun magit-git-executable-find (command)
-  "Search for COMMAND in Git's exec path, falling back to `exec-path'.
-Like `executable-find', return the absolute file name of the
-executable."
-  (or (locate-file command
-                   (list (concat
-                          (file-remote-p default-directory)
-                          (or (magit-git-string "--exec-path")
-                              (error "`git --exec-path' failed"))))
-                   exec-suffixes
-                   #'file-executable-p)
-      (compat-call executable-find command t)))
-
-;;; Git Version
-
-(defconst magit--git-version-regexp
-  "\\`git version \\([0-9]+\\(\\.[0-9]+\\)\\{1,2\\}\\)")
-
-(defvar magit--host-git-version-cache nil)
-
-(defun magit-git-version>= (n)
-  "Return t if `magit-git-version's value is greater than or equal to N."
-  (magit--version>= (magit-git-version) n))
-
-(defun magit-git-version< (n)
-  "Return t if `magit-git-version's value is smaller than N."
-  (version< (magit-git-version) n))
-
-(defun magit-git-version ()
-  "Return the Git version used for `default-directory'.
-Raise an error if Git cannot be found, if it exits with a
-non-zero status, or the output does not have the expected
-format."
-  (magit--with-refresh-cache default-directory
-    (let ((host (file-remote-p default-directory)))
-      (or (cdr (assoc host magit--host-git-version-cache))
-          (magit--with-temp-process-buffer
-            ;; Unset global arguments for ancient Git versions.
-            (let* ((magit-git-global-arguments nil)
-                   (status (magit-process-git t "version"))
-                   (output (buffer-string)))
-              (cond
-               ((not (zerop status))
-                (display-warning
-                 'magit
-                 (format "%S\n\nRunning \"%s --version\" failed with output:\n\n%s"
-                         (if host
-                             (format "Magit cannot find Git on host %S.\n
-Check the value of `magit-remote-git-executable' using
-`magit-debug-git-executable' and consult the info node
-`(tramp)Remote programs'." host)
-                           "Magit cannot find Git.\n
-Check the values of `magit-git-executable' and `exec-path'
-using `magit-debug-git-executable'.")
-                         (magit-git-executable)
-                         output)))
-               ((save-match-data
-                  (and (string-match magit--git-version-regexp output)
-                       (let ((version (match-string 1 output)))
-                         (push (cons host version)
-                               magit--host-git-version-cache)
-                         version))))
-               ((error "Unexpected \"%s --version\" output: %S"
-                       (magit-git-executable)
-                       output)))))))))
-
-(defun magit-git-version-assert (&optional minimal who)
-  "Assert that the used Git version is greater than or equal to MINIMAL.
-If optional MINIMAL is nil, compare with `magit--minimal-git'
-instead.  Optional WHO if non-nil specifies what functionality
-needs at least MINIMAL, otherwise it defaults to \"Magit\"."
-  (when (magit-git-version< (or minimal magit--minimal-git))
-    (let* ((host (file-remote-p default-directory))
-           (msg (format-spec
-                 (cond (host "\
-%w requires Git %m or greater, but on %h the version is %v.
-
-If multiple Git versions are installed on the host, then the
-problem might be that TRAMP uses the wrong executable.
-
-Check the value of `magit-remote-git-executable' and consult
-the info node `(tramp)Remote programs'.\n")
-                       (t "\
-%w requires Git %m or greater, but you are using %v.
-
-If you have multiple Git versions installed, then check the
-values of `magit-remote-git-executable' and `exec-path'.\n"))
-                 `((?w . ,(or who "Magit"))
-                   (?m . ,(or minimal magit--minimal-git))
-                   (?v . ,(magit-git-version))
-                   (?h . ,host)))))
-      (display-warning 'magit msg :error))))
-
-(defun magit--safe-git-version ()
-  "Return the Git version used for `default-directory' or an error message."
-  (magit--with-temp-process-buffer
-    (let* ((magit-git-global-arguments nil)
-           (status (magit-process-git t "version"))
-           (output (buffer-string)))
-      (cond ((not (zerop status)) output)
-            ((save-match-data
-               (and (string-match magit--git-version-regexp output)
-                    (match-string 1 output))))
-            (t output)))))
-
-(defun magit-debug-git-executable ()
-  "Display a buffer with information about `magit-git-executable'.
-Also include information about `magit-remote-git-executable'.
-See info node `(magit)Debugging Tools' for more information."
-  (interactive)
-  (with-current-buffer (get-buffer-create "*magit-git-debug*")
-    (pop-to-buffer (current-buffer))
-    (erase-buffer)
-    (insert (format "magit-remote-git-executable: %S\n"
-                    magit-remote-git-executable))
-    (insert (concat
-             (format "magit-git-executable: %S" magit-git-executable)
-             (and (not (file-name-absolute-p magit-git-executable))
-                  (format " [%S]" (executable-find magit-git-executable)))
-             (format " (%s)\n" (magit--safe-git-version))))
-    (insert (format "exec-path: %S\n" exec-path))
-    (when-let ((diff (cl-set-difference
-                      (seq-filter #'file-exists-p (remq nil (parse-colon-path
-                                                             (getenv "PATH"))))
-                      (seq-filter #'file-exists-p (remq nil exec-path))
-                      :test #'file-equal-p)))
-      (insert (format "  entries in PATH, but not in exec-path: %S\n" diff)))
-    (dolist (execdir exec-path)
-      (insert (format "  %s (%s)\n" execdir (car (file-attributes execdir))))
-      (when (file-directory-p execdir)
-        (dolist (exec (directory-files
-                       execdir t (concat
-                                  "\\`git" (regexp-opt exec-suffixes) "\\'")))
-          (insert (format "    %s (%s)\n" exec
-                          (magit--safe-git-version))))))))
-
-;;; Variables
-
-(defun magit-config-get-from-cached-list (key)
-  (gethash
-   ;; `git config --list' downcases first and last components of the key.
-   (let* ((key (replace-regexp-in-string "\\`[^.]+" #'downcase key t t))
-          (key (replace-regexp-in-string "[^.]+\\'" #'downcase key t t)))
-     key)
-   (magit--with-refresh-cache (cons (magit-toplevel) 'config)
-     (let ((configs (make-hash-table :test #'equal)))
-       (dolist (conf (magit-git-items "config" "--list" "-z"))
-         (let* ((nl-pos (cl-position ?\n conf))
-                (key (substring conf 0 nl-pos))
-                (val (if nl-pos (substring conf (1+ nl-pos)) "")))
-           (puthash key (nconc (gethash key configs) (list val)) configs)))
-       configs))))
-
-(defun magit-get (&rest keys)
-  "Return the value of the Git variable specified by KEYS."
-  (car (last (apply #'magit-get-all keys))))
-
-(defun magit-get-all (&rest keys)
-  "Return all values of the Git variable specified by KEYS."
-  (let ((magit-git-debug nil)
-        (arg (and (or (null (car keys))
-                      (string-prefix-p "--" (car keys)))
-                  (pop keys)))
-        (key (string-join keys ".")))
-    (if (and magit--refresh-cache (not arg))
-        (magit-config-get-from-cached-list key)
-      (magit-git-items "config" arg "-z" "--get-all" "--include" key))))
-
-(defun magit-get-boolean (&rest keys)
-  "Return the boolean value of the Git variable specified by KEYS.
-Also see `magit-git-config-p'."
-  (let ((arg (and (or (null (car keys))
-                      (string-prefix-p "--" (car keys)))
-                  (pop keys)))
-        (key (string-join keys ".")))
-    (equal (if magit--refresh-cache
-               (car (last (magit-config-get-from-cached-list key)))
-             (magit-git-str "config" arg "--bool" "--include" key))
-           "true")))
-
-(defun magit-set (value &rest keys)
-  "Set the value of the Git variable specified by KEYS to VALUE."
-  (let ((arg (and (or (null (car keys))
-                      (string-prefix-p "--" (car keys)))
-                  (pop keys)))
-        (key (string-join keys ".")))
-    (if value
-        (magit-git-success "config" arg key value)
-      (magit-git-success "config" arg "--unset" key))
-    value))
-
-(gv-define-setter magit-get (val &rest keys)
-  `(magit-set ,val ,@keys))
-
-(defun magit-set-all (values &rest keys)
-  "Set all values of the Git variable specified by KEYS to VALUES."
-  (let ((arg (and (or (null (car keys))
-                      (string-prefix-p "--" (car keys)))
-                  (pop keys)))
-        (var (string-join keys ".")))
-    (when (magit-get var)
-      (magit-call-git "config" arg "--unset-all" var))
-    (dolist (v values)
-      (magit-call-git "config" arg "--add" var v))))
-
-;;; Files
-
-(defun magit--safe-default-directory (&optional file)
-  (catch 'unsafe-default-dir
-    (let ((dir (file-name-as-directory
-                (expand-file-name (or file default-directory))))
-          (previous nil))
-      (while (not (file-accessible-directory-p dir))
-        (setq dir (file-name-directory (directory-file-name dir)))
-        (when (equal dir previous)
-          (throw 'unsafe-default-dir nil))
-        (setq previous dir))
-      dir)))
-
-(defmacro magit--with-safe-default-directory (file &rest body)
-  (declare (indent 1) (debug (form body)))
-  `(when-let ((default-directory (magit--safe-default-directory ,file)))
-     ,@body))
-
-(defun magit-git-dir (&optional path)
-  "Like (expand-file-name PATH (magit-gitdir)) or just (magit-gitdir)."
-  (declare (obsolete 'magit-gitdir "Magit 4.0.0"))
-  (and-let* ((dir (magit-gitdir)))
-    (if path
-        (expand-file-name (convert-standard-filename path) dir)
-      dir)))
-
-(defun magit-gitdir (&optional directory)
-  "Return the absolute and resolved path of the .git directory.
-
-If the `GIT_DIR' environment variable is defined, return that.
-Otherwise return the .git directory for DIRECTORY, or if that is
-nil, then for `default-directory' instead.  If the directory is
-not located inside a Git repository, then return nil."
-  (let ((default-directory (or directory default-directory)))
-    (magit--with-refresh-cache (list default-directory 'magit-gitdir)
-      (magit--with-safe-default-directory nil
-        (and-let*
-            ((dir (magit-rev-parse-safe "--git-dir"))
-             (dir (file-name-as-directory (magit-expand-git-file-name dir))))
-          (if (file-remote-p dir)
-              dir
-            (concat (file-remote-p default-directory) dir)))))))
-
-(defvar magit--separated-gitdirs nil)
-
-(defun magit--record-separated-gitdir ()
-  (let ((topdir (magit-toplevel))
-        (gitdir (magit-gitdir)))
-    ;; Kludge: git-annex converts submodule gitdirs to symlinks. See #3599.
-    (when (file-symlink-p (directory-file-name gitdir))
-      (setq gitdir (file-truename gitdir)))
-    ;; We want to delete the entry for `topdir' here, rather than within
-    ;; (unless ...), in case a `--separate-git-dir' repository was switched to
-    ;; the standard structure (i.e., "topdir/.git/").
-    (setq magit--separated-gitdirs (cl-delete topdir
-                                              magit--separated-gitdirs
-                                              :key #'car :test #'equal))
-    (unless (equal (file-name-as-directory (expand-file-name ".git" topdir))
-                   gitdir)
-      (push (cons topdir gitdir) magit--separated-gitdirs))))
-
-(defun magit-toplevel (&optional directory)
-  "Return the absolute path to the toplevel of the current repository.
-
-From within the working tree or control directory of a repository
-return the absolute path to the toplevel directory of the working
-tree.  As a special case, from within a bare repository return
-the control directory instead.  When called outside a repository
-then return nil.
-
-When optional DIRECTORY is non-nil then return the toplevel for
-that directory instead of the one for `default-directory'.
-
-Try to respect the option `find-file-visit-truename', i.e.,  when
-the value of that option is nil, then avoid needlessly returning
-the truename.  When a symlink to a sub-directory of the working
-tree is involved, or when called from within a sub-directory of
-the gitdir or from the toplevel of a gitdir, which itself is not
-located within the working tree, then it is not possible to avoid
-returning the truename."
-  (or
-   (magit--with-refresh-cache
-       (cons (or directory default-directory) 'magit-toplevel)
-     (magit--with-safe-default-directory directory
-       (if-let ((topdir (magit-rev-parse-safe "--show-toplevel")))
-           (let (updir)
-             (setq topdir (magit-expand-git-file-name topdir))
-             (cond
-              ((and
-                ;; Always honor these settings.
-                (not find-file-visit-truename)
-                (not (getenv "GIT_WORK_TREE"))
-                ;; `--show-cdup' is the relative path to the toplevel
-                ;; from `(file-truename default-directory)'.  Here we
-                ;; pretend it is relative to `default-directory', and
-                ;; go to that directory.  Then we check whether
-                ;; `--show-toplevel' still returns the same value and
-                ;; whether `--show-cdup' now is the empty string.  If
-                ;; both is the case, then we are at the toplevel of
-                ;; the same working tree, but also avoided needlessly
-                ;; following any symlinks.
-                (progn
-                  (setq updir (file-name-as-directory
-                               (magit-rev-parse-safe "--show-cdup")))
-                  (setq updir (if (file-name-absolute-p updir)
-                                  (concat (file-remote-p default-directory)
-                                          updir)
-                                (expand-file-name updir)))
-                  (and-let*
-                      ((default-directory updir)
-                       (top (and (string-equal
-                                  (magit-rev-parse-safe "--show-cdup") "")
-                                 (magit-rev-parse-safe "--show-toplevel"))))
-                    (string-equal (magit-expand-git-file-name top) topdir))))
-               updir)
-              ((concat (file-remote-p default-directory)
-                       (file-name-as-directory topdir)))))
-         (and-let* ((gitdir (magit-rev-parse-safe "--git-dir"))
-                    (gitdir (file-name-as-directory
-                             (if (file-name-absolute-p gitdir)
-                                 ;; We might have followed a symlink.
-                                 (concat (file-remote-p default-directory)
-                                         (magit-expand-git-file-name gitdir))
-                               (expand-file-name gitdir)))))
-           (if (magit-bare-repo-p)
-               gitdir
-             (let* ((link (expand-file-name "gitdir" gitdir))
-                    (wtree (and (file-exists-p link)
-                                (magit-file-line link))))
-               (cond
-                ((and wtree
-                      ;; Ignore .git/gitdir files that result from a
-                      ;; Git bug.  See #2364.
-                      (not (equal wtree ".git")))
-                 ;; Return the linked working tree.
-                 (concat (file-remote-p default-directory)
-                         (file-name-directory wtree)))
-                ;; The working directory may not be the parent
-                ;; directory of .git if it was set up with
-                ;; "git init --separate-git-dir".  See #2955.
-                ((car (rassoc gitdir magit--separated-gitdirs)))
-                (;; Step outside the control directory to enter the
-                 ;; working tree.
-                 (file-name-directory (directory-file-name gitdir))))))))))))
-
-(defun magit--toplevel-safe ()
-  (or (magit-toplevel)
-      (magit--not-inside-repository-error)))
-
-(defmacro magit-with-toplevel (&rest body)
-  (declare (indent defun) (debug (body)))
-  `(let ((default-directory (magit--toplevel-safe)))
-     ,@body))
-
-(define-error 'magit-outside-git-repo "Not inside Git repository")
-(define-error 'magit-corrupt-git-config "Corrupt Git configuration")
-(define-error 'magit-git-executable-not-found
-              (concat "Git executable cannot be found "
-                      "(see https://magit.vc/goto/e6a78ed2)"))
-
-(defun magit--assert-usable-git ()
-  (if (not (compat-call executable-find (magit-git-executable) t))
-      (signal 'magit-git-executable-not-found (magit-git-executable))
-    (let ((magit-git-debug
-           (lambda (err)
-             (signal 'magit-corrupt-git-config
-                     (format "%s: %s" default-directory err)))))
-      ;; This should always succeed unless there's a corrupt config
-      ;; (or at least a similarly severe failing state).  Note that
-      ;; git-config's --default is avoided because it's not available
-      ;; until Git 2.18.
-      (magit-git-string "config" "--get-color" "" "reset"))
-    nil))
-
-(defun magit--not-inside-repository-error ()
-  (magit--assert-usable-git)
-  (signal 'magit-outside-git-repo default-directory))
-
-(defun magit-inside-gitdir-p (&optional noerror)
-  "Return t if `default-directory' is below the repository directory.
-If it is below the working directory, then return nil.
-If it isn't below either, then signal an error unless NOERROR
-is non-nil, in which case return nil."
-  (and (magit--assert-default-directory noerror)
-       ;; Below a repository directory that is not located below the
-       ;; working directory "git rev-parse --is-inside-git-dir" prints
-       ;; "false", which is wrong.
-       (let ((gitdir (magit-gitdir)))
-         (cond (gitdir (file-in-directory-p default-directory gitdir))
-               (noerror nil)
-               ((signal 'magit-outside-git-repo default-directory))))))
-
-(defun magit-inside-worktree-p (&optional noerror)
-  "Return t if `default-directory' is below the working directory.
-If it is below the repository directory, then return nil.
-If it isn't below either, then signal an error unless NOERROR
-is non-nil, in which case return nil."
-  (and (magit--assert-default-directory noerror)
-       (condition-case nil
-           (magit-rev-parse-true "--is-inside-work-tree")
-         (magit-invalid-git-boolean
-          (and (not noerror)
-               (signal 'magit-outside-git-repo default-directory))))))
-
-(cl-defgeneric magit-bare-repo-p (&optional noerror)
-  "Return t if the current repository is bare.
-If it is non-bare, then return nil.  If `default-directory'
-isn't below a Git repository, then signal an error unless
-NOERROR is non-nil, in which case return nil."
-  (and (magit--assert-default-directory noerror)
-       (condition-case nil
-           (magit-rev-parse-true "--is-bare-repository")
-         (magit-invalid-git-boolean
-          (and (not noerror)
-               (signal 'magit-outside-git-repo default-directory))))))
-
-(defun magit--assert-default-directory (&optional noerror)
-  (or (file-directory-p default-directory)
-      (and (not noerror)
-           (let ((exists (file-exists-p default-directory)))
-             (signal (if exists 'file-error 'file-missing)
-                     (list "Running git in directory"
-                           (if exists
-                               "Not a directory"
-                             "No such file or directory")
-                           default-directory))))))
-
-(defun magit-git-repo-p (directory &optional non-bare)
-  "Return t if DIRECTORY is a Git repository.
-When optional NON-BARE is non-nil also return nil if DIRECTORY is
-a bare repository."
-  (and (file-directory-p directory) ; Avoid archives, see #3397.
-       (or (file-regular-p (expand-file-name ".git" directory))
-           (file-directory-p (expand-file-name ".git" directory))
-           (and (not non-bare)
-                (file-regular-p (expand-file-name "HEAD" directory))
-                (file-directory-p (expand-file-name "refs" directory))
-                (file-directory-p (expand-file-name "objects" directory))))))
-
-(defun magit-file-relative-name (&optional file tracked)
-  "Return the path of FILE relative to the repository root.
-
-If optional FILE is nil or omitted, return the relative path of
-the file being visited in the current buffer, if any, else nil.
-If the file is not inside a Git repository, then return nil.
-
-If TRACKED is non-nil, return the path only if it matches a
-tracked file."
-  (unless file
-    (with-current-buffer (or (buffer-base-buffer)
-                             (current-buffer))
-      (setq file (or magit-buffer-file-name buffer-file-name
-                     (and (derived-mode-p 'dired-mode) default-directory)))))
-  (when (and file (or (not tracked)
-                      (magit-file-tracked-p (file-relative-name file))))
-    (and-let* ((dir (magit-toplevel
-                     (magit--safe-default-directory
-                      (directory-file-name (file-name-directory file))))))
-      (file-relative-name file dir))))
-
-(defun magit-file-ignored-p (file)
-  (magit-git-string-p "ls-files" "--others" "--ignored" "--exclude-standard"
-                      "--" (magit-convert-filename-for-git file)))
-
-(defun magit-file-tracked-p (file)
-  (magit-git-success "ls-files" "--error-unmatch"
-                     "--" (magit-convert-filename-for-git file)))
-
-(defun magit-list-files (&rest args)
-  (apply #'magit-git-items "ls-files" "-z" "--full-name" args))
-
-(defun magit-tracked-files ()
-  (magit-list-files "--cached"))
-
-(defun magit-untracked-files (&optional all files compact)
-  (if compact
-      (--mapcat (and (eq (aref it 0) ??)
-                     (list (substring it 3)))
-                (magit-git-items "status" "-z" "--porcelain"
-                                 (magit-ignore-submodules-p t)
-                                 "--" files))
-    (magit-list-files "--other"
-                      (and (not all) "--exclude-standard")
-                      "--" files)))
-
-(defun magit-modified-files (&optional nomodules files)
-  (magit-git-items "diff-index" "-z" "--name-only"
-                   ;; Work around a bug in Git v2.46.0. See #5212 and #5221.
-                   (if nomodules "--ignore-submodules" "--submodule=short")
-                   (magit-headish) "--" files))
-
-(defun magit-unstaged-files (&optional nomodules files)
-  (magit-git-items "diff-files" "-z" "--name-only" "--diff-filter=u"
-                   ;; Work around a bug in Git v2.46.0. See #5212 and #5221.
-                   (if nomodules "--ignore-submodules" "--submodule=short")
-                   "--" files))
-
-(defun magit-staged-files (&optional nomodules files)
-  (magit-git-items "diff-index" "-z" "--name-only" "--cached"
-                   ;; Work around a bug in Git v2.46.0. See #5212 and #5221.
-                   (if nomodules "--ignore-submodules" "--submodule=short")
-                   (magit-headish) "--" files))
-
-(defun magit-binary-files (&rest args)
-  (--mapcat (and (string-match "^-\t-\t\\(.+\\)" it)
-                 (list (match-string 1 it)))
-            (apply #'magit-git-items
-                   "diff" "-z" "--numstat" "--ignore-submodules"
-                   args)))
-
-(defun magit-unmerged-files ()
-  (magit-git-items "diff-files" "-z" "--name-only" "--diff-filter=U"))
-
-(defun magit-ignored-files ()
-  (magit-git-items "ls-files" "-z" "--others" "--ignored"
-                   "--exclude-standard" "--directory"))
-
-(defun magit-stashed-files (stash)
-  (magit-git-items "stash" "show" "-z" "--name-only" stash))
-
-(defun magit-skip-worktree-files ()
-  (--keep (and (= (aref it 0) ?S)
-               (substring it 2))
-          (magit-list-files "-t")))
-
-(defun magit-assume-unchanged-files ()
-  (--keep (and (memq (aref it 0) '(?h ?s ?m ?r ?c ?k))
-               (substring it 2))
-          (magit-list-files "-v")))
-
-(defun magit-revision-files (rev)
-  (magit-with-toplevel
-    (magit-git-items "ls-tree" "-z" "-r" "--name-only" rev)))
-
-(defun magit-revision-directories (rev)
-  "List directories that contain a tracked file in revision REV."
-  (magit-with-toplevel
-    (mapcar #'file-name-as-directory
-            (magit-git-items "ls-tree" "-z" "-r" "-d" "--name-only" rev))))
-
-(defun magit-changed-files (rev-or-range &optional other-rev)
-  "Return list of files the have changed between two revisions.
-If OTHER-REV is non-nil, REV-OR-RANGE should be a revision, not a
-range.  Otherwise, it can be any revision or range accepted by
-\"git diff\" (i.e., <rev>, <revA>..<revB>, or <revA>...<revB>)."
-  (magit-with-toplevel
-    (magit-git-items "diff" "-z" "--name-only" rev-or-range other-rev)))
-
-(defun magit-renamed-files (revA revB)
-  (mapcar (pcase-lambda (`(,_status ,fileA ,fileB))
-            (cons fileA fileB))
-          (seq-partition (magit-git-items "diff" "-z" "--name-status"
-                                          "--find-renames"
-                                          "--diff-filter=R" revA revB)
-                         3)))
-
-(defun magit--rev-file-name (file rev other-rev)
-  "For FILE, potentially renamed between REV and OTHER-REV, return name in REV.
-Return nil, if FILE appears neither in REV nor OTHER-REV,
-or if no rename is detected."
-  (or (car (member file (magit-revision-files rev)))
-      (and-let* ((renamed (magit-renamed-files rev other-rev)))
-        (car (rassoc file renamed)))))
-
-(defun magit-file-status (&rest args)
-  (magit--with-temp-process-buffer
-    (save-excursion (magit-git-insert "status" "-z" args))
-    (let ((pos (point)) status)
-      (while (> (skip-chars-forward "[:print:]") 0)
-        (let ((x (char-after     pos))
-              (y (char-after (1+ pos)))
-              (file (buffer-substring (+ pos 3) (point))))
-          (forward-char)
-          (if (memq x '(?R ?C))
-              (progn
-                (setq pos (point))
-                (skip-chars-forward "[:print:]")
-                (push (list file (buffer-substring pos (point)) x y) status)
-                (forward-char))
-            (push (list file nil x y) status)))
-        (setq pos (point)))
-      status)))
-
-(defcustom magit-cygwin-mount-points
-  (and (eq system-type 'windows-nt)
-       (cl-sort (--map (if (string-match "^\\(.*\\) on \\(.*\\) type" it)
-                           (cons (file-name-as-directory (match-string 2 it))
-                                 (file-name-as-directory (match-string 1 it)))
-                         (lwarn '(magit) :error
-                                "Failed to parse Cygwin mount: %S" it))
-                       ;; If --exec-path is not a native Windows path,
-                       ;; then we probably have a cygwin git.
-                       (let ((process-environment
-                              (append magit-git-environment
-                                      process-environment)))
-                         (and (not (string-match-p
-                                    "\\`[a-zA-Z]:"
-                                    (car (process-lines
-                                          magit-git-executable "--exec-path"))))
-                              (ignore-errors (process-lines "mount")))))
-                #'> :key (pcase-lambda (`(,cyg . ,_win)) (length cyg))))
-  "Alist of (CYGWIN . WIN32) directory names.
-Sorted from longest to shortest CYGWIN name."
-  :package-version '(magit . "2.3.0")
-  :group 'magit-process
-  :type '(alist :key-type string :value-type directory))
-
-(defun magit-expand-git-file-name (filename)
-  (unless (file-name-absolute-p filename)
-    (setq filename (expand-file-name filename)))
-  (if-let ((cyg:win (and (not (file-remote-p default-directory)) ; see #4976
-                         (cl-assoc filename magit-cygwin-mount-points
-                                   :test (lambda (f cyg) (string-prefix-p cyg f))))))
-      (concat (cdr cyg:win)
-              (substring filename (length (car cyg:win))))
-    filename))
-
-(defun magit-convert-filename-for-git (filename)
-  "Convert FILENAME so that it can be passed to git.
-1. If it is a absolute filename, then pass it through
-   `expand-file-name' to replace things such as \"~/\" that
-   Git does not understand.
-2. If it is a remote filename, then remove the remote part.
-3. Deal with an `windows-nt' Emacs vs. Cygwin Git incompatibility."
-  (if (file-name-absolute-p filename)
-      (if-let ((cyg:win (cl-rassoc filename magit-cygwin-mount-points
-                                   :test (lambda (f win) (string-prefix-p win f)))))
-          (concat (car cyg:win)
-                  (substring filename (length (cdr cyg:win))))
-        (let ((expanded (expand-file-name filename)))
-          (or (file-remote-p expanded 'localname)
-              expanded)))
-    filename))
-
-(defun magit-decode-git-path (path)
-  (if (eq (aref path 0) ?\")
-      (decode-coding-string (read path)
-                            (or magit-git-output-coding-system
-                                (car default-process-coding-system))
-                            t)
-    path))
-
-(defun magit-file-at-point (&optional expand assert)
-  (if-let ((file (magit-section-case
-                   (file (oref it value))
-                   (hunk (magit-section-parent-value it)))))
-      (if expand
-          (expand-file-name file (magit-toplevel))
-        file)
-    (when assert
-      (user-error "No file at point"))))
-
-(defun magit-current-file ()
-  (or (magit-file-relative-name)
-      (magit-file-at-point)
-      (and (derived-mode-p 'magit-log-mode)
-           (car magit-buffer-log-files))))
-
-;;; Predicates
-
-(defun magit-no-commit-p ()
-  "Return t if there is no commit in the current Git repository."
-  (not (magit-rev-verify "HEAD")))
-
-(defun magit-merge-commit-p (commit)
-  "Return t if COMMIT is a merge commit."
-  (length> (magit-commit-parents commit) 1))
-
-(defun magit-anything-staged-p (&optional ignore-submodules &rest files)
-  "Return t if there are any staged changes.
-If optional FILES is non-nil, then only changes to those files
-are considered."
-  (magit-git-failure "diff" "--quiet" "--cached"
-                     (if ignore-submodules
-                         "--ignore-submodules"
-                       ;; Work around a bug in Git v2.46.0. See #5212 and #5221.
-                       "--submodule=short")
-                     "--" files))
-
-(defun magit-anything-unstaged-p (&optional ignore-submodules &rest files)
-  "Return t if there are any unstaged changes.
-If optional FILES is non-nil, then only changes to those files
-are considered."
-  (magit-git-failure "diff" "--quiet"
-                     (if ignore-submodules
-                         "--ignore-submodules"
-                       ;; Work around a bug in Git v2.46.0. See #5212 and #5221.
-                       "--submodule=short")
-                     "--" files))
-
-(defun magit-anything-modified-p (&optional ignore-submodules &rest files)
-  "Return t if there are any staged or unstaged changes.
-If optional FILES is non-nil, then only changes to those files
-are considered."
-  (or (apply #'magit-anything-staged-p   ignore-submodules files)
-      (apply #'magit-anything-unstaged-p ignore-submodules files)))
-
-(defun magit-anything-unmerged-p (&rest files)
-  "Return t if there are any merge conflicts.
-If optional FILES is non-nil, then only conflicts in those files
-are considered."
-  (and (magit-git-string "ls-files" "--unmerged" files) t))
-
-(defun magit-module-worktree-p (module)
-  (magit-with-toplevel
-    (file-exists-p (expand-file-name ".git" module))))
-
-(defun magit-module-no-worktree-p (module)
-  (not (magit-module-worktree-p module)))
-
-(defun magit-ignore-submodules-p (&optional return-argument)
-  (or (cl-find-if (lambda (arg)
-                    (string-prefix-p "--ignore-submodules" arg))
-                  magit-buffer-diff-args)
-      (and-let* ((value (magit-get "diff.ignoreSubmodules")))
-        (if return-argument
-            (concat "--ignore-submodules=" value)
-          (concat "diff.ignoreSubmodules=" value)))))
-
-;;; Revisions and References
-
-(defun magit-rev-parse (&rest args)
-  "Execute `git rev-parse ARGS', returning first line of output.
-If there is no output, return nil."
-  (apply #'magit-git-string "rev-parse" args))
-
-(defun magit-rev-parse-safe (&rest args)
-  "Execute `git rev-parse ARGS', returning first line of output.
-If there is no output, return nil.  Like `magit-rev-parse' but
-ignore `magit-git-debug'."
-  (apply #'magit-git-str "rev-parse" args))
-
-(defun magit-rev-parse-true (&rest args)
-  "Execute `git rev-parse ARGS', returning t if it prints \"true\".
-If it prints \"false\", then return nil.  For any other output
-signal an error."
-  (magit-git-true "rev-parse" args))
-
-(defun magit-rev-parse-false (&rest args)
-  "Execute `git rev-parse ARGS', returning t if it prints \"false\".
-If it prints \"true\", then return nil.  For any other output
-signal an error."
-  (magit-git-false "rev-parse" args))
-
-(defun magit-rev-parse-p (&rest args)
-  "Execute `git rev-parse ARGS', returning t if it prints \"true\".
-Return t if the first (and usually only) output line is the
-string \"true\", otherwise return nil."
-  (equal (magit-git-str "rev-parse" args) "true"))
-
-(defun magit-rev-verify (rev)
-  (magit-git-string-p "rev-parse" "--verify" rev))
-
-(defun magit-commit-p (rev)
-  "Return full hash for REV if it names an existing commit."
-  (magit-rev-verify (magit--rev-dereference rev)))
-
-(defalias 'magit-rev-verify-commit #'magit-commit-p)
-
-(defalias 'magit-rev-hash #'magit-commit-p)
-
-(defun magit--rev-dereference (rev)
-  "Return a rev that forces Git to interpret REV as a commit.
-If REV is nil or has the form \":/TEXT\", return REV itself."
-  (cond ((not rev) nil)
-        ((string-match-p "^:/" rev) rev)
-        ((concat rev "^{commit}"))))
-
-(defun magit-rev-equal (a b)
-  "Return t if there are no differences between the commits A and B."
-  (magit-git-success "diff" "--quiet" a b))
-
-(defun magit-rev-eq (a b)
-  "Return t if A and B refer to the same commit."
-  (let ((a (magit-commit-p a))
-        (b (magit-commit-p b)))
-    (and a b (equal a b))))
-
-(defun magit-rev-ancestor-p (a b)
-  "Return non-nil if commit A is an ancestor of commit B."
-  (magit-git-success "merge-base" "--is-ancestor" a b))
-
-(defun magit-rev-head-p (rev)
-  (or (equal rev "HEAD")
-      (and rev
-           (not (string-search ".." rev))
-           (equal (magit-rev-parse rev)
-                  (magit-rev-parse "HEAD")))))
-
-(defun magit-rev-author-p (rev)
-  "Return t if the user is the author of REV.
-More precisely return t if `user.name' is equal to the author
-name of REV and/or `user.email' is equal to the author email
-of REV."
-  (or (equal (magit-get "user.name")  (magit-rev-format "%an" rev))
-      (equal (magit-get "user.email") (magit-rev-format "%ae" rev))))
-
-(defun magit-rev-name (rev &optional pattern not-anchored)
-  "Return a symbolic name for REV using `git-name-rev'.
-
-PATTERN can be used to limit the result to a matching ref.
-Unless NOT-ANCHORED is non-nil, the beginning of the ref must
-match PATTERN.
-
-An anchored lookup is done using the arguments
-\"--exclude=*/<PATTERN> --exclude=*/HEAD\" in addition to
-\"--refs=<PATTERN>\", provided at least version v2.13 of Git is
-used.  Older versions did not support the \"--exclude\" argument.
-When \"--exclude\" cannot be used and `git-name-rev' returns a
-ref that should have been excluded, then that is discarded and
-this function returns nil instead.  This is unfortunate because
-there might be other refs that do match.  To fix that, update
-Git."
-  (if (magit-git-version< "2.13")
-      (and-let*
-          ((ref (magit-git-string "name-rev" "--name-only" "--no-undefined"
-                                  (and pattern (concat "--refs=" pattern))
-                                  rev)))
-        (if (and pattern
-                 (string-match-p "\\`refs/[^/]+/\\*\\'" pattern))
-            (let ((namespace (substring pattern 0 -1)))
-              (and (not (or (string-suffix-p "HEAD" ref)
-                            (and (string-match-p namespace ref)
-                                 (not (magit-rev-verify
-                                       (concat namespace ref))))))
-                   ref))
-          ref))
-    (magit-git-string "name-rev" "--name-only" "--no-undefined"
-                      (and pattern (concat "--refs=" pattern))
-                      (and pattern
-                           (not not-anchored)
-                           (list "--exclude=*/HEAD"
-                                 (concat "--exclude=*/" pattern)))
-                      rev)))
-
-(defun magit-rev-branch (rev)
-  (and-let* ((name (magit-rev-name rev "refs/heads/*")))
-    (and (not (string-match-p "[~^]" name)) name)))
-
-(defun magit-rev-fixup-target (rev)
-  (let ((msg (magit-rev-format "%s" rev)))
-    (save-match-data
-      (and (string-match "\\`\\(fixup\\|squash\\)! \\(.+\\)" msg)
-           (magit-rev-format
-            "%h" (format "%s^{/^%s}" rev
-                         (magit--ext-regexp-quote (match-string 2 msg))))))))
-
-(defun magit-get-shortname (rev)
-  (let* ((fn (apply-partially #'magit-rev-name rev))
-         (name (or (funcall fn "refs/tags/*")
-                   (funcall fn "refs/heads/*")
-                   (funcall fn "refs/remotes/*"))))
-    (cond ((not name)
-           (magit-rev-parse "--short" rev))
-          ((string-match "^\\(?:tags\\|remotes\\)/\\(.+\\)" name)
-           (if (magit-ref-ambiguous-p (match-string 1 name))
-               name
-             (match-string 1 name)))
-          ((magit-ref-maybe-qualify name)))))
-
-(defun magit-name-branch (rev &optional lax)
-  (or (magit-name-local-branch rev)
-      (magit-name-remote-branch rev)
-      (and lax (or (magit-name-local-branch rev t)
-                   (magit-name-remote-branch rev t)))))
-
-(defun magit-name-local-branch (rev &optional lax)
-  (and-let* ((name (magit-rev-name rev "refs/heads/*")))
-    (and (or lax (not (string-match-p "[~^]" name))) name)))
-
-(defun magit-name-remote-branch (rev &optional lax)
-  (and-let* ((name (magit-rev-name rev "refs/remotes/*")))
-    (and (or lax (not (string-match-p "[~^]" name)))
-         (substring name 8))))
-
-(defun magit-name-tag (rev &optional lax)
-  (and-let* ((name (magit-rev-name rev "refs/tags/*")))
-    ;; The progn is necessary to work around debbugs#31840.  This, and all
-    ;; the other instances, can be removed once we require at least Emacs 27.
-    (progn
-      (when (string-suffix-p "^0" name)
-        (setq name (substring name 0 -2)))
-      (and (or lax (not (string-match-p "[~^]" name)))
-           (substring name 5)))))
-
-(defun magit-ref-abbrev (refname)
-  "Return an unambiguous abbreviation of REFNAME."
-  (magit-rev-parse "--verify" "--abbrev-ref" refname))
-
-(defun magit-ref-fullname (refname)
-  "Return fully qualified refname for REFNAME.
-If REFNAME is ambiguous, return nil."
-  (magit-rev-parse "--verify" "--symbolic-full-name" refname))
-
-(defun magit-ref-ambiguous-p (refname)
-  (save-match-data
-    (if (string-match "\\`\\([^^~]+\\)\\(.*\\)" refname)
-        (not (magit-ref-fullname (match-string 1 refname)))
-      (error "%S has an unrecognized format" refname))))
-
-(defun magit-ref-maybe-qualify (refname &optional prefix)
-  "If REFNAME is ambiguous, try to disambiguate it by prepend PREFIX to it.
-Return an unambiguous refname, either REFNAME or that prefixed
-with PREFIX, nil otherwise.  If REFNAME has an offset suffix
-such as \"~1\", then that is preserved.  If optional PREFIX is
-nil, then use \"heads/\".  "
-  (if (magit-ref-ambiguous-p refname)
-      (let ((refname (concat (or prefix "heads/") refname)))
-        (and (not (magit-ref-ambiguous-p refname)) refname))
-    refname))
-
-(defun magit-ref-exists-p (ref)
-  (magit-git-success "show-ref" "--verify" ref))
-
-(defun magit-ref-equal (a b)
-  "Return t if the refnames A and B are `equal'.
-A symbolic-ref pointing to some ref, is `equal' to that ref,
-as are two symbolic-refs pointing to the same ref.  Refnames
-may be abbreviated."
-  (let ((a (magit-ref-fullname a))
-        (b (magit-ref-fullname b)))
-    (and a b (equal a b))))
-
-(defun magit-ref-eq (a b)
-  "Return t if the refnames A and B are `eq'.
-A symbolic-ref is `eq' to itself, but not to the ref it points
-to, or to some other symbolic-ref that points to the same ref."
-  (let ((symbolic-a (magit-symbolic-ref-p a))
-        (symbolic-b (magit-symbolic-ref-p b)))
-    (or (and symbolic-a
-             symbolic-b
-             (equal a b))
-        (and (not symbolic-a)
-             (not symbolic-b)
-             (magit-ref-equal a b)))))
-
-(defun magit-headish ()
-  "Return the `HEAD' or if that doesn't exist the hash of the empty tree."
-  (if (magit-no-commit-p)
-      (magit-git-string "mktree")
-    "HEAD"))
-
-(defun magit-branch-at-point ()
-  (magit-section-case
-    (branch (oref it value))
-    (commit (or (magit--painted-branch-at-point)
-                (magit-name-branch (oref it value))))))
-
-(defun magit--painted-branch-at-point (&optional type)
-  (or (and (not (eq type 'remote))
-           (memq (get-text-property (magit-point) 'font-lock-face)
-                 (list 'magit-branch-local
-                       'magit-branch-current))
-           (and-let* ((branch (magit-thing-at-point 'git-revision t)))
-             (cdr (magit-split-branch-name branch))))
-      (and (not (eq type 'local))
-           (memq (get-text-property (magit-point) 'font-lock-face)
-                 (list 'magit-branch-remote
-                       'magit-branch-remote-head))
-           (thing-at-point 'git-revision t))))
-
-(defun magit-local-branch-at-point ()
-  (magit-section-case
-    (branch (let ((branch (magit-ref-maybe-qualify (oref it value))))
-              (when (member branch (magit-list-local-branch-names))
-                branch)))
-    (commit (or (magit--painted-branch-at-point 'local)
-                (magit-name-local-branch (oref it value))))))
-
-(defun magit-remote-branch-at-point ()
-  (magit-section-case
-    (branch (let ((branch (oref it value)))
-              (when (member branch (magit-list-remote-branch-names))
-                branch)))
-    (commit (or (magit--painted-branch-at-point 'remote)
-                (magit-name-remote-branch (oref it value))))))
-
-(defun magit-commit-at-point ()
-  (or (magit-section-value-if 'commit)
-      (magit-thing-at-point 'git-revision t)
-      (and-let* ((chunk (and (bound-and-true-p magit-blame-mode)
-                             (fboundp 'magit-current-blame-chunk)
-                             (magit-current-blame-chunk))))
-        (oref chunk orig-rev))
-      (and (derived-mode-p 'magit-stash-mode
-                           'magit-merge-preview-mode
-                           'magit-revision-mode)
-           magit-buffer-revision)))
-
-(defun magit-branch-or-commit-at-point ()
-  (or (magit-section-case
-        (branch (magit-ref-maybe-qualify (oref it value)))
-        (commit (or (magit--painted-branch-at-point)
-                    (let ((rev (oref it value)))
-                      (or (magit-name-branch rev) rev))))
-        (tag (magit-ref-maybe-qualify (oref it value) "tags/"))
-        (pullreq (or (and (fboundp 'forge--pullreq-branch)
-                          (magit-branch-p
-                           (forge--pullreq-branch (oref it value))))
-                     (magit-ref-p (format "refs/pullreqs/%s"
-                                          (oref (oref it value) number)))))
-        ((unpulled unpushed)
-         (magit-ref-abbrev
-          (replace-regexp-in-string "\\.\\.\\.?" "" (oref it value)))))
-      (magit-thing-at-point 'git-revision t)
-      (and-let* ((chunk (and (bound-and-true-p magit-blame-mode)
-                             (fboundp 'magit-current-blame-chunk)
-                             (magit-current-blame-chunk))))
-        (oref chunk orig-rev))
-      (and magit-buffer-file-name
-           magit-buffer-refname)
-      (and (derived-mode-p 'magit-stash-mode
-                           'magit-merge-preview-mode
-                           'magit-revision-mode)
-           magit-buffer-revision)))
-
-(defun magit-tag-at-point ()
-  (magit-section-case
-    (tag    (oref it value))
-    (commit (magit-name-tag (oref it value)))))
-
-(defun magit-stash-at-point ()
-  (magit-section-value-if 'stash))
-
-(defun magit-remote-at-point ()
-  (magit-section-case
-    (remote (oref it value))
-    ([branch remote] (magit-section-parent-value it))))
-
-(defun magit-module-at-point (&optional predicate)
-  (when (magit-section-match 'module)
-    (let ((module (oref (magit-current-section) value)))
-      (and (or (not predicate)
-               (funcall predicate module))
-           module))))
-
-(defun magit-get-current-branch ()
-  "Return the refname of the currently checked out branch.
-Return nil if no branch is currently checked out."
-  (magit-git-string "symbolic-ref" "--short" "HEAD"))
-
-(defvar magit-get-previous-branch-timeout 0.5
-  "Maximum time to spend in `magit-get-previous-branch'.
-Given as a number of seconds.")
-
-(defun magit-get-previous-branch ()
-  "Return the refname of the previously checked out branch.
-Return nil if no branch can be found in the `HEAD' reflog
-which is different from the current branch and still exists.
-The amount of time spent searching is limited by
-`magit-get-previous-branch-timeout'."
-  (let ((t0 (float-time))
-        (current (magit-get-current-branch))
-        (i 1) prev)
-    (while (if (> (- (float-time) t0) magit-get-previous-branch-timeout)
-               (setq prev nil) ;; Timed out.
-             (and (setq prev (magit-rev-verify (format "@{-%d}" i)))
-                  (or (not (setq prev (magit-rev-branch prev)))
-                      (equal prev current))))
-      (cl-incf i))
-    prev))
-
-(defun magit--set-default-branch (newname oldname)
-  (let ((remote (or (magit-primary-remote)
-                    (user-error "Cannot determine primary remote")))
-        (branches (mapcar (lambda (line) (split-string line "\t"))
-                          (magit-git-lines
-                           "for-each-ref" "refs/heads"
-                           "--format=%(refname:short)\t%(upstream:short)"))))
-    (when-let ((old (assoc oldname branches)))
-      (unless (assoc newname branches)
-        (magit-call-git "branch" "-m" oldname newname)
-        (setcar old newname)))
-    (let ((new (if (magit-branch-p newname)
-                   newname
-                 (concat remote "/" newname))))
-      (pcase-dolist (`(,branch ,upstream) branches)
-        (cond
-         ((equal upstream oldname)
-          (magit-set-upstream-branch branch new))
-         ((equal upstream (concat remote "/" oldname))
-          (magit-set-upstream-branch branch (concat remote "/" newname))))))))
-
-(defun magit--get-default-branch (&optional update)
-  (let ((remote (magit-primary-remote)))
-    (when update
-      (if (not remote)
-          (user-error "Cannot determine primary remote")
-        (message "Determining default branch...")
-        (magit-git "fetch" "--prune")
-        (magit-git "remote" "set-head" "--auto" remote)
-        (message "Determining default branch...done")))
-    (let ((branch (magit-git-string "symbolic-ref" "--short"
-                                    (format "refs/remotes/%s/HEAD" remote))))
-      (when (and update (not branch))
-        (error "Cannot determine new default branch"))
-      (list remote (and branch (cdr (magit-split-branch-name branch)))))))
-
-(defun magit-set-upstream-branch (branch upstream)
-  "Set UPSTREAM as the upstream of BRANCH.
-If UPSTREAM is nil, then unset BRANCH's upstream.
-Otherwise UPSTREAM has to be an existing branch."
-  (if upstream
-      (magit-call-git "branch" "--set-upstream-to" upstream branch)
-    (magit-call-git "branch" "--unset-upstream" branch)))
-
-(defun magit-get-upstream-ref (&optional branch)
-  "Return the upstream branch of BRANCH as a fully qualified ref.
-It BRANCH is nil, then return the upstream of the current branch,
-if any, nil otherwise.  If the upstream is not configured, the
-configured remote is an url, or the named branch does not exist,
-then return nil.  I.e.,  return an existing local or
-remote-tracking branch ref."
-  (and-let* ((branch (or branch (magit-get-current-branch))))
-    (magit-ref-fullname (concat branch "@{upstream}"))))
-
-(defun magit-get-upstream-branch (&optional branch)
-  "Return the name of the upstream branch of BRANCH.
-It BRANCH is nil, then return the upstream of the current branch
-if any, nil otherwise.  If the upstream is not configured, the
-configured remote is an url, or the named branch does not exist,
-then return nil.  I.e., return the name of an existing local or
-remote-tracking branch.  The returned string is colorized
-according to the branch type."
-  (magit--with-refresh-cache
-      (list default-directory 'magit-get-upstream-branch branch)
-    (and-let* ((branch (or branch (magit-get-current-branch)))
-               (upstream (magit-ref-abbrev (concat branch "@{upstream}"))))
-      (magit--propertize-face
-       upstream (if (equal (magit-get "branch" branch "remote") ".")
-                    'magit-branch-local
-                  'magit-branch-remote)))))
-
-(defun magit-get-indirect-upstream-branch (branch &optional force)
-  (let ((remote (magit-get "branch" branch "remote")))
-    (and remote (not (equal remote "."))
-         ;; The user has opted in...
-         (or force
-             (--some (if (magit-git-success "check-ref-format" "--branch" it)
-                         (equal it branch)
-                       (string-match-p it branch))
-                     magit-branch-prefer-remote-upstream))
-         ;; and local BRANCH tracks a remote branch...
-         (let ((upstream (magit-get-upstream-branch branch)))
-           ;; whose upstream...
-           (and upstream
-                ;; has the same name as BRANCH...
-                (equal (substring upstream (1+ (length remote))) branch)
-                ;; and can be fast-forwarded to BRANCH.
-                (magit-rev-ancestor-p upstream branch)
-                upstream)))))
-
-(defun magit-get-upstream-remote (&optional branch allow-unnamed)
-  (and-let* ((branch (or branch (magit-get-current-branch)))
-             (remote (magit-get "branch" branch "remote")))
-    (and (not (equal remote "."))
-         (cond ((member remote (magit-list-remotes))
-                (magit--propertize-face remote 'magit-branch-remote))
-               ((and allow-unnamed
-                     (string-match-p "\\(\\`.\\{0,2\\}/\\|[:@]\\)" remote))
-                (magit--propertize-face remote 'bold))))))
-
-(defun magit-get-unnamed-upstream (&optional branch)
-  (and-let* ((branch (or branch (magit-get-current-branch)))
-             (remote (magit-get "branch" branch "remote"))
-             (merge  (magit-get "branch" branch "merge")))
-    (and (magit--unnamed-upstream-p remote merge)
-         (list (magit--propertize-face remote 'bold)
-               (magit--propertize-face merge 'magit-branch-remote)))))
-
-(defun magit--unnamed-upstream-p (remote merge)
-  (and remote (string-match-p "\\(\\`\\.\\{0,2\\}/\\|[:@]\\)" remote)
-       merge  (string-prefix-p "refs/" merge)))
-
-(defun magit--valid-upstream-p (remote merge)
-  (and (or (equal remote ".")
-           (member remote (magit-list-remotes)))
-       (string-prefix-p "refs/" merge)))
-
-(defun magit-get-current-remote (&optional allow-unnamed)
-  (or (magit-get-upstream-remote nil allow-unnamed)
-      (and-let* ((remotes (magit-list-remotes))
-                 (remote (if (length= remotes 1)
-                             (car remotes)
-                           (magit-primary-remote))))
-        (magit--propertize-face remote 'magit-branch-remote))))
-
-(defun magit-get-push-remote (&optional branch)
-  (and-let* ((remote
-              (or (and (or branch (setq branch (magit-get-current-branch)))
-                       (magit-get "branch" branch "pushRemote"))
-                  (magit-get "remote.pushDefault"))))
-    (magit--propertize-face remote 'magit-branch-remote)))
-
-(defun magit-get-push-branch (&optional branch verify)
-  (magit--with-refresh-cache
-      (list default-directory 'magit-get-push-branch branch verify)
-    (and-let* ((branch (or branch (setq branch (magit-get-current-branch))))
-               (remote (magit-get-push-remote branch))
-               (target (concat remote "/" branch)))
-      (and (or (not verify)
-               (magit-rev-verify target))
-           (magit--propertize-face target 'magit-branch-remote)))))
-
-(defun magit-get-@{push}-branch (&optional branch)
-  (let ((ref (magit-rev-parse "--symbolic-full-name"
-                              (concat branch "@{push}"))))
-    (and ref
-         (string-prefix-p "refs/remotes/" ref)
-         (substring ref 13))))
-
-(defun magit-get-remote (&optional branch)
-  (and (or branch (setq branch (magit-get-current-branch)))
-       (let ((remote (magit-get "branch" branch "remote")))
-         (and (not (equal remote "."))
-              remote))))
-
-(defun magit-get-some-remote (&optional branch)
-  (or (magit-get-remote branch)
-      (and-let* ((main (magit-main-branch)))
-        (magit-get-remote main))
-      (magit-primary-remote)
-      (car (magit-list-remotes))))
-
-(defvar magit-primary-remote-names
-  '("upstream" "origin"))
-
-(defun magit-primary-remote ()
-  "Return the primary remote.
-
-The primary remote is the remote that tracks the repository that
-other repositories are forked from.  It often is called \"origin\"
-but because many people name their own fork \"origin\", using that
-term would be ambiguous.  Likewise we avoid the term \"upstream\"
-because a branch's @{upstream} branch may be a local branch or a
-branch from a remote other than the primary remote.
-
-If a remote exists whose name matches `magit.primaryRemote', then
-that is considered the primary remote.  If no remote by that name
-exists, then remotes in `magit-primary-remote-names' are tried in
-order and the first remote from that list that actually exists in
-the current repository is considered its primary remote."
-  (let ((remotes (magit-list-remotes)))
-    (seq-find (lambda (name)
-                (member name remotes))
-              (delete-dups
-               (delq nil
-                     (cons (magit-get "magit.primaryRemote")
-                           magit-primary-remote-names))))))
-
-(defun magit-branch-merged-p (branch &optional target)
-  "Return non-nil if BRANCH is merged into its upstream and TARGET.
-
-TARGET defaults to the current branch.  If `HEAD' is detached and
-TARGET is nil, then always return nil.  As a special case, if
-TARGET is t, then return non-nil if BRANCH is merged into any one
-of the other local branches.
-
-If, and only if, BRANCH has an upstream, then only return non-nil
-if BRANCH is merged into both TARGET (as described above) as well
-as into its upstream."
-  (and (if-let ((upstream (and (magit-branch-p branch)
-                               (magit-get-upstream-branch branch))))
-           (magit-rev-ancestor-p branch upstream)
-         t)
-       (if (eq target t)
-           (delete (magit-name-local-branch branch)
-                   (magit-list-containing-branches branch))
-         (and-let* ((target (or target (magit-get-current-branch))))
-           (magit-rev-ancestor-p branch target)))))
-
-(defun magit-get-tracked (refname)
-  "Return the remote branch tracked by the remote-tracking branch REFNAME.
-The returned value has the form (REMOTE . REF), where REMOTE is
-the name of a remote and REF is the ref local to the remote."
-  (and-let* ((ref (magit-ref-fullname refname)))
-    (save-match-data
-      (seq-some (lambda (line)
-                  (and (string-match "\
-\\`remote\\.\\([^.]+\\)\\.fetch=\\+?\\([^:]+\\):\\(.+\\)" line)
-                       (let ((rmt (match-string 1 line))
-                             (src (match-string 2 line))
-                             (dst (match-string 3 line)))
-                         (and (string-match (format "\\`%s\\'"
-                                                    (string-replace
-                                                     "*" "\\(.+\\)" dst))
-                                            ref)
-                              (cons rmt (string-replace
-                                         "*" (match-string 1 ref) src))))))
-                (magit-git-lines "config" "--local" "--list")))))
-
-(defun magit-split-branch-name (branch)
-  (cond ((member branch (magit-list-local-branch-names))
-         (cons "." branch))
-        ((string-match "/" branch)
-         (or (seq-some (lambda (remote)
-                         (and (string-match
-                               (format "\\`\\(%s\\)/\\(.+\\)\\'" remote)
-                               branch)
-                              (cons (match-string 1 branch)
-                                    (match-string 2 branch))))
-                       (magit-list-remotes))
-             (error "Invalid branch name %s" branch)))))
-
-(defun magit-get-current-tag (&optional rev with-distance)
-  "Return the closest tag reachable from REV.
-
-If optional REV is nil, then default to `HEAD'.
-If optional WITH-DISTANCE is non-nil then return (TAG COMMITS),
-if it is `dirty' return (TAG COMMIT DIRTY). COMMITS is the number
-of commits in `HEAD' but not in TAG and DIRTY is t if there are
-uncommitted changes, nil otherwise."
-  (and-let* ((str (magit-git-str "describe" "--long" "--tags"
-                                 (and (eq with-distance 'dirty) "--dirty")
-                                 rev)))
-    (save-match-data
-      (string-match
-       "\\(.+\\)-\\(?:0[0-9]*\\|\\([0-9]+\\)\\)-g[0-9a-z]+\\(-dirty\\)?$" str)
-      (if with-distance
-          `(,(match-string 1 str)
-            ,(string-to-number (or (match-string 2 str) "0"))
-            ,@(and (match-string 3 str) (list t)))
-        (match-string 1 str)))))
-
-(defun magit-get-next-tag (&optional rev with-distance)
-  "Return the closest tag from which REV is reachable.
-
-If optional REV is nil, then default to `HEAD'.
-If no such tag can be found or if the distance is 0 (in which
-case it is the current tag, not the next), return nil instead.
-If optional WITH-DISTANCE is non-nil, then return (TAG COMMITS)
-where COMMITS is the number of commits in TAG but not in REV."
-  (and-let* ((str (magit-git-str "describe" "--contains" (or rev "HEAD"))))
-    (save-match-data
-      (when (string-match "^[^^~]+" str)
-        (setq str (match-string 0 str))
-        (unless (equal str (magit-get-current-tag rev))
-          (if with-distance
-              (list str (car (magit-rev-diff-count str rev)))
-            str))))))
-
-(defun magit-list-refs (&optional namespaces format sortby)
-  "Return list of references, excluding symbolic references.
-
-When NAMESPACES is non-nil, list refs from these namespaces
-rather than those from `magit-list-refs-namespaces'.
-
-FORMAT is passed to the `--format' flag of `git for-each-ref'
-and defaults to \"%(refname)\".
-
-SORTBY is a key or list of keys to pass to the `--sort' flag of
-`git for-each-ref'.  When nil, use `magit-list-refs-sortby'"
-  (unless format
-    (setq format "%(refname)"))
-  (seq-keep (lambda (line)
-              (pcase-let* ((`(,symrefp ,value)
-                            (split-string line ""))
-                           (symrefp (not (equal symrefp ""))))
-                (and (not symrefp) value)))
-            (magit-git-lines "for-each-ref"
-                             (concat "--format=%(symref)" format)
-                             (--map (concat "--sort=" it)
-                                    (pcase (or sortby magit-list-refs-sortby)
-                                      ((and val (pred stringp)) (list val))
-                                      ((and val (pred listp)) val)))
-                             (or namespaces magit-list-refs-namespaces))))
-
-(defun magit-list-branches ()
-  (magit-list-refs (list "refs/heads" "refs/remotes")))
-
-(defun magit-list-local-branches ()
-  (magit-list-refs "refs/heads"))
-
-(defun magit-list-remote-branches (&optional remote)
-  (magit-list-refs (concat "refs/remotes/" remote)))
-
-(defun magit-list-related-branches (relation &optional commit &rest args)
-  (--remove (string-match-p "\\(\\`(HEAD\\|HEAD -> \\)" it)
-            (--map (substring it 2)
-                   (magit-git-lines "branch" args relation commit))))
-
-(defun magit-list-containing-branches (&optional commit &rest args)
-  (magit-list-related-branches "--contains" commit args))
-
-(defun magit-list-publishing-branches (&optional commit)
-  (--filter (magit-rev-ancestor-p (or commit "HEAD") it)
-            magit-published-branches))
-
-(defun magit-list-merged-branches (&optional commit &rest args)
-  (magit-list-related-branches "--merged" commit args))
-
-(defun magit-list-unmerged-branches (&optional commit &rest args)
-  (magit-list-related-branches "--no-merged" commit args))
-
-(defun magit-list-unmerged-to-upstream-branches ()
-  (--filter (and-let* ((upstream (magit-get-upstream-branch it)))
-              (member it (magit-list-unmerged-branches upstream)))
-            (magit-list-local-branch-names)))
-
-(defun magit-list-branches-pointing-at (commit)
-  (let ((re (format "\\`%s refs/\\(heads\\|remotes\\)/\\(.*\\)\\'"
-                    (magit-rev-verify commit))))
-    (--keep (and (string-match re it)
-                 (let ((name (match-string 2 it)))
-                   (and (not (string-suffix-p "HEAD" name))
-                        name)))
-            (magit-git-lines "show-ref"))))
-
-(defun magit-list-refnames (&optional namespaces include-special)
-  (nconc (magit-list-refs namespaces "%(refname:short)")
-         (and include-special
-              (magit-list-special-refnames))))
-
-(defvar magit-special-refnames
-  '("HEAD" "ORIG_HEAD" "FETCH_HEAD" "MERGE_HEAD" "CHERRY_PICK_HEAD"))
-
-(defun magit-list-special-refnames ()
-  (let ((gitdir (magit-gitdir)))
-    (cl-mapcan (lambda (name)
-                 (and (file-exists-p (expand-file-name name gitdir))
-                      (list name)))
-               magit-special-refnames)))
-
-(defun magit-list-branch-names ()
-  (magit-list-refnames (list "refs/heads" "refs/remotes")))
-
-(defun magit-list-local-branch-names ()
-  (magit-list-refnames "refs/heads"))
-
-(defun magit-list-remote-branch-names (&optional remote relative)
-  (if (and remote relative)
-      (let ((regexp (format "^refs/remotes/%s/\\(.+\\)" remote)))
-        (--mapcat (when (string-match regexp it)
-                    (list (match-string 1 it)))
-                  (magit-list-remote-branches remote)))
-    (magit-list-refnames (concat "refs/remotes/" remote))))
-
-(defun magit-format-refs (format &rest args)
-  (let ((lines (magit-git-lines
-                "for-each-ref" (concat "--format=" format)
-                (or args (list "refs/heads" "refs/remotes" "refs/tags")))))
-    (if (string-search "\f" format)
-        (--map (split-string it "\f") lines)
-      lines)))
-
-(defun magit-list-remotes ()
-  (magit-git-lines "remote"))
-
-(defun magit-list-tags ()
-  (magit-git-lines "tag"))
-
-(defun magit-list-stashes (&optional format)
-  (magit-git-lines "stash" "list" (concat "--format=" (or format "%gd"))))
-
-(defun magit-list-active-notes-refs ()
-  "Return notes refs according to `core.notesRef' and `notes.displayRef'."
-  (magit-git-lines "for-each-ref" "--format=%(refname)"
-                   (or (magit-get "core.notesRef") "refs/notes/commits")
-                   (magit-get-all "notes.displayRef")))
-
-(defun magit-list-notes-refnames ()
-  (--map (substring it 6) (magit-list-refnames "refs/notes")))
-
-(defun magit-remote-list-tags (remote)
-  (--keep (and (not (string-suffix-p "^{}" it))
-               (substring it 51))
-          (magit-git-lines "ls-remote" "--tags" remote)))
-
-(defun magit-remote-list-branches (remote)
-  (--keep (and (not (string-suffix-p "^{}" it))
-               (substring it 52))
-          (magit-git-lines "ls-remote" "--heads" remote)))
-
-(defun magit-remote-list-refs (remote)
-  (--keep (and (not (string-suffix-p "^{}" it))
-               (substring it 41))
-          (magit-git-lines "ls-remote" remote)))
-
-(defun magit-remote-head (remote)
-  (and-let* ((line (cl-find-if
-                    (lambda (line)
-                      (string-match
-                       "\\`ref: refs/heads/\\([^\s\t]+\\)[\s\t]HEAD\\'" line))
-                    (magit-git-lines "ls-remote" "--symref" remote "HEAD"))))
-    (match-string 1 line)))
-
-(defun magit-list-modified-modules ()
-  (--keep (and (string-match "\\`\\+\\([^ ]+\\) \\(.+\\) (.+)\\'" it)
-               (match-string 2 it))
-          (magit-git-lines "submodule" "status")))
-
-(defun magit-list-module-paths ()
-  (magit-with-toplevel
-    (--mapcat (and (string-match "^160000 [0-9a-z]\\{40,\\} 0\t\\(.+\\)$" it)
-                   (list (match-string 1 it)))
-              (magit-git-items "ls-files" "-z" "--stage"))))
-
-(defun magit-list-module-names ()
-  (mapcar #'magit-get-submodule-name (magit-list-module-paths)))
-
-(defun magit-get-submodule-name (path)
-  "Return the name of the submodule at PATH.
-PATH has to be relative to the super-repository."
-  (if (magit-git-version>= "2.38.0")
-      ;; "git submodule--helper name" was removed,
-      ;; but might still come back in another form.
-      (substring
-       (car (split-string
-             (car (or (magit-git-items
-                       "config" "-z"
-                       "-f" (expand-file-name ".gitmodules" (magit-toplevel))
-                       "--get-regexp" "^submodule\\..*\\.path$"
-                       (concat "^" (regexp-quote (directory-file-name path)) "$"))
-                      (error "No such submodule `%s'" path)))
-             "\n"))
-       10 -5)
-    (magit-git-string "submodule--helper" "name" path)))
-
-(defun magit-list-worktrees ()
-  "Return list of the worktrees of this repository.
-
-The returned list has the form (PATH COMMIT BRANCH BARE DETACHED
-LOCKED PRUNABLE).  The last four elements are booleans, with the
-exception of LOCKED and PRUNABLE, which may also be strings.
-See git-worktree(1) manpage for the meaning of the various parts.
-
-This function corrects a situation where \"git worktree list\"
-would claim a worktree is bare, even though the working tree is
-specified using `core.worktree'."
-  (let ((remote (file-remote-p default-directory))
-        worktrees worktree)
-    (dolist (line (let ((magit-git-global-arguments
-                         ;; KLUDGE At least in Git v2.8.3 this argument
-                         ;; would trigger a segfault.
-                         (remove "--no-pager" magit-git-global-arguments)))
-                    (if (magit-git-version>= "2.36")
-                        (magit-git-items "worktree" "list" "--porcelain" "-z")
-                      (magit-git-lines "worktree" "list" "--porcelain"))))
-      (cond ((string-prefix-p "worktree" line)
-             (let ((path (substring line 9)))
-               (when remote
-                 (setq path (concat remote path)))
-               ;; If the git directory is separate from the main
-               ;; worktree, then "git worktree" returns the git
-               ;; directory instead of the worktree, which isn't
-               ;; what it is supposed to do and not what we want.
-               ;; However, if the worktree has been removed, then
-               ;; we want to return it anyway; instead of nil.
-               (setq path (or (magit-toplevel path) path))
-               (setq worktree (list path nil nil nil nil nil nil))
-               (push worktree worktrees)))
-            ((string-prefix-p "HEAD" line)
-             (setf (nth 1 worktree) (substring line 5)))
-            ((string-prefix-p "branch" line)
-             (setf (nth 2 worktree) (substring line 18)))
-            ((string-equal line "bare")
-             (let* ((default-directory (car worktree))
-                    (wt (and (not (magit-get-boolean "core.bare"))
-                             (magit-get "core.worktree"))))
-               (if (and wt (file-exists-p (expand-file-name wt)))
-                   (progn (setf (nth 0 worktree) (expand-file-name wt))
-                          (setf (nth 2 worktree) (magit-rev-parse "HEAD"))
-                          (setf (nth 3 worktree) (magit-get-current-branch)))
-                 (setf (nth 3 worktree) t))))
-            ((string-equal line "detached")
-             (setf (nth 4 worktree) t))
-            ((string-prefix-p line "locked")
-             (setf (nth 5 worktree)
-                   (if (> (length line) 6) (substring line 7) t)))
-            ((string-prefix-p line "prunable")
-             (setf (nth 6 worktree)
-                   (if (> (length line) 8) (substring line 9) t)))))
-    (nreverse worktrees)))
-
-(defun magit-symbolic-ref-p (name)
-  (magit-git-success "symbolic-ref" "--quiet" name))
-
-(defun magit-ref-p (rev)
-  (or (car (member rev (magit-list-refs "refs/")))
-      (car (member rev (magit-list-refnames "refs/")))))
-
-(defun magit-branch-p (rev)
-  (or (car (member rev (magit-list-branches)))
-      (car (member rev (magit-list-branch-names)))))
-
-(defun magit-local-branch-p (rev)
-  (or (car (member rev (magit-list-local-branches)))
-      (car (member rev (magit-list-local-branch-names)))))
-
-(defun magit-remote-branch-p (rev)
-  (or (car (member rev (magit-list-remote-branches)))
-      (car (member rev (magit-list-remote-branch-names)))))
-
-(defun magit-branch-set-face (branch)
-  (magit--propertize-face branch (if (magit-local-branch-p branch)
-                                     'magit-branch-local
-                                   'magit-branch-remote)))
-
-(defun magit-tag-p (rev)
-  (car (member rev (magit-list-tags))))
-
-(defun magit-remote-p (string)
-  (car (member string (magit-list-remotes))))
-
-(defvar magit-main-branch-names
-  '("main" "master" "trunk" "development")
-  "Branch names reserved for use by the primary branch.
-Use function `magit-main-branch' to get the name actually used in
-the current repository.")
-
-(defvar magit-long-lived-branches
-  (append magit-main-branch-names (list "maint" "next"))
-  "Branch names reserved for use by long lived branches.")
-
-(defun magit-main-branch ()
-  "Return the main branch.
-
-If a branch exists whose name matches `init.defaultBranch', then
-that is considered the main branch.  If no branch by that name
-exists, then the branch names in `magit-main-branch-names' are
-tried in order.  The first branch from that list that actually
-exists in the current repository is considered its main branch."
-  (let ((branches (magit-list-local-branch-names)))
-    (seq-find (lambda (name)
-                (member name branches))
-              (delete-dups
-               (delq nil
-                     (cons (magit-get "init.defaultBranch")
-                           magit-main-branch-names))))))
-
-(defun magit-rev-diff-count (a b &optional first-parent)
-  "Return the commits in A but not B and vice versa.
-Return a list of two integers: (A>B B>A).
-
-If `first-parent' is set, traverse only first parents."
-  (mapcar #'string-to-number
-          (split-string (magit-git-string "rev-list"
-                                          "--count" "--left-right"
-                                          (and first-parent "--first-parent")
-                                          (concat a "..." b))
-                        "\t")))
-
-(defun magit-abbrev-length ()
-  (let ((abbrev (magit-get "core.abbrev")))
-    (if (and abbrev (not (equal abbrev "auto")))
-        (string-to-number abbrev)
-      ;; Guess the length git will be using based on an example
-      ;; abbreviation.  Actually HEAD's abbreviation might be an
-      ;; outlier, so use the shorter of the abbreviations for two
-      ;; commits.  See #3034.
-      (if-let ((head (magit-rev-parse "--short" "HEAD"))
-               (head-len (length head)))
-          (min head-len
-               (if-let ((rev (magit-rev-parse "--short" "HEAD~")))
-                   (length rev)
-                 head-len))
-        ;; We're on an unborn branch, but perhaps the repository has
-        ;; other commits.  See #4123.
-        (if-let ((commits (magit-git-lines "rev-list" "-n2" "--all"
-                                           "--abbrev-commit")))
-            (apply #'min (mapcar #'length commits))
-          ;; A commit does not exist.  Fall back to the default of 7.
-          7)))))
-
-(defun magit-abbrev-arg (&optional arg)
-  (format "--%s=%d" (or arg "abbrev") (magit-abbrev-length)))
-
-(defun magit-rev-abbrev (rev)
-  (magit-rev-parse (magit-abbrev-arg "short") rev))
-
-(defun magit-commit-children (commit &optional args)
-  (mapcar #'car
-          (--filter (member commit (cdr it))
-                    (--map (split-string it " ")
-                           (magit-git-lines
-                            "log" "--format=%H %P"
-                            (or args (list "--branches" "--tags" "--remotes"))
-                            "--not" commit)))))
-
-(defun magit-commit-parents (commit)
-  (and-let* ((str (magit-git-string "rev-list" "-1" "--parents" commit)))
-    (cdr (split-string str))))
-
-(defun magit-patch-id (rev)
-  (magit--with-connection-local-variables
-    (magit--with-temp-process-buffer
-      (magit-process-file
-       shell-file-name nil '(t nil) nil shell-command-switch
-       (let ((exec (shell-quote-argument (magit-git-executable))))
-         (format "%s diff-tree -u %s | %s patch-id" exec rev exec)))
-      (car (split-string (buffer-string))))))
-
-(defun magit-rev-format (format &optional rev args)
-  ;; Prefer `git log --no-walk' to `git show --no-patch' because it
-  ;; performs better in some scenarios.
-  (let ((str (magit-git-string "log" "--no-walk"
-                               (concat "--format=" format) args
-                               (if rev (magit--rev-dereference rev) "HEAD")
-                               "--")))
-    (and (not (string-equal str ""))
-         str)))
-
-(defun magit-rev-insert-format (format &optional rev args)
-  ;; Prefer `git log --no-walk' to `git show --no-patch' because it
-  ;; performs better in some scenarios.
-  (magit-git-insert "log" "--no-walk"
-                    (concat "--format=" format) args
-                    (if rev (magit--rev-dereference rev) "HEAD")
-                    "--"))
-
-(defun magit-format-rev-summary (rev)
-  (and-let* ((str (magit-rev-format "%h %s" rev)))
-    (progn
-      (magit--put-face 0 (string-match " " str) 'magit-hash str)
-      str)))
-
-(defvar magit-ref-namespaces
-  '(("\\`HEAD\\'"                  . magit-head)
-    ("\\`refs/tags/\\(.+\\)"       . magit-tag)
-    ("\\`refs/heads/\\(.+\\)"      . magit-branch-local)
-    ("\\`refs/remotes/\\(.+\\)"    . magit-branch-remote)
-    ("\\`refs/bisect/\\(bad\\)"    . magit-bisect-bad)
-    ("\\`refs/bisect/\\(skip.*\\)" . magit-bisect-skip)
-    ("\\`refs/bisect/\\(good.*\\)" . magit-bisect-good)
-    ("\\`refs/stash$"              . magit-refname-stash)
-    ("\\`refs/wip/\\(.+\\)"        . magit-refname-wip)
-    ("\\`refs/pullreqs/\\(.+\\)"   . magit-refname-pullreq)
-    ("\\`\\(bad\\):"               . magit-bisect-bad)
-    ("\\`\\(skip\\):"              . magit-bisect-skip)
-    ("\\`\\(good\\):"              . magit-bisect-good)
-    ("\\`\\(.+\\)"                 . magit-refname))
-  "How refs are formatted for display.
-
-Each entry controls how a certain type of ref is displayed, and
-has the form (REGEXP . FACE).  REGEXP is a regular expression
-used to match full refs.  The first entry whose REGEXP matches
-the reference is used.
-
-In log and revision buffers the first regexp submatch becomes the
-\"label\" that represents the ref and is propertized with FONT.
-In refs buffers the displayed text is controlled by other means
-and this option only controls what face is used.")
-
-(defun magit-format-ref-labels (string)
-  (save-match-data
-    (let ((regexp "\\(, \\|tag: \\|HEAD -> \\)")
-          names)
-      (if (and (derived-mode-p 'magit-log-mode)
-               (member "--simplify-by-decoration" magit-buffer-log-args))
-          (let ((branches (magit-list-local-branch-names))
-                (re (format "^%s/.+" (regexp-opt (magit-list-remotes)))))
-            (setq names
-                  (--map (cond ((string-equal it "HEAD")     it)
-                               ((string-prefix-p "refs/" it) it)
-                               ((member it branches) (concat "refs/heads/" it))
-                               ((string-match re it) (concat "refs/remotes/" it))
-                               (t                    (concat "refs/" it)))
-                         (split-string
-                          (string-replace "tag: " "refs/tags/" string)
-                          regexp t))))
-        (setq names (split-string string regexp t)))
-      (let (state head upstream tags branches remotes other combined)
-        (dolist (ref names)
-          (let* ((face (cdr (--first (string-match (car it) ref)
-                                     magit-ref-namespaces)))
-                 (name (magit--propertize-face
-                        (or (match-string 1 ref) ref) face)))
-            (cl-case face
-              ((magit-bisect-bad magit-bisect-skip magit-bisect-good)
-               (setq state name))
-              (magit-head
-               (setq head (magit--propertize-face "@" 'magit-head)))
-              (magit-tag            (push name tags))
-              (magit-branch-local   (push name branches))
-              (magit-branch-remote  (push name remotes))
-              (t                    (push name other)))))
-        (setq remotes
-              (seq-keep
-               (lambda (name)
-                 (if (string-match "\\`\\([^/]*\\)/\\(.*\\)\\'" name)
-                     (let ((r (match-string 1 name))
-                           (b (match-string 2 name)))
-                       (and (not (equal b "HEAD"))
-                            (if (equal (concat "refs/remotes/" name)
-                                       (magit-git-string
-                                        "symbolic-ref"
-                                        (format "refs/remotes/%s/HEAD" r)))
-                                (magit--propertize-face
-                                 name 'magit-branch-remote-head)
-                              name)))
-                   name))
-               remotes))
-        (let* ((current (magit-get-current-branch))
-               (target  (magit-get-upstream-branch current)))
-          (dolist (name branches)
-            (let ((push (car (member (magit-get-push-branch name) remotes))))
-              (when push
-                (setq remotes (delete push remotes))
-                (string-match "^[^/]*/" push)
-                (setq push (substring push 0 (match-end 0))))
-              (cond
-               ((equal name current)
-                (setq head
-                      (concat push
-                              (magit--propertize-face
-                               name 'magit-branch-current))))
-               ((equal name target)
-                (setq upstream
-                      (concat push
-                              (magit--propertize-face
-                               name '(magit-branch-upstream
-                                      magit-branch-local)))))
-               (t
-                (push (concat push name) combined)))))
-          (when (and target (not upstream))
-            (if (member target remotes)
-                (progn
-                  (magit--add-face-text-property
-                   0 (length target) 'magit-branch-upstream nil target)
-                  (setq upstream target)
-                  (setq remotes  (delete target remotes)))
-              (when-let ((target (car (member target combined))))
-                (magit--add-face-text-property
-                 0 (length target) 'magit-branch-upstream nil target)
-                (setq upstream target)
-                (setq combined (delete target combined))))))
-        (string-join (flatten-tree `(,state
-                                     ,head
-                                     ,upstream
-                                     ,@(nreverse tags)
-                                     ,@(nreverse combined)
-                                     ,@(nreverse remotes)
-                                     ,@other))
-                     " ")))))
-
-(defun magit-object-type (object)
-  (magit-git-string "cat-file" "-t" object))
-
-(defmacro magit-with-blob (commit file &rest body)
-  (declare (indent 2)
-           (debug (form form body)))
-  `(magit--with-temp-process-buffer
-     (let ((buffer-file-name ,file))
-       (save-excursion
-         (magit-git-insert "cat-file" "-p"
-                           (concat ,commit ":" buffer-file-name)))
-       (decode-coding-inserted-region
-        (point-min) (point-max) buffer-file-name t nil nil t)
-       ,@body)))
-
-(defmacro magit-with-temp-index (tree arg &rest body)
-  (declare (indent 2) (debug (form form body)))
-  (let ((file (cl-gensym "file")))
-    `(let ((magit--refresh-cache nil)
-           (,file (magit-convert-filename-for-git
-                   (make-temp-name
-                    (expand-file-name "index.magit." (magit-gitdir))))))
-       (unwind-protect
-           (magit-with-toplevel
-             (when-let ((tree ,tree))
-               (unless (magit-git-success "read-tree" ,arg tree
-                                          (concat "--index-output=" ,file))
-                 (error "Cannot read tree %s" tree)))
-             (with-environment-variables (("GIT_INDEX_FILE" ,file))
-               ,@body))
-         (ignore-errors
-           (delete-file (concat (file-remote-p default-directory) ,file)))))))
-
-(defun magit-commit-tree (message &optional tree &rest parents)
-  (magit-git-string "commit-tree" "--no-gpg-sign" "-m" message
-                    (--mapcat (list "-p" it) (delq nil parents))
-                    (or tree
-                        (magit-git-string "write-tree")
-                        (error "Cannot write tree"))))
-
-(defun magit-commit-worktree (message &optional arg &rest other-parents)
-  (magit-with-temp-index "HEAD" arg
-    (and (magit-update-files (magit-unstaged-files))
-         (apply #'magit-commit-tree message nil "HEAD" other-parents))))
-
-(defun magit-update-files (files)
-  (magit-git-success "update-index" "--add" "--remove" "--" files))
-
-(defun magit-update-ref (ref message rev &optional stashish)
-  (let ((magit--refresh-cache nil))
-    (or (if (magit-git-version>= "2.6.0")
-            (zerop (magit-call-git "update-ref" "--create-reflog"
-                                   "-m" message ref rev
-                                   (or (magit-rev-verify ref) "")))
-          ;; `--create-reflog' didn't exist before v2.6.0
-          (let ((oldrev  (magit-rev-verify ref))
-                (logfile (expand-file-name (concat "logs/" ref)
-                                           (magit-gitdir))))
-            (unless (file-exists-p logfile)
-              (when oldrev
-                (magit-git-success "update-ref" "-d" ref oldrev))
-              (make-directory (file-name-directory logfile) t)
-              (with-temp-file logfile)
-              (when (and oldrev (not stashish))
-                (magit-git-success "update-ref" "-m" "enable reflog"
-                                   ref oldrev ""))))
-          (magit-git-success "update-ref" "-m" message ref rev
-                             (or (magit-rev-verify ref) "")))
-        (error "Cannot update %s with %s" ref rev))))
-
-(defconst magit-range-re
-  (concat "\\`\\([^ \t]*[^.]\\)?"       ; revA
-          "\\(\\.\\.\\.?\\)"            ; range marker
-          "\\([^.][^ \t]*\\)?\\'"))     ; revB
-
-(defun magit-split-range (range)
-  (pcase-let ((`(,beg ,end ,sep) (magit--split-range-raw range)))
-    (and sep
-         (let ((beg (or beg "HEAD"))
-               (end (or end "HEAD")))
-           (if (string-equal (match-string 2 range) "...")
-               (and-let* ((base (magit-git-string "merge-base" beg end)))
-                 (cons base end))
-             (cons beg end))))))
-
-(defun magit--split-range-raw (range)
-  (and (string-match magit-range-re range)
-       (let ((beg (match-string 1 range))
-             (end (match-string 3 range)))
-         (and (or beg end)
-              (list beg end (match-string 2 range))))))
-
-(defun magit-hash-range (range)
-  (if (string-match magit-range-re range)
-      (let ((beg (match-string 1 range))
-            (end (match-string 3 range)))
-        (and (or beg end)
-             (let ((beg-hash (and beg (magit-rev-hash (match-string 1 range))))
-                   (end-hash (and end (magit-rev-hash (match-string 3 range)))))
-               (and (or (not beg) beg-hash)
-                    (or (not end) end-hash)
-                    (concat beg-hash (match-string 2 range) end-hash)))))
-    (magit-rev-hash range)))
-
-(defvar magit-revision-faces
-  '(magit-hash
-    magit-tag
-    magit-branch-remote
-    magit-branch-remote-head
-    magit-branch-local
-    magit-branch-current
-    magit-branch-upstream
-    magit-branch-warning
-    magit-head
-    magit-refname
-    magit-refname-stash
-    magit-refname-wip
-    magit-refname-pullreq))
-
-(put 'git-revision 'thing-at-point #'magit-thingatpt--git-revision)
-(defun magit-thingatpt--git-revision (&optional disallow)
-  ;; Support hashes and references.
-  (and-let* ((bounds
-              (let ((c (concat "\s\n\t~^:?*[\\" disallow)))
-                (cl-letf
-                    (((get 'git-revision 'beginning-op)
-                      (lambda ()
-                        (if (re-search-backward (format "[%s]" c) nil t)
-                            (forward-char)
-                          (goto-char (point-min)))))
-                     ((get 'git-revision 'end-op)
-                      (lambda ()
-                        (re-search-forward (format "\\=[^%s]*" c) nil t))))
-                  (bounds-of-thing-at-point 'git-revision))))
-             (string (buffer-substring-no-properties (car bounds) (cdr bounds)))
-             ;; References are allowed to contain most parentheses and
-             ;; most punctuation, but if those characters appear at the
-             ;; edges of a possible reference in arbitrary text, then
-             ;; they are much more likely to be intended as just that:
-             ;; punctuation and delimiters.
-             (string (thread-first string
-                       (string-trim-left  "[(</]")
-                       (string-trim-right "[])>/.,;!]"))))
-    (let (disallow)
-      (when (or (string-match-p "\\.\\." string)
-                (string-match-p "/\\." string))
-        (setq disallow (concat disallow ".")))
-      (when (string-match-p "@{" string)
-        (setq disallow (concat disallow "@{")))
-      (if disallow
-          ;; These additional restrictions overcompensate,
-          ;; but that only matters in rare cases.
-          (magit-thingatpt--git-revision disallow)
-        (and (not (equal string "@"))
-             (or (and (>= (length string) 7)
-                      (string-match-p "[a-z]" string)
-                      (magit-commit-p string))
-                 (and (magit-ref-p string)
-                      (let ((face (get-text-property (point) 'face)))
-                        (or (not face)
-                            (member face magit-revision-faces)))))
-             string)))))
-
-(put 'git-revision-range 'thing-at-point #'magit-thingatpt--git-revision-range)
-(defun magit-thingatpt--git-revision-range ()
-  ;; Support hashes but no references.
-  (and-let* ((bounds
-              (cl-letf (((get 'git-revision 'beginning-op)
-                         (lambda ()
-                           (if (re-search-backward "[^a-z0-9.]" nil t)
-                               (forward-char)
-                             (goto-char (point-min)))))
-                        ((get 'git-revision 'end-op)
-                         (lambda ()
-                           (and (re-search-forward "[^a-z0-9.]" nil t)
-                                (backward-char)))))
-                (bounds-of-thing-at-point 'git-revision)))
-             (range (buffer-substring-no-properties (car bounds) (cdr bounds))))
-    ;; Validate but return as-is.
-    (and (magit-hash-range range) range)))
-
-;;; Completion
-
-(defvar magit-revision-history nil)
-
-(defun magit--minibuf-default-add-commit ()
-  (let ((fn minibuffer-default-add-function))
-    (lambda ()
-      (if-let ((commit (with-selected-window (minibuffer-selected-window)
-                         (or (magit-thing-at-point 'git-revision-range t)
-                             (magit-commit-at-point)))))
-          (let ((rest (cons commit (delete commit (funcall fn))))
-                (def minibuffer-default))
-            (if (listp def)
-                (append def rest)
-              (cons def (delete def rest))))
-        (funcall fn)))))
-
-(defun magit-read-branch (prompt &optional secondary-default)
-  (magit-completing-read prompt (magit-list-branch-names)
-                         nil t nil 'magit-revision-history
-                         (or (magit-branch-at-point)
-                             secondary-default
-                             (magit-get-current-branch))))
-
-(defun magit-read-branch-or-commit (prompt &optional secondary-default exclude)
-  (let ((current (magit-get-current-branch))
-        (atpoint (magit-branch-or-commit-at-point))
-        (minibuffer-default-add-function (magit--minibuf-default-add-commit)))
-    (or (magit-completing-read prompt
-                               (delete exclude (magit-list-refnames nil t))
-                               nil nil nil 'magit-revision-history
-                               (or (and (not (equal atpoint exclude)) atpoint)
-                                   secondary-default
-                                   (and (not (equal current exclude)) current)))
-        (user-error "Nothing selected"))))
-
-(defun magit-read-range-or-commit (prompt &optional secondary-default)
-  (magit-read-range
-   prompt
-   (or (and-let* ((revs (magit-region-values '(commit branch) t)))
-         (progn
-           (deactivate-mark)
-           (concat (car (last revs)) ".." (car revs))))
-       (magit-branch-or-commit-at-point)
-       secondary-default
-       (magit-get-current-branch))))
-
-(defun magit-read-range (prompt &optional default)
-  (let ((minibuffer-default-add-function (magit--minibuf-default-add-commit))
-        (crm-separator "\\.\\.\\.?"))
-    (magit-completing-read-multiple
-     (concat prompt ": ")
-     (magit-list-refnames)
-     nil nil nil 'magit-revision-history default nil t)))
-
-(defun magit-read-remote-branch
-    (prompt &optional remote default local-branch require-match)
-  (let ((choice (magit-completing-read
-                 prompt
-                 (cl-union (and local-branch
-                                (if remote
-                                    (list local-branch)
-                                  (--map (concat it "/" local-branch)
-                                         (magit-list-remotes))))
-                           (magit-list-remote-branch-names remote t)
-                           :test #'equal)
-                 nil require-match nil 'magit-revision-history default)))
-    (if (or remote (string-match "\\`\\([^/]+\\)/\\(.+\\)" choice))
-        choice
-      (user-error "`%s' doesn't have the form REMOTE/BRANCH" choice))))
-
-(defun magit-read-refspec (prompt remote)
-  (magit-completing-read prompt
-                         (prog2 (message "Determining available refs...")
-                             (magit-remote-list-refs remote)
-                           (message "Determining available refs...done"))))
-
-(defun magit-read-local-branch (prompt &optional secondary-default)
-  (magit-completing-read prompt (magit-list-local-branch-names)
-                         nil t nil 'magit-revision-history
-                         (or (magit-local-branch-at-point)
-                             secondary-default
-                             (magit-get-current-branch))))
-
-(defun magit-read-local-branch-or-commit (prompt)
-  (let ((minibuffer-default-add-function (magit--minibuf-default-add-commit))
-        (choices (nconc (magit-list-local-branch-names)
-                        (magit-list-special-refnames)))
-        (commit (magit-commit-at-point)))
-    (when commit
-      (push commit choices))
-    (or (magit-completing-read prompt choices
-                               nil nil nil 'magit-revision-history
-                               (or (magit-local-branch-at-point) commit))
-        (user-error "Nothing selected"))))
-
-(defun magit-read-local-branch-or-ref (prompt &optional secondary-default)
-  (magit-completing-read prompt (nconc (magit-list-local-branch-names)
-                                       (magit-list-refs "refs/"))
-                         nil t nil 'magit-revision-history
-                         (or (magit-local-branch-at-point)
-                             secondary-default
-                             (magit-get-current-branch))))
-
-(defun magit-read-other-branch
-    (prompt &optional exclude secondary-default no-require-match)
-  (let* ((current (magit-get-current-branch))
-         (atpoint (magit-branch-at-point))
-         (exclude (or exclude current))
-         (default (or (and (not (equal atpoint exclude)) atpoint)
-                      (and (not (equal current exclude)) current)
-                      secondary-default
-                      (magit-get-previous-branch))))
-    (magit-completing-read prompt (delete exclude (magit-list-branch-names))
-                           nil (not no-require-match)
-                           nil 'magit-revision-history default)))
-
-(defun magit-read-other-branch-or-commit
-    (prompt &optional exclude secondary-default)
-  (let* ((minibuffer-default-add-function (magit--minibuf-default-add-commit))
-         (current (magit-get-current-branch))
-         (atpoint (magit-branch-or-commit-at-point))
-         (exclude (or exclude current))
-         (default (or (and (not (equal atpoint exclude))
-                           (not (and (not current)
-                                     (magit-rev-equal atpoint "HEAD")))
-                           atpoint)
-                      (and (not (equal current exclude)) current)
-                      secondary-default
-                      (magit-get-previous-branch))))
-    (or (magit-completing-read prompt (delete exclude (magit-list-refnames))
-                               nil nil nil 'magit-revision-history default)
-        (user-error "Nothing selected"))))
-
-(defun magit-read-other-local-branch
-    (prompt &optional exclude secondary-default no-require-match)
-  (let* ((current (magit-get-current-branch))
-         (atpoint (magit-local-branch-at-point))
-         (exclude (or exclude current))
-         (default (or (and (not (equal atpoint exclude)) atpoint)
-                      (and (not (equal current exclude)) current)
-                      secondary-default
-                      (magit-get-previous-branch))))
-    (magit-completing-read prompt
-                           (delete exclude (magit-list-local-branch-names))
-                           nil (not no-require-match)
-                           nil 'magit-revision-history default)))
-
-(defun magit-read-branch-prefer-other (prompt)
-  (let* ((current (magit-get-current-branch))
-         (commit  (magit-commit-at-point))
-         (atrev   (and commit (magit-list-branches-pointing-at commit)))
-         (atpoint (magit--painted-branch-at-point)))
-    (magit-completing-read prompt (magit-list-branch-names)
-                           nil t nil 'magit-revision-history
-                           (or (magit-section-value-if 'branch)
-                               atpoint
-                               (and (not (cdr atrev)) (car atrev))
-                               (--first (not (equal it current)) atrev)
-                               (magit-get-previous-branch)
-                               (car atrev)))))
-
-(defun magit-read-upstream-branch (&optional branch prompt)
-  "Read the upstream for BRANCH using PROMPT.
-If optional BRANCH is nil, then read the upstream for the
-current branch, or raise an error if no branch is checked
-out.  Only existing branches can be selected."
-  (unless branch
-    (setq branch (or (magit-get-current-branch)
-                     (error "Need a branch to set its upstream"))))
-  (let ((branches (delete branch (magit-list-branch-names))))
-    (magit-completing-read
-     (or prompt (format "Change upstream of %s to" branch))
-     branches nil t nil 'magit-revision-history
-     (or (let ((r (car (member (magit-remote-branch-at-point) branches)))
-               (l (car (member (magit-local-branch-at-point) branches))))
-           (if magit-prefer-remote-upstream (or r l) (or l r)))
-         (and-let* ((main (magit-main-branch)))
-           (let ((r (car (member (concat "origin/" main) branches)))
-                 (l (car (member main branches))))
-             (if magit-prefer-remote-upstream (or r l) (or l r))))
-         (car (member (magit-get-previous-branch) branches))))))
-
-(defun magit-read-starting-point (prompt &optional branch default)
-  (or (magit-completing-read
-       (concat prompt
-               (and branch
-                    (if (bound-and-true-p ivy-mode)
-                        ;; Ivy-mode strips faces from prompt.
-                        (format  " `%s'" branch)
-                      (concat " " (magit--propertize-face
-                                   branch 'magit-branch-local))))
-               " starting at")
-       (nconc (list "HEAD")
-              (magit-list-refnames)
-              (directory-files (magit-gitdir) nil "_HEAD\\'"))
-       nil nil nil 'magit-revision-history
-       (or default (magit--default-starting-point)))
-      (user-error "Nothing selected")))
-
-(defun magit--default-starting-point ()
-  (or (let ((r (magit-remote-branch-at-point))
-            (l (magit-local-branch-at-point)))
-        (if magit-prefer-remote-upstream (or r l) (or l r)))
-      (magit-commit-at-point)
-      (magit-stash-at-point)
-      (magit-get-current-branch)))
-
-(defun magit-read-tag (prompt &optional require-match)
-  (magit-completing-read prompt (magit-list-tags) nil
-                         require-match nil 'magit-revision-history
-                         (magit-tag-at-point)))
-
-(defun magit-read-stash (prompt)
-  (let* ((atpoint (magit-stash-at-point))
-         (default (and atpoint
-                       (concat atpoint (magit-rev-format " %s" atpoint))))
-         (choices (mapcar (lambda (c)
-                            (pcase-let ((`(,rev ,msg) (split-string c "\0")))
-                              (concat (propertize rev 'face 'magit-hash)
-                                      " " msg)))
-                          (magit-list-stashes "%gd%x00%s")))
-         (choice  (magit-completing-read prompt choices
-                                         nil t nil nil
-                                         default
-                                         (car choices))))
-    (and choice
-         (string-match "^\\([^ ]+\\) \\(.+\\)" choice)
-         (substring-no-properties (match-string 1 choice)))))
-
-(defun magit-read-remote (prompt &optional default use-only)
-  (let ((remotes (magit-list-remotes)))
-    (if (and use-only (length= remotes 1))
-        (car remotes)
-      (magit-completing-read prompt remotes
-                             nil t nil nil
-                             (or default
-                                 (magit-remote-at-point)
-                                 (magit-get-remote))))))
-
-(defun magit-read-remote-or-url (prompt &optional default)
-  (magit-completing-read prompt
-                         (nconc (magit-list-remotes)
-                                (list "https://" "git://" "git@"))
-                         nil nil nil nil
-                         (or default
-                             (magit-remote-at-point)
-                             (magit-get-remote))))
-
-(defun magit-read-module-path (prompt &optional predicate)
-  (magit-completing-read prompt (magit-list-module-paths)
-                         predicate t nil nil
-                         (magit-module-at-point predicate)))
-
-(defun magit-module-confirm (verb &optional predicate)
-  ;; Some predicates use the inefficient `magit-toplevel'
-  ;; and some repositories have thousands of submodules.
-  (let ((magit--refresh-cache (list (cons 0 0)))
-        (modules nil))
-    (if current-prefix-arg
-        (progn
-          (setq modules (magit-list-module-paths))
-          (when predicate
-            (setq modules (seq-filter predicate modules)))
-          (unless modules
-            (if predicate
-                (user-error "No modules satisfying %s available" predicate)
-              (user-error "No modules available"))))
-      (setq modules (magit-region-values 'module))
-      (when modules
-        (when predicate
-          (setq modules (seq-filter predicate modules)))
-        (unless modules
-          (user-error "No modules satisfying %s selected" predicate))))
-    (if (or (length> modules 1) current-prefix-arg)
-        (magit-confirm t nil (format "%s %%d modules" verb) nil modules)
-      (list (magit-read-module-path (format "%s module" verb) predicate)))))
-
-;;; _
-(provide 'magit-git)
-;;; magit-git.el ends here
diff --git a/emacs/elpa/magit-20240930.1805/magit-git.elc b/emacs/elpa/magit-20240930.1805/magit-git.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240930.1805/magit-log.elc b/emacs/elpa/magit-20240930.1805/magit-log.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240930.1805/magit-pkg.el b/emacs/elpa/magit-20240930.1805/magit-pkg.el
@@ -1,18 +0,0 @@
-;; -*- no-byte-compile: t; lexical-binding: nil -*-
-(define-package "magit" "20240930.1805"
-  "A Git porcelain inside Emacs."
-  '((emacs         "26.1")
-    (compat        "30.0.0.0")
-    (dash          "2.19.1")
-    (magit-section "4.1.0")
-    (seq           "2.24")
-    (transient     "0.7.5")
-    (with-editor   "3.4.2"))
-  :url "https://github.com/magit/magit"
-  :commit "155b5364caf3dd317723a1b47f355fe4ef96e5c1"
-  :revdesc "155b5364caf3"
-  :keywords '("git" "tools" "vc")
-  :authors '(("Marius Vollmer" . "marius.vollmer@gmail.com")
-             ("Jonas Bernoulli" . "emacs.magit@jonas.bernoulli.dev"))
-  :maintainers '(("Jonas Bernoulli" . "emacs.magit@jonas.bernoulli.dev")
-                 ("Kyle Meyer" . "kyle@kyleam.com")))
diff --git a/emacs/elpa/magit-20240930.1805/magit.el b/emacs/elpa/magit-20240930.1805/magit.el
@@ -1,789 +0,0 @@
-;;; magit.el --- A Git porcelain inside Emacs  -*- lexical-binding:t; coding:utf-8 -*-
-
-;; Copyright (C) 2008-2024 The Magit Project Contributors
-
-;; Author: Marius Vollmer <marius.vollmer@gmail.com>
-;;     Jonas Bernoulli <emacs.magit@jonas.bernoulli.dev>
-;; Maintainer: Jonas Bernoulli <emacs.magit@jonas.bernoulli.dev>
-;;     Kyle Meyer <kyle@kyleam.com>
-;; Former-Maintainers:
-;;     Nicolas Dudebout <nicolas.dudebout@gatech.edu>
-;;     Noam Postavsky <npostavs@users.sourceforge.net>
-;;     Peter J. Weisberg <pj@irregularexpressions.net>
-;;     Phil Jackson <phil@shellarchive.co.uk>
-;;     Rémi Vanicat <vanicat@debian.org>
-;;     Yann Hodique <yann.hodique@gmail.com>
-
-;; Homepage: https://github.com/magit/magit
-;; Keywords: git tools vc
-
-;; Package-Version: 20240930.1805
-;; Package-Revision: 155b5364caf3
-;; Package-Requires: (
-;;     (emacs "26.1")
-;;     (compat "30.0.0.0")
-;;     (dash "2.19.1")
-;;     (magit-section "4.1.0")
-;;     (seq "2.24")
-;;     (transient "0.7.5")
-;;     (with-editor "3.4.2"))
-
-;; SPDX-License-Identifier: GPL-3.0-or-later
-
-;; Magit is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published
-;; by the Free Software Foundation, either version 3 of the License,
-;; or (at your option) any later version.
-;;
-;; Magit is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-;;
-;; You should have received a copy of the GNU General Public License
-;; along with Magit.  If not, see <https://www.gnu.org/licenses/>.
-
-;; You should have received a copy of the AUTHORS.md file, which
-;; lists all contributors.  If not, see https://magit.vc/authors.
-
-;;; Commentary:
-
-;; Magit is a text-based Git user interface that puts an unmatched focus
-;; on streamlining workflows.  Commands are invoked using short mnemonic
-;; key sequences that take the cursor’s position in the highly actionable
-;; interface into account to provide context-sensitive behavior.
-
-;; With Magit you can do nearly everything that you can do when using Git
-;; on the command-line, but at greater speed and while taking advantage
-;; of advanced features that previously seemed too daunting to use on a
-;; daily basis.  Many users will find that by using Magit they can become
-;; more effective Git user.
-
-;;; Code:
-
-(require 'magit-core)
-(require 'magit-diff)
-(require 'magit-log)
-(require 'magit-wip)
-(require 'magit-apply)
-(require 'magit-repos)
-(require 'git-commit)
-
-(require 'format-spec)
-(require 'package nil t) ; used in `magit-version'
-(require 'with-editor)
-
-;; For `magit:--gpg-sign'
-(declare-function epg-list-keys "epg" (context &optional name mode))
-(declare-function epg-decode-dn "epg" (alist))
-(defvar epa-protocol)
-
-;;; Options
-
-(defcustom magit-openpgp-default-signing-key nil
-  "Fingerprint of your default Openpgp key used for signing.
-If the specified primary key has signing capacity then it is used
-as the value of the `--gpg-sign' argument without prompting, even
-when other such keys exist.  To be able to select another key you
-must then use a prefix argument."
-  :package-version '(magit . "4.0.0")
-  :group 'magit-commands
-  :type 'string)
-
-;;; Faces
-
-(defface magit-header-line
-  '((t :inherit magit-section-heading))
-  "Face for the `header-line' in some Magit modes.
-Note that some modes, such as `magit-log-select-mode', have their
-own faces for the `header-line', or for parts of the
-`header-line'."
-  :group 'magit-faces)
-
-(defface magit-header-line-key
-  '((t :inherit font-lock-builtin-face))
-  "Face for keys in the `header-line'."
-  :group 'magit-faces)
-
-(defface magit-dimmed
-  '((((class color) (background light)) :foreground "grey50")
-    (((class color) (background  dark)) :foreground "grey50"))
-  "Face for text that shouldn't stand out."
-  :group 'magit-faces)
-
-(defface magit-hash
-  '((((class color) (background light)) :foreground "grey60")
-    (((class color) (background  dark)) :foreground "grey40"))
-  "Face for the commit object name in the log output."
-  :group 'magit-faces)
-
-(defface magit-tag
-  '((((class color) (background light)) :foreground "Goldenrod4")
-    (((class color) (background  dark)) :foreground "LightGoldenrod2"))
-  "Face for tag labels shown in log buffer."
-  :group 'magit-faces)
-
-(defface magit-branch-remote
-  '((((class color) (background light)) :foreground "DarkOliveGreen4")
-    (((class color) (background  dark)) :foreground "DarkSeaGreen2"))
-  "Face for remote branch head labels shown in log buffer."
-  :group 'magit-faces)
-
-(defface magit-branch-remote-head
-  '((((supports (:box t))) :inherit magit-branch-remote :box t)
-    (t                     :inherit magit-branch-remote :inverse-video t))
-  "Face for current branch."
-  :group 'magit-faces)
-
-(defface magit-branch-local
-  '((((class color) (background light)) :foreground "SkyBlue4")
-    (((class color) (background  dark)) :foreground "LightSkyBlue1"))
-  "Face for local branches."
-  :group 'magit-faces)
-
-(defface magit-branch-current
-  '((((supports (:box t))) :inherit magit-branch-local :box t)
-    (t                     :inherit magit-branch-local :inverse-video t))
-  "Face for current branch."
-  :group 'magit-faces)
-
-(defface magit-branch-upstream
-  '((t :slant italic))
-  "Face for upstream branch.
-This face is only used in logs and it gets combined
- with `magit-branch-local', `magit-branch-remote'
-and/or `magit-branch-remote-head'."
-  :group 'magit-faces)
-
-(defface magit-branch-warning
-  '((t :inherit warning))
-  "Face for warning about (missing) branch."
-  :group 'magit-faces)
-
-(defface magit-head
-  '((((class color) (background light)) :inherit magit-branch-local)
-    (((class color) (background  dark)) :inherit magit-branch-local))
-  "Face for the symbolic ref `HEAD'."
-  :group 'magit-faces)
-
-(defface magit-refname
-  '((((class color) (background light)) :foreground "grey30")
-    (((class color) (background  dark)) :foreground "grey80"))
-  "Face for refnames without a dedicated face."
-  :group 'magit-faces)
-
-(defface magit-refname-stash
-  '((t :inherit magit-refname))
-  "Face for stash refnames."
-  :group 'magit-faces)
-
-(defface magit-refname-wip
-  '((t :inherit magit-refname))
-  "Face for wip refnames."
-  :group 'magit-faces)
-
-(defface magit-refname-pullreq
-  '((t :inherit magit-refname))
-  "Face for pullreq refnames."
-  :group 'magit-faces)
-
-(defface magit-keyword
-  '((t :inherit font-lock-string-face))
-  "Face for parts of commit messages inside brackets."
-  :group 'magit-faces)
-
-(defface magit-keyword-squash
-  '((t :inherit font-lock-warning-face))
-  "Face for squash! and fixup! keywords in commit messages."
-  :group 'magit-faces)
-
-(defface magit-signature-good
-  '((t :foreground "green"))
-  "Face for good signatures."
-  :group 'magit-faces)
-
-(defface magit-signature-bad
-  '((t :foreground "red" :weight bold))
-  "Face for bad signatures."
-  :group 'magit-faces)
-
-(defface magit-signature-untrusted
-  '((t :foreground "medium aquamarine"))
-  "Face for good untrusted signatures."
-  :group 'magit-faces)
-
-(defface magit-signature-expired
-  '((t :foreground "orange"))
-  "Face for signatures that have expired."
-  :group 'magit-faces)
-
-(defface magit-signature-expired-key
-  '((t :inherit magit-signature-expired))
-  "Face for signatures made by an expired key."
-  :group 'magit-faces)
-
-(defface magit-signature-revoked
-  '((t :foreground "violet red"))
-  "Face for signatures made by a revoked key."
-  :group 'magit-faces)
-
-(defface magit-signature-error
-  '((t :foreground "light blue"))
-  "Face for signatures that cannot be checked (e.g., missing key)."
-  :group 'magit-faces)
-
-(defface magit-cherry-unmatched
-  '((t :foreground "cyan"))
-  "Face for unmatched cherry commits."
-  :group 'magit-faces)
-
-(defface magit-cherry-equivalent
-  '((t :foreground "magenta"))
-  "Face for equivalent cherry commits."
-  :group 'magit-faces)
-
-(defface magit-filename
-  '((t :weight normal))
-  "Face for filenames."
-  :group 'magit-faces)
-
-;;; Global Bindings
-
-;;;###autoload
-(defcustom magit-define-global-key-bindings 'default
-  "Which set of key bindings to add to the global keymap, if any.
-
-This option controls which set of Magit key bindings, if any, may
-be added to the global keymap, even before Magit is first used in
-the current Emacs session.
-
-If the value is nil, no bindings are added.
-
-If `default', maybe add:
-
-    C-x g     `magit-status'
-    C-x M-g   `magit-dispatch'
-    C-c M-g   `magit-file-dispatch'
-
-If `recommended', maybe add:
-
-    C-x g     `magit-status'
-    C-c g     `magit-dispatch'
-    C-c f     `magit-file-dispatch'
-
-    These bindings are strongly recommended, but we cannot use
-    them by default, because the \"C-c <LETTER>\" namespace is
-    strictly reserved for bindings added by the user.
-
-The bindings in the chosen set may be added when
-`after-init-hook' is run.  Each binding is added if, and only
-if, at that time no other key is bound to the same command,
-and no other command is bound to the same key.  In other words
-we try to avoid adding bindings that are unnecessary, as well
-as bindings that conflict with other bindings.
-
-Adding these bindings is delayed until `after-init-hook' is
-run to allow users to set the variable anywhere in their init
-file (without having to make sure to do so before `magit' is
-loaded or autoloaded) and to increase the likelihood that all
-the potentially conflicting user bindings have already been
-added.
-
-To set this variable use either `setq' or the Custom interface.
-Do not use the function `customize-set-variable' because doing
-that would cause Magit to be loaded immediately, when that form
-is evaluated (this differs from `custom-set-variables', which
-doesn't load the libraries that define the customized variables).
-
-Setting this variable has no effect if `after-init-hook' has
-already been run."
-  :package-version '(magit . "4.0.0")
-  :group 'magit-essentials
-  :type '(choice (const :tag "Add no binding" nil)
-                 (const :tag "Use default bindings" default)
-                 (const :tag "Use recommended bindings" recommended)))
-
-;;;###autoload
-(progn
-  (defun magit-maybe-define-global-key-bindings (&optional force)
-    "See variable `magit-define-global-key-bindings'."
-    (when magit-define-global-key-bindings
-      (let ((map (current-global-map)))
-        (pcase-dolist (`(,key . ,def)
-                       (cond ((eq magit-define-global-key-bindings 'recommended)
-                              '(("C-x g"   . magit-status)
-                                ("C-c g"   . magit-dispatch)
-                                ("C-c f"   . magit-file-dispatch)))
-                             ('(("C-x g"   . magit-status)
-                                ("C-x M-g" . magit-dispatch)
-                                ("C-c M-g" . magit-file-dispatch)))))
-          ;; This is autoloaded and thus is used before `compat' is
-          ;; loaded, so we cannot use `keymap-lookup' and `keymap-set'.
-          (when (or force
-                    (not (or (lookup-key map (kbd key))
-                             (where-is-internal def (make-sparse-keymap) t))))
-            (define-key map (kbd key) def))))))
-  (if after-init-time
-      (magit-maybe-define-global-key-bindings)
-    (add-hook 'after-init-hook #'magit-maybe-define-global-key-bindings t)))
-
-;;; Dispatch Popup
-
-;;;###autoload (autoload 'magit-dispatch "magit" nil t)
-(transient-define-prefix magit-dispatch ()
-  "Invoke a Magit command from a list of available commands."
-  :info-manual "(magit)Top"
-  ["Transient and dwim commands"
-   ;; → bound in magit-mode-map or magit-section-mode-map
-   ;; ↓ bound below
-   [("A" "Apply"          magit-cherry-pick)
-    ;; a                  ↓
-    ("b" "Branch"         magit-branch)
-    ("B" "Bisect"         magit-bisect)
-    ("c" "Commit"         magit-commit)
-    ("C" "Clone"          magit-clone)
-    ("d" "Diff"           magit-diff)
-    ("D" "Diff (change)"  magit-diff-refresh)
-    ("e" "Ediff (dwim)"   magit-ediff-dwim)
-    ("E" "Ediff"          magit-ediff)
-    ("f" "Fetch"          magit-fetch)
-    ("F" "Pull"           magit-pull)
-    ;; g                  ↓
-    ;; G                → magit-refresh-all
-    ("h" "Help"           magit-info)
-    ("H" "Section info"   magit-describe-section :if-derived magit-mode)]
-   [("i" "Ignore"         magit-gitignore)
-    ("I" "Init"           magit-init)
-    ("j" "Jump to section"magit-status-jump  :if-mode     magit-status-mode)
-    ("j" "Display status" magit-status-quick :if-not-mode magit-status-mode)
-    ("J" "Display buffer" magit-display-repository-buffer)
-    ;; k                  ↓
-    ;; K                → magit-file-untrack
-    ("l" "Log"            magit-log)
-    ("L" "Log (change)"   magit-log-refresh)
-    ("m" "Merge"          magit-merge)
-    ("M" "Remote"         magit-remote)
-    ;; n                → magit-section-forward
-    ;; N       reserved → forge-dispatch
-    ("o" "Submodule"      magit-submodule)
-    ("O" "Subtree"        magit-subtree)
-    ;; p                → magit-section-backward
-    ("P" "Push"           magit-push)
-    ;; q                → magit-mode-bury-buffer
-    ("Q" "Command"        magit-git-command)]
-   [("r" "Rebase"         magit-rebase)
-    ;; R                → magit-file-rename
-    ;; s                  ↓
-    ;; S                  ↓
-    ("t" "Tag"            magit-tag)
-    ("T" "Note"           magit-notes)
-    ;; u                  ↓
-    ;; U                  ↓
-    ;; v                  ↓
-    ("V" "Revert"         magit-revert)
-    ("w" "Apply patches"  magit-am)
-    ("W" "Format patches" magit-patch)
-    ;; x                → magit-reset-quickly
-    ("X" "Reset"          magit-reset)
-    ("y" "Show Refs"      magit-show-refs)
-    ("Y" "Cherries"       magit-cherry)
-    ("z" "Stash"          magit-stash)
-    ("Z" "Worktree"       magit-worktree)
-    ("!" "Run"            magit-run)]]
-  ["Applying changes"
-   :if-derived magit-mode
-   [("a" "Apply"          magit-apply)
-    ("v" "Reverse"        magit-reverse)
-    ("k" "Discard"        magit-discard)]
-   [("s" "Stage"          magit-stage)
-    ("u" "Unstage"        magit-unstage)]
-   [("S" "Stage all"      magit-stage-modified)
-    ("U" "Unstage all"    magit-unstage-all)]]
-  ["Essential commands"
-   :if-derived magit-mode
-   [("g" "       Refresh current buffer"   magit-refresh)
-    ("q" "       Bury current buffer"      magit-mode-bury-buffer)
-    ("<tab>" "   Toggle section at point"  magit-section-toggle)
-    ("<return>" "Visit thing at point"     magit-visit-thing)]
-   [("C-x m"    "Show all key bindings"    describe-mode)
-    ("C-x i"    "Show Info manual"         magit-info)]])
-
-;;; Git Popup
-
-(defcustom magit-shell-command-verbose-prompt t
-  "Whether to show the working directory when reading a command.
-This affects `magit-git-command', `magit-git-command-topdir',
-`magit-shell-command', and `magit-shell-command-topdir'."
-  :package-version '(magit . "2.11.0")
-  :group 'magit-commands
-  :type 'boolean)
-
-(defvar magit-git-command-history nil)
-
-;;;###autoload (autoload 'magit-run "magit" nil t)
-(transient-define-prefix magit-run ()
-  "Run git or another command, or launch a graphical utility."
-  [["Run git subcommand"
-    ("!" "in repository root"   magit-git-command-topdir)
-    ("p" "in working directory" magit-git-command)]
-   ["Run shell command"
-    ("s" "in repository root"   magit-shell-command-topdir)
-    ("S" "in working directory" magit-shell-command)]
-   ["Launch"
-    ("k" "gitk"                 magit-run-gitk)
-    ("a" "gitk --all"           magit-run-gitk-all)
-    ("b" "gitk --branches"      magit-run-gitk-branches)
-    ("g" "git gui"              magit-run-git-gui)
-    ("m" "git mergetool --gui"  magit-git-mergetool)]])
-
-;;;###autoload
-(defun magit-git-command (command)
-  "Execute COMMAND asynchronously; display output.
-
-Interactively, prompt for COMMAND in the minibuffer. \"git \" is
-used as initial input, but can be deleted to run another command.
-
-With a prefix argument COMMAND is run in the top-level directory
-of the current working tree, otherwise in `default-directory'."
-  (interactive (list (magit-read-shell-command nil "git ")))
-  (magit--shell-command command))
-
-;;;###autoload
-(defun magit-git-command-topdir (command)
-  "Execute COMMAND asynchronously; display output.
-
-Interactively, prompt for COMMAND in the minibuffer. \"git \" is
-used as initial input, but can be deleted to run another command.
-
-COMMAND is run in the top-level directory of the current
-working tree."
-  (interactive (list (magit-read-shell-command t "git ")))
-  (magit--shell-command command (magit-toplevel)))
-
-;;;###autoload
-(defun magit-shell-command (command)
-  "Execute COMMAND asynchronously; display output.
-
-Interactively, prompt for COMMAND in the minibuffer.  With a
-prefix argument COMMAND is run in the top-level directory of
-the current working tree, otherwise in `default-directory'."
-  (interactive (list (magit-read-shell-command)))
-  (magit--shell-command command))
-
-;;;###autoload
-(defun magit-shell-command-topdir (command)
-  "Execute COMMAND asynchronously; display output.
-
-Interactively, prompt for COMMAND in the minibuffer.  COMMAND
-is run in the top-level directory of the current working tree."
-  (interactive (list (magit-read-shell-command t)))
-  (magit--shell-command command (magit-toplevel)))
-
-(defun magit--shell-command (command &optional directory)
-  (let ((default-directory (or directory default-directory)))
-    (with-environment-variables (("GIT_PAGER" "cat"))
-      (magit--with-connection-local-variables
-        (magit-with-editor
-          (magit-start-process shell-file-name nil
-                               shell-command-switch command)))))
-  (magit-process-buffer))
-
-(defun magit-read-shell-command (&optional toplevel initial-input)
-  (let ((default-directory
-         (if (or toplevel current-prefix-arg)
-             (or (magit-toplevel)
-                 (magit--not-inside-repository-error))
-           default-directory)))
-    (read-shell-command (if magit-shell-command-verbose-prompt
-                            (format "Async shell command in %s: "
-                                    (abbreviate-file-name default-directory))
-                          "Async shell command: ")
-                        initial-input 'magit-git-command-history)))
-
-;;; Shared Infix Arguments
-
-(transient-define-argument magit:--gpg-sign ()
-  :description "Sign using gpg"
-  :class 'transient-option
-  :shortarg "-S"
-  :argument "--gpg-sign="
-  :allow-empty t
-  :reader #'magit-read-gpg-signing-key)
-
-(defvar magit-gpg-secret-key-hist nil)
-
-(defun magit-read-gpg-secret-key
-    (prompt &optional initial-input history predicate default)
-  (require 'epa)
-  (let* ((keys (cl-mapcan
-                (lambda (cert)
-                  (and (or (not predicate)
-                           (funcall predicate cert))
-                       (let* ((key (car (epg-key-sub-key-list cert)))
-                              (fpr (epg-sub-key-fingerprint key))
-                              (id  (epg-sub-key-id key))
-                              (author
-                               (and-let* ((id-obj
-                                           (car (epg-key-user-id-list cert))))
-                                 (let ((id-str (epg-user-id-string id-obj)))
-                                   (if (stringp id-str)
-                                       id-str
-                                     (epg-decode-dn id-obj))))))
-                         (list
-                          (propertize fpr 'display
-                                      (concat (substring fpr 0 (- (length id)))
-                                              (propertize id 'face 'highlight)
-                                              " " author))))))
-                (epg-list-keys (epg-make-context epa-protocol) nil t)))
-         (choice (or (and (not current-prefix-arg)
-                          (or (and (length= keys 1) (car keys))
-                              (and default (car (member default keys)))))
-                     (completing-read prompt keys nil nil nil
-                                      history nil initial-input))))
-    (set-text-properties 0 (length choice) nil choice)
-    choice))
-
-(defun magit-read-gpg-signing-key (prompt &optional initial-input history)
-  (magit-read-gpg-secret-key
-   prompt initial-input history
-   (lambda (cert)
-     (cl-some (lambda (key)
-                (memq 'sign (epg-sub-key-capability key)))
-              (epg-key-sub-key-list cert)))
-   magit-openpgp-default-signing-key))
-
-;;; Font-Lock Keywords
-
-(defconst magit-font-lock-keywords
-  (eval-when-compile
-    `((,(concat "(\\(magit-define-section-jumper\\)\\_>"
-                "[ \t'(]*"
-                "\\(\\(?:\\sw\\|\\s_\\)+\\)?")
-       (1 'font-lock-keyword-face)
-       (2 'font-lock-function-name-face nil t))
-      (,(concat "(" (regexp-opt '("magit-insert-section"
-                                  "magit-section-case"
-                                  "magit-bind-match-strings"
-                                  "magit-with-temp-index"
-                                  "magit-with-blob"
-                                  "magit-with-toplevel")
-                                t)
-                "\\_>")
-       . 1))))
-
-(font-lock-add-keywords 'emacs-lisp-mode magit-font-lock-keywords)
-
-;;; Version
-
-(defvar magit-version #'undefined
-  "The version of Magit that you're using.
-Use the function by the same name instead of this variable.")
-
-;;;###autoload
-(defun magit-version (&optional print-dest interactive nowarn)
-  "Return the version of Magit currently in use.
-
-If optional argument PRINT-DEST is non-nil, also print the used
-versions of Magit, Transient, Git and Emacs to the output stream
-selected by that argument.  Interactively use the echo area, or
-with a prefix argument use the current buffer.  Additionally put
-the output in the kill ring.
-\n(fn &optional PRINT-DEST)"
-  (interactive (list (if current-prefix-arg (current-buffer) t) t))
-  (let ((magit-git-global-arguments nil)
-        (toplib (or load-file-name buffer-file-name))
-        debug)
-    (unless (and toplib
-                 (member (file-name-nondirectory toplib)
-                         '("magit.el" "magit.el.gz")))
-      (let ((load-suffixes (reverse load-suffixes))) ; prefer .el than .elc
-        (setq toplib (locate-library "magit"))))
-    (setq toplib (and toplib (magit--chase-links toplib)))
-    (push toplib debug)
-    (when toplib
-      (let* ((topdir (file-name-directory toplib))
-             (gitdir (expand-file-name
-                      ".git" (file-name-directory
-                              (directory-file-name topdir))))
-             (static (locate-library "magit-version.el" nil (list topdir)))
-             (static (and static (magit--chase-links static))))
-        (or (progn
-              (push 'repo debug)
-              (when (and (file-exists-p gitdir)
-                         ;; It is a repo, but is it the Magit repo?
-                         (file-exists-p
-                          (expand-file-name "../lisp/magit.el" gitdir)))
-                (push t debug)
-                ;; Inside the repo the version file should only exist
-                ;; while running make.
-                (when (and static (not noninteractive))
-                  (ignore-errors (delete-file static)))
-                (setq magit-version
-                      (let ((default-directory topdir))
-                        (magit-git-string "describe"
-                                          "--tags" "--dirty" "--always")))))
-            (progn
-              (push 'static debug)
-              (when (and static (file-exists-p static))
-                (push t debug)
-                (load-file static)
-                magit-version))
-            (when (featurep 'package)
-              (push 'elpa debug)
-              (ignore-errors
-                (when-let ((version (cadr (assq 'magit package-alist))))
-                  (push t debug)
-                  (setq magit-version
-                        (and (fboundp 'package-desc-version)
-                             (package-version-join
-                              (package-desc-version version)))))))
-            (progn
-              (push 'dirname debug)
-              (let ((dirname (file-name-nondirectory
-                              (directory-file-name topdir))))
-                (when (string-match "\\`magit-\\([0-9].*\\)" dirname)
-                  (setq magit-version (match-string 1 dirname)))))
-            ;; If all else fails, just report the commit hash. It's
-            ;; better than nothing and we cannot do better in the case
-            ;; of e.g., a shallow clone.
-            (progn
-              (push 'hash debug)
-              ;; Same check as above to see if it's really the Magit repo.
-              (when (and (file-exists-p gitdir)
-                         (file-exists-p
-                          (expand-file-name "../lisp/magit.el" gitdir)))
-                (setq magit-version
-                      (let ((default-directory topdir))
-                        (magit-git-string "rev-parse" "HEAD"))))))))
-    (if (stringp magit-version)
-        (when print-dest
-          (let ((str (format
-                      "Magit %s%s, Transient %s,%s Git %s, Emacs %s, %s"
-                      (or magit-version "(unknown)")
-                      (or (and (ignore-errors
-                                 (magit--version>= magit-version "2008"))
-                               (ignore-errors
-                                 (require 'lisp-mnt)
-                                 (and (fboundp 'lm-header)
-                                      (format
-                                       " [>= %s]"
-                                       (with-temp-buffer
-                                         (insert-file-contents
-                                          (locate-library "magit.el" t))
-                                         (lm-header "Package-Version"))))))
-                          "")
-                      (or (ignore-errors
-                            (require 'lisp-mnt)
-                            (and (fboundp 'lm-header)
-                                 (with-temp-buffer
-                                   (insert-file-contents
-                                    (locate-library "transient.el" t))
-                                   (lm-header "Package-Version"))))
-                          "(unknown)")
-                      (let ((lib (locate-library "forge.el" t)))
-                        (or (and lib
-                                 (format
-                                  " Forge %s,"
-                                  (or (ignore-errors
-                                        (require 'lisp-mnt)
-                                        (with-temp-buffer
-                                          (insert-file-contents lib)
-                                          (and (fboundp 'lm-header)
-                                               (lm-header "Package-Version"))))
-                                      "(unknown)")))
-                            ""))
-                      (magit--safe-git-version)
-                      emacs-version
-                      system-type)))
-            (when interactive
-              (kill-new str))
-            (princ str print-dest)))
-      (setq debug (reverse debug))
-      (setq magit-version 'error)
-      (when magit-version
-        (push magit-version debug))
-      (unless (or nowarn (equal (getenv "CI") "true"))
-        (message "Cannot determine Magit's version %S" debug)))
-    magit-version))
-
-;;; Startup Asserts
-
-(defun magit-startup-asserts ()
-  (when-let ((val (getenv "GIT_DIR")))
-    (setenv "GIT_DIR")
-    (message
-     "Magit unset $GIT_DIR (was %S).  See %s" val
-     ;; Note: Pass URL as argument rather than embedding in the format
-     ;; string to prevent the single quote from being rendered
-     ;; according to `text-quoting-style'.
-     "https://github.com/magit/magit/wiki/Don't-set-$GIT_DIR-and-alike"))
-  (when-let ((val (getenv "GIT_WORK_TREE")))
-    (setenv "GIT_WORK_TREE")
-    (message
-     "Magit unset $GIT_WORK_TREE (was %S).  See %s" val
-     ;; See comment above.
-     "https://github.com/magit/magit/wiki/Don't-set-$GIT_DIR-and-alike"))
-  ;; Git isn't required while building Magit.
-  (unless (bound-and-true-p byte-compile-current-file)
-    (magit-git-version-assert))
-  (when (version< emacs-version magit--minimal-emacs)
-    (display-warning 'magit (format "\
-Magit requires Emacs >= %s, you are using %s.
-
-If this comes as a surprise to you, because you do actually have
-a newer version installed, then that probably means that the
-older version happens to appear earlier on the `$PATH'.  If you
-always start Emacs from a shell, then that can be fixed in the
-shell's init file.  If you start Emacs by clicking on an icon,
-or using some sort of application launcher, then you probably
-have to adjust the environment as seen by graphical interface.
-For X11 something like ~/.xinitrc should work.\n"
-                                    magit--minimal-emacs emacs-version)
-                     :error)))
-
-;;; Loading Libraries
-
-(provide 'magit)
-
-(cl-eval-when (load eval)
-  (require 'magit-status)
-  (require 'magit-refs)
-  (require 'magit-files)
-  (require 'magit-reset)
-  (require 'magit-branch)
-  (require 'magit-merge)
-  (require 'magit-tag)
-  (require 'magit-worktree)
-  (require 'magit-notes)
-  (require 'magit-sequence)
-  (require 'magit-commit)
-  (require 'magit-remote)
-  (require 'magit-clone)
-  (require 'magit-fetch)
-  (require 'magit-pull)
-  (require 'magit-push)
-  (require 'magit-bisect)
-  (require 'magit-stash)
-  (require 'magit-blame)
-  (require 'magit-submodule)
-  (unless (load "magit-autoloads" t t)
-    (require 'magit-patch)
-    (require 'magit-subtree)
-    (require 'magit-ediff)
-    (require 'magit-gitignore)
-    (require 'magit-sparse-checkout)
-    (require 'magit-extras)
-    (require 'git-rebase)
-    (require 'magit-bookmark)))
-
-(with-eval-after-load 'bookmark
-  (require 'magit-bookmark))
-
-(unless (bound-and-true-p byte-compile-current-file)
-  (if after-init-time
-      (progn (magit-startup-asserts)
-             (magit-version nil nil t))
-    (add-hook 'after-init-hook #'magit-startup-asserts t)
-    (add-hook 'after-init-hook #'magit-version t)))
-
-;;; magit.el ends here
diff --git a/emacs/elpa/magit-20240930.1805/magit.info b/emacs/elpa/magit-20240930.1805/magit.info
@@ -1,11592 +0,0 @@
-This is magit.info, produced by makeinfo version 6.8 from magit.texi.
-
-     Copyright (C) 2015-2024 Jonas Bernoulli
-     <emacs.magit@jonas.bernoulli.dev>
-
-     You can redistribute this document and/or modify it under the terms
-     of the GNU General Public License as published by the Free Software
-     Foundation, either version 3 of the License, or (at your option)
-     any later version.
-
-     This document is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     General Public License for more details.
-
-INFO-DIR-SECTION Emacs
-START-INFO-DIR-ENTRY
-* Magit: (magit).       Using Git from Emacs with Magit.
-END-INFO-DIR-ENTRY
-
-
-File: magit.info,  Node: Top,  Next: Introduction,  Up: (dir)
-
-Magit User Manual
-*****************
-
-Magit is an interface to the version control system Git, implemented as
-an Emacs package.  Magit aspires to be a complete Git porcelain.  While
-we cannot (yet) claim that Magit wraps and improves upon each and every
-Git command, it is complete enough to allow even experienced Git users
-to perform almost all of their daily version control tasks directly from
-within Emacs.  While many fine Git clients exist, only Magit and Git
-itself deserve to be called porcelains.
-
-This manual is for Magit version 4.1.0.
-
-     Copyright (C) 2015-2024 Jonas Bernoulli
-     <emacs.magit@jonas.bernoulli.dev>
-
-     You can redistribute this document and/or modify it under the terms
-     of the GNU General Public License as published by the Free Software
-     Foundation, either version 3 of the License, or (at your option)
-     any later version.
-
-     This document is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     General Public License for more details.
-
-* Menu:
-
-* Introduction::
-* Installation::
-* Getting Started::
-* Interface Concepts::
-* Inspecting::
-* Manipulating::
-* Transferring::
-* Miscellaneous::
-* Customizing::
-* Plumbing::
-* FAQ::
-* Debugging Tools::
-* Keystroke Index::
-* Function and Command Index::
-* Variable Index::
-
-— The Detailed Node Listing —
-
-Installation
-
-* Installing from Melpa::
-* Installing from the Git Repository::
-* Post-Installation Tasks::
-
-Interface Concepts
-
-* Modes and Buffers::
-* Sections::
-* Transient Commands::
-* Transient Arguments and Buffer Variables::
-* Completion, Confirmation and the Selection: Completion Confirmation and the Selection.
-* Mouse Support::
-* Running Git::
-
-Modes and Buffers
-
-* Switching Buffers::
-* Naming Buffers::
-* Quitting Windows::
-* Automatic Refreshing of Magit Buffers::
-* Automatic Saving of File-Visiting Buffers::
-* Automatic Reverting of File-Visiting Buffers::
-
-
-Sections
-
-* Section Movement::
-* Section Visibility::
-* Section Hooks::
-* Section Types and Values::
-* Section Options::
-
-
-Completion, Confirmation and the Selection
-
-* Action Confirmation::
-* Completion and Confirmation::
-* The Selection::
-* The hunk-internal region::
-* Support for Completion Frameworks::
-* Additional Completion Options::
-
-
-Running Git
-
-* Viewing Git Output::
-* Git Process Status::
-* Running Git Manually::
-* Git Executable::
-* Global Git Arguments::
-
-
-Inspecting
-
-* Status Buffer::
-* Repository List::
-* Logging::
-* Diffing::
-* Ediffing::
-* References Buffer::
-* Bisecting::
-* Visiting Files and Blobs::
-* Blaming::
-
-Status Buffer
-
-* Status Sections::
-* Status Header Sections::
-* Status Module Sections::
-* Status Options::
-
-
-Logging
-
-* Refreshing Logs::
-* Log Buffer::
-* Log Margin::
-* Select from Log::
-* Reflog::
-* Cherries::
-
-
-Diffing
-
-* Refreshing Diffs::
-* Commands Available in Diffs::
-* Diff Options::
-* Revision Buffer::
-
-
-References Buffer
-
-* References Sections::
-
-
-Visiting Files and Blobs
-
-* General-Purpose Visit Commands::
-* Visiting Files and Blobs from a Diff::
-
-
-Manipulating
-
-* Creating Repository::
-* Cloning Repository::
-* Staging and Unstaging::
-* Applying::
-* Committing::
-* Branching::
-* Merging::
-* Resolving Conflicts::
-* Rebasing::
-* Cherry Picking::
-* Resetting::
-* Stashing::
-
-Staging and Unstaging
-
-* Staging from File-Visiting Buffers::
-
-
-Committing
-
-* Initiating a Commit::
-* Editing Commit Messages::
-
-
-Branching
-
-* The Two Remotes::
-* Branch Commands::
-* Branch Git Variables::
-* Auxiliary Branch Commands::
-
-
-Rebasing
-
-* Editing Rebase Sequences::
-* Information About In-Progress Rebase::
-
-
-Cherry Picking
-
-* Reverting::
-
-
-Transferring
-
-* Remotes::
-* Fetching::
-* Pulling::
-* Pushing::
-* Plain Patches::
-* Maildir Patches::
-
-Remotes
-
-* Remote Commands::
-* Remote Git Variables::
-
-
-Miscellaneous
-
-* Tagging::
-* Notes::
-* Submodules::
-* Subtree::
-* Worktree::
-* Sparse checkouts::
-* Bundle::
-* Common Commands::
-* Wip Modes::
-* Commands for Buffers Visiting Files::
-* Minor Mode for Buffers Visiting Blobs::
-
-Submodules
-
-* Listing Submodules::
-* Submodule Transient::
-
-
-Wip Modes
-
-* Wip Graph::
-* Legacy Wip Modes::
-
-
-Customizing
-
-* Per-Repository Configuration::
-* Essential Settings::
-
-Essential Settings
-
-* Safety::
-* Performance::
-* Global Bindings::
-
-
-Plumbing
-
-* Calling Git::
-* Section Plumbing::
-* Refreshing Buffers::
-* Conventions::
-
-Calling Git
-
-* Getting a Value from Git::
-* Calling Git for Effect::
-
-
-Section Plumbing
-
-* Creating Sections::
-* Section Selection::
-* Matching Sections::
-
-
-Conventions
-
-* Theming Faces::
-
-
-FAQ
-
-* FAQ - How to ...?::
-* FAQ - Issues and Errors::
-
-FAQ - How to ...?
-
-* How to pronounce Magit?::
-* How to show git's output?::
-* How to install the gitman info manual?::
-* How to show diffs for gpg-encrypted files?::
-* How does branching and pushing work?::
-* Should I disable VC?::
-
-
-FAQ - Issues and Errors
-
-* Magit is slow::
-* I changed several thousand files at once and now Magit is unusable::
-* I am having problems committing::
-* I am using MS Windows and cannot push with Magit::
-* I am using macOS and SOMETHING works in shell, but not in Magit: I am using macOS and SOMETHING works in shell but not in Magit.
-* Expanding a file to show the diff causes it to disappear::
-* Point is wrong in the COMMIT_EDITMSG buffer::
-* The mode-line information isn't always up-to-date::
-* A branch and tag sharing the same name breaks SOMETHING::
-* My Git hooks work on the command-line but not inside Magit::
-* git-commit-mode isn't used when committing from the command-line::
-* Point ends up inside invisible text when jumping to a file-visiting buffer::
-* I am no longer able to save popup defaults::
-
-
-
-
-File: magit.info,  Node: Introduction,  Next: Installation,  Prev: Top,  Up: Top
-
-1 Introduction
-**************
-
-Magit is an interface to the version control system Git, implemented as
-an Emacs package.  Magit aspires to be a complete Git porcelain.  While
-we cannot (yet) claim that Magit wraps and improves upon each and every
-Git command, it is complete enough to allow even experienced Git users
-to perform almost all of their daily version control tasks directly from
-within Emacs.  While many fine Git clients exist, only Magit and Git
-itself deserve to be called porcelains.
-
-   Staging and otherwise applying changes is one of the most important
-features in a Git porcelain and here Magit outshines anything else,
-including Git itself.  Git’s own staging interface (‘git add --patch’)
-is so cumbersome that many users only use it in exceptional cases.  In
-Magit staging a hunk or even just part of a hunk is as trivial as
-staging all changes made to a file.
-
-   The most visible part of Magit’s interface is the status buffer,
-which displays information about the current repository.  Its content is
-created by running several Git commands and making their output
-actionable.  Among other things, it displays information about the
-current branch, lists unpulled and unpushed changes and contains
-sections displaying the staged and unstaged changes.  That might sound
-noisy, but, since sections are collapsible, it’s not.
-
-   To stage or unstage a change one places the cursor on the change and
-then types ‘s’ or ‘u’.  The change can be a file or a hunk, or when the
-region is active (i.e., when there is a selection) several files or
-hunks, or even just part of a hunk.  The change or changes that these
-commands - and many others - would act on are highlighted.
-
-   Magit also implements several other "apply variants" in addition to
-staging and unstaging.  One can discard or reverse a change, or apply it
-to the working tree.  Git’s own porcelain only supports this for staging
-and unstaging and you would have to do something like ‘git diff ... |
-??? | git apply ...’ to discard, revert, or apply a single hunk on the
-command line.  In fact that’s exactly what Magit does internally (which
-is what lead to the term "apply variants").
-
-   Magit isn’t just for Git experts, but it does assume some prior
-experience with Git as well as Emacs.  That being said, many users have
-reported that using Magit was what finally taught them what Git is
-capable of and how to use it to its fullest.  Other users wished they
-had switched to Emacs sooner so that they would have gotten their hands
-on Magit earlier.
-
-   While one has to know the basic features of Emacs to be able to make
-full use of Magit, acquiring just enough Emacs skills doesn’t take long
-and is worth it, even for users who prefer other editors.  Vim users are
-advised to give Evil (https://github.com/emacs-evil/evil), the
-"Extensible VI Layer for Emacs", and Spacemacs
-(https://github.com/syl20bnr/spacemacs), an "Emacs starter-kit focused
-on Evil" a try.
-
-   Magit provides a consistent and efficient Git porcelain.  After a
-short learning period, you will be able to perform most of your daily
-version control tasks faster than you would on the command line.  You
-will likely also start using features that seemed too daunting in the
-past.
-
-   Magit fully embraces Git.  It exposes many advanced features using a
-simple but flexible interface instead of only wrapping the trivial ones
-like many GUI clients do.  Of course Magit supports logging, cloning,
-pushing, and other commands that usually don’t fail in spectacular ways;
-but it also supports tasks that often cannot be completed in a single
-step.  Magit fully supports tasks such as merging, rebasing,
-cherry-picking, reverting, and blaming by not only providing a command
-to initiate these tasks but also by displaying context sensitive
-information along the way and providing commands that are useful for
-resolving conflicts and resuming the sequence after doing so.
-
-   Magit wraps and in many cases improves upon at least the following
-Git porcelain commands: ‘add’, ‘am’, ‘bisect’, ‘blame’, ‘branch’,
-‘checkout’, ‘cherry’, ‘cherry-pick’, ‘clean’, ‘clone’, ‘commit’,
-‘config’, ‘describe’, ‘diff’, ‘fetch’, ‘format-patch’, ‘init’, ‘log’,
-‘merge’, ‘merge-tree’, ‘mv’, ‘notes’, ‘pull’, ‘rebase’, ‘reflog’,
-‘remote’, ‘request-pull’, ‘reset’, ‘revert’, ‘rm’, ‘show’, ‘stash’,
-‘submodule’, ‘subtree’, ‘tag’, and ‘worktree.’ Many more Magit porcelain
-commands are implemented on top of Git plumbing commands.
-
-
-File: magit.info,  Node: Installation,  Next: Getting Started,  Prev: Introduction,  Up: Top
-
-2 Installation
-**************
-
-Magit can be installed using Emacs’ package manager or manually from its
-development repository.
-
-* Menu:
-
-* Installing from Melpa::
-* Installing from the Git Repository::
-* Post-Installation Tasks::
-
-
-File: magit.info,  Node: Installing from Melpa,  Next: Installing from the Git Repository,  Up: Installation
-
-2.1 Installing from Melpa
-=========================
-
-Magit is available from Melpa and Melpa-Stable.  If you haven’t used
-Emacs’ package manager before, then it is high time you familiarize
-yourself with it by reading the documentation in the Emacs manual, see
-*note (emacs)Packages::.  Then add one of the archives to
-‘package-archives’:
-
-   • To use Melpa:
-
-     (require 'package)
-     (add-to-list 'package-archives
-                  '("melpa" . "https://melpa.org/packages/") t)
-
-   • To use Melpa-Stable:
-
-     (require 'package)
-     (add-to-list 'package-archives
-                  '("melpa-stable" . "https://stable.melpa.org/packages/") t)
-
-   Once you have added your preferred archive, you need to update the
-local package list using:
-
-     M-x package-refresh-contents RET
-
-   Once you have done that, you can install Magit and its dependencies
-using:
-
-     M-x package-install RET magit RET
-
-   Now see *note Post-Installation Tasks::.
-
-
-File: magit.info,  Node: Installing from the Git Repository,  Next: Post-Installation Tasks,  Prev: Installing from Melpa,  Up: Installation
-
-2.2 Installing from the Git Repository
-======================================
-
-Magit depends on the ‘compat’, ‘dash’, ‘transient’ and ‘with-editor’
-libraries which are available from Melpa and Melpa-Stable.  Install them
-using ‘M-x package-install RET <package> RET’.  Of course you may also
-install them manually from their repository.
-
-   Then clone the Magit repository:
-
-     $ git clone https://github.com/magit/magit.git ~/.emacs.d/site-lisp/magit
-     $ cd ~/.emacs.d/site-lisp/magit
-
-   Then compile the libraries and generate the info manuals:
-
-     $ make
-
-   If you haven’t installed ‘compat’, ‘dash’, ‘transient’ and
-‘with-editor’ from Melpa or at ‘/path/to/magit/../<package>’, then you
-have to tell ‘make’ where to find them.  To do so create the file
-‘/path/to/magit/config.mk’ with the following content before running
-‘make’:
-
-     LOAD_PATH  = -L ~/.emacs.d/site-lisp/magit/lisp
-     LOAD_PATH += -L ~/.emacs.d/site-lisp/dash
-     LOAD_PATH += -L ~/.emacs.d/site-lisp/transient/lisp
-     LOAD_PATH += -L ~/.emacs.d/site-lisp/with-editor/lisp
-     LOAD_PATH += -L ~/.emacs.d/site-lisp/compat
-
-   Finally add this to your init file:
-
-     (add-to-list 'load-path "~/.emacs.d/site-lisp/magit/lisp")
-     (require 'magit)
-
-     (with-eval-after-load 'info
-       (info-initialize)
-       (add-to-list 'Info-directory-list
-                    "~/.emacs.d/site-lisp/magit/Documentation/"))
-
-   Of course if you installed the dependencies manually as well, then
-you have to tell Emacs about them too, by prefixing the above with:
-
-     (add-to-list 'load-path "~/.emacs.d/site-lisp/dash")
-     (add-to-list 'load-path "~/.emacs.d/site-lisp/transient/lisp")
-     (add-to-list 'load-path "~/.emacs.d/site-lisp/with-editor")
-
-   Note that you have to add the ‘lisp’ subdirectory to the ‘load-path’,
-not the top-level of the repository, and that elements of ‘load-path’
-should not end with a slash, while those of ‘Info-directory-list’
-should.
-
-   Instead of requiring the feature ‘magit’, you could load just the
-autoload definitions, by loading the file ‘magit-autoloads.el’.
-
-     (load "/path/to/magit/lisp/magit-autoloads")
-
-   Instead of running Magit directly from the repository by adding that
-to the ‘load-path’, you might want to instead install it in some other
-directory using ‘sudo make install’ and setting ‘load-path’ accordingly.
-
-   To update Magit use:
-
-     $ git pull
-     $ make
-
-   At times it might be necessary to run ‘make clean all’ instead.
-
-   To view all available targets use ‘make help’.
-
-   Now see *note Post-Installation Tasks::.
-
-
-File: magit.info,  Node: Post-Installation Tasks,  Prev: Installing from the Git Repository,  Up: Installation
-
-2.3 Post-Installation Tasks
-===========================
-
-After installing Magit you should verify that you are indeed using the
-Magit, Git, and Emacs releases you think you are using.  It’s best to
-restart Emacs before doing so, to make sure you are not using an
-outdated value for ‘load-path’.
-
-     M-x magit-version RET
-
-   should display something like
-
-     Magit 2.8.0, Git 2.10.2, Emacs 25.1.1, gnu/linux
-
-   Then you might also want to read about options that many users likely
-want to customize.  See *note Essential Settings::.
-
-   To be able to follow cross references to Git manpages found in this
-manual, you might also have to manually install the ‘gitman’ info
-manual, or advice ‘Info-follow-nearest-node’ to instead open the actual
-manpage.  See *note How to install the gitman info manual?::.
-
-   If you are completely new to Magit then see *note Getting Started::.
-
-   If you run into problems, then please see the *note FAQ::.  Also see
-the *note Debugging Tools::.
-
-   And last but not least please consider making a donation, to ensure
-that I can keep working on Magit.  See <https://magit.vc/donations>.
-for various donation options.
-
-
-File: magit.info,  Node: Getting Started,  Next: Interface Concepts,  Prev: Installation,  Up: Top
-
-3 Getting Started
-*****************
-
-This short tutorial describes the most essential features that many
-Magitians use on a daily basis.  It only scratches the surface but
-should be enough to get you started.
-
-   IMPORTANT: It is safest if you clone some repository just for this
-tutorial.  Alternatively you can use an existing local repository, but
-if you do that, then you should commit all uncommitted changes before
-proceeding.
-
-   Type ‘C-x g’ to display information about the current Git repository
-in a dedicated buffer, called the status buffer.
-
-   Most Magit commands are commonly invoked from the status buffer.  It
-can be considered the primary interface for interacting with Git using
-Magit.  Many other Magit buffers may exist at a given time, but they are
-often created from this buffer.
-
-   Depending on what state your repository is in, this buffer may
-contain sections titled "Staged changes", "Unstaged changes", "Unmerged
-into origin/master", "Unpushed to origin/master", and many others.
-
-   Since we are starting from a safe state, which you can easily return
-to (by doing a ‘git reset --hard PRE-MAGIT-STATE’), there currently are
-no staged or unstaged changes.  Edit some files and save the changes.
-Then go back to the status buffer, while at the same time refreshing it,
-by typing ‘C-x g’.  (When the status buffer, or any Magit buffer for
-that matter, is the current buffer, then you can also use just ‘g’ to
-refresh it).
-
-   Move between sections using ‘p’ and ‘n’.  Note that the bodies of
-some sections are hidden.  Type ‘TAB’ to expand or collapse the section
-at point.  You can also use ‘C-tab’ to cycle the visibility of the
-current section and its children.  Move to a file section inside the
-section named "Unstaged changes" and type ‘s’ to stage the changes you
-have made to that file.  That file now appears under "Staged changes".
-
-   Magit can stage and unstage individual hunks, not just complete
-files.  Move to the file you have just staged, expand it using ‘TAB’,
-move to one of the hunks using ‘n’, and unstage just that by typing ‘u’.
-Note how the staging (‘s’) and unstaging (‘u’) commands operate on the
-change at point.  Many other commands behave the same way.
-
-   You can also un-/stage just part of a hunk.  Inside the body of a
-hunk section (move there using ‘C-n’), set the mark using ‘C-SPC’ and
-move down until some added and/or removed lines fall inside the region
-but not all of them.  Again type ‘s’ to stage.
-
-   It is also possible to un-/stage multiple files at once.  Move to a
-file section, type ‘C-SPC’, move to the next file using ‘n’, and then
-‘s’ to stage both files.  Note that both the mark and point have to be
-on the headings of sibling sections for this to work.  If the region
-looks like it does in other buffers, then it doesn’t select Magit
-sections that can be acted on as a unit.
-
-   And then of course you want to commit your changes.  Type ‘c’.  This
-shows the available commit commands and arguments in a buffer at the
-bottom of the frame.  Each command and argument is prefixed with the key
-that invokes/sets it.  Do not worry about this for now.  We want to
-create a "normal" commit, which is done by typing ‘c’ again.
-
-   Now two new buffers appear.  One is for writing the commit message,
-the other shows a diff with the changes that you are about to commit.
-Write a message and then type ‘C-c C-c’ to actually create the commit.
-
-   You probably don’t want to push the commit you just created because
-you just committed some random changes, but if that is not the case you
-could push it by typing ‘P’ to show all the available push commands and
-arguments and then ‘p’ to push to a branch with the same name as the
-local branch onto the remote configured as the push-remote.  (If the
-push-remote is not configured yet, then you would first be prompted for
-the remote to push to.)
-
-   So far we have mentioned the commit and push menu commands.  These
-are probably among the menus you will be using the most, but many others
-exist.  To show a menu that lists all other menus (as well as the
-various apply commands and some other essential commands), type ‘h’.
-Try a few.  (Such menus are also called "transient prefix commands" or
-just "transients".)
-
-   The key bindings in that menu correspond to the bindings in Magit
-buffers, including but not limited to the status buffer.  So you could
-type ‘h d’ to bring up the diff menu, but once you remember that "d"
-stands for "diff", you would usually do so by just typing ‘d’.
-
-   This "prefix of prefixes" is useful even once you have memorized all
-the bindings, as it can provide easy access to Magit commands from
-non-Magit buffers.  So, by default, it is globally bound to ‘C-x M-g’.
-
-   A similar menu featuring (for the most part) commands that act on
-just the file being visited in the current buffer, is globally bound to
-‘C-c M-g’.  That binding can also be used in buffers, which do not visit
-a file, but then only a subset of the commands is available.
-
-   The global key bindings mentioned in the previous two paragraphs are
-quite inconvenient.  We recommend using ‘C-c g’ and ‘C-c f’ instead, but
-cannot use those key sequences by default because they are strictly
-reserved for bindings added by the user.  See *note Global Bindings::,
-if you want to explicitly opt-in to the recommended key bindings.
-
-   Magit also provides context menus and other mouse commands, see *note
-Mouse Support::.
-
-   It is not necessary that you do so now, but if you stick with Magit,
-then it is highly recommended that you read the next section too.
-
-
-File: magit.info,  Node: Interface Concepts,  Next: Inspecting,  Prev: Getting Started,  Up: Top
-
-4 Interface Concepts
-********************
-
-* Menu:
-
-* Modes and Buffers::
-* Sections::
-* Transient Commands::
-* Transient Arguments and Buffer Variables::
-* Completion, Confirmation and the Selection: Completion Confirmation and the Selection.
-* Mouse Support::
-* Running Git::
-
-
-File: magit.info,  Node: Modes and Buffers,  Next: Sections,  Up: Interface Concepts
-
-4.1 Modes and Buffers
-=====================
-
-Magit provides several major-modes.  For each of these modes there
-usually exists only one buffer per repository.  Separate modes and thus
-buffers exist for commits, diffs, logs, and some other things.
-
-   Besides these special purpose buffers, there also exists an overview
-buffer, called the *status buffer*.  It’s usually from this buffer that
-the user invokes Git commands, or creates or visits other buffers.
-
-   In this manual we often speak about "Magit buffers".  By that we mean
-buffers whose major-modes derive from ‘magit-mode’.
-
-‘M-x magit-toggle-buffer-lock’
-     This command locks the current buffer to its value or if the buffer
-     is already locked, then it unlocks it.
-
-     Locking a buffer to its value prevents it from being reused to
-     display another value.  The name of a locked buffer contains its
-     value, which allows telling it apart from other locked buffers and
-     the unlocked buffer.
-
-     Not all Magit buffers can be locked to their values; for example,
-     it wouldn’t make sense to lock a status buffer.
-
-     There can only be a single unlocked buffer using a certain
-     major-mode per repository.  So when a buffer is being unlocked and
-     another unlocked buffer already exists for that mode and
-     repository, then the former buffer is instead deleted and the
-     latter is displayed in its place.
-
-* Menu:
-
-* Switching Buffers::
-* Naming Buffers::
-* Quitting Windows::
-* Automatic Refreshing of Magit Buffers::
-* Automatic Saving of File-Visiting Buffers::
-* Automatic Reverting of File-Visiting Buffers::
-
-
-File: magit.info,  Node: Switching Buffers,  Next: Naming Buffers,  Up: Modes and Buffers
-
-4.1.1 Switching Buffers
------------------------
-
- -- Function: magit-display-buffer buffer &optional display-function
-     This function is a wrapper around ‘display-buffer’ and is used to
-     display any Magit buffer.  It displays BUFFER in some window and,
-     unlike ‘display-buffer’, also selects that window, provided
-     ‘magit-display-buffer-noselect’ is ‘nil’.  It also runs the hooks
-     mentioned below.
-
-     If optional DISPLAY-FUNCTION is non-nil, then that is used to
-     display the buffer.  Usually that is ‘nil’ and the function
-     specified by ‘magit-display-buffer-function’ is used.
-
- -- Variable: magit-display-buffer-noselect
-     When this is non-nil, then ‘magit-display-buffer’ only displays the
-     buffer but forgoes also selecting the window.  This variable should
-     not be set globally, it is only intended to be let-bound, by code
-     that automatically updates "the other window".  This is used for
-     example when the revision buffer is updated when you move inside
-     the log buffer.
-
- -- User Option: magit-display-buffer-function
-     The function specified here is called by ‘magit-display-buffer’
-     with one argument, a buffer, to actually display that buffer.  This
-     function should call ‘display-buffer’ with that buffer as first and
-     a list of display actions as second argument.
-
-     Magit provides several functions, listed below, that are suitable
-     values for this option.  If you want to use different rules, then a
-     good way of doing that is to start with a copy of one of these
-     functions and then adjust it to your needs.
-
-     Instead of using a wrapper around ‘display-buffer’, that function
-     itself can be used here, in which case the display actions have to
-     be specified by adding them to ‘display-buffer-alist’ instead.
-
-     To learn about display actions, see *note (elisp)Choosing Window::.
-
- -- Function: magit-display-buffer-traditional buffer
-     This function is the current default value of the option
-     ‘magit-display-buffer-function’.  Before that option and this
-     function were added, the behavior was hard-coded in many places all
-     over the code base but now all the rules are contained in this one
-     function (except for the "noselect" special case mentioned above).
-
- -- Function: magit-display-buffer-same-window-except-diff-v1
-     This function displays most buffers in the currently selected
-     window.  If a buffer’s mode derives from ‘magit-diff-mode’ or
-     ‘magit-process-mode’, it is displayed in another window.
-
- -- Function: magit-display-buffer-fullframe-status-v1
-     This function fills the entire frame when displaying a status
-     buffer.  Otherwise, it behaves like
-     ‘magit-display-buffer-traditional’.
-
- -- Function: magit-display-buffer-fullframe-status-topleft-v1
-     This function fills the entire frame when displaying a status
-     buffer.  It behaves like ‘magit-display-buffer-fullframe-status-v1’
-     except that it displays buffers that derive from ‘magit-diff-mode’
-     or ‘magit-process-mode’ to the top or left of the current buffer
-     rather than to the bottom or right.  As a result, Magit buffers
-     tend to pop up on the same side as they would if
-     ‘magit-display-buffer-traditional’ were in use.
-
- -- Function: magit-display-buffer-fullcolumn-most-v1
-     This function displays most buffers so that they fill the entire
-     height of the frame.  However, the buffer is displayed in another
-     window if (1) the buffer’s mode derives from ‘magit-process-mode’,
-     or (2) the buffer’s mode derives from ‘magit-diff-mode’, provided
-     that the mode of the current buffer derives from ‘magit-log-mode’
-     or ‘magit-cherry-mode’.
-
- -- User Option: magit-pre-display-buffer-hook
-     This hook is run by ‘magit-display-buffer’ before displaying the
-     buffer.
-
- -- Function: magit-save-window-configuration
-     This function saves the current window configuration.  Later when
-     the buffer is buried, it may be restored by
-     ‘magit-restore-window-configuration’.
-
- -- User Option: magit-post-display-buffer-hook
-     This hook is run by ‘magit-display-buffer’ after displaying the
-     buffer.
-
- -- Function: magit-maybe-set-dedicated
-     This function remembers if a new window had to be created to
-     display the buffer, or whether an existing window was reused.  This
-     information is later used by ‘magit-mode-quit-window’, to determine
-     whether the window should be deleted when its last Magit buffer is
-     buried.
-
-
-File: magit.info,  Node: Naming Buffers,  Next: Quitting Windows,  Prev: Switching Buffers,  Up: Modes and Buffers
-
-4.1.2 Naming Buffers
---------------------
-
- -- User Option: magit-generate-buffer-name-function
-     The function used to generate the names of Magit buffers.
-
-     Such a function should take the options
-     ‘magit-uniquify-buffer-names’ as well as ‘magit-buffer-name-format’
-     into account.  If it doesn’t, then should be clearly stated in the
-     doc-string.  And if it supports %-sequences beyond those mentioned
-     in the doc-string of the option ‘magit-buffer-name-format’, then
-     its own doc-string should describe the additions.
-
- -- Function: magit-generate-buffer-name-default-function mode
-     This function returns a buffer name suitable for a buffer whose
-     major-mode is MODE and which shows information about the repository
-     in which ‘default-directory’ is located.
-
-     This function uses ‘magit-buffer-name-format’ and supporting all of
-     the %-sequences mentioned the documentation of that option.  It
-     also respects the option ‘magit-uniquify-buffer-names’.
-
- -- User Option: magit-buffer-name-format
-     The format string used to name Magit buffers.
-
-     At least the following %-sequences are supported:
-
-        • ‘%m’
-
-          The name of the major-mode, but with the ‘-mode’ suffix
-          removed.
-
-        • ‘%M’
-
-          Like ‘%m’ but abbreviate ‘magit-status-mode’ as ‘magit’.
-
-        • ‘%v’
-
-          The value the buffer is locked to, in parentheses, or an empty
-          string if the buffer is not locked to a value.
-
-        • ‘%V’
-
-          Like ‘%v’, but the string is prefixed with a space, unless it
-          is an empty string.
-
-        • ‘%t’
-
-          The top-level directory of the working tree of the repository,
-          or if ‘magit-uniquify-buffer-names’ is non-nil an abbreviation
-          of that.
-
-        • ‘%x’
-
-          If ‘magit-uniquify-buffer-names’ is nil "*", otherwise the
-          empty string.  Due to limitations of the ‘uniquify’ package,
-          buffer names must end with the path.
-
-     The value should always contain ‘%m’ or ‘%M’, ‘%v’ or ‘%V’, and
-     ‘%t’.  If ‘magit-uniquify-buffer-names’ is non-nil, then the value
-     must end with ‘%t’ or ‘%t%x’.  See issue #2841.
-
- -- User Option: magit-uniquify-buffer-names
-     This option controls whether the names of Magit buffers are
-     uniquified.  If the names are not being uniquified, then they
-     contain the full path of the top-level of the working tree of the
-     corresponding repository.  If they are being uniquified, then they
-     end with the basename of the top-level, or if that would conflict
-     with the name used for other buffers, then the names of all these
-     buffers are adjusted until they no longer conflict.
-
-     This is done using the ‘uniquify’ package; customize its options to
-     control how buffer names are uniquified.
-
-
-File: magit.info,  Node: Quitting Windows,  Next: Automatic Refreshing of Magit Buffers,  Prev: Naming Buffers,  Up: Modes and Buffers
-
-4.1.3 Quitting Windows
-----------------------
-
-‘q’ (‘magit-mode-bury-buffer’)
-     This command buries or kills the current Magit buffer.  The
-     function specified by option ‘magit-bury-buffer-function’ is used
-     to bury the buffer when called without a prefix argument or to kill
-     it when called with a single prefix argument.
-
-     When called with two or more prefix arguments then it always kills
-     all Magit buffers, associated with the current project, including
-     the current buffer.
-
- -- User Option: magit-bury-buffer-function
-     The function used to actually bury or kill the current buffer.
-
-     ‘magit-mode-bury-buffer’ calls this function with one argument.  If
-     the argument is non-nil, then the function has to kill the current
-     buffer.  Otherwise it has to bury it alive.  The default value
-     currently is ‘magit-mode-quit-window’.
-
- -- Function: magit-restore-window-configuration kill-buffer
-     Bury or kill the current buffer using ‘quit-window’, which is
-     called with KILL-BUFFER as first and the selected window as second
-     argument.
-
-     Then restore the window configuration that existed right before the
-     current buffer was displayed in the selected frame.  Unfortunately
-     that also means that point gets adjusted in all the buffers, which
-     are being displayed in the selected frame.
-
- -- Function: magit-mode-quit-window kill-buffer
-     Bury or kill the current buffer using ‘quit-window’, which is
-     called with KILL-BUFFER as first and the selected window as second
-     argument.
-
-     Then, if the window was originally created to display a Magit
-     buffer and the buried buffer was the last remaining Magit buffer
-     that was ever displayed in the window, then that is deleted.
-
-
-File: magit.info,  Node: Automatic Refreshing of Magit Buffers,  Next: Automatic Saving of File-Visiting Buffers,  Prev: Quitting Windows,  Up: Modes and Buffers
-
-4.1.4 Automatic Refreshing of Magit Buffers
--------------------------------------------
-
-After running a command which may change the state of the current
-repository, the current Magit buffer and the corresponding status buffer
-are refreshed.  The status buffer can be automatically refreshed
-whenever a buffer is saved to a file inside the respective repository by
-adding a hook, like so:
-
-     (with-eval-after-load 'magit-mode
-       (add-hook 'after-save-hook 'magit-after-save-refresh-status t))
-
-   Automatically refreshing Magit buffers ensures that the displayed
-information is up-to-date most of the time but can lead to a noticeable
-delay in big repositories.  Other Magit buffers are not refreshed to
-keep the delay to a minimum and also because doing so can sometimes be
-undesirable.
-
-   Buffers can also be refreshed explicitly, which is useful in buffers
-that weren’t current during the last refresh and after changes were made
-to the repository outside of Magit.
-
-‘g’ (‘magit-refresh’)
-     This command refreshes the current buffer if its major mode derives
-     from ‘magit-mode’ as well as the corresponding status buffer.
-
-     If the option ‘magit-revert-buffers’ calls for it, then it also
-     reverts all unmodified buffers that visit files being tracked in
-     the current repository.
-
-‘G’ (‘magit-refresh-all’)
-     This command refreshes all Magit buffers belonging to the current
-     repository and also reverts all unmodified buffers that visit files
-     being tracked in the current repository.
-
-     The file-visiting buffers are always reverted, even if
-     ‘magit-revert-buffers’ is nil.
-
- -- User Option: magit-refresh-buffer-hook
-     This hook is run in each Magit buffer that was refreshed during the
-     current refresh - normally the current buffer and the status
-     buffer.
-
- -- User Option: magit-refresh-status-buffer
-     When this option is non-nil, then the status buffer is
-     automatically refreshed after running git for side-effects, in
-     addition to the current Magit buffer, which is always refreshed
-     automatically.
-
-     Only set this to nil after exhausting all other options to improve
-     performance.
-
- -- Function: magit-after-save-refresh-status
-     This function is intended to be added to ‘after-save-hook’.  After
-     doing that the corresponding status buffer is refreshed whenever a
-     buffer is saved to a file inside a repository.
-
-     Note that refreshing a Magit buffer is done by re-creating its
-     contents from scratch, which can be slow in large repositories.  If
-     you are not satisfied with Magit’s performance, then you should
-     obviously not add this function to that hook.
-
-
-File: magit.info,  Node: Automatic Saving of File-Visiting Buffers,  Next: Automatic Reverting of File-Visiting Buffers,  Prev: Automatic Refreshing of Magit Buffers,  Up: Modes and Buffers
-
-4.1.5 Automatic Saving of File-Visiting Buffers
------------------------------------------------
-
-File-visiting buffers are by default saved at certain points in time.
-This doesn’t guarantee that Magit buffers are always up-to-date, but,
-provided one only edits files by editing them in Emacs and uses only
-Magit to interact with Git, one can be fairly confident.  When in doubt
-or after outside changes, type ‘g’ (‘magit-refresh’) to save and refresh
-explicitly.
-
- -- User Option: magit-save-repository-buffers
-     This option controls whether file-visiting buffers are saved before
-     certain events.
-
-     If this is non-nil then all modified file-visiting buffers
-     belonging to the current repository may be saved before running
-     commands, before creating new Magit buffers, and before explicitly
-     refreshing such buffers.  If this is ‘dontask’ then this is done
-     without user intervention.  If it is ‘t’ then the user has to
-     confirm each save.
-
-
-File: magit.info,  Node: Automatic Reverting of File-Visiting Buffers,  Prev: Automatic Saving of File-Visiting Buffers,  Up: Modes and Buffers
-
-4.1.6 Automatic Reverting of File-Visiting Buffers
---------------------------------------------------
-
-By default Magit automatically reverts buffers that are visiting files
-that are being tracked in a Git repository, after they have changed on
-disk.  When using Magit one often changes files on disk by running Git,
-i.e., "outside Emacs", making this a rather important feature.
-
-   For example, if you discard a change in the status buffer, then that
-is done by running ‘git apply --reverse ...’, and Emacs considers the
-file to have "changed on disk".  If Magit did not automatically revert
-the buffer, then you would have to type ‘M-x revert-buffer RET RET’ in
-the visiting buffer before you could continue making changes.
-
- -- User Option: magit-auto-revert-mode
-     When this mode is enabled, then buffers that visit tracked files
-     are automatically reverted after the visited files change on disk.
-
- -- User Option: global-auto-revert-mode
-     When this mode is enabled, then any file-visiting buffer is
-     automatically reverted after the visited file changes on disk.
-
-     If you like buffers that visit tracked files to be automatically
-     reverted, then you might also like any buffer to be reverted, not
-     just those visiting tracked files.  If that is the case, then
-     enable this mode _instead of_ ‘magit-auto-revert-mode’.
-
- -- User Option: magit-auto-revert-immediately
-     This option controls whether Magit reverts buffers immediately.
-
-     If this is non-nil and either ‘global-auto-revert-mode’ or
-     ‘magit-auto-revert-mode’ is enabled, then Magit immediately reverts
-     buffers by explicitly calling ‘auto-revert-buffers’ after running
-     Git for side-effects.
-
-     If ‘auto-revert-use-notify’ is non-nil (and file notifications are
-     actually supported), then ‘magit-auto-revert-immediately’ does not
-     have to be non-nil, because the reverts happen immediately anyway.
-
-     If ‘magit-auto-revert-immediately’ and ‘auto-revert-use-notify’ are
-     both ‘nil’, then reverts happen after ‘auto-revert-interval’
-     seconds of user inactivity.  That is not desirable.
-
- -- User Option: auto-revert-use-notify
-     This option controls whether file notification functions should be
-     used.  Note that this variable unfortunately defaults to ‘t’ even
-     on systems on which file notifications cannot be used.
-
- -- User Option: magit-auto-revert-tracked-only
-     This option controls whether ‘magit-auto-revert-mode’ only reverts
-     tracked files or all files that are located inside Git
-     repositories, including untracked files and files located inside
-     Git’s control directory.
-
- -- User Option: auto-revert-mode
-     The global mode ‘magit-auto-revert-mode’ works by turning on this
-     local mode in the appropriate buffers (but
-     ‘global-auto-revert-mode’ is implemented differently).  You can
-     also turn it on or off manually, which might be necessary if Magit
-     does not notice that a previously untracked file now is being
-     tracked or vice-versa.
-
- -- User Option: auto-revert-stop-on-user-input
-     This option controls whether the arrival of user input suspends the
-     automatic reverts for ‘auto-revert-interval’ seconds.
-
- -- User Option: auto-revert-interval
-     This option controls how many seconds Emacs waits for before
-     resuming suspended reverts.
-
- -- User Option: auto-revert-buffer-list-filter
-     This option specifies an additional filter used by
-     ‘auto-revert-buffers’ to determine whether a buffer should be
-     reverted or not.
-
-     This option is provided by Magit, which also advises
-     ‘auto-revert-buffers’ to respect it.  Magit users who do not turn
-     on the local mode ‘auto-revert-mode’ themselves, are best served by
-     setting the value to ‘magit-auto-revert-repository-buffer-p’.
-
-     However the default is nil, so as not to disturb users who do use
-     the local mode directly.  If you experience delays when running
-     Magit commands, then you should consider using one of the
-     predicates provided by Magit - especially if you also use Tramp.
-
-     Users who do turn on ‘auto-revert-mode’ in buffers in which Magit
-     doesn’t do that for them, should likely not use any filter.  Users
-     who turn on ‘global-auto-revert-mode’, do not have to worry about
-     this option, because it is disregarded if the global mode is
-     enabled.
-
- -- User Option: auto-revert-verbose
-     This option controls whether Emacs reports when a buffer has been
-     reverted.
-
-   The options with the ‘auto-revert-’ prefix are located in the Custom
-group named ‘auto-revert’.  The other, Magit-specific, options are
-located in the ‘magit’ group.
-
-* Menu:
-
-* Risk of Reverting Automatically::
-
-
-File: magit.info,  Node: Risk of Reverting Automatically,  Up: Automatic Reverting of File-Visiting Buffers
-
-Risk of Reverting Automatically
-...............................
-
-For the vast majority of users, automatically reverting file-visiting
-buffers after they have changed on disk is harmless.
-
-   If a buffer is modified (i.e., it contains changes that haven’t been
-saved yet), then Emacs will refuse to automatically revert it.  If you
-save a previously modified buffer, then that results in what is seen by
-Git as an uncommitted change.  Git will then refuse to carry out any
-commands that would cause these changes to be lost.  In other words, if
-there is anything that could be lost, then either Git or Emacs will
-refuse to discard the changes.
-
-   However, if you use file-visiting buffers as a sort of ad hoc
-"staging area", then the automatic reverts could potentially cause data
-loss.  So far I have heard from only one user who uses such a workflow.
-
-   An example: You visit some file in a buffer, edit it, and save the
-changes.  Then, outside of Emacs (or at least not using Magit or by
-saving the buffer) you change the file on disk again.  At this point the
-buffer is the only place where the intermediate version still exists.
-You have saved the changes to disk, but that has since been overwritten.
-Meanwhile Emacs considers the buffer to be unmodified (because you have
-not made any changes to it since you last saved it to the visited file)
-and therefore would not object to it being automatically reverted.  At
-this point an Auto-Revert mode would kick in.  It would check whether
-the buffer is modified and since that is not the case it would revert
-it.  The intermediate version would be lost.  (Actually you could still
-get it back using the ‘undo’ command.)
-
-   If your workflow depends on Emacs preserving the intermediate version
-in the buffer, then you have to disable all Auto-Revert modes.  But
-please consider that such a workflow would be dangerous even without
-using an Auto-Revert mode, and should therefore be avoided.  If Emacs
-crashes or if you quit Emacs by mistake, then you would also lose the
-buffer content.  There would be no autosave file still containing the
-intermediate version (because that was deleted when you saved the
-buffer) and you would not be asked whether you want to save the buffer
-(because it isn’t modified).
-
-
-File: magit.info,  Node: Sections,  Next: Transient Commands,  Prev: Modes and Buffers,  Up: Interface Concepts
-
-4.2 Sections
-============
-
-Magit buffers are organized into nested sections, which can be collapsed
-and expanded, similar to how sections are handled in Org mode.  Each
-section also has a type, and some sections also have a value.  For each
-section type there can also be a local keymap, shared by all sections of
-that type.
-
-   Taking advantage of the section value and type, many commands operate
-on the current section, or when the region is active and selects
-sections of the same type, all of the selected sections.  Commands that
-only make sense for a particular section type (as opposed to just
-behaving differently depending on the type) are usually bound in section
-type keymaps.
-
-* Menu:
-
-* Section Movement::
-* Section Visibility::
-* Section Hooks::
-* Section Types and Values::
-* Section Options::
-
-
-File: magit.info,  Node: Section Movement,  Next: Section Visibility,  Up: Sections
-
-4.2.1 Section Movement
-----------------------
-
-To move within a section use the usual keys (‘C-p’, ‘C-n’, ‘C-b’, ‘C-f’
-etc), whose global bindings are not shadowed.  To move to another
-section use the following commands.
-
-‘p’ (‘magit-section-backward’)
-     When not at the beginning of a section, then move to the beginning
-     of the current section.  At the beginning of a section, instead
-     move to the beginning of the previous visible section.
-
-‘n’ (‘magit-section-forward’)
-     Move to the beginning of the next visible section.
-
-‘M-p’ (‘magit-section-backward-siblings’)
-     Move to the beginning of the previous sibling section.  If there is
-     no previous sibling section, then move to the parent section
-     instead.
-
-‘M-n’ (‘magit-section-forward-siblings’)
-     Move to the beginning of the next sibling section.  If there is no
-     next sibling section, then move to the parent section instead.
-
-‘^’ (‘magit-section-up’)
-     Move to the beginning of the parent of the current section.
-
-   The above commands all call the hook ‘magit-section-movement-hook’.
-Any of the functions listed below can be used as members of this hook.
-
-   You might want to remove some of the functions that Magit adds using
-‘add-hook’.  In doing so you have to make sure you do not attempt to
-remove function that haven’t even been added yet, for example:
-
-     (with-eval-after-load 'magit-diff
-       (remove-hook 'magit-section-movement-hook
-                    'magit-hunk-set-window-start))
-
- -- Variable: magit-section-movement-hook
-     This hook is run by all of the above movement commands, after
-     arriving at the destination.
-
- -- Function: magit-hunk-set-window-start
-     This hook function ensures that the beginning of the current
-     section is visible, provided it is a ‘hunk’ section.  Otherwise, it
-     does nothing.
-
-     Loading ‘magit-diff’ adds this function to the hook.
-
- -- Function: magit-section-set-window-start
-     This hook function ensures that the beginning of the current
-     section is visible, regardless of the section’s type.  If you add
-     this to ‘magit-section-movement-hook’, then you must remove the
-     hunk-only variant in turn.
-
- -- Function: magit-log-maybe-show-more-commits
-     This hook function only has an effect in log buffers, and ‘point’
-     is on the "show more" section.  If that is the case, then it
-     doubles the number of commits that are being shown.
-
-     Loading ‘magit-log’ adds this function to the hook.
-
- -- Function: magit-log-maybe-update-revision-buffer
-     When moving inside a log buffer, then this function updates the
-     revision buffer, provided it is already being displayed in another
-     window of the same frame.
-
-     Loading ‘magit-log’ adds this function to the hook.
-
- -- Function: magit-log-maybe-update-blob-buffer
-     When moving inside a log buffer and another window of the same
-     frame displays a blob buffer, then this function instead displays
-     the blob buffer for the commit at point in that window.
-
- -- Function: magit-status-maybe-update-revision-buffer
-     When moving inside a status buffer, then this function updates the
-     revision buffer, provided it is already being displayed in another
-     window of the same frame.
-
- -- Function: magit-status-maybe-update-stash-buffer
-     When moving inside a status buffer, then this function updates the
-     stash buffer, provided it is already being displayed in another
-     window of the same frame.
-
- -- Function: magit-status-maybe-update-blob-buffer
-     When moving inside a status buffer and another window of the same
-     frame displays a blob buffer, then this function instead displays
-     the blob buffer for the commit at point in that window.
-
- -- Function: magit-stashes-maybe-update-stash-buffer
-     When moving inside a buffer listing stashes, then this function
-     updates the stash buffer, provided it is already being displayed in
-     another window of the same frame.
-
- -- User Option: magit-update-other-window-delay
-     Delay before automatically updating the other window.
-
-     When moving around in certain buffers, then certain other buffers,
-     which are being displayed in another window, may optionally be
-     updated to display information about the section at point.
-
-     When holding down a key to move by more than just one section, then
-     that would update that buffer for each section on the way.  To
-     prevent that, updating the revision buffer is delayed, and this
-     option controls for how long.  For optimal experience you might
-     have to adjust this delay and/or the keyboard repeat rate and delay
-     of your graphical environment or operating system.
-
-
-File: magit.info,  Node: Section Visibility,  Next: Section Hooks,  Prev: Section Movement,  Up: Sections
-
-4.2.2 Section Visibility
-------------------------
-
-Magit provides many commands for changing the visibility of sections,
-but all you need to get started are the next two.
-
-‘<TAB>’ (‘magit-section-toggle’)
-     Toggle the visibility of the body of the current section.
-
-‘C-c <TAB>’ (‘magit-section-cycle’)
-‘C-<tab>’ (‘magit-section-cycle’)
-     Cycle the visibility of current section and its children.
-
-     If this command is invoked using ‘C-<tab>’ and that is globally
-     bound to ‘tab-next’, then this command pivots to behave like that
-     command, and you must instead use ‘C-c TAB’ to cycle section
-     visibility.
-
-     If you would like to keep using ‘C-<tab>’ to cycle section
-     visibility but also want to use ‘tab-bar-mode’, then you have to
-     prevent that mode from using this key and instead bind another key
-     to ‘tab-next’.  Because ‘tab-bar-mode’ does not use a mode map but
-     instead manipulates the global map, this involves advising
-     ‘tab-bar--define-keys’.
-
-‘M-<tab>’ (‘magit-section-cycle-diffs’)
-     Cycle the visibility of diff-related sections in the current
-     buffer.
-
-‘S-<tab>’ (‘magit-section-cycle-global’)
-     Cycle the visibility of all sections in the current buffer.
-
-‘1’ (‘magit-section-show-level-1’)
-‘2’ (‘magit-section-show-level-2’)
-‘3’ (‘magit-section-show-level-3’)
-‘4’ (‘magit-section-show-level-4’)
-     Show sections surrounding the current section up to level N.
-
-‘M-1’ (‘magit-section-show-level-1-all’)
-‘M-2’ (‘magit-section-show-level-2-all’)
-‘M-3’ (‘magit-section-show-level-3-all’)
-‘M-4’ (‘magit-section-show-level-4-all’)
-     Show all sections up to level N.
-
-   Some functions, which are used to implement the above commands, are
-also exposed as commands themselves.  By default no keys are bound to
-these commands, as they are generally perceived to be much less useful.
-But your mileage may vary.
-
- -- Command: magit-section-show
-     Show the body of the current section.
-
- -- Command: magit-section-hide
-     Hide the body of the current section.
-
- -- Command: magit-section-show-headings
-     Recursively show headings of children of the current section.  Only
-     show the headings.  Previously shown text-only bodies are hidden.
-
- -- Command: magit-section-show-children
-     Recursively show the bodies of children of the current section.
-     With a prefix argument show children down to the level of the
-     current section, and hide deeper children.
-
- -- Command: magit-section-hide-children
-     Recursively hide the bodies of children of the current section.
-
- -- Command: magit-section-toggle-children
-     Toggle visibility of bodies of children of the current section.
-
-   When a buffer is first created then some sections are shown expanded
-while others are not.  This is hard coded.  When a buffer is refreshed
-then the previous visibility is preserved.  The initial visibility of
-certain sections can also be overwritten using the hook
-‘magit-section-set-visibility-hook’.
-
- -- User Option: magit-section-initial-visibility-alist
-     This options can be used to override the initial visibility of
-     sections.  In the future it will also be used to define the
-     defaults, but currently a section’s default is still hardcoded.
-
-     The value is an alist.  Each element maps a section type or lineage
-     to the initial visibility state for such sections.  The state has
-     to be one of ‘show’ or ‘hide’, or a function that returns one of
-     these symbols.  A function is called with the section as the only
-     argument.
-
-     Use the command ‘magit-describe-section-briefly’ to determine a
-     section’s lineage or type.  The vector in the output is the section
-     lineage and the type is the first element of that vector.
-     Wildcards can be used, see ‘magit-section-match’.
-
- -- User Option: magit-section-cache-visibility
-     This option controls for which sections the previous visibility
-     state should be restored if a section disappears and later appears
-     again.  The value is a boolean or a list of section types.  If t,
-     then the visibility of all sections is cached.  Otherwise this is
-     only done for sections whose type matches one of the listed types.
-
-     This requires that the function ‘magit-section-cached-visibility’
-     is a member of ‘magit-section-set-visibility-hook’.
-
- -- Variable: magit-section-set-visibility-hook
-     This hook is run when first creating a buffer and also when
-     refreshing an existing buffer, and is used to determine the
-     visibility of the section currently being inserted.
-
-     Each function is called with one argument, the section being
-     inserted.  It should return ‘hide’ or ‘show’, or to leave the
-     visibility undefined ‘nil’.  If no function decides on the
-     visibility and the buffer is being refreshed, then the visibility
-     is preserved; or if the buffer is being created, then the hard
-     coded default is used.
-
-     Usually this should only be used to set the initial visibility but
-     not during refreshes.  If ‘magit-insert-section--oldroot’ is
-     non-nil, then the buffer is being refreshed and these functions
-     should immediately return ‘nil’.
-
- -- User Option: magit-section-visibility-indicator
-     This option controls whether and how to indicate that a section can
-     be expanded/collapsed.
-
-     If nil, then no visibility indicators are shown.  Otherwise the
-     value has to have one of these two forms:
-
-        • ‘(EXPANDABLE-BITMAP . COLLAPSIBLE-BITMAP)’
-
-          Both values have to be variables whose values are fringe
-          bitmaps.  In this case every section that can be expanded or
-          collapsed gets an indicator in the left fringe.
-
-          To provide extra padding around the indicator, set
-          ‘left-fringe-width’ in ‘magit-mode-hook’, e.g.:
-
-               (add-hook 'magit-mode-hook (lambda ()
-                                            (setq left-fringe-width 20)))
-
-        • ‘(STRING . BOOLEAN)’
-
-          In this case STRING (usually an ellipsis) is shown at the end
-          of the heading of every collapsed section.  Expanded sections
-          get no indicator.  The cdr controls whether the appearance of
-          these ellipsis take section highlighting into account.  Doing
-          so might potentially have an impact on performance, while not
-          doing so is kinda ugly.
-
-
-File: magit.info,  Node: Section Hooks,  Next: Section Types and Values,  Prev: Section Visibility,  Up: Sections
-
-4.2.3 Section Hooks
--------------------
-
-Which sections are inserted into certain buffers is controlled with
-hooks.  This includes the status and the refs buffers.  For other
-buffers, e.g., log and diff buffers, this is not possible.  The command
-‘magit-describe-section’ can be used to see which hook (if any) was
-responsible for inserting the section at point.
-
-   For buffers whose sections can be customized by the user, a hook
-variable called ‘magit-TYPE-sections-hook’ exists.  This hook should be
-changed using ‘magit-add-section-hook’.  Avoid using ‘add-hooks’ or the
-Custom interface.
-
-   The various available section hook variables are described later in
-this manual along with the appropriate "section inserter functions".
-
- -- Function: magit-add-section-hook hook function &optional at append
-          local
-     Add the function FUNCTION to the value of section hook HOOK.
-
-     Add FUNCTION at the beginning of the hook list unless optional
-     APPEND is non-nil, in which case FUNCTION is added at the end.  If
-     FUNCTION already is a member then move it to the new location.
-
-     If optional AT is non-nil and a member of the hook list, then add
-     FUNCTION next to that instead.  Add before or after AT, or replace
-     AT with FUNCTION depending on APPEND.  If APPEND is the symbol
-     ‘replace’, then replace AT with FUNCTION.  For any other non-nil
-     value place FUNCTION right after AT.  If nil, then place FUNCTION
-     right before AT.  If FUNCTION already is a member of the list but
-     AT is not, then leave FUNCTION where ever it already is.
-
-     If optional LOCAL is non-nil, then modify the hook’s buffer-local
-     value rather than its global value.  This makes the hook local by
-     copying the default value.  That copy is then modified.
-
-     HOOK should be a symbol.  If HOOK is void, it is first set to nil.
-     HOOK’s value must not be a single hook function.  FUNCTION should
-     be a function that takes no arguments and inserts one or multiple
-     sections at point, moving point forward.  FUNCTION may choose not
-     to insert its section(s), when doing so would not make sense.  It
-     should not be abused for other side-effects.
-
-   To remove a function from a section hook, use ‘remove-hook’.
-
-
-File: magit.info,  Node: Section Types and Values,  Next: Section Options,  Prev: Section Hooks,  Up: Sections
-
-4.2.4 Section Types and Values
-------------------------------
-
-Each section has a type, for example ‘hunk’, ‘file’, and ‘commit’.
-Instances of certain section types also have a value.  The value of a
-section of type ‘file’, for example, is a file name.
-
-   Users usually do not have to worry about a section’s type and value,
-but knowing them can be handy at times.
-
-‘H’ (‘magit-describe-section’)
-     This command shows information about the section at point in a
-     separate buffer.
-
- -- Command: magit-describe-section-briefly
-     This command shows information about the section at point in the
-     echo area, as ‘#<magit-section VALUE [TYPE PARENT-TYPE...]
-     BEGINNING-END>’.
-
-   Many commands behave differently depending on the type of the section
-at point and/or somehow consume the value of that section.  But that is
-only one of the reasons why the same key may do something different,
-depending on what section is current.
-
-   Additionally for each section type a keymap *might* be defined, named
-‘magit-TYPE-section-map’.  That keymap is used as text property keymap
-of all text belonging to any section of the respective type.  If such a
-map does not exist for a certain type, then you can define it yourself,
-and it will automatically be used.
-
-
-File: magit.info,  Node: Section Options,  Prev: Section Types and Values,  Up: Sections
-
-4.2.5 Section Options
----------------------
-
-This section describes options that have an effect on more than just a
-certain type of sections.  As you can see there are not many of those.
-
- -- User Option: magit-section-show-child-count
-     Whether to append the number of children to section headings.  This
-     only affects sections that could benefit from this information.
-
-
-File: magit.info,  Node: Transient Commands,  Next: Transient Arguments and Buffer Variables,  Prev: Sections,  Up: Interface Concepts
-
-4.3 Transient Commands
-======================
-
-Many Magit commands are implemented as *transient* commands.  First the
-user invokes a *prefix* command, which causes its *infix* arguments and
-*suffix* commands to be displayed in the echo area.  The user then
-optionally sets some infix arguments and finally invokes one of the
-suffix commands.
-
-   This is implemented in the library ‘transient’.  Earlier Magit
-releases used the package ‘magit-popup’ and even earlier versions
-library ‘magit-key-mode’.
-
-   Transient is documented in *note (transient)Top::.
-
-‘C-x M-g’ (‘magit-dispatch’)
-‘C-c g’ (‘magit-dispatch’)
-     This transient prefix command binds most of Magit’s other prefix
-     commands as suffix commands and displays them in a temporary buffer
-     until one of them is invoked.  Invoking such a sub-prefix causes
-     the suffixes of that command to be bound and displayed instead of
-     those of ‘magit-dispatch’.
-
-     This command is also, or especially, useful outside Magit buffers,
-     so Magit by default binds it to ‘C-c M-g’ in the global keymap.
-     ‘C-c g’ would be a better binding, but we cannot use that by
-     default, because that key sequence is reserved for the user.  See
-     *note Global Bindings:: to learn more default and recommended key
-     bindings.
-
-
-File: magit.info,  Node: Transient Arguments and Buffer Variables,  Next: Completion Confirmation and the Selection,  Prev: Transient Commands,  Up: Interface Concepts
-
-4.4 Transient Arguments and Buffer Variables
-============================================
-
-The infix arguments of many of Magit’s transient prefix commands cease
-to have an effect once the ‘git’ command that is called with those
-arguments has returned.  Commands that create a commit are a good
-example for this.  If the user changes the arguments, then that only
-affects the next invocation of a suffix command.  If the same transient
-prefix command is later invoked again, then the arguments are initially
-reset to the default value.  This default value can be set for the
-current Emacs session or saved permanently, see *note (transient)Saving
-Values::.  It is also possible to cycle through previously used sets of
-arguments using ‘C-M-p’ and ‘C-M-n’, see *note (transient)Using
-History::.
-
-   However the infix arguments of many other transient commands continue
-to have an effect even after the ‘git’ command that was called with
-those arguments has returned.  The most important commands like this are
-those that display a diff or log in a dedicated buffer.  Their arguments
-obviously continue to have an effect for as long as the respective diff
-or log is being displayed.  Furthermore the used arguments are stored in
-buffer-local variables for future reference.
-
-   For commands in the second group it isn’t always desirable to reset
-their arguments to the global value when the transient prefix command is
-invoked again.
-
-   As mentioned above, it is possible to cycle through previously used
-sets of arguments while a transient popup is visible.  That means that
-we could always reset the infix arguments to the default because the set
-of arguments that is active in the existing buffer is only a few ‘C-M-p’
-away.  Magit can be configured to behave like that, but because I expect
-that most users would not find that very convenient, it is not the
-default.
-
-   Also note that it is possible to change the diff and log arguments
-used in the current buffer (including the status buffer, which contains
-both diff and log sections) using the respective "refresh" transient
-prefix commands on ‘D’ and ‘L’.  (‘d’ and ‘l’ on the other hand are
-intended to change *what* diff or log is being displayed.  It is
-possible to also change *how* the diff or log is being displayed at the
-same time, but if you only want to do the latter, then you should use
-the refresh variants.)  Because these secondary diff and log transient
-prefixes are about *changing* the arguments used in the current buffer,
-they *always* start out with the set of arguments that are currently in
-effect in that buffer.
-
-   Some commands are usually invoked directly even though they can also
-be invoked as the suffix of a transient prefix command.  Most
-prominently ‘magit-show-commit’ is usually invoked by typing ‘RET’ while
-point is on a commit in a log, but it can also be invoked from the
-‘magit-diff’ transient prefix.
-
-   When such a command is invoked directly, then it is important to
-reuse the arguments as specified by the respective buffer-local values,
-instead of using the default arguments.  Imagine you press ‘RET’ in a
-log to display the commit at point in a different buffer and then use
-‘D’ to change how the diff is displayed in that buffer.  And then you
-press ‘RET’ on another commit to show that instead and the diff
-arguments are reset to the default.  Not cool; so Magit does not do that
-by default.
-
- -- User Option: magit-prefix-use-buffer-arguments
-     This option controls whether the infix arguments initially shown in
-     certain transient prefix commands are based on the arguments that
-     are currently in effect in the buffer that their suffixes update.
-
-     The ‘magit-diff’ and ‘magit-log’ transient prefix commands are
-     affected by this option.
-
- -- User Option: magit-direct-use-buffer-arguments
-     This option controls whether certain commands, when invoked
-     directly (i.e., not as the suffix of a transient prefix command),
-     use the arguments that are currently active in the buffer that they
-     are about to update.  The alternative is to use the default value
-     for these arguments, which might change the arguments that are used
-     in the buffer.
-
-Valid values for both of the above options are:
-
-   • ‘always’: Always use the set of arguments that is currently active
-     in the respective buffer, provided that buffer exists of course.
-   • ‘selected’ or ‘t’: Use the set of arguments from the respective
-     buffer, but only if it is displayed in a window of the current
-     frame.  This is the default for both variables.
-   • ‘current’: Use the set of arguments from the respective buffer, but
-     only if it is the current buffer.
-   • ‘never’: Never use the set of arguments from the respective buffer.
-
-I am afraid it gets more complicated still:
-
-   • The global diff and log arguments are set for each supported mode
-     individually.  The diff arguments for example have different values
-     in ‘magit-diff-mode’, ‘magit-revision-mode’,
-     ‘magit-merge-preview-mode’ and ‘magit-status-mode’ buffers.
-     Setting or saving the value for one mode does not change the value
-     for other modes.  The history however is shared.
-
-   • When ‘magit-show-commit’ is invoked directly from a log buffer,
-     then the file filter is picked up from that buffer, not from the
-     revision buffer or the mode’s global diff arguments.
-
-   • Even though they are suffixes of the diff prefix
-     ‘magit-show-commit’ and ‘magit-stash-show’ do not use the diff
-     buffer used by the diff commands, instead they use the dedicated
-     revision and stash buffers.
-
-     At the time you invoke the diff prefix it is unknown to Magit which
-     of the suffix commands you are going to invoke.  While not certain,
-     more often than not users invoke one of the commands that use the
-     diff buffer, so the initial infix arguments are those used in that
-     buffer.  However if you invoke one of these commands directly, then
-     Magit knows that it should use the arguments from the revision
-     resp.  stash buffer.
-
-   • The log prefix also features reflog commands, but these commands do
-     not use the log arguments.
-
-   • If ‘magit-show-refs’ is invoked from a ‘magit-refs-mode’ buffer,
-     then it acts as a refresh prefix and therefore unconditionally uses
-     the buffer’s arguments as initial arguments.  If it is invoked
-     elsewhere with a prefix argument, then it acts as regular prefix
-     and therefore respects ‘magit-prefix-use-buffer-arguments’.  If it
-     is invoked elsewhere without a prefix argument, then it acts as a
-     direct command and therefore respects
-     ‘magit-direct-use-buffer-arguments’.
-
-
-File: magit.info,  Node: Completion Confirmation and the Selection,  Next: Mouse Support,  Prev: Transient Arguments and Buffer Variables,  Up: Interface Concepts
-
-4.5 Completion, Confirmation and the Selection
-==============================================
-
-* Menu:
-
-* Action Confirmation::
-* Completion and Confirmation::
-* The Selection::
-* The hunk-internal region::
-* Support for Completion Frameworks::
-* Additional Completion Options::
-
-
-File: magit.info,  Node: Action Confirmation,  Next: Completion and Confirmation,  Up: Completion Confirmation and the Selection
-
-4.5.1 Action Confirmation
--------------------------
-
-By default many actions that could potentially lead to data loss have to
-be confirmed.  This includes many very common actions, so this can
-quickly become annoying.  Many of these actions can be undone and if you
-have thought about how to undo certain mistakes, then it should be safe
-to disable confirmation for the respective actions.
-
-   The option ‘magit-no-confirm’ can be used to tell Magit to perform
-certain actions without the user having to confirm them.  Note that
-while this option can only be used to disable confirmation for a
-specific set of actions, the next section explains another way of
-telling Magit to ask fewer questions.
-
- -- User Option: magit-no-confirm
-     The value of this option is a list of symbols, representing actions
-     that do not have to be confirmed by the user before being carried
-     out.
-
-     By default many potentially dangerous commands ask the user for
-     confirmation.  Each of the below symbols stands for an action
-     which, when invoked unintentionally or without being fully aware of
-     the consequences, could lead to tears.  In many cases there are
-     several commands that perform variations of a certain action, so we
-     don’t use the command names but more generic symbols.
-
-        • Applying changes:
-
-             • ‘discard’ Discarding one or more changes (i.e., hunks or
-               the complete diff for a file) loses that change,
-               obviously.
-
-             • ‘reverse’ Reverting one or more changes can usually be
-               undone by reverting the reversion.
-
-             • ‘stage-all-changes’, ‘unstage-all-changes’ When there are
-               both staged and unstaged changes, then un-/staging
-               everything would destroy that distinction.  Of course
-               that also applies when un-/staging a single change, but
-               then less is lost and one does that so often that having
-               to confirm every time would be unacceptable.
-
-        • Files:
-
-             • ‘delete’ When a file that isn’t yet tracked by Git is
-               deleted, then it is completely lost, not just the last
-               changes.  Very dangerous.
-
-             • ‘trash’ Instead of deleting a file it can also be move to
-               the system trash.  Obviously much less dangerous than
-               deleting it.
-
-               Also see option ‘magit-delete-by-moving-to-trash’.
-
-             • ‘resurrect’ A deleted file can easily be resurrected by
-               "deleting" the deletion, which is done using the same
-               command that was used to delete the same file in the
-               first place.
-
-             • ‘untrack’ Untracking a file can be undone by tracking it
-               again.
-
-             • ‘rename’ Renaming a file can easily be undone.
-
-        • Sequences:
-
-             • ‘reset-bisect’ Aborting (known to Git as "resetting") a
-               bisect operation loses all information collected so far.
-
-             • ‘abort-cherry-pick’ Aborting a cherry-pick throws away
-               all conflict resolutions which have already been carried
-               out by the user.
-
-             • ‘abort-revert’ Aborting a revert throws away all conflict
-               resolutions which have already been carried out by the
-               user.
-
-             • ‘abort-rebase’ Aborting a rebase throws away all already
-               modified commits, but it’s possible to restore those from
-               the reflog.
-
-             • ‘abort-merge’ Aborting a merge throws away all conflict
-               resolutions which have already been carried out by the
-               user.
-
-             • ‘merge-dirty’ Merging with a dirty worktree can make it
-               hard to go back to the state before the merge was
-               initiated.
-
-        • References:
-
-             • ‘delete-unmerged-branch’ Once a branch has been deleted,
-               it can only be restored using low-level recovery tools
-               provided by Git.  And even then the reflog is gone.  The
-               user always has to confirm the deletion of a branch by
-               accepting the default choice (or selecting another
-               branch), but when a branch has not been merged yet, also
-               make sure the user is aware of that.
-
-             • ‘delete-pr-remote’ When deleting a branch that was
-               created from a pull-request and if no other branches
-               still exist on that remote, then ‘magit-branch-delete’
-               offers to delete the remote as well.  This should be safe
-               because it only happens if no other refs exist in the
-               remotes namespace, and you can recreate the remote if
-               necessary.
-
-             • ‘drop-stashes’ Dropping a stash is dangerous because Git
-               stores stashes in the reflog.  Once a stash is removed,
-               there is no going back without using low-level recovery
-               tools provided by Git.  When a single stash is dropped,
-               then the user always has to confirm by accepting the
-               default (or selecting another).  This action only
-               concerns the deletion of multiple stashes at once.
-
-        • Publishing:
-
-             • ‘set-and-push’ When pushing to the upstream or the
-               push-remote and that isn’t actually configured yet, then
-               the user can first set the target.  If s/he confirms the
-               default too quickly, then s/he might end up pushing to
-               the wrong branch and if the remote repository is
-               configured to disallow fixing such mistakes, then that
-               can be quite embarrassing and annoying.
-
-        • Edit published history:
-
-          Without adding these symbols here, you will be warned before
-          editing commits that have already been pushed to one of the
-          branches listed in ‘magit-published-branches’.
-
-             • ‘amend-published’ Affects most commands that amend to
-               "HEAD".
-
-             • ‘rebase-published’ Affects commands that perform
-               interactive rebases.  This includes commands from the
-               commit transient that modify a commit other than "HEAD",
-               namely the various fixup and squash variants.
-
-             • ‘edit-published’ Affects the commands
-               ‘magit-edit-line-commit’ and
-               ‘magit-diff-edit-hunk-commit’.  These two commands make
-               it quite easy to accidentally edit a published commit, so
-               you should think twice before configuring them not to ask
-               for confirmation.
-
-          To disable confirmation completely, add all three symbols here
-          or set ‘magit-published-branches’ to ‘nil’.
-
-        • Various:
-
-             • ‘stash-apply-3way’ When a stash cannot be applied using
-               ‘git stash apply’, then Magit uses ‘git apply’ instead,
-               possibly using the ‘--3way’ argument, which isn’t always
-               perfectly safe.  See also ‘magit-stash-apply’.
-
-             • ‘kill-process’ There seldom is a reason to kill a
-               process.
-
-        • Global settings:
-
-          Instead of adding all of the above symbols to the value of
-          this option, you can also set it to the atom ‘t’, which has
-          the same effect as adding all of the above symbols.  Doing
-          that most certainly is a bad idea, especially because other
-          symbols might be added in the future.  So even if you don’t
-          want to be asked for confirmation for any of these actions,
-          you are still better of adding all of the respective symbols
-          individually.
-
-          When ‘magit-wip-before-change-mode’ is enabled, then the
-          following actions can be undone fairly easily: ‘discard’,
-          ‘reverse’, ‘stage-all-changes’, and ‘unstage-all-changes’.  If
-          and only if this mode is enabled, then ‘safe-with-wip’ has the
-          same effect as adding all of these symbols individually.
-
-
-File: magit.info,  Node: Completion and Confirmation,  Next: The Selection,  Prev: Action Confirmation,  Up: Completion Confirmation and the Selection
-
-4.5.2 Completion and Confirmation
----------------------------------
-
-Many Magit commands ask the user to select from a list of possible
-things to act on, while offering the most likely choice as the default.
-For many of these commands the default is the thing at point, provided
-that it actually is a valid thing to act on.  For many commands that act
-on a branch, the current branch serves as the default if there is no
-branch at point.
-
-   These commands combine asking for confirmation and asking for a
-target to act on into a single action.  The user can confirm the default
-target using ‘RET’ or abort using ‘C-g’.  This is similar to a
-‘y-or-n-p’ prompt, but the keys to confirm or abort differ.
-
-   At the same time the user is also given the opportunity to select
-another target, which is useful because for some commands and/or in some
-situations you might want to select the action before selecting the
-target by moving to it.
-
-   However you might find that for some commands you always want to use
-the default target, if any, or even that you want the command to act on
-the default without requiring any confirmation at all.  The option
-‘magit-dwim-selection’ can be used to configure certain commands to that
-effect.
-
-   Note that when the region is active then many commands act on the
-things that are selected using a mechanism based on the region, in many
-cases after asking for confirmation.  This region-based mechanism is
-called the "selection" and is described in detail in the next section.
-When a selection exists that is valid for the invoked command, then that
-command never offers to act on something else, and whether it asks for
-confirmation is not controlled by this option.
-
-   Also note that Magit asks for confirmation of certain actions that
-are not coupled with completion (or the selection).  Such dialogs are
-also not affected by this option and are described in the previous
-section.
-
- -- User Option: magit-dwim-selection
-   This option can be used to tell certain commands to use the thing at
-point instead of asking the user to select a candidate to act on, with
-or without confirmation.
-
-   The value has the form ‘((COMMAND nil|PROMPT DEFAULT)...)’.
-
-   • COMMAND is the command that should not prompt for a choice.  To
-     have an effect, the command has to use the function
-     ‘magit-completing-read’ or a utility function which in turn uses
-     that function.
-
-   • If the command uses ‘magit-completing-read’ multiple times, then
-     PROMPT can be used to only affect one of these uses.  PROMPT, if
-     non-nil, is a regular expression that is used to match against the
-     PROMPT argument passed to ‘magit-completing-read’.
-
-   • DEFAULT specifies how to use the default.  If it is ‘t’, then the
-     DEFAULT argument passed to ‘magit-completing-read’ is used without
-     confirmation.  If it is ‘ask’, then the user is given a chance to
-     abort.  DEFAULT can also be ‘nil’, in which case the entry has no
-     effect.
-
-
-File: magit.info,  Node: The Selection,  Next: The hunk-internal region,  Prev: Completion and Confirmation,  Up: Completion Confirmation and the Selection
-
-4.5.3 The Selection
--------------------
-
-If the region is active, then many Magit commands act on the things that
-are selected using a mechanism based on the region instead of one single
-thing.  When the region is not active, then these commands act on the
-thing at point or read a single thing to act on.  This is described in
-the previous section — this section only covers how multiple things are
-selected, how that is visualized, and how certain commands behave when
-that is the case.
-
-   Magit’s mechanism for selecting multiple things, or rather sections
-that represent these things, is based on the Emacs region, but the area
-that Magit considers to be selected is typically larger than the region
-and additional restrictions apply.
-
-   Magit makes a distinction between a region that qualifies as forming
-a valid Magit selection and a region that does not.  If the region does
-not qualify, then it is displayed as it is in other Emacs buffers.  If
-the region does qualify as a Magit selection, then the selection is
-always visualized, while the region itself is only visualized if it
-begins and ends on the same line.
-
-   For a region to qualify as a Magit selection, it must begin in the
-heading of one section and end in the heading of a sibling section.
-Note that if the end of the region is at the very beginning of section
-heading (i.e., at the very beginning of a line) then that section is
-considered to be *inside* the selection.
-
-   This is not consistent with how the region is normally treated in
-Emacs — if the region ends at the beginning of a line, then that line is
-outside the region.  Due to how Magit visualizes the selection, it
-should be obvious that this difference exists.
-
-   Not every command acts on every valid selection.  Some commands do
-not even consider the location of point, others may act on the section
-at point but not support acting on the selection, and even commands that
-do support the selection of course only do so if it selects things that
-they can act on.
-
-   This is the main reason why the selection must include the section at
-point.  Even if a selection exists, the invoked command may disregard
-it, in which case it may act on the current section only.  It is much
-safer to only act on the current section but not the other selected
-sections than it is to act on the current section *instead* of the
-selected sections.  The latter would be much more surprising and if the
-current section always is part of the selection, then that cannot
-happen.
-
- -- Variable: magit-keep-region-overlay
-     This variable controls whether the region is visualized as usual
-     even when a valid Magit selection or a hunk-internal region exists.
-     See the doc-string for more information.
-
-
-File: magit.info,  Node: The hunk-internal region,  Next: Support for Completion Frameworks,  Prev: The Selection,  Up: Completion Confirmation and the Selection
-
-4.5.4 The hunk-internal region
-------------------------------
-
-Somewhat related to the Magit selection described in the previous
-section is the hunk-internal region.
-
-   Like the selection, the hunk-internal region is based on the Emacs
-region but causes that region to not be visualized as it would in other
-Emacs buffers, and includes the line on which the region ends even if it
-ends at the very beginning of that line.
-
-   Unlike the selection, which is based on a region that must begin in
-the heading of one section and ends in the section of a sibling section,
-the hunk-internal region must begin inside the *body* of a hunk section
-and end in the body of the *same* section.
-
-   The hunk-internal region is honored by "apply" commands, which can,
-among other targets, act on a hunk.  If the hunk-internal region is
-active, then such commands act only on the marked part of the hunk
-instead of on the complete hunk.
-
-
-File: magit.info,  Node: Support for Completion Frameworks,  Next: Additional Completion Options,  Prev: The hunk-internal region,  Up: Completion Confirmation and the Selection
-
-4.5.5 Support for Completion Frameworks
----------------------------------------
-
-The built-in option ‘completing-read-function’ specifies the low-level
-function used by ‘completing-read’ to ask a user to select from a list
-of choices.  Its default value is ‘completing-read-default’.
-Alternative completion frameworks typically activate themselves by
-substituting their own implementation.
-
-   Mostly for historic reasons Magit provides a similar option named
-‘magit-completing-read-function’, which only controls the low-level
-function used by ‘magit-completing-read’.  This option also makes it
-possible to use a different completing mechanism for Magit than for the
-rest of Emacs, but doing that is not recommend.
-
-   You most likely don’t have to customize the magit-specific option to
-use an alternative completion framework.  For example, if you enable
-‘ivy-mode’, then Magit will respect that, and if you enable ‘helm-mode’,
-then you are done too.
-
-   However if you want to use Ido, then ‘ido-mode’ won’t do the trick.
-You will also have to install the ‘ido-completing-read+’ package and use
-‘magit-ido-completing-read’ as ‘magit-completing-read-function’.
-
- -- User Option: magit-completing-read-function
-     The value of this variable is the low-level function used to
-     perform completion by code that uses ‘magit-completing-read’ (as
-     opposed to the built-in ‘completing-read’).
-
-     The default value, ‘magit-builtin-completing-read’, is suitable for
-     the standard completion mechanism, ‘ivy-mode’, and ‘helm-mode’ at
-     least.
-
-     The built-in ‘completing-read’ and ‘completing-read-default’ are
-     *not* suitable to be used here.  ‘magit-builtin-completing-read’
-     performs some additional work, and any function used in its place
-     has to do the same.
-
- -- Function: magit-builtin-completing-read prompt choices &optional
-          predicate require-match initial-input hist def
-     This function performs completion using the built-in
-     ‘completing-read’ and does some additional magit-specific work.
-
- -- Function: magit-ido-completing-read prompt choices &optional
-          predicate require-match initial-input hist def
-     This function performs completion using ‘ido-completing-read+’ from
-     the package by the same name (which you have to explicitly install)
-     and does some additional magit-specific work.
-
-     We have to use ‘ido-completing-read+’ instead of the
-     ‘ido-completing-read’ that comes with Ido itself, because the
-     latter, while intended as a drop-in replacement, cannot serve that
-     purpose because it violates too many of the implicit conventions.
-
- -- Function: magit-completing-read prompt choices &optional predicate
-          require-match initial-input hist def fallback
-     This is the function that Magit commands use when they need the
-     user to select a single thing to act on.  The arguments have the
-     same meaning as for ‘completing-read’, except for FALLBACK, which
-     is unique to this function and is described below.
-
-     Instead of asking the user to choose from a list of possible
-     candidates, this function may just return the default specified by
-     DEF, with or without requiring user confirmation.  Whether that is
-     the case depends on PROMPT, ‘this-command’ and
-     ‘magit-dwim-selection’.  See the documentation of the latter for
-     more information.
-
-     If it does read a value in the minibuffer, then this function acts
-     similar to ‘completing-read’, except for the following:
-
-        • COLLECTION must be a list of choices.  A function is not
-          supported.
-
-        • If REQUIRE-MATCH is ‘nil’ and the user exits without a choice,
-          then ‘nil’ is returned instead of an empty string.
-
-        • If REQUIRE-MATCH is non-nil and the users exits without a
-          choice, an user-error is raised.
-
-        • FALLBACK specifies a secondary default that is only used if
-          the primary default DEF is ‘nil’.  The secondary default is
-          not subject to ‘magit-dwim-selection’ — if DEF is ‘nil’ but
-          FALLBACK is not, then this function always asks the user to
-          choose a candidate, just as if both defaults were ‘nil’.
-
-        • ‘format-prompt’ is called on PROMPT and DEF (or FALLBACK if
-          DEF is ‘nil’).  This appends ": " to the prompt and may also
-          add the default to the prompt, using the format specified by
-          ‘minibuffer-default-prompt-format’ and depending on
-          ‘magit-completing-read-default-prompt-predicate’.
-
-
-File: magit.info,  Node: Additional Completion Options,  Prev: Support for Completion Frameworks,  Up: Completion Confirmation and the Selection
-
-4.5.6 Additional Completion Options
------------------------------------
-
- -- User Option: magit-list-refs-sortby
-     For many commands that read a ref or refs from the user, the value
-     of this option can be used to control the order of the refs.  Valid
-     values include any key accepted by the ‘--sort’ flag of ‘git
-     for-each-ref’.  By default, refs are sorted alphabetically by their
-     full name (e.g., "refs/heads/master").
-
-
-File: magit.info,  Node: Mouse Support,  Next: Running Git,  Prev: Completion Confirmation and the Selection,  Up: Interface Concepts
-
-4.6 Mouse Support
-=================
-
-Double clicking on a section heading toggles the visibility of its body,
-if any.  Likewise clicking in the left fringe toggles the visibility of
-the appropriate section.
-
-   A context menu is provided but has to be enabled explicitly.  In
-Emacs 28 and greater, enable the global mode ‘context-menu-mode’.  If
-you use an older Emacs release, set
-‘magit-section-show-context-menu-for-emacs<28’.
-
-
-File: magit.info,  Node: Running Git,  Prev: Mouse Support,  Up: Interface Concepts
-
-4.7 Running Git
-===============
-
-* Menu:
-
-* Viewing Git Output::
-* Git Process Status::
-* Running Git Manually::
-* Git Executable::
-* Global Git Arguments::
-
-
-File: magit.info,  Node: Viewing Git Output,  Next: Git Process Status,  Up: Running Git
-
-4.7.1 Viewing Git Output
-------------------------
-
-Magit runs Git either for side-effects (e.g., when pushing) or to get
-some value (e.g., the name of the current branch).
-
-   When Git is run for side-effects, the process output is logged in a
-per-repository log buffer, which can be consulted using the
-‘magit-process’ command when things don’t go as expected.
-
-   The output/errors for up to ‘magit-process-log-max’ Git commands are
-retained.
-
-‘$’ (‘magit-process’)
-     This commands displays the process buffer for the current
-     repository.
-
-   Inside that buffer, the usual key bindings for navigating and showing
-sections are available.  There is one additional command.
-
-‘k’ (‘magit-process-kill’)
-     This command kills the process represented by the section at point.
-
- -- Variable: magit-git-debug
-     This option controls whether additional reporting of git errors is
-     enabled.
-
-     Magit basically calls git for one of these two reasons: for
-     side-effects or to do something with its standard output.
-
-     When git is run for side-effects then its output, including error
-     messages, go into the process buffer which is shown when using ‘$’.
-
-     When git’s output is consumed in some way, then it would be too
-     expensive to also insert it into this buffer, but when this option
-     is non-nil and git returns with a non-zero exit status, then at
-     least its standard error is inserted into this buffer.
-
-     This is only intended for debugging purposes.  Do not enable this
-     permanently, that would negatively affect performance.
-
-     This is only intended for debugging purposes.  Do not enable this
-     permanently, that would negatively affect performance.  Also note
-     that just because git exits with a non-zero exit status and prints
-     an error message that usually doesn’t mean that it is an error as
-     far as Magit is concerned, which is another reason we usually hide
-     these error messages.  Whether some error message is relevant in
-     the context of some unexpected behavior has to be judged on a case
-     by case basis.
-
-     The command ‘magit-toggle-git-debug’ changes the value of this
-     variable.
-
- -- Variable: magit-process-extreme-logging
-     This option controls whether ‘magit-process-file’ logs to the
-     ‘*Messages*’ buffer.
-
-     Only intended for temporary use when you try to figure out how
-     Magit uses Git behind the scene.  Output that normally goes to the
-     magit-process buffer continues to go there.  Not all output goes to
-     either of these two buffers.
-
-
-File: magit.info,  Node: Git Process Status,  Next: Running Git Manually,  Prev: Viewing Git Output,  Up: Running Git
-
-4.7.2 Git Process Status
-------------------------
-
-When a Git process is running for side-effects, Magit displays an
-indicator in the mode line, using the ‘magit-mode-line-process’ face.
-
-   If the Git process exits successfully, the process indicator is
-removed from the mode line immediately.
-
-   In the case of a Git error, the process indicator is not removed, but
-is instead highlighted with the ‘magit-mode-line-process-error’ face,
-and the error details from the process buffer are provided as a tooltip
-for mouse users.  This error indicator persists in the mode line until
-the next magit buffer refresh.
-
-   If you do not wish process errors to be indicated in the mode line,
-customize the ‘magit-process-display-mode-line-error’ user option.
-
-   Process errors are additionally indicated at the top of the status
-buffer.
-
-
-File: magit.info,  Node: Running Git Manually,  Next: Git Executable,  Prev: Git Process Status,  Up: Running Git
-
-4.7.3 Running Git Manually
---------------------------
-
-While Magit provides many Emacs commands to interact with Git, it does
-not cover everything.  In those cases your existing Git knowledge will
-come in handy.  Magit provides some commands for running arbitrary Git
-commands by typing them into the minibuffer, instead of having to switch
-to a shell.
-
-‘!’ (‘magit-run’)
-     This transient prefix command binds the following suffix commands
-     and displays them in a temporary buffer until a suffix is invoked.
-
-‘! !’ (‘magit-git-command-topdir’)
-     This command reads a command from the user and executes it in the
-     top-level directory of the current working tree.
-
-     The string "git " is used as initial input when prompting the user
-     for the command.  It can be removed to run another command.
-
-‘:’ (‘magit-git-command’)
-‘! p’
-     This command reads a command from the user and executes it in
-     ‘default-directory’.  With a prefix argument the command is
-     executed in the top-level directory of the current working tree
-     instead.
-
-     The string "git " is used as initial input when prompting the user
-     for the command.  It can be removed to run another command.
-
-‘! s’ (‘magit-shell-command-topdir’)
-     This command reads a command from the user and executes it in the
-     top-level directory of the current working tree.
-
-‘! S’ (‘magit-shell-command’)
-     This command reads a command from the user and executes it in
-     ‘default-directory’.  With a prefix argument the command is
-     executed in the top-level directory of the current working tree
-     instead.
-
- -- User Option: magit-shell-command-verbose-prompt
-     Whether the prompt, used by the above commands when reading a shell
-     command, shows the directory in which it will be run.
-
-   These suffix commands start external gui tools.
-
-‘! k’ (‘magit-run-gitk’)
-     This command runs ‘gitk’ in the current repository.
-
-‘! a’ (‘magit-run-gitk-all’)
-     This command runs ‘gitk --all’ in the current repository.
-
-‘! b’ (‘magit-run-gitk-branches’)
-     This command runs ‘gitk --branches’ in the current repository.
-
-‘! g’ (‘magit-run-git-gui’)
-     This command runs ‘git gui’ in the current repository.
-
-‘! m’ (‘magit-git-mergetool’)
-     This command runs ‘git mergetool --gui’ in the current repository.
-
-     With a prefix argument this acts as a transient prefix command,
-     allowing the user to select the mergetool and change some settings.
-
-
-File: magit.info,  Node: Git Executable,  Next: Global Git Arguments,  Prev: Running Git Manually,  Up: Running Git
-
-4.7.4 Git Executable
---------------------
-
-When Magit calls Git, then it may do so using the absolute path to the
-‘git’ executable, or using just its name.
-
-   When running ‘git’ locally and the ‘system-type’ is ‘windows-nt’ (any
-Windows version) or ‘darwin’ (macOS) then ‘magit-git-executable’ is set
-to an absolute path when Magit is loaded.
-
-   On Windows it is necessary to use an absolute path because Git comes
-with several wrapper scripts for the actual ‘git’ binary, which are also
-placed on ‘$PATH’, and using one of these wrappers instead of the binary
-would degrade performance horribly.  For some macOS users using just the
-name of the executable also performs horribly, so we avoid doing that on
-that platform as well.  On other platforms, using just the name seems to
-work just fine.
-
-   Using an absolute path when running ‘git’ on a remote machine over
-Tramp, would be problematic to use an absolute path that is suitable on
-the local machine, so a separate option is used to control the name or
-path that is used on remote machines.
-
- -- User Option: magit-git-executable
-     The ‘git’ executable used by Magit on the local host.  This should
-     be either the absolute path to the executable, or the string "git"
-     to let Emacs find the executable itself, using the standard
-     mechanism for doing such things.
-
- -- User Option: magit-remote-git-executable
-     The ‘git’ executable used by Magit on remote machines over Tramp.
-     Normally this should be just the string "git".  Consider
-     customizing ‘tramp-remote-path’ instead of this option.
-
-   If Emacs is unable to find the correct executable, then you can work
-around that by explicitly setting the value of one of these two options.
-Doing that should be considered a kludge; it is better to make sure that
-the order in ‘exec-path’ or ‘tramp-remote-path’ is correct.
-
-   Note that ‘exec-path’ is set based on the value of the ‘PATH’
-environment variable that is in effect when Emacs is started.  If you
-set ‘PATH’ in your shell’s init files, then that only has an effect on
-Emacs if you start it from that shell (because the environment of a
-process is only passed to its child processes, not to arbitrary other
-processes).  If that is not how you start Emacs, then the
-‘exec-path-from-shell’ package can help; though honestly I consider that
-a kludge too.
-
-   The command ‘magit-debug-git-executable’ can be useful to find out
-where Emacs is searching for ‘git’.
-
-‘M-x magit-debug-git-executable’
-     This command displays a buffer with information about
-     ‘magit-git-executable’ and ‘magit-remote-git-executable’.
-
-‘M-x magit-version’
-     This command shows the currently used versions of Magit, Git, and
-     Emacs in the echo area.  Non-interactively this just returns the
-     Magit version.
-
-
-File: magit.info,  Node: Global Git Arguments,  Prev: Git Executable,  Up: Running Git
-
-4.7.5 Global Git Arguments
---------------------------
-
- -- User Option: magit-git-global-arguments
-     The arguments set here are used every time the git executable is
-     run as a subprocess.  They are placed right after the executable
-     itself and before the git command - as in ‘git HERE... COMMAND
-     REST’.  For valid arguments see *note (gitman)git::.
-
-     Be careful what you add here, especially if you are using Tramp to
-     connect to servers with ancient Git versions.  Never remove
-     anything that is part of the default value, unless you really know
-     what you are doing.  And think very hard before adding something;
-     it will be used every time Magit runs Git for any purpose.
-
-
-File: magit.info,  Node: Inspecting,  Next: Manipulating,  Prev: Interface Concepts,  Up: Top
-
-5 Inspecting
-************
-
-The functionality provided by Magit can be roughly divided into three
-groups: inspecting existing data, manipulating existing data or adding
-new data, and transferring data.  Of course that is a rather crude
-distinction that often falls short, but it’s more useful than no
-distinction at all.  This section is concerned with inspecting data, the
-next two with manipulating and transferring it.  Then follows a section
-about miscellaneous functionality, which cannot easily be fit into this
-distinction.
-
-   Of course other distinctions make sense too, e.g., Git’s distinction
-between porcelain and plumbing commands, which for the most part is
-equivalent to Emacs’ distinction between interactive commands and
-non-interactive functions.  All of the sections mentioned before are
-mainly concerned with the porcelain – Magit’s plumbing layer is
-described later.
-
-* Menu:
-
-* Status Buffer::
-* Repository List::
-* Logging::
-* Diffing::
-* Ediffing::
-* References Buffer::
-* Bisecting::
-* Visiting Files and Blobs::
-* Blaming::
-
-
-File: magit.info,  Node: Status Buffer,  Next: Repository List,  Up: Inspecting
-
-5.1 Status Buffer
-=================
-
-While other Magit buffers contain, e.g., one particular diff or one
-particular log, the status buffer contains the diffs for staged and
-unstaged changes, logs for unpushed and unpulled commits, lists of
-stashes and untracked files, and information related to the current
-branch.
-
-   During certain incomplete operations – for example when a merge
-resulted in a conflict – additional information is displayed that helps
-proceeding with or aborting the operation.
-
-   The command ‘magit-status’ displays the status buffer belonging to
-the current repository in another window.  This command is used so often
-that it should be bound globally.  We recommend using ‘C-x g’:
-
-     (global-set-key (kbd "C-x g") 'magit-status)
-
-‘C-x g’ (‘magit-status’)
-     When invoked from within an existing Git repository, then this
-     command shows the status of that repository in a buffer.
-
-     If the current directory isn’t located within a Git repository,
-     then this command prompts for an existing repository or an
-     arbitrary directory, depending on the option
-     ‘magit-repository-directories’, and the status for the selected
-     repository is shown instead.
-
-        • If that option specifies any existing repositories, then the
-          user is asked to select one of them.
-
-        • Otherwise the user is asked to select an arbitrary directory
-          using regular file-name completion.  If the selected directory
-          is the top-level directory of an existing working tree, then
-          the status buffer for that is shown.
-
-        • Otherwise the user is offered to initialize the selected
-          directory as a new repository.  After creating the repository
-          its status buffer is shown.
-
-     These fallback behaviors can also be forced using one or more
-     prefix arguments:
-
-        • With two prefix arguments (or more precisely a numeric prefix
-          value of 16 or greater) an arbitrary directory is read, which
-          is then acted on as described above.  The same could be
-          accomplished using the command ‘magit-init’.
-
-        • With a single prefix argument an existing repository is read
-          from the user, or if no repository can be found based on the
-          value of ‘magit-repository-directories’, then the behavior is
-          the same as with two prefix arguments.
-
- -- User Option: magit-repository-directories
-     List of directories that are Git repositories or contain Git
-     repositories.
-
-     Each element has the form ‘(DIRECTORY . DEPTH)’.  DIRECTORY has to
-     be a directory or a directory file-name, a string.  DEPTH, an
-     integer, specifies the maximum depth to look for Git repositories.
-     If it is 0, then only add DIRECTORY itself.
-
-     This option controls which repositories are being listed by
-     ‘magit-list-repositories’.  It also affects ‘magit-status’ (which
-     see) in potentially surprising ways (see above).
-
- -- Command: magit-status-quick
-     This command is an alternative to ‘magit-status’ that usually
-     avoids refreshing the status buffer.
-
-     If the status buffer of the current Git repository exists but isn’t
-     being displayed in the selected frame, then it is displayed without
-     being refreshed.
-
-     If the status buffer is being displayed in the selected frame, then
-     this command refreshes it.
-
-     Prefix arguments have the same meaning as for ‘magit-status’, and
-     additionally cause the buffer to be refresh.
-
-     To use this command add this to your init file:
-
-          (global-set-key (kbd "C-x g") 'magit-status-quick).
-
-     If you do that and then for once want to redisplay the buffer and
-     also immediately refresh it, then type ‘C-x g’ followed by ‘g’.
-
-     A possible alternative command is
-     ‘magit-display-repository-buffer’.  It supports displaying any
-     existing Magit buffer that belongs to the current repository; not
-     just the status buffer.
-
- -- Command: ido-enter-magit-status
-     From an Ido prompt used to open a file, instead drop into
-     ‘magit-status’.  This is similar to ‘ido-magic-delete-char’, which,
-     despite its name, usually causes a Dired buffer to be created.
-
-     To make this command available, use something like:
-
-          (add-hook 'ido-setup-hook
-                    (lambda ()
-                      (define-key ido-completion-map
-                        (kbd \"C-x g\") 'ido-enter-magit-status)))
-
-     Starting with Emacs 25.1 the Ido keymaps are defined just once
-     instead of every time Ido is invoked, so now you can modify it like
-     pretty much every other keymap:
-
-          (define-key ido-common-completion-map
-            (kbd \"C-x g\") 'ido-enter-magit-status)
-
-* Menu:
-
-* Status Sections::
-* Status Header Sections::
-* Status Module Sections::
-* Status Options::
-
-
-File: magit.info,  Node: Status Sections,  Next: Status Header Sections,  Up: Status Buffer
-
-5.1.1 Status Sections
----------------------
-
-The contents of status buffers is controlled using the hook
-‘magit-status-sections-hook’.  See *note Section Hooks:: to learn about
-such hooks and how to customize them.
-
- -- User Option: magit-status-sections-hook
-     Hook run to insert sections into a status buffer.
-
-   The first function on that hook by default is
-‘magit-insert-status-headers’; it is described in the next section.  By
-default the following functions are also members of that hook:
-
- -- Function: magit-insert-merge-log
-     Insert section for the on-going merge.  Display the heads that are
-     being merged.  If no merge is in progress, do nothing.
-
- -- Function: magit-insert-rebase-sequence
-     Insert section for the on-going rebase sequence.  If no such
-     sequence is in progress, do nothing.
-
- -- Function: magit-insert-am-sequence
-     Insert section for the on-going patch applying sequence.  If no
-     such sequence is in progress, do nothing.
-
- -- Function: magit-insert-sequencer-sequence
-     Insert section for the on-going cherry-pick or revert sequence.  If
-     no such sequence is in progress, do nothing.
-
- -- Function: magit-insert-bisect-output
-     While bisecting, insert section with output from ‘git bisect’.
-
- -- Function: magit-insert-bisect-rest
-     While bisecting, insert section visualizing the bisect state.
-
- -- Function: magit-insert-bisect-log
-     While bisecting, insert section logging bisect progress.
-
- -- Function: magit-insert-untracked-files
-     Maybe insert a list or tree of untracked files.
-
-     Do so depending on the value of ‘status.showUntrackedFiles’.  Note
-     that even if the value is ‘all’, Magit still initially only shows
-     directories.  But the directory sections can then be expanded using
-     ‘TAB’.
-
- -- Function: magit-insert-unstaged-changes
-     Insert section showing unstaged changes.
-
- -- Function: magit-insert-staged-changes
-     Insert section showing staged changes.
-
- -- Function: magit-insert-stashes &optional ref heading
-     Insert the ‘stashes’ section showing reflog for "refs/stash".  If
-     optional REF is non-nil show reflog for that instead.  If optional
-     HEADING is non-nil use that as section heading instead of
-     "Stashes:".
-
- -- Function: magit-insert-unpulled-from-upstream
-     Insert section showing commits that haven’t been pulled from the
-     upstream branch yet.
-
- -- Function: magit-insert-unpulled-from-pushremote
-     Insert section showing commits that haven’t been pulled from the
-     push-remote branch yet.
-
- -- Function: magit-insert-unpushed-to-upstream
-     Insert section showing commits that haven’t been pushed to the
-     upstream yet.
-
- -- Function: magit-insert-unpushed-to-pushremote
-     Insert section showing commits that haven’t been pushed to the
-     push-remote yet.
-
-   The following functions can also be added to the above hook:
-
- -- Function: magit-insert-tracked-files
-     Insert a tree of tracked files.
-
- -- Function: magit-insert-ignored-files
-     Insert a tree of ignored files.  Its possible to limit the logs in
-     the current buffer to a certain directory using ‘D = f <DIRECTORY>
-     RET g’.  If you do that, then that that also affects this command.
-
-     The log filter can be used to limit to multiple files.  In that
-     case this function only respects the first of the files and only if
-     it is a directory.
-
- -- Function: magit-insert-skip-worktree-files
-     Insert a tree of skip-worktree files.  If the first element of
-     ‘magit-buffer-diff-files’ is a directory, then limit the list to
-     files below that.  The value of that variable can be set using ‘D
-     -- DIRECTORY RET g’.
-
- -- Function: magit-insert-assumed-unchanged-files
-     Insert a tree of files that are assumed to be unchanged.  If the
-     first element of ‘magit-buffer-diff-files’ is a directory, then
-     limit the list to files below that.  The value of that variable can
-     be set using ‘D -- DIRECTORY RET g’.
-
- -- Function: magit-insert-unpulled-or-recent-commits
-     Insert section showing unpulled or recent commits.  If an upstream
-     is configured for the current branch and it is ahead of the current
-     branch, then show the missing commits.  Otherwise, show the last
-     ‘magit-log-section-commit-count’ commits.
-
- -- Function: magit-insert-recent-commits
-     Insert section showing the last ‘magit-log-section-commit-count’
-     commits.
-
- -- User Option: magit-log-section-commit-count
-     How many recent commits ‘magit-insert-recent-commits’ and
-     ‘magit-insert-unpulled-or-recent-commits’ (provided there are no
-     unpulled commits) show.
-
- -- Function: magit-insert-unpulled-cherries
-     Insert section showing unpulled commits.  Like
-     ‘magit-insert-unpulled-commits’ but prefix each commit that has not
-     been applied yet (i.e., a commit with a patch-id not shared with
-     any local commit) with "+", and all others with "-".
-
- -- Function: magit-insert-unpushed-cherries
-     Insert section showing unpushed commits.  Like
-     ‘magit-insert-unpushed-commits’ but prefix each commit which has
-     not been applied to upstream yet (i.e., a commit with a patch-id
-     not shared with any upstream commit) with "+" and all others with
-     "-".
-
-   See *note References Buffer:: for some more section inserters, which
-could be used here.
-
-
-File: magit.info,  Node: Status Header Sections,  Next: Status Module Sections,  Prev: Status Sections,  Up: Status Buffer
-
-5.1.2 Status Header Sections
-----------------------------
-
-The contents of status buffers is controlled using the hook
-‘magit-status-sections-hook’ (see *note Status Sections::).
-
-   By default ‘magit-insert-status-headers’ is the first member of that
-hook variable.
-
- -- Function: magit-insert-status-headers
-     Insert headers sections appropriate for ‘magit-status-mode’
-     buffers.  The sections are inserted by running the functions on the
-     hook ‘magit-status-headers-hook’.
-
- -- User Option: magit-status-headers-hook
-     Hook run to insert headers sections into the status buffer.
-
-     This hook is run by ‘magit-insert-status-headers’, which in turn
-     has to be a member of ‘magit-status-sections-hook’ to be used at
-     all.
-
-   By default the following functions are members of the above hook:
-
- -- Function: magit-insert-error-header
-     Insert a header line showing the message about the Git error that
-     just occurred.
-
-     This function is only aware of the last error that occur when Git
-     was run for side-effects.  If, for example, an error occurs while
-     generating a diff, then that error won’t be inserted.  Refreshing
-     the status buffer causes this section to disappear again.
-
- -- Function: magit-insert-diff-filter-header
-     Insert a header line showing the effective diff filters.
-
- -- Function: magit-insert-head-branch-header
-     Insert a header line about the current branch or detached ‘HEAD’.
-
- -- Function: magit-insert-upstream-branch-header
-     Insert a header line about the branch that is usually pulled into
-     the current branch.
-
- -- Function: magit-insert-push-branch-header
-     Insert a header line about the branch that the current branch is
-     usually pushed to.
-
- -- Function: magit-insert-tags-header
-     Insert a header line about the current and/or next tag, along with
-     the number of commits between the tag and ‘HEAD’.
-
-   The following functions can also be added to the above hook:
-
- -- Function: magit-insert-repo-header
-     Insert a header line showing the path to the repository top-level.
-
- -- Function: magit-insert-remote-header
-     Insert a header line about the remote of the current branch.
-
-     If no remote is configured for the current branch, then fall back
-     showing the "origin" remote, or if that does not exist the first
-     remote in alphabetic order.
-
- -- Function: magit-insert-user-header
-     Insert a header line about the current user.
-
-
-File: magit.info,  Node: Status Module Sections,  Next: Status Options,  Prev: Status Header Sections,  Up: Status Buffer
-
-5.1.3 Status Module Sections
-----------------------------
-
-The contents of status buffers is controlled using the hook
-‘magit-status-sections-hook’ (see *note Status Sections::).
-
-   By default ‘magit-insert-modules’ is _not_ a member of that hook
-variable.
-
- -- Function: magit-insert-modules
-     Insert submodule sections.
-
-     Hook ‘magit-module-sections-hook’ controls which module sections
-     are inserted, and option ‘magit-module-sections-nested’ controls
-     whether they are wrapped in an additional section.
-
- -- User Option: magit-module-sections-hook
-     Hook run by ‘magit-insert-modules’.
-
- -- User Option: magit-module-sections-nested
-     This option controls whether ‘magit-insert-modules’ wraps inserted
-     sections in an additional section.
-
-     If this is non-nil, then only a single top-level section is
-     inserted.  If it is nil, then all sections listed in
-     ‘magit-module-sections-hook’ become top-level sections.
-
- -- Function: magit-insert-modules-overview
-     Insert sections for all submodules.  For each section insert the
-     path, the branch, and the output of ‘git describe --tags’, or,
-     failing that, the abbreviated HEAD commit hash.
-
-     Press ‘RET’ on such a submodule section to show its own status
-     buffer.  Press ‘RET’ on the "Modules" section to display a list of
-     submodules in a separate buffer.  This shows additional information
-     not displayed in the super-repository’s status buffer.
-
- -- Function: magit-insert-modules-unpulled-from-upstream
-     Insert sections for modules that haven’t been pulled from the
-     upstream yet.  These sections can be expanded to show the
-     respective commits.
-
- -- Function: magit-insert-modules-unpulled-from-pushremote
-     Insert sections for modules that haven’t been pulled from the
-     push-remote yet.  These sections can be expanded to show the
-     respective commits.
-
- -- Function: magit-insert-modules-unpushed-to-upstream
-     Insert sections for modules that haven’t been pushed to the
-     upstream yet.  These sections can be expanded to show the
-     respective commits.
-
- -- Function: magit-insert-modules-unpushed-to-pushremote
-     Insert sections for modules that haven’t been pushed to the
-     push-remote yet.  These sections can be expanded to show the
-     respective commits.
-
-
-File: magit.info,  Node: Status Options,  Prev: Status Module Sections,  Up: Status Buffer
-
-5.1.4 Status Options
---------------------
-
- -- User Option: magit-status-margin
-     This option specifies whether the margin is initially shown in
-     Magit-Status mode buffers and how it is formatted.
-
-     The value has the form ‘(INIT STYLE WIDTH AUTHOR AUTHOR-WIDTH)’.
-
-        • If INIT is non-nil, then the margin is shown initially.
-        • STYLE controls how to format the author or committer date.  It
-          can be one of ‘age’ (to show the age of the commit),
-          ‘age-abbreviated’ (to abbreviate the time unit to a
-          character), or a string (suitable for ‘format-time-string’) to
-          show the actual date.  Option
-          ‘magit-log-margin-show-committer-date’ controls which date is
-          being displayed.
-        • WIDTH controls the width of the margin.  This exists for
-          forward compatibility and currently the value should not be
-          changed.
-        • AUTHOR controls whether the name of the author is also shown
-          by default.
-        • AUTHOR-WIDTH has to be an integer.  When the name of the
-          author is shown, then this specifies how much space is used to
-          do so.
-
-   Also see the proceeding section for more options concerning status
-buffers.
-
-
-File: magit.info,  Node: Repository List,  Next: Logging,  Prev: Status Buffer,  Up: Inspecting
-
-5.2 Repository List
-===================
-
- -- Command: magit-list-repositories
-     This command displays a list of repositories in a separate buffer.
-
-     The option ‘magit-repository-directories’ controls which
-     repositories are displayed.
-
- -- User Option: magit-repolist-columns
-     This option controls what columns are displayed by the command
-     ‘magit-list-repositories’ and how they are displayed.
-
-     Each element has the form ‘(HEADER WIDTH FORMAT PROPS)’.
-
-     HEADER is the string displayed in the header.  WIDTH is the width
-     of the column.  FORMAT is a function that is called with one
-     argument, the repository identification (usually its basename), and
-     with ‘default-directory’ bound to the toplevel of its working tree.
-     It has to return a string to be inserted or nil.  PROPS is an alist
-     that supports the keys ‘:right-align’, ‘:pad-right’ and ‘:sort’.
-
-     The ‘:sort’ function has a weird interface described in the
-     docstring of ‘tabulated-list--get-sort’.  Alternatively ‘<’ and
-     ‘magit-repolist-version<’ can be used as those functions are
-     automatically replaced with functions that satisfy the interface.
-     Set ‘:sort’ to ‘nil’ to inhibit sorting; if unspecified, then the
-     column is sortable using the default sorter.
-
-     You may wish to display a range of numeric columns using just one
-     character per column and without any padding between columns, in
-     which case you should use an appropriate HEADER, set WIDTH to 1,
-     and set ‘:pad-right’ to 9.  ‘+’ is substituted for numbers higher
-     than 9.
-
-The following functions can be added to the above option:
-
- -- Function: magit-repolist-column-ident
-     This function inserts the identification of the repository.
-     Usually this is just its basename.
-
- -- Function: magit-repolist-column-path
-     This function inserts the absolute path of the repository.
-
- -- Function: magit-repolist-column-version
-     This function inserts a description of the repository’s ‘HEAD’
-     revision.
-
- -- Function: magit-repolist-column-branch
-     This function inserts the name of the current branch.
-
- -- Function: magit-repolist-column-upstream
-     This function inserts the name of the upstream branch of the
-     current branch.
-
- -- Function: magit-repolist-column-branches
-     This function inserts the number of branches.
-
- -- Function: magit-repolist-column-stashes
-     This function inserts the number of stashes.
-
- -- Function: magit-repolist-column-flag
-     This function inserts a flag as specified by
-     ‘magit-repolist-column-flag-alist’.
-
-     By default this indicates whether there are uncommitted changes.
-
-        • ‘N’ if there is at least one untracked file.
-        • ‘U’ if there is at least one unstaged file.
-        • ‘S’ if there is at least one staged file.
-
-     Only the first one of these that applies is shown.
-
- -- Function: magit-repolist-column-flags
-     This functions insert all flags as specified by
-     ‘magit-repolist-column-flag-alist’.
-
-     This is an alternative to function ‘magit-repolist-column-flag’,
-     which only lists the first one found.
-
- -- Function: magit-repolist-column-unpulled-from-upstream
-     This function inserts the number of upstream commits not in the
-     current branch.
-
- -- Function: magit-repolist-column-unpulled-from-pushremote
-     This function inserts the number of commits in the push branch but
-     not the current branch.
-
- -- Function: magit-repolist-column-unpushed-to-upstream
-     This function inserts the number of commits in the current branch
-     but not its upstream.
-
- -- Function: magit-repolist-column-unpushed-to-pushremote
-     This function inserts the number of commits in the current branch
-     but not its push branch.
-
-The following commands are available in repolist buffers:
-
-‘<RET>’ (‘magit-repolist-status’)
-     This command shows the status for the repository at point.
-
-‘m’ (‘magit-repolist-mark’)
-     This command marks the repository at point.
-
-‘u’ (‘magit-repolist-unmark’)
-     This command unmarks the repository at point.
-
-‘f’ (‘magit-repolist-fetch’)
-     This command fetches all marked repositories.  If no repositories
-     are marked, then it offers to fetch all displayed repositories.
-
-‘5’ (‘magit-repolist-find-file-other-frame’)
-     This command reads a relative file-name (without completion) and
-     opens the respective file in each marked repository in a new frame.
-     If no repositories are marked, then it offers to do this for all
-     displayed repositories.
-
-
-File: magit.info,  Node: Logging,  Next: Diffing,  Prev: Repository List,  Up: Inspecting
-
-5.3 Logging
-===========
-
-The status buffer contains logs for the unpushed and unpulled commits,
-but that obviously isn’t enough.  The transient prefix command
-‘magit-log’, on ‘l’, features several suffix commands, which show a
-specific log in a separate log buffer.
-
-   Like other transient prefix commands, ‘magit-log’ also features
-several infix arguments that can be changed before invoking one of the
-suffix commands.  However, in the case of the log transient, these
-arguments may be taken from those currently in use in the current
-repository’s log buffer, depending on the value of
-‘magit-prefix-use-buffer-arguments’ (see *note Transient Arguments and
-Buffer Variables::).
-
-   For information about the various arguments, see *note
-(gitman)git-log::.  The switch ‘++order=VALUE’ is converted to one of
-‘--author-date-order’, ‘--date-order’, or ‘--topo-order’ before being
-passed to ‘git log’.
-
-   The log transient also features several reflog commands.  See *note
-Reflog::.
-
-‘l’ (‘magit-log’)
-     This transient prefix command binds the following suffix commands
-     along with the appropriate infix arguments and displays them in a
-     temporary buffer until a suffix is invoked.
-
-‘l l’ (‘magit-log-current’)
-     Show log for the current branch.  When ‘HEAD’ is detached or with a
-     prefix argument, show log for one or more revs read from the
-     minibuffer.
-
-‘l h’ (‘magit-log-head’)
-     Show log for ‘HEAD’.
-
-‘l u’ (‘magit-log-related’)
-     Show log for the current branch, its upstream and its push target.
-     When the upstream is a local branch, then also show its own
-     upstream.  When ‘HEAD’ is detached, then show log for that, the
-     previously checked out branch and its upstream and push-target.
-
-‘l o’ (‘magit-log-other’)
-     Show log for one or more revs read from the minibuffer.  The user
-     can input any revision or revisions separated by a space, or even
-     ranges, but only branches, tags, and a representation of the commit
-     at point are available as completion candidates.
-
-‘l L’ (‘magit-log-branches’)
-     Show log for all local branches and ‘HEAD’.
-
-‘l b’ (‘magit-log-all-branches’)
-     Show log for all local and remote branches and ‘HEAD’.
-
-‘l a’ (‘magit-log-all’)
-     Show log for all references and ‘HEAD’.
-
-   Two additional commands that show the log for the file or blob that
-is being visited in the current buffer exists, see *note Commands for
-Buffers Visiting Files::.  The command ‘magit-cherry’ also shows a log,
-see *note Cherries::.
-
-* Menu:
-
-* Refreshing Logs::
-* Log Buffer::
-* Log Margin::
-* Select from Log::
-* Reflog::
-* Cherries::
-
-
-File: magit.info,  Node: Refreshing Logs,  Next: Log Buffer,  Up: Logging
-
-5.3.1 Refreshing Logs
----------------------
-
-The transient prefix command ‘magit-log-refresh’, on ‘L’, can be used to
-change the log arguments used in the current buffer, without changing
-which log is shown.  This works in dedicated log buffers, but also in
-the status buffer.
-
-‘L’ (‘magit-log-refresh’)
-     This transient prefix command binds the following suffix commands
-     along with the appropriate infix arguments and displays them in a
-     temporary buffer until a suffix is invoked.
-
-‘L g’ (‘magit-log-refresh’)
-     This suffix command sets the local log arguments for the current
-     buffer.
-
-‘L s’ (‘magit-log-set-default-arguments’)
-     This suffix command sets the default log arguments for buffers of
-     the same type as that of the current buffer.  Other existing
-     buffers of the same type are not affected because their local
-     values have already been initialized.
-
-‘L w’ (‘magit-log-save-default-arguments’)
-     This suffix command sets the default log arguments for buffers of
-     the same type as that of the current buffer, and saves the value
-     for future sessions.  Other existing buffers of the same type are
-     not affected because their local values have already been
-     initialized.
-
-‘L L’ (‘magit-toggle-margin’)
-     Show or hide the margin.
-
-
-File: magit.info,  Node: Log Buffer,  Next: Log Margin,  Prev: Refreshing Logs,  Up: Logging
-
-5.3.2 Log Buffer
-----------------
-
-‘L’ (‘magit-log-refresh’)
-     This transient prefix command binds the following suffix commands
-     along with the appropriate infix arguments and displays them in a
-     temporary buffer until a suffix is invoked.
-
-     See *note Refreshing Logs::.
-
-‘q’ (‘magit-log-bury-buffer’)
-     Bury the current buffer or the revision buffer in the same frame.
-     Like ‘magit-mode-bury-buffer’ (which see) but with a negative
-     prefix argument instead bury the revision buffer, provided it is
-     displayed in the current frame.
-
-‘C-c C-b’ (‘magit-go-backward’)
-     Move backward in current buffer’s history.
-
-‘C-c C-f’ (‘magit-go-forward’)
-     Move forward in current buffer’s history.
-
-‘C-c C-n’ (‘magit-log-move-to-parent’)
-     Move to a parent of the current commit.  By default, this is the
-     first parent, but a numeric prefix can be used to specify another
-     parent.
-
-‘j’ (‘magit-log-move-to-revision’)
-     Read a revision and move to it in current log buffer.
-
-     If the chosen reference or revision isn’t being displayed in the
-     current log buffer, then inform the user about that and do nothing
-     else.
-
-     If invoked outside any log buffer, then display the log buffer of
-     the current repository first; creating it if necessary.
-
-‘<SPC>’ (‘magit-diff-show-or-scroll-up’)
-     Update the commit or diff buffer for the thing at point.
-
-     Either show the commit or stash at point in the appropriate buffer,
-     or if that buffer is already being displayed in the current frame
-     and contains information about that commit or stash, then instead
-     scroll the buffer up.  If there is no commit or stash at point,
-     then prompt for a commit.
-
-‘<DEL>’ (‘magit-diff-show-or-scroll-down’)
-     Update the commit or diff buffer for the thing at point.
-
-     Either show the commit or stash at point in the appropriate buffer,
-     or if that buffer is already being displayed in the current frame
-     and contains information about that commit or stash, then instead
-     scroll the buffer down.  If there is no commit or stash at point,
-     then prompt for a commit.
-
-‘=’ (‘magit-log-toggle-commit-limit’)
-     Toggle the number of commits the current log buffer is limited to.
-     If the number of commits is currently limited, then remove that
-     limit.  Otherwise set it to 256.
-
-‘+’ (‘magit-log-double-commit-limit’)
-     Double the number of commits the current log buffer is limited to.
-
-‘-’ (‘magit-log-half-commit-limit’)
-     Half the number of commits the current log buffer is limited to.
-
- -- User Option: magit-log-auto-more
-     Insert more log entries automatically when moving past the last
-     entry.  Only considered when moving past the last entry with
-     ‘magit-goto-*-section’ commands.
-
- -- User Option: magit-log-show-refname-after-summary
-     Whether to show the refnames after the commit summaries.  This is
-     useful if you use really long branch names.
-
- -- User Option: magit-log-show-color-graph-limit
-     When showing more commits than specified by this option, then the
-     ‘--color’ argument, if specified, is silently dropped.  This is
-     necessary because the ‘ansi-color’ library, which is used to turn
-     control sequences into faces, is just too slow.
-
- -- User Option: magit-log-show-signatures-limit
-     When showing more commits than specified by this option, then the
-     ‘--show-signature’ argument, if specified, is silently dropped.
-     This is necessary because checking the signature of a large number
-     of commits is just too slow.
-
-   Magit displays references in logs a bit differently from how Git does
-it.
-
-   Local branches are blue and remote branches are green.  Of course
-that depends on the used theme, as do the colors used for other types of
-references.  The current branch has a box around it, as do remote
-branches that are their respective remote’s ‘HEAD’ branch.
-
-   If a local branch and its push-target point at the same commit, then
-their names are combined to preserve space and to make that relationship
-visible.  For example:
-
-     origin/feature
-     [green][blue-]
-
-     instead of
-
-     feature origin/feature
-     [blue-] [green-------]
-
-   Also note that while the transient features the ‘--show-signature’
-argument, that won’t actually be used when enabled, because Magit
-defaults to use just one line per commit.  Instead the commit colorized
-to indicate the validity of the signed commit object, using the faces
-named ‘magit-signature-*’ (which see).
-
-   For a description of ‘magit-log-margin’ see *note Log Margin::.
-
-
-File: magit.info,  Node: Log Margin,  Next: Select from Log,  Prev: Log Buffer,  Up: Logging
-
-5.3.3 Log Margin
-----------------
-
-In buffers which show one or more logs, it is possible to show
-additional information about each commit in the margin.  The options
-used to configure the margin are named ‘magit-INFIX-margin’, where INFIX
-is the same as in the respective major-mode ‘magit-INFIX-mode’.  In
-regular log buffers that would be ‘magit-log-margin’.
-
- -- User Option: magit-log-margin
-     This option specifies whether the margin is initially shown in
-     Magit-Log mode buffers and how it is formatted.
-
-     The value has the form ‘(INIT STYLE WIDTH AUTHOR AUTHOR-WIDTH)’.
-
-        • If INIT is non-nil, then the margin is shown initially.
-        • STYLE controls how to format the author or committer date.  It
-          can be one of ‘age’ (to show the age of the commit),
-          ‘age-abbreviated’ (to abbreviate the time unit to a
-          character), or a string (suitable for ‘format-time-string’) to
-          show the actual date.  Option
-          ‘magit-log-margin-show-committer-date’ controls which date is
-          being displayed.
-        • WIDTH controls the width of the margin.  This exists for
-          forward compatibility and currently the value should not be
-          changed.
-        • AUTHOR controls whether the name of the author is also shown
-          by default.
-        • AUTHOR-WIDTH has to be an integer.  When the name of the
-          author is shown, then this specifies how much space is used to
-          do so.
-
-   You can change the STYLE and AUTHOR-WIDTH of all ‘magit-INFIX-margin’
-options to the same values by customizing ‘magit-log-margin’ *before*
-‘magit’ is loaded.  If you do that, then the respective values for the
-other options will default to what you have set for that variable.
-Likewise if you set INIT in ‘magit-log-margin’ to ‘nil’, then that is
-used in the default of all other options.  But setting it to ‘t’, i.e.
-re-enforcing the default for that option, does not carry to other
-options.
-
- -- User Option: magit-log-margin-show-committer-date
-     This option specifies whether to show the committer date in the
-     margin.  This option only controls whether the committer date is
-     displayed instead of the author date.  Whether some date is
-     displayed in the margin and whether the margin is displayed at all
-     is controlled by other options.
-
-‘L’ (‘magit-margin-settings’)
-     This transient prefix command binds the following suffix commands,
-     each of which changes the appearance of the margin in some way.
-
-   In some buffers that support the margin, ‘L’ is instead bound to
-‘magit-log-refresh’, but that transient features the same commands, and
-then some other unrelated commands.
-
-‘L L’ (‘magit-toggle-margin’)
-     This command shows or hides the margin.
-
-‘L l’ (‘magit-cycle-margin-style’)
-     This command cycles the style used for the margin.
-
-‘L d’ (‘magit-toggle-margin-details’)
-     This command shows or hides details in the margin.
-
-
-File: magit.info,  Node: Select from Log,  Next: Reflog,  Prev: Log Margin,  Up: Logging
-
-5.3.4 Select from Log
----------------------
-
-When the user has to select a recent commit that is reachable from
-‘HEAD’, using regular completion would be inconvenient (because most
-humans cannot remember hashes or "HEAD~5", at least not without double
-checking).  Instead a log buffer is used to select the commit, which has
-the advantage that commits are presented in order and with the commit
-message.
-
-   Such selection logs are used when selecting the beginning of a rebase
-and when selecting the commit to be squashed into.
-
-   In addition to the key bindings available in all log buffers, the
-following additional key bindings are available in selection log
-buffers:
-
-‘C-c C-c’ (‘magit-log-select-pick’)
-     Select the commit at point and act on it.  Call
-     ‘magit-log-select-pick-function’ with the selected commit as
-     argument.
-
-‘C-c C-k’ (‘magit-log-select-quit’)
-     Abort selecting a commit, don’t act on any commit.
-
- -- User Option: magit-log-select-margin
-     This option specifies whether the margin is initially shown in
-     Magit-Log-Select mode buffers and how it is formatted.
-
-     The value has the form ‘(INIT STYLE WIDTH AUTHOR AUTHOR-WIDTH)’.
-
-        • If INIT is non-nil, then the margin is shown initially.
-        • STYLE controls how to format the author or committer date.  It
-          can be one of ‘age’ (to show the age of the commit),
-          ‘age-abbreviated’ (to abbreviate the time unit to a
-          character), or a string (suitable for ‘format-time-string’) to
-          show the actual date.  Option
-          ‘magit-log-margin-show-committer-date’ controls which date is
-          being displayed.
-        • WIDTH controls the width of the margin.  This exists for
-          forward compatibility and currently the value should not be
-          changed.
-        • AUTHOR controls whether the name of the author is also shown
-          by default.
-        • AUTHOR-WIDTH has to be an integer.  When the name of the
-          author is shown, then this specifies how much space is used to
-          do so.
-
-
-File: magit.info,  Node: Reflog,  Next: Cherries,  Prev: Select from Log,  Up: Logging
-
-5.3.5 Reflog
-------------
-
-Also see *note (gitman)git-reflog::.
-
-   These reflog commands are available from the log transient.  See
-*note Logging::.
-
-‘l r’ (‘magit-reflog-current’)
-     Display the reflog of the current branch.
-
-‘l O’ (‘magit-reflog-other’)
-     Display the reflog of a branch or another ref.
-
-‘l H’ (‘magit-reflog-head’)
-     Display the ‘HEAD’ reflog.
-
- -- User Option: magit-reflog-margin
-     This option specifies whether the margin is initially shown in
-     Magit-Reflog mode buffers and how it is formatted.
-
-     The value has the form ‘(INIT STYLE WIDTH AUTHOR AUTHOR-WIDTH)’.
-
-        • If INIT is non-nil, then the margin is shown initially.
-        • STYLE controls how to format the author or committer date.  It
-          can be one of ‘age’ (to show the age of the commit),
-          ‘age-abbreviated’ (to abbreviate the time unit to a
-          character), or a string (suitable for ‘format-time-string’) to
-          show the actual date.  Option
-          ‘magit-log-margin-show-committer-date’ controls which date is
-          being displayed.
-        • WIDTH controls the width of the margin.  This exists for
-          forward compatibility and currently the value should not be
-          changed.
-        • AUTHOR controls whether the name of the author is also shown
-          by default.
-        • AUTHOR-WIDTH has to be an integer.  When the name of the
-          author is shown, then this specifies how much space is used to
-          do so.
-
-
-File: magit.info,  Node: Cherries,  Prev: Reflog,  Up: Logging
-
-5.3.6 Cherries
---------------
-
-Cherries are commits that haven’t been applied upstream (yet), and are
-usually visualized using a log.  Each commit is prefixed with ‘-’ if it
-has an equivalent in the upstream and ‘+’ if it does not, i.e., if it is
-a cherry.
-
-   The command ‘magit-cherry’ shows cherries for a single branch, but
-the references buffer (see *note References Buffer::) can show cherries
-for multiple "upstreams" at once.
-
-   Also see *note (gitman)git-reflog::.
-
-‘Y’ (‘magit-cherry’)
-     Show commits that are in a certain branch but that have not been
-     merged in the upstream branch.
-
- -- User Option: magit-cherry-margin
-     This option specifies whether the margin is initially shown in
-     Magit-Cherry mode buffers and how it is formatted.
-
-     The value has the form ‘(INIT STYLE WIDTH AUTHOR AUTHOR-WIDTH)’.
-
-        • If INIT is non-nil, then the margin is shown initially.
-        • STYLE controls how to format the author or committer date.  It
-          can be one of ‘age’ (to show the age of the commit),
-          ‘age-abbreviated’ (to abbreviate the time unit to a
-          character), or a string (suitable for ‘format-time-string’) to
-          show the actual date.  Option
-          ‘magit-log-margin-show-committer-date’ controls which date is
-          being displayed.
-        • WIDTH controls the width of the margin.  This exists for
-          forward compatibility and currently the value should not be
-          changed.
-        • AUTHOR controls whether the name of the author is also shown
-          by default.
-        • AUTHOR-WIDTH has to be an integer.  When the name of the
-          author is shown, then this specifies how much space is used to
-          do so.
-
-
-File: magit.info,  Node: Diffing,  Next: Ediffing,  Prev: Logging,  Up: Inspecting
-
-5.4 Diffing
-===========
-
-The status buffer contains diffs for the staged and unstaged commits,
-but that obviously isn’t enough.  The transient prefix command
-‘magit-diff’, on ‘d’, features several suffix commands, which show a
-specific diff in a separate diff buffer.
-
-   Like other transient prefix commands, ‘magit-diff’ also features
-several infix arguments that can be changed before invoking one of the
-suffix commands.  However, in the case of the diff transient, these
-arguments may be taken from those currently in use in the current
-repository’s diff buffer, depending on the value of
-‘magit-prefix-use-buffer-arguments’ (see *note Transient Arguments and
-Buffer Variables::).
-
-   Also see *note (gitman)git-diff::.
-
-‘d’ (‘magit-diff’)
-     This transient prefix command binds the following suffix commands
-     along with the appropriate infix arguments and displays them in a
-     temporary buffer until a suffix is invoked.
-
-‘d d’ (‘magit-diff-dwim’)
-     Show changes for the thing at point.
-
-‘d r’ (‘magit-diff-range’)
-     Show differences between two commits.
-
-     RANGE should be a range (A..B or A...B) but can also be a single
-     commit.  If one side of the range is omitted, then it defaults to
-     ‘HEAD’.  If just a commit is given, then changes in the working
-     tree relative to that commit are shown.
-
-     If the region is active, use the revisions on the first and last
-     line of the region.  With a prefix argument, instead of diffing the
-     revisions, choose a revision to view changes along, starting at the
-     common ancestor of both revisions (i.e., use a "..." range).
-
-‘d w’ (‘magit-diff-working-tree’)
-     Show changes between the current working tree and the ‘HEAD’
-     commit.  With a prefix argument show changes between the working
-     tree and a commit read from the minibuffer.
-
-‘d s’ (‘magit-diff-staged’)
-     Show changes between the index and the ‘HEAD’ commit.  With a
-     prefix argument show changes between the index and a commit read
-     from the minibuffer.
-
-‘d u’ (‘magit-diff-unstaged’)
-     Show changes between the working tree and the index.
-
-‘d p’ (‘magit-diff-paths’)
-     Show changes between any two files on disk.
-
-   All of the above suffix commands update the repository’s diff buffer.
-The diff transient also features two commands which show differences in
-another buffer:
-
-‘d c’ (‘magit-show-commit’)
-     Show the commit at point.  If there is no commit at point or with a
-     prefix argument, prompt for a commit.
-
-‘d t’ (‘magit-stash-show’)
-     Show all diffs of a stash in a buffer.
-
-   Two additional commands that show the diff for the file or blob that
-is being visited in the current buffer exists, see *note Commands for
-Buffers Visiting Files::.
-
-* Menu:
-
-* Refreshing Diffs::
-* Commands Available in Diffs::
-* Diff Options::
-* Revision Buffer::
-
-
-File: magit.info,  Node: Refreshing Diffs,  Next: Commands Available in Diffs,  Up: Diffing
-
-5.4.1 Refreshing Diffs
-----------------------
-
-The transient prefix command ‘magit-diff-refresh’, on ‘D’, can be used
-to change the diff arguments used in the current buffer, without
-changing which diff is shown.  This works in dedicated diff buffers, but
-also in the status buffer.
-
-   (There is one exception; diff arguments cannot be changed in buffers
-created by ‘magit-merge-preview’ because the underlying Git command does
-not support these arguments.)
-
-‘D’ (‘magit-diff-refresh’)
-     This transient prefix command binds the following suffix commands
-     along with the appropriate infix arguments and displays them in a
-     temporary buffer until a suffix is invoked.
-
-‘D g’ (‘magit-diff-refresh’)
-     This suffix command sets the local diff arguments for the current
-     buffer.
-
-‘D s’ (‘magit-diff-set-default-arguments’)
-     This suffix command sets the default diff arguments for buffers of
-     the same type as that of the current buffer.  Other existing
-     buffers of the same type are not affected because their local
-     values have already been initialized.
-
-‘D w’ (‘magit-diff-save-default-arguments’)
-     This suffix command sets the default diff arguments for buffers of
-     the same type as that of the current buffer, and saves the value
-     for future sessions.  Other existing buffers of the same type are
-     not affected because their local values have already been
-     initialized.
-
-‘D t’ (‘magit-diff-toggle-refine-hunk’)
-     This command toggles hunk refinement on or off.
-
-‘D r’ (‘magit-diff-switch-range-type’)
-     This command converts the diff range type from "revA..revB" to
-     "revB...revA", or vice versa.
-
-‘D f’ (‘magit-diff-flip-revs’)
-     This command swaps revisions in the diff range from "revA..revB" to
-     "revB..revA", or vice versa.
-
-‘D F’ (‘magit-diff-toggle-file-filter’)
-     This command toggles the file restriction of the diffs in the
-     current buffer, allowing you to quickly switch between viewing all
-     the changes in the commit and the restricted subset.  As a special
-     case, when this command is called from a log buffer, it toggles the
-     file restriction in the repository’s revision buffer, which is
-     useful when you display a revision from a log buffer that is
-     restricted to a file or files.
-
-   In addition to the above transient, which allows changing any of the
-supported arguments, there also exist some commands that change only a
-particular argument.
-
-‘-’ (‘magit-diff-less-context’)
-     This command decreases the context for diff hunks by COUNT lines.
-
-‘+’ (‘magit-diff-more-context’)
-     This command increases the context for diff hunks by COUNT lines.
-
-‘0’ (‘magit-diff-default-context’)
-     This command resets the context for diff hunks to the default
-     height.
-
-   The following commands quickly change what diff is being displayed
-without having to using one of the diff transient.
-
-‘C-c C-d’ (‘magit-diff-while-committing’)
-     While committing, this command shows the changes that are about to
-     be committed.  While amending, invoking the command again toggles
-     between showing just the new changes or all the changes that will
-     be committed.
-
-     This binding is available in the diff buffer as well as the commit
-     message buffer.
-
-‘C-c C-b’ (‘magit-go-backward’)
-     This command moves backward in current buffer’s history.
-
-‘C-c C-f’ (‘magit-go-forward’)
-     This command moves forward in current buffer’s history.
-
-
-File: magit.info,  Node: Commands Available in Diffs,  Next: Diff Options,  Prev: Refreshing Diffs,  Up: Diffing
-
-5.4.2 Commands Available in Diffs
----------------------------------
-
-Some commands are only available if point is inside a diff.
-
-   ‘magit-diff-visit-file’ and related commands visit the appropriate
-version of the file that the diff at point is about.  Likewise
-‘magit-diff-visit-worktree-file’ and related commands visit the worktree
-version of the file that the diff at point is about.  See *note Visiting
-Files and Blobs from a Diff:: for more information and the key bindings.
-
-‘C-c C-t’ (‘magit-diff-trace-definition’)
-     This command shows a log for the definition at point.
-
- -- User Option: magit-log-trace-definition-function
-     The function specified by this option is used by
-     ‘magit-log-trace-definition’ to determine the function at point.
-     For major-modes that have special needs, you could set the local
-     value using the mode’s hook.
-
-‘C-c C-e’ (‘magit-diff-edit-hunk-commit’)
-     From a hunk, this command edits the respective commit and visits
-     the file.
-
-     First it visits the file being modified by the hunk at the correct
-     location using ‘magit-diff-visit-file’.  This actually visits a
-     blob.  When point is on a diff header, not within an individual
-     hunk, then this visits the blob the first hunk is about.
-
-     Then it invokes ‘magit-edit-line-commit’, which uses an interactive
-     rebase to make the commit editable, or if that is not possible
-     because the commit is not reachable from ‘HEAD’ by checking out
-     that commit directly.  This also causes the actual worktree file to
-     be visited.
-
-     Neither the blob nor the file buffer are killed when finishing the
-     rebase.  If that is undesirable, then it might be better to use
-     ‘magit-rebase-edit-commit’ instead of this command.
-
-‘j’ (‘magit-jump-to-diffstat-or-diff’)
-     This command jumps to the diffstat or diff.  When point is on a
-     file inside the diffstat section, then jump to the respective diff
-     section.  Otherwise, jump to the diffstat section or a child
-     thereof.
-
-   The next two commands are not specific to Magit-Diff mode (or and
-Magit buffer for that matter), but it might be worth pointing out that
-they are available here too.
-
-‘<SPC>’ (‘scroll-up’)
-     This command scrolls text upward.
-
-‘<DEL>’ (‘scroll-down’)
-     This command scrolls text downward.
-
-
-File: magit.info,  Node: Diff Options,  Next: Revision Buffer,  Prev: Commands Available in Diffs,  Up: Diffing
-
-5.4.3 Diff Options
-------------------
-
- -- User Option: magit-diff-refine-hunk
-     Whether to show word-granularity differences within diff hunks.
-
-        • ‘nil’ Never show fine differences.
-        • ‘t’ Show fine differences for the current diff hunk only.
-        • ‘all’ Show fine differences for all displayed diff hunks.
-
- -- User Option: magit-diff-refine-ignore-whitespace
-     Whether to ignore whitespace changes in word-granularity
-     differences.
-
- -- User Option: magit-diff-adjust-tab-width
-     Whether to adjust the width of tabs in diffs.
-
-     Determining the correct width can be expensive if it requires
-     opening large and/or many files, so the widths are cached in the
-     variable ‘magit-diff--tab-width-cache’.  Set that to nil to
-     invalidate the cache.
-
-        • ‘nil’ Never adjust tab width.  Use ‘tab-width’s value from the
-          Magit buffer itself instead.
-
-        • ‘t’ If the corresponding file-visiting buffer exits, then use
-          ‘tab-width’’s value from that buffer.  Doing this is cheap, so
-          this value is used even if a corresponding cache entry exists.
-
-        • ‘always’ If there is no such buffer, then temporarily visit
-          the file to determine the value.
-
-        • NUMBER Like ‘always’, but don’t visit files larger than NUMBER
-          bytes.
-
- -- User Option: magit-diff-paint-whitespace
-     Specify where to highlight whitespace errors.
-
-     See ‘magit-diff-highlight-trailing’,
-     ‘magit-diff-highlight-indentation’.  The symbol ‘t’ means in all
-     diffs, ‘status’ means only in the status buffer, and nil means
-     nowhere.
-
-        • ‘nil’ Never highlight whitespace errors.
-        • ‘t’ Highlight whitespace errors everywhere.
-        • ‘uncommitted’ Only highlight whitespace errors in diffs
-          showing uncommitted changes.  For backward compatibility
-          ‘status’ is treated as a synonym.
-
- -- User Option: magit-diff-paint-whitespace-lines
-     Specify in what kind of lines to highlight whitespace errors.
-
-        • ‘t’ Highlight only in added lines.
-        • ‘both’ Highlight in added and removed lines.
-        • ‘all’ Highlight in added, removed and context lines.
-
- -- User Option: magit-diff-highlight-trailing
-     Whether to highlight whitespace at the end of a line in diffs.
-     Used only when ‘magit-diff-paint-whitespace’ is non-nil.
-
- -- User Option: magit-diff-highlight-indentation
-     This option controls whether to highlight the indentation in case
-     it used the "wrong" indentation style.  Indentation is only
-     highlighted if ‘magit-diff-paint-whitespace’ is also non-nil.
-
-     The value is an alist of the form ‘((REGEXP . INDENT)...)’.  The
-     path to the current repository is matched against each element in
-     reverse order.  Therefore if a REGEXP matches, then earlier
-     elements are not tried.
-
-     If the used INDENT is ‘tabs’, highlight indentation with tabs.  If
-     INDENT is an integer, highlight indentation with at least that many
-     spaces.  Otherwise, highlight neither.
-
- -- User Option: magit-diff-hide-trailing-cr-characters
-     Whether to hide ^M characters at the end of a line in diffs.
-
- -- User Option: magit-diff-highlight-hunk-region-functions
-     This option specifies the functions used to highlight the
-     hunk-internal region.
-
-     ‘magit-diff-highlight-hunk-region-dim-outside’ overlays the outside
-     of the hunk internal selection with a face that causes the added
-     and removed lines to have the same background color as context
-     lines.  This function should not be removed from the value of this
-     option.
-
-     ‘magit-diff-highlight-hunk-region-using-overlays’ and
-     ‘magit-diff-highlight-hunk-region-using-underline’ emphasize the
-     region by placing delimiting horizontal lines before and after it.
-     Both of these functions have glitches which cannot be fixed due to
-     limitations of Emacs’ display engine.  For more information see
-     <https://github.com/magit/magit/issues/2758> ff.
-
-     Instead of, or in addition to, using delimiting horizontal lines,
-     to emphasize the boundaries, you may wish to emphasize the text
-     itself, using ‘magit-diff-highlight-hunk-region-using-face’.
-
-     In terminal frames it’s not possible to draw lines as the overlay
-     and underline variants normally do, so there they fall back to
-     calling the face function instead.
-
- -- User Option: magit-diff-unmarked-lines-keep-foreground
-     This option controls whether added and removed lines outside the
-     hunk-internal region only lose their distinct background color or
-     also the foreground color.  Whether the outside of the region is
-     dimmed at all depends on
-     ‘magit-diff-highlight-hunk-region-functions’.
-
- -- User Option: magit-diff-extra-stat-arguments
-     This option specifies additional arguments to be used alongside
-     ‘--stat’.
-
-     The value is a list of zero or more arguments or a function that
-     takes no argument and returns such a list.  These arguments are
-     allowed here: ‘--stat-width’, ‘--stat-name-width’,
-     ‘--stat-graph-width’ and ‘--compact-summary’.  Also see *note
-     (gitman)git-diff::.
-
-
-File: magit.info,  Node: Revision Buffer,  Prev: Diff Options,  Up: Diffing
-
-5.4.4 Revision Buffer
----------------------
-
- -- User Option: magit-revision-insert-related-refs
-     Whether to show related branches in revision buffers.
-
-        • ‘nil’ Don’t show any related branches.
-        • ‘t’ Show related local branches.
-        • ‘all’ Show related local and remote branches.
-        • ‘mixed’ Show all containing branches and local merged
-          branches.
-
- -- User Option: magit-revision-show-gravatars
-     Whether to show gravatar images in revision buffers.
-
-     If ‘nil’, then don’t insert any gravatar images.  If ‘t’, then
-     insert both images.  If ‘author’ or ‘committer’, then insert only
-     the respective image.
-
-     If you have customized the option ‘magit-revision-headers-format’
-     and want to insert the images then you might also have to specify
-     where to do so.  In that case the value has to be a cons-cell of
-     two regular expressions.  The car specifies where to insert the
-     author’s image.  The top half of the image is inserted right after
-     the matched text, the bottom half on the next line in the same
-     column.  The cdr specifies where to insert the committer’s image,
-     accordingly.  Either the car or the cdr may be nil."
-
- -- User Option: magit-revision-use-hash-sections
-     Whether to turn hashes inside the commit message into sections.
-
-     If non-nil, then hashes inside the commit message are turned into
-     ‘commit’ sections.  There is a trade off to be made between
-     performance and reliability:
-
-        • ‘slow’ calls git for every word to be absolutely sure.
-        • ‘quick’ skips words less than seven characters long.
-        • ‘quicker’ additionally skips words that don’t contain a
-          number.
-        • ‘quickest’ uses all words that are at least seven characters
-          long and which contain at least one number as well as at least
-          one letter.
-
-     If nil, then no hashes are turned into sections, but you can still
-     visit the commit at point using "RET".
-
-   The diffs shown in the revision buffer may be automatically
-restricted to a subset of the changed files.  If the revision buffer is
-displayed from a log buffer, the revision buffer will share the same
-file restriction as that log buffer (also see the command
-‘magit-diff-toggle-file-filter’).
-
- -- User Option: magit-revision-filter-files-on-follow
-     Whether showing a commit from a log buffer honors the log’s file
-     filter when the log arguments include ‘--follow’.
-
-     When this option is nil, displaying a commit from a log ignores the
-     log’s file filter if the log arguments include ‘--follow’.  Doing
-     so avoids showing an empty diff in revision buffers for commits
-     before a rename event.  In such cases, the ‘--patch’ argument of
-     the log transient can be used to show the file-restricted diffs
-     inline.
-
-     Set this option to non-nil to keep the log’s file restriction even
-     if ‘--follow’ is present in the log arguments.
-
-   If the revision buffer is not displayed from a log buffer, the file
-restriction is determined as usual (see *note Transient Arguments and
-Buffer Variables::).
-
-
-File: magit.info,  Node: Ediffing,  Next: References Buffer,  Prev: Diffing,  Up: Inspecting
-
-5.5 Ediffing
-============
-
-This section describes how to enter Ediff from Magit buffers.  For
-information on how to use Ediff itself, see *note (ediff)Top::.
-
-‘e’ (‘magit-ediff-dwim’)
-     Compare, stage, or resolve using Ediff.
-
-     This command tries to guess what file, and what commit or range the
-     user wants to compare, stage, or resolve using Ediff.  It might
-     only be able to guess either the file, or range/commit, in which
-     case the user is asked about the other.  It might not always guess
-     right, in which case the appropriate ‘magit-ediff-*’ command has to
-     be used explicitly.  If it cannot read the user’s mind at all, then
-     it asks the user for a command to run.
-
-‘E’ (‘magit-ediff’)
-     This transient prefix command binds the following suffix commands
-     and displays them in a temporary buffer until a suffix is invoked.
-
-‘E r’ (‘magit-ediff-compare’)
-     Compare two revisions of a file using Ediff.
-
-     If the region is active, use the revisions on the first and last
-     line of the region.  With a prefix argument, instead of diffing the
-     revisions, choose a revision to view changes along, starting at the
-     common ancestor of both revisions (i.e., use a "..." range).
-
-‘E m’ (‘magit-ediff-resolve-rest’)
-     This command allows you to resolve outstanding conflicts in the
-     file at point using Ediff.  If there is no file at point or if it
-     doesn’t have any unmerged changes, then this command prompts for a
-     file.
-
-     Provided that the value of ‘merge.conflictstyle’ is ‘diff3’, you
-     can view the file’s merge-base revision using ‘/’ in the Ediff
-     control buffer.
-
-     The A, B and Ancestor buffers are constructed from the conflict
-     markers in the worktree file.  Because you and/or Git may have
-     already resolved some conflicts, that means that these buffers may
-     not contain the actual versions from the respective blobs.
-
-‘E M’ (‘magit-ediff-resolve-all’)
-     This command allows you to resolve all conflicts in the file at
-     point using Ediff.  If there is no file at point or if it doesn’t
-     have any unmerged changes, then this command prompts for a file.
-
-     Provided that the value of ‘merge.conflictstyle’ is ‘diff3’, you
-     can view the file’s merge-base revision using ‘/’ in the Ediff
-     control buffer.
-
-     First the file in the worktree is moved aside, appending the suffix
-     ‘.ORIG’, so that you could later go back to that version.  Then it
-     is reconstructed from the two sides of the conflict and the
-     merge-base, if available.
-
-     It would be nice if the worktree file were just used as-is, but
-     Ediff does not support that.  This means that all conflicts, that
-     Git has already resolved, are restored.  On the other hand Ediff
-     also tries to resolve conflicts, and in many cases Ediff and Git
-     should produce similar results.
-
-     However if you have already resolved some conflicts manually, then
-     those changes are discarded (though you can recover them from the
-     backup file).  In such cases ‘magit-ediff-resolve-rest’ might be
-     more suitable.
-
-     The advantage that this command has over ‘magit-ediff-resolve-rest’
-     is that the A, B and Ancestor buffers correspond to blobs from the
-     respective commits, allowing you to inspect a side in context and
-     to use Magit commands in these buffers to do so.  Blame and log
-     commands are particularly useful here.
-
-‘E t’ (‘magit-git-mergetool’)
-     This command does not actually use Ediff.  While it serves the same
-     purpose as ‘magit-ediff-resolve-rest’, it uses ‘git mergetool
-     --gui’ to resolve conflicts.
-
-     With a prefix argument this acts as a transient prefix command,
-     allowing the user to select the mergetool and change some settings.
-
-‘E s’ (‘magit-ediff-stage’)
-     Stage and unstage changes to a file using Ediff, defaulting to the
-     file at point.
-
-‘E u’ (‘magit-ediff-show-unstaged’)
-     Show unstaged changes to a file using Ediff.
-
-‘E i’ (‘magit-ediff-show-staged’)
-     Show staged changes to a file using Ediff.
-
-‘E w’ (‘magit-ediff-show-working-tree’)
-     Show changes in a file between ‘HEAD’ and working tree using Ediff.
-
-‘E c’ (‘magit-ediff-show-commit’)
-     Show changes to a file introduced by a commit using Ediff.
-
-‘E z’ (‘magit-ediff-show-stash’)
-     Show changes to a file introduced by a stash using Ediff.
-
- -- User Option: magit-ediff-dwim-resolve-function
-     This option controls which function ‘magit-ediff-dwim’ uses to
-     resolve conflicts.  One of ‘magit-ediff-resolve-rest’,
-     ‘magit-ediff-resolve-all’ or ‘magit-git-mergetool’; which are all
-     discussed above.
-
- -- User Option: magit-ediff-dwim-show-on-hunks
-     This option controls what command ‘magit-ediff-dwim’ calls when
-     point is on uncommitted hunks.  When nil, always run
-     ‘magit-ediff-stage’.  Otherwise, use ‘magit-ediff-show-staged’ and
-     ‘magit-ediff-show-unstaged’ to show staged and unstaged changes,
-     respectively.
-
- -- User Option: magit-ediff-show-stash-with-index
-     This option controls whether ‘magit-ediff-show-stash’ includes a
-     buffer containing the file’s state in the index at the time the
-     stash was created.  This makes it possible to tell which changes in
-     the stash were staged.
-
- -- User Option: magit-ediff-quit-hook
-     This hook is run after quitting an Ediff session that was created
-     using a Magit command.  The hook functions are run inside the Ediff
-     control buffer, and should not change the current buffer.
-
-     This is similar to ‘ediff-quit-hook’ but takes the needs of Magit
-     into account.  The regular ‘ediff-quit-hook’ is ignored by Ediff
-     sessions that were created using a Magit command.
-
-
-File: magit.info,  Node: References Buffer,  Next: Bisecting,  Prev: Ediffing,  Up: Inspecting
-
-5.6 References Buffer
-=====================
-
-‘y’ (‘magit-show-refs’)
-     This command lists branches and tags in a dedicated buffer.
-
-     However if this command is invoked again from this buffer or if it
-     is invoked with a prefix argument, then it acts as a transient
-     prefix command, which binds the following suffix commands and some
-     infix arguments.
-
-   All of the following suffix commands list exactly the same branches
-and tags.  The only difference the optional feature that can be enabled
-by changing the value of ‘magit-refs-show-commit-count’ (see below).
-These commands specify a different branch or commit against which all
-the other references are compared.
-
-‘y y’ (‘magit-show-refs-head’)
-     This command lists branches and tags in a dedicated buffer.  Each
-     reference is being compared with ‘HEAD’.
-
-‘y c’ (‘magit-show-refs-current’)
-     This command lists branches and tags in a dedicated buffer.  Each
-     reference is being compared with the current branch or ‘HEAD’ if it
-     is detached.
-
-‘y o’ (‘magit-show-refs-other’)
-     This command lists branches and tags in a dedicated buffer.  Each
-     reference is being compared with a branch read from the user.
-
-‘y r’ (‘magit-refs-set-show-commit-count’)
-     This command changes for which refs the commit count is shown.
-
- -- User Option: magit-refs-show-commit-count
-     Whether to show commit counts in Magit-Refs mode buffers.
-
-        • ‘all’ Show counts for branches and tags.
-        • ‘branch’ Show counts for branches only.
-        • ‘nil’ Never show counts.
-
-     The default is ‘nil’ because anything else can be very expensive.
-
- -- User Option: magit-refs-pad-commit-counts
-     Whether to pad all commit counts on all sides in Magit-Refs mode
-     buffers.
-
-     If this is nil, then some commit counts are displayed right next to
-     one of the branches that appear next to the count, without any
-     space in between.  This might look bad if the branch name faces
-     look too similar to ‘magit-dimmed’.
-
-     If this is non-nil, then spaces are placed on both sides of all
-     commit counts.
-
- -- User Option: magit-refs-show-remote-prefix
-     Whether to show the remote prefix in lists of remote branches.
-
-     Showing the prefix is redundant because the name of the remote is
-     already shown in the heading preceding the list of its branches.
-
- -- User Option: magit-refs-primary-column-width
-     Width of the primary column in ‘magit-refs-mode’ buffers.  The
-     primary column is the column that contains the name of the branch
-     that the current row is about.
-
-     If this is an integer, then the column is that many columns wide.
-     Otherwise it has to be a cons-cell of two integers.  The first
-     specifies the minimal width, the second the maximal width.  In that
-     case the actual width is determined using the length of the names
-     of the shown local branches.  (Remote branches and tags are not
-     taken into account when calculating to optimal width.)
-
- -- User Option: magit-refs-focus-column-width
-     Width of the focus column in ‘magit-refs-mode’ buffers.
-
-     The focus column is the first column, which marks one branch
-     (usually the current branch) as the focused branch using ‘*’ or
-     ‘@’.  For each other reference, this column optionally shows how
-     many commits it is ahead of the focused branch and ‘<’, or if it
-     isn’t ahead then the commits it is behind and ‘>’, or if it isn’t
-     behind either, then a ‘=’.
-
-     This column may also display only ‘*’ or ‘@’ for the focused
-     branch, in which case this option is ignored.  Use ‘L v’ to change
-     the verbosity of this column.
-
- -- User Option: magit-refs-margin
-     This option specifies whether the margin is initially shown in
-     Magit-Refs mode buffers and how it is formatted.
-
-     The value has the form ‘(INIT STYLE WIDTH AUTHOR AUTHOR-WIDTH)’.
-
-        • If INIT is non-nil, then the margin is shown initially.
-        • STYLE controls how to format the author or committer date.  It
-          can be one of ‘age’ (to show the age of the commit),
-          ‘age-abbreviated’ (to abbreviate the time unit to a
-          character), or a string (suitable for ‘format-time-string’) to
-          show the actual date.  Option
-          ‘magit-log-margin-show-committer-date’ controls which date is
-          being displayed.
-        • WIDTH controls the width of the margin.  This exists for
-          forward compatibility and currently the value should not be
-          changed.
-        • AUTHOR controls whether the name of the author is also shown
-          by default.
-        • AUTHOR-WIDTH has to be an integer.  When the name of the
-          author is shown, then this specifies how much space is used to
-          do so.
-
- -- User Option: magit-refs-margin-for-tags
-     This option specifies whether to show information about tags in the
-     margin.  This is disabled by default because it is slow if there
-     are many tags.
-
-   The following variables control how individual refs are displayed.
-If you change one of these variables (especially the "%c" part), then
-you should also change the others to keep things aligned.  The following
-%-sequences are supported:
-
-   • ‘%a’ Number of commits this ref has over the one we compare to.
-   • ‘%b’ Number of commits the ref we compare to has over this one.
-   • ‘%c’ Number of commits this ref has over the one we compare to.
-     For the ref which all other refs are compared this is instead "@",
-     if it is the current branch, or "#" otherwise.
-   • ‘%C’ For the ref which all other refs are compared this is "@", if
-     it is the current branch, or "#" otherwise.  For all other refs "
-     ".
-   • ‘%h’ Hash of this ref’s tip.
-   • ‘%m’ Commit summary of the tip of this ref.
-   • ‘%n’ Name of this ref.
-   • ‘%u’ Upstream of this local branch.
-   • ‘%U’ Upstream of this local branch and additional local vs.
-     upstream information.
-
- -- User Option: magit-refs-filter-alist
-     The purpose of this option is to forgo displaying certain refs
-     based on their name.  If you want to not display any refs of a
-     certain type, then you should remove the appropriate function from
-     ‘magit-refs-sections-hook’ instead.
-
-     This alist controls which tags and branches are omitted from being
-     displayed in ‘magit-refs-mode’ buffers.  If it is ‘nil’, then all
-     refs are displayed (subject to ‘magit-refs-sections-hook’).
-
-     All keys are tried in order until one matches.  Then its value is
-     used and subsequent elements are ignored.  If the value is non-nil,
-     then the reference is displayed, otherwise it is not.  If no
-     element matches, then the reference is displayed.
-
-     A key can either be a regular expression that the refname has to
-     match, or a function that takes the refname as only argument and
-     returns a boolean.  A remote branch such as "origin/master" is
-     displayed as just "master", however for this comparison the former
-     is used.
-
-‘<RET>’ (‘magit-visit-ref’)
-     This command visits the reference or revision at point in another
-     buffer.  If there is no revision at point or with a prefix argument
-     then it prompts for a revision.
-
-     This command behaves just like ‘magit-show-commit’ as described
-     above, except if point is on a reference in a ‘magit-refs-mode’
-     buffer, in which case the behavior may be different, but only if
-     you have customized the option ‘magit-visit-ref-behavior’.
-
- -- User Option: magit-visit-ref-behavior
-     This option controls how ‘magit-visit-ref’ behaves in
-     ‘magit-refs-mode’ buffers.
-
-     By default ‘magit-visit-ref’ behaves like ‘magit-show-commit’, in
-     all buffers, including ‘magit-refs-mode’ buffers.  When the type of
-     the section at point is ‘commit’ then "RET" is bound to
-     ‘magit-show-commit’, and when the type is either ‘branch’ or ‘tag’
-     then it is bound to ‘magit-visit-ref’.
-
-     "RET" is one of Magit’s most essential keys and at least by default
-     it should behave consistently across all of Magit, especially
-     because users quickly learn that it does something very harmless;
-     it shows more information about the thing at point in another
-     buffer.
-
-     However "RET" used to behave differently in ‘magit-refs-mode’
-     buffers, doing surprising things, some of which cannot really be
-     described as "visit this thing".  If you’ve grown accustomed this
-     behavior, you can restore it by adding one or more of the below
-     symbols to the value of this option.  But keep in mind that by
-     doing so you don’t only introduce inconsistencies, you also lose
-     some functionality and might have to resort to ‘M-x
-     magit-show-commit’ to get it back.
-
-     ‘magit-visit-ref’ looks for these symbols in the order in which
-     they are described here.  If the presence of a symbol applies to
-     the current situation, then the symbols that follow do not affect
-     the outcome.
-
-        • ‘focus-on-ref’
-
-          With a prefix argument update the buffer to show commit counts
-          and lists of cherry commits relative to the reference at point
-          instead of relative to the current buffer or ‘HEAD’.
-
-          Instead of adding this symbol, consider pressing "C-u y o
-          RET".
-
-        • ‘create-branch’
-
-          If point is on a remote branch, then create a new local branch
-          with the same name, use the remote branch as its upstream, and
-          then check out the local branch.
-
-          Instead of adding this symbol, consider pressing "b c RET
-          RET", like you would do in other buffers.
-
-        • ‘checkout-any’
-
-          Check out the reference at point.  If that reference is a tag
-          or a remote branch, then this results in a detached ‘HEAD’.
-
-          Instead of adding this symbol, consider pressing "b b RET",
-          like you would do in other buffers.
-
-        • ‘checkout-branch’
-
-          Check out the local branch at point.
-
-          Instead of adding this symbol, consider pressing "b b RET",
-          like you would do in other buffers.
-
-* Menu:
-
-* References Sections::
-
-
-File: magit.info,  Node: References Sections,  Up: References Buffer
-
-5.6.1 References Sections
--------------------------
-
-The contents of references buffers is controlled using the hook
-‘magit-refs-sections-hook’.  See *note Section Hooks:: to learn about
-such hooks and how to customize them.  All of the below functions are
-members of the default value.  Note that it makes much less sense to
-customize this hook than it does for the respective hook used for the
-status buffer.
-
- -- User Option: magit-refs-sections-hook
-     Hook run to insert sections into a references buffer.
-
- -- Function: magit-insert-local-branches
-     Insert sections showing all local branches.
-
- -- Function: magit-insert-remote-branches
-     Insert sections showing all remote-tracking branches.
-
- -- Function: magit-insert-tags
-     Insert sections showing all tags.
-
-
-File: magit.info,  Node: Bisecting,  Next: Visiting Files and Blobs,  Prev: References Buffer,  Up: Inspecting
-
-5.7 Bisecting
-=============
-
-Also see *note (gitman)git-bisect::.
-
-‘B’ (‘magit-bisect’)
-     This transient prefix command binds the following suffix commands
-     and displays them in a temporary buffer until a suffix is invoked.
-
-   When bisecting is not in progress, then the transient features the
-following suffix commands.
-
-‘B B’ (‘magit-bisect-start’)
-     Start a bisect session.
-
-     Bisecting a bug means to find the commit that introduced it.  This
-     command starts such a bisect session by asking for a known good
-     commit and a known bad commit.  If you’re bisecting a change that
-     isn’t a regression, you can select alternate terms that are
-     conceptually more fitting than "bad" and "good", but the infix
-     arguments to do so are disabled by default.
-
-‘B s’ (‘magit-bisect-run’)
-     Bisect automatically by running commands after each step.
-
-   When bisecting in progress, then the transient instead features the
-following suffix commands.
-
-‘B b’ (‘magit-bisect-bad’)
-     Mark the current commit as bad.  Use this after you have asserted
-     that the commit does contain the bug in question.
-
-‘B g’ (‘magit-bisect-good’)
-     Mark the current commit as good.  Use this after you have asserted
-     that the commit does not contain the bug in question.
-
-‘B m’ (‘magit-bisect-mark’)
-     Mark the current commit with one of the bisect terms.  This command
-     provides an alternative to ‘magit-bisect-bad’ and
-     ‘magit-bisect-good’ and is useful when using terms other than "bad"
-     and "good".  This suffix is disabled by default.
-
-‘B k’ (‘magit-bisect-skip’)
-     Skip the current commit.  Use this if for some reason the current
-     commit is not a good one to test.  This command lets Git choose a
-     different one.
-
-‘B r’ (‘magit-bisect-reset’)
-     After bisecting, cleanup bisection state and return to original
-     ‘HEAD’.
-
-   By default the status buffer shows information about the ongoing
-bisect session.
-
- -- User Option: magit-bisect-show-graph
-     This option controls whether a graph is displayed for the log of
-     commits that still have to be bisected.
-
-
-File: magit.info,  Node: Visiting Files and Blobs,  Next: Blaming,  Prev: Bisecting,  Up: Inspecting
-
-5.8 Visiting Files and Blobs
-============================
-
-Magit provides several commands that visit a file or blob (the version
-of a file that is stored in a certain commit).  Actually it provides
-several *groups* of such commands and the several *variants* within each
-group.
-
-   Also see *note Commands for Buffers Visiting Files::.
-
-* Menu:
-
-* General-Purpose Visit Commands::
-* Visiting Files and Blobs from a Diff::
-
-
-File: magit.info,  Node: General-Purpose Visit Commands,  Next: Visiting Files and Blobs from a Diff,  Up: Visiting Files and Blobs
-
-5.8.1 General-Purpose Visit Commands
-------------------------------------
-
-These commands can be used anywhere to open any blob.  Currently no keys
-are bound to these commands by default, but that is likely to change.
-
- -- Command: magit-find-file
-     This command reads a filename and revision from the user and visits
-     the respective blob in a buffer.  The buffer is displayed in the
-     selected window.
-
- -- Command: magit-find-file-other-window
-     This command reads a filename and revision from the user and visits
-     the respective blob in a buffer.  The buffer is displayed in
-     another window.
-
- -- Command: magit-find-file-other-frame
-     This command reads a filename and revision from the user and visits
-     the respective blob in a buffer.  The buffer is displayed in
-     another frame.
-
-
-File: magit.info,  Node: Visiting Files and Blobs from a Diff,  Prev: General-Purpose Visit Commands,  Up: Visiting Files and Blobs
-
-5.8.2 Visiting Files and Blobs from a Diff
-------------------------------------------
-
-These commands can only be used when point is inside a diff.
-
-‘<RET>’ (‘magit-diff-visit-file’)
-     This command visits the appropriate version of the file that the
-     diff at point is about.
-
-     This commands visits the worktree version of the appropriate file.
-     The location of point inside the diff determines which file is
-     being visited.  The visited version depends on what changes the
-     diff is about.
-
-       1. If the diff shows uncommitted changes (i.e., staged or
-          unstaged changes), then visit the file in the working tree
-          (i.e., the same "real" file that ‘find-file’ would visit.  In
-          all other cases visit a "blob" (i.e., the version of a file as
-          stored in some commit).
-
-       2. If point is on a removed line, then visit the blob for the
-          first parent of the commit that removed that line, i.e., the
-          last commit where that line still exists.
-
-       3. If point is on an added or context line, then visit the blob
-          that adds that line, or if the diff shows from more than a
-          single commit, then visit the blob from the last of these
-          commits.
-
-     In the file-visiting buffer this command goes to the line that
-     corresponds to the line that point is on in the diff.
-
-     The buffer is displayed in the selected window.  With a prefix
-     argument the buffer is displayed in another window instead.
-
- -- User Option: magit-diff-visit-previous-blob
-     This option controls whether ‘magit-diff-visit-file’ may visit the
-     previous blob.  When this is ‘t’ (the default) and point is on a
-     removed line in a diff for a committed change, then
-     ‘magit-diff-visit-file’ visits the blob from the last revision
-     which still had that line.
-
-     Currently this is only supported for committed changes, for staged
-     and unstaged changes ‘magit-diff-visit-file’ always visits the file
-     in the working tree.
-
-‘C-<return>’ (‘magit-diff-visit-file-worktree’)
-     This command visits the worktree version of the appropriate file.
-     The location of point inside the diff determines which file is
-     being visited.  Unlike ‘magit-diff-visit-file’ it always visits the
-     "real" file in the working tree, i.e the "current version" of the
-     file.
-
-     In the file-visiting buffer this command goes to the line that
-     corresponds to the line that point is on in the diff.  Lines that
-     were added or removed in the working tree, the index and other
-     commits in between are automatically accounted for.
-
-     The buffer is displayed in the selected window.  With a prefix
-     argument the buffer is displayed in another window instead.
-
-   Variants of the above two commands exist that instead visit the file
-in another window or in another frame.  If you prefer such behavior,
-then you may want to change the above key bindings, but note that the
-above commands also use another window when invoked with a prefix
-argument.
-
- -- Command: magit-diff-visit-file-other-window
- -- Command: magit-diff-visit-file-other-frame
- -- Command: magit-diff-visit-worktree-file-other-window
- -- Command: magit-diff-visit-worktree-file-other-frame
-
-
-File: magit.info,  Node: Blaming,  Prev: Visiting Files and Blobs,  Up: Inspecting
-
-5.9 Blaming
-===========
-
-Also see *note (gitman)git-blame::.
-
-   To start blaming, invoke the ‘magit-file-dispatch’ transient prefix
-command.  When using the default key bindings, that can be done by
-pressing ‘C-c M-g’.  When using the recommended bindings, this command
-is instead bound to ‘C-c f’.  Also see *note Global Bindings::.
-
-   The blaming suffix commands can be invoked directly from the file
-dispatch transient.  However if you want to set an infix argument, then
-you have to enter the blaming sub-prefix first.
-
-‘C-c f B’ (‘magit-blame’)
-‘C-c f b’ (‘magit-blame-addition’)
-‘C-c f B b’
-‘C-c f r’ (‘magit-blame-removal’)
-‘C-c f B r’
-‘C-c f f’ (‘magit-blame-reverse’)
-‘C-c f B f’
-‘C-c f e’ (‘magit-blame-echo’)
-‘C-c f B e’
-‘C-c f q’ (‘magit-blame-quit’)
-‘C-c f B q’
-     Each of these commands is documented individually right below,
-     alongside their default key bindings.  The bindings shown above are
-     the recommended bindings, which you can enable by following the
-     instructions in *note Global Bindings::.
-
-‘C-c M-g B’ (‘magit-blame’)
-     This transient prefix command binds the following suffix commands
-     along with the appropriate infix arguments and displays them in a
-     temporary buffer until a suffix is invoked.
-
-   Note that not all of the following suffixes are available at all
-times.  For example if ‘magit-blame-mode’ is not enabled, then the
-command whose purpose is to turn off that mode would not be of any use
-and therefore isn’t available.
-
-‘C-c M-g b’ (‘magit-blame-addition’)
-‘C-c M-g B b’
-     This command augments each line or chunk of lines in the current
-     file-visiting or blob-visiting buffer with information about what
-     commits last touched these lines.
-
-     If the buffer visits a revision of that file, then history up to
-     that revision is considered.  Otherwise, the file’s full history is
-     considered, including uncommitted changes.
-
-     If Magit-Blame mode is already turned on in the current buffer then
-     blaming is done recursively, by visiting REVISION:FILE (using
-     ‘magit-find-file’), where REVISION is a parent of the revision that
-     added the current line or chunk of lines.
-
-‘C-c M-g r’ (‘magit-blame-removal’)
-‘C-c M-g B r’
-     This command augments each line or chunk of lines in the current
-     blob-visiting buffer with information about the revision that
-     removes it.  It cannot be used in file-visiting buffers.
-
-     Like ‘magit-blame-addition’, this command can be used recursively.
-
-‘C-c M-g f’ (‘magit-blame-reverse’)
-‘C-c M-g B f’
-     This command augments each line or chunk of lines in the current
-     file-visiting or blob-visiting buffer with information about the
-     last revision in which a line still existed.
-
-     Like ‘magit-blame-addition’, this command can be used recursively.
-
-‘C-c M-g e’ (‘magit-blame-echo’)
-‘C-c M-g B e’
-     This command is like ‘magit-blame-addition’ except that it doesn’t
-     turn on ‘read-only-mode’ and that it initially uses the
-     visualization style specified by option ‘magit-blame-echo-style’.
-
-   The following key bindings are available when Magit-Blame mode is
-enabled and Read-Only mode is not enabled.  These commands are also
-available in other buffers; here only the behavior is described that is
-relevant in file-visiting buffers that are being blamed.
-
-‘C-c M-g q’ (‘magit-blame-quit’)
-‘C-c M-g B q’
-     This command turns off Magit-Blame mode.  If the buffer was created
-     during a recursive blame, then it also kills the buffer.
-
-‘<RET>’ (‘magit-show-commit’)
-     This command shows the commit that last touched the line at point.
-
-‘<SPC>’ (‘magit-diff-show-or-scroll-up’)
-     This command updates the commit buffer.
-
-     This either shows the commit that last touched the line at point in
-     the appropriate buffer, or if that buffer is already being
-     displayed in the current frame and if that buffer contains
-     information about that commit, then the buffer is scrolled up
-     instead.
-
-‘<DEL>’ (‘magit-diff-show-or-scroll-down’)
-     This command updates the commit buffer.
-
-     This either shows the commit that last touched the line at point in
-     the appropriate buffer, or if that buffer is already being
-     displayed in the current frame and if that buffer contains
-     information about that commit, then the buffer is scrolled down
-     instead.
-
-   The following key bindings are available when both Magit-Blame mode
-and Read-Only mode are enabled.
-
-‘b’ (‘magit-blame’)
-     See above.
-
-‘n’ (‘magit-blame-next-chunk’)
-     This command moves to the next chunk.
-
-‘N’ (‘magit-blame-next-chunk-same-commit’)
-     This command moves to the next chunk from the same commit.
-
-‘p’ (‘magit-blame-previous-chunk’)
-     This command moves to the previous chunk.
-
-‘P’ (‘magit-blame-previous-chunk-same-commit’)
-     This command moves to the previous chunk from the same commit.
-
-‘q’ (‘magit-blame-quit’)
-     This command turns off Magit-Blame mode.  If the buffer was created
-     during a recursive blame, then it also kills the buffer.
-
-‘M-w’ (‘magit-blame-copy-hash’)
-     This command saves the hash of the current chunk’s commit to the
-     kill ring.
-
-     When the region is active, the command saves the region’s content
-     instead of the hash, like ‘kill-ring-save’ would.
-
-‘c’ (‘magit-blame-cycle-style’)
-     This command changes how blame information is visualized in the
-     current buffer by cycling through the styles specified using the
-     option ‘magit-blame-styles’.
-
-   Blaming is also controlled using the following options.
-
- -- User Option: magit-blame-styles
-     This option defines a list of styles used to visualize blame
-     information.  For now see its doc-string to learn more.
-
- -- User Option: magit-blame-echo-style
-     This option specifies the blame visualization style used by the
-     command ‘magit-blame-echo’.  This must be a symbol that is used as
-     the identifier for one of the styles defined in
-     ‘magit-blame-styles’.
-
- -- User Option: magit-blame-time-format
-     This option specifies the format string used to display times when
-     showing blame information.
-
- -- User Option: magit-blame-read-only
-     This option controls whether blaming a buffer also makes
-     temporarily read-only.
-
- -- User Option: magit-blame-disable-modes
-     This option lists incompatible minor-modes that should be disabled
-     temporarily when a buffer contains blame information.  They are
-     enabled again when the buffer no longer shows blame information.
-
- -- User Option: magit-blame-goto-chunk-hook
-     This hook is run when moving between chunks.
-
-
-File: magit.info,  Node: Manipulating,  Next: Transferring,  Prev: Inspecting,  Up: Top
-
-6 Manipulating
-**************
-
-* Menu:
-
-* Creating Repository::
-* Cloning Repository::
-* Staging and Unstaging::
-* Applying::
-* Committing::
-* Branching::
-* Merging::
-* Resolving Conflicts::
-* Rebasing::
-* Cherry Picking::
-* Resetting::
-* Stashing::
-
-
-File: magit.info,  Node: Creating Repository,  Next: Cloning Repository,  Up: Manipulating
-
-6.1 Creating Repository
-=======================
-
-‘I’ (‘magit-init’)
-     This command initializes a repository and then shows the status
-     buffer for the new repository.
-
-     If the directory is below an existing repository, then the user has
-     to confirm that a new one should be created inside.  If the
-     directory is the root of the existing repository, then the user has
-     to confirm that it should be reinitialized.
-
-
-File: magit.info,  Node: Cloning Repository,  Next: Staging and Unstaging,  Prev: Creating Repository,  Up: Manipulating
-
-6.2 Cloning Repository
-======================
-
-To clone a remote or local repository use ‘C’, which is bound to the
-command ‘magit-clone’.  This command either act as a transient prefix
-command, which binds several infix arguments and suffix commands, or it
-can invoke ‘git clone’ directly, depending on whether a prefix argument
-is used and on the value of ‘magit-clone-always-transient’.
-
- -- User Option: magit-clone-always-transient
-     This option controls whether the command ‘magit-clone’ always acts
-     as a transient prefix command, regardless of whether a prefix
-     argument is used or not.  If ‘t’, then that command always acts as
-     a transient prefix.  If ‘nil’, then a prefix argument has to be
-     used for it to act as a transient.
-
-‘C’ (‘magit-clone’)
-     This command either acts as a transient prefix command as described
-     above or does the same thing as ‘transient-clone-regular’ as
-     described below.
-
-     If it acts as a transient prefix, then it binds the following
-     suffix commands and several infix arguments.
-
-‘C C’ (‘magit-clone-regular’)
-     This command creates a regular clone of an existing repository.
-     The repository and the target directory are read from the user.
-
-‘C s’ (‘magit-clone-shallow’)
-     This command creates a shallow clone of an existing repository.
-     The repository and the target directory are read from the user.  By
-     default the depth of the cloned history is a single commit, but
-     with a prefix argument the depth is read from the user.
-
-‘C >’ (‘magit-clone-sparse’)
-     This command creates a clone of an existing repository and
-     initializes a sparse checkout, avoiding a checkout of the full
-     working tree.  To add more directories, use the
-     ‘magit-sparse-checkout’ transient (see *note Sparse checkouts::).
-
-‘C b’ (‘magit-clone-bare’)
-     This command creates a bare clone of an existing repository.  The
-     repository and the target directory are read from the user.
-
-‘C m’ (‘magit-clone-mirror’)
-     This command creates a mirror of an existing repository.  The
-     repository and the target directory are read from the user.
-
-   The following suffixes are disabled by default.  See *note
-(transient)Enabling and Disabling Suffixes:: for how to enable them.
-
-‘C d’ (‘magit-clone-shallow-since’)
-     This command creates a shallow clone of an existing repository.
-     Only commits that were committed after a date are cloned, which is
-     read from the user.  The repository and the target directory are
-     also read from the user.
-
-‘C e’ (‘magit-clone-shallow-exclude’)
-     This command creates a shallow clone of an existing repository.
-     This reads a branch or tag from the user.  Commits that are
-     reachable from that are not cloned.  The repository and the target
-     directory are also read from the user.
-
- -- User Option: magit-clone-set-remote-head
-     This option controls whether cloning causes the reference
-     ‘refs/remotes/<remote>/HEAD’ to be created in the clone.  The
-     default is to delete the reference after running ‘git clone’, which
-     insists on creating it.  This is because the reference has not been
-     found to be particularly useful as it is not automatically updated
-     when the ‘HEAD’ of the remote changes.  Setting this option to ‘t’
-     preserves Git’s default behavior of creating the reference.
-
- -- User Option: magit-clone-set-remote.pushDefault
-     This option controls whether the value of the Git variable
-     ‘remote.pushDefault’ is set after cloning.
-
-        • If ‘t’, then it is always set without asking.
-        • If ‘ask’, then the users are asked every time they clone a
-          repository.
-        • If ‘nil’, then it is never set.
-
- -- User Option: magit-clone-default-directory
-     This option control the default directory name used when reading
-     the destination for a cloning operation.
-
-        • If ‘nil’ (the default), then the value of ‘default-directory’
-          is used.
-        • If a directory, then that is used.
-        • If a function, then that is called with the remote url as the
-          only argument and the returned value is used.
-
- -- User Option: magit-clone-name-alist
-     This option maps regular expressions, which match repository names,
-     to repository urls, making it possible for users to enter short
-     names instead of urls when cloning repositories.
-
-     Each element has the form ‘(REGEXP HOSTNAME USER)’.  When the user
-     enters a name when a cloning command asks for a name or url, then
-     that is looked up in this list.  The first element whose REGEXP
-     matches is used.
-
-     The format specified by option ‘magit-clone-url-format’ is used to
-     turn the name into an url, using HOSTNAME and the repository name.
-     If the provided name contains a slash, then that is used.
-     Otherwise if the name omits the owner of the repository, then the
-     default user specified in the matched entry is used.
-
-     If USER contains a dot, then it is treated as a Git variable and
-     the value of that is used as the username.  Otherwise it is used as
-     the username itself.
-
- -- User Option: magit-clone-url-format
-     The format specified by this option is used when turning repository
-     names into urls.  ‘%h’ is the hostname and ‘%n’ is the repository
-     name, including the name of the owner.  The value can be a string
-     (representing a single static format) or an alist with elements
-     ‘(HOSTNAME . FORMAT)’ mapping hostnames to formats.  When an alist
-     is used, the ‘t’ key represents the default format.
-
-     Example of a single format string:
-
-          (setq magit-clone-url-format
-                "git@%h:%n.git")
-
-     Example of by-hostname format strings:
-
-          (setq magit-clone-url-format
-                '(("git.example.com" . "git@%h:~%n")
-                  (nil . "git@%h:%n.git")))
-
- -- User Option: magit-post-clone-hook
-     Hook run after the Git process has successfully finished cloning
-     the repository.  When the hook is called, ‘default-directory’ is
-     let-bound to the directory where the repository has been cloned.
-
-
-File: magit.info,  Node: Staging and Unstaging,  Next: Applying,  Prev: Cloning Repository,  Up: Manipulating
-
-6.3 Staging and Unstaging
-=========================
-
-Like Git, Magit can of course stage and unstage complete files.  Unlike
-Git, it also allows users to gracefully un-/stage individual hunks and
-even just part of a hunk.  To stage individual hunks and parts of hunks
-using Git directly, one has to use the very modal and rather clumsy
-interface of a ‘git add --interactive’ session.
-
-   With Magit, on the other hand, one can un-/stage individual hunks by
-just moving point into the respective section inside a diff displayed in
-the status buffer or a separate diff buffer and typing ‘s’ or ‘u’.  To
-operate on just parts of a hunk, mark the changes that should be
-un-/staged using the region and then press the same key that would be
-used to un-/stage.  To stage multiple files or hunks at once use a
-region that starts inside the heading of such a section and ends inside
-the heading of a sibling section of the same type.
-
-   Besides staging and unstaging, Magit also provides several other
-"apply variants" that can also operate on a file, multiple files at
-once, a hunk, multiple hunks at once, and on parts of a hunk.  These
-apply variants are described in the next section.
-
-   You can also use Ediff to stage and unstage.  See *note Ediffing::.
-
-‘s’ (‘magit-stage’)
-     Add the change at point to the staging area.
-
-     With a prefix argument and an untracked file (or files) at point,
-     stage the file but not its content.  This makes it possible to
-     stage only a subset of the new file’s changes.
-
-‘S’ (‘magit-stage-modified’)
-     Stage all changes to files modified in the worktree.  Stage all new
-     content of tracked files and remove tracked files that no longer
-     exist in the working tree from the index also.  With a prefix
-     argument also stage previously untracked (but not ignored) files.
-
-‘u’ (‘magit-unstage’)
-     Remove the change at point from the staging area.
-
-     Only staged changes can be unstaged.  But by default this command
-     performs an action that is somewhat similar to unstaging, when it
-     is called on a committed change: it reverses the change in the
-     index but not in the working tree.
-
-‘U’ (‘magit-unstage-all’)
-     Remove all changes from the staging area.
-
- -- User Option: magit-unstage-committed
-     This option controls whether ‘magit-unstage’ "unstages" committed
-     changes by reversing them in the index but not the working tree.
-     The alternative is to raise an error.
-
-‘M-x magit-reverse-in-index’
-     This command reverses the committed change at point in the index
-     but not the working tree.  By default no key is bound directly to
-     this command, but it is indirectly called when ‘u’
-     (‘magit-unstage’) is pressed on a committed change.
-
-     This allows extracting a change from ‘HEAD’, while leaving it in
-     the working tree, so that it can later be committed using a
-     separate commit.  A typical workflow would be:
-
-       1. Optionally make sure that there are no uncommitted changes.
-       2. Visit the ‘HEAD’ commit and navigate to the change that should
-          not have been included in that commit.
-       3. Type ‘u’ (‘magit-unstage’) to reverse it in the index.  This
-          assumes that ‘magit-unstage-committed’ is non-nil.
-       4. Type ‘c e’ to extend ‘HEAD’ with the staged changes, including
-          those that were already staged before.
-       5. Optionally stage the remaining changes using ‘s’ or ‘S’ and
-          then type ‘c c’ to create a new commit.
-
-‘M-x magit-reset-index’
-     Reset the index to some commit.  The commit is read from the user
-     and defaults to the commit at point.  If there is no commit at
-     point, then it defaults to ‘HEAD’.
-
-* Menu:
-
-* Staging from File-Visiting Buffers::
-
-
-File: magit.info,  Node: Staging from File-Visiting Buffers,  Up: Staging and Unstaging
-
-6.3.1 Staging from File-Visiting Buffers
-----------------------------------------
-
-Fine-grained un-/staging has to be done from the status or a diff
-buffer, but it’s also possible to un-/stage all changes made to the file
-visited in the current buffer right from inside that buffer.
-
-‘M-x magit-stage-file’
-     When invoked inside a file-visiting buffer, then stage all changes
-     to that file.  In a Magit buffer, stage the file at point if any.
-     Otherwise prompt for a file to be staged.  With a prefix argument
-     always prompt the user for a file, even in a file-visiting buffer
-     or when there is a file section at point.
-
-‘M-x magit-unstage-file’
-     When invoked inside a file-visiting buffer, then unstage all
-     changes to that file.  In a Magit buffer, unstage the file at point
-     if any.  Otherwise prompt for a file to be unstaged.  With a prefix
-     argument always prompt the user for a file, even in a file-visiting
-     buffer or when there is a file section at point.
-
-
-File: magit.info,  Node: Applying,  Next: Committing,  Prev: Staging and Unstaging,  Up: Manipulating
-
-6.4 Applying
-============
-
-Magit provides several "apply variants": stage, unstage, discard,
-reverse, and "regular apply".  At least when operating on a hunk they
-are all implemented using ‘git apply’, which is why they are called
-"apply variants".
-
-   • Stage.  Apply a change from the working tree to the index.  The
-     change also remains in the working tree.
-
-   • Unstage.  Remove a change from the index.  The change remains in
-     the working tree.
-
-   • Discard.  On a staged change, remove it from the working tree and
-     the index.  On an unstaged change, remove it from the working tree
-     only.
-
-   • Reverse.  Reverse a change in the working tree.  Both committed and
-     staged changes can be reversed.  Unstaged changes cannot be
-     reversed.  Discard them instead.
-
-   • Apply.  Apply a change to the working tree.  Both committed and
-     staged changes can be applied.  Unstaged changes cannot be applied
-     - as they already have been applied.
-
-   The previous section described the staging and unstaging commands.
-What follows are the commands which implement the remaining apply
-variants.
-
-‘a’ (‘magit-apply’)
-     Apply the change at point to the working tree.
-
-     With a prefix argument fallback to a 3-way merge.  Doing so causes
-     the change to be applied to the index as well.
-
-‘k’ (‘magit-discard’)
-     Remove the change at point from the working tree.
-
-     On a hunk or file with unresolved conflicts prompt which side to
-     keep (while discarding the other).  If point is within the text of
-     a side, then keep that side without prompting.
-
-‘v’ (‘magit-reverse’)
-     Reverse the change at point in the working tree.
-
-     With a prefix argument fallback to a 3-way merge.  Doing so causes
-     the change to be applied to the index as well.
-
-   With a prefix argument all apply variants attempt a 3-way merge when
-appropriate (i.e., when ‘git apply’ is used internally).
-
-
-File: magit.info,  Node: Committing,  Next: Branching,  Prev: Applying,  Up: Manipulating
-
-6.5 Committing
-==============
-
-When the user initiates a commit, Magit calls ‘git commit’ without any
-arguments, so Git has to get it from the user.  It creates the file
-‘.git/COMMIT_EDITMSG’ and then opens that file in an editor.  Magit
-arranges for that editor to be the Emacsclient.  Once the user finishes
-the editing session, the Emacsclient exits and Git creates the commit
-using the file’s content as message.
-
-* Menu:
-
-* Initiating a Commit::
-* Editing Commit Messages::
-
-
-File: magit.info,  Node: Initiating a Commit,  Next: Editing Commit Messages,  Up: Committing
-
-6.5.1 Initiating a Commit
--------------------------
-
-Also see *note (gitman)git-commit::.
-
-‘c’ (‘magit-commit’)
-     This transient prefix command binds the following suffix commands
-     along with the appropriate infix arguments and displays them in a
-     temporary buffer until a suffix is invoked.
-
-‘c c’ (‘magit-commit-create’)
-     Create a new commit on ‘HEAD’.  With a prefix argument amend to the
-     commit at ‘HEAD’ instead.
-
-‘c a’ (‘magit-commit-amend’)
-     Amend the last commit.
-
-‘c e’ (‘magit-commit-extend’)
-     Amend the last commit, without editing the message.  With a prefix
-     argument keep the committer date, otherwise change it.  The option
-     ‘magit-commit-extend-override-date’ can be used to inverse the
-     meaning of the prefix argument.
-
-     Non-interactively respect the optional OVERRIDE-DATE argument and
-     ignore the option.
-
-‘c w’ (‘magit-commit-reword’)
-     Reword the last commit, ignoring staged changes.  With a prefix
-     argument keep the committer date, otherwise change it.  The option
-     ‘magit-commit-reword-override-date’ can be used to inverse the
-     meaning of the prefix argument.
-
-     Non-interactively respect the optional OVERRIDE-DATE argument and
-     ignore the option.
-
-‘c f’ (‘magit-commit-fixup’)
-     Create a fixup commit.
-
-     With a prefix argument the target commit has to be confirmed.
-     Otherwise the commit at point may be used without confirmation
-     depending on the value of option ‘magit-commit-squash-confirm’.
-
-‘c F’ (‘magit-commit-instant-fixup’)
-     Create a fixup commit and instantly rebase.
-
-‘c s’ (‘magit-commit-squash’)
-     Create a squash commit, without editing the squash message.
-
-     With a prefix argument the target commit has to be confirmed.
-     Otherwise the commit at point may be used without confirmation
-     depending on the value of option ‘magit-commit-squash-confirm’.
-
-‘c S’ (‘magit-commit-instant-squash’)
-     Create a squash commit and instantly rebase.
-
-‘c A’ (‘magit-commit-augment’)
-     Create a squash commit, editing the squash message.
-
-     With a prefix argument the target commit has to be confirmed.
-     Otherwise the commit at point may be used without confirmation
-     depending on the value of option ‘magit-commit-squash-confirm’.
-
- -- User Option: magit-commit-ask-to-stage
-     Whether to ask to stage all unstaged changes when committing and
-     nothing is staged.
-
- -- User Option: magit-commit-show-diff
-     Whether the relevant diff is automatically shown when committing.
-
- -- User Option: magit-commit-extend-override-date
-     Whether using ‘magit-commit-extend’ changes the committer date.
-
- -- User Option: magit-commit-reword-override-date
-     Whether using ‘magit-commit-reword’ changes the committer date.
-
- -- User Option: magit-commit-squash-confirm
-     Whether the commit targeted by squash and fixup has to be
-     confirmed.  When non-nil then the commit at point (if any) is used
-     as default choice.  Otherwise it has to be confirmed.  This option
-     only affects ‘magit-commit-squash’ and ‘magit-commit-fixup’.  The
-     "instant" variants always require confirmation because making an
-     error while using those is harder to recover from.
-
- -- User Option: magit-post-commit-hook
-     Hook run after creating a commit without the user editing a
-     message.
-
-     This hook is run by ‘magit-refresh’ if ‘this-command’ is a member
-     of ‘magit-post-commit-hook-commands’.  This only includes commands
-     named ‘magit-commit-*’ that do *not* require that the user edits
-     the commit message in a buffer.
-
-     Also see ‘git-commit-post-finish-hook’.
-
- -- User Option: magit-commit-diff-inhibit-same-window
-     Whether to inhibit use of same window when showing diff while
-     committing.
-
-     When writing a commit, then a diff of the changes to be committed
-     is automatically shown.  The idea is that the diff is shown in a
-     different window of the same frame and for most users that just
-     works.  In other words most users can completely ignore this option
-     because its value doesn’t make a difference for them.
-
-     However for users who configured Emacs to never create a new window
-     even when the package explicitly tries to do so, then displaying
-     two new buffers necessarily means that the first is immediately
-     replaced by the second.  In our case the message buffer is
-     immediately replaced by the diff buffer, which is of course highly
-     undesirable.
-
-     A workaround is to suppress this user configuration in this
-     particular case.  Users have to explicitly opt-in by toggling this
-     option.  We cannot enable the workaround unconditionally because
-     that again causes issues for other users: if the frame is too tiny
-     or the relevant settings too aggressive, then the diff buffer would
-     end up being displayed in a new frame.
-
-     Also see <https://github.com/magit/magit/issues/4132>.
-
-
-File: magit.info,  Node: Editing Commit Messages,  Prev: Initiating a Commit,  Up: Committing
-
-6.5.2 Editing Commit Messages
------------------------------
-
-After initiating a commit as described in the previous section, two new
-buffers appear.  One shows the changes that are about to be committed,
-while the other is used to write the message.
-
-   Commit messages are edited in an edit session - in the background
-‘git’ is waiting for the editor, in our case ‘emacsclient’, to save the
-commit message in a file (in most cases ‘.git/COMMIT_EDITMSG’) and then
-return.  If the editor returns with a non-zero exit status then ‘git’
-does not create the commit.  So the most important commands are those
-for finishing and aborting the commit.
-
-‘C-c C-c’ (‘with-editor-finish’)
-     Finish the current editing session by returning with exit code 0.
-     Git then creates the commit using the message it finds in the file.
-
-‘C-c C-k’ (‘with-editor-cancel’)
-     Cancel the current editing session by returning with exit code 1.
-     Git then cancels the commit, but leaves the file untouched.
-
-   In addition to being used by ‘git commit’, messages may also be
-stored in a ring that persists until Emacs is closed.  By default the
-message is stored at the beginning and the end of an edit session
-(regardless of whether the session is finished successfully or was
-canceled).  It is sometimes useful to bring back messages from that
-ring.
-
-‘C-c M-s’ (‘git-commit-save-message’)
-     Save the current buffer content to the commit message ring.
-
-‘M-p’ (‘git-commit-prev-message’)
-     Cycle backward through the commit message ring, after saving the
-     current message to the ring.  With a numeric prefix ARG, go back
-     ARG comments.
-
-‘M-n’ (‘git-commit-next-message’)
-     Cycle forward through the commit message ring, after saving the
-     current message to the ring.  With a numeric prefix ARG, go back
-     ARG comments.
-
-   By default the diff for the changes that are about to be committed
-are automatically shown when invoking the commit.  To prevent that,
-remove ‘magit-commit-diff’ from ‘server-switch-hook’.
-
-   When amending to an existing commit it may be useful to show either
-the changes that are about to be added to that commit or to show those
-changes alongside those that have already been committed.
-
-‘C-c C-d’ (‘magit-diff-while-committing’)
-     While committing, show the changes that are about to be committed.
-     While amending, invoking the command again toggles between showing
-     just the new changes or all the changes that will be committed.
-
-* Menu:
-
-* Using the Revision Stack::
-* Commit Pseudo Headers::
-* Commit Mode and Hooks::
-* Commit Message Conventions::
-
-
-File: magit.info,  Node: Using the Revision Stack,  Next: Commit Pseudo Headers,  Up: Editing Commit Messages
-
-Using the Revision Stack
-........................
-
-‘C-c C-w’ (‘magit-pop-revision-stack’)
-     This command inserts a representation of a revision into the
-     current buffer.  It can be used inside buffers used to write commit
-     messages but also in other buffers such as buffers used to edit
-     emails or ChangeLog files.
-
-     By default this command pops the revision which was last added to
-     the ‘magit-revision-stack’ and inserts it into the current buffer
-     according to ‘magit-pop-revision-stack-format’.  Revisions can be
-     put on the stack using ‘magit-copy-section-value’ and
-     ‘magit-copy-buffer-revision’.
-
-     If the stack is empty or with a prefix argument it instead reads a
-     revision in the minibuffer.  By using the minibuffer history this
-     allows selecting an item which was popped earlier or to insert an
-     arbitrary reference or revision without first pushing it onto the
-     stack.
-
-     When reading the revision from the minibuffer, then it might not be
-     possible to guess the correct repository.  When this command is
-     called inside a repository (e.g., while composing a commit
-     message), then that repository is used.  Otherwise (e.g., while
-     composing an email) then the repository recorded for the top
-     element of the stack is used (even though we insert another
-     revision).  If not called inside a repository and with an empty
-     stack, or with two prefix arguments, then read the repository in
-     the minibuffer too.
-
- -- User Option: magit-pop-revision-stack-format
-     This option controls how the command ‘magit-pop-revision-stack’
-     inserts a revision into the current buffer.
-
-     The entries on the stack have the format ‘(HASH TOPLEVEL)’ and this
-     option has the format ‘(POINT-FORMAT EOB-FORMAT INDEX-REGEXP)’, all
-     of which may be nil or a string (though either one of EOB-FORMAT or
-     POINT-FORMAT should be a string, and if INDEX-REGEXP is non-nil,
-     then the two formats should be too).
-
-     First INDEX-REGEXP is used to find the previously inserted entry,
-     by searching backward from point.  The first submatch must match
-     the index number.  That number is incremented by one, and becomes
-     the index number of the entry to be inserted.  If you don’t want to
-     number the inserted revisions, then use nil for INDEX-REGEXP.
-
-     If INDEX-REGEXP is non-nil then both POINT-FORMAT and EOB-FORMAT
-     should contain \"%N\", which is replaced with the number that was
-     determined in the previous step.
-
-     Both formats, if non-nil and after removing %N, are then expanded
-     using ‘git show --format=FORMAT ...’ inside TOPLEVEL.
-
-     The expansion of POINT-FORMAT is inserted at point, and the
-     expansion of EOB-FORMAT is inserted at the end of the buffer (if
-     the buffer ends with a comment, then it is inserted right before
-     that).
-
-
-File: magit.info,  Node: Commit Pseudo Headers,  Next: Commit Mode and Hooks,  Prev: Using the Revision Stack,  Up: Editing Commit Messages
-
-Commit Pseudo Headers
-.....................
-
-Some projects use pseudo headers in commit messages.  Magit colorizes
-such headers and provides some commands to insert such headers.
-
- -- User Option: git-commit-known-pseudo-headers
-     A list of Git pseudo headers to be highlighted.
-
-‘C-c C-i’ (‘git-commit-insert-pseudo-header’)
-     Insert a commit message pseudo header.
-
-‘C-c C-a’ (‘git-commit-ack’)
-     Insert a header acknowledging that you have looked at the commit.
-
-‘C-c C-r’ (‘git-commit-review’)
-     Insert a header acknowledging that you have reviewed the commit.
-
-‘C-c C-s’ (‘git-commit-signoff’)
-     Insert a header to sign off the commit.
-
-‘C-c C-t’ (‘git-commit-test’)
-     Insert a header acknowledging that you have tested the commit.
-
-‘C-c C-o’ (‘git-commit-cc’)
-     Insert a header mentioning someone who might be interested.
-
-‘C-c C-p’ (‘git-commit-reported’)
-     Insert a header mentioning the person who reported the issue being
-     fixed by the commit.
-
-‘C-c M-i’ (‘git-commit-suggested’)
-     Insert a header mentioning the person who suggested the change.
-
-
-File: magit.info,  Node: Commit Mode and Hooks,  Next: Commit Message Conventions,  Prev: Commit Pseudo Headers,  Up: Editing Commit Messages
-
-Commit Mode and Hooks
-.....................
-
-‘git-commit-mode’ is a minor mode that is only used to establish certain
-key bindings.  This makes it possible to use an arbitrary major mode in
-buffers used to edit commit messages.  It is even possible to use
-different major modes in different repositories, which is useful when
-different projects impose different commit message conventions.
-
- -- User Option: git-commit-major-mode
-     The value of this option is the major mode used to edit Git commit
-     messages.
-
-   Because ‘git-commit-mode’ is a minor mode, we don’t use its mode hook
-to setup the buffer, except for the key bindings.  All other setup
-happens in the function ‘git-commit-setup’, which among other things
-runs the hook ‘git-commit-setup-hook’.
-
- -- User Option: git-commit-setup-hook
-     Hook run at the end of ‘git-commit-setup’.
-
-The following functions are suitable for this hook:
-
- -- Function: git-commit-save-message
-     Save the current buffer content to the commit message ring.
-
- -- Function: git-commit-setup-changelog-support
-     After this function is called, ChangeLog entries are treated as
-     paragraphs.
-
- -- Function: git-commit-turn-on-auto-fill
-     Turn on ‘auto-fill-mode’.
-
- -- Function: git-commit-turn-on-flyspell
-     Turn on Flyspell mode.  Also prevent comments from being checked
-     and finally check current non-comment text.
-
- -- Function: git-commit-propertize-diff
-     Propertize the diff shown inside the commit message buffer.  Git
-     inserts such diffs into the commit message template when the
-     ‘--verbose’ argument is used.  ‘magit-commit’ by default does not
-     offer that argument because the diff that is shown in a separate
-     buffer is more useful.  But some users disagree, which is why this
-     function exists.
-
- -- Function: bug-reference-mode
-     Hyperlink bug references in the buffer.
-
- -- Function: with-editor-usage-message
-     Show usage information in the echo area.
-
- -- User Option: git-commit-post-finish-hook
-     Hook run after the user finished writing a commit message.
-
-     This hook is only run after pressing ‘C-c C-c’ in a buffer used to
-     edit a commit message.  If a commit is created without the user
-     typing a message into a buffer, then this hook is not run.
-
-     This hook is not run until the new commit has been created.  If
-     doing so takes Git longer than one second, then this hook isn’t run
-     at all.  For certain commands such as ‘magit-rebase-continue’ this
-     hook is never run because doing so would lead to a race condition.
-
-     This hook is only run if ‘magit’ is available.
-
-     Also see ‘magit-post-commit-hook’.
-
-
-File: magit.info,  Node: Commit Message Conventions,  Prev: Commit Mode and Hooks,  Up: Editing Commit Messages
-
-Commit Message Conventions
-..........................
-
-Git-Commit highlights certain violations of commonly accepted commit
-message conventions.  Certain violations even cause Git-Commit to ask
-you to confirm that you really want to do that.  This nagging can of
-course be turned off, but the result of doing that usually is that
-instead of some code it’s now the human who is reviewing your commits
-who has to waste some time telling you to fix your commits.
-
- -- User Option: git-commit-summary-max-length
-     The intended maximal length of the summary line of commit messages.
-     Characters beyond this column are colorized to indicate that this
-     preference has been violated.
-
- -- User Option: git-commit-finish-query-functions
-     List of functions called to query before performing commit.
-
-     The commit message buffer is current while the functions are
-     called.  If any of them returns nil, then the commit is not
-     performed and the buffer is not killed.  The user should then fix
-     the issue and try again.
-
-     The functions are called with one argument.  If it is non-nil then
-     that indicates that the user used a prefix argument to force
-     finishing the session despite issues.  Functions should usually
-     honor this wish and return non-nil.
-
-     By default the only member is ‘git-commit-check-style-conventions’.
-
- -- Function: git-commit-check-style-conventions
-     This function checks for violations of certain basic style
-     conventions.  For each violation it asks users if they want to
-     proceed anyway.
-
- -- User Option: git-commit-style-convention-checks
-     This option controls what conventions the function by the same name
-     tries to enforce.  The value is a list of self-explanatory symbols
-     identifying certain conventions; ‘non-empty-second-line’ and
-     ‘overlong-summary-line’.
-
-
-File: magit.info,  Node: Branching,  Next: Merging,  Prev: Committing,  Up: Manipulating
-
-6.6 Branching
-=============
-
-* Menu:
-
-* The Two Remotes::
-* Branch Commands::
-* Branch Git Variables::
-* Auxiliary Branch Commands::
-
-
-File: magit.info,  Node: The Two Remotes,  Next: Branch Commands,  Up: Branching
-
-6.6.1 The Two Remotes
----------------------
-
-The upstream branch of some local branch is the branch into which the
-commits on that local branch should eventually be merged, usually
-something like ‘origin/master’.  For the ‘master’ branch itself the
-upstream branch and the branch it is being pushed to, are usually the
-same remote branch.  But for a feature branch the upstream branch and
-the branch it is being pushed to should differ.
-
-   The commits on feature branches too should _eventually_ end up in a
-remote branch such as ‘origin/master’ or ‘origin/maint’.  Such a branch
-should therefore be used as the upstream.  But feature branches
-shouldn’t be pushed directly to such branches.  Instead a feature branch
-‘my-feature’ is usually pushed to ‘my-fork/my-feature’ or if you are a
-contributor ‘origin/my-feature’.  After the new feature has been
-reviewed, the maintainer merges the feature into ‘master’.  And finally
-‘master’ (not ‘my-feature’ itself) is pushed to ‘origin/master’.
-
-   But new features seldom are perfect on the first try, and so feature
-branches usually have to be reviewed, improved, and re-pushed several
-times.  Pushing should therefore be easy to do, and for that reason many
-Git users have concluded that it is best to use the remote branch to
-which the local feature branch is being pushed as its upstream.
-
-   But luckily Git has long ago gained support for a push-remote which
-can be configured separately from the upstream branch, using the
-variables ‘branch.<name>.pushRemote’ and ‘remote.pushDefault’.  So we no
-longer have to choose which of the two remotes should be used as "the
-remote".
-
-   Each of the fetching, pulling, and pushing transient commands
-features three suffix commands that act on the current branch and some
-other branch.  Of these, ‘p’ is bound to a command which acts on the
-push-remote, ‘u’ is bound to a command which acts on the upstream, and
-‘e’ is bound to a command which acts on any other branch.  The status
-buffer shows unpushed and unpulled commits for both the push-remote and
-the upstream.
-
-   It’s fairly simple to configure these two remotes.  The values of all
-the variables that are related to fetching, pulling, and pushing (as
-well as some other branch-related variables) can be inspected and
-changed using the command ‘magit-branch-configure’, which is available
-from many transient prefix commands that deal with branches.  It is also
-possible to set the push-remote or upstream while pushing (see *note
-Pushing::).
-
-
-File: magit.info,  Node: Branch Commands,  Next: Branch Git Variables,  Prev: The Two Remotes,  Up: Branching
-
-6.6.2 Branch Commands
----------------------
-
-The transient prefix command ‘magit-branch’ is used to create and
-checkout branches, and to make changes to existing branches.  It is not
-used to fetch, pull, merge, rebase, or push branches, i.e., this command
-deals with branches themselves, not with the commits reachable from
-them.  Those features are available from separate transient command.
-
-‘b’ (‘magit-branch’)
-     This transient prefix command binds the following suffix commands
-     and displays them in a temporary buffer until a suffix is invoked.
-
-     By default it also binds and displays the values of some
-     branch-related Git variables and allows changing their values.
-
- -- User Option: magit-branch-direct-configure
-     This option controls whether the transient command ‘magit-branch’
-     can be used to directly change the values of Git variables.  This
-     defaults to ‘t’ (to avoid changing key bindings).  When set to
-     ‘nil’, then no variables are displayed by that transient command,
-     and its suffix command ‘magit-branch-configure’ has to be used
-     instead to view and change branch related variables.
-
-‘b C’ (‘magit-branch-configure’)
-‘f C’
-‘F C’
-‘P C’
-     This transient prefix command binds commands that set the value of
-     branch-related variables and displays them in a temporary buffer
-     until the transient is exited.
-
-     With a prefix argument, this command always prompts for a branch.
-
-     Without a prefix argument this depends on whether it was invoked as
-     a suffix of ‘magit-branch’ and on the
-     ‘magit-branch-direct-configure’ option.  If ‘magit-branch’ already
-     displays the variables for the current branch, then it isn’t useful
-     to invoke another transient that displays them for the same branch.
-     In that case this command prompts for a branch.
-
-   The variables are described in *note Branch Git Variables::.
-
-‘b b’ (‘magit-checkout’)
-     Checkout a revision read in the minibuffer and defaulting to the
-     branch or arbitrary revision at point.  If the revision is a local
-     branch then that becomes the current branch.  If it is something
-     else then ‘HEAD’ becomes detached.  Checkout fails if the working
-     tree or the staging area contain changes.
-
-‘b n’ (‘magit-branch-create’)
-     Create a new branch.  The user is asked for a branch or arbitrary
-     revision to use as the starting point of the new branch.  When a
-     branch name is provided, then that becomes the upstream branch of
-     the new branch.  The name of the new branch is also read in the
-     minibuffer.
-
-     Also see option ‘magit-branch-prefer-remote-upstream’.
-
-‘b c’ (‘magit-branch-and-checkout’)
-     This command creates a new branch like ‘magit-branch-create’, but
-     then also checks it out.
-
-     Also see option ‘magit-branch-prefer-remote-upstream’.
-
-‘b l’ (‘magit-branch-checkout’)
-     This command checks out an existing or new local branch.  It reads
-     a branch name from the user offering all local branches and a
-     subset of remote branches as candidates.  Remote branches for which
-     a local branch by the same name exists are omitted from the list of
-     candidates.  The user can also enter a completely new branch name.
-
-        • If the user selects an existing local branch, then that is
-          checked out.
-
-        • If the user selects a remote branch, then it creates and
-          checks out a new local branch with the same name, and
-          configures the selected remote branch as the push target.
-
-        • If the user enters a new branch name, then it creates and
-          checks that out, after also reading the starting-point from
-          the user.
-
-     In the latter two cases the upstream is also set.  Whether it is
-     set to the chosen starting point or something else depends on the
-     value of ‘magit-branch-adjust-remote-upstream-alist’.
-
-‘b s’ (‘magit-branch-spinoff’)
-     This command creates and checks out a new branch starting at and
-     tracking the current branch.  That branch in turn is reset to the
-     last commit it shares with its upstream.  If the current branch has
-     no upstream or no unpushed commits, then the new branch is created
-     anyway and the previously current branch is not touched.
-
-     This is useful to create a feature branch after work has already
-     begun on the old branch (likely but not necessarily "master").
-
-     If the current branch is a member of the value of option
-     ‘magit-branch-prefer-remote-upstream’ (which see), then the current
-     branch will be used as the starting point as usual, but the
-     upstream of the starting-point may be used as the upstream of the
-     new branch, instead of the starting-point itself.
-
-     If optional FROM is non-nil, then the source branch is reset to
-     ‘FROM~’, instead of to the last commit it shares with its upstream.
-     Interactively, FROM is only ever non-nil, if the region selects
-     some commits, and among those commits, FROM is the commit that is
-     the fewest commits ahead of the source branch.
-
-     The commit at the other end of the selection actually does not
-     matter, all commits between FROM and ‘HEAD’ are moved to the new
-     branch.  If FROM is not reachable from ‘HEAD’ or is reachable from
-     the source branch’s upstream, then an error is raised.
-
-‘b S’ (‘magit-branch-spinout’)
-     This command behaves like ‘magit-branch-spinoff’, except that it
-     does not change the current branch.  If there are any uncommitted
-     changes, then it behaves exactly like ‘magit-branch-spinoff’.
-
-‘b x’ (‘magit-branch-reset’)
-     This command resets a branch, defaulting to the branch at point, to
-     the tip of another branch or any other commit.
-
-     When the branch being reset is the current branch, then a hard
-     reset is performed.  If there are any uncommitted changes, then the
-     user has to confirm the reset because those changes would be lost.
-
-     This is useful when you have started work on a feature branch but
-     realize it’s all crap and want to start over.
-
-     When resetting to another branch and a prefix argument is used,
-     then the target branch is set as the upstream of the branch that is
-     being reset.
-
-‘b k’ (‘magit-branch-delete’)
-     Delete one or multiple branches.  If the region marks multiple
-     branches, then offer to delete those.  Otherwise, prompt for a
-     single branch to be deleted, defaulting to the branch at point.
-
-     Require confirmation when deleting branches is dangerous in some
-     way.  Option ‘magit-no-confirm’ can be customized to not require
-     confirmation in certain cases.  See its docstring to learn why
-     confirmation is required by default in certain cases or if a prompt
-     is confusing.
-
-‘b m’ (‘magit-branch-rename’)
-     Rename a branch.  The branch and the new name are read in the
-     minibuffer.  With prefix argument the branch is renamed even if
-     that name conflicts with an existing branch.
-
- -- User Option: magit-branch-read-upstream-first
-     When creating a branch, whether to read the upstream branch before
-     the name of the branch that is to be created.  The default is ‘t’,
-     and I recommend you leave it at that.
-
- -- User Option: magit-branch-prefer-remote-upstream
-     This option specifies whether remote upstreams are favored over
-     local upstreams when creating new branches.
-
-     When a new branch is created, then the branch, commit, or stash at
-     point is suggested as the starting point of the new branch, or if
-     there is no such revision at point the current branch.  In either
-     case the user may choose another starting point.
-
-     If the chosen starting point is a branch, then it may also be set
-     as the upstream of the new branch, depending on the value of the
-     Git variable ‘branch.autoSetupMerge’.  By default this is done for
-     remote branches, but not for local branches.
-
-     You might prefer to always use some remote branch as upstream.  If
-     the chosen starting point is (1) a local branch, (2) whose name
-     matches a member of the value of this option, (3) the upstream of
-     that local branch is a remote branch with the same name, and (4)
-     that remote branch can be fast-forwarded to the local branch, then
-     the chosen branch is used as starting point, but its own upstream
-     is used as the upstream of the new branch.
-
-     Members of this option’s value are treated as branch names that
-     have to match exactly unless they contain a character that makes
-     them invalid as a branch name.  Recommended characters to use to
-     trigger interpretation as a regexp are "*" and "^".  Some other
-     characters which you might expect to be invalid, actually are not,
-     e.g., ".+$" are all perfectly valid.  More precisely, if ‘git
-     check-ref-format --branch STRING’ exits with a non-zero status,
-     then treat STRING as a regexp.
-
-     Assuming the chosen branch matches these conditions you would end
-     up with with e.g.:
-
-          feature --upstream--> origin/master
-
-     instead of
-
-          feature --upstream--> master --upstream--> origin/master
-
-     Which you prefer is a matter of personal preference.  If you do
-     prefer the former, then you should add branches such as ‘master’,
-     ‘next’, and ‘maint’ to the value of this options.
-
- -- User Option: magit-branch-adjust-remote-upstream-alist
-     The value of this option is an alist of branches to be used as the
-     upstream when branching a remote branch.
-
-     When creating a local branch from an ephemeral branch located on a
-     remote, e.g., a feature or hotfix branch, then that remote branch
-     should usually not be used as the upstream branch, since the
-     push-remote already allows accessing it and having both the
-     upstream and the push-remote reference the same related branch
-     would be wasteful.  Instead a branch like "maint" or "master"
-     should be used as the upstream.
-
-     This option allows specifying the branch that should be used as the
-     upstream when branching certain remote branches.  The value is an
-     alist of the form ‘((UPSTREAM . RULE)...)’.  The first matching
-     element is used, the following elements are ignored.
-
-     UPSTREAM is the branch to be used as the upstream for branches
-     specified by RULE.  It can be a local or a remote branch.
-
-     RULE can either be a regular expression, matching branches whose
-     upstream should be the one specified by UPSTREAM.  Or it can be a
-     list of the only branches that should *not* use UPSTREAM; all other
-     branches will.  Matching is done after stripping the remote part of
-     the name of the branch that is being branched from.
-
-     If you use a finite set of non-ephemeral branches across all your
-     repositories, then you might use something like:
-
-          (("origin/master" . ("master" "next" "maint")))
-
-     Or if the names of all your ephemeral branches contain a slash, at
-     least in some repositories, then a good value could be:
-
-          (("origin/master" . "/"))
-
-     Of course you can also fine-tune:
-
-          (("origin/maint" . "\\`hotfix/")
-           ("origin/master" . "\\`feature/"))
-
-     UPSTREAM can be a local branch:
-
-          (("master" . ("master" "next" "maint")))
-
-   Because the main branch is no longer almost always named "master" you
-should also account for other common names:
-
-     (("main"  . ("main" "master" "next" "maint"))
-      ("master" . ("main" "master" "next" "maint")))
-
- -- Command: magit-branch-orphan
-     This command creates and checks out a new orphan branch with
-     contents from a given revision.
-
- -- Command: magit-branch-or-checkout
-     This command is a hybrid between ‘magit-checkout’ and
-     ‘magit-branch-and-checkout’ and is intended as a replacement for
-     the former in ‘magit-branch’.
-
-     It first asks the user for an existing branch or revision.  If the
-     user input actually can be resolved as a branch or revision, then
-     it checks that out, just like ‘magit-checkout’ would.
-
-     Otherwise it creates and checks out a new branch using the input as
-     its name.  Before doing so it reads the starting-point for the new
-     branch.  This is similar to what ‘magit-branch-and-checkout’ does.
-
-     To use this command instead of ‘magit-checkout’ add this to your
-     init file:
-
-          (transient-replace-suffix 'magit-branch 'magit-checkout
-            '("b" "dwim" magit-branch-or-checkout))
-
-
-File: magit.info,  Node: Branch Git Variables,  Next: Auxiliary Branch Commands,  Prev: Branch Commands,  Up: Branching
-
-6.6.3 Branch Git Variables
---------------------------
-
-These variables can be set from the transient prefix command
-‘magit-branch-configure’.  By default they can also be set from
-‘magit-branch’.  See *note Branch Commands::.
-
- -- Variable: branch.NAME.merge
-     Together with ‘branch.NAME.remote’ this variable defines the
-     upstream branch of the local branch named NAME.  The value of this
-     variable is the full reference of the upstream _branch_.
-
- -- Variable: branch.NAME.remote
-     Together with ‘branch.NAME.merge’ this variable defines the
-     upstream branch of the local branch named NAME.  The value of this
-     variable is the name of the upstream _remote_.
-
- -- Variable: branch.NAME.rebase
-     This variable controls whether pulling into the branch named NAME
-     is done by rebasing or by merging the fetched branch.
-
-        • When ‘true’ then pulling is done by rebasing.
-        • When ‘false’ then pulling is done by merging.
-        • When undefined then the value of ‘pull.rebase’ is used.  The
-          default of that variable is ‘false’.
-
- -- Variable: branch.NAME.pushRemote
-     This variable specifies the remote that the branch named NAME is
-     usually pushed to.  The value has to be the name of an existing
-     remote.
-
-     It is not possible to specify the name of _branch_ to push the
-     local branch to.  The name of the remote branch is always the same
-     as the name of the local branch.
-
-     If this variable is undefined but ‘remote.pushDefault’ is defined,
-     then the value of the latter is used.  By default
-     ‘remote.pushDefault’ is undefined.
-
- -- Variable: branch.NAME.description
-     This variable can be used to describe the branch named NAME.  That
-     description is used, e.g., when turning the branch into a series of
-     patches.
-
-   The following variables specify defaults which are used if the above
-branch-specific variables are not set.
-
- -- Variable: pull.rebase
-     This variable specifies whether pulling is done by rebasing or by
-     merging.  It can be overwritten using ‘branch.NAME.rebase’.
-
-        • When ‘true’ then pulling is done by rebasing.
-        • When ‘false’ (the default) then pulling is done by merging.
-
-     Since it is never a good idea to merge the upstream branch into a
-     feature or hotfix branch and most branches are such branches, you
-     should consider setting this to ‘true’, and ‘branch.master.rebase’
-     to ‘false’.
-
- -- Variable: remote.pushDefault
-     This variable specifies what remote the local branches are usually
-     pushed to.  This can be overwritten per branch using
-     ‘branch.NAME.pushRemote’.
-
-   The following variables are used during the creation of a branch and
-control whether the various branch-specific variables are automatically
-set at this time.
-
- -- Variable: branch.autoSetupMerge
-     This variable specifies under what circumstances creating a branch
-     NAME should result in the variables ‘branch.NAME.merge’ and
-     ‘branch.NAME.remote’ being set according to the starting point used
-     to create the branch.  If the starting point isn’t a branch, then
-     these variables are never set.
-
-        • When ‘always’ then the variables are set regardless of whether
-          the starting point is a local or a remote branch.
-        • When ‘true’ (the default) then the variables are set when the
-          starting point is a remote branch, but not when it is a local
-          branch.
-        • When ‘false’ then the variables are never set.
-
- -- Variable: branch.autoSetupRebase
-     This variable specifies whether creating a branch NAME should
-     result in the variable ‘branch.NAME.rebase’ being set to ‘true’.
-
-        • When ‘always’ then the variable is set regardless of whether
-          the starting point is a local or a remote branch.
-        • When ‘local’ then the variable are set when the starting point
-          is a local branch, but not when it is a remote branch.
-        • When ‘remote’ then the variable are set when the starting
-          point is a remote branch, but not when it is a local branch.
-        • When ‘never’ (the default) then the variable is never set.
-
-   Note that the respective commands always change the repository-local
-values.  If you want to change the global value, which is used when the
-local value is undefined, then you have to do so on the command line,
-e.g.:
-
-     git config --global remote.autoSetupMerge always
-
-   For more information about these variables you should also see *note
-(gitman)git-config::.  Also see *note (gitman)git-branch::.  , *note
-(gitman)git-checkout::.  and *note Pushing::.
-
- -- User Option: magit-prefer-remote-upstream
-     This option controls whether commands that read a branch from the
-     user and then set it as the upstream branch, offer a local or a
-     remote branch as default completion candidate, when they have the
-     choice.
-
-     This affects all commands that use ‘magit-read-upstream-branch’ or
-     ‘magit-read-starting-point’, which includes all commands that
-     change the upstream and many which create new branches.
-
-
-File: magit.info,  Node: Auxiliary Branch Commands,  Prev: Branch Git Variables,  Up: Branching
-
-6.6.4 Auxiliary Branch Commands
--------------------------------
-
-These commands are not available from the transient ‘magit-branch’ by
-default.
-
- -- Command: magit-branch-shelve
-     This command shelves a branch.  This is done by deleting the
-     branch, and creating a new reference "refs/shelved/BRANCH-NAME"
-     pointing at the same commit as the branch pointed at.  If the
-     deleted branch had a reflog, then that is preserved as the reflog
-     of the new reference.
-
-     This is useful if you want to move a branch out of sight, but are
-     not ready to completely discard it yet.
-
- -- Command: magit-branch-unshelve
-     This command unshelves a branch that was previously shelved using
-     ‘magit-branch-shelve’.  This is done by deleting the reference
-     "refs/shelved/BRANCH-NAME" and creating a branch "BRANCH-NAME"
-     pointing at the same commit as the deleted reference pointed at.
-     If the deleted reference had a reflog, then that is restored as the
-     reflog of the branch.
-
-
-File: magit.info,  Node: Merging,  Next: Resolving Conflicts,  Prev: Branching,  Up: Manipulating
-
-6.7 Merging
-===========
-
-Also see *note (gitman)git-merge::.  For information on how to resolve
-merge conflicts see the next section.
-
-‘m’ (‘magit-merge’)
-     This transient prefix command binds the following suffix commands
-     along with the appropriate infix arguments and displays them in a
-     temporary buffer until a suffix is invoked.
-
-   When no merge is in progress, then the transient features the
-following suffix commands.
-
-‘m m’ (‘magit-merge-plain’)
-     This command merges another branch or an arbitrary revision into
-     the current branch.  The branch or revision to be merged is read in
-     the minibuffer and defaults to the branch at point.
-
-     Unless there are conflicts or a prefix argument is used, then the
-     resulting merge commit uses a generic commit message, and the user
-     does not get a chance to inspect or change it before the commit is
-     created.  With a prefix argument this does not actually create the
-     merge commit, which makes it possible to inspect how conflicts were
-     resolved and to adjust the commit message.
-
-‘m e’ (‘magit-merge-editmsg’)
-     This command merges another branch or an arbitrary revision into
-     the current branch and opens a commit message buffer, so that the
-     user can make adjustments.  The commit is not actually created
-     until the user finishes with ‘C-c C-c’.
-
-‘m n’ (‘magit-merge-nocommit’)
-     This command merges another branch or an arbitrary revision into
-     the current branch, but does not actually create the merge commit.
-     The user can then further adjust the merge, even when automatic
-     conflict resolution succeeded and/or adjust the commit message.
-
-‘m a’ (‘magit-merge-absorb’)
-     This command merges another local branch into the current branch
-     and then removes the former.
-
-     Before the source branch is merged, it is first force pushed to its
-     push-remote, provided the respective remote branch already exists.
-     This ensures that the respective pull-request (if any) won’t get
-     stuck on some obsolete version of the commits that are being
-     merged.  Finally, if ‘magit-branch-pull-request’ was used to create
-     the merged branch, then the respective remote branch is also
-     removed.
-
-‘m i’ (‘magit-merge-into’)
-     This command merges the current branch into another local branch
-     and then removes the former.  The latter becomes the new current
-     branch.
-
-     Before the source branch is merged, it is first force pushed to its
-     push-remote, provided the respective remote branch already exists.
-     This ensures that the respective pull-request (if any) won’t get
-     stuck on some obsolete version of the commits that are being
-     merged.  Finally, if ‘magit-branch-pull-request’ was used to create
-     the merged branch, then the respective remote branch is also
-     removed.
-
-‘m s’ (‘magit-merge-squash’)
-     This command squashes the changes introduced by another branch or
-     an arbitrary revision into the current branch.  This only applies
-     the changes made by the squashed commits.  No information is
-     preserved that would allow creating an actual merge commit.
-     Instead of this command you should probably use a command from the
-     apply transient.
-
-‘m p’ (‘magit-merge-preview’)
-     This command shows a preview of merging another branch or an
-     arbitrary revision into the current branch.
-
-     Note that commands, that normally change how a diff is displayed,
-     do not work in buffers created by this command, because the
-     underlying Git command does not support diff arguments.
-
-   When a merge is in progress, then the transient instead features the
-following suffix commands.
-
-‘m m’ (‘magit-merge’)
-     After the user resolved conflicts, this command proceeds with the
-     merge.  If some conflicts weren’t resolved, then this command
-     fails.
-
-‘m a’ (‘magit-merge-abort’)
-     This command aborts the current merge operation.
-
-
-File: magit.info,  Node: Resolving Conflicts,  Next: Rebasing,  Prev: Merging,  Up: Manipulating
-
-6.8 Resolving Conflicts
-=======================
-
-When merging branches (or otherwise combining or changing history)
-conflicts can occur.  If you edited two completely different parts of
-the same file in two branches and then merge one of these branches into
-the other, then Git can resolve that on its own, but if you edit the
-same area of a file, then a human is required to decide how the two
-versions, or "sides of the conflict", are to be combined into one.
-
-   Here we can only provide a brief introduction to the subject and
-point you toward some tools that can help.  If you are new to this, then
-please also consult Git’s own documentation as well as other resources.
-
-   If a file has conflicts and Git cannot resolve them by itself, then
-it puts both versions into the affected file along with special markers
-whose purpose is to denote the boundaries of the unresolved part of the
-file and between the different versions.  These boundary lines begin
-with the strings consisting of seven times the same character, one of
-‘<’, ‘|’, ‘=’ and ‘>’, and are followed by information about the source
-of the respective versions, e.g.:
-
-     <<<<<<< HEAD
-     Take the blue pill.
-     =======
-     Take the red pill.
-     >>>>>>> feature
-
-   In this case you have chosen to take the red pill on one branch and
-on another you picked the blue pill.  Now that you are merging these two
-diverging branches, Git cannot possibly know which pill you want to
-take.
-
-   To resolve that conflict you have to create a version of the affected
-area of the file by keeping only one of the sides, possibly by editing
-it in order to bring in the changes from the other side, remove the
-other versions as well as the markers, and then stage the result.  A
-possible resolution might be:
-
-     Take both pills.
-
-   Often it is useful to see not only the two sides of the conflict but
-also the "original" version from before the same area of the file was
-modified twice on different branches.  Instruct Git to insert that
-version as well by running this command once:
-
-     git config --global merge.conflictStyle diff3
-
-   The above conflict might then have looked like this:
-
-     <<<<<<< HEAD
-     Take the blue pill.
-     ||||||| merged common ancestors
-     Take either the blue or the red pill, but not both.
-     =======
-     Take the red pill.
-     >>>>>>> feature
-
-   If that were the case, then the above conflict resolution would not
-have been correct, which demonstrates why seeing the original version
-alongside the conflicting versions can be useful.
-
-   You can perform the conflict resolution completely by hand, but Emacs
-also provides some packages that help in the process: Smerge, Ediff
-(*note (ediff)Top::), and Emerge (*note (emacs)Emerge::).  Magit does
-not provide its own tools for conflict resolution, but it does make
-using Smerge and Ediff more convenient.  (Ediff supersedes Emerge, so
-you probably don’t want to use the latter anyway.)
-
-   In the Magit status buffer, files with unresolved conflicts are
-listed in the "Unstaged changes" and/or "Staged changes" sections.  They
-are prefixed with the word "unmerged", which in this context essentially
-is a synonym for "unresolved".
-
-   Pressing ‘RET’ while point is on such a file section shows a buffer
-visiting that file, turns on ‘smerge-mode’ in that buffer, and places
-point inside the first area with conflicts.  You should then resolve
-that conflict using regular edit commands and/or Smerge commands.
-
-   Unfortunately Smerge does not have a manual, but you can get a list
-of commands and binding ‘C-c ^ C-h’ and press ‘RET’ while point is on a
-command name to read its documentation.
-
-   Normally you would edit one version and then tell Smerge to keep only
-that version.  Use ‘C-c ^ m’ (‘smerge-keep-mine’) to keep the ‘HEAD’
-version or ‘C-c ^ o’ (‘smerge-keep-other’) to keep the version that
-follows "|||||||".  Then use ‘C-c ^ n’ to move to the next conflicting
-area in the same file.  Once you are done resolving conflicts, return to
-the Magit status buffer.  The file should now be shown as "modified", no
-longer as "unmerged", because Smerge automatically stages the file when
-you save the buffer after resolving the last conflict.
-
-   Magit now wraps the mentioned Smerge commands, allowing you to use
-these key bindings without having to go to the file-visiting buffer.
-Additionally ‘k’ (‘magit-discard’) on a hunk with unresolved conflicts
-asks which side to keep or, if point is on a side, then it keeps it
-without prompting.  Similarly ‘k’ on a unresolved file ask which side to
-keep.
-
-   Alternatively you could use Ediff, which uses separate buffers for
-the different versions of the file.  To resolve conflicts in a file
-using Ediff press ‘e’ while point is on such a file in the status
-buffer.
-
-   Ediff can be used for other purposes as well.  For more information
-on how to enter Ediff from Magit, see *note Ediffing::.  Explaining how
-to use Ediff is beyond the scope of this manual, instead see *note
-(ediff)Top::.
-
-   If you are unsure whether you should Smerge or Ediff, then use the
-former.  It is much easier to understand and use, and except for truly
-complex conflicts, the latter is usually overkill.
-
-
-File: magit.info,  Node: Rebasing,  Next: Cherry Picking,  Prev: Resolving Conflicts,  Up: Manipulating
-
-6.9 Rebasing
-============
-
-Also see *note (gitman)git-rebase::.  For information on how to resolve
-conflicts that occur during rebases see the preceding section.
-
-‘r’ (‘magit-rebase’)
-     This transient prefix command binds the following suffix commands
-     along with the appropriate infix arguments and displays them in a
-     temporary buffer until a suffix is invoked.
-
-   When no rebase is in progress, then the transient features the
-following suffix commands.
-
-   Using one of these commands _starts_ a rebase sequence.  Git might
-then stop somewhere along the way, either because you told it to do so,
-or because applying a commit failed due to a conflict.  When that
-happens, then the status buffer shows information about the rebase
-sequence which is in progress in a section similar to a log section.
-See *note Information About In-Progress Rebase::.
-
-   For information about the upstream and the push-remote, see *note The
-Two Remotes::.
-
-‘r p’ (‘magit-rebase-onto-pushremote’)
-     This command rebases the current branch onto its push-remote.
-
-     With a prefix argument or when the push-remote is either not
-     configured or unusable, then let the user first configure the
-     push-remote.
-
-‘r u’ (‘magit-rebase-onto-upstream’)
-     This command rebases the current branch onto its upstream branch.
-
-     With a prefix argument or when the upstream is either not
-     configured or unusable, then let the user first configure the
-     upstream.
-
-‘r e’ (‘magit-rebase-branch’)
-     This command rebases the current branch onto a branch read in the
-     minibuffer.  All commits that are reachable from head but not from
-     the selected branch TARGET are being rebased.
-
-‘r s’ (‘magit-rebase-subset’)
-     This command starts a non-interactive rebase sequence to transfer
-     commits from START to ‘HEAD’ onto NEWBASE.  START has to be
-     selected from a list of recent commits.
-
-   By default Magit uses the ‘--autostash’ argument, which causes
-uncommitted changes to be stored in a stash before the rebase begins.
-These changes are restored after the rebase completes and if possible
-the stash is removed.  If the stash does not apply cleanly, then the
-stash is not removed.  In case something goes wrong when resolving the
-conflicts, this allows you to start over.
-
-   Even though one of the actions is dedicated to interactive rebases,
-the transient also features the infix argument ‘--interactive’.  This
-can be used to turn one of the other, non-interactive rebase variants
-into an interactive rebase.
-
-   For example if you want to clean up a feature branch and at the same
-time rebase it onto ‘master’, then you could use ‘r-iu’.  But we
-recommend that you instead do that in two steps.  First use ‘ri’ to
-cleanup the feature branch, and then in a second step ‘ru’ to rebase it
-onto ‘master’.  That way if things turn out to be more complicated than
-you thought and/or you make a mistake and have to start over, then you
-only have to redo half the work.
-
-   Explicitly enabling ‘--interactive’ won’t have an effect on the
-following commands as they always use that argument anyway, even if it
-is not enabled in the transient.
-
-‘r i’ (‘magit-rebase-interactive’)
-     This command starts an interactive rebase sequence.
-
-‘r f’ (‘magit-rebase-autosquash’)
-     This command combines squash and fixup commits with their intended
-     targets.
-
-‘r m’ (‘magit-rebase-edit-commit’)
-     This command starts an interactive rebase sequence that lets the
-     user edit a single older commit.
-
-‘r w’ (‘magit-rebase-reword-commit’)
-     This command starts an interactive rebase sequence that lets the
-     user reword a single older commit.
-
-‘r k’ (‘magit-rebase-remove-commit’)
-     This command removes a single older commit using rebase.
-
-   When a rebase is in progress, then the transient instead features the
-following suffix commands.
-
-‘r r’ (‘magit-rebase-continue’)
-     This command restart the current rebasing operation.
-
-     In some cases this pops up a commit message buffer for you do edit.
-     With a prefix argument the old message is reused as-is.
-
-‘r s’ (‘magit-rebase-skip’)
-     This command skips the current commit and restarts the current
-     rebase operation.
-
-‘r e’ (‘magit-rebase-edit’)
-     This command lets the user edit the todo list of the current rebase
-     operation.
-
-‘r a’ (‘magit-rebase-abort’)
-     This command aborts the current rebase operation, restoring the
-     original branch.
-
-* Menu:
-
-* Editing Rebase Sequences::
-* Information About In-Progress Rebase::
-
-
-File: magit.info,  Node: Editing Rebase Sequences,  Next: Information About In-Progress Rebase,  Up: Rebasing
-
-6.9.1 Editing Rebase Sequences
-------------------------------
-
-‘C-c C-c’ (‘with-editor-finish’)
-     Finish the current editing session by returning with exit code 0.
-     Git then uses the rebase instructions it finds in the file.
-
-‘C-c C-k’ (‘with-editor-cancel’)
-     Cancel the current editing session by returning with exit code 1.
-     Git then forgoes starting the rebase sequence.
-
-‘<RET>’ (‘git-rebase-show-commit’)
-     Show the commit on the current line in another buffer and select
-     that buffer.
-
-‘<SPC>’ (‘git-rebase-show-or-scroll-up’)
-     Show the commit on the current line in another buffer without
-     selecting that buffer.  If the revision buffer is already visible
-     in another window of the current frame, then instead scroll that
-     window up.
-
-‘<DEL>’ (‘git-rebase-show-or-scroll-down’)
-     Show the commit on the current line in another buffer without
-     selecting that buffer.  If the revision buffer is already visible
-     in another window of the current frame, then instead scroll that
-     window down.
-
-‘p’ (‘git-rebase-backward-line’)
-     Move to previous line.
-
-‘n’ (‘forward-line’)
-     Move to next line.
-
-‘M-p’ (‘git-rebase-move-line-up’)
-     Move the current commit (or command) up.
-
-‘M-n’ (‘git-rebase-move-line-down’)
-     Move the current commit (or command) down.
-
-‘r’ (‘git-rebase-reword’)
-     Edit message of commit on current line.
-
-‘e’ (‘git-rebase-edit’)
-     Stop at the commit on the current line.
-
-‘s’ (‘git-rebase-squash’)
-     Meld commit on current line into previous commit, and edit message.
-
-‘f’ (‘git-rebase-fixup’)
-     Meld commit on current line into previous commit, discarding the
-     current commit’s message.
-
-‘k’ (‘git-rebase-kill-line’)
-     Kill the current action line.
-
-‘c’ (‘git-rebase-pick’)
-     Use commit on current line.
-
-‘x’ (‘git-rebase-exec’)
-     Insert a shell command to be run after the proceeding commit.
-
-     If there already is such a command on the current line, then edit
-     that instead.  With a prefix argument insert a new command even
-     when there already is one on the current line.  With empty input
-     remove the command on the current line, if any.
-
-‘b’ (‘git-rebase-break’)
-     Insert a break action before the current line, instructing Git to
-     return control to the user.
-
-‘y’ (‘git-rebase-insert’)
-     Read an arbitrary commit and insert it below current line.
-
-‘C-x u’ (‘git-rebase-undo’)
-     Undo some previous changes.  Like ‘undo’ but works in read-only
-     buffers.
-
- -- User Option: git-rebase-auto-advance
-     Whether to move to next line after changing a line.
-
- -- User Option: git-rebase-show-instructions
-     Whether to show usage instructions inside the rebase buffer.
-
- -- User Option: git-rebase-confirm-cancel
-     Whether confirmation is required to cancel.
-
-   When a rebase is performed with the ‘--rebase-merges’ option, the
-sequence will include a few other types of actions and the following
-commands become relevant.
-
-‘l’ (‘git-rebase-label’)
-     This commands inserts a label action or edits the one at point.
-
-‘t’ (‘git-rebase-reset’)
-     This command inserts a reset action or edits the one at point.  The
-     prompt will offer the labels that are currently present in the
-     buffer.
-
-‘MM’ (‘git-rebase-merge’)
-     The command inserts a merge action or edits the one at point.  The
-     prompt will offer the labels that are currently present in the
-     buffer.  Specifying a message to reuse via ‘-c’ or ‘-C’ is not
-     supported; an editor will always be invoked for the merge.
-
-‘Mt’ (‘git-rebase-merge-toggle-editmsg’)
-     This command toggles between the ‘-C’ and ‘-c’ options of the merge
-     action at point.  These options both specify a commit whose message
-     should be reused.  The lower-case variant instructs Git to invoke
-     the editor when creating the merge, allowing the user to edit the
-     message.
-
-
-File: magit.info,  Node: Information About In-Progress Rebase,  Prev: Editing Rebase Sequences,  Up: Rebasing
-
-6.9.2 Information About In-Progress Rebase
-------------------------------------------
-
-While a rebase sequence is in progress, the status buffer features a
-section that lists the commits that have already been applied as well as
-the commits that still have to be applied.
-
-   The commits are split in two halves.  When rebase stops at a commit,
-either because the user has to deal with a conflict or because s/he
-explicitly requested that rebase stops at that commit, then point is
-placed on the commit that separates the two groups, i.e., on ‘HEAD’.
-The commits above it have not been applied yet, while the ‘HEAD’ and the
-commits below it have already been applied.  In between these two groups
-of applied and yet-to-be applied commits, there sometimes is a commit
-which has been dropped.
-
-   Each commit is prefixed with a word and these words are additionally
-shown in different colors to indicate the status of the commits.
-
-   The following colors are used:
-
-   • Commits that use the same foreground color as the ‘default’ face
-     have not been applied yet.
-
-   • Yellow commits have some special relationship to the commit rebase
-     stopped at.  This is used for the words "join", "goal", "same" and
-     "work" (see below).
-
-   • Gray commits have already been applied.
-
-   • The blue commit is the ‘HEAD’ commit.
-
-   • The green commit is the commit the rebase sequence stopped at.  If
-     this is the same commit as ‘HEAD’ (e.g., because you haven’t done
-     anything yet after rebase stopped at the commit, then this commit
-     is shown in blue, not green).  There can only be a green *and* a
-     blue commit at the same time, if you create one or more new commits
-     after rebase stops at a commit.
-
-   • Red commits have been dropped.  They are shown for reference only,
-     e.g., to make it easier to diff.
-
-   Of course these colors are subject to the color-theme in use.
-
-   The following words are used:
-
-   • Commits prefixed with ‘pick’, ‘reword’, ‘edit’, ‘squash’, and
-     ‘fixup’ have not been applied yet.  These words have the same
-     meaning here as they do in the buffer used to edit the rebase
-     sequence.  See *note Editing Rebase Sequences::.  When the
-     ‘--rebase-merges’ option was specified, ‘reset’, ‘label’, and
-     ‘merge’ lines may also be present.
-
-   • Commits prefixed with ‘done’ and ‘onto’ have already been applied.
-     It is possible for such a commit to be the ‘HEAD’, in which case it
-     is blue.  Otherwise it is grey.
-
-        • The commit prefixed with ‘onto’ is the commit on top of which
-          all the other commits are being re-applied.  This commit
-          itself did not have to be re-applied, it is the commit rebase
-          did rewind to before starting to re-apply other commits.
-
-        • Commits prefixed with ‘done’ have already been re-applied.
-          This includes commits that have been re-applied but also new
-          commits that you have created during the rebase.
-
-   • All other commits, those not prefixed with any of the above words,
-     are in some way related to the commit at which rebase stopped.
-
-     To determine whether a commit is related to the stopped-at commit
-     their hashes, trees and patch-ids (1) are being compared.  The
-     commit message is not used for this purpose.
-
-     Generally speaking commits that are related to the stopped-at
-     commit can have any of the used colors, though not all color/word
-     combinations are possible.
-
-     Words used for stopped-at commits are:
-
-        • When a commit is prefixed with ‘void’, then that indicates
-          that Magit knows for sure that all the changes in that commit
-          have been applied using several new commits.  This commit is
-          no longer reachable from ‘HEAD’, and it also isn’t one of the
-          commits that will be applied when resuming the session.
-
-        • When a commit is prefixed with ‘join’, then that indicates
-          that the rebase sequence stopped at that commit due to a
-          conflict - you now have to join (merge) the changes with what
-          has already been applied.  In a sense this is the commit
-          rebase stopped at, but while its effect is already in the
-          index and in the worktree (with conflict markers), the commit
-          itself has not actually been applied yet (it isn’t the
-          ‘HEAD’).  So it is shown in yellow, like the other commits
-          that still have to be applied.
-
-        • When a commit is prefixed with ‘stop’ or a _blue_ or _green_
-          ‘same’, then that indicates that rebase stopped at this
-          commit, that it is still applied or has been applied again,
-          and that at least its patch-id is unchanged.
-
-             • When a commit is prefixed with ‘stop’, then that
-               indicates that rebase stopped at that commit because you
-               requested that earlier, and its patch-id is unchanged.
-               It might even still be the exact same commit.
-
-             • When a commit is prefixed with a _blue_ or _green_
-               ‘same’, then that indicates that while its tree or hash
-               changed, its patch-id did not.  If it is blue, then it is
-               the ‘HEAD’ commit (as always for blue).  When it is
-               green, then it no longer is ‘HEAD’ because other commit
-               have been created since (but before continuing the
-               rebase).
-
-        • When a commit is prefixed with ‘goal’, a _yellow_ ‘same,’ or
-          ‘work’, then that indicates that rebase applied that commit
-          but that you then reset ‘HEAD’ to an earlier commit (likely to
-          split it up into multiple commits), and that there are some
-          uncommitted changes remaining which likely (but not
-          necessarily) originate from that commit.
-
-             • When a commit is prefixed with ‘goal’, then that
-               indicates that it is still possible to create a new
-               commit with the exact same tree (the "goal") without
-               manually editing any files, by committing the index, or
-               by staging all changes and then committing that.  This is
-               the case when the original tree still exists in the index
-               or worktree in untainted form.
-
-             • When a commit is prefixed with a yellow ‘same’, then that
-               indicates that it is no longer possible to create a
-               commit with the exact same tree, but that it is still
-               possible to create a commit with the same patch-id.  This
-               would be the case if you created a new commit with other
-               changes, but the changes from the original commit still
-               exist in the index or working tree in untainted form.
-
-             • When a commit is prefixed with ‘work’, then that
-               indicates that you reset ‘HEAD’ to an earlier commit, and
-               that there are some staged and/or unstaged changes
-               (likely, but not necessarily) originating from that
-               commit.  However it is no longer possible to create a new
-               commit with the same tree or at least the same patch-id
-               because you have already made other changes.
-
-        • When a commit is prefixed with ‘poof’ or ‘gone’, then that
-          indicates that rebase applied that commit but that you then
-          reset ‘HEAD’ to an earlier commit (likely to split it up into
-          multiple commits), and that there are no uncommitted changes.
-
-             • When a commit is prefixed with ‘poof’, then that
-               indicates that it is no longer reachable from ‘HEAD’, but
-               that it has been replaced with one or more commits, which
-               together have the exact same effect.
-
-             • When a commit is prefixed with ‘gone’, then that
-               indicates that it is no longer reachable from ‘HEAD’ and
-               that we also cannot determine whether its changes are
-               still in effect in one or more new commits.  They might
-               be, but if so, then there must also be other changes
-               which makes it impossible to know for sure.
-
-   Do not worry if you do not fully understand the above.  That’s okay,
-you will acquire a good enough understanding through practice.
-
-   For other sequence operations such as cherry-picking, a similar
-section is displayed, but they lack some of the features described
-above, due to limitations in the git commands used to implement them.
-Most importantly these sequences only support "picking" a commit but not
-other actions such as "rewording", and they do not keep track of the
-commits which have already been applied.
-
-   ---------- Footnotes ----------
-
-   (1) The patch-id is a hash of the _changes_ introduced by a commit.
-It differs from the hash of the commit itself, which is a hash of the
-result of applying that change (i.e., the resulting trees and blobs) as
-well as author and committer information, the commit message, and the
-hashes of the parents of the commit.  The patch-id hash on the other
-hand is created only from the added and removed lines, even line numbers
-and whitespace changes are ignored when calculating this hash.  The
-patch-ids of two commits can be used to answer the question "Do these
-commits make the same change?".
-
-
-File: magit.info,  Node: Cherry Picking,  Next: Resetting,  Prev: Rebasing,  Up: Manipulating
-
-6.10 Cherry Picking
-===================
-
-Also see *note (gitman)git-cherry-pick::.
-
-‘A’ (‘magit-cherry-pick’)
-     This transient prefix command binds the following suffix commands
-     along with the appropriate infix arguments and displays them in a
-     temporary buffer until a suffix is invoked.
-
-   When no cherry-pick or revert is in progress, then the transient
-features the following suffix commands.
-
-‘A A’ (‘magit-cherry-copy’)
-     This command copies COMMITS from another branch onto the current
-     branch.  If the region selects multiple commits, then those are
-     copied, without prompting.  Otherwise the user is prompted for a
-     commit or range, defaulting to the commit at point.
-
-‘A a’ (‘magit-cherry-apply’)
-     This command applies the changes in COMMITS from another branch
-     onto the current branch.  If the region selects multiple commits,
-     then those are used, without prompting.  Otherwise the user is
-     prompted for a commit or range, defaulting to the commit at point.
-
-     This command also has a top-level binding, which can be invoked
-     without using the transient by typing ‘a’ at the top-level.
-
-   The following commands not only apply some commits to some branch,
-but also remove them from some other branch.  The removal is performed
-using either ‘git-update-ref’ or if necessary ‘git-rebase’.  Both
-applying commits as well as removing them using ‘git-rebase’ can lead to
-conflicts.  If that happens, then these commands abort and you not only
-have to resolve the conflicts but also finish the process the same way
-you would have to if these commands didn’t exist at all.
-
-‘A h’ (‘magit-cherry-harvest’)
-     This command moves the selected COMMITS that must be located on
-     another BRANCH onto the current branch instead, removing them from
-     the former.  When this command succeeds, then the same branch is
-     current as before.
-
-     Applying the commits on the current branch or removing them from
-     the other branch can lead to conflicts.  When that happens, then
-     this command stops and you have to resolve the conflicts and then
-     finish the process manually.
-
-‘A d’ (‘magit-cherry-donate’)
-     This command moves the selected COMMITS from the current branch
-     onto another existing BRANCH, removing them from the former.  When
-     this command succeeds, then the same branch is current as before.
-     ‘HEAD’ is allowed to be detached initially.
-
-     Applying the commits on the other branch or removing them from the
-     current branch can lead to conflicts.  When that happens, then this
-     command stops and you have to resolve the conflicts and then finish
-     the process manually.
-
-‘A n’ (‘magit-cherry-spinout’)
-     This command moves the selected COMMITS from the current branch
-     onto a new branch BRANCH, removing them from the former.  When this
-     command succeeds, then the same branch is current as before.
-
-     Applying the commits on the other branch or removing them from the
-     current branch can lead to conflicts.  When that happens, then this
-     command stops and you have to resolve the conflicts and then finish
-     the process manually.
-
-‘A s’ (‘magit-cherry-spinoff’)
-     This command moves the selected COMMITS from the current branch
-     onto a new branch BRANCH, removing them from the former.  When this
-     command succeeds, then the new branch is checked out.
-
-     Applying the commits on the other branch or removing them from the
-     current branch can lead to conflicts.  When that happens, then this
-     command stops and you have to resolve the conflicts and then finish
-     the process manually.
-
-   When a cherry-pick or revert is in progress, then the transient
-instead features the following suffix commands.
-
-‘A A’ (‘magit-sequence-continue’)
-     Resume the current cherry-pick or revert sequence.
-
-‘A s’ (‘magit-sequence-skip’)
-     Skip the stopped at commit during a cherry-pick or revert sequence.
-
-‘A a’ (‘magit-sequence-abort’)
-     Abort the current cherry-pick or revert sequence.  This discards
-     all changes made since the sequence started.
-
-* Menu:
-
-* Reverting::
-
-
-File: magit.info,  Node: Reverting,  Up: Cherry Picking
-
-6.10.1 Reverting
-----------------
-
-‘V’ (‘magit-revert’)
-     This transient prefix command binds the following suffix commands
-     along with the appropriate infix arguments and displays them in a
-     temporary buffer until a suffix is invoked.
-
-   When no cherry-pick or revert is in progress, then the transient
-features the following suffix commands.
-
-‘V V’ (‘magit-revert-and-commit’)
-     Revert a commit by creating a new commit.  Prompt for a commit,
-     defaulting to the commit at point.  If the region selects multiple
-     commits, then revert all of them, without prompting.
-
-‘V v’ (‘magit-revert-no-commit’)
-     Revert a commit by applying it in reverse to the working tree.
-     Prompt for a commit, defaulting to the commit at point.  If the
-     region selects multiple commits, then revert all of them, without
-     prompting.
-
-   When a cherry-pick or revert is in progress, then the transient
-instead features the following suffix commands.
-
-‘V V’ (‘magit-sequence-continue’)
-     Resume the current cherry-pick or revert sequence.
-
-‘V s’ (‘magit-sequence-skip’)
-     Skip the stopped at commit during a cherry-pick or revert sequence.
-
-‘V a’ (‘magit-sequence-abort’)
-     Abort the current cherry-pick or revert sequence.  This discards
-     all changes made since the sequence started.
-
-
-File: magit.info,  Node: Resetting,  Next: Stashing,  Prev: Cherry Picking,  Up: Manipulating
-
-6.11 Resetting
-==============
-
-Also see *note (gitman)git-reset::.
-
-‘x’ (‘magit-reset-quickly’)
-     Reset the ‘HEAD’ and index to some commit read from the user and
-     defaulting to the commit at point, and possibly also reset the
-     working tree.  With a prefix argument reset the working tree
-     otherwise don’t.
-
-‘X m’ (‘magit-reset-mixed’)
-     Reset the ‘HEAD’ and index to some commit read from the user and
-     defaulting to the commit at point.  The working tree is kept as-is.
-
-‘X s’ (‘magit-reset-soft’)
-     Reset the ‘HEAD’ to some commit read from the user and defaulting
-     to the commit at point.  The index and the working tree are kept
-     as-is.
-
-‘X h’ (‘magit-reset-hard’)
-     Reset the ‘HEAD’, index, and working tree to some commit read from
-     the user and defaulting to the commit at point.
-
-‘X k’ (‘magit-reset-keep’)
-     Reset the ‘HEAD’, index, and working tree to some commit read from
-     the user and defaulting to the commit at point.  Uncommitted
-     changes are kept as-is.
-
-‘X i’ (‘magit-reset-index’)
-     Reset the index to some commit read from the user and defaulting to
-     the commit at point.  Keep the ‘HEAD’ and working tree as-is, so if
-     the commit refers to the ‘HEAD’, then this effectively unstages all
-     changes.
-
-‘X w’ (‘magit-reset-worktree’)
-     Reset the working tree to some commit read from the user and
-     defaulting to the commit at point.  Keep the ‘HEAD’ and index
-     as-is.
-
-‘X f’ (‘magit-file-checkout’)
-     Update file in the working tree and index to the contents from a
-     revision.  Both the revision and file are read from the user.
-
-
-File: magit.info,  Node: Stashing,  Prev: Resetting,  Up: Manipulating
-
-6.12 Stashing
-=============
-
-Also see *note (gitman)git-stash::.
-
-‘z’ (‘magit-stash’)
-     This transient prefix command binds the following suffix commands
-     along with the appropriate infix arguments and displays them in a
-     temporary buffer until a suffix is invoked.
-
-‘z z’ (‘magit-stash-both’)
-     Create a stash of the index and working tree.  Untracked files are
-     included according to infix arguments.  One prefix argument is
-     equivalent to ‘--include-untracked’ while two prefix arguments are
-     equivalent to ‘--all’.
-
-‘z i’ (‘magit-stash-index’)
-     Create a stash of the index only.  Unstaged and untracked changes
-     are not stashed.
-
-‘z w’ (‘magit-stash-worktree’)
-     Create a stash of unstaged changes in the working tree.  Untracked
-     files are included according to infix arguments.  One prefix
-     argument is equivalent to ‘--include-untracked’ while two prefix
-     arguments are equivalent to ‘--all’.
-
-‘z x’ (‘magit-stash-keep-index’)
-     Create a stash of the index and working tree, keeping index intact.
-     Untracked files are included according to infix arguments.  One
-     prefix argument is equivalent to ‘--include-untracked’ while two
-     prefix arguments are equivalent to ‘--all’.
-
-‘z Z’ (‘magit-snapshot-both’)
-     Create a snapshot of the index and working tree.  Untracked files
-     are included according to infix arguments.  One prefix argument is
-     equivalent to ‘--include-untracked’ while two prefix arguments are
-     equivalent to ‘--all’.
-
-‘z I’ (‘magit-snapshot-index’)
-     Create a snapshot of the index only.  Unstaged and untracked
-     changes are not stashed.
-
-‘z W’ (‘magit-snapshot-worktree’)
-     Create a snapshot of unstaged changes in the working tree.
-     Untracked files are included according to infix arguments.  One
-     prefix argument is equivalent to ‘--include-untracked’ while two
-     prefix arguments are equivalent to ‘--all’-.
-
-‘z a’ (‘magit-stash-apply’)
-     Apply a stash to the working tree.
-
-     First try ‘git stash apply --index’, which tries to preserve the
-     index stored in the stash, if any.  This may fail because applying
-     the stash could result in conflicts and those have to be stored in
-     the index, making it impossible to also store the stash’s index
-     there as well.
-
-     If the above failed, then try ‘git stash apply’.  This fails (with
-     or without ‘--index’) if there are any uncommitted changes to files
-     that are also modified in the stash.
-
-     If both of the above failed, then apply using ‘git apply’.  If
-     there are no conflicting files, use ‘--3way’.  If there are
-     conflicting files, then using ‘--3way’ requires that those files
-     are staged first, which may be undesirable, so prompt the user
-     whether to use ‘--3way’ or ‘--reject’.
-
-     Customize ‘magit-no-confirm’ if you want to always use ‘--3way’,
-     without being prompted.
-
-‘z p’ (‘magit-stash-pop’)
-     Apply a stash to the working tree.  On complete success (if the
-     stash can be applied without any conflicts, and while preserving
-     the stash’s index) then remove the stash from stash list.
-
-     First try ‘git stash pop --index’, which tries to preserve the
-     index stored in the stash, if any.  This may fail because applying
-     the stash could result in conflicts and those have to be stored in
-     the index, making it impossible to also store the stash’s index
-     there as well.
-
-     If the above failed, then try ‘git stash apply’.  This fails (with
-     or without ‘--index’) if there are any uncommitted changes to files
-     that are also modified in the stash.
-
-     If both of the above failed, then apply using ‘git apply’.  If
-     there are no conflicting files, use ‘--3way’.  If there are
-     conflicting files, then using ‘--3way’ requires that those files
-     are staged first, which may be undesirable, so prompt the user
-     whether to use ‘--3way’ or ‘--reject’.
-
-     Customize ‘magit-no-confirm’ if you want to always use ‘--3way’,
-     without being prompted.
-
-‘z k’ (‘magit-stash-drop’)
-     Remove a stash from the stash list.  When the region is active,
-     offer to drop all contained stashes.
-
-‘z v’ (‘magit-stash-show’)
-     Show all diffs of a stash in a buffer.
-
-‘z b’ (‘magit-stash-branch’)
-     Create and checkout a new branch from an existing stash.  The new
-     branch starts at the commit that was current when the stash was
-     created.
-
-‘z B’ (‘magit-stash-branch-here’)
-     Create and checkout a new branch from an existing stash.  Use the
-     current branch or ‘HEAD’ as the starting-point of the new branch.
-     Then apply the stash, dropping it if it applies cleanly.
-
-‘z f’ (‘magit-stash-format-patch’)
-     Create a patch from STASH.
-
-‘k’ (‘magit-stash-clear’)
-     Remove all stashes saved in REF’s reflog by deleting REF.
-
-‘z l’ (‘magit-stash-list’)
-     List all stashes in a buffer.
-
- -- User Option: magit-stashes-margin
-     This option specifies whether the margin is initially shown in
-     stashes buffers and how it is formatted.
-
-     The value has the form ‘(INIT STYLE WIDTH AUTHOR AUTHOR-WIDTH)’.
-
-        • If INIT is non-nil, then the margin is shown initially.
-        • STYLE controls how to format the author or committer date.  It
-          can be one of ‘age’ (to show the age of the commit),
-          ‘age-abbreviated’ (to abbreviate the time unit to a
-          character), or a string (suitable for ‘format-time-string’) to
-          show the actual date.  Option
-          ‘magit-log-margin-show-committer-date’ controls which date is
-          being displayed.
-        • WIDTH controls the width of the margin.  This exists for
-          forward compatibility and currently the value should not be
-          changed.
-        • AUTHOR controls whether the name of the author is also shown
-          by default.
-        • AUTHOR-WIDTH has to be an integer.  When the name of the
-          author is shown, then this specifies how much space is used to
-          do so.
-
-
-File: magit.info,  Node: Transferring,  Next: Miscellaneous,  Prev: Manipulating,  Up: Top
-
-7 Transferring
-**************
-
-* Menu:
-
-* Remotes::
-* Fetching::
-* Pulling::
-* Pushing::
-* Plain Patches::
-* Maildir Patches::
-
-
-File: magit.info,  Node: Remotes,  Next: Fetching,  Up: Transferring
-
-7.1 Remotes
-===========
-
-* Menu:
-
-* Remote Commands::
-* Remote Git Variables::
-
-
-File: magit.info,  Node: Remote Commands,  Next: Remote Git Variables,  Up: Remotes
-
-7.1.1 Remote Commands
----------------------
-
-The transient prefix command ‘magit-remote’ is used to add remotes and
-to make changes to existing remotes.  This command only deals with
-remotes themselves, not with branches or the transfer of commits.  Those
-features are available from separate transient commands.
-
-   Also see *note (gitman)git-remote::.
-
-‘M’ (‘magit-remote’)
-     This transient prefix command binds the following suffix commands
-     and displays them in a temporary buffer until a suffix is invoked.
-
-     By default it also binds and displays the values of some
-     remote-related Git variables and allows changing their values.
-
- -- User Option: magit-remote-direct-configure
-     This option controls whether remote-related Git variables are
-     accessible directly from the transient ‘magit-remote’.
-
-     If ‘t’ (the default) and a local branch is checked out, then
-     ‘magit-remote’ features the variables for the upstream remote of
-     that branch, or if ‘HEAD’ is detached, for ‘origin’, provided that
-     exists.
-
-     If ‘nil’, then ‘magit-remote-configure’ has to be used to do so.
-
-‘M C’ (‘magit-remote-configure’)
-     This transient prefix command binds commands that set the value of
-     remote-related variables and displays them in a temporary buffer
-     until the transient is exited.
-
-     With a prefix argument, this command always prompts for a remote.
-
-     Without a prefix argument this depends on whether it was invoked as
-     a suffix of ‘magit-remote’ and on the
-     ‘magit-remote-direct-configure’ option.  If ‘magit-remote’ already
-     displays the variables for the upstream, then it does not make
-     sense to invoke another transient that displays them for the same
-     remote.  In that case this command prompts for a remote.
-
-   The variables are described in *note Remote Git Variables::.
-
-‘M a’ (‘magit-remote-add’)
-     This command add a remote and fetches it.  The remote name and url
-     are read in the minibuffer.
-
-‘M r’ (‘magit-remote-rename’)
-     This command renames a remote.  Both the old and the new names are
-     read in the minibuffer.
-
-‘M u’ (‘magit-remote-set-url’)
-     This command changes the url of a remote.  Both the remote and the
-     new url are read in the minibuffer.
-
-‘M k’ (‘magit-remote-remove’)
-     This command deletes a remote, read in the minibuffer.
-
-‘M p’ (‘magit-remote-prune’)
-     This command removes stale remote-tracking branches for a remote
-     read in the minibuffer.
-
-‘M P’ (‘magit-remote-prune-refspecs’)
-     This command removes stale refspecs for a remote read in the
-     minibuffer.
-
-     A refspec is stale if there no longer exists at least one branch on
-     the remote that would be fetched due to that refspec.  A stale
-     refspec is problematic because its existence causes Git to refuse
-     to fetch according to the remaining non-stale refspecs.
-
-     If only stale refspecs remain, then this command offers to either
-     delete the remote or to replace the stale refspecs with the default
-     refspec ("+refs/heads/*:refs/remotes/REMOTE/*").
-
-     This command also removes the remote-tracking branches that were
-     created due to the now stale refspecs.  Other stale branches are
-     not removed.
-
- -- User Option: magit-remote-add-set-remote.pushDefault
-     This option controls whether the user is asked whether they want to
-     set ‘remote.pushDefault’ after adding a remote.
-
-     If ‘ask’, then users is always ask.  If ‘ask-if-unset’, then the
-     user is only if the variable isn’t set already.  If ‘nil’, then the
-     user isn’t asked and the variable isn’t set.  If the value is a
-     string, then the variable is set without the user being asked,
-     provided that the name of the added remote is equal to that string
-     and the variable isn’t already set.
-
-
-File: magit.info,  Node: Remote Git Variables,  Prev: Remote Commands,  Up: Remotes
-
-7.1.2 Remote Git Variables
---------------------------
-
-These variables can be set from the transient prefix command
-‘magit-remote-configure’.  By default they can also be set from
-‘magit-remote’.  See *note Remote Commands::.
-
- -- Variable: remote.NAME.url
-     This variable specifies the url of the remote named NAME.  It can
-     have multiple values.
-
- -- Variable: remote.NAME.fetch
-     The refspec used when fetching from the remote named NAME.  It can
-     have multiple values.
-
- -- Variable: remote.NAME.pushurl
-     This variable specifies the url used for pushing to the remote
-     named NAME.  If it is not specified, then ‘remote.NAME.url’ is used
-     instead.  It can have multiple values.
-
- -- Variable: remote.NAME.push
-     The refspec used when pushing to the remote named NAME.  It can
-     have multiple values.
-
- -- Variable: remote.NAME.tagOpts
-     This variable specifies what tags are fetched by default.  If the
-     value is ‘--no-tags’ then no tags are fetched.  If the value is
-     ‘--tags’, then all tags are fetched.  If this variable has no
-     value, then only tags are fetched that are reachable from fetched
-     branches.
-
-
-File: magit.info,  Node: Fetching,  Next: Pulling,  Prev: Remotes,  Up: Transferring
-
-7.2 Fetching
-============
-
-Also see *note (gitman)git-fetch::.  For information about the upstream
-and the push-remote, see *note The Two Remotes::.
-
-‘f’ (‘magit-fetch’)
-     This transient prefix command binds the following suffix commands
-     along with the appropriate infix arguments and displays them in a
-     temporary buffer until a suffix is invoked.
-
-‘f p’ (‘magit-fetch-from-pushremote’)
-     This command fetches from the current push-remote.
-
-     With a prefix argument or when the push-remote is either not
-     configured or unusable, then let the user first configure the
-     push-remote.
-
-‘f u’ (‘magit-fetch-from-upstream’)
-     This command fetch from the upstream of the current branch.
-
-     If the upstream is configured for the current branch and names an
-     existing remote, then use that.  Otherwise try to use another
-     remote: If only a single remote is configured, then use that.
-     Otherwise if a remote named "origin" exists, then use that.
-
-     If no remote can be determined, then this command is not available
-     from the ‘magit-fetch’ transient prefix and invoking it directly
-     results in an error.
-
-‘f e’ (‘magit-fetch-other’)
-     This command fetch from a repository read from the minibuffer.
-
-‘f o’ (‘magit-fetch-branch’)
-     This command fetches a branch from a remote, both of which are read
-     from the minibuffer.
-
-‘f r’ (‘magit-fetch-refspec’)
-     This command fetches from a remote using an explicit refspec, both
-     of which are read from the minibuffer.
-
-‘f a’ (‘magit-fetch-all’)
-     This command fetches from all remotes.
-
-‘f m’ (‘magit-fetch-modules’)
-     This command fetches all submodules.  With a prefix argument, it
-     acts as a transient prefix command, allowing the caller to set
-     options.
-
- -- User Option: magit-pull-or-fetch
-     By default fetch and pull commands are available from separate
-     transient prefix command.  Setting this to ‘t’ adds some (but not
-     all) of the above suffix commands to the ‘magit-pull’ transient.
-
-     If you do that, then you might also want to change the key binding
-     for these prefix commands, e.g.:
-
-          (setq magit-pull-or-fetch t)
-          (define-key magit-mode-map "f" 'magit-pull) ; was magit-fetch
-          (define-key magit-mode-map "F" nil)         ; was magit-pull
-
-
-File: magit.info,  Node: Pulling,  Next: Pushing,  Prev: Fetching,  Up: Transferring
-
-7.3 Pulling
-===========
-
-Also see *note (gitman)git-pull::.  For information about the upstream
-and the push-remote, see *note The Two Remotes::.
-
-‘F’ (‘magit-pull’)
-     This transient prefix command binds the following suffix commands
-     and displays them in a temporary buffer until a suffix is invoked.
-
-‘F p’ (‘magit-pull-from-pushremote’)
-     This command pulls from the push-remote of the current branch.
-
-     With a prefix argument or when the push-remote is either not
-     configured or unusable, then let the user first configure the
-     push-remote.
-
-‘F u’ (‘magit-pull-from-upstream’)
-     This command pulls from the upstream of the current branch.
-
-     With a prefix argument or when the upstream is either not
-     configured or unusable, then let the user first configure the
-     upstream.
-
-‘F e’ (‘magit-pull-branch’)
-     This command pulls from a branch read in the minibuffer.
-
-
-File: magit.info,  Node: Pushing,  Next: Plain Patches,  Prev: Pulling,  Up: Transferring
-
-7.4 Pushing
-===========
-
-Also see *note (gitman)git-push::.  For information about the upstream
-and the push-remote, see *note The Two Remotes::.
-
-‘P’ (‘magit-push’)
-     This transient prefix command binds the following suffix commands
-     along with the appropriate infix arguments and displays them in a
-     temporary buffer until a suffix is invoked.
-
-‘P p’ (‘magit-push-current-to-pushremote’)
-     This command pushes the current branch to its push-remote.
-
-     With a prefix argument or when the push-remote is either not
-     configured or unusable, then let the user first configure the
-     push-remote.
-
-‘P u’ (‘magit-push-current-to-upstream’)
-     This command pushes the current branch to its upstream branch.
-
-     With a prefix argument or when the upstream is either not
-     configured or unusable, then let the user first configure the
-     upstream.
-
-‘P e’ (‘magit-push-current’)
-     This command pushes the current branch to a branch read in the
-     minibuffer.
-
-‘P o’ (‘magit-push-other’)
-     This command pushes an arbitrary branch or commit somewhere.  Both
-     the source and the target are read in the minibuffer.
-
-‘P r’ (‘magit-push-refspecs’)
-     This command pushes one or multiple refspecs to a remote, both of
-     which are read in the minibuffer.
-
-     To use multiple refspecs, separate them with commas.  Completion is
-     only available for the part before the colon, or when no colon is
-     used.
-
-‘P m’ (‘magit-push-matching’)
-     This command pushes all matching branches to another repository.
-
-     If only one remote exists, then push to that.  Otherwise prompt for
-     a remote, offering the remote configured for the current branch as
-     default.
-
-‘P t’ (‘magit-push-tags’)
-     This command pushes all tags to another repository.
-
-     If only one remote exists, then push to that.  Otherwise prompt for
-     a remote, offering the remote configured for the current branch as
-     default.
-
-‘P T’ (‘magit-push-tag’)
-     This command pushes a tag to another repository.
-
-   One of the infix arguments, ‘--force-with-lease’, deserves a word of
-caution.  It is passed without a value, which means "permit a force push
-as long as the remote-tracking branches match their counterparts on the
-remote end".  If you’ve set up a tool to do automatic fetches (Magit
-itself does not provide such functionality), using ‘--force-with-lease’
-can be dangerous because you don’t actually control or know the state of
-the remote-tracking refs.  In that case, you should consider setting
-‘push.useForceIfIncludes’ to ‘true’ (available since Git 2.30).
-
-   Two more push commands exist, which by default are not available from
-the push transient.  See their doc-strings for instructions on how to
-add them to the transient.
-
- -- Command: magit-push-implicitly args
-     This command pushes somewhere without using an explicit refspec.
-
-     This command simply runs ‘git push -v [ARGS]’.  ARGS are the infix
-     arguments.  No explicit refspec arguments are used.  Instead the
-     behavior depends on at least these Git variables: ‘push.default’,
-     ‘remote.pushDefault’, ‘branch.<branch>.pushRemote’,
-     ‘branch.<branch>.remote’, ‘branch.<branch>.merge’, and
-     ‘remote.<remote>.push’.
-
-     If you add this suffix to a transient prefix without explicitly
-     specifying the description, then an attempt is made to predict what
-     this command will do.  For example:
-
-          (transient-insert-suffix 'magit-push \"p\"
-            '(\"i\" magit-push-implicitly))"
-
- -- Command: magit-push-to-remote remote args
-     This command pushes to the remote REMOTE without using an explicit
-     refspec.  The remote is read in the minibuffer.
-
-     This command simply runs ‘git push -v [ARGS] REMOTE’.  ARGS are the
-     infix arguments.  No refspec arguments are used.  Instead the
-     behavior depends on at least these Git variables: ‘push.default’,
-     ‘remote.pushDefault’, ‘branch.<branch>.pushRemote’,
-     ‘branch.<branch>.remote’, ‘branch.<branch>.merge’, and
-     ‘remote.<remote>.push’.
-
-
-File: magit.info,  Node: Plain Patches,  Next: Maildir Patches,  Prev: Pushing,  Up: Transferring
-
-7.5 Plain Patches
-=================
-
-‘W’ (‘magit-patch’)
-     This transient prefix command binds the following suffix commands
-     along with the appropriate infix arguments and displays them in a
-     temporary buffer until a suffix is invoked.
-
-‘W c’ (‘magit-patch-create’)
-     This command creates patches for a set commits.  If the region
-     marks several commits, then it creates patches for all of them.
-     Otherwise it functions as a transient prefix command, which
-     features several infix arguments and binds itself as a suffix
-     command.  When this command is invoked as a suffix of itself, then
-     it creates a patch using the specified infix arguments.
-
-‘w a’ (‘magit-patch-apply’)
-     This command applies a patch.  This is a transient prefix command,
-     which features several infix arguments and binds itself as a suffix
-     command.  When this command is invoked as a suffix of itself, then
-     it applies a patch using the specified infix arguments.
-
-‘W s’ (‘magit-patch-save’)
-     This command creates a patch from the current diff.
-
-     Inside ‘magit-diff-mode’ or ‘magit-revision-mode’ buffers, ‘C-x
-     C-w’ is also bound to this command.
-
-   It is also possible to save a plain patch file by using ‘C-x C-w’
-inside a ‘magit-diff-mode’ or ‘magit-revision-mode’ buffer.
-
-
-File: magit.info,  Node: Maildir Patches,  Prev: Plain Patches,  Up: Transferring
-
-7.6 Maildir Patches
-===================
-
-Also see *note (gitman)git-am::.  and *note (gitman)git-apply::.
-
-‘w’ (‘magit-am’)
-     This transient prefix command binds the following suffix commands
-     along with the appropriate infix arguments and displays them in a
-     temporary buffer until a suffix is invoked.
-
-‘w w’ (‘magit-am-apply-patches’)
-     This command applies one or more patches.  If the region marks
-     files, then those are applied as patches.  Otherwise this command
-     reads a file-name in the minibuffer, defaulting to the file at
-     point.
-
-‘w m’ (‘magit-am-apply-maildir’)
-     This command applies patches from a maildir.
-
-‘w a’ (‘magit-patch-apply’)
-     This command applies a plain patch.  For a longer description see
-     *note Plain Patches::.  This command is only available from the
-     ‘magit-am’ transient for historic reasons.
-
-   When an "am" operation is in progress, then the transient instead
-features the following suffix commands.
-
-‘w w’ (‘magit-am-continue’)
-     This command resumes the current patch applying sequence.
-
-‘w s’ (‘magit-am-skip’)
-     This command skips the stopped at patch during a patch applying
-     sequence.
-
-‘w a’ (‘magit-am-abort’)
-     This command aborts the current patch applying sequence.  This
-     discards all changes made since the sequence started.
-
-
-File: magit.info,  Node: Miscellaneous,  Next: Customizing,  Prev: Transferring,  Up: Top
-
-8 Miscellaneous
-***************
-
-* Menu:
-
-* Tagging::
-* Notes::
-* Submodules::
-* Subtree::
-* Worktree::
-* Sparse checkouts::
-* Bundle::
-* Common Commands::
-* Wip Modes::
-* Commands for Buffers Visiting Files::
-* Minor Mode for Buffers Visiting Blobs::
-
-
-File: magit.info,  Node: Tagging,  Next: Notes,  Up: Miscellaneous
-
-8.1 Tagging
-===========
-
-Also see *note (gitman)git-tag::.
-
-‘t’ (‘magit-tag’)
-     This transient prefix command binds the following suffix commands
-     along with the appropriate infix arguments and displays them in a
-     temporary buffer until a suffix is invoked.
-
-‘t t’ (‘magit-tag-create’)
-     This command creates a new tag with the given NAME at REV.  With a
-     prefix argument it creates an annotated tag.
-
-‘t r’ (‘magit-tag-release’)
-     This commands creates a release tag.  It assumes that release tags
-     match ‘magit-release-tag-regexp’.
-
-     First it prompts for the name of the new tag using the highest
-     existing tag as initial input and leaving it to the user to
-     increment the desired part of the version string.  If you use
-     unconventional release tags or version numbers (e.g.,
-     ‘v1.2.3-custom.1’), you can set the ‘magit-release-tag-regexp’ and
-     ‘magit-tag-version-regexp-alist’ variables.
-
-     If ‘--annotate’ is enabled then it prompts for the message of the
-     new tag.  The proposed tag message is based on the message of the
-     highest tag, provided that that contains the corresponding version
-     string and substituting the new version string for that.  Otherwise
-     it proposes something like "Foo-Bar 1.2.3", given, for example, a
-     TAG "v1.2.3" and a repository located at something like
-     "/path/to/foo-bar".
-
-‘t k’ (‘magit-tag-delete’)
-     This command deletes one or more tags.  If the region marks
-     multiple tags (and nothing else), then it offers to delete those.
-     Otherwise, it prompts for a single tag to be deleted, defaulting to
-     the tag at point.
-
-‘t p’ (‘magit-tag-prune’)
-     This command offers to delete tags missing locally from REMOTE, and
-     vice versa.
-
-
-File: magit.info,  Node: Notes,  Next: Submodules,  Prev: Tagging,  Up: Miscellaneous
-
-8.2 Notes
-=========
-
-Also see *note (gitman)git-notes::.
-
-‘T’ (‘magit-notes’)
-     This transient prefix command binds the following suffix commands
-     along with the appropriate infix arguments and displays them in a
-     temporary buffer until a suffix is invoked.
-
-‘T T’ (‘magit-notes-edit’)
-     Edit the note attached to a commit, defaulting to the commit at
-     point.
-
-     By default use the value of Git variable ‘core.notesRef’ or
-     "refs/notes/commits" if that is undefined.
-
-‘T r’ (‘magit-notes-remove’)
-     Remove the note attached to a commit, defaulting to the commit at
-     point.
-
-     By default use the value of Git variable ‘core.notesRef’ or
-     "refs/notes/commits" if that is undefined.
-
-‘T p’ (‘magit-notes-prune’)
-     Remove notes about unreachable commits.
-
-   It is possible to merge one note ref into another.  That may result
-in conflicts which have to resolved in the temporary worktree
-".git/NOTES_MERGE_WORKTREE".
-
-‘T m’ (‘magit-notes-merge’)
-     Merge the notes of a ref read from the user into the current notes
-     ref.  The current notes ref is the value of Git variable
-     ‘core.notesRef’ or "refs/notes/commits" if that is undefined.
-
-   When a notes merge is in progress then the transient features the
-following suffix commands, instead of those listed above.
-
-‘T c’ (‘magit-notes-merge-commit’)
-     Commit the current notes ref merge, after manually resolving
-     conflicts.
-
-‘T a’ (‘magit-notes-merge-abort’)
-     Abort the current notes ref merge.
-
-   The following variables control what notes reference ‘magit-notes-*’,
-‘git notes’ and ‘git show’ act on and display.  Both the local and
-global values are displayed and can be modified.
-
- -- Variable: core.notesRef
-     This variable specifies the notes ref that is displayed by default
-     and which commands act on by default.
-
- -- Variable: notes.displayRef
-     This variable specifies additional notes ref to be displayed in
-     addition to the ref specified by ‘core.notesRef’.  It can have
-     multiple values and may end with ‘*’ to display all refs in the
-     ‘refs/notes/’ namespace (or ‘**’ if some names contain slashes).
-
-
-File: magit.info,  Node: Submodules,  Next: Subtree,  Prev: Notes,  Up: Miscellaneous
-
-8.3 Submodules
-==============
-
-Also see *note (gitman)git-submodule::.
-
-* Menu:
-
-* Listing Submodules::
-* Submodule Transient::
-
-
-File: magit.info,  Node: Listing Submodules,  Next: Submodule Transient,  Up: Submodules
-
-8.3.1 Listing Submodules
-------------------------
-
-The command ‘magit-list-submodules’ displays a list of the current
-repository’s submodules in a separate buffer.  It’s also possible to
-display information about submodules directly in the status buffer of
-the super-repository by adding ‘magit-insert-modules’ to the hook
-‘magit-status-sections-hook’ as described in *note Status Module
-Sections::.
-
- -- Command: magit-list-submodules
-     This command displays a list of the current repository’s populated
-     submodules in a separate buffer.
-
-     It can be invoked by pressing ‘RET’ on the section titled
-     "Modules".
-
- -- User Option: magit-submodule-list-columns
-     This option controls what columns are displayed by the command
-     ‘magit-list-submodules’ and how they are displayed.
-
-     Each element has the form ‘(HEADER WIDTH FORMAT PROPS)’.
-
-     HEADER is the string displayed in the header.  WIDTH is the width
-     of the column.  FORMAT is a function that is called with one
-     argument, the repository identification (usually its basename), and
-     with ‘default-directory’ bound to the toplevel of its working tree.
-     It has to return a string to be inserted or nil.  PROPS is an alist
-     that supports the keys ‘:right-align’, ‘:pad-right’ and ‘:sort’.
-
-     The ‘:sort’ function has a weird interface described in the
-     docstring of ‘tabulated-list--get-sort’.  Alternatively ‘<’ and
-     ‘magit-repolist-version<’ can be used as those functions are
-     automatically replaced with functions that satisfy the interface.
-     Set ‘:sort’ to ‘nil’ to inhibit sorting; if unspecified, then the
-     column is sortable using the default sorter.
-
-     You may wish to display a range of numeric columns using just one
-     character per column and without any padding between columns, in
-     which case you should use an appropriate HEADER, set WIDTH to 1,
-     and set ‘:pad-right’ to 9.  ‘+’ is substituted for numbers higher
-     than 9.
-
-
-File: magit.info,  Node: Submodule Transient,  Prev: Listing Submodules,  Up: Submodules
-
-8.3.2 Submodule Transient
--------------------------
-
-‘o’ (‘magit-submodule’)
-     This transient prefix command binds the following suffix commands
-     along with the appropriate infix arguments and displays them in a
-     temporary buffer until a suffix is invoked.
-
-   Some of the below commands default to act on the modules that are
-selected using the region.  For brevity their description talk about
-"the selected modules", but if no modules are selected, then they act on
-the current module instead, or if point isn’t on a module, then the read
-a single module to act on.  With a prefix argument these commands ignore
-the selection and the current module and instead act on all suitable
-modules.
-
-‘o a’ (‘magit-submodule-add’)
-     This commands adds the repository at URL as a module.  Optional
-     PATH is the path to the module relative to the root of the
-     super-project.  If it is nil then the path is determined based on
-     URL.
-
-‘o r’ (‘magit-submodule-register’)
-     This command registers the selected modules by copying their urls
-     from ".gitmodules" to "$GIT_DIR/config".  These values can then be
-     edited before running ‘magit-submodule-populate’.  If you don’t
-     need to edit any urls, then use the latter directly.
-
-‘o p’ (‘magit-submodule-populate’)
-     This command creates the working directory or directories of the
-     selected modules, checking out the recorded commits.
-
-‘o u’ (‘magit-submodule-update’)
-     This command updates the selected modules checking out the recorded
-     commits.
-
-‘o s’ (‘magit-submodule-synchronize’)
-     This command synchronizes the urls of the selected modules, copying
-     the values from ".gitmodules" to the ".git/config" of the
-     super-project as well those of the modules.
-
-‘o d’ (‘magit-submodule-unpopulate’)
-     This command removes the working directory of the selected modules.
-
-‘o l’ (‘magit-list-submodules’)
-     This command displays a list of the current repository’s modules.
-
-‘o f’ (‘magit-fetch-modules’)
-     This command fetches all populated modules.  With a prefix
-     argument, it acts as a transient prefix command, allowing the
-     caller to set options.
-
-     Also fetch the super-repository, because ‘git fetch’ does not
-     support not doing that.
-
-
-File: magit.info,  Node: Subtree,  Next: Worktree,  Prev: Submodules,  Up: Miscellaneous
-
-8.4 Subtree
-===========
-
-Also see *note (gitman)git-subtree::.
-
-‘O’ (‘magit-subtree’)
-     This transient prefix command binds the two sub-transients; one for
-     importing a subtree and one for exporting a subtree.
-
-‘O i’ (‘magit-subtree-import’)
-     This transient prefix command binds the following suffix commands
-     along with the appropriate infix arguments and displays them in a
-     temporary buffer until a suffix is invoked.
-
-     The suffixes of this command import subtrees.
-
-     If the ‘--prefix’ argument is set, then the suffix commands use
-     that prefix without prompting the user.  If it is unset, then they
-     read the prefix in the minibuffer.
-
-‘O i a’ (‘magit-subtree-add’)
-     This command adds COMMIT from REPOSITORY as a new subtree at
-     PREFIX.
-
-‘O i c’ (‘magit-subtree-add-commit’)
-     This command add COMMIT as a new subtree at PREFIX.
-
-‘O i m’ (‘magit-subtree-merge’)
-     This command merges COMMIT into the PREFIX subtree.
-
-‘O i f’ (‘magit-subtree-pull’)
-     This command pulls COMMIT from REPOSITORY into the PREFIX subtree.
-
-‘O e’ (‘magit-subtree-export’)
-     This transient prefix command binds the following suffix commands
-     along with the appropriate infix arguments and displays them in a
-     temporary buffer until a suffix is invoked.
-
-     The suffixes of this command export subtrees.
-
-     If the ‘--prefix’ argument is set, then the suffix commands use
-     that prefix without prompting the user.  If it is unset, then they
-     read the prefix in the minibuffer.
-
-‘O e p’ (‘magit-subtree-push’)
-     This command extract the history of the subtree PREFIX and pushes
-     it to REF on REPOSITORY.
-
-‘O e s’ (‘magit-subtree-split’)
-     This command extracts the history of the subtree PREFIX.
-
-
-File: magit.info,  Node: Worktree,  Next: Sparse checkouts,  Prev: Subtree,  Up: Miscellaneous
-
-8.5 Worktree
-============
-
-Also see *note (gitman)git-worktree::.
-
-‘Z’ (‘magit-worktree’)
-     This transient prefix command binds the following suffix commands
-     and displays them in a temporary buffer until a suffix is invoked.
-
-‘Z b’ (‘magit-worktree-checkout’)
-     Checkout BRANCH in a new worktree at PATH.
-
-‘Z c’ (‘magit-worktree-branch’)
-     Create a new BRANCH and check it out in a new worktree at PATH.
-
-‘Z m’ (‘magit-worktree-move’)
-     Move an existing worktree to a new PATH.
-
-‘Z k’ (‘magit-worktree-delete’)
-     Delete a worktree, defaulting to the worktree at point.  The
-     primary worktree cannot be deleted.
-
-‘Z g’ (‘magit-worktree-status’)
-     Show the status for the worktree at point.
-
-     If there is no worktree at point, then read one in the minibuffer.
-     If the worktree at point is the one whose status is already being
-     displayed in the current buffer, then show it in Dired instead.
-
-
-File: magit.info,  Node: Sparse checkouts,  Next: Bundle,  Prev: Worktree,  Up: Miscellaneous
-
-8.6 Sparse checkouts
-====================
-
-Sparse checkouts provide a way to restrict the working tree to a subset
-of directories.  See *note (gitman)git-sparse-checkout::.
-
-   *Warning*: Git introduced the ‘git sparse-checkout’ command in
-version 2.25 and still advertises it as experimental and subject to
-change.  Magit’s interface should be considered the same.  In
-particular, if Git introduces a backward incompatible change, Magit’s
-sparse checkout functionality may be updated in a way that requires a
-more recent Git version.
-
-‘>’ (‘magit-sparse-checkout’)
-     This transient prefix command binds the following suffix commands
-     and displays them in a temporary buffer until a suffix is invoked.
-
-‘> e’ (‘magit-sparse-checkout-enable’)
-     This command initializes a sparse checkout that includes only the
-     files in the top-level directory.
-
-     Note that ‘magit-sparse-checkout-set’ and
-     ‘magit-sparse-checkout-add’ automatically initialize a sparse
-     checkout if necessary.  However, you may want to call
-     ‘magit-sparse-checkout-enable’ explicitly to re-initialize a sparse
-     checkout after calling ‘magit-sparse-checkout-disable’, to pass
-     additional arguments to ‘git sparse-checkout init’, or to execute
-     the initialization asynchronously.
-
-‘> s’ (‘magit-sparse-checkout-set’)
-     This command takes a list of directories and configures the sparse
-     checkout to include only files in those subdirectories.  Any
-     previously included directories are excluded unless they are in the
-     provided list of directories.
-
-‘> a’ (‘magit-sparse-checkout-add’)
-     This command is like ‘magit-sparse-checkout-set’, but instead adds
-     the specified list of directories to the set of directories that is
-     already included in the sparse checkout.
-
-‘> r’ (‘magit-sparse-checkout-reapply’)
-     This command applies the currently configured sparse checkout
-     patterns to the working tree.  This is useful to call if excluded
-     files have been checked out after operations such as merging or
-     rebasing.
-
-‘> d’ (‘magit-sparse-checkout-disable’)
-     This command restores the full checkout.  To return to the previous
-     sparse checkout, call ‘magit-sparse-checkout-enable’.
-
-   A sparse checkout can also be initiated when cloning a repository by
-using the ‘magit-clone-sparse’ command in the ‘magit-clone’ transient
-(see *note Cloning Repository::).
-
-   If you want the status buffer to indicate when a sparse checkout is
-enabled, add the function ‘magit-sparse-checkout-insert-header’ to
-‘magit-status-headers-hook’.
-
-
-File: magit.info,  Node: Bundle,  Next: Common Commands,  Prev: Sparse checkouts,  Up: Miscellaneous
-
-8.7 Bundle
-==========
-
-Also see *note (gitman)git-bundle::.
-
- -- Command: magit-bundle
-     This transient prefix command binds several suffix commands for
-     running ‘git bundle’ subcommands and displays them in a temporary
-     buffer until a suffix is invoked.
-
-
-File: magit.info,  Node: Common Commands,  Next: Wip Modes,  Prev: Bundle,  Up: Miscellaneous
-
-8.8 Common Commands
-===================
-
- -- Command: magit-switch-to-repository-buffer
- -- Command: magit-switch-to-repository-buffer-other-window
- -- Command: magit-switch-to-repository-buffer-other-frame
- -- Command: magit-display-repository-buffer
-     These commands read any existing Magit buffer that belongs to the
-     current repository from the user and then switch to the selected
-     buffer (without refreshing it).
-
-     The last variant uses ‘magit-display-buffer’ to do so and thus
-     respects ‘magit-display-buffer-function’.
-
-   These are some of the commands that can be used in all buffers whose
-major-modes derive from ‘magit-mode’.  There are other common commands
-beside the ones below, but these didn’t fit well anywhere else.
-
-‘C-w’ (‘magit-copy-section-value’)
-     This command saves the value of the current section to the
-     ‘kill-ring’, and, provided that the current section is a commit,
-     branch, or tag section, it also pushes the (referenced) revision to
-     the ‘magit-revision-stack’.
-
-     When the current section is a branch or a tag, and a prefix
-     argument is used, then it saves the revision at its tip to the
-     ‘kill-ring’ instead of the reference name.
-
-     When the region is active, this command saves that to the
-     ‘kill-ring’, like ‘kill-ring-save’ would, instead of behaving as
-     described above.  If a prefix argument is used and the region is
-     within a hunk, then it strips the diff marker column and keeps only
-     either the added or removed lines, depending on the sign of the
-     prefix argument.
-
-‘M-w’ (‘magit-copy-buffer-revision’)
-     This command saves the revision being displayed in the current
-     buffer to the ‘kill-ring’ and also pushes it to the
-     ‘magit-revision-stack’.  It is mainly intended for use in
-     ‘magit-revision-mode’ buffers, the only buffers where it is always
-     unambiguous exactly which revision should be saved.
-
-     Most other Magit buffers usually show more than one revision, in
-     some way or another, so this command has to select one of them, and
-     that choice might not always be the one you think would have been
-     the best pick.
-
-   Outside of Magit ‘M-w’ and ‘C-w’ are usually bound to
-‘kill-ring-save’ and ‘kill-region’, and these commands would also be
-useful in Magit buffers.  Therefore when the region is active, then both
-of these commands behave like ‘kill-ring-save’ instead of as described
-above.
-
-
-File: magit.info,  Node: Wip Modes,  Next: Commands for Buffers Visiting Files,  Prev: Common Commands,  Up: Miscellaneous
-
-8.9 Wip Modes
-=============
-
-Git keeps *committed* changes around long enough for users to recover
-changes they have accidentally deleted.  It does so by not garbage
-collecting any committed but no longer referenced objects for a certain
-period of time, by default 30 days.
-
-   But Git does *not* keep track of *uncommitted* changes in the working
-tree and not even the index (the staging area).  Because Magit makes it
-so convenient to modify uncommitted changes, it also makes it easy to
-shoot yourself in the foot in the process.
-
-   For that reason Magit provides a global mode that saves *tracked*
-files to work-in-progress references after or before certain actions.
-(At present untracked files are never saved and for technical reasons
-nothing is saved before the first commit has been created).
-
-   Two separate work-in-progress references are used to track the state
-of the index and of the working tree: ‘refs/wip/index/<branchref>’ and
-‘refs/wip/wtree/<branchref>’, where ‘<branchref>’ is the full ref of the
-current branch, e.g., ‘refs/heads/master’.  When the ‘HEAD’ is detached
-then ‘HEAD’ is used in place of ‘<branchref>’.
-
-   Checking out another branch (or detaching ‘HEAD’) causes the use of
-different wip refs for subsequent changes.
-
- -- User Option: magit-wip-mode
-     When this mode is enabled, then uncommitted changes are committed
-     to dedicated work-in-progress refs whenever appropriate (i.e., when
-     dataloss would be a possibility otherwise).
-
-     Setting this variable directly does not take effect; either use the
-     Custom interface to do so or call the respective mode function.
-
-     For historic reasons this mode is implemented on top of four other
-     ‘magit-wip-*’ modes, which can also be used individually, if you
-     want finer control over when the wip refs are updated; but that is
-     discouraged.  See *note Legacy Wip Modes::.
-
-   To view the log for a branch and its wip refs use the commands
-‘magit-wip-log’ and ‘magit-wip-log-current’.  You should use ‘--graph’
-when using these commands.
-
- -- Command: magit-wip-log
-     This command shows the log for a branch and its wip refs.  With a
-     negative prefix argument only the worktree wip ref is shown.
-
-     The absolute numeric value of the prefix argument controls how many
-     "branches" of each wip ref are shown.  This is only relevant if the
-     value of ‘magit-wip-merge-branch’ is ‘nil’.
-
- -- Command: magit-wip-log-current
-     This command shows the log for the current branch and its wip refs.
-     With a negative prefix argument only the worktree wip ref is shown.
-
-     The absolute numeric value of the prefix argument controls how many
-     "branches" of each wip ref are shown.  This is only relevant if the
-     value of ‘magit-wip-merge-branch’ is ‘nil’.
-
-‘X w’ (‘magit-reset-worktree’)
-     This command resets the working tree to some commit read from the
-     user and defaulting to the commit at point, while keeping the
-     ‘HEAD’ and index as-is.
-
-     This can be used to restore files to the state committed to a wip
-     ref.  Note that this will discard any unstaged changes that might
-     have existed before invoking this command (but of course only after
-     committing that to the working tree wip ref).
-
-   Note that even if you enable ‘magit-wip-mode’ this won’t give you
-perfect protection.  The most likely scenario for losing changes despite
-the use of ‘magit-wip-mode’ is making a change outside Emacs and then
-destroying it also outside Emacs.  In some such a scenario, Magit, being
-an Emacs package, didn’t get the opportunity to keep you from shooting
-yourself in the foot.
-
-   When you are unsure whether Magit did commit a change to the wip
-refs, then you can explicitly request that all changes to all tracked
-files are being committed.
-
-‘M-x magit-wip-commit’
-     This command commits all changes to all tracked files to the index
-     and working tree work-in-progress refs.  Like the modes described
-     above, it does not commit untracked files, but it does check all
-     tracked files for changes.  Use this command when you suspect that
-     the modes might have overlooked a change made outside Emacs/Magit.
-
- -- User Option: magit-wip-namespace
-     The namespace used for work-in-progress refs.  It has to end with a
-     slash.  The wip refs are named ‘<namespace>index/<branchref>’ and
-     ‘<namespace>wtree/<branchref>’.  When snapshots are created while
-     the ‘HEAD’ is detached then ‘HEAD’ is used in place of
-     ‘<branchref>’.
-
- -- User Option: magit-wip-mode-lighter
-     Mode-line lighter for ‘magit-wip--mode’.
-
-* Menu:
-
-* Wip Graph::
-* Legacy Wip Modes::
-
-
-File: magit.info,  Node: Wip Graph,  Next: Legacy Wip Modes,  Up: Wip Modes
-
-8.9.1 Wip Graph
----------------
-
- -- User Option: magit-wip-merge-branch
-     This option controls whether the current branch is merged into the
-     wip refs after a new commit was created on the branch.
-
-     If non-nil and the current branch has new commits, then it is
-     merged into the wip ref before creating a new wip commit.  This
-     makes it easier to inspect wip history and the wip commits are
-     never garbage collected.
-
-     If nil and the current branch has new commits, then the wip ref is
-     reset to the tip of the branch before creating a new wip commit.
-     With this setting wip commits are eventually garbage collected.
-
-   When ‘magit-wip-merge-branch’ is ‘t’, then the history looks like
-this:
-
-       *--*--*--*--*--*       refs/wip/index/refs/heads/master
-      /     /     /
-     A-----B-----C            refs/heads/master
-
-   When ‘magit-wip-merge-branch’ is ‘nil’, then creating a commit on the
-real branch and then making a change causes the wip refs to be recreated
-to fork from the new commit.  But the old commits on the wip refs are
-not lost.  They are still available from the reflog.  To make it easier
-to see when the fork point of a wip ref was changed, an additional
-commit with the message "restart autosaving" is created on it (‘xxO’
-commits below are such boundary commits).
-
-   Starting with
-
-           BI0---BI1    refs/wip/index/refs/heads/master
-          /
-     A---B              refs/heads/master
-          \
-           BW0---BW1    refs/wip/wtree/refs/heads/master
-
-   and committing the staged changes and editing and saving a file would
-result in
-
-           BI0---BI1        refs/wip/index/refs/heads/master
-          /
-     A---B---C              refs/heads/master
-          \   \
-           \   CW0---CW1    refs/wip/wtree/refs/heads/master
-            \
-             BW0---BW1      refs/wip/wtree/refs/heads/master@{2}
-
-   The fork-point of the index wip ref is not changed until some change
-is being staged.  Likewise just checking out a branch or creating a
-commit does not change the fork-point of the working tree wip ref.  The
-fork-points are not adjusted until there actually is a change that
-should be committed to the respective wip ref.
-
-
-File: magit.info,  Node: Legacy Wip Modes,  Prev: Wip Graph,  Up: Wip Modes
-
-8.9.2 Legacy Wip Modes
-----------------------
-
-It is recommended that you use the mode ‘magit-wip-mode’ (which see) and
-ignore the existence of the following modes, which are preserved for
-historic reasons.
-
-   Setting the following variables directly does not take effect; either
-use the Custom interface to do so or call the respective mode functions.
-
- -- User Option: magit-wip-after-save-mode
-     When this mode is enabled, then saving a buffer that visits a file
-     tracked in a Git repository causes its current state to be
-     committed to the working tree wip ref for the current branch.
-
- -- User Option: magit-wip-after-apply-mode
-     When this mode is enabled, then applying (i.e., staging, unstaging,
-     discarding, reversing, and regularly applying) a change to a file
-     tracked in a Git repository causes its current state to be
-     committed to the index and/or working tree wip refs for the current
-     branch.
-
-   If you only ever edit files using Emacs and only ever interact with
-Git using Magit, then the above two modes should be enough to protect
-each and every change from accidental loss.  In practice nobody does
-that.  Two additional modes exists that do commit to the wip refs before
-making changes that could cause the loss of earlier changes.
-
- -- User Option: magit-wip-before-change-mode
-     When this mode is enabled, then certain commands commit the
-     existing changes to the files they are about to make changes to.
-
- -- User Option: magit-wip-initial-backup-mode
-     When this mode is enabled, then the current version of a file is
-     committed to the worktree wip ref before the buffer visiting that
-     file is saved for the first time since the buffer was created.
-
-     This backs up the same version of the file that ‘backup-buffer’
-     would save.  While ‘backup-buffer’ uses a backup file, this mode
-     uses the same worktree wip ref as used by the other Magit Wip
-     modes.  Like ‘backup-buffer’, it only does this once; unless you
-     kill the buffer and visit the file again only one backup will be
-     created per Emacs session.
-
-     This mode ignores the variables that affect ‘backup-buffer’ and can
-     be used along-side that function, which is recommended because it
-     only backs up files that are tracked in a Git repository.
-
- -- User Option: magit-wip-after-save-local-mode-lighter
-     Mode-line lighter for ‘magit-wip-after-save-local-mode’.
-
- -- User Option: magit-wip-after-apply-mode-lighter
-     Mode-line lighter for ‘magit-wip-after-apply-mode’.
-
- -- User Option: magit-wip-before-change-mode-lighter
-     Mode-line lighter for ‘magit-wip-before-change-mode’.
-
- -- User Option: magit-wip-initial-backup-mode-lighter
-     Mode-line lighter for ‘magit-wip-initial-backup-mode’.
-
-
-File: magit.info,  Node: Commands for Buffers Visiting Files,  Next: Minor Mode for Buffers Visiting Blobs,  Prev: Wip Modes,  Up: Miscellaneous
-
-8.10 Commands for Buffers Visiting Files
-========================================
-
-By default Magit defines a few global key bindings.  These bindings are
-a compromise between providing no bindings at all and providing the
-better bindings I would have liked to use instead.  Magit cannot provide
-the set of recommended bindings by default because those key sequences
-are strictly reserved for bindings added by the user.  Also see *note
-Global Bindings:: and *note (elisp)Key Binding Conventions::.
-
-   To use the recommended bindings, add this to your init file and
-restart Emacs.
-
-     (setq magit-define-global-key-bindings 'recommended)
-
-   If you don’t want Magit to add any bindings to the global keymap at
-all, add this to your init file and restart Emacs.
-
-     (setq magit-define-global-key-bindings nil)
-
-‘C-c f’ (‘magit-file-dispatch’)
-‘C-c f s’ (‘magit-stage-file’)
-‘C-c f s’ (‘magit-stage-buffer-file’)
-‘C-c f u’ (‘magit-unstage-file’)
-‘C-c f u’ (‘magit-unstage-buffer-file’)
-‘C-c f , x’ (‘magit-file-untrack’)
-‘C-c f , r’ (‘magit-file-rename’)
-‘C-c f , k’ (‘magit-file-delete’)
-‘C-c f , c’ (‘magit-file-checkout’)
-‘C-c f D’ (‘magit-diff’)
-‘C-c f d’ (‘magit-diff-buffer-file’)
-‘C-c f L’ (‘magit-log’)
-‘C-c f l’ (‘magit-log-buffer-file’)
-‘C-c f t’ (‘magit-log-trace-definition’)
-‘C-c f M’ (‘magit-log-merged’)
-‘C-c f B’ (‘magit-blame’)
-‘C-c f b’ (‘magit-blame-additions’)
-‘C-c f r’ (‘magit-blame-removal’)
-‘C-c f f’ (‘magit-blame-reverse’)
-‘C-c f m’ (‘magit-blame-echo’)
-‘C-c f q’ (‘magit-blame-quit’)
-‘C-c f p’ (‘magit-blob-previous’)
-‘C-c f n’ (‘magit-blob-next’)
-‘C-c f v’ (‘magit-find-file’)
-‘C-c f V’ (‘magit-blob-visit-file’)
-‘C-c f g’ (‘magit-status-here’)
-‘C-c f G’ (‘magit-display-repository-buffer’)
-‘C-c f c’ (‘magit-commit’)
-‘C-c f e’ (‘magit-edit-line-commit’)
-     Each of these commands is documented individually right below,
-     alongside their default key bindings.  The bindings shown above are
-     the recommended bindings, which you can enable by following the
-     instructions further up.
-
-‘C-c M-g’ (‘magit-file-dispatch’)
-     This transient prefix command binds the following suffix commands
-     and displays them in a temporary buffer until a suffix is invoked.
-
-‘C-c M-g s’ (‘magit-stage-file’)
-‘C-c M-g s’ (‘magit-stage-buffer-file’)
-     Stage all changes to the file being visited in the current buffer.
-     When not visiting a file, then the first command is used, which
-     prompts for a file.
-
-‘C-c M-g u’ (‘magit-unstage-file’)
-‘C-c M-g u’ (‘magit-unstage-buffer-file’)
-     Unstage all changes to the file being visited in the current
-     buffer.  When not visiting a file, then the first command is used,
-     which prompts for a file.
-
-‘C-c M-g , x’ (‘magit-file-untrack’)
-     This command untracks a file read from the user, defaulting to the
-     visited file.
-
-‘C-c M-g , r’ (‘magit-file-rename’)
-     This command renames a file read from the user, defaulting to the
-     visited file.
-
-‘C-c M-g , k’ (‘magit-file-delete’)
-     This command deletes a file read from the user, defaulting to the
-     visited file.
-
-‘C-c M-g , c’ (‘magit-file-checkout’)
-     This command updates a file in the working tree and index to the
-     contents from a revision.  Both the revision and file are read from
-     the user.
-
-‘C-c M-g D’ (‘magit-diff’)
-     This transient prefix command binds several diff suffix commands
-     and infix arguments and displays them in a temporary buffer until a
-     suffix is invoked.  See *note Diffing::.
-
-     This is the same command that ‘d’ is bound to in Magit buffers.  If
-     this command is invoked from a file-visiting buffer, then the
-     initial value of the option (‘--’) that limits the diff to certain
-     file(s) is set to the visited file.
-
-‘C-c M-g d’ (‘magit-diff-buffer-file’)
-     This command shows the diff for the file of blob that the current
-     buffer visits.
-
- -- User Option: magit-diff-buffer-file-locked
-     This option controls whether ‘magit-diff-buffer-file’ uses a
-     dedicated buffer.  See *note Modes and Buffers::.
-
-‘C-c M-g L’ (‘magit-log’)
-     This transient prefix command binds several log suffix commands and
-     infix arguments and displays them in a temporary buffer until a
-     suffix is invoked.  See *note Logging::.
-
-     This is the same command that ‘l’ is bound to in Magit buffers.  If
-     this command is invoked from a file-visiting buffer, then the
-     initial value of the option (‘--’) that limits the log to certain
-     file(s) is set to the visited file.
-
-‘C-c M-g l’ (‘magit-log-buffer-file’)
-     This command shows the log for the file of blob that the current
-     buffer visits.  Renames are followed when a prefix argument is used
-     or when ‘--follow’ is an active log argument.  When the region is
-     active, the log is restricted to the selected line range.
-
- -- User Option: magit-log-buffer-file-locked
-     This option controls whether ‘magit-log-buffer-file’ uses a
-     dedicated buffer.  See *note Modes and Buffers::.
-
-‘C-c M-g t’ (‘magit-log-trace-definition’)
-     This command shows the log for the definition at point.
-
-‘C-c M-g M’ (‘magit-log-merged’)
-     This command reads a commit and a branch in shows a log concerning
-     the merge of the former into the latter.  This shows multiple
-     commits even in case of a fast-forward merge.
-
-‘C-c M-g B’ (‘magit-blame’)
-     This transient prefix command binds all blaming suffix commands
-     along with the appropriate infix arguments and displays them in a
-     temporary buffer until a suffix is invoked.
-
-     For more information about this and the following commands also see
-     *note Blaming::.
-
-     In addition to the ‘magit-blame’ sub-transient, the dispatch
-     transient also binds several blaming suffix commands directly.  See
-     *note Blaming:: for information about those commands and bindings.
-
-‘C-c M-g p’ (‘magit-blob-previous’)
-     This command visits the previous blob which modified the current
-     file.
-
-‘C-c M-g n’ (‘magit-blob-next’)
-     This command visits the next blob which modified the current file.
-
-‘C-c M-g v’ (‘magit-find-file’)
-     This command reads a revision and file and visits the respective
-     blob.
-
-‘C-c M-g V’ (‘magit-blob-visit-file’)
-     This command visits the file from the working tree, corresponding
-     to the current blob.  When visiting a blob or the version from the
-     index, then it goes to the same location in the respective file in
-     the working tree.
-
-‘C-c M-g g’ (‘magit-status-here’)
-     This command displays the status of the current repository in a
-     buffer, like ‘magit-status’ does.  Additionally it tries to go to
-     the position in that buffer, which corresponds to the position in
-     the current file-visiting buffer (if any).
-
-‘C-c M-g G’ (‘magit-display-repository-buffer’)
-     This command reads and displays a Magit buffer belonging to the
-     current repository, without refreshing it.
-
-‘C-c M-g c’ (‘magit-commit’)
-     This transient prefix command binds the following suffix commands
-     along with the appropriate infix arguments and displays them in a
-     temporary buffer until a suffix is invoked.  See *note Initiating a
-     Commit::.
-
-‘C-c M-g e’ (‘magit-edit-line-commit’)
-     This command makes the commit editable that added the current line.
-
-     With a prefix argument it makes the commit editable that removes
-     the line, if any.  The commit is determined using ‘git blame’ and
-     made editable using ‘git rebase --interactive’ if it is reachable
-     from ‘HEAD’, or by checking out the commit (or a branch that points
-     at it) otherwise.
-
-
-File: magit.info,  Node: Minor Mode for Buffers Visiting Blobs,  Prev: Commands for Buffers Visiting Files,  Up: Miscellaneous
-
-8.11 Minor Mode for Buffers Visiting Blobs
-==========================================
-
-The ‘magit-blob-mode’ enables certain Magit features in blob-visiting
-buffers.  Such buffers can be created using ‘magit-find-file’ and some
-of the commands mentioned below, which also take care of turning on this
-minor mode.  Currently this mode only establishes a few key bindings,
-but this might be extended.
-
-‘p’ (‘magit-blob-previous’)
-     Visit the previous blob which modified the current file.
-
-‘n’ (‘magit-blob-next’)
-     Visit the next blob which modified the current file.
-
-‘q’ (‘magit-kill-this-buffer’)
-     Kill the current buffer.
-
-
-File: magit.info,  Node: Customizing,  Next: Plumbing,  Prev: Miscellaneous,  Up: Top
-
-9 Customizing
-*************
-
-Both Git and Emacs are highly customizable.  Magit is both a Git
-porcelain as well as an Emacs package, so it makes sense to customize it
-using both Git variables as well as Emacs options.  However this
-flexibility doesn’t come without problems, including but not limited to
-the following.
-
-   • Some Git variables automatically have an effect in Magit without
-     requiring any explicit support.  Sometimes that is desirable - in
-     other cases, it breaks Magit.
-
-     When a certain Git setting breaks Magit but you want to keep using
-     that setting on the command line, then that can be accomplished by
-     overriding the value for Magit only by appending something like
-     ‘("-c" "some.variable=compatible-value")’ to
-     ‘magit-git-global-arguments’.
-
-   • Certain settings like ‘fetch.prune=true’ are respected by Magit
-     commands (because they simply call the respective Git command) but
-     their value is not reflected in the respective transient buffers.
-     In this case the ‘--prune’ argument in ‘magit-fetch’ might be
-     active or inactive, but that doesn’t keep the Git variable from
-     being honored by the suffix commands anyway.  So pruning might
-     happen despite the ‘--prune’ arguments being displayed in a way
-     that seems to indicate that no pruning will happen.
-
-   I intend to address these and similar issues in a future release.
-
-* Menu:
-
-* Per-Repository Configuration::
-* Essential Settings::
-
-
-File: magit.info,  Node: Per-Repository Configuration,  Next: Essential Settings,  Up: Customizing
-
-9.1 Per-Repository Configuration
-================================
-
-Magit can be configured on a per-repository level using both Git
-variables as well as Emacs options.
-
-   To set a Git variable for one repository only, simply set it in
-‘/path/to/repo/.git/config’ instead of ‘$HOME/.gitconfig’ or
-‘/etc/gitconfig’.  See *note (gitman)git-config::.
-
-   Similarly, Emacs options can be set for one repository only by
-editing ‘/path/to/repo/.dir-locals.el’.  See *note (emacs)Directory
-Variables::.  For example to disable automatic refreshes of
-file-visiting buffers in just one huge repository use this:
-
-   • ‘/path/to/huge/repo/.dir-locals.el’
-
-          ((nil . ((magit-refresh-buffers . nil))))
-
-   It might only be costly to insert certain information into Magit
-buffers for repositories that are exceptionally large, in which case you
-can disable the respective section inserters just for that repository:
-
-   • ‘/path/to/tag/invested/repo/.dir-locals.el’
-
-          ((magit-status-mode
-            . ((eval . (magit-disable-section-inserter 'magit-insert-tags-header)))))
-
- -- Function: magit-disable-section-inserter fn
-     This function disables the section inserter FN in the current
-     repository.  It is only intended for use in ‘.dir-locals.el’ and
-     ‘.dir-locals-2.el’.
-
-   If you want to apply the same settings to several, but not all,
-repositories then keeping the repository-local config files in sync
-would quickly become annoying.  To avoid that you can create config
-files for certain classes of repositories (e.g., "huge repositories")
-and then include those files in the per-repository config files.  For
-example:
-
-   • ‘/path/to/huge/repo/.git/config’
-
-          [include]
-                  path = /path/to/huge-gitconfig
-
-   • ‘/path/to/huge-gitconfig’
-
-          [status]
-                  showUntrackedFiles = no
-
-   • ‘$HOME/.emacs.d/init.el’
-
-          (dir-locals-set-class-variables 'huge-git-repository
-             '((nil . ((magit-refresh-buffers . nil)))))
-
-          (dir-locals-set-directory-class
-             "/path/to/huge/repo/" 'huge-git-repository)
-
-
-File: magit.info,  Node: Essential Settings,  Prev: Per-Repository Configuration,  Up: Customizing
-
-9.2 Essential Settings
-======================
-
-The next three sections list and discuss several variables that many
-users might want to customize, for safety and/or performance reasons.
-
-* Menu:
-
-* Safety::
-* Performance::
-* Global Bindings::
-
-
-File: magit.info,  Node: Safety,  Next: Performance,  Up: Essential Settings
-
-9.2.1 Safety
-------------
-
-This section discusses various variables that you might want to change
-(or *not* change) for safety reasons.
-
-   Git keeps *committed* changes around long enough for users to recover
-changes they have accidentally been deleted.  It does not do the same
-for *uncommitted* changes in the working tree and not even the index
-(the staging area).  Because Magit makes it so easy to modify
-uncommitted changes, it also makes it easy to shoot yourself in the foot
-in the process.  For that reason Magit provides three global modes that
-save *tracked* files to work-in-progress references after or before
-certain actions.  See *note Wip Modes::.
-
-   These modes are not enabled by default because of performance
-concerns.  Instead a lot of potentially destructive commands require
-confirmation every time they are used.  In many cases this can be
-disabled by adding a symbol to ‘magit-no-confirm’ (see *note Completion
-and Confirmation::).  If you enable the various wip modes then you
-should add ‘safe-with-wip’ to this list.
-
-   Similarly it isn’t necessary to require confirmation before moving a
-file to the system trash - if you trashed a file by mistake then you can
-recover it from there.  Option ‘magit-delete-by-moving-to-trash’
-controls whether the system trash is used, which is the case by default.
-Nevertheless, ‘trash’ isn’t a member of ‘magit-no-confirm’ - you might
-want to change that.
-
-   By default buffers visiting files are automatically reverted when the
-visited file changes on disk.  This isn’t as risky as it might seem, but
-to make an informed decision you should see *note Risk of Reverting
-Automatically::.
-
-
-File: magit.info,  Node: Performance,  Next: Global Bindings,  Prev: Safety,  Up: Essential Settings
-
-9.2.2 Performance
------------------
-
-After Magit has run ‘git’ for side-effects, it also refreshes the
-current Magit buffer and the respective status buffer.  This is
-necessary because otherwise outdated information might be displayed
-without the user noticing.  Magit buffers are updated by recreating
-their content from scratch, which makes updating simpler and less
-error-prone, but also more costly.  Keeping it simple and just
-re-creating everything from scratch is an old design decision and
-departing from that will require major refactoring.
-
-   Meanwhile you can tell Magit to only automatically refresh the
-current Magit buffer, but not the status buffer.  If you do that, then
-the status buffer is only refreshed automatically if it is the current
-buffer.
-
-     (setq magit-refresh-status-buffer nil)
-
-   You should also check whether any third-party packages have added
-anything to ‘magit-refresh-buffer-hook’, ‘magit-pre-refresh-hook’, and
-‘magit-post-refresh-hook’.  If so, then check whether those additions
-impact performance significantly.
-
-   Magit can be told to refresh buffers verbosely using ‘M-x
-magit-toggle-verbose-refresh’.  Enabling this helps figuring out which
-sections are bottlenecks.  Each line printed to the ‘*Messages*’ buffer
-contains a section name, the number of seconds it took to show this
-section, and from 0 to 2 exclamation marks: the more exclamation marks
-the slower the section is.
-
-   Magit also reverts buffers for visited files located inside the
-current repository when the visited file changes on disk.  That is
-implemented on top of ‘auto-revert-mode’ from the built-in library
-‘autorevert’.  To figure out whether that impacts performance, check
-whether performance is significantly worse, when many buffers exist
-and/or when some buffers visit files using TRAMP.  If so, then this
-should help.
-
-     (setq auto-revert-buffer-list-filter
-           'magit-auto-revert-repository-buffer-p)
-
-   For alternative approaches see *note Automatic Reverting of
-File-Visiting Buffers::.
-
-   If you have enabled any features that are disabled by default, then
-you should check whether they impact performance significantly.  It’s
-likely that they were not enabled by default because it is known that
-they reduce performance at least in large repositories.
-
-   If performance is only slow inside certain unusually large
-repositories, then you might want to disable certain features on a
-per-repository or per-repository-class basis only.  See *note
-Per-Repository Configuration::.  For example it takes a long time to
-determine the next and current tag in repository with exceptional
-numbers of tags.  It would therefore be a good idea to disable
-‘magit-insert-tags-headers’, as explained at the mentioned node.
-
-* Menu:
-
-* Microsoft Windows Performance::
-* MacOS Performance::
-
-Log Performance
-...............
-
-When showing logs, Magit limits the number of commits initially shown in
-the hope that this avoids unnecessary work.  When ‘--graph’ is used,
-then this unfortunately does not have the desired effect for large
-histories.  Junio, Git’s maintainer, said on the Git mailing list
-(<https://www.spinics.net/lists/git/msg232230.html>): "‘--graph’ wants
-to compute the whole history and the max-count only affects the output
-phase after ‘--graph’ does its computation".
-
-   In other words, it’s not that Git is slow at outputting the
-differences, or that Magit is slow at parsing the output - the problem
-is that Git first goes outside and has a smoke.
-
-   We actually work around this issue by limiting the number of commits
-not only by using ‘-<N>’ but by also using a range.  But unfortunately
-that’s not always possible.
-
-   When more than a few thousand commits are shown, then the use of
-‘--graph’ can slow things down.
-
-   Using ‘--color --graph’ is even slower.  Magit uses code that is part
-of Emacs to turn control characters into faces.  That code is pretty
-slow and this is quite noticeable when showing a log with many branches
-and merges.  For that reason ‘--color’ is not enabled by default
-anymore.  Consider leaving it at that.
-
-Diff Performance
-................
-
-If diffs are slow, then consider turning off some optional diff features
-by setting all or some of the following variables to ‘nil’:
-‘magit-diff-highlight-indentation’, ‘magit-diff-highlight-trailing’,
-‘magit-diff-paint-whitespace’, ‘magit-diff-highlight-hunk-body’, and
-‘magit-diff-refine-hunk’.
-
-   When showing a commit instead of some arbitrary diff, then some
-additional information is displayed.  Calculating this information can
-be quite expensive given certain circumstances.  If looking at a commit
-using ‘magit-revision-mode’ takes considerably more time than looking at
-the same commit in ‘magit-diff-mode’, then consider setting
-‘magit-revision-insert-related-refs’ to ‘nil’.
-
-   When you are often confronted with diffs that contain deleted files,
-then you might want to enable the ‘--irreversible-delete’ argument.  If
-you do that then diffs still show that a file was deleted but without
-also showing the complete deleted content of the file.  This argument is
-not available by default, see *note (transient)Enabling and Disabling
-Suffixes::.  Once you have done that you should enable it and save that
-setting, see *note (transient)Saving Values::.  You should do this in
-both the diff (‘d’) and the diff refresh (‘D’) transient popups.
-
-Refs Buffer Performance
-.......................
-
-When refreshing the "references buffer" is slow, then that’s usually
-because several hundred refs are being displayed.  The best way to
-address that is to display fewer refs, obviously.
-
-   If you are not, or only mildly, interested in seeing the list of
-tags, then start by not displaying them:
-
-     (remove-hook 'magit-refs-sections-hook 'magit-insert-tags)
-
-   Then you should also make sure that the listed remote branches
-actually all exist.  You can do so by pruning branches which no longer
-exist using ‘f-pa’.
-
-Committing Performance
-......................
-
-When you initiate a commit, then Magit by default automatically shows a
-diff of the changes you are about to commit.  For large commits this can
-take a long time, which is especially distracting when you are
-committing large amounts of generated data which you don’t actually
-intend to inspect before committing.  This behavior can be turned off
-using:
-
-     (remove-hook 'server-switch-hook 'magit-commit-diff)
-     (remove-hook 'with-editor-filter-visit-hook 'magit-commit-diff)
-
-   Then you can type ‘C-c C-d’ to show the diff when you actually want
-to see it, but only then.  Alternatively you can leave the hook alone
-and just type ‘C-g’ in those cases when it takes too long to generate
-the diff.  If you do that, then you will end up with a broken diff
-buffer, but doing it this way has the advantage that you usually get to
-see the diff, which is useful because it increases the odds that you
-spot potential issues.
-
-
-File: magit.info,  Node: Microsoft Windows Performance,  Next: MacOS Performance,  Up: Performance
-
-Microsoft Windows Performance
-.............................
-
-In order to update the status buffer, ‘git’ has to be run a few dozen
-times.  That is problematic on Microsoft Windows, because that operating
-system is exceptionally slow at starting processes.  Sadly this is an
-issue that can only be fixed by Microsoft itself, and they don’t appear
-to be particularly interested in doing so.
-
-   Beside the subprocess issue, there are also other Windows-specific
-performance issues.  Some of these have workarounds.  The maintainers of
-"Git for Windows" try to improve performance on Windows.  Always use the
-latest release in order to benefit from the latest performance tweaks.
-Magit too tries to work around some Windows-specific issues.
-
-   According to some sources, setting the following Git variables can
-also help.
-
-     git config --global core.preloadindex true   # default since v2.1
-     git config --global core.fscache true        # default since v2.8
-     git config --global gc.auto 256
-
-   You should also check whether an anti-virus program is affecting
-performance.
-
-
-File: magit.info,  Node: MacOS Performance,  Prev: Microsoft Windows Performance,  Up: Performance
-
-MacOS Performance
-.................
-
-Before Emacs 26.1 child processes were created using ‘fork’ on macOS.
-That needlessly copied GUI resources, which is expensive.  The result
-was that forking took about 30 times as long on Darwin than on Linux,
-and because Magit starts many ‘git’ processes that made quite a
-difference.
-
-   So make sure that you are using at least Emacs 26.1, in which case
-the faster ‘vfork’ will be used.  (The creation of child processes still
-takes about twice as long on Darwin compared to Linux.)  See (1) for
-more information.
-
-   Additionally, ‘git’ installed from a package manager like ‘brew’ or
-‘nix’ seems to be slower than the native executable.  Profile the ‘git’
-executable you’re running against the one at ‘/usr/bin/git’, and if you
-notice a notable difference try using the latter as
-‘magit-git-executable’.
-
-   ---------- Footnotes ----------
-
-   (1) 
-<https://lists.gnu.org/archive/html/bug-gnu-emacs/2017-04/msg00201.html>
-
-
-File: magit.info,  Node: Global Bindings,  Prev: Performance,  Up: Essential Settings
-
-9.2.3 Global Bindings
----------------------
-
- -- User Option: magit-define-global-key-bindings
-     This option controls which set of Magit key bindings, if any, may
-     be added to the global keymap, even before Magit is first used in
-     the current Emacs session.
-
-        • If the value is ‘nil’, no bindings are added.
-
-        • If ‘default’, maybe add:
-
-          ‘C-x g’     ‘magit-status’
-          ‘C-x M-g’   ‘magit-dispatch’
-          ‘C-c M-g’   ‘magit-file-dispatch’
-
-        • If ‘recommended’, maybe add:
-
-          ‘C-x g’   ‘magit-status’
-          ‘C-c g’   ‘magit-dispatch’
-          ‘C-c f’   ‘magit-file-dispatch’
-
-          These bindings are strongly recommended, but we cannot use
-          them by default, because the ‘C-c <LETTER>’ namespace is
-          strictly reserved for bindings added by the user (see *note
-          (elisp)Key Binding Conventions::).
-
-     The bindings in the chosen set may be added when ‘after-init-hook’
-     is run.  Each binding is added if, and only if, at that time no
-     other key is bound to the same command, and no other command is
-     bound to the same key.  In other words we try to avoid adding
-     bindings that are unnecessary, as well as bindings that conflict
-     with other bindings.
-
-     Adding these bindings is delayed until ‘after-init-hook’ is run to
-     allow users to set the variable anywhere in their init file
-     (without having to make sure to do so before ‘magit’ is loaded or
-     autoloaded) and to increase the likelihood that all the potentially
-     conflicting user bindings have already been added.
-
-     To set this variable use either ‘setq’ or the Custom interface.  Do
-     not use the function ‘customize-set-variable’ because doing that
-     would cause Magit to be loaded immediately, when that form is
-     evaluated (this differs from ‘custom-set-variables’, which doesn’t
-     load the libraries that define the customized variables).
-
-     Setting this variable has no effect if ‘after-init-hook’ has
-     already been run.
-
-
-File: magit.info,  Node: Plumbing,  Next: FAQ,  Prev: Customizing,  Up: Top
-
-10 Plumbing
-***********
-
-The following sections describe how to use several of Magit’s core
-abstractions to extend Magit itself or implement a separate extension.
-
-   A few of the low-level features used by Magit have been factored out
-into separate libraries/packages, so that they can be used by other
-packages, without having to depend on Magit.  See *note
-(with-editor)Top:: for information about ‘with-editor’.  ‘transient’
-doesn’t have a manual yet.
-
-   If you are trying to find an unused key that you can bind to a
-command provided by your own Magit extension, then checkout
-<https://github.com/magit/magit/wiki/Plugin-Dispatch-Key-Registry>.
-
-* Menu:
-
-* Calling Git::
-* Section Plumbing::
-* Refreshing Buffers::
-* Conventions::
-
-
-File: magit.info,  Node: Calling Git,  Next: Section Plumbing,  Up: Plumbing
-
-10.1 Calling Git
-================
-
-Magit provides many specialized functions for calling Git.  All of these
-functions are defined in either ‘magit-git.el’ or ‘magit-process.el’ and
-have one of the prefixes ‘magit-run-’, ‘magit-call-’, ‘magit-start-’, or
-‘magit-git-’ (which is also used for other things).
-
-   All of these functions accept an indefinite number of arguments,
-which are strings that specify command line arguments for Git (or in
-some cases an arbitrary executable).  These arguments are flattened
-before being passed on to the executable; so instead of strings they can
-also be lists of strings and arguments that are ‘nil’ are silently
-dropped.  Some of these functions also require a single mandatory
-argument before these command line arguments.
-
-   Roughly speaking, these functions run Git either to get some value or
-for side-effects.  The functions that return a value are useful to
-collect the information necessary to populate a Magit buffer, while the
-others are used to implement Magit commands.
-
-   The functions in the value-only group always run synchronously, and
-they never trigger a refresh.  The function in the side-effect group can
-be further divided into subgroups depending on whether they run Git
-synchronously or asynchronously, and depending on whether they trigger a
-refresh when the executable has finished.
-
-* Menu:
-
-* Getting a Value from Git::
-* Calling Git for Effect::
-
-
-File: magit.info,  Node: Getting a Value from Git,  Next: Calling Git for Effect,  Up: Calling Git
-
-10.1.1 Getting a Value from Git
--------------------------------
-
-These functions run Git in order to get a value, an exit status, or
-output.  Of course you could also use them to run Git commands that have
-side-effects, but that should be avoided.
-
- -- Function: magit-git-exit-code &rest args
-     Executes git with ARGS and returns its exit code.
-
- -- Function: magit-git-success &rest args
-     Executes git with ARGS and returns ‘t’ if the exit code is ‘0’,
-     ‘nil’ otherwise.
-
- -- Function: magit-git-failure &rest args
-     Executes git with ARGS and returns ‘t’ if the exit code is ‘1’,
-     ‘nil’ otherwise.
-
- -- Function: magit-git-true &rest args
-     Executes git with ARGS and returns ‘t’ if the first line printed by
-     git is the string "true", ‘nil’ otherwise.
-
- -- Function: magit-git-false &rest args
-     Executes git with ARGS and returns ‘t’ if the first line printed by
-     git is the string "false", ‘nil’ otherwise.
-
- -- Function: magit-git-insert &rest args
-     Executes git with ARGS and inserts its output at point.
-
- -- Function: magit-git-string &rest args
-     Executes git with ARGS and returns the first line of its output.
-     If there is no output or if it begins with a newline character,
-     then this returns ‘nil’.
-
- -- Function: magit-git-lines &rest args
-     Executes git with ARGS and returns its output as a list of lines.
-     Empty lines anywhere in the output are omitted.
-
- -- Function: magit-git-items &rest args
-     Executes git with ARGS and returns its null-separated output as a
-     list.  Empty items anywhere in the output are omitted.
-
-     If the value of option ‘magit-git-debug’ is non-nil and git exits
-     with a non-zero exit status, then warn about that in the echo area
-     and add a section containing git’s standard error in the current
-     repository’s process buffer.
-
- -- Function: magit-process-git destination &rest args
-     Calls Git synchronously in a separate process, returning its exit
-     code.  DESTINATION specifies how to handle the output, like for
-     ‘call-process’, except that file handlers are supported.  Enables
-     Cygwin’s "noglob" option during the call and ensures unix eol
-     conversion.
-
- -- Function: magit-process-file process &optional infile buffer display
-          &rest args
-     Processes files synchronously in a separate process.  Identical to
-     ‘process-file’ but temporarily enables Cygwin’s "noglob" option
-     during the call and ensures unix eol conversion.
-
-   If an error occurs when using one of the above functions, then that
-is usually due to a bug, i.e., using an argument which is not actually
-supported.  Such errors are usually not reported, but when they occur we
-need to be able to debug them.
-
- -- User Option: magit-git-debug
-     Whether to report errors that occur when using ‘magit-git-insert’,
-     ‘magit-git-string’, ‘magit-git-lines’, or ‘magit-git-items’.  This
-     does not actually raise an error.  Instead a message is shown in
-     the echo area, and git’s standard error is insert into a new
-     section in the current repository’s process buffer.
-
- -- Function: magit-git-str &rest args
-     This is a variant of ‘magit-git-string’ that ignores the option
-     ‘magit-git-debug’.  It is mainly intended to be used while handling
-     errors in functions that do respect that option.  Using such a
-     function while handing an error could cause yet another error and
-     therefore lead to an infinite recursion.  You probably won’t ever
-     need to use this function.
-
-
-File: magit.info,  Node: Calling Git for Effect,  Prev: Getting a Value from Git,  Up: Calling Git
-
-10.1.2 Calling Git for Effect
------------------------------
-
-These functions are used to run git to produce some effect.  Most Magit
-commands that actually run git do so by using such a function.
-
-   Because we do not need to consume git’s output when using these
-functions, their output is instead logged into a per-repository buffer,
-which can be shown using ‘$’ from a Magit buffer or ‘M-x magit-process’
-elsewhere.
-
-   These functions can have an effect in two distinct ways.  Firstly,
-running git may change something, i.e., create or push a new commit.
-Secondly, that change may require that Magit buffers are refreshed to
-reflect the changed state of the repository.  But refreshing isn’t
-always desirable, so only some of these functions do perform such a
-refresh after git has returned.
-
-   Sometimes it is useful to run git asynchronously.  For example, when
-the user has just initiated a push, then there is no reason to make her
-wait until that has completed.  In other cases it makes sense to wait
-for git to complete before letting the user do something else.  For
-example after staging a change it is useful to wait until after the
-refresh because that also automatically moves to the next change.
-
- -- Function: magit-call-git &rest args
-     Calls git synchronously with ARGS.
-
- -- Function: magit-call-process program &rest args
-     Calls PROGRAM synchronously with ARGS.
-
- -- Function: magit-run-git &rest args
-     Calls git synchronously with ARGS and then refreshes.
-
- -- Function: magit-run-git-with-input &rest args
-     Calls git synchronously with ARGS and sends it the content of the
-     current buffer on standard input.
-
-     If the current buffer’s ‘default-directory’ is on a remote
-     filesystem, this function actually runs git asynchronously.  But
-     then it waits for the process to return, so the function itself is
-     synchronous.
-
- -- Function: magit-git &rest args
-     Calls git synchronously with ARGS for side-effects only.  This
-     function does not refresh the buffer.
-
- -- Function: magit-git-wash washer &rest args
-     Execute Git with ARGS, inserting washed output at point.  Actually
-     first insert the raw output at point.  If there is no output call
-     ‘magit-cancel-section’.  Otherwise temporarily narrow the buffer to
-     the inserted text, move to its beginning, and then call function
-     WASHER with ARGS as its sole argument.
-
-   And now for the asynchronous variants.
-
- -- Function: magit-run-git-async &rest args
-     Start Git, prepare for refresh, and return the process object.
-     ARGS is flattened and then used as arguments to Git.
-
-     Display the command line arguments in the echo area.
-
-     After Git returns some buffers are refreshed: the buffer that was
-     current when this function was called (if it is a Magit buffer and
-     still alive), as well as the respective Magit status buffer.
-     Unmodified buffers visiting files that are tracked in the current
-     repository are reverted if ‘magit-revert-buffers’ is non-nil.
-
- -- Function: magit-run-git-with-editor &rest args
-     Export GIT_EDITOR and start Git.  Also prepare for refresh and
-     return the process object.  ARGS is flattened and then used as
-     arguments to Git.
-
-     Display the command line arguments in the echo area.
-
-     After Git returns some buffers are refreshed: the buffer that was
-     current when this function was called (if it is a Magit buffer and
-     still alive), as well as the respective Magit status buffer.
-
- -- Function: magit-start-git input &rest args
-     Start Git, prepare for refresh, and return the process object.
-
-     If INPUT is non-nil, it has to be a buffer or the name of an
-     existing buffer.  The buffer content becomes the processes standard
-     input.
-
-     Option ‘magit-git-executable’ specifies the Git executable and
-     option ‘magit-git-global-arguments’ specifies constant arguments.
-     The remaining arguments ARGS specify arguments to Git.  They are
-     flattened before use.
-
-     After Git returns, some buffers are refreshed: the buffer that was
-     current when this function was called (if it is a Magit buffer and
-     still alive), as well as the respective Magit status buffer.
-     Unmodified buffers visiting files that are tracked in the current
-     repository are reverted if ‘magit-revert-buffers’ is non-nil.
-
- -- Function: magit-start-process &rest args
-     Start PROGRAM, prepare for refresh, and return the process object.
-
-     If optional argument INPUT is non-nil, it has to be a buffer or the
-     name of an existing buffer.  The buffer content becomes the
-     processes standard input.
-
-     The process is started using ‘start-file-process’ and then setup to
-     use the sentinel ‘magit-process-sentinel’ and the filter
-     ‘magit-process-filter’.  Information required by these functions is
-     stored in the process object.  When this function returns the
-     process has not started to run yet so it is possible to override
-     the sentinel and filter.
-
-     After the process returns, ‘magit-process-sentinel’ refreshes the
-     buffer that was current when ‘magit-start-process’ was called (if
-     it is a Magit buffer and still alive), as well as the respective
-     Magit status buffer.  Unmodified buffers visiting files that are
-     tracked in the current repository are reverted if
-     ‘magit-revert-buffers’ is non-nil.
-
- -- Variable: magit-this-process
-     The child process which is about to start.  This can be used to
-     change the filter and sentinel.
-
- -- Variable: magit-process-raise-error
-     When this is non-nil, then ‘magit-process-sentinel’ raises an error
-     if git exits with a non-zero exit status.  For debugging purposes.
-
-
-File: magit.info,  Node: Section Plumbing,  Next: Refreshing Buffers,  Prev: Calling Git,  Up: Plumbing
-
-10.2 Section Plumbing
-=====================
-
-* Menu:
-
-* Creating Sections::
-* Section Selection::
-* Matching Sections::
-
-
-File: magit.info,  Node: Creating Sections,  Next: Section Selection,  Up: Section Plumbing
-
-10.2.1 Creating Sections
-------------------------
-
- -- Macro: magit-insert-section &rest args
-     Insert a section at point.
-
-     TYPE is the section type, a symbol.  Many commands that act on the
-     current section behave differently depending on that type.  Also if
-     a variable ‘magit-TYPE-section-map’ exists, then use that as the
-     text-property ‘keymap’ of all text belonging to the section (but
-     this may be overwritten in subsections).  TYPE can also have the
-     form ‘(eval FORM)’ in which case FORM is evaluated at runtime.
-
-     Optional VALUE is the value of the section, usually a string that
-     is required when acting on the section.
-
-     When optional HIDE is non-nil collapse the section body by default,
-     i.e., when first creating the section, but not when refreshing the
-     buffer.  Otherwise, expand it by default.  This can be overwritten
-     using ‘magit-section-set-visibility-hook’.  When a section is
-     recreated during a refresh, then the visibility of predecessor is
-     inherited and HIDE is ignored (but the hook is still honored).
-
-     BODY is any number of forms that actually insert the section’s
-     heading and body.  Optional NAME, if specified, has to be a symbol,
-     which is then bound to the struct of the section being inserted.
-
-     Before BODY is evaluated the ‘start’ of the section object is set
-     to the value of ‘point’ and after BODY was evaluated its ‘end’ is
-     set to the new value of ‘point’; BODY is responsible for moving
-     ‘point’ forward.
-
-     If it turns out inside BODY that the section is empty, then
-     ‘magit-cancel-section’ can be used to abort and remove all traces
-     of the partially inserted section.  This can happen when creating a
-     section by washing Git’s output and Git didn’t actually output
-     anything this time around.
-
- -- Function: magit-insert-heading &rest args
-     Insert the heading for the section currently being inserted.
-
-     This function should only be used inside ‘magit-insert-section’.
-
-     When called without any arguments, then just set the ‘content’ slot
-     of the object representing the section being inserted to a marker
-     at ‘point’.  The section should only contain a single line when
-     this function is used like this.
-
-     When called with arguments ARGS, which have to be strings, then
-     insert those strings at point.  The section should not contain any
-     text before this happens and afterwards it should again only
-     contain a single line.  If the ‘face’ property is set anywhere
-     inside any of these strings, then insert all of them unchanged.
-     Otherwise use the ‘magit-section-heading’ face for all inserted
-     text.
-
-     The ‘content’ property of the section struct is the end of the
-     heading (which lasts from ‘start’ to ‘content’) and the beginning
-     of the body (which lasts from ‘content’ to ‘end’).  If the value of
-     ‘content’ is nil, then the section has no heading and its body
-     cannot be collapsed.  If a section does have a heading then its
-     height must be exactly one line, including a trailing newline
-     character.  This isn’t enforced; you are responsible for getting it
-     right.  The only exception is that this function does insert a
-     newline character if necessary.
-
- -- Function: magit-cancel-section
-     Cancel the section currently being inserted.  This exits the
-     innermost call to ‘magit-insert-section’ and removes all traces of
-     what has already happened inside that call.
-
- -- Function: magit-define-section-jumper sym title &optional value
-     Define an interactive function to go to section SYM.  TITLE is the
-     displayed title of the section.
-
-
-File: magit.info,  Node: Section Selection,  Next: Matching Sections,  Prev: Creating Sections,  Up: Section Plumbing
-
-10.2.2 Section Selection
-------------------------
-
- -- Function: magit-current-section
-     Return the section at point.
-
- -- Function: magit-region-sections &optional condition multiple
-     Return a list of the selected sections.
-
-     When the region is active and constitutes a valid section
-     selection, then return a list of all selected sections.  This is
-     the case when the region begins in the heading of a section and
-     ends in the heading of the same section or in that of a sibling
-     section.  If optional MULTIPLE is non-nil, then the region cannot
-     begin and end in the same section.
-
-     When the selection is not valid, then return nil.  In this case,
-     most commands that can act on the selected sections will instead
-     act on the section at point.
-
-     When the region looks like it would in any other buffer then the
-     selection is invalid.  When the selection is valid then the region
-     uses the ‘magit-section-highlight’ face.  This does not apply to
-     diffs where things get a bit more complicated, but even here if the
-     region looks like it usually does, then that’s not a valid
-     selection as far as this function is concerned.
-
-     If optional CONDITION is non-nil, then the selection not only has
-     to be valid; all selected sections additionally have to match
-     CONDITION, or nil is returned.  See ‘magit-section-match’ for the
-     forms CONDITION can take.
-
- -- Function: magit-region-values &optional condition multiple
-     Return a list of the values of the selected sections.
-
-     Return the values that themselves would be returned by
-     ‘magit-region-sections’ (which see).
-
-
-File: magit.info,  Node: Matching Sections,  Prev: Section Selection,  Up: Section Plumbing
-
-10.2.3 Matching Sections
-------------------------
-
-‘M-x magit-describe-section-briefly’
-     Show information about the section at point.  This command is
-     intended for debugging purposes.
-
- -- Function: magit-section-ident section
-     Return an unique identifier for SECTION.  The return value has the
-     form ‘((TYPE . VALUE)...)’.
-
- -- Function: magit-get-section ident &optional root
-     Return the section identified by IDENT.  IDENT has to be a list as
-     returned by ‘magit-section-ident’.
-
- -- Function: magit-section-match condition &optional section
-     Return ‘t’ if SECTION matches CONDITION.  SECTION defaults to the
-     section at point.  If SECTION is not specified and there also is no
-     section at point, then return ‘nil’.
-
-     CONDITION can take the following forms:
-        • ‘(CONDITION...)’
-
-          matches if any of the CONDITIONs matches.
-
-        • ‘[CLASS...]’
-
-          matches if the section’s class is the same as the first CLASS
-          or a subclass of that; the section’s parent class matches the
-          second CLASS; and so on.
-
-        • ‘[* CLASS...]’
-
-          matches sections that match ‘[CLASS...]’ and also recursively
-          all their child sections.
-
-        • ‘CLASS’
-
-          matches if the section’s class is the same as CLASS or a
-          subclass of that; regardless of the classes of the parent
-          sections.
-
-     Each CLASS should be a class symbol, identifying a class that
-     derives from ‘magit-section’.  For backward compatibility CLASS can
-     also be a "type symbol".  A section matches such a symbol if the
-     value of its ‘type’ slot is ‘eq’.  If a type symbol has an entry in
-     ‘magit--section-type-alist’, then a section also matches that type
-     if its class is a subclass of the class that corresponds to the
-     type as per that alist.
-
-     Note that it is not necessary to specify the complete section
-     lineage as printed by ‘magit-describe-section-briefly’, unless of
-     course you want to be that precise.
-
- -- Function: magit-section-value-if condition &optional section
-     If the section at point matches CONDITION, then return its value.
-
-     If optional SECTION is non-nil then test whether that matches
-     instead.  If there is no section at point and SECTION is nil, then
-     return nil.  If the section does not match, then return nil.
-
-     See ‘magit-section-match’ for the forms CONDITION can take.
-
- -- Function: magit-section-case &rest clauses
-     Choose among clauses on the type of the section at point.
-
-     Each clause looks like (CONDITION BODY...).  The type of the
-     section is compared against each CONDITION; the BODY forms of the
-     first match are evaluated sequentially and the value of the last
-     form is returned.  Inside BODY the symbol ‘it’ is bound to the
-     section at point.  If no clause succeeds or if there is no section
-     at point return nil.
-
-     See ‘magit-section-match’ for the forms CONDITION can take.
-     Additionally a CONDITION of t is allowed in the final clause and
-     matches if no other CONDITION match, even if there is no section at
-     point.
-
- -- Variable: magit-root-section
-     The root section in the current buffer.  All other sections are
-     descendants of this section.  The value of this variable is set by
-     ‘magit-insert-section’ and you should never modify it.
-
-   For diff related sections a few additional tools exist.
-
- -- Function: magit-diff-type &optional section
-     Return the diff type of SECTION.
-
-     The returned type is one of the symbols ‘staged’, ‘unstaged’,
-     ‘committed’, or ‘undefined’.  This type serves a similar purpose as
-     the general type common to all sections (which is stored in the
-     ‘type’ slot of the corresponding ‘magit-section’ struct) but takes
-     additional information into account.  When the SECTION isn’t
-     related to diffs and the buffer containing it also isn’t a
-     diff-only buffer, then return nil.
-
-     Currently the type can also be one of ‘tracked’ and ‘untracked’,
-     but these values are not handled explicitly in every place they
-     should be.  A possible fix could be to just return nil here.
-
-     The section has to be a ‘diff’ or ‘hunk’ section, or a section
-     whose children are of type ‘diff’.  If optional SECTION is nil,
-     return the diff type for the current section.  In buffers whose
-     major mode is ‘magit-diff-mode’ SECTION is ignored and the type is
-     determined using other means.  In ‘magit-revision-mode’ buffers the
-     type is always ‘committed’.
-
- -- Function: magit-diff-scope &optional section strict
-     Return the diff scope of SECTION or the selected section(s).
-
-     A diff’s "scope" describes what part of a diff is selected, it is a
-     symbol, one of ‘region’, ‘hunk’, ‘hunks’, ‘file’, ‘files’, or
-     ‘list’.  Do not confuse this with the diff "type", as returned by
-     ‘magit-diff-type’.
-
-     If optional SECTION is non-nil, then return the scope of that,
-     ignoring the sections selected by the region.  Otherwise return the
-     scope of the current section, or if the region is active and
-     selects a valid group of diff related sections, the type of these
-     sections, i.e., ‘hunks’ or ‘files’.  If SECTION (or if the current
-     section that is nil) is a ‘hunk’ section and the region starts and
-     ends inside the body of a that section, then the type is ‘region’.
-
-     If optional STRICT is non-nil then return nil if the diff type of
-     the section at point is ‘untracked’ or the section at point is not
-     actually a ‘diff’ but a ‘diffstat’ section.
-
-
-File: magit.info,  Node: Refreshing Buffers,  Next: Conventions,  Prev: Section Plumbing,  Up: Plumbing
-
-10.3 Refreshing Buffers
-=======================
-
-All commands that create a new Magit buffer or change what is being
-displayed in an existing buffer do so by calling ‘magit-mode-setup’.
-Among other things, that function sets the buffer local values of
-‘default-directory’ (to the top-level of the repository),
-‘magit-refresh-function’, and ‘magit-refresh-args’.
-
-   Buffers are refreshed by calling the function that is the local value
-of ‘magit-refresh-function’ (a function named ‘magit-*-refresh-buffer’,
-where ‘*’ may be something like ‘diff’) with the value of
-‘magit-refresh-args’ as arguments.
-
- -- Macro: magit-mode-setup buffer switch-func mode refresh-func
-          &optional refresh-args
-     This function displays and selects BUFFER, turns on MODE, and
-     refreshes a first time.
-
-     This function displays and optionally selects BUFFER by calling
-     ‘magit-mode-display-buffer’ with BUFFER, MODE and SWITCH-FUNC as
-     arguments.  Then it sets the local value of
-     ‘magit-refresh-function’ to REFRESH-FUNC and that of
-     ‘magit-refresh-args’ to REFRESH-ARGS.  Finally it creates the
-     buffer content by calling REFRESH-FUNC with REFRESH-ARGS as
-     arguments.
-
-     All arguments are evaluated before switching to BUFFER.
-
- -- Function: magit-mode-display-buffer buffer mode &optional
-          switch-function
-     This function display BUFFER in some window and select it.  BUFFER
-     may be a buffer or a string, the name of a buffer.  The buffer is
-     returned.
-
-     Unless BUFFER is already displayed in the selected frame, store the
-     previous window configuration as a buffer local value, so that it
-     can later be restored by ‘magit-mode-bury-buffer’.
-
-     The buffer is displayed and selected using SWITCH-FUNCTION.  If
-     that is ‘nil’ then ‘pop-to-buffer’ is used if the current buffer’s
-     major mode derives from ‘magit-mode’.  Otherwise ‘switch-to-buffer’
-     is used.
-
- -- Variable: magit-refresh-function
-     The value of this buffer-local variable is the function used to
-     refresh the current buffer.  It is called with ‘magit-refresh-args’
-     as arguments.
-
- -- Variable: magit-refresh-args
-     The list of arguments used by ‘magit-refresh-function’ to refresh
-     the current buffer.  ‘magit-refresh-function’ is called with these
-     arguments.
-
-     The value is usually set using ‘magit-mode-setup’, but in some
-     cases it’s also useful to provide commands that can change the
-     value.  For example, the ‘magit-diff-refresh’ transient can be used
-     to change any of the arguments used to display the diff, without
-     having to specify again which differences should be shown, but
-     ‘magit-diff-more-context’, ‘magit-diff-less-context’ and
-     ‘magit-diff-default-context’ change just the ‘-U<N>’ argument.  In
-     both case this is done by changing the value of this variable and
-     then calling this ‘magit-refresh-function’.
-
-
-File: magit.info,  Node: Conventions,  Prev: Refreshing Buffers,  Up: Plumbing
-
-10.4 Conventions
-================
-
-Also see *note Completion and Confirmation::.
-
-* Menu:
-
-* Theming Faces::
-
-
-File: magit.info,  Node: Theming Faces,  Up: Conventions
-
-10.4.1 Theming Faces
---------------------
-
-The default theme uses blue for local branches, green for remote
-branches, and goldenrod (brownish yellow) for tags.  When creating a new
-theme, you should probably follow that example.  If your theme already
-uses other colors, then stick to that.
-
-   In older releases these reference faces used to have a background
-color and a box around them.  The basic default faces no longer do so,
-to make Magit buffers much less noisy, and you should follow that
-example at least with regards to boxes.  (Boxes were used in the past to
-work around a conflict between the highlighting overlay and text
-property backgrounds.  That’s no longer necessary because highlighting
-no longer causes other background colors to disappear.)  Alternatively
-you can keep the background color and/or box, but then have to take
-special care to adjust ‘magit-branch-current’ accordingly.  By default
-it looks mostly like ‘magit-branch-local’, but with a box (by default
-the former is the only face that uses a box, exactly so that it sticks
-out).  If the former also uses a box, then you have to make sure that it
-differs in some other way from the latter.
-
-   The most difficult faces to theme are those related to diffs,
-headings, highlighting, and the region.  There are faces that fall into
-all four groups - expect to spend some time getting this right.
-
-   The ‘region’ face in the default theme, in both the light and dark
-variants, as well as in many other themes, distributed with Emacs or by
-third-parties, is very ugly.  It is common to use a background color
-that really sticks out, which is ugly but if that were the only problem
-then it would be acceptable.  Unfortunately many themes also set the
-foreground color, which ensures that all text within the region is
-readable.  Without doing that there might be cases where some foreground
-color is too close to the region background color to still be readable.
-But it also means that text within the region loses all syntax
-highlighting.
-
-   I consider the work that went into getting the ‘region’ face right to
-be a good indicator for the general quality of a theme.  My
-recommendation for the ‘region’ face is this: use a background color
-slightly different from the background color of the ‘default’ face, and
-do not set the foreground color at all.  So for a light theme you might
-use a light (possibly tinted) gray as the background color of ‘default’
-and a somewhat darker gray for the background of ‘region’.  That should
-usually be enough to not collide with the foreground color of any other
-face.  But if some other faces also set a light gray as background
-color, then you should also make sure it doesn’t collide with those (in
-some cases it might be acceptable though).
-
-   Magit only uses the ‘region’ face when the region is "invalid" by its
-own definition.  In a Magit buffer the region is used to either select
-multiple sibling sections, so that commands which support it act on all
-of these sections instead of just the current section, or to select
-lines within a single hunk section.  In all other cases, the section is
-considered invalid and Magit won’t act on it.  But such invalid sections
-happen, either because the user has not moved point enough yet to make
-it valid or because she wants to use a non-magit command to act on the
-region, e.g., ‘kill-region’.
-
-   So using the regular ‘region’ face for invalid sections is a feature.
-It tells the user that Magit won’t be able to act on it.  It’s
-acceptable if that face looks a bit odd and even (but less so) if it
-collides with the background colors of section headings and other things
-that have a background color.
-
-   Magit highlights the current section.  If a section has subsections,
-then all of them are highlighted.  This is done using faces that have
-"highlight" in their names.  For most sections,
-‘magit-section-highlight’ is used for both the body and the heading.
-Like the ‘region’ face, it should only set the background color to
-something similar to that of ‘default’.  The highlight background color
-must be different from both the ‘region’ background color and the
-‘default’ background color.
-
-   For diff related sections Magit uses various faces to highlight
-different parts of the selected section(s).  Note that hunk headings,
-unlike all other section headings, by default have a background color,
-because it is useful to have very visible separators between hunks.
-That face ‘magit-diff-hunk-heading’, should be different from both
-‘magit-diff-hunk-heading-highlight’ and ‘magit-section-highlight’, as
-well as from ‘magit-diff-context’ and ‘magit-diff-context-highlight’.
-By default we do that by changing the foreground color.  Changing the
-background color would lead to complications, and there are already
-enough we cannot get around.  (Also note that it is generally a good
-idea for section headings to always be bold, but only for sections that
-have subsections).
-
-   When there is a valid region selecting diff-related sibling sections,
-i.e., multiple files or hunks, then the bodies of all these sections use
-the respective highlight faces, but additionally the headings instead
-use one of the faces ‘magit-diff-file-heading-selection’ or
-‘magit-diff-hunk-heading-selection’.  These faces have to be different
-from the regular highlight variants to provide explicit visual
-indication that the region is active.
-
-   When theming diff related faces, start by setting the option
-‘magit-diff-refine-hunk’ to ‘all’.  You might personally prefer to only
-refine the current hunk or not use hunk refinement at all, but some of
-the users of your theme want all hunks to be refined, so you have to
-cater to that.
-
-   (Also turn on ‘magit-diff-highlight-indentation’,
-‘magit-diff-highlight-trailing’, and ‘magit-diff-paint-whitespace’; and
-insert some whitespace errors into the code you use for testing.)
-
-   For added lines you have to adjust three faces: ‘magit-diff-added’,
-‘magit-diff-added-highlight’, and ‘diff-refined-added’.  Make sure that
-the latter works well with both of the former, as well as ‘smerge-other’
-and ‘diff-added’.  Then do the same for the removed lines, context
-lines, lines added by us, and lines added by them.  Also make sure the
-respective added, removed, and context faces use approximately the same
-saturation for both the highlighted and unhighlighted variants.  Also
-make sure the file and diff headings work nicely with context lines
-(e.g., make them look different).  Line faces should set both the
-foreground and the background color.  For example, for added lines use
-two different greens.
-
-   It’s best if the foreground color of both the highlighted and the
-unhighlighted variants are the same, so you will need to have to find a
-color that works well on the highlight and unhighlighted background, the
-refine background, and the highlight context background.  When there is
-an hunk internal region, then the added- and removed-lines background
-color is used only within that region.  Outside the region the
-highlighted context background color is used.  This makes it easier to
-see what is being staged.  With an hunk internal region the hunk heading
-is shown using ‘magit-diff-hunk-heading-selection’, and so are the thin
-lines that are added around the lines that fall within the region.  The
-background color of that has to be distinct enough from the various
-other involved background colors.
-
-   Nobody said this would be easy.  If your theme restricts itself to a
-certain set of colors, then you should make an exception here.
-Otherwise it would be impossible to make the diffs look good in each and
-every variation.  Actually you might want to just stick to the default
-definitions for these faces.  You have been warned.  Also please note
-that if you do not get this right, this will in some cases look to users
-like bugs in Magit - so please do it right or not at all.
-
-
-File: magit.info,  Node: FAQ,  Next: Debugging Tools,  Prev: Plumbing,  Up: Top
-
-Appendix A FAQ
-**************
-
-The next two nodes lists frequently asked questions.  For a list of
-frequently *and recently* asked questions, i.e., questions that haven’t
-made it into the manual yet, see
-<https://github.com/magit/magit/wiki/FAQ>.
-
-   Please also see *note Debugging Tools::.
-
-* Menu:
-
-* FAQ - How to ...?::
-* FAQ - Issues and Errors::
-
-
-File: magit.info,  Node: FAQ - How to ...?,  Next: FAQ - Issues and Errors,  Up: FAQ
-
-A.1 FAQ - How to ...?
-=====================
-
-* Menu:
-
-* How to pronounce Magit?::
-* How to show git's output?::
-* How to install the gitman info manual?::
-* How to show diffs for gpg-encrypted files?::
-* How does branching and pushing work?::
-* Should I disable VC?::
-
-
-File: magit.info,  Node: How to pronounce Magit?,  Next: How to show git's output?,  Up: FAQ - How to ...?
-
-A.1.1 How to pronounce Magit?
------------------------------
-
-Either ‘mu[m's] git’ or ‘magi{c => t}’ is fine.
-
-   The slogan is "It’s Magit!  The magical Git client", so it makes
-sense to pronounce Magit like magic, while taking into account that C
-and T do not sound the same.
-
-   The German "Magie" is not pronounced the same as the English "magic",
-so if you speak German then you can use the above rationale to justify
-using the former pronunciation; ‘Mag{ie => it}’.
-
-   You can also choose to use the former pronunciation just because you
-like it better.
-
-   Also see <https://magit.vc/assets/videos/magic.mp4>.  Also see
-<https://emacs.stackexchange.com/questions/13696>.
-
-
-File: magit.info,  Node: How to show git's output?,  Next: How to install the gitman info manual?,  Prev: How to pronounce Magit?,  Up: FAQ - How to ...?
-
-A.1.2 How to show git’s output?
--------------------------------
-
-To show the output of recently run git commands, press ‘$’ (or, if that
-isn’t available, ‘M-x magit-process-buffer’).  This will show a buffer
-containing a section per git invocation; as always press ‘TAB’ to expand
-or collapse them.
-
-   By default, git’s output is only inserted into the process buffer if
-it is run for side-effects.  When the output is consumed in some way,
-also inserting it into the process buffer would be too expensive.  For
-debugging purposes, it’s possible to do so anyway by setting
-‘magit-git-debug’ to ‘t’.
-
-
-File: magit.info,  Node: How to install the gitman info manual?,  Next: How to show diffs for gpg-encrypted files?,  Prev: How to show git's output?,  Up: FAQ - How to ...?
-
-A.1.3 How to install the gitman info manual?
---------------------------------------------
-
-Git’s manpages can be exported as an info manual called ‘gitman’.
-Magit’s own info manual links to nodes in that manual instead of the
-actual manpages because Info doesn’t support linking to manpages.
-
-   Unfortunately some distributions do not install the ‘gitman’ manual
-by default and you will have to install a separate documentation package
-to get it.
-
-   Magit patches Info adding the ability to visit links to the ‘gitman’
-Info manual by instead viewing the respective manpage.  If you prefer
-that approach, then set the value of ‘magit-view-git-manual-method’ to
-one of the supported packages ‘man’ or ‘woman’, e.g.:
-
-     (setq magit-view-git-manual-method 'man)
-
-
-File: magit.info,  Node: How to show diffs for gpg-encrypted files?,  Next: How does branching and pushing work?,  Prev: How to install the gitman info manual?,  Up: FAQ - How to ...?
-
-A.1.4 How to show diffs for gpg-encrypted files?
-------------------------------------------------
-
-Git supports showing diffs for encrypted files, but has to be told to do
-so.  Since Magit just uses Git to get the diffs, configuring Git also
-affects the diffs displayed inside Magit.
-
-     git config --global diff.gpg.textconv "gpg --no-tty --decrypt"
-     echo "*.gpg filter=gpg diff=gpg" > .gitattributes
-
-
-File: magit.info,  Node: How does branching and pushing work?,  Next: Should I disable VC?,  Prev: How to show diffs for gpg-encrypted files?,  Up: FAQ - How to ...?
-
-A.1.5 How does branching and pushing work?
-------------------------------------------
-
-Please see *note Branching:: and
-<https://emacsair.me/2016/01/17/magit-2.4>
-
-
-File: magit.info,  Node: Should I disable VC?,  Prev: How does branching and pushing work?,  Up: FAQ - How to ...?
-
-A.1.6 Should I disable VC?
---------------------------
-
-If you don’t use VC (the built-in version control interface) then you
-might be tempted to disable it, not least because we used to recommend
-that you do that.
-
-   We no longer recommend that you disable VC.  Doing so would break
-useful third-party packages (such as ‘diff-hl’), which depend on VC
-being enabled.
-
-   If you choose to disable VC anyway, then you can do so by changing
-the value of ‘vc-handled-backends’.
-
-
-File: magit.info,  Node: FAQ - Issues and Errors,  Prev: FAQ - How to ...?,  Up: FAQ
-
-A.2 FAQ - Issues and Errors
-===========================
-
-* Menu:
-
-* Magit is slow::
-* I changed several thousand files at once and now Magit is unusable::
-* I am having problems committing::
-* I am using MS Windows and cannot push with Magit::
-* I am using macOS and SOMETHING works in shell, but not in Magit: I am using macOS and SOMETHING works in shell but not in Magit.
-* Expanding a file to show the diff causes it to disappear::
-* Point is wrong in the COMMIT_EDITMSG buffer::
-* The mode-line information isn't always up-to-date::
-* A branch and tag sharing the same name breaks SOMETHING::
-* My Git hooks work on the command-line but not inside Magit::
-* git-commit-mode isn't used when committing from the command-line::
-* Point ends up inside invisible text when jumping to a file-visiting buffer::
-* I am no longer able to save popup defaults::
-
-
-File: magit.info,  Node: Magit is slow,  Next: I changed several thousand files at once and now Magit is unusable,  Up: FAQ - Issues and Errors
-
-A.2.1 Magit is slow
--------------------
-
-See *note Performance:: and *note I changed several thousand files at
-once and now Magit is unusable::.
-
-
-File: magit.info,  Node: I changed several thousand files at once and now Magit is unusable,  Next: I am having problems committing,  Prev: Magit is slow,  Up: FAQ - Issues and Errors
-
-A.2.2 I changed several thousand files at once and now Magit is unusable
-------------------------------------------------------------------------
-
-Magit is currently not expected to work well under such conditions.  It
-sure would be nice if it did.  Reaching satisfactory performance under
-such conditions will require some heavy refactoring.  This is no small
-task but I hope to eventually find the time to make it happen.
-
-   But for now we recommend you use the command line to complete this
-one commit.  Also see *note Performance::.
-
-
-File: magit.info,  Node: I am having problems committing,  Next: I am using MS Windows and cannot push with Magit,  Prev: I changed several thousand files at once and now Magit is unusable,  Up: FAQ - Issues and Errors
-
-A.2.3 I am having problems committing
--------------------------------------
-
-That likely means that Magit is having problems finding an appropriate
-emacsclient executable.  See *note (with-editor)Configuring
-With-Editor:: and *note (with-editor)Debugging::.
-
-
-File: magit.info,  Node: I am using MS Windows and cannot push with Magit,  Next: I am using macOS and SOMETHING works in shell but not in Magit,  Prev: I am having problems committing,  Up: FAQ - Issues and Errors
-
-A.2.4 I am using MS Windows and cannot push with Magit
-------------------------------------------------------
-
-It’s almost certain that Magit is only incidental to this issue.  It is
-much more likely that this is a configuration issue, even if you can
-push on the command line.
-
-   Detailed setup instructions can be found at
-<https://github.com/magit/magit/wiki/Pushing-with-Magit-from-Windows>.
-
-
-File: magit.info,  Node: I am using macOS and SOMETHING works in shell but not in Magit,  Next: Expanding a file to show the diff causes it to disappear,  Prev: I am using MS Windows and cannot push with Magit,  Up: FAQ - Issues and Errors
-
-A.2.5 I am using macOS and SOMETHING works in shell, but not in Magit
----------------------------------------------------------------------
-
-This usually occurs because Emacs doesn’t have the same environment
-variables as your shell.  Try installing and configuring
-<https://github.com/purcell/exec-path-from-shell>.  By default it
-synchronizes ‘$PATH’, which helps Magit find the same ‘git’ as the one
-you are using on the shell.
-
-   If SOMETHING is "passphrase caching with gpg-agent for commit and/or
-tag signing", then you’ll also need to synchronize ‘$GPG_AGENT_INFO’.
-
-
-File: magit.info,  Node: Expanding a file to show the diff causes it to disappear,  Next: Point is wrong in the COMMIT_EDITMSG buffer,  Prev: I am using macOS and SOMETHING works in shell but not in Magit,  Up: FAQ - Issues and Errors
-
-A.2.6 Expanding a file to show the diff causes it to disappear
---------------------------------------------------------------
-
-This is probably caused by a customization of a ‘diff.*’ Git variable.
-You probably set that variable for a reason, and should therefore only
-undo that setting in Magit by customizing ‘magit-git-global-arguments’.
-
-
-File: magit.info,  Node: Point is wrong in the COMMIT_EDITMSG buffer,  Next: The mode-line information isn't always up-to-date,  Prev: Expanding a file to show the diff causes it to disappear,  Up: FAQ - Issues and Errors
-
-A.2.7 Point is wrong in the ‘COMMIT_EDITMSG’ buffer
----------------------------------------------------
-
-Neither Magit nor ‘git-commit.el’ fiddle with point in the buffer used
-to write commit messages, so something else must be doing it.
-
-   You have probably globally enabled a mode which restores point in
-file-visiting buffers.  It might be a bit surprising, but when you write
-a commit message, then you are actually editing a file.
-
-   So you have to figure out which package is doing it.  ‘saveplace’,
-‘pointback’, and ‘session’ are likely candidates.  These snippets might
-help:
-
-     (setq session-name-disable-regexp "\\(?:\\`'\\.git/[A-Z_]+\\'\\)")
-
-     (with-eval-after-load 'pointback
-       (lambda ()
-         (when (or git-commit-mode git-rebase-mode)
-           (pointback-mode -1))))
-
-
-File: magit.info,  Node: The mode-line information isn't always up-to-date,  Next: A branch and tag sharing the same name breaks SOMETHING,  Prev: Point is wrong in the COMMIT_EDITMSG buffer,  Up: FAQ - Issues and Errors
-
-A.2.8 The mode-line information isn’t always up-to-date
--------------------------------------------------------
-
-Magit is not responsible for the version control information that is
-being displayed in the mode-line and looks something like ‘Git-master’.
-The built-in "Version Control" package, also known as "VC", updates that
-information, and can be told to do so more often:
-
-     (setq auto-revert-check-vc-info t)
-
-   But doing so isn’t good for performance.  For more (overly
-optimistic) information see *note (emacs)VC Mode Line::.
-
-   If you don’t really care about seeing this information in the
-mode-line, but just don’t want to see _incorrect_ information, then
-consider simply not displaying it in the mode-line:
-
-     (setq-default mode-line-format
-                   (delete '(vc-mode vc-mode) mode-line-format))
-
-
-File: magit.info,  Node: A branch and tag sharing the same name breaks SOMETHING,  Next: My Git hooks work on the command-line but not inside Magit,  Prev: The mode-line information isn't always up-to-date,  Up: FAQ - Issues and Errors
-
-A.2.9 A branch and tag sharing the same name breaks SOMETHING
--------------------------------------------------------------
-
-Or more generally, ambiguous refnames break SOMETHING.
-
-   Magit assumes that refs are named non-ambiguously across the
-"refs/heads/", "refs/tags/", and "refs/remotes/" namespaces (i.e., all
-the names remain unique when those prefixes are stripped).  We consider
-ambiguous refnames unsupported and recommend that you use a
-non-ambiguous naming scheme.  However, if you do work with a repository
-that has ambiguous refnames, please report any issues you encounter, so
-that we can investigate whether there is a simple fix.
-
-
-File: magit.info,  Node: My Git hooks work on the command-line but not inside Magit,  Next: git-commit-mode isn't used when committing from the command-line,  Prev: A branch and tag sharing the same name breaks SOMETHING,  Up: FAQ - Issues and Errors
-
-A.2.10 My Git hooks work on the command-line but not inside Magit
------------------------------------------------------------------
-
-When Magit calls ‘git’ it adds a few global arguments including
-‘--literal-pathspecs’ and the ‘git’ process started by Magit then passes
-that setting on to other ‘git’ process it starts itself.  It does so by
-setting the environment variable ‘GIT_LITERAL_PATHSPECS’, not by calling
-subprocesses with the ‘--literal-pathspecs’ argument.  You can therefore
-override this setting in hook scripts using ‘unset
-GIT_LITERAL_PATHSPECS’.
-
-
-File: magit.info,  Node: git-commit-mode isn't used when committing from the command-line,  Next: Point ends up inside invisible text when jumping to a file-visiting buffer,  Prev: My Git hooks work on the command-line but not inside Magit,  Up: FAQ - Issues and Errors
-
-A.2.11 ‘git-commit-mode’ isn’t used when committing from the command-line
--------------------------------------------------------------------------
-
-The reason for this is that ‘git-commit.el’ has not been loaded yet
-and/or that the server has not been started yet.  These things have
-always already been taken care of when you commit from Magit because in
-order to do so, Magit has to be loaded and doing that involves loading
-‘git-commit’ and starting the server.
-
-   If you want to commit from the command-line, then you have to take
-care of these things yourself.  Your ‘init.el’ file should contain:
-
-     (require 'git-commit)
-     (server-mode)
-
-   Instead of ‘(require ’git-commit)‘ you may also use:
-
-     (load "/path/to/magit-autoloads.el")
-
-   You might want to do that because loading ‘git-commit’ causes large
-parts of Magit to be loaded.
-
-   There are also some variations of ‘(server-mode)’ that you might want
-to try.  Personally I use:
-
-     (use-package server
-       :config (or (server-running-p) (server-mode)))
-
-   Now you can use:
-
-     $ emacs&
-     $ EDITOR=emacsclient git commit
-
-   However you cannot use:
-
-     $ killall emacs
-     $ EDITOR="emacsclient --alternate-editor emacs" git commit
-
-   This will actually end up using ‘emacs’, not ‘emacsclient’.  If you
-do this, then you can still edit the commit message but
-‘git-commit-mode’ won’t be used and you have to exit ‘emacs’ to finish
-the process.
-
-   Tautology ahead.  If you want to be able to use ‘emacsclient’ to
-connect to a running ‘emacs’ instance, even though no ‘emacs’ instance
-is running, then you cannot use ‘emacsclient’ directly.
-
-   Instead you have to create a script that does something like this:
-
-   Try to use ‘emacsclient’ (without using ‘--alternate-editor’).  If
-that succeeds, do nothing else.  Otherwise start ‘emacs &’ (and
-‘init.el’ must call ‘server-start’) and try to use ‘emacsclient’ again.
-
-
-File: magit.info,  Node: Point ends up inside invisible text when jumping to a file-visiting buffer,  Next: I am no longer able to save popup defaults,  Prev: git-commit-mode isn't used when committing from the command-line,  Up: FAQ - Issues and Errors
-
-A.2.12 Point ends up inside invisible text when jumping to a file-visiting buffer
----------------------------------------------------------------------------------
-
-This can happen when you type ‘RET’ on a hunk to visit the respective
-file at the respective position.  One solution to this problem is to use
-‘global-reveal-mode’.  It makes sure that text around point is always
-visible.  If that is too drastic for your taste, then you may instead
-use ‘magit-diff-visit-file-hook’ to reveal the text, possibly using
-‘reveal-post-command’ or for Org buffers ‘org-reveal’.
-
-
-File: magit.info,  Node: I am no longer able to save popup defaults,  Prev: Point ends up inside invisible text when jumping to a file-visiting buffer,  Up: FAQ - Issues and Errors
-
-A.2.13 I am no longer able to save popup defaults
--------------------------------------------------
-
-Magit used to use Magit-Popup to implement the transient popup menus.
-Now it used Transient instead, which is Magit-Popup’s successor.
-
-   In the older Magit-Popup menus, it was possible to save user settings
-(e.g., setting the gpg signing key for commits) by using ‘C-c C-c’ in
-the popup buffer.  This would dismiss the popup, but save the settings
-as the defaults for future popups.
-
-   When switching to Transient menus, this functionality is now
-available via ‘C-x C-s’ instead; the ‘C-x’ prefix has other options as
-well when using Transient, which will be displayed when it is typed.
-See <https://magit.vc/manual/transient/Saving-Values.html#Saving-Values>
-for more details.
-
-
-File: magit.info,  Node: Debugging Tools,  Next: Keystroke Index,  Prev: FAQ,  Up: Top
-
-B Debugging Tools
-*****************
-
-Magit and its dependencies provide a few debugging tools, and we
-appreciate it very much if you use those tools before reporting an
-issue.  Please include all relevant output when reporting an issue.
-
-‘M-x magit-version’
-     This command shows the currently used versions of Magit, Git, and
-     Emacs in the echo area.  Non-interactively this just returns the
-     Magit version.
-
-‘M-x magit-emacs-Q-command’
-     This command shows a debugging shell command in the echo area and
-     adds it to the kill ring.  Paste that command into a shell and run
-     it.
-
-     This shell command starts ‘emacs’ with only ‘magit’ and its
-     dependencies loaded.  Neither your configuration nor other
-     installed packages are loaded.  This makes it easier to determine
-     whether some issue lays with Magit or something else.
-
-     If you run Magit from its Git repository, then you should be able
-     to use ‘make emacs-Q’ instead of the output of this command.
-
-‘M-x magit-toggle-git-debug’
-     This command toggles whether additional git errors are reported.
-
-     Magit basically calls git for one of these two reasons: for
-     side-effects or to do something with its standard output.
-
-     When git is run for side-effects then its output, including error
-     messages, go into the process buffer which is shown when using ‘$’.
-
-     When git’s output is consumed in some way, then it would be too
-     expensive to also insert it into this buffer, but when this option
-     is non-nil and git returns with a non-zero exit status, then at
-     least its standard error is inserted into this buffer.
-
-     This is only intended for debugging purposes.  Do not enable this
-     permanently, that would negatively affect performance.  Also note
-     that just because git exits with a non-zero exit status and prints
-     an error message that usually doesn’t mean that it is an error as
-     far as Magit is concerned, which is another reason we usually hide
-     these error messages.  Whether some error message is relevant in
-     the context of some unexpected behavior has to be judged on a case
-     by case basis.
-
-‘M-x magit-toggle-verbose-refresh’
-     This command toggles whether Magit refreshes buffers verbosely.
-     Enabling this helps figuring out which sections are bottlenecks.
-     The additional output can be found in the ‘*Messages*’ buffer.
-
-‘M-x magit-debug-git-executable’
-     This command displays a buffer containing information about the
-     available and used ‘git’ executable(s), and can be useful when
-     investigating ‘exec-path’ issues.
-
-     Also see *note Git Executable::.
-
-‘M-x with-editor-debug’
-     This command displays a buffer containing information about the
-     available and used ‘emacsclient’ executable(s), and can be useful
-     when investigating why Magit (or rather ‘with-editor’) cannot find
-     an appropriate ‘emacsclient’ executable.
-
-     Also see *note (with-editor)Debugging::.
-
-Please also see *note FAQ::.
-
-
-File: magit.info,  Node: Keystroke Index,  Next: Function and Command Index,  Prev: Debugging Tools,  Up: Top
-
-Appendix C Keystroke Index
-**************************
-
-
-* Menu:
-
-* !:                                     Running Git Manually.
-                                                              (line  13)
-* ! !:                                   Running Git Manually.
-                                                              (line  17)
-* ! a:                                   Running Git Manually.
-                                                              (line  53)
-* ! b:                                   Running Git Manually.
-                                                              (line  56)
-* ! g:                                   Running Git Manually.
-                                                              (line  59)
-* ! k:                                   Running Git Manually.
-                                                              (line  50)
-* ! m:                                   Running Git Manually.
-                                                              (line  62)
-* ! p:                                   Running Git Manually.
-                                                              (line  25)
-* ! s:                                   Running Git Manually.
-                                                              (line  34)
-* ! S:                                   Running Git Manually.
-                                                              (line  38)
-* $:                                     Viewing Git Output.  (line  17)
-* +:                                     Log Buffer.          (line  64)
-* + <1>:                                 Refreshing Diffs.    (line  65)
-* -:                                     Log Buffer.          (line  67)
-* - <1>:                                 Refreshing Diffs.    (line  62)
-* 0:                                     Refreshing Diffs.    (line  68)
-* 1:                                     Section Visibility.  (line  39)
-* 2:                                     Section Visibility.  (line  39)
-* 3:                                     Section Visibility.  (line  39)
-* 4:                                     Section Visibility.  (line  39)
-* 5:                                     Repository List.     (line 115)
-* ::                                     Running Git Manually.
-                                                              (line  25)
-* =:                                     Log Buffer.          (line  59)
-* >:                                     Sparse checkouts.    (line  17)
-* > a:                                   Sparse checkouts.    (line  39)
-* > d:                                   Sparse checkouts.    (line  50)
-* > e:                                   Sparse checkouts.    (line  21)
-* > r:                                   Sparse checkouts.    (line  44)
-* > s:                                   Sparse checkouts.    (line  33)
-* ^:                                     Section Movement.    (line  28)
-* a:                                     Applying.            (line  34)
-* A:                                     Cherry Picking.      (line   9)
-* A A:                                   Cherry Picking.      (line  17)
-* A a:                                   Cherry Picking.      (line  23)
-* A A <1>:                               Cherry Picking.      (line  85)
-* A a <1>:                               Cherry Picking.      (line  91)
-* A d:                                   Cherry Picking.      (line  51)
-* A h:                                   Cherry Picking.      (line  40)
-* A n:                                   Cherry Picking.      (line  62)
-* A s:                                   Cherry Picking.      (line  72)
-* A s <1>:                               Cherry Picking.      (line  88)
-* B:                                     Bisecting.           (line   9)
-* b:                                     Blaming.             (line 115)
-* b <1>:                                 Branch Commands.     (line  13)
-* b <2>:                                 Editing Rebase Sequences.
-                                                              (line  70)
-* B B:                                   Bisecting.           (line  16)
-* B b:                                   Bisecting.           (line  32)
-* b b:                                   Branch Commands.     (line  47)
-* b C:                                   Branch Commands.     (line  31)
-* b c:                                   Branch Commands.     (line  63)
-* B g:                                   Bisecting.           (line  36)
-* B k:                                   Bisecting.           (line  46)
-* b k:                                   Branch Commands.     (line 138)
-* b l:                                   Branch Commands.     (line  69)
-* B m:                                   Bisecting.           (line  40)
-* b m:                                   Branch Commands.     (line 149)
-* b n:                                   Branch Commands.     (line  54)
-* B r:                                   Bisecting.           (line  51)
-* B s:                                   Bisecting.           (line  26)
-* b s:                                   Branch Commands.     (line  91)
-* b S:                                   Branch Commands.     (line 118)
-* b x:                                   Branch Commands.     (line 123)
-* c:                                     Blaming.             (line 141)
-* C:                                     Cloning Repository.  (line  20)
-* c <1>:                                 Initiating a Commit. (line   9)
-* c <2>:                                 Editing Rebase Sequences.
-                                                              (line  59)
-* C >:                                   Cloning Repository.  (line  38)
-* c a:                                   Initiating a Commit. (line  18)
-* c A:                                   Initiating a Commit. (line  59)
-* C b:                                   Cloning Repository.  (line  44)
-* C C:                                   Cloning Repository.  (line  28)
-* c c:                                   Initiating a Commit. (line  14)
-* C d:                                   Cloning Repository.  (line  55)
-* C e:                                   Cloning Repository.  (line  61)
-* c e:                                   Initiating a Commit. (line  21)
-* c f:                                   Initiating a Commit. (line  39)
-* c F:                                   Initiating a Commit. (line  46)
-* C m:                                   Cloning Repository.  (line  48)
-* C s:                                   Cloning Repository.  (line  32)
-* c s:                                   Initiating a Commit. (line  49)
-* c S:                                   Initiating a Commit. (line  56)
-* c w:                                   Initiating a Commit. (line  30)
-* C-<return>:                            Visiting Files and Blobs from a Diff.
-                                                              (line  50)
-* C-<tab>:                               Section Visibility.  (line  14)
-* C-c C-a:                               Commit Pseudo Headers.
-                                                              (line  16)
-* C-c C-b:                               Log Buffer.          (line  20)
-* C-c C-b <1>:                           Refreshing Diffs.    (line  84)
-* C-c C-c:                               Select from Log.     (line  21)
-* C-c C-c <1>:                           Editing Commit Messages.
-                                                              (line  18)
-* C-c C-c <2>:                           Editing Rebase Sequences.
-                                                              (line   7)
-* C-c C-d:                               Refreshing Diffs.    (line  75)
-* C-c C-d <1>:                           Editing Commit Messages.
-                                                              (line  54)
-* C-c C-e:                               Commands Available in Diffs.
-                                                              (line  24)
-* C-c C-f:                               Log Buffer.          (line  23)
-* C-c C-f <1>:                           Refreshing Diffs.    (line  87)
-* C-c C-i:                               Commit Pseudo Headers.
-                                                              (line  13)
-* C-c C-k:                               Select from Log.     (line  26)
-* C-c C-k <1>:                           Editing Commit Messages.
-                                                              (line  22)
-* C-c C-k <2>:                           Editing Rebase Sequences.
-                                                              (line  11)
-* C-c C-n:                               Log Buffer.          (line  26)
-* C-c C-o:                               Commit Pseudo Headers.
-                                                              (line  28)
-* C-c C-p:                               Commit Pseudo Headers.
-                                                              (line  31)
-* C-c C-r:                               Commit Pseudo Headers.
-                                                              (line  19)
-* C-c C-s:                               Commit Pseudo Headers.
-                                                              (line  22)
-* C-c C-t:                               Commands Available in Diffs.
-                                                              (line  15)
-* C-c C-t <1>:                           Commit Pseudo Headers.
-                                                              (line  25)
-* C-c C-w:                               Using the Revision Stack.
-                                                              (line   7)
-* C-c f:                                 Commands for Buffers Visiting Files.
-                                                              (line  52)
-* C-c f , c:                             Commands for Buffers Visiting Files.
-                                                              (line  52)
-* C-c f , k:                             Commands for Buffers Visiting Files.
-                                                              (line  52)
-* C-c f , r:                             Commands for Buffers Visiting Files.
-                                                              (line  52)
-* C-c f , x:                             Commands for Buffers Visiting Files.
-                                                              (line  52)
-* C-c f B:                               Blaming.             (line  28)
-* C-c f b:                               Blaming.             (line  28)
-* C-c f B <1>:                           Commands for Buffers Visiting Files.
-                                                              (line  52)
-* C-c f b <1>:                           Commands for Buffers Visiting Files.
-                                                              (line  52)
-* C-c f B b:                             Blaming.             (line  28)
-* C-c f B e:                             Blaming.             (line  28)
-* C-c f B f:                             Blaming.             (line  28)
-* C-c f B q:                             Blaming.             (line  28)
-* C-c f B r:                             Blaming.             (line  28)
-* C-c f c:                               Commands for Buffers Visiting Files.
-                                                              (line  52)
-* C-c f D:                               Commands for Buffers Visiting Files.
-                                                              (line  52)
-* C-c f d:                               Commands for Buffers Visiting Files.
-                                                              (line  52)
-* C-c f e:                               Blaming.             (line  28)
-* C-c f e <1>:                           Commands for Buffers Visiting Files.
-                                                              (line  52)
-* C-c f f:                               Blaming.             (line  28)
-* C-c f f <1>:                           Commands for Buffers Visiting Files.
-                                                              (line  52)
-* C-c f g:                               Commands for Buffers Visiting Files.
-                                                              (line  52)
-* C-c f G:                               Commands for Buffers Visiting Files.
-                                                              (line  52)
-* C-c f L:                               Commands for Buffers Visiting Files.
-                                                              (line  52)
-* C-c f l:                               Commands for Buffers Visiting Files.
-                                                              (line  52)
-* C-c f M:                               Commands for Buffers Visiting Files.
-                                                              (line  52)
-* C-c f m:                               Commands for Buffers Visiting Files.
-                                                              (line  52)
-* C-c f n:                               Commands for Buffers Visiting Files.
-                                                              (line  52)
-* C-c f p:                               Commands for Buffers Visiting Files.
-                                                              (line  52)
-* C-c f q:                               Blaming.             (line  28)
-* C-c f q <1>:                           Commands for Buffers Visiting Files.
-                                                              (line  52)
-* C-c f r:                               Blaming.             (line  28)
-* C-c f r <1>:                           Commands for Buffers Visiting Files.
-                                                              (line  52)
-* C-c f s:                               Commands for Buffers Visiting Files.
-                                                              (line  52)
-* C-c f s <1>:                           Commands for Buffers Visiting Files.
-                                                              (line  52)
-* C-c f t:                               Commands for Buffers Visiting Files.
-                                                              (line  52)
-* C-c f u:                               Commands for Buffers Visiting Files.
-                                                              (line  52)
-* C-c f u <1>:                           Commands for Buffers Visiting Files.
-                                                              (line  52)
-* C-c f v:                               Commands for Buffers Visiting Files.
-                                                              (line  52)
-* C-c f V:                               Commands for Buffers Visiting Files.
-                                                              (line  52)
-* C-c g:                                 Transient Commands.  (line  20)
-* C-c M-g:                               Commands for Buffers Visiting Files.
-                                                              (line  58)
-* C-c M-g , c:                           Commands for Buffers Visiting Files.
-                                                              (line  86)
-* C-c M-g , k:                           Commands for Buffers Visiting Files.
-                                                              (line  82)
-* C-c M-g , r:                           Commands for Buffers Visiting Files.
-                                                              (line  78)
-* C-c M-g , x:                           Commands for Buffers Visiting Files.
-                                                              (line  74)
-* C-c M-g B:                             Blaming.             (line  34)
-* C-c M-g b:                             Blaming.             (line  45)
-* C-c M-g B <1>:                         Commands for Buffers Visiting Files.
-                                                              (line 137)
-* C-c M-g B b:                           Blaming.             (line  45)
-* C-c M-g B e:                           Blaming.             (line  76)
-* C-c M-g B f:                           Blaming.             (line  68)
-* C-c M-g B q:                           Blaming.             (line  87)
-* C-c M-g B r:                           Blaming.             (line  60)
-* C-c M-g c:                             Commands for Buffers Visiting Files.
-                                                              (line 176)
-* C-c M-g D:                             Commands for Buffers Visiting Files.
-                                                              (line  91)
-* C-c M-g d:                             Commands for Buffers Visiting Files.
-                                                              (line 101)
-* C-c M-g e:                             Blaming.             (line  76)
-* C-c M-g e <1>:                         Commands for Buffers Visiting Files.
-                                                              (line 182)
-* C-c M-g f:                             Blaming.             (line  68)
-* C-c M-g g:                             Commands for Buffers Visiting Files.
-                                                              (line 166)
-* C-c M-g G:                             Commands for Buffers Visiting Files.
-                                                              (line 172)
-* C-c M-g L:                             Commands for Buffers Visiting Files.
-                                                              (line 109)
-* C-c M-g l:                             Commands for Buffers Visiting Files.
-                                                              (line 119)
-* C-c M-g M:                             Commands for Buffers Visiting Files.
-                                                              (line 132)
-* C-c M-g n:                             Commands for Buffers Visiting Files.
-                                                              (line 153)
-* C-c M-g p:                             Commands for Buffers Visiting Files.
-                                                              (line 149)
-* C-c M-g q:                             Blaming.             (line  87)
-* C-c M-g r:                             Blaming.             (line  60)
-* C-c M-g s:                             Commands for Buffers Visiting Files.
-                                                              (line  63)
-* C-c M-g s <1>:                         Commands for Buffers Visiting Files.
-                                                              (line  63)
-* C-c M-g t:                             Commands for Buffers Visiting Files.
-                                                              (line 129)
-* C-c M-g u:                             Commands for Buffers Visiting Files.
-                                                              (line  69)
-* C-c M-g u <1>:                         Commands for Buffers Visiting Files.
-                                                              (line  69)
-* C-c M-g v:                             Commands for Buffers Visiting Files.
-                                                              (line 156)
-* C-c M-g V:                             Commands for Buffers Visiting Files.
-                                                              (line 160)
-* C-c M-i:                               Commit Pseudo Headers.
-                                                              (line  35)
-* C-c M-s:                               Editing Commit Messages.
-                                                              (line  33)
-* C-c TAB:                               Section Visibility.  (line  14)
-* C-w:                                   Common Commands.     (line  22)
-* C-x g:                                 Status Buffer.       (line  23)
-* C-x M-g:                               Transient Commands.  (line  20)
-* C-x u:                                 Editing Rebase Sequences.
-                                                              (line  77)
-* d:                                     Diffing.             (line  22)
-* D:                                     Refreshing Diffs.    (line  16)
-* d c:                                   Diffing.             (line  63)
-* d d:                                   Diffing.             (line  27)
-* D f:                                   Refreshing Diffs.    (line  45)
-* D F:                                   Refreshing Diffs.    (line  49)
-* D g:                                   Refreshing Diffs.    (line  21)
-* d p:                                   Diffing.             (line  56)
-* d r:                                   Diffing.             (line  30)
-* D r:                                   Refreshing Diffs.    (line  41)
-* d s:                                   Diffing.             (line  48)
-* D s:                                   Refreshing Diffs.    (line  25)
-* d t:                                   Diffing.             (line  67)
-* D t:                                   Refreshing Diffs.    (line  38)
-* d u:                                   Diffing.             (line  53)
-* d w:                                   Diffing.             (line  43)
-* D w:                                   Refreshing Diffs.    (line  31)
-* DEL:                                   Log Buffer.          (line  50)
-* DEL <1>:                               Commands Available in Diffs.
-                                                              (line  56)
-* DEL <2>:                               Blaming.             (line 103)
-* DEL <3>:                               Editing Rebase Sequences.
-                                                              (line  25)
-* e:                                     Ediffing.            (line  10)
-* E:                                     Ediffing.            (line  21)
-* e <1>:                                 Editing Rebase Sequences.
-                                                              (line  46)
-* E c:                                   Ediffing.            (line 100)
-* E i:                                   Ediffing.            (line  94)
-* E m:                                   Ediffing.            (line  33)
-* E M:                                   Ediffing.            (line  48)
-* E r:                                   Ediffing.            (line  25)
-* E s:                                   Ediffing.            (line  87)
-* E t:                                   Ediffing.            (line  79)
-* E u:                                   Ediffing.            (line  91)
-* E w:                                   Ediffing.            (line  97)
-* E z:                                   Ediffing.            (line 103)
-* f:                                     Repository List.     (line 111)
-* f <1>:                                 Editing Rebase Sequences.
-                                                              (line  52)
-* f <2>:                                 Fetching.            (line  10)
-* F:                                     Pulling.             (line  10)
-* f a:                                   Fetching.            (line  45)
-* f C:                                   Branch Commands.     (line  31)
-* F C:                                   Branch Commands.     (line  31)
-* f e:                                   Fetching.            (line  34)
-* F e:                                   Pulling.             (line  28)
-* f m:                                   Fetching.            (line  48)
-* f o:                                   Fetching.            (line  37)
-* f p:                                   Fetching.            (line  15)
-* F p:                                   Pulling.             (line  14)
-* f r:                                   Fetching.            (line  41)
-* f u:                                   Fetching.            (line  22)
-* F u:                                   Pulling.             (line  21)
-* g:                                     Automatic Refreshing of Magit Buffers.
-                                                              (line  26)
-* G:                                     Automatic Refreshing of Magit Buffers.
-                                                              (line  34)
-* H:                                     Section Types and Values.
-                                                              (line  14)
-* I:                                     Creating Repository. (line   7)
-* j:                                     Log Buffer.          (line  31)
-* j <1>:                                 Commands Available in Diffs.
-                                                              (line  43)
-* k:                                     Viewing Git Output.  (line  24)
-* k <1>:                                 Applying.            (line  40)
-* k <2>:                                 Editing Rebase Sequences.
-                                                              (line  56)
-* k <3>:                                 Stashing.            (line 118)
-* l:                                     Logging.             (line  28)
-* L:                                     Refreshing Logs.     (line  12)
-* L <1>:                                 Log Buffer.          (line   7)
-* L <2>:                                 Log Margin.          (line  52)
-* l <1>:                                 Editing Rebase Sequences.
-                                                              (line  94)
-* l a:                                   Logging.             (line  59)
-* l b:                                   Logging.             (line  56)
-* L d:                                   Log Margin.          (line  66)
-* L g:                                   Refreshing Logs.     (line  17)
-* l h:                                   Logging.             (line  38)
-* l H:                                   Reflog.              (line  18)
-* l l:                                   Logging.             (line  33)
-* l L:                                   Logging.             (line  53)
-* L L:                                   Refreshing Logs.     (line  34)
-* L L <1>:                               Log Margin.          (line  60)
-* L l:                                   Log Margin.          (line  63)
-* l o:                                   Logging.             (line  47)
-* l O:                                   Reflog.              (line  15)
-* l r:                                   Reflog.              (line  12)
-* L s:                                   Refreshing Logs.     (line  21)
-* l u:                                   Logging.             (line  41)
-* L w:                                   Refreshing Logs.     (line  27)
-* m:                                     Repository List.     (line 105)
-* m <1>:                                 Merging.             (line  10)
-* M:                                     Remote Commands.     (line  14)
-* m a:                                   Merging.             (line  42)
-* m a <1>:                               Merging.             (line  91)
-* M a:                                   Remote Commands.     (line  48)
-* M C:                                   Remote Commands.     (line  32)
-* m e:                                   Merging.             (line  30)
-* m i:                                   Merging.             (line  54)
-* M k:                                   Remote Commands.     (line  60)
-* m m:                                   Merging.             (line  18)
-* m m <1>:                               Merging.             (line  86)
-* m n:                                   Merging.             (line  36)
-* m p:                                   Merging.             (line  75)
-* M p:                                   Remote Commands.     (line  63)
-* M P:                                   Remote Commands.     (line  67)
-* M r:                                   Remote Commands.     (line  52)
-* m s:                                   Merging.             (line  67)
-* M u:                                   Remote Commands.     (line  56)
-* M-1:                                   Section Visibility.  (line  45)
-* M-2:                                   Section Visibility.  (line  45)
-* M-3:                                   Section Visibility.  (line  45)
-* M-4:                                   Section Visibility.  (line  45)
-* M-<tab>:                               Section Visibility.  (line  29)
-* M-n:                                   Section Movement.    (line  24)
-* M-n <1>:                               Editing Commit Messages.
-                                                              (line  41)
-* M-n <2>:                               Editing Rebase Sequences.
-                                                              (line  40)
-* M-p:                                   Section Movement.    (line  19)
-* M-p <1>:                               Editing Commit Messages.
-                                                              (line  36)
-* M-p <2>:                               Editing Rebase Sequences.
-                                                              (line  37)
-* M-w:                                   Blaming.             (line 134)
-* M-w <1>:                               Common Commands.     (line  39)
-* MM:                                    Editing Rebase Sequences.
-                                                              (line 102)
-* Mt:                                    Editing Rebase Sequences.
-                                                              (line 108)
-* n:                                     Section Movement.    (line  16)
-* n <1>:                                 Blaming.             (line 118)
-* N:                                     Blaming.             (line 121)
-* n <2>:                                 Editing Rebase Sequences.
-                                                              (line  34)
-* n <3>:                                 Minor Mode for Buffers Visiting Blobs.
-                                                              (line  16)
-* o:                                     Submodule Transient. (line   7)
-* O:                                     Subtree.             (line   9)
-* o a:                                   Submodule Transient. (line  20)
-* o d:                                   Submodule Transient. (line  45)
-* O e:                                   Subtree.             (line  37)
-* O e p:                                 Subtree.             (line  48)
-* O e s:                                 Subtree.             (line  52)
-* o f:                                   Submodule Transient. (line  51)
-* O i:                                   Subtree.             (line  13)
-* O i a:                                 Subtree.             (line  24)
-* O i c:                                 Subtree.             (line  28)
-* O i f:                                 Subtree.             (line  34)
-* O i m:                                 Subtree.             (line  31)
-* o l:                                   Submodule Transient. (line  48)
-* o p:                                   Submodule Transient. (line  32)
-* o r:                                   Submodule Transient. (line  26)
-* o s:                                   Submodule Transient. (line  40)
-* o u:                                   Submodule Transient. (line  36)
-* p:                                     Section Movement.    (line  11)
-* p <1>:                                 Blaming.             (line 124)
-* P:                                     Blaming.             (line 127)
-* p <2>:                                 Editing Rebase Sequences.
-                                                              (line  31)
-* P <1>:                                 Pushing.             (line  10)
-* p <3>:                                 Minor Mode for Buffers Visiting Blobs.
-                                                              (line  13)
-* P C:                                   Branch Commands.     (line  31)
-* P e:                                   Pushing.             (line  29)
-* P m:                                   Pushing.             (line  45)
-* P o:                                   Pushing.             (line  33)
-* P p:                                   Pushing.             (line  15)
-* P r:                                   Pushing.             (line  37)
-* P t:                                   Pushing.             (line  52)
-* P T:                                   Pushing.             (line  59)
-* P u:                                   Pushing.             (line  22)
-* q:                                     Quitting Windows.    (line   7)
-* q <1>:                                 Log Buffer.          (line  14)
-* q <2>:                                 Blaming.             (line 130)
-* q <3>:                                 Minor Mode for Buffers Visiting Blobs.
-                                                              (line  19)
-* r:                                     Rebasing.            (line  10)
-* r <1>:                                 Editing Rebase Sequences.
-                                                              (line  43)
-* r a:                                   Rebasing.            (line 111)
-* r e:                                   Rebasing.            (line  42)
-* r e <1>:                               Rebasing.            (line 107)
-* r f:                                   Rebasing.            (line  79)
-* r i:                                   Rebasing.            (line  76)
-* r k:                                   Rebasing.            (line  91)
-* r m:                                   Rebasing.            (line  83)
-* r p:                                   Rebasing.            (line  28)
-* r r:                                   Rebasing.            (line  97)
-* r s:                                   Rebasing.            (line  47)
-* r s <1>:                               Rebasing.            (line 103)
-* r u:                                   Rebasing.            (line  35)
-* r w:                                   Rebasing.            (line  87)
-* RET:                                   Repository List.     (line 102)
-* RET <1>:                               References Buffer.   (line 159)
-* RET <2>:                               Visiting Files and Blobs from a Diff.
-                                                              (line   9)
-* RET <3>:                               Blaming.             (line  91)
-* RET <4>:                               Editing Rebase Sequences.
-                                                              (line  15)
-* s:                                     Staging and Unstaging.
-                                                              (line  29)
-* S:                                     Staging and Unstaging.
-                                                              (line  36)
-* s <1>:                                 Editing Rebase Sequences.
-                                                              (line  49)
-* S-<tab>:                               Section Visibility.  (line  33)
-* SPC:                                   Log Buffer.          (line  41)
-* SPC <1>:                               Commands Available in Diffs.
-                                                              (line  53)
-* SPC <2>:                               Blaming.             (line  94)
-* SPC <3>:                               Editing Rebase Sequences.
-                                                              (line  19)
-* t:                                     Editing Rebase Sequences.
-                                                              (line  97)
-* t <1>:                                 Tagging.             (line   9)
-* T:                                     Notes.               (line   9)
-* T a:                                   Notes.               (line  47)
-* T c:                                   Notes.               (line  43)
-* t k:                                   Tagging.             (line  37)
-* T m:                                   Notes.               (line  35)
-* t p:                                   Tagging.             (line  43)
-* T p:                                   Notes.               (line  28)
-* t r:                                   Tagging.             (line  18)
-* T r:                                   Notes.               (line  21)
-* t t:                                   Tagging.             (line  14)
-* T T:                                   Notes.               (line  14)
-* TAB:                                   Section Visibility.  (line  10)
-* u:                                     Repository List.     (line 108)
-* u <1>:                                 Staging and Unstaging.
-                                                              (line  42)
-* U:                                     Staging and Unstaging.
-                                                              (line  50)
-* v:                                     Applying.            (line  47)
-* V:                                     Reverting.           (line   7)
-* V a:                                   Reverting.           (line  35)
-* V s:                                   Reverting.           (line  32)
-* V V:                                   Reverting.           (line  15)
-* V v:                                   Reverting.           (line  20)
-* V V <1>:                               Reverting.           (line  29)
-* W:                                     Plain Patches.       (line   7)
-* w:                                     Maildir Patches.     (line   9)
-* w a:                                   Plain Patches.       (line  20)
-* w a <1>:                               Maildir Patches.     (line  23)
-* w a <2>:                               Maildir Patches.     (line  38)
-* W c:                                   Plain Patches.       (line  12)
-* w m:                                   Maildir Patches.     (line  20)
-* W s:                                   Plain Patches.       (line  26)
-* w s:                                   Maildir Patches.     (line  34)
-* w w:                                   Maildir Patches.     (line  14)
-* w w <1>:                               Maildir Patches.     (line  31)
-* x:                                     Editing Rebase Sequences.
-                                                              (line  62)
-* x <1>:                                 Resetting.           (line   9)
-* X f:                                   Resetting.           (line  44)
-* X h:                                   Resetting.           (line  24)
-* X i:                                   Resetting.           (line  33)
-* X k:                                   Resetting.           (line  28)
-* X m:                                   Resetting.           (line  15)
-* X s:                                   Resetting.           (line  19)
-* X w:                                   Resetting.           (line  39)
-* X w <1>:                               Wip Modes.           (line  64)
-* Y:                                     Cherries.            (line  18)
-* y:                                     References Buffer.   (line   7)
-* y <1>:                                 Editing Rebase Sequences.
-                                                              (line  74)
-* y c:                                   References Buffer.   (line  25)
-* y o:                                   References Buffer.   (line  30)
-* y r:                                   References Buffer.   (line  34)
-* y y:                                   References Buffer.   (line  21)
-* z:                                     Stashing.            (line   9)
-* Z:                                     Worktree.            (line   9)
-* z a:                                   Stashing.            (line  52)
-* z b:                                   Stashing.            (line 105)
-* z B:                                   Stashing.            (line 110)
-* Z b:                                   Worktree.            (line  13)
-* Z c:                                   Worktree.            (line  16)
-* z f:                                   Stashing.            (line 115)
-* Z g:                                   Worktree.            (line  26)
-* z i:                                   Stashing.            (line  20)
-* z I:                                   Stashing.            (line  42)
-* z k:                                   Stashing.            (line  98)
-* Z k:                                   Worktree.            (line  22)
-* z l:                                   Stashing.            (line 121)
-* Z m:                                   Worktree.            (line  19)
-* z p:                                   Stashing.            (line  74)
-* z v:                                   Stashing.            (line 102)
-* z w:                                   Stashing.            (line  24)
-* z W:                                   Stashing.            (line  46)
-* z x:                                   Stashing.            (line  30)
-* z z:                                   Stashing.            (line  14)
-* z Z:                                   Stashing.            (line  36)
-
-
-File: magit.info,  Node: Function and Command Index,  Next: Variable Index,  Prev: Keystroke Index,  Up: Top
-
-Appendix D Function and Command Index
-*************************************
-
-
-* Menu:
-
-* bug-reference-mode:                    Commit Mode and Hooks.
-                                                              (line  48)
-* forward-line:                          Editing Rebase Sequences.
-                                                              (line  34)
-* git-commit-ack:                        Commit Pseudo Headers.
-                                                              (line  16)
-* git-commit-cc:                         Commit Pseudo Headers.
-                                                              (line  28)
-* git-commit-check-style-conventions:    Commit Message Conventions.
-                                                              (line  33)
-* git-commit-insert-pseudo-header:       Commit Pseudo Headers.
-                                                              (line  13)
-* git-commit-next-message:               Editing Commit Messages.
-                                                              (line  41)
-* git-commit-prev-message:               Editing Commit Messages.
-                                                              (line  36)
-* git-commit-propertize-diff:            Commit Mode and Hooks.
-                                                              (line  40)
-* git-commit-reported:                   Commit Pseudo Headers.
-                                                              (line  31)
-* git-commit-review:                     Commit Pseudo Headers.
-                                                              (line  19)
-* git-commit-save-message:               Editing Commit Messages.
-                                                              (line  33)
-* git-commit-save-message <1>:           Commit Mode and Hooks.
-                                                              (line  26)
-* git-commit-setup-changelog-support:    Commit Mode and Hooks.
-                                                              (line  29)
-* git-commit-signoff:                    Commit Pseudo Headers.
-                                                              (line  22)
-* git-commit-suggested:                  Commit Pseudo Headers.
-                                                              (line  35)
-* git-commit-test:                       Commit Pseudo Headers.
-                                                              (line  25)
-* git-commit-turn-on-auto-fill:          Commit Mode and Hooks.
-                                                              (line  33)
-* git-commit-turn-on-flyspell:           Commit Mode and Hooks.
-                                                              (line  36)
-* git-rebase-backward-line:              Editing Rebase Sequences.
-                                                              (line  31)
-* git-rebase-break:                      Editing Rebase Sequences.
-                                                              (line  70)
-* git-rebase-edit:                       Editing Rebase Sequences.
-                                                              (line  46)
-* git-rebase-exec:                       Editing Rebase Sequences.
-                                                              (line  62)
-* git-rebase-fixup:                      Editing Rebase Sequences.
-                                                              (line  52)
-* git-rebase-insert:                     Editing Rebase Sequences.
-                                                              (line  74)
-* git-rebase-kill-line:                  Editing Rebase Sequences.
-                                                              (line  56)
-* git-rebase-label:                      Editing Rebase Sequences.
-                                                              (line  94)
-* git-rebase-merge:                      Editing Rebase Sequences.
-                                                              (line 102)
-* git-rebase-merge-toggle-editmsg:       Editing Rebase Sequences.
-                                                              (line 108)
-* git-rebase-move-line-down:             Editing Rebase Sequences.
-                                                              (line  40)
-* git-rebase-move-line-up:               Editing Rebase Sequences.
-                                                              (line  37)
-* git-rebase-pick:                       Editing Rebase Sequences.
-                                                              (line  59)
-* git-rebase-reset:                      Editing Rebase Sequences.
-                                                              (line  97)
-* git-rebase-reword:                     Editing Rebase Sequences.
-                                                              (line  43)
-* git-rebase-show-commit:                Editing Rebase Sequences.
-                                                              (line  15)
-* git-rebase-show-or-scroll-down:        Editing Rebase Sequences.
-                                                              (line  25)
-* git-rebase-show-or-scroll-up:          Editing Rebase Sequences.
-                                                              (line  19)
-* git-rebase-squash:                     Editing Rebase Sequences.
-                                                              (line  49)
-* git-rebase-undo:                       Editing Rebase Sequences.
-                                                              (line  77)
-* ido-enter-magit-status:                Status Buffer.       (line  96)
-* magit-add-section-hook:                Section Hooks.       (line  20)
-* magit-after-save-refresh-status:       Automatic Refreshing of Magit Buffers.
-                                                              (line  55)
-* magit-am:                              Maildir Patches.     (line   9)
-* magit-am-abort:                        Maildir Patches.     (line  38)
-* magit-am-apply-maildir:                Maildir Patches.     (line  20)
-* magit-am-apply-patches:                Maildir Patches.     (line  14)
-* magit-am-continue:                     Maildir Patches.     (line  31)
-* magit-am-skip:                         Maildir Patches.     (line  34)
-* magit-apply:                           Applying.            (line  34)
-* magit-bisect:                          Bisecting.           (line   9)
-* magit-bisect-bad:                      Bisecting.           (line  32)
-* magit-bisect-good:                     Bisecting.           (line  36)
-* magit-bisect-mark:                     Bisecting.           (line  40)
-* magit-bisect-reset:                    Bisecting.           (line  51)
-* magit-bisect-run:                      Bisecting.           (line  26)
-* magit-bisect-skip:                     Bisecting.           (line  46)
-* magit-bisect-start:                    Bisecting.           (line  16)
-* magit-blame:                           Blaming.             (line  28)
-* magit-blame <1>:                       Blaming.             (line  34)
-* magit-blame <2>:                       Blaming.             (line 115)
-* magit-blame <3>:                       Commands for Buffers Visiting Files.
-                                                              (line  52)
-* magit-blame <4>:                       Commands for Buffers Visiting Files.
-                                                              (line 137)
-* magit-blame-addition:                  Blaming.             (line  28)
-* magit-blame-addition <1>:              Blaming.             (line  45)
-* magit-blame-additions:                 Commands for Buffers Visiting Files.
-                                                              (line  52)
-* magit-blame-copy-hash:                 Blaming.             (line 134)
-* magit-blame-cycle-style:               Blaming.             (line 141)
-* magit-blame-echo:                      Blaming.             (line  28)
-* magit-blame-echo <1>:                  Blaming.             (line  76)
-* magit-blame-echo <2>:                  Commands for Buffers Visiting Files.
-                                                              (line  52)
-* magit-blame-next-chunk:                Blaming.             (line 118)
-* magit-blame-next-chunk-same-commit:    Blaming.             (line 121)
-* magit-blame-previous-chunk:            Blaming.             (line 124)
-* magit-blame-previous-chunk-same-commit: Blaming.            (line 127)
-* magit-blame-quit:                      Blaming.             (line  28)
-* magit-blame-quit <1>:                  Blaming.             (line  87)
-* magit-blame-quit <2>:                  Blaming.             (line 130)
-* magit-blame-quit <3>:                  Commands for Buffers Visiting Files.
-                                                              (line  52)
-* magit-blame-removal:                   Blaming.             (line  28)
-* magit-blame-removal <1>:               Blaming.             (line  60)
-* magit-blame-removal <2>:               Commands for Buffers Visiting Files.
-                                                              (line  52)
-* magit-blame-reverse:                   Blaming.             (line  28)
-* magit-blame-reverse <1>:               Blaming.             (line  68)
-* magit-blame-reverse <2>:               Commands for Buffers Visiting Files.
-                                                              (line  52)
-* magit-blob-next:                       Commands for Buffers Visiting Files.
-                                                              (line  52)
-* magit-blob-next <1>:                   Commands for Buffers Visiting Files.
-                                                              (line 153)
-* magit-blob-next <2>:                   Minor Mode for Buffers Visiting Blobs.
-                                                              (line  16)
-* magit-blob-previous:                   Commands for Buffers Visiting Files.
-                                                              (line  52)
-* magit-blob-previous <1>:               Commands for Buffers Visiting Files.
-                                                              (line 149)
-* magit-blob-previous <2>:               Minor Mode for Buffers Visiting Blobs.
-                                                              (line  13)
-* magit-blob-visit-file:                 Commands for Buffers Visiting Files.
-                                                              (line  52)
-* magit-blob-visit-file <1>:             Commands for Buffers Visiting Files.
-                                                              (line 160)
-* magit-branch:                          Branch Commands.     (line  13)
-* magit-branch-and-checkout:             Branch Commands.     (line  63)
-* magit-branch-checkout:                 Branch Commands.     (line  69)
-* magit-branch-configure:                Branch Commands.     (line  31)
-* magit-branch-create:                   Branch Commands.     (line  54)
-* magit-branch-delete:                   Branch Commands.     (line 138)
-* magit-branch-or-checkout:              Branch Commands.     (line 257)
-* magit-branch-orphan:                   Branch Commands.     (line 253)
-* magit-branch-rename:                   Branch Commands.     (line 149)
-* magit-branch-reset:                    Branch Commands.     (line 123)
-* magit-branch-shelve:                   Auxiliary Branch Commands.
-                                                              (line   9)
-* magit-branch-spinoff:                  Branch Commands.     (line  91)
-* magit-branch-spinout:                  Branch Commands.     (line 118)
-* magit-branch-unshelve:                 Auxiliary Branch Commands.
-                                                              (line  19)
-* magit-builtin-completing-read:         Support for Completion Frameworks.
-                                                              (line  41)
-* magit-bundle:                          Bundle.              (line   8)
-* magit-call-git:                        Calling Git for Effect.
-                                                              (line  28)
-* magit-call-process:                    Calling Git for Effect.
-                                                              (line  31)
-* magit-cancel-section:                  Creating Sections.   (line  69)
-* magit-checkout:                        Branch Commands.     (line  47)
-* magit-cherry:                          Cherries.            (line  18)
-* magit-cherry-apply:                    Cherry Picking.      (line  23)
-* magit-cherry-copy:                     Cherry Picking.      (line  17)
-* magit-cherry-donate:                   Cherry Picking.      (line  51)
-* magit-cherry-harvest:                  Cherry Picking.      (line  40)
-* magit-cherry-pick:                     Cherry Picking.      (line   9)
-* magit-cherry-spinoff:                  Cherry Picking.      (line  72)
-* magit-cherry-spinout:                  Cherry Picking.      (line  62)
-* magit-clone:                           Cloning Repository.  (line  20)
-* magit-clone-bare:                      Cloning Repository.  (line  44)
-* magit-clone-mirror:                    Cloning Repository.  (line  48)
-* magit-clone-regular:                   Cloning Repository.  (line  28)
-* magit-clone-shallow:                   Cloning Repository.  (line  32)
-* magit-clone-shallow-exclude:           Cloning Repository.  (line  61)
-* magit-clone-shallow-since:             Cloning Repository.  (line  55)
-* magit-clone-sparse:                    Cloning Repository.  (line  38)
-* magit-commit:                          Initiating a Commit. (line   9)
-* magit-commit <1>:                      Commands for Buffers Visiting Files.
-                                                              (line  52)
-* magit-commit <2>:                      Commands for Buffers Visiting Files.
-                                                              (line 176)
-* magit-commit-amend:                    Initiating a Commit. (line  18)
-* magit-commit-augment:                  Initiating a Commit. (line  59)
-* magit-commit-create:                   Initiating a Commit. (line  14)
-* magit-commit-extend:                   Initiating a Commit. (line  21)
-* magit-commit-fixup:                    Initiating a Commit. (line  39)
-* magit-commit-instant-fixup:            Initiating a Commit. (line  46)
-* magit-commit-instant-squash:           Initiating a Commit. (line  56)
-* magit-commit-reword:                   Initiating a Commit. (line  30)
-* magit-commit-squash:                   Initiating a Commit. (line  49)
-* magit-completing-read:                 Support for Completion Frameworks.
-                                                              (line  57)
-* magit-copy-buffer-revision:            Common Commands.     (line  39)
-* magit-copy-section-value:              Common Commands.     (line  22)
-* magit-current-section:                 Section Selection.   (line   6)
-* magit-cycle-margin-style:              Log Margin.          (line  63)
-* magit-debug-git-executable:            Git Executable.      (line  55)
-* magit-debug-git-executable <1>:        Debugging Tools.     (line  57)
-* magit-define-section-jumper:           Creating Sections.   (line  74)
-* magit-describe-section:                Section Types and Values.
-                                                              (line  14)
-* magit-describe-section-briefly:        Section Types and Values.
-                                                              (line  17)
-* magit-describe-section-briefly <1>:    Matching Sections.   (line   7)
-* magit-diff:                            Diffing.             (line  22)
-* magit-diff <1>:                        Commands for Buffers Visiting Files.
-                                                              (line  52)
-* magit-diff <2>:                        Commands for Buffers Visiting Files.
-                                                              (line  91)
-* magit-diff-buffer-file:                Commands for Buffers Visiting Files.
-                                                              (line  52)
-* magit-diff-buffer-file <1>:            Commands for Buffers Visiting Files.
-                                                              (line 101)
-* magit-diff-default-context:            Refreshing Diffs.    (line  68)
-* magit-diff-dwim:                       Diffing.             (line  27)
-* magit-diff-edit-hunk-commit:           Commands Available in Diffs.
-                                                              (line  24)
-* magit-diff-flip-revs:                  Refreshing Diffs.    (line  45)
-* magit-diff-less-context:               Refreshing Diffs.    (line  62)
-* magit-diff-more-context:               Refreshing Diffs.    (line  65)
-* magit-diff-paths:                      Diffing.             (line  56)
-* magit-diff-range:                      Diffing.             (line  30)
-* magit-diff-refresh:                    Refreshing Diffs.    (line  16)
-* magit-diff-refresh <1>:                Refreshing Diffs.    (line  21)
-* magit-diff-save-default-arguments:     Refreshing Diffs.    (line  31)
-* magit-diff-scope:                      Matching Sections.   (line 110)
-* magit-diff-set-default-arguments:      Refreshing Diffs.    (line  25)
-* magit-diff-show-or-scroll-down:        Log Buffer.          (line  50)
-* magit-diff-show-or-scroll-down <1>:    Blaming.             (line 103)
-* magit-diff-show-or-scroll-up:          Log Buffer.          (line  41)
-* magit-diff-show-or-scroll-up <1>:      Blaming.             (line  94)
-* magit-diff-staged:                     Diffing.             (line  48)
-* magit-diff-switch-range-type:          Refreshing Diffs.    (line  41)
-* magit-diff-toggle-file-filter:         Refreshing Diffs.    (line  49)
-* magit-diff-toggle-refine-hunk:         Refreshing Diffs.    (line  38)
-* magit-diff-trace-definition:           Commands Available in Diffs.
-                                                              (line  15)
-* magit-diff-type:                       Matching Sections.   (line  88)
-* magit-diff-unstaged:                   Diffing.             (line  53)
-* magit-diff-visit-file:                 Visiting Files and Blobs from a Diff.
-                                                              (line   9)
-* magit-diff-visit-file-other-frame:     Visiting Files and Blobs from a Diff.
-                                                              (line  71)
-* magit-diff-visit-file-other-window:    Visiting Files and Blobs from a Diff.
-                                                              (line  70)
-* magit-diff-visit-file-worktree:        Visiting Files and Blobs from a Diff.
-                                                              (line  50)
-* magit-diff-visit-worktree-file-other-frame: Visiting Files and Blobs from a Diff.
-                                                              (line  73)
-* magit-diff-visit-worktree-file-other-window: Visiting Files and Blobs from a Diff.
-                                                              (line  72)
-* magit-diff-while-committing:           Refreshing Diffs.    (line  75)
-* magit-diff-while-committing <1>:       Editing Commit Messages.
-                                                              (line  54)
-* magit-diff-working-tree:               Diffing.             (line  43)
-* magit-disable-section-inserter:        Per-Repository Configuration.
-                                                              (line  31)
-* magit-discard:                         Applying.            (line  40)
-* magit-dispatch:                        Transient Commands.  (line  20)
-* magit-display-buffer:                  Switching Buffers.   (line   6)
-* magit-display-buffer-fullcolumn-most-v1: Switching Buffers. (line  68)
-* magit-display-buffer-fullframe-status-topleft-v1: Switching Buffers.
-                                                              (line  59)
-* magit-display-buffer-fullframe-status-v1: Switching Buffers.
-                                                              (line  54)
-* magit-display-buffer-same-window-except-diff-v1: Switching Buffers.
-                                                              (line  49)
-* magit-display-buffer-traditional:      Switching Buffers.   (line  42)
-* magit-display-repository-buffer:       Common Commands.     (line   9)
-* magit-display-repository-buffer <1>:   Commands for Buffers Visiting Files.
-                                                              (line  52)
-* magit-display-repository-buffer <2>:   Commands for Buffers Visiting Files.
-                                                              (line 172)
-* magit-ediff:                           Ediffing.            (line  21)
-* magit-ediff-compare:                   Ediffing.            (line  25)
-* magit-ediff-dwim:                      Ediffing.            (line  10)
-* magit-ediff-resolve-all:               Ediffing.            (line  48)
-* magit-ediff-resolve-rest:              Ediffing.            (line  33)
-* magit-ediff-show-commit:               Ediffing.            (line 100)
-* magit-ediff-show-staged:               Ediffing.            (line  94)
-* magit-ediff-show-stash:                Ediffing.            (line 103)
-* magit-ediff-show-unstaged:             Ediffing.            (line  91)
-* magit-ediff-show-working-tree:         Ediffing.            (line  97)
-* magit-ediff-stage:                     Ediffing.            (line  87)
-* magit-edit-line-commit:                Commands for Buffers Visiting Files.
-                                                              (line  52)
-* magit-edit-line-commit <1>:            Commands for Buffers Visiting Files.
-                                                              (line 182)
-* magit-emacs-Q-command:                 Debugging Tools.     (line  16)
-* magit-fetch:                           Fetching.            (line  10)
-* magit-fetch-all:                       Fetching.            (line  45)
-* magit-fetch-branch:                    Fetching.            (line  37)
-* magit-fetch-from-pushremote:           Fetching.            (line  15)
-* magit-fetch-from-upstream:             Fetching.            (line  22)
-* magit-fetch-modules:                   Fetching.            (line  48)
-* magit-fetch-modules <1>:               Submodule Transient. (line  51)
-* magit-fetch-other:                     Fetching.            (line  34)
-* magit-fetch-refspec:                   Fetching.            (line  41)
-* magit-file-checkout:                   Resetting.           (line  44)
-* magit-file-checkout <1>:               Commands for Buffers Visiting Files.
-                                                              (line  52)
-* magit-file-checkout <2>:               Commands for Buffers Visiting Files.
-                                                              (line  86)
-* magit-file-delete:                     Commands for Buffers Visiting Files.
-                                                              (line  52)
-* magit-file-delete <1>:                 Commands for Buffers Visiting Files.
-                                                              (line  82)
-* magit-file-dispatch:                   Commands for Buffers Visiting Files.
-                                                              (line  52)
-* magit-file-dispatch <1>:               Commands for Buffers Visiting Files.
-                                                              (line  58)
-* magit-file-rename:                     Commands for Buffers Visiting Files.
-                                                              (line  52)
-* magit-file-rename <1>:                 Commands for Buffers Visiting Files.
-                                                              (line  78)
-* magit-file-untrack:                    Commands for Buffers Visiting Files.
-                                                              (line  52)
-* magit-file-untrack <1>:                Commands for Buffers Visiting Files.
-                                                              (line  74)
-* magit-find-file:                       General-Purpose Visit Commands.
-                                                              (line   9)
-* magit-find-file <1>:                   Commands for Buffers Visiting Files.
-                                                              (line  52)
-* magit-find-file <2>:                   Commands for Buffers Visiting Files.
-                                                              (line 156)
-* magit-find-file-other-frame:           General-Purpose Visit Commands.
-                                                              (line  19)
-* magit-find-file-other-window:          General-Purpose Visit Commands.
-                                                              (line  14)
-* magit-generate-buffer-name-default-function: Naming Buffers.
-                                                              (line  16)
-* magit-get-section:                     Matching Sections.   (line  14)
-* magit-git:                             Calling Git for Effect.
-                                                              (line  46)
-* magit-git-command:                     Running Git Manually.
-                                                              (line  25)
-* magit-git-command-topdir:              Running Git Manually.
-                                                              (line  17)
-* magit-git-exit-code:                   Getting a Value from Git.
-                                                              (line  10)
-* magit-git-failure:                     Getting a Value from Git.
-                                                              (line  17)
-* magit-git-false:                       Getting a Value from Git.
-                                                              (line  25)
-* magit-git-insert:                      Getting a Value from Git.
-                                                              (line  29)
-* magit-git-items:                       Getting a Value from Git.
-                                                              (line  41)
-* magit-git-lines:                       Getting a Value from Git.
-                                                              (line  37)
-* magit-git-mergetool:                   Running Git Manually.
-                                                              (line  62)
-* magit-git-mergetool <1>:               Ediffing.            (line  79)
-* magit-git-str:                         Getting a Value from Git.
-                                                              (line  75)
-* magit-git-string:                      Getting a Value from Git.
-                                                              (line  32)
-* magit-git-success:                     Getting a Value from Git.
-                                                              (line  13)
-* magit-git-true:                        Getting a Value from Git.
-                                                              (line  21)
-* magit-git-wash:                        Calling Git for Effect.
-                                                              (line  50)
-* magit-go-backward:                     Log Buffer.          (line  20)
-* magit-go-backward <1>:                 Refreshing Diffs.    (line  84)
-* magit-go-forward:                      Log Buffer.          (line  23)
-* magit-go-forward <1>:                  Refreshing Diffs.    (line  87)
-* magit-hunk-set-window-start:           Section Movement.    (line  45)
-* magit-ido-completing-read:             Support for Completion Frameworks.
-                                                              (line  46)
-* magit-init:                            Creating Repository. (line   7)
-* magit-insert-am-sequence:              Status Sections.     (line  25)
-* magit-insert-assumed-unchanged-files:  Status Sections.     (line  98)
-* magit-insert-bisect-log:               Status Sections.     (line  39)
-* magit-insert-bisect-output:            Status Sections.     (line  33)
-* magit-insert-bisect-rest:              Status Sections.     (line  36)
-* magit-insert-diff-filter-header:       Status Header Sections.
-                                                              (line  35)
-* magit-insert-error-header:             Status Header Sections.
-                                                              (line  26)
-* magit-insert-head-branch-header:       Status Header Sections.
-                                                              (line  38)
-* magit-insert-heading:                  Creating Sections.   (line  41)
-* magit-insert-ignored-files:            Status Sections.     (line  83)
-* magit-insert-local-branches:           References Sections. (line  16)
-* magit-insert-merge-log:                Status Sections.     (line  17)
-* magit-insert-modules:                  Status Module Sections.
-                                                              (line  12)
-* magit-insert-modules-overview:         Status Module Sections.
-                                                              (line  30)
-* magit-insert-modules-unpulled-from-pushremote: Status Module Sections.
-                                                              (line  45)
-* magit-insert-modules-unpulled-from-upstream: Status Module Sections.
-                                                              (line  40)
-* magit-insert-modules-unpushed-to-pushremote: Status Module Sections.
-                                                              (line  55)
-* magit-insert-modules-unpushed-to-upstream: Status Module Sections.
-                                                              (line  50)
-* magit-insert-push-branch-header:       Status Header Sections.
-                                                              (line  45)
-* magit-insert-rebase-sequence:          Status Sections.     (line  21)
-* magit-insert-recent-commits:           Status Sections.     (line 110)
-* magit-insert-remote-branches:          References Sections. (line  19)
-* magit-insert-remote-header:            Status Header Sections.
-                                                              (line  58)
-* magit-insert-repo-header:              Status Header Sections.
-                                                              (line  55)
-* magit-insert-section:                  Creating Sections.   (line   6)
-* magit-insert-sequencer-sequence:       Status Sections.     (line  29)
-* magit-insert-skip-worktree-files:      Status Sections.     (line  92)
-* magit-insert-staged-changes:           Status Sections.     (line  53)
-* magit-insert-stashes:                  Status Sections.     (line  56)
-* magit-insert-status-headers:           Status Header Sections.
-                                                              (line  12)
-* magit-insert-tags:                     References Sections. (line  22)
-* magit-insert-tags-header:              Status Header Sections.
-                                                              (line  49)
-* magit-insert-tracked-files:            Status Sections.     (line  80)
-* magit-insert-unpulled-cherries:        Status Sections.     (line 119)
-* magit-insert-unpulled-from-pushremote: Status Sections.     (line  66)
-* magit-insert-unpulled-from-upstream:   Status Sections.     (line  62)
-* magit-insert-unpulled-or-recent-commits: Status Sections.   (line 104)
-* magit-insert-unpushed-cherries:        Status Sections.     (line 125)
-* magit-insert-unpushed-to-pushremote:   Status Sections.     (line  74)
-* magit-insert-unpushed-to-upstream:     Status Sections.     (line  70)
-* magit-insert-unstaged-changes:         Status Sections.     (line  50)
-* magit-insert-untracked-files:          Status Sections.     (line  42)
-* magit-insert-upstream-branch-header:   Status Header Sections.
-                                                              (line  41)
-* magit-insert-user-header:              Status Header Sections.
-                                                              (line  65)
-* magit-jump-to-diffstat-or-diff:        Commands Available in Diffs.
-                                                              (line  43)
-* magit-kill-this-buffer:                Minor Mode for Buffers Visiting Blobs.
-                                                              (line  19)
-* magit-list-repositories:               Repository List.     (line   6)
-* magit-list-submodules:                 Listing Submodules.  (line  13)
-* magit-list-submodules <1>:             Submodule Transient. (line  48)
-* magit-log:                             Logging.             (line  28)
-* magit-log <1>:                         Commands for Buffers Visiting Files.
-                                                              (line  52)
-* magit-log <2>:                         Commands for Buffers Visiting Files.
-                                                              (line 109)
-* magit-log-all:                         Logging.             (line  59)
-* magit-log-all-branches:                Logging.             (line  56)
-* magit-log-branches:                    Logging.             (line  53)
-* magit-log-buffer-file:                 Commands for Buffers Visiting Files.
-                                                              (line  52)
-* magit-log-buffer-file <1>:             Commands for Buffers Visiting Files.
-                                                              (line 119)
-* magit-log-bury-buffer:                 Log Buffer.          (line  14)
-* magit-log-current:                     Logging.             (line  33)
-* magit-log-double-commit-limit:         Log Buffer.          (line  64)
-* magit-log-half-commit-limit:           Log Buffer.          (line  67)
-* magit-log-head:                        Logging.             (line  38)
-* magit-log-maybe-show-more-commits:     Section Movement.    (line  58)
-* magit-log-maybe-update-blob-buffer:    Section Movement.    (line  72)
-* magit-log-maybe-update-revision-buffer: Section Movement.   (line  65)
-* magit-log-merged:                      Commands for Buffers Visiting Files.
-                                                              (line  52)
-* magit-log-merged <1>:                  Commands for Buffers Visiting Files.
-                                                              (line 132)
-* magit-log-move-to-parent:              Log Buffer.          (line  26)
-* magit-log-move-to-revision:            Log Buffer.          (line  31)
-* magit-log-other:                       Logging.             (line  47)
-* magit-log-refresh:                     Refreshing Logs.     (line  12)
-* magit-log-refresh <1>:                 Refreshing Logs.     (line  17)
-* magit-log-refresh <2>:                 Log Buffer.          (line   7)
-* magit-log-related:                     Logging.             (line  41)
-* magit-log-save-default-arguments:      Refreshing Logs.     (line  27)
-* magit-log-select-pick:                 Select from Log.     (line  21)
-* magit-log-select-quit:                 Select from Log.     (line  26)
-* magit-log-set-default-arguments:       Refreshing Logs.     (line  21)
-* magit-log-toggle-commit-limit:         Log Buffer.          (line  59)
-* magit-log-trace-definition:            Commands for Buffers Visiting Files.
-                                                              (line  52)
-* magit-log-trace-definition <1>:        Commands for Buffers Visiting Files.
-                                                              (line 129)
-* magit-margin-settings:                 Log Margin.          (line  52)
-* magit-maybe-set-dedicated:             Switching Buffers.   (line  89)
-* magit-merge:                           Merging.             (line  10)
-* magit-merge <1>:                       Merging.             (line  86)
-* magit-merge-abort:                     Merging.             (line  91)
-* magit-merge-absorb:                    Merging.             (line  42)
-* magit-merge-editmsg:                   Merging.             (line  30)
-* magit-merge-into:                      Merging.             (line  54)
-* magit-merge-nocommit:                  Merging.             (line  36)
-* magit-merge-plain:                     Merging.             (line  18)
-* magit-merge-preview:                   Merging.             (line  75)
-* magit-merge-squash:                    Merging.             (line  67)
-* magit-mode-bury-buffer:                Quitting Windows.    (line   7)
-* magit-mode-display-buffer:             Refreshing Buffers.  (line  32)
-* magit-mode-quit-window:                Quitting Windows.    (line  34)
-* magit-mode-setup:                      Refreshing Buffers.  (line  17)
-* magit-notes:                           Notes.               (line   9)
-* magit-notes-edit:                      Notes.               (line  14)
-* magit-notes-merge:                     Notes.               (line  35)
-* magit-notes-merge-abort:               Notes.               (line  47)
-* magit-notes-merge-commit:              Notes.               (line  43)
-* magit-notes-prune:                     Notes.               (line  28)
-* magit-notes-remove:                    Notes.               (line  21)
-* magit-patch:                           Plain Patches.       (line   7)
-* magit-patch-apply:                     Plain Patches.       (line  20)
-* magit-patch-apply <1>:                 Maildir Patches.     (line  23)
-* magit-patch-create:                    Plain Patches.       (line  12)
-* magit-patch-save:                      Plain Patches.       (line  26)
-* magit-pop-revision-stack:              Using the Revision Stack.
-                                                              (line   7)
-* magit-process:                         Viewing Git Output.  (line  17)
-* magit-process-file:                    Getting a Value from Git.
-                                                              (line  57)
-* magit-process-git:                     Getting a Value from Git.
-                                                              (line  50)
-* magit-process-kill:                    Viewing Git Output.  (line  24)
-* magit-pull:                            Pulling.             (line  10)
-* magit-pull-branch:                     Pulling.             (line  28)
-* magit-pull-from-pushremote:            Pulling.             (line  14)
-* magit-pull-from-upstream:              Pulling.             (line  21)
-* magit-push:                            Pushing.             (line  10)
-* magit-push-current:                    Pushing.             (line  29)
-* magit-push-current-to-pushremote:      Pushing.             (line  15)
-* magit-push-current-to-upstream:        Pushing.             (line  22)
-* magit-push-implicitly:                 Pushing.             (line  74)
-* magit-push-matching:                   Pushing.             (line  45)
-* magit-push-other:                      Pushing.             (line  33)
-* magit-push-refspecs:                   Pushing.             (line  37)
-* magit-push-tag:                        Pushing.             (line  59)
-* magit-push-tags:                       Pushing.             (line  52)
-* magit-push-to-remote:                  Pushing.             (line  91)
-* magit-rebase:                          Rebasing.            (line  10)
-* magit-rebase-abort:                    Rebasing.            (line 111)
-* magit-rebase-autosquash:               Rebasing.            (line  79)
-* magit-rebase-branch:                   Rebasing.            (line  42)
-* magit-rebase-continue:                 Rebasing.            (line  97)
-* magit-rebase-edit:                     Rebasing.            (line 107)
-* magit-rebase-edit-commit:              Rebasing.            (line  83)
-* magit-rebase-interactive:              Rebasing.            (line  76)
-* magit-rebase-onto-pushremote:          Rebasing.            (line  28)
-* magit-rebase-onto-upstream:            Rebasing.            (line  35)
-* magit-rebase-remove-commit:            Rebasing.            (line  91)
-* magit-rebase-reword-commit:            Rebasing.            (line  87)
-* magit-rebase-skip:                     Rebasing.            (line 103)
-* magit-rebase-subset:                   Rebasing.            (line  47)
-* magit-reflog-current:                  Reflog.              (line  12)
-* magit-reflog-head:                     Reflog.              (line  18)
-* magit-reflog-other:                    Reflog.              (line  15)
-* magit-refresh:                         Automatic Refreshing of Magit Buffers.
-                                                              (line  26)
-* magit-refresh-all:                     Automatic Refreshing of Magit Buffers.
-                                                              (line  34)
-* magit-refs-set-show-commit-count:      References Buffer.   (line  34)
-* magit-region-sections:                 Section Selection.   (line   9)
-* magit-region-values:                   Section Selection.   (line  35)
-* magit-remote:                          Remote Commands.     (line  14)
-* magit-remote-add:                      Remote Commands.     (line  48)
-* magit-remote-configure:                Remote Commands.     (line  32)
-* magit-remote-prune:                    Remote Commands.     (line  63)
-* magit-remote-prune-refspecs:           Remote Commands.     (line  67)
-* magit-remote-remove:                   Remote Commands.     (line  60)
-* magit-remote-rename:                   Remote Commands.     (line  52)
-* magit-remote-set-url:                  Remote Commands.     (line  56)
-* magit-repolist-column-branch:          Repository List.     (line  51)
-* magit-repolist-column-branches:        Repository List.     (line  58)
-* magit-repolist-column-flag:            Repository List.     (line  64)
-* magit-repolist-column-flags:           Repository List.     (line  76)
-* magit-repolist-column-ident:           Repository List.     (line  40)
-* magit-repolist-column-path:            Repository List.     (line  44)
-* magit-repolist-column-stashes:         Repository List.     (line  61)
-* magit-repolist-column-unpulled-from-pushremote: Repository List.
-                                                              (line  87)
-* magit-repolist-column-unpulled-from-upstream: Repository List.
-                                                              (line  83)
-* magit-repolist-column-unpushed-to-pushremote: Repository List.
-                                                              (line  95)
-* magit-repolist-column-unpushed-to-upstream: Repository List.
-                                                              (line  91)
-* magit-repolist-column-upstream:        Repository List.     (line  54)
-* magit-repolist-column-version:         Repository List.     (line  47)
-* magit-repolist-fetch:                  Repository List.     (line 111)
-* magit-repolist-find-file-other-frame:  Repository List.     (line 115)
-* magit-repolist-mark:                   Repository List.     (line 105)
-* magit-repolist-status:                 Repository List.     (line 102)
-* magit-repolist-unmark:                 Repository List.     (line 108)
-* magit-reset-hard:                      Resetting.           (line  24)
-* magit-reset-index:                     Staging and Unstaging.
-                                                              (line  78)
-* magit-reset-index <1>:                 Resetting.           (line  33)
-* magit-reset-keep:                      Resetting.           (line  28)
-* magit-reset-mixed:                     Resetting.           (line  15)
-* magit-reset-quickly:                   Resetting.           (line   9)
-* magit-reset-soft:                      Resetting.           (line  19)
-* magit-reset-worktree:                  Resetting.           (line  39)
-* magit-reset-worktree <1>:              Wip Modes.           (line  64)
-* magit-restore-window-configuration:    Quitting Windows.    (line  24)
-* magit-reverse:                         Applying.            (line  47)
-* magit-reverse-in-index:                Staging and Unstaging.
-                                                              (line  58)
-* magit-revert:                          Reverting.           (line   7)
-* magit-revert-and-commit:               Reverting.           (line  15)
-* magit-revert-no-commit:                Reverting.           (line  20)
-* magit-run:                             Running Git Manually.
-                                                              (line  13)
-* magit-run-git:                         Calling Git for Effect.
-                                                              (line  34)
-* magit-run-git-async:                   Calling Git for Effect.
-                                                              (line  59)
-* magit-run-git-gui:                     Running Git Manually.
-                                                              (line  59)
-* magit-run-git-with-editor:             Calling Git for Effect.
-                                                              (line  71)
-* magit-run-git-with-input:              Calling Git for Effect.
-                                                              (line  37)
-* magit-run-gitk:                        Running Git Manually.
-                                                              (line  50)
-* magit-run-gitk-all:                    Running Git Manually.
-                                                              (line  53)
-* magit-run-gitk-branches:               Running Git Manually.
-                                                              (line  56)
-* magit-save-window-configuration:       Switching Buffers.   (line  80)
-* magit-section-backward:                Section Movement.    (line  11)
-* magit-section-backward-siblings:       Section Movement.    (line  19)
-* magit-section-case:                    Matching Sections.   (line  66)
-* magit-section-cycle:                   Section Visibility.  (line  14)
-* magit-section-cycle-diffs:             Section Visibility.  (line  29)
-* magit-section-cycle-global:            Section Visibility.  (line  33)
-* magit-section-forward:                 Section Movement.    (line  16)
-* magit-section-forward-siblings:        Section Movement.    (line  24)
-* magit-section-hide:                    Section Visibility.  (line  55)
-* magit-section-hide-children:           Section Visibility.  (line  67)
-* magit-section-ident:                   Matching Sections.   (line  10)
-* magit-section-match:                   Matching Sections.   (line  18)
-* magit-section-set-window-start:        Section Movement.    (line  52)
-* magit-section-show:                    Section Visibility.  (line  52)
-* magit-section-show-children:           Section Visibility.  (line  62)
-* magit-section-show-headings:           Section Visibility.  (line  58)
-* magit-section-show-level-1:            Section Visibility.  (line  39)
-* magit-section-show-level-1-all:        Section Visibility.  (line  45)
-* magit-section-show-level-2:            Section Visibility.  (line  39)
-* magit-section-show-level-2-all:        Section Visibility.  (line  45)
-* magit-section-show-level-3:            Section Visibility.  (line  39)
-* magit-section-show-level-3-all:        Section Visibility.  (line  45)
-* magit-section-show-level-4:            Section Visibility.  (line  39)
-* magit-section-show-level-4-all:        Section Visibility.  (line  45)
-* magit-section-toggle:                  Section Visibility.  (line  10)
-* magit-section-toggle-children:         Section Visibility.  (line  70)
-* magit-section-up:                      Section Movement.    (line  28)
-* magit-section-value-if:                Matching Sections.   (line  57)
-* magit-sequence-abort:                  Cherry Picking.      (line  91)
-* magit-sequence-abort <1>:              Reverting.           (line  35)
-* magit-sequence-continue:               Cherry Picking.      (line  85)
-* magit-sequence-continue <1>:           Reverting.           (line  29)
-* magit-sequence-skip:                   Cherry Picking.      (line  88)
-* magit-sequence-skip <1>:               Reverting.           (line  32)
-* magit-shell-command:                   Running Git Manually.
-                                                              (line  38)
-* magit-shell-command-topdir:            Running Git Manually.
-                                                              (line  34)
-* magit-show-commit:                     Diffing.             (line  63)
-* magit-show-commit <1>:                 Blaming.             (line  91)
-* magit-show-refs:                       References Buffer.   (line   7)
-* magit-show-refs-current:               References Buffer.   (line  25)
-* magit-show-refs-head:                  References Buffer.   (line  21)
-* magit-show-refs-other:                 References Buffer.   (line  30)
-* magit-snapshot-both:                   Stashing.            (line  36)
-* magit-snapshot-index:                  Stashing.            (line  42)
-* magit-snapshot-worktree:               Stashing.            (line  46)
-* magit-sparse-checkout:                 Sparse checkouts.    (line  17)
-* magit-sparse-checkout-add:             Sparse checkouts.    (line  39)
-* magit-sparse-checkout-disable:         Sparse checkouts.    (line  50)
-* magit-sparse-checkout-enable:          Sparse checkouts.    (line  21)
-* magit-sparse-checkout-reapply:         Sparse checkouts.    (line  44)
-* magit-sparse-checkout-set:             Sparse checkouts.    (line  33)
-* magit-stage:                           Staging and Unstaging.
-                                                              (line  29)
-* magit-stage-buffer-file:               Commands for Buffers Visiting Files.
-                                                              (line  52)
-* magit-stage-buffer-file <1>:           Commands for Buffers Visiting Files.
-                                                              (line  63)
-* magit-stage-file:                      Staging from File-Visiting Buffers.
-                                                              (line  11)
-* magit-stage-file <1>:                  Commands for Buffers Visiting Files.
-                                                              (line  52)
-* magit-stage-file <2>:                  Commands for Buffers Visiting Files.
-                                                              (line  63)
-* magit-stage-modified:                  Staging and Unstaging.
-                                                              (line  36)
-* magit-start-git:                       Calling Git for Effect.
-                                                              (line  82)
-* magit-start-process:                   Calling Git for Effect.
-                                                              (line 100)
-* magit-stash:                           Stashing.            (line   9)
-* magit-stash-apply:                     Stashing.            (line  52)
-* magit-stash-both:                      Stashing.            (line  14)
-* magit-stash-branch:                    Stashing.            (line 105)
-* magit-stash-branch-here:               Stashing.            (line 110)
-* magit-stash-clear:                     Stashing.            (line 118)
-* magit-stash-drop:                      Stashing.            (line  98)
-* magit-stash-format-patch:              Stashing.            (line 115)
-* magit-stash-index:                     Stashing.            (line  20)
-* magit-stash-keep-index:                Stashing.            (line  30)
-* magit-stash-list:                      Stashing.            (line 121)
-* magit-stash-pop:                       Stashing.            (line  74)
-* magit-stash-show:                      Diffing.             (line  67)
-* magit-stash-show <1>:                  Stashing.            (line 102)
-* magit-stash-worktree:                  Stashing.            (line  24)
-* magit-stashes-maybe-update-stash-buffer: Section Movement.  (line  92)
-* magit-status:                          Status Buffer.       (line  23)
-* magit-status-here:                     Commands for Buffers Visiting Files.
-                                                              (line  52)
-* magit-status-here <1>:                 Commands for Buffers Visiting Files.
-                                                              (line 166)
-* magit-status-maybe-update-blob-buffer: Section Movement.    (line  87)
-* magit-status-maybe-update-revision-buffer: Section Movement.
-                                                              (line  77)
-* magit-status-maybe-update-stash-buffer: Section Movement.   (line  82)
-* magit-status-quick:                    Status Buffer.       (line  70)
-* magit-submodule:                       Submodule Transient. (line   7)
-* magit-submodule-add:                   Submodule Transient. (line  20)
-* magit-submodule-populate:              Submodule Transient. (line  32)
-* magit-submodule-register:              Submodule Transient. (line  26)
-* magit-submodule-synchronize:           Submodule Transient. (line  40)
-* magit-submodule-unpopulate:            Submodule Transient. (line  45)
-* magit-submodule-update:                Submodule Transient. (line  36)
-* magit-subtree:                         Subtree.             (line   9)
-* magit-subtree-add:                     Subtree.             (line  24)
-* magit-subtree-add-commit:              Subtree.             (line  28)
-* magit-subtree-export:                  Subtree.             (line  37)
-* magit-subtree-import:                  Subtree.             (line  13)
-* magit-subtree-merge:                   Subtree.             (line  31)
-* magit-subtree-pull:                    Subtree.             (line  34)
-* magit-subtree-push:                    Subtree.             (line  48)
-* magit-subtree-split:                   Subtree.             (line  52)
-* magit-switch-to-repository-buffer:     Common Commands.     (line   6)
-* magit-switch-to-repository-buffer-other-frame: Common Commands.
-                                                              (line   8)
-* magit-switch-to-repository-buffer-other-window: Common Commands.
-                                                              (line   7)
-* magit-tag:                             Tagging.             (line   9)
-* magit-tag-create:                      Tagging.             (line  14)
-* magit-tag-delete:                      Tagging.             (line  37)
-* magit-tag-prune:                       Tagging.             (line  43)
-* magit-tag-release:                     Tagging.             (line  18)
-* magit-toggle-buffer-lock:              Modes and Buffers.   (line  18)
-* magit-toggle-git-debug:                Debugging Tools.     (line  29)
-* magit-toggle-margin:                   Refreshing Logs.     (line  34)
-* magit-toggle-margin <1>:               Log Margin.          (line  60)
-* magit-toggle-margin-details:           Log Margin.          (line  66)
-* magit-toggle-verbose-refresh:          Debugging Tools.     (line  52)
-* magit-unstage:                         Staging and Unstaging.
-                                                              (line  42)
-* magit-unstage-all:                     Staging and Unstaging.
-                                                              (line  50)
-* magit-unstage-buffer-file:             Commands for Buffers Visiting Files.
-                                                              (line  52)
-* magit-unstage-buffer-file <1>:         Commands for Buffers Visiting Files.
-                                                              (line  69)
-* magit-unstage-file:                    Staging from File-Visiting Buffers.
-                                                              (line  18)
-* magit-unstage-file <1>:                Commands for Buffers Visiting Files.
-                                                              (line  52)
-* magit-unstage-file <2>:                Commands for Buffers Visiting Files.
-                                                              (line  69)
-* magit-version:                         Git Executable.      (line  59)
-* magit-version <1>:                     Debugging Tools.     (line  11)
-* magit-visit-ref:                       References Buffer.   (line 159)
-* magit-wip-commit:                      Wip Modes.           (line  85)
-* magit-wip-log:                         Wip Modes.           (line  47)
-* magit-wip-log-current:                 Wip Modes.           (line  55)
-* magit-worktree:                        Worktree.            (line   9)
-* magit-worktree-branch:                 Worktree.            (line  16)
-* magit-worktree-checkout:               Worktree.            (line  13)
-* magit-worktree-delete:                 Worktree.            (line  22)
-* magit-worktree-move:                   Worktree.            (line  19)
-* magit-worktree-status:                 Worktree.            (line  26)
-* scroll-down:                           Commands Available in Diffs.
-                                                              (line  56)
-* scroll-up:                             Commands Available in Diffs.
-                                                              (line  53)
-* with-editor-cancel:                    Editing Commit Messages.
-                                                              (line  22)
-* with-editor-cancel <1>:                Editing Rebase Sequences.
-                                                              (line  11)
-* with-editor-debug:                     Debugging Tools.     (line  64)
-* with-editor-finish:                    Editing Commit Messages.
-                                                              (line  18)
-* with-editor-finish <1>:                Editing Rebase Sequences.
-                                                              (line   7)
-* with-editor-usage-message:             Commit Mode and Hooks.
-                                                              (line  51)
-
-
-File: magit.info,  Node: Variable Index,  Prev: Function and Command Index,  Up: Top
-
-Appendix E Variable Index
-*************************
-
-
-* Menu:
-
-* auto-revert-buffer-list-filter:        Automatic Reverting of File-Visiting Buffers.
-                                                              (line  73)
-* auto-revert-interval:                  Automatic Reverting of File-Visiting Buffers.
-                                                              (line  69)
-* auto-revert-mode:                      Automatic Reverting of File-Visiting Buffers.
-                                                              (line  57)
-* auto-revert-stop-on-user-input:        Automatic Reverting of File-Visiting Buffers.
-                                                              (line  65)
-* auto-revert-use-notify:                Automatic Reverting of File-Visiting Buffers.
-                                                              (line  46)
-* auto-revert-verbose:                   Automatic Reverting of File-Visiting Buffers.
-                                                              (line  94)
-* branch.autoSetupMerge:                 Branch Git Variables.
-                                                              (line  71)
-* branch.autoSetupRebase:                Branch Git Variables.
-                                                              (line  85)
-* branch.NAME.description:               Branch Git Variables.
-                                                              (line  42)
-* branch.NAME.merge:                     Branch Git Variables.
-                                                              (line  10)
-* branch.NAME.pushRemote:                Branch Git Variables.
-                                                              (line  29)
-* branch.NAME.rebase:                    Branch Git Variables.
-                                                              (line  20)
-* branch.NAME.remote:                    Branch Git Variables.
-                                                              (line  15)
-* core.notesRef:                         Notes.               (line  53)
-* git-commit-finish-query-functions:     Commit Message Conventions.
-                                                              (line  18)
-* git-commit-known-pseudo-headers:       Commit Pseudo Headers.
-                                                              (line   9)
-* git-commit-major-mode:                 Commit Mode and Hooks.
-                                                              (line  12)
-* git-commit-post-finish-hook:           Commit Mode and Hooks.
-                                                              (line  54)
-* git-commit-setup-hook:                 Commit Mode and Hooks.
-                                                              (line  21)
-* git-commit-style-convention-checks:    Commit Message Conventions.
-                                                              (line  38)
-* git-commit-summary-max-length:         Commit Message Conventions.
-                                                              (line  13)
-* git-rebase-auto-advance:               Editing Rebase Sequences.
-                                                              (line  80)
-* git-rebase-confirm-cancel:             Editing Rebase Sequences.
-                                                              (line  86)
-* git-rebase-show-instructions:          Editing Rebase Sequences.
-                                                              (line  83)
-* global-auto-revert-mode:               Automatic Reverting of File-Visiting Buffers.
-                                                              (line  21)
-* magit-auto-revert-immediately:         Automatic Reverting of File-Visiting Buffers.
-                                                              (line  30)
-* magit-auto-revert-mode:                Automatic Reverting of File-Visiting Buffers.
-                                                              (line  17)
-* magit-auto-revert-tracked-only:        Automatic Reverting of File-Visiting Buffers.
-                                                              (line  51)
-* magit-bisect-show-graph:               Bisecting.           (line  57)
-* magit-blame-disable-modes:             Blaming.             (line 165)
-* magit-blame-echo-style:                Blaming.             (line 151)
-* magit-blame-goto-chunk-hook:           Blaming.             (line 170)
-* magit-blame-read-only:                 Blaming.             (line 161)
-* magit-blame-styles:                    Blaming.             (line 147)
-* magit-blame-time-format:               Blaming.             (line 157)
-* magit-branch-adjust-remote-upstream-alist: Branch Commands. (line 202)
-* magit-branch-direct-configure:         Branch Commands.     (line  19)
-* magit-branch-prefer-remote-upstream:   Branch Commands.     (line 158)
-* magit-branch-read-upstream-first:      Branch Commands.     (line 153)
-* magit-buffer-name-format:              Naming Buffers.      (line  25)
-* magit-bury-buffer-function:            Quitting Windows.    (line  16)
-* magit-cherry-margin:                   Cherries.            (line  21)
-* magit-clone-always-transient:          Cloning Repository.  (line  12)
-* magit-clone-default-directory:         Cloning Repository.  (line  84)
-* magit-clone-name-alist:                Cloning Repository.  (line  94)
-* magit-clone-set-remote-head:           Cloning Repository.  (line  66)
-* magit-clone-set-remote.pushDefault:    Cloning Repository.  (line  75)
-* magit-clone-url-format:                Cloning Repository.  (line 114)
-* magit-commit-ask-to-stage:             Initiating a Commit. (line  65)
-* magit-commit-diff-inhibit-same-window: Initiating a Commit. (line  97)
-* magit-commit-extend-override-date:     Initiating a Commit. (line  72)
-* magit-commit-reword-override-date:     Initiating a Commit. (line  75)
-* magit-commit-show-diff:                Initiating a Commit. (line  69)
-* magit-commit-squash-confirm:           Initiating a Commit. (line  78)
-* magit-completing-read-function:        Support for Completion Frameworks.
-                                                              (line  27)
-* magit-define-global-key-bindings:      Global Bindings.     (line   6)
-* magit-diff-adjust-tab-width:           Diff Options.        (line  17)
-* magit-diff-buffer-file-locked:         Commands for Buffers Visiting Files.
-                                                              (line 104)
-* magit-diff-extra-stat-arguments:       Diff Options.        (line 112)
-* magit-diff-hide-trailing-cr-characters: Diff Options.       (line  77)
-* magit-diff-highlight-hunk-region-functions: Diff Options.   (line  80)
-* magit-diff-highlight-indentation:      Diff Options.        (line  63)
-* magit-diff-highlight-trailing:         Diff Options.        (line  59)
-* magit-diff-paint-whitespace:           Diff Options.        (line  38)
-* magit-diff-paint-whitespace-lines:     Diff Options.        (line  52)
-* magit-diff-refine-hunk:                Diff Options.        (line   6)
-* magit-diff-refine-ignore-whitespace:   Diff Options.        (line  13)
-* magit-diff-unmarked-lines-keep-foreground: Diff Options.    (line 105)
-* magit-diff-visit-previous-blob:        Visiting Files and Blobs from a Diff.
-                                                              (line  38)
-* magit-direct-use-buffer-arguments:     Transient Arguments and Buffer Variables.
-                                                              (line  73)
-* magit-display-buffer-function:         Switching Buffers.   (line  25)
-* magit-display-buffer-noselect:         Switching Buffers.   (line  17)
-* magit-dwim-selection:                  Completion and Confirmation.
-                                                              (line  42)
-* magit-ediff-dwim-resolve-function:     Ediffing.            (line 105)
-* magit-ediff-dwim-show-on-hunks:        Ediffing.            (line 111)
-* magit-ediff-quit-hook:                 Ediffing.            (line 124)
-* magit-ediff-show-stash-with-index:     Ediffing.            (line 118)
-* magit-generate-buffer-name-function:   Naming Buffers.      (line   6)
-* magit-git-debug:                       Viewing Git Output.  (line  26)
-* magit-git-debug <1>:                   Getting a Value from Git.
-                                                              (line  68)
-* magit-git-executable:                  Git Executable.      (line  26)
-* magit-git-global-arguments:            Global Git Arguments.
-                                                              (line   6)
-* magit-keep-region-overlay:             The Selection.       (line  52)
-* magit-list-refs-sortby:                Additional Completion Options.
-                                                              (line   6)
-* magit-log-auto-more:                   Log Buffer.          (line  69)
-* magit-log-buffer-file-locked:          Commands for Buffers Visiting Files.
-                                                              (line 124)
-* magit-log-margin:                      Log Margin.          (line  12)
-* magit-log-margin-show-committer-date:  Log Margin.          (line  44)
-* magit-log-section-commit-count:        Status Sections.     (line 114)
-* magit-log-select-margin:               Select from Log.     (line  28)
-* magit-log-show-color-graph-limit:      Log Buffer.          (line  78)
-* magit-log-show-refname-after-summary:  Log Buffer.          (line  74)
-* magit-log-show-signatures-limit:       Log Buffer.          (line  84)
-* magit-log-trace-definition-function:   Commands Available in Diffs.
-                                                              (line  17)
-* magit-module-sections-hook:            Status Module Sections.
-                                                              (line  19)
-* magit-module-sections-nested:          Status Module Sections.
-                                                              (line  22)
-* magit-no-confirm:                      Action Confirmation. (line  18)
-* magit-pop-revision-stack-format:       Using the Revision Stack.
-                                                              (line  34)
-* magit-post-clone-hook:                 Cloning Repository.  (line 133)
-* magit-post-commit-hook:                Initiating a Commit. (line  86)
-* magit-post-display-buffer-hook:        Switching Buffers.   (line  85)
-* magit-pre-display-buffer-hook:         Switching Buffers.   (line  76)
-* magit-prefer-remote-upstream:          Branch Git Variables.
-                                                              (line 108)
-* magit-prefix-use-buffer-arguments:     Transient Arguments and Buffer Variables.
-                                                              (line  65)
-* magit-process-extreme-logging:         Viewing Git Output.  (line  56)
-* magit-process-raise-error:             Calling Git for Effect.
-                                                              (line 125)
-* magit-pull-or-fetch:                   Fetching.            (line  52)
-* magit-reflog-margin:                   Reflog.              (line  20)
-* magit-refresh-args:                    Refreshing Buffers.  (line  52)
-* magit-refresh-buffer-hook:             Automatic Refreshing of Magit Buffers.
-                                                              (line  41)
-* magit-refresh-function:                Refreshing Buffers.  (line  47)
-* magit-refresh-status-buffer:           Automatic Refreshing of Magit Buffers.
-                                                              (line  46)
-* magit-refs-filter-alist:               References Buffer.   (line 137)
-* magit-refs-focus-column-width:         References Buffer.   (line  75)
-* magit-refs-margin:                     References Buffer.   (line  89)
-* magit-refs-margin-for-tags:            References Buffer.   (line 112)
-* magit-refs-pad-commit-counts:          References Buffer.   (line  45)
-* magit-refs-primary-column-width:       References Buffer.   (line  63)
-* magit-refs-sections-hook:              References Sections. (line  13)
-* magit-refs-show-commit-count:          References Buffer.   (line  36)
-* magit-refs-show-remote-prefix:         References Buffer.   (line  57)
-* magit-remote-add-set-remote.pushDefault: Remote Commands.   (line  83)
-* magit-remote-direct-configure:         Remote Commands.     (line  20)
-* magit-remote-git-executable:           Git Executable.      (line  32)
-* magit-repolist-columns:                Repository List.     (line  12)
-* magit-repository-directories:          Status Buffer.       (line  57)
-* magit-revision-filter-files-on-follow: Revision Buffer.     (line  55)
-* magit-revision-insert-related-refs:    Revision Buffer.     (line   6)
-* magit-revision-show-gravatars:         Revision Buffer.     (line  15)
-* magit-revision-use-hash-sections:      Revision Buffer.     (line  31)
-* magit-root-section:                    Matching Sections.   (line  81)
-* magit-save-repository-buffers:         Automatic Saving of File-Visiting Buffers.
-                                                              (line  13)
-* magit-section-cache-visibility:        Section Visibility.  (line  95)
-* magit-section-initial-visibility-alist: Section Visibility. (line  79)
-* magit-section-movement-hook:           Section Movement.    (line  41)
-* magit-section-set-visibility-hook:     Section Visibility.  (line 105)
-* magit-section-show-child-count:        Section Options.     (line   9)
-* magit-section-visibility-indicator:    Section Visibility.  (line 122)
-* magit-shell-command-verbose-prompt:    Running Git Manually.
-                                                              (line  43)
-* magit-stashes-margin:                  Stashing.            (line 123)
-* magit-status-headers-hook:             Status Header Sections.
-                                                              (line  17)
-* magit-status-margin:                   Status Options.      (line   6)
-* magit-status-sections-hook:            Status Sections.     (line  10)
-* magit-submodule-list-columns:          Listing Submodules.  (line  20)
-* magit-this-process:                    Calling Git for Effect.
-                                                              (line 121)
-* magit-uniquify-buffer-names:           Naming Buffers.      (line  65)
-* magit-unstage-committed:               Staging and Unstaging.
-                                                              (line  52)
-* magit-update-other-window-delay:       Section Movement.    (line  97)
-* magit-visit-ref-behavior:              References Buffer.   (line 168)
-* magit-wip-after-apply-mode:            Legacy Wip Modes.    (line  18)
-* magit-wip-after-apply-mode-lighter:    Legacy Wip Modes.    (line  54)
-* magit-wip-after-save-local-mode-lighter: Legacy Wip Modes.  (line  51)
-* magit-wip-after-save-mode:             Legacy Wip Modes.    (line  13)
-* magit-wip-before-change-mode:          Legacy Wip Modes.    (line  31)
-* magit-wip-before-change-mode-lighter:  Legacy Wip Modes.    (line  57)
-* magit-wip-initial-backup-mode:         Legacy Wip Modes.    (line  35)
-* magit-wip-initial-backup-mode-lighter: Legacy Wip Modes.    (line  60)
-* magit-wip-merge-branch:                Wip Graph.           (line   6)
-* magit-wip-mode:                        Wip Modes.           (line  30)
-* magit-wip-mode-lighter:                Wip Modes.           (line  98)
-* magit-wip-namespace:                   Wip Modes.           (line  91)
-* notes.displayRef:                      Notes.               (line  57)
-* pull.rebase:                           Branch Git Variables.
-                                                              (line  50)
-* remote.NAME.fetch:                     Remote Git Variables.
-                                                              (line  14)
-* remote.NAME.push:                      Remote Git Variables.
-                                                              (line  23)
-* remote.NAME.pushurl:                   Remote Git Variables.
-                                                              (line  18)
-* remote.NAME.tagOpts:                   Remote Git Variables.
-                                                              (line  27)
-* remote.NAME.url:                       Remote Git Variables.
-                                                              (line  10)
-* remote.pushDefault:                    Branch Git Variables.
-                                                              (line  62)
-
-
-
-Tag Table:
-Node: Top774
-Node: Introduction6559
-Node: Installation11275
-Node: Installing from Melpa11605
-Node: Installing from the Git Repository12680
-Node: Post-Installation Tasks15494
-Node: Getting Started16779
-Node: Interface Concepts22590
-Node: Modes and Buffers22969
-Node: Switching Buffers24680
-Node: Naming Buffers29419
-Node: Quitting Windows32494
-Node: Automatic Refreshing of Magit Buffers34429
-Node: Automatic Saving of File-Visiting Buffers37310
-Node: Automatic Reverting of File-Visiting Buffers38494
-Node: Risk of Reverting Automatically43479
-Node: Sections45861
-Node: Section Movement46787
-Node: Section Visibility51661
-Node: Section Hooks58348
-Node: Section Types and Values60754
-Node: Section Options62169
-Node: Transient Commands62640
-Node: Transient Arguments and Buffer Variables64116
-Node: Completion Confirmation and the Selection71133
-Node: Action Confirmation71579
-Node: Completion and Confirmation80084
-Node: The Selection83269
-Node: The hunk-internal region86167
-Node: Support for Completion Frameworks87256
-Node: Additional Completion Options92141
-Node: Mouse Support92739
-Node: Running Git93315
-Node: Viewing Git Output93560
-Node: Git Process Status96264
-Node: Running Git Manually97229
-Node: Git Executable99919
-Node: Global Git Arguments102927
-Node: Inspecting103732
-Node: Status Buffer104889
-Node: Status Sections109900
-Node: Status Header Sections115427
-Node: Status Module Sections118046
-Node: Status Options120543
-Node: Repository List121906
-Node: Logging126684
-Node: Refreshing Logs129523
-Node: Log Buffer130944
-Node: Log Margin135767
-Node: Select from Log138920
-Node: Reflog141130
-Node: Cherries142767
-Node: Diffing144605
-Node: Refreshing Diffs147639
-Node: Commands Available in Diffs151328
-Node: Diff Options153841
-Node: Revision Buffer159304
-Node: Ediffing162624
-Node: References Buffer168674
-Node: References Sections179268
-Node: Bisecting180125
-Node: Visiting Files and Blobs182436
-Node: General-Purpose Visit Commands182964
-Node: Visiting Files and Blobs from a Diff183917
-Node: Blaming187361
-Node: Manipulating194349
-Node: Creating Repository194691
-Node: Cloning Repository195228
-Node: Staging and Unstaging201669
-Node: Staging from File-Visiting Buffers205642
-Node: Applying206748
-Node: Committing208821
-Node: Initiating a Commit209404
-Node: Editing Commit Messages214594
-Node: Using the Revision Stack217367
-Node: Commit Pseudo Headers220412
-Node: Commit Mode and Hooks221707
-Node: Commit Message Conventions224565
-Node: Branching226552
-Node: The Two Remotes226778
-Node: Branch Commands229431
-Node: Branch Git Variables242281
-Node: Auxiliary Branch Commands247651
-Node: Merging248767
-Node: Resolving Conflicts252923
-Node: Rebasing258297
-Node: Editing Rebase Sequences263086
-Node: Information About In-Progress Rebase267302
-Ref: Information About In-Progress Rebase-Footnote-1276415
-Node: Cherry Picking277011
-Node: Reverting281345
-Node: Resetting282764
-Node: Stashing284590
-Node: Transferring290971
-Node: Remotes291193
-Node: Remote Commands291345
-Node: Remote Git Variables295384
-Node: Fetching296655
-Node: Pulling299138
-Node: Pushing300164
-Node: Plain Patches304455
-Node: Maildir Patches305926
-Node: Miscellaneous307405
-Node: Tagging307751
-Node: Notes309644
-Node: Submodules311979
-Node: Listing Submodules312197
-Node: Submodule Transient314345
-Node: Subtree316790
-Node: Worktree318721
-Node: Sparse checkouts319797
-Node: Bundle322573
-Node: Common Commands322948
-Node: Wip Modes325576
-Node: Wip Graph330467
-Node: Legacy Wip Modes332780
-Node: Commands for Buffers Visiting Files335667
-Node: Minor Mode for Buffers Visiting Blobs343894
-Node: Customizing344692
-Node: Per-Repository Configuration346288
-Node: Essential Settings348542
-Node: Safety348888
-Node: Performance350649
-Ref: Log Performance353612
-Ref: Diff Performance354917
-Ref: Refs Buffer Performance356258
-Ref: Committing Performance356833
-Node: Microsoft Windows Performance357815
-Node: MacOS Performance359006
-Ref: MacOS Performance-Footnote-1360029
-Node: Global Bindings360111
-Node: Plumbing362339
-Node: Calling Git363168
-Node: Getting a Value from Git364693
-Node: Calling Git for Effect368421
-Node: Section Plumbing374315
-Node: Creating Sections374543
-Node: Section Selection378439
-Node: Matching Sections380235
-Node: Refreshing Buffers386156
-Node: Conventions389300
-Node: Theming Faces389492
-Node: FAQ397597
-Node: FAQ - How to ...?398035
-Node: How to pronounce Magit?398392
-Node: How to show git's output?399195
-Node: How to install the gitman info manual?399981
-Node: How to show diffs for gpg-encrypted files?400951
-Node: How does branching and pushing work?401547
-Node: Should I disable VC?401880
-Node: FAQ - Issues and Errors402483
-Node: Magit is slow403428
-Node: I changed several thousand files at once and now Magit is unusable403721
-Node: I am having problems committing404447
-Node: I am using MS Windows and cannot push with Magit404928
-Node: I am using macOS and SOMETHING works in shell but not in Magit405546
-Node: Expanding a file to show the diff causes it to disappear406380
-Node: Point is wrong in the COMMIT_EDITMSG buffer406968
-Node: The mode-line information isn't always up-to-date408016
-Node: A branch and tag sharing the same name breaks SOMETHING409079
-Node: My Git hooks work on the command-line but not inside Magit409966
-Node: git-commit-mode isn't used when committing from the command-line410812
-Node: Point ends up inside invisible text when jumping to a file-visiting buffer413083
-Node: I am no longer able to save popup defaults413932
-Node: Debugging Tools414913
-Node: Keystroke Index418087
-Node: Function and Command Index459701
-Node: Variable Index517902
-
-End Tag Table
-
-
-Local Variables:
-coding: utf-8
-End:
diff --git a/emacs/elpa/magit-20240930.1805/AUTHORS.md b/emacs/elpa/magit-20241001.2052/AUTHORS.md
diff --git a/emacs/elpa/magit-20240930.1805/LICENSE b/emacs/elpa/magit-20241001.2052/LICENSE
diff --git a/emacs/elpa/magit-20240930.1805/dir b/emacs/elpa/magit-20241001.2052/dir
diff --git a/emacs/elpa/magit-20240930.1805/git-commit.el b/emacs/elpa/magit-20241001.2052/git-commit.el
diff --git a/emacs/elpa/magit-20241001.2052/git-commit.elc b/emacs/elpa/magit-20241001.2052/git-commit.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240930.1805/git-rebase.el b/emacs/elpa/magit-20241001.2052/git-rebase.el
diff --git a/emacs/elpa/magit-20240930.1805/git-rebase.elc b/emacs/elpa/magit-20241001.2052/git-rebase.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240930.1805/magit-apply.el b/emacs/elpa/magit-20241001.2052/magit-apply.el
diff --git a/emacs/elpa/magit-20240930.1805/magit-apply.elc b/emacs/elpa/magit-20241001.2052/magit-apply.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240930.1805/magit-autoloads.el b/emacs/elpa/magit-20241001.2052/magit-autoloads.el
diff --git a/emacs/elpa/magit-20240930.1805/magit-autorevert.el b/emacs/elpa/magit-20241001.2052/magit-autorevert.el
diff --git a/emacs/elpa/magit-20240930.1805/magit-autorevert.elc b/emacs/elpa/magit-20241001.2052/magit-autorevert.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240930.1805/magit-base.el b/emacs/elpa/magit-20241001.2052/magit-base.el
diff --git a/emacs/elpa/magit-20240930.1805/magit-base.elc b/emacs/elpa/magit-20241001.2052/magit-base.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240930.1805/magit-bisect.el b/emacs/elpa/magit-20241001.2052/magit-bisect.el
diff --git a/emacs/elpa/magit-20240930.1805/magit-bisect.elc b/emacs/elpa/magit-20241001.2052/magit-bisect.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20241001.2052/magit-blame.el b/emacs/elpa/magit-20241001.2052/magit-blame.el
@@ -0,0 +1,988 @@
+;;; magit-blame.el --- Blame support for Magit  -*- lexical-binding:t -*-
+
+;; Copyright (C) 2008-2024 The Magit Project Contributors
+
+;; Author: Jonas Bernoulli <emacs.magit@jonas.bernoulli.dev>
+;; Maintainer: Jonas Bernoulli <emacs.magit@jonas.bernoulli.dev>
+
+;; SPDX-License-Identifier: GPL-3.0-or-later
+
+;; Magit is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+;;
+;; Magit is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+;; or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
+;; License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with Magit.  If not, see <https://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; Annotates each line in file-visiting buffer with information from
+;; the revision which last modified the line.
+
+;;; Code:
+
+(require 'magit)
+
+;;; Options
+
+(defgroup magit-blame nil
+  "Blame support for Magit."
+  :link '(info-link "(magit)Blaming")
+  :group 'magit-modes)
+
+(defcustom magit-blame-styles
+  '((headings
+     (heading-format   . "%-20a %C %s\n"))
+    (highlight
+     (highlight-face   . magit-blame-highlight))
+    (lines
+     (show-lines       . t)
+     (show-message     . t)))
+  "List of styles used to visualize blame information.
+
+The style used in the current buffer can be cycled from the blame
+popup.  Blame commands (except `magit-blame-echo') use the first
+style as the initial style when beginning to blame in a buffer.
+
+Each entry has the form (IDENT (KEY . VALUE)...).  IDENT has
+to be a symbol uniquely identifying the style.  The following
+KEYs are recognized:
+
+ `show-lines'
+    Whether to prefix each chunk of lines with a thin line.
+    This has no effect if `heading-format' is non-nil.
+ `show-message'
+    Whether to display a commit's summary line in the echo area
+    when crossing chunks.
+ `highlight-face'
+    Face used to highlight the first line of each chunk.
+    If this is nil, then those lines are not highlighted.
+ `heading-format'
+    String specifying the information to be shown above each
+    chunk of lines.  It must end with a newline character.
+ `margin-format'
+    String specifying the information to be shown in the left
+    buffer margin.  It must NOT end with a newline character.
+    This can also be a list of formats used for the lines at
+    the same positions within the chunk.  If the chunk has
+    more lines than formats are specified, then the last is
+    repeated.  WARNING: Adding this key affects performance;
+    see the note at the end of this docstring.
+ `margin-width'
+    Width of the margin, provided `margin-format' is non-nil.
+ `margin-face'
+    Face used in the margin, provided `margin-format' is
+    non-nil.  This face is used in combination with the faces
+    that are specific to the used %-specs.  If this is nil,
+    then `magit-blame-margin' is used.
+ `margin-body-face'
+    Face used in the margin for all but first line of a chunk.
+    This face is used in combination with the faces that are
+    specific to the used %-specs.  This can also be a list of
+    faces (usually one face), in which case only these faces
+    are used and the %-spec faces are ignored.  A good value
+    might be `(magit-blame-dimmed)'.  If this is nil, then
+    the same face as for the first line is used.
+
+The following %-specs can be used in `heading-format' and
+`margin-format':
+
+  %H    hash              using face `magit-blame-hash'
+  %s    summary           using face `magit-blame-summary'
+  %a    author            using face `magit-blame-name'
+  %A    author time       using face `magit-blame-date'
+  %c    committer         using face `magit-blame-name'
+  %C    committer time    using face `magit-blame-date'
+
+Additionally if `margin-format' ends with %f, then the string
+that is displayed in the margin is made at least `margin-width'
+characters wide, which may be desirable if the used face sets
+the background color.
+
+Blame information is displayed using overlays.  Such extensive
+use of overlays is known to slow down even basic operations, such
+as moving the cursor. To reduce the number of overlays the margin
+style had to be removed from the default value of this option.
+
+Note that the margin overlays are created even if another style
+is currently active.  This can only be prevented by not even
+defining a style that uses the margin.  If you want to use this
+style anyway, you can restore this definition, which used to be
+part of the default value:
+
+  (margin
+   (margin-format    . (\" %s%f\" \" %C %a\" \" %H\"))
+   (margin-width     . 42)
+   (margin-face      . magit-blame-margin)
+   (margin-body-face . (magit-blame-dimmed)))"
+  :package-version '(magit . "2.13.0")
+  :group 'magit-blame
+  :type 'string)
+
+(defcustom magit-blame-echo-style 'lines
+  "The blame visualization style used by `magit-blame-echo'.
+A symbol that has to be used as the identifier for one of the
+styles defined in `magit-blame-styles'."
+  :package-version '(magit . "2.13.0")
+  :group 'magit-blame
+  :type 'symbol)
+
+(defcustom magit-blame-time-format "%F %H:%M"
+  "Format for time strings in blame headings."
+  :group 'magit-blame
+  :type 'string)
+
+(defcustom magit-blame-read-only t
+  "Whether to initially make the blamed buffer read-only."
+  :package-version '(magit . "2.13.0")
+  :group 'magit-blame
+  :type 'boolean)
+
+(defcustom magit-blame-disable-modes '(fci-mode yascroll-bar-mode)
+  "List of modes not compatible with Magit-Blame mode.
+This modes are turned off when Magit-Blame mode is turned on,
+and then turned on again when turning off the latter."
+  :group 'magit-blame
+  :type '(repeat (symbol :tag "Mode")))
+
+(defcustom magit-blame-mode-lighter " Blame"
+  "The mode-line lighter of the Magit-Blame mode."
+  :group 'magit-blame
+  :type '(choice (const :tag "No lighter" "") string))
+
+(defcustom magit-blame-goto-chunk-hook
+  '(magit-blame-maybe-update-revision-buffer
+    magit-blame-maybe-show-message)
+  "Hook run after point entered another chunk."
+  :package-version '(magit . "2.13.0")
+  :group 'magit-blame
+  :type 'hook
+  :get #'magit-hook-custom-get
+  :options '(magit-blame-maybe-update-revision-buffer
+             magit-blame-maybe-show-message))
+
+;;; Faces
+
+(defface magit-blame-highlight
+  `((((class color) (background light))
+     ,@(and (>= emacs-major-version 27) '(:extend t))
+     :background "grey80"
+     :foreground "black")
+    (((class color) (background dark))
+     ,@(and (>= emacs-major-version 27) '(:extend t))
+     :background "grey25"
+     :foreground "white"))
+  "Face used for highlighting when blaming.
+Also see option `magit-blame-styles'."
+  :group 'magit-faces)
+
+(defface magit-blame-margin
+  '((t :inherit magit-blame-highlight
+       :weight normal
+       :slant normal))
+  "Face used for the blame margin by default when blaming.
+Also see option `magit-blame-styles'."
+  :group 'magit-faces)
+
+(defface magit-blame-dimmed
+  '((t :inherit magit-dimmed
+       :weight normal
+       :slant normal))
+  "Face used for the blame margin in some cases when blaming.
+Also see option `magit-blame-styles'."
+  :group 'magit-faces)
+
+(defface magit-blame-heading
+  `((t ,@(and (>= emacs-major-version 27) '(:extend t))
+       :inherit magit-blame-highlight
+       :weight normal
+       :slant normal))
+  "Face used for blame headings by default when blaming.
+Also see option `magit-blame-styles'."
+  :group 'magit-faces)
+
+(defface magit-blame-summary '((t nil))
+  "Face used for commit summaries when blaming."
+  :group 'magit-faces)
+
+(defface magit-blame-hash '((t nil))
+  "Face used for commit hashes when blaming."
+  :group 'magit-faces)
+
+(defface magit-blame-name '((t nil))
+  "Face used for author and committer names when blaming."
+  :group 'magit-faces)
+
+(defface magit-blame-date '((t nil))
+  "Face used for dates when blaming."
+  :group 'magit-faces)
+
+;;; Variables
+
+(defvar-local magit-blame-buffer-read-only nil)
+(defvar-local magit-blame-cache nil)
+(defvar-local magit-blame-disabled-modes nil)
+(defvar-local magit-blame-process nil)
+(defvar-local magit-blame-recursive-p nil)
+(defvar-local magit-blame-type nil)
+(defvar-local magit-blame-separator nil)
+(defvar-local magit-blame-previous-chunk nil)
+
+(defvar-local magit-blame--make-margin-overlays nil)
+(defvar-local magit-blame--style nil)
+
+;;; Chunks
+
+(defclass magit-blame-chunk ()
+  (;; <orig-rev> <orig-line> <final-line> <num-lines>
+   (orig-rev   :initarg :orig-rev)
+   (orig-line  :initarg :orig-line)
+   (final-line :initarg :final-line)
+   (num-lines  :initarg :num-lines)
+   ;; previous <prev-rev> <prev-file>
+   (prev-rev   :initform nil)
+   (prev-file  :initform nil)
+   ;; filename <orig-file>
+   (orig-file)))
+
+(defun magit-current-blame-chunk (&optional type noerror)
+  (or (and (not (and type (not (eq type magit-blame-type))))
+           (magit-blame-chunk-at (point)))
+      (and type
+           (let ((rev  (or magit-buffer-refname magit-buffer-revision))
+                 (file (and (not (derived-mode-p 'dired-mode))
+                            (magit-file-relative-name
+                             nil (not magit-buffer-file-name))))
+                 (line (format "%d,+1" (line-number-at-pos))))
+             (cond (file (with-temp-buffer
+                           (magit-with-toplevel
+                             (magit-git-insert
+                              "blame" "--porcelain"
+                              (if (memq magit-blame-type '(final removal))
+                                  (cons "--reverse" (magit-blame-arguments))
+                                (magit-blame-arguments))
+                              "-L" line rev "--" file)
+                             (goto-char (point-min))
+                             (if (eobp)
+                                 (unless noerror
+                                   (error "Cannot get blame chunk at eob"))
+                               (car (magit-blame--parse-chunk type))))))
+                   (noerror nil)
+                   ((error "Buffer does not visit a tracked file")))))))
+
+(defun magit-blame-chunk-at (pos)
+  (--some (overlay-get it 'magit-blame-chunk)
+          (overlays-at pos)))
+
+(defun magit-blame--overlay-at (&optional pos key)
+  (unless pos
+    (setq pos (point)))
+  (--first (overlay-get it (or key 'magit-blame-chunk))
+           (nconc (overlays-at pos)
+                  (overlays-in pos pos))))
+
+;;; Keymaps
+
+(defvar-keymap magit-blame-mode-map
+  :doc "Keymap for `magit-blame-mode'.
+Note that most blaming key bindings are defined
+in `magit-blame-read-only-mode-map' instead."
+  "C-c C-q" #'magit-blame-quit)
+
+(defvar-keymap magit-blame-read-only-mode-map
+  :doc "Keymap for `magit-blame-read-only-mode'."
+  "C-m" #'magit-show-commit
+  "p"   #'magit-blame-previous-chunk
+  "P"   #'magit-blame-previous-chunk-same-commit
+  "n"   #'magit-blame-next-chunk
+  "N"   #'magit-blame-next-chunk-same-commit
+  "b"   #'magit-blame-addition
+  "r"   #'magit-blame-removal
+  "f"   #'magit-blame-reverse
+  "B"   #'magit-blame
+  "c"   #'magit-blame-cycle-style
+  "q"   #'magit-blame-quit
+  "M-w" #'magit-blame-copy-hash
+  "SPC"   #'magit-diff-show-or-scroll-up
+  "S-SPC" #'magit-diff-show-or-scroll-down
+  "DEL"   #'magit-diff-show-or-scroll-down)
+
+;;; Modes
+;;;; Base Mode
+
+(define-minor-mode magit-blame-mode
+  "Display blame information inline."
+  :lighter magit-blame-mode-lighter
+  :interactive nil
+  (cond (magit-blame-mode
+         (unless arg
+           ;; Emacs < 28.1 doesn't support `:interactive'.
+           (setq magit-blame-mode nil)
+           (user-error
+            (concat "Don't call `magit-blame-mode' directly; "
+                    "instead use `magit-blame'")))
+         (add-hook 'after-save-hook     #'magit-blame--refresh t t)
+         (add-hook 'post-command-hook   #'magit-blame-goto-chunk-hook t t)
+         (add-hook 'before-revert-hook  #'magit-blame--remove-overlays t t)
+         (add-hook 'after-revert-hook   #'magit-blame--refresh t t)
+         (add-hook 'read-only-mode-hook #'magit-blame-toggle-read-only t t)
+         (setq magit-blame-buffer-read-only buffer-read-only)
+         (when (or magit-blame-read-only magit-buffer-file-name)
+           (read-only-mode 1))
+         (dolist (mode magit-blame-disable-modes)
+           (when (and (boundp mode) (symbol-value mode))
+             (funcall mode -1)
+             (push mode magit-blame-disabled-modes)))
+         (setq magit-blame-separator (magit-blame--format-separator))
+         (unless magit-blame--style
+           (setq magit-blame--style (car magit-blame-styles)))
+         (setq magit-blame--make-margin-overlays
+               (and (cl-find-if (lambda (style)
+                                  (assq 'margin-format (cdr style)))
+                                magit-blame-styles)))
+         (magit-blame--update-margin))
+        (t
+         (when (process-live-p magit-blame-process)
+           (kill-process magit-blame-process)
+           (while magit-blame-process
+             (sit-for 0.01))) ; avoid racing the sentinel
+         (remove-hook 'after-save-hook     #'magit-blame--refresh t)
+         (remove-hook 'post-command-hook   #'magit-blame-goto-chunk-hook t)
+         (remove-hook 'before-revert-hook  #'magit-blame--remove-overlays t)
+         (remove-hook 'after-revert-hook   #'magit-blame--refresh t)
+         (remove-hook 'read-only-mode-hook #'magit-blame-toggle-read-only t)
+         (unless magit-blame-buffer-read-only
+           (read-only-mode -1))
+         (magit-blame-read-only-mode -1)
+         (dolist (mode magit-blame-disabled-modes)
+           (funcall mode 1))
+         (kill-local-variable 'magit-blame-disabled-modes)
+         (kill-local-variable 'magit-blame-type)
+         (kill-local-variable 'magit-blame--style)
+         (magit-blame--update-margin)
+         (magit-blame--remove-overlays))))
+
+(defun magit-blame--refresh ()
+  (magit-blame--run (magit-blame-arguments)))
+
+(defun magit-blame-goto-chunk-hook ()
+  (let ((chunk (magit-blame-chunk-at (point))))
+    (when (cl-typep chunk 'magit-blame-chunk)
+      (unless (eq chunk magit-blame-previous-chunk)
+        (run-hooks 'magit-blame-goto-chunk-hook))
+      (setq magit-blame-previous-chunk chunk))))
+
+(defun magit-blame-toggle-read-only ()
+  (magit-blame-read-only-mode (if buffer-read-only 1 -1)))
+
+;;;; Read-Only Mode
+
+(define-minor-mode magit-blame-read-only-mode
+  "Provide keybindings for Magit-Blame mode.
+
+This minor-mode provides the key bindings for Magit-Blame mode,
+but only when Read-Only mode is also enabled because these key
+bindings would otherwise conflict badly with regular bindings.
+
+When both Magit-Blame mode and Read-Only mode are enabled, then
+this mode gets automatically enabled too and when one of these
+modes is toggled, then this mode also gets toggled automatically.
+
+\\{magit-blame-read-only-mode-map}")
+
+;;;; Kludges
+
+(defun magit-blame-put-keymap-before-view-mode ()
+  "Put `magit-blame-read-only-mode' ahead of `view-mode' in `minor-mode-map-alist'."
+  (when-let ((entry (assq 'magit-blame-read-only-mode
+                          (cl-member 'view-mode minor-mode-map-alist
+                                     :key #'car))))
+    (setq minor-mode-map-alist
+          (cons entry
+                (delq entry minor-mode-map-alist))))
+  (remove-hook 'view-mode-hook #'magit-blame-put-keymap-before-view-mode))
+
+(add-hook 'view-mode-hook #'magit-blame-put-keymap-before-view-mode)
+
+;;; Process
+
+(defun magit-blame--run (args)
+  (magit-with-toplevel
+    (unless magit-blame-mode
+      (magit-blame-mode 1))
+    (message "Blaming...")
+    (magit-blame-run-process
+     (or magit-buffer-refname magit-buffer-revision)
+     (magit-file-relative-name nil (not magit-buffer-file-name))
+     (if (memq magit-blame-type '(final removal))
+         (cons "--reverse" args)
+       args)
+     (list (line-number-at-pos (window-start))
+           (line-number-at-pos (1- (window-end nil t)))))
+    (set-process-sentinel magit-this-process
+                          #'magit-blame-process-quickstart-sentinel)))
+
+(defun magit-blame-run-process (revision file args &optional lines)
+  (let ((process (magit-parse-git-async
+                  "blame" "--incremental" args
+                  (and lines (list "-L" (apply #'format "%s,%s" lines)))
+                  revision "--" file)))
+    (set-process-filter   process #'magit-blame-process-filter)
+    (set-process-sentinel process #'magit-blame-process-sentinel)
+    (process-put process 'arguments (list revision file args))
+    (setq magit-blame-cache (make-hash-table :test #'equal))
+    (setq magit-blame-process process)))
+
+(defun magit-blame-process-quickstart-sentinel (process event)
+  (when (memq (process-status process) '(exit signal))
+    (magit-blame-process-sentinel process event t)
+    (magit-blame-assert-buffer process)
+    (with-current-buffer (process-get process 'command-buf)
+      (when magit-blame-mode
+        (let ((default-directory (magit-toplevel)))
+          (apply #'magit-blame-run-process
+                 (process-get process 'arguments)))))))
+
+(defun magit-blame-process-sentinel (process _event &optional quiet)
+  (let ((status (process-status process)))
+    (when (memq status '(exit signal))
+      (kill-buffer (process-buffer process))
+      (kill-buffer (process-get process 'stderr-buf))
+      (if (and (eq status 'exit)
+               (zerop (process-exit-status process)))
+          (unless quiet
+            (message "Blaming...done"))
+        (magit-blame-assert-buffer process)
+        (with-current-buffer (process-get process 'command-buf)
+          (if magit-blame-mode
+              (progn (magit-blame-mode -1)
+                     (message "Blaming...failed"))
+            (message "Blaming...aborted"))))
+      (kill-local-variable 'magit-blame-process))))
+
+(defun magit-blame-process-filter (process string)
+  (internal-default-process-filter process string)
+  (let ((buf  (process-get process 'command-buf))
+        (pos  (process-get process 'parsed))
+        (mark (process-mark process))
+        type cache)
+    (with-current-buffer buf
+      (setq type  magit-blame-type)
+      (setq cache magit-blame-cache))
+    (with-current-buffer (process-buffer process)
+      (goto-char pos)
+      (while (and (< (point) mark)
+                  (save-excursion (re-search-forward "^filename .+\n" nil t)))
+        (pcase-let* ((`(,chunk ,revinfo)
+                      (magit-blame--parse-chunk type))
+                     (rev (oref chunk orig-rev)))
+          (if revinfo
+              (puthash rev revinfo cache)
+            (setq revinfo
+                  (or (gethash rev cache)
+                      (puthash rev (magit-blame--commit-alist rev) cache))))
+          (magit-blame--make-overlays buf chunk revinfo))
+        (process-put process 'parsed (point))))))
+
+(defun magit-blame--parse-chunk (type)
+  (let (chunk revinfo)
+    (unless (looking-at "^\\(.\\{40,\\}\\) \\([0-9]+\\) \\([0-9]+\\) \\([0-9]+\\)")
+      (error "Blaming failed due to unexpected output: %s"
+             (buffer-substring-no-properties (point) (line-end-position))))
+    (with-slots (orig-rev orig-file prev-rev prev-file)
+        (setq chunk (magit-blame-chunk
+                     :orig-rev                     (match-string 1)
+                     :orig-line  (string-to-number (match-string 2))
+                     :final-line (string-to-number (match-string 3))
+                     :num-lines  (string-to-number (match-string 4))))
+      (forward-line)
+      (let (done)
+        (while (not done)
+          (cond ((looking-at "^filename \\(.+\\)")
+                 (setq done t)
+                 (setf orig-file (magit-decode-git-path (match-string 1))))
+                ((looking-at "^previous \\(.\\{40,\\}\\) \\(.+\\)")
+                 (setf prev-rev  (match-string 1))
+                 (setf prev-file (magit-decode-git-path (match-string 2))))
+                ((looking-at "^\\([^ ]+\\) \\(.+\\)")
+                 (push (cons (match-string 1)
+                             (match-string 2))
+                       revinfo)))
+          (forward-line)))
+      (when (and (eq type 'removal) prev-rev)
+        (cl-rotatef orig-rev  prev-rev)
+        (cl-rotatef orig-file prev-file)
+        (setq revinfo nil)))
+    (list chunk revinfo)))
+
+(defun magit-blame--commit-alist (rev)
+  (cl-mapcar 'cons
+             '("summary"
+               "author" "author-time" "author-tz"
+               "committer" "committer-time" "committer-tz")
+             (split-string (magit-rev-format "%s\v%an\v%ad\v%cn\v%cd" rev
+                                             "--date=format:%s\v%z")
+                           "\v")))
+
+(defun magit-blame-assert-buffer (process)
+  (unless (buffer-live-p (process-get process 'command-buf))
+    (kill-process process)
+    (user-error "Buffer being blamed has been killed")))
+
+;;; Display
+
+(defsubst magit-blame--style-get (key)
+  (cdr (assoc key (cdr magit-blame--style))))
+
+(defun magit-blame--make-overlays (buf chunk revinfo)
+  (with-current-buffer buf
+    (save-excursion
+      (save-restriction
+        (widen)
+        (let* ((line (oref chunk final-line))
+               (beg (magit-blame--line-beginning-position line))
+               (end (magit-blame--line-beginning-position
+                     (+ line (oref chunk num-lines))))
+               (before (magit-blame-chunk-at (1- beg))))
+          (when (and before
+                     (equal (oref before orig-rev)
+                            (oref chunk orig-rev)))
+            (setq beg (magit-blame--line-beginning-position
+                       (oset chunk final-line (oref before final-line))))
+            (cl-incf (oref chunk num-lines)
+                     (oref before num-lines)))
+          (magit-blame--remove-overlays beg end)
+          (when magit-blame--make-margin-overlays
+            (magit-blame--make-margin-overlays chunk revinfo beg end))
+          (magit-blame--make-heading-overlay chunk revinfo beg end)
+          (magit-blame--make-highlight-overlay chunk beg))))))
+
+(defun magit-blame--line-beginning-position (line)
+  (save-excursion
+    (goto-char (point-min))
+    (forward-line (1- line))
+    (point)))
+
+(defun magit-blame--make-margin-overlays (chunk revinfo beg end)
+  (save-excursion
+    (let ((line 0))
+      (goto-char beg)
+      (while (< (point) end)
+        (magit-blame--make-margin-overlay chunk revinfo line)
+        (forward-line)
+        (cl-incf line)))))
+
+(defun magit-blame--make-margin-overlay (chunk revinfo line)
+  (let* ((end (line-end-position))
+         ;; If possible avoid putting this on the first character
+         ;; of the line to avoid a conflict with the line overlay.
+         (beg (min (1+ (line-beginning-position)) end))
+         (ov  (make-overlay beg end)))
+    (overlay-put ov 'magit-blame-chunk chunk)
+    (overlay-put ov 'magit-blame-revinfo revinfo)
+    (overlay-put ov 'magit-blame-margin line)
+    (magit-blame--update-margin-overlay ov)))
+
+(defun magit-blame--make-heading-overlay (chunk revinfo beg end)
+  (let ((ov (make-overlay beg end)))
+    (overlay-put ov 'magit-blame-chunk chunk)
+    (overlay-put ov 'magit-blame-revinfo revinfo)
+    (overlay-put ov 'magit-blame-heading t)
+    (magit-blame--update-heading-overlay ov)))
+
+(defun magit-blame--make-highlight-overlay (chunk beg)
+  (let ((ov (make-overlay beg (save-excursion
+                                (goto-char beg)
+                                (1+ (line-end-position))))))
+    (overlay-put ov 'magit-blame-chunk chunk)
+    (overlay-put ov 'magit-blame-highlight t)
+    (magit-blame--update-highlight-overlay ov)))
+
+(defun magit-blame--update-margin ()
+  (setq left-margin-width (or (magit-blame--style-get 'margin-width) 0))
+  (set-window-buffer (selected-window) (current-buffer)))
+
+(defun magit-blame--update-overlays ()
+  (save-restriction
+    (widen)
+    (dolist (ov (overlays-in (point-min) (point-max)))
+      (cond ((overlay-get ov 'magit-blame-heading)
+             (magit-blame--update-heading-overlay ov))
+            ((overlay-get ov 'magit-blame-margin)
+             (magit-blame--update-margin-overlay ov))
+            ((overlay-get ov 'magit-blame-highlight)
+             (magit-blame--update-highlight-overlay ov))))))
+
+(defun magit-blame--update-margin-overlay (ov)
+  (overlay-put
+   ov 'before-string
+   (and (magit-blame--style-get 'margin-width)
+        (propertize
+         "o" 'display
+         (list (list 'margin 'left-margin)
+               (let ((line   (overlay-get ov 'magit-blame-margin))
+                     (format (magit-blame--style-get 'margin-format))
+                     (face   (magit-blame--style-get 'margin-face)))
+                 (magit-blame--format-string
+                  ov
+                  (or (and (atom format)
+                           format)
+                      (nth line format)
+                      (car (last format)))
+                  (or (and (not (zerop line))
+                           (magit-blame--style-get 'margin-body-face))
+                      face
+                      'magit-blame-margin))))))))
+
+(defun magit-blame--update-heading-overlay (ov)
+  (overlay-put
+   ov 'before-string
+   (if-let ((format (magit-blame--style-get 'heading-format)))
+       ;; Use `default' as the last face to avoid picking up any face
+       ;; attributes from the first character of the text on which we
+       ;; put the overlay.  See #5233.
+       (magit-blame--format-string ov format '(magit-blame-heading default))
+     (and (magit-blame--style-get 'show-lines)
+          (or (not (magit-blame--style-get 'margin-format))
+              (save-excursion
+                (goto-char (overlay-start ov))
+                ;; Special case of the special case described in
+                ;; `magit-blame--make-margin-overlay'.  For empty
+                ;; lines it is not possible to show both overlays
+                ;; without the line being too high.
+                (not (= (point) (line-end-position)))))
+          magit-blame-separator))))
+
+(defun magit-blame--update-highlight-overlay (ov)
+  (overlay-put ov 'font-lock-face (magit-blame--style-get 'highlight-face)))
+
+(defun magit-blame--format-string (ov format face)
+  (let* ((chunk   (overlay-get ov 'magit-blame-chunk))
+         (revinfo (overlay-get ov 'magit-blame-revinfo))
+         (key     (list format face))
+         (string  (cdr (assoc key revinfo))))
+    (unless string
+      (setq string
+            (and format
+                 (magit-blame--format-string-1 (oref chunk orig-rev)
+                                               revinfo format face)))
+      (nconc revinfo (list (cons key string))))
+    string))
+
+(defun magit-blame--format-string-1 (rev revinfo format face)
+  (let ((str
+         (if (string-match-p "\\`0\\{40,\\}\\'" rev)
+             (propertize (concat (if (string-prefix-p "\s" format) "\s" "")
+                                 "Not Yet Committed"
+                                 (if (string-suffix-p "\n" format) "\n" ""))
+                         'font-lock-face face)
+           (magit--format-spec
+            (propertize format 'font-lock-face face)
+            (cl-flet* ((p0 (s f)
+                         (propertize s 'font-lock-face
+                                     (if face (cons f (ensure-list face)) f)))
+                       (p1 (k f)
+                         (p0 (cdr (assoc k revinfo)) f))
+                       (p2 (k1 k2 f)
+                         (p0 (magit-blame--format-time-string
+                              (cdr (assoc k1 revinfo))
+                              (cdr (assoc k2 revinfo)))
+                             f)))
+              `((?H . ,(p0 rev         'magit-blame-hash))
+                (?s . ,(p1 "summary"   'magit-blame-summary))
+                (?a . ,(p1 "author"    'magit-blame-name))
+                (?c . ,(p1 "committer" 'magit-blame-name))
+                (?A . ,(p2 "author-time"    "author-tz"    'magit-blame-date))
+                (?C . ,(p2 "committer-time" "committer-tz" 'magit-blame-date))
+                (?f . "")))))))
+    (if-let ((width (and (string-suffix-p "%f" format)
+                         (magit-blame--style-get 'margin-width))))
+        (concat str
+                (propertize (make-string (max 0 (- width (length str))) ?\s)
+                            'font-lock-face face))
+      str)))
+
+(defun magit-blame--format-separator ()
+  (propertize
+   (concat (propertize "\s" 'display '(space :height (2)))
+           (propertize "\n" 'line-height t))
+   'font-lock-face `(:background
+                     ,(face-attribute 'magit-blame-heading
+                                      :background nil t)
+                     ,@(and (>= emacs-major-version 27) '(:extend t)))))
+
+(defun magit-blame--format-time-string (time tz)
+  (let* ((time-format (or (magit-blame--style-get 'time-format)
+                          magit-blame-time-format))
+         (tz-in-second (and (string-search "%z" time-format)
+                            (car (last (parse-time-string tz))))))
+    (format-time-string time-format
+                        (seconds-to-time (string-to-number time))
+                        tz-in-second)))
+
+(defun magit-blame--remove-overlays (&optional beg end)
+  (save-restriction
+    (widen)
+    (dolist (ov (overlays-in (or beg (point-min))
+                             (or end (point-max))))
+      (when (overlay-get ov 'magit-blame-chunk)
+        (delete-overlay ov)))))
+
+(defun magit-blame-maybe-show-message ()
+  (when (magit-blame--style-get 'show-message)
+    (let ((message-log-max 0))
+      (if-let ((msg (cdr (assoc "summary"
+                                (gethash (oref (magit-current-blame-chunk)
+                                               orig-rev)
+                                         magit-blame-cache)))))
+          (progn (set-text-properties 0 (length msg) nil msg)
+                 (message msg))
+        (message "Commit data not available yet.  Still blaming.")))))
+
+;;; Commands
+
+;;;###autoload (autoload 'magit-blame-echo "magit-blame" nil t)
+(transient-define-suffix magit-blame-echo (args)
+  "For each line show the revision in which it was added.
+Show the information about the chunk at point in the echo area
+when moving between chunks.  Unlike other blaming commands, do
+not turn on `read-only-mode'."
+  :if (lambda ()
+        (and buffer-file-name
+             (or (not magit-blame-mode)
+                 buffer-read-only)))
+  (interactive (list (magit-blame-arguments)))
+  (when magit-buffer-file-name
+    (user-error "Blob buffers aren't supported"))
+  (setq-local magit-blame--style
+              (assq magit-blame-echo-style magit-blame-styles))
+  (setq-local magit-blame-disable-modes
+              (cons 'eldoc-mode magit-blame-disable-modes))
+  (if (not magit-blame-mode)
+      (let ((magit-blame-read-only nil))
+        (magit-blame--pre-blame-assert 'addition)
+        (magit-blame--pre-blame-setup  'addition)
+        (magit-blame--run args))
+    (read-only-mode -1)
+    (magit-blame--update-overlays)))
+
+;;;###autoload (autoload 'magit-blame-addition "magit-blame" nil t)
+(transient-define-suffix magit-blame-addition (args)
+  "For each line show the revision in which it was added."
+  (interactive (list (magit-blame-arguments)))
+  (magit-blame--pre-blame-assert 'addition)
+  (magit-blame--pre-blame-setup  'addition)
+  (magit-blame--run args))
+
+;;;###autoload (autoload 'magit-blame-removal "magit-blame" nil t)
+(transient-define-suffix magit-blame-removal (args)
+  "For each line show the revision in which it was removed."
+  :if-nil 'buffer-file-name
+  (interactive (list (magit-blame-arguments)))
+  (unless magit-buffer-file-name
+    (user-error "Only blob buffers can be blamed in reverse"))
+  (magit-blame--pre-blame-assert 'removal)
+  (magit-blame--pre-blame-setup  'removal)
+  (magit-blame--run args))
+
+;;;###autoload (autoload 'magit-blame-reverse "magit-blame" nil t)
+(transient-define-suffix magit-blame-reverse (args)
+  "For each line show the last revision in which it still exists."
+  :if-nil 'buffer-file-name
+  (interactive (list (magit-blame-arguments)))
+  (unless magit-buffer-file-name
+    (user-error "Only blob buffers can be blamed in reverse"))
+  (magit-blame--pre-blame-assert 'final)
+  (magit-blame--pre-blame-setup  'final)
+  (magit-blame--run args))
+
+(defun magit-blame--pre-blame-assert (type)
+  (unless (magit-toplevel)
+    (magit--not-inside-repository-error))
+  (if (and magit-blame-mode
+           (eq type magit-blame-type))
+      (if-let ((chunk (magit-current-blame-chunk)))
+          (unless (oref chunk prev-rev)
+            (user-error "Chunk has no further history"))
+        (user-error "Commit data not available yet.  Still blaming."))
+    (unless (magit-file-relative-name nil (not magit-buffer-file-name))
+      (if buffer-file-name
+          (user-error "Buffer isn't visiting a tracked file")
+        (user-error "Buffer isn't visiting a file")))))
+
+(defun magit-blame--pre-blame-setup (type)
+  (when magit-blame-mode
+    (if (eq type magit-blame-type)
+        (let ((style magit-blame--style))
+          (magit-blame-visit-other-file)
+          (setq-local magit-blame--style style)
+          (setq-local magit-blame-recursive-p t)
+          ;; Set window-start for the benefit of quickstart.
+          (redisplay))
+      (magit-blame--remove-overlays)))
+  (setq magit-blame-type type))
+
+(defun magit-blame-visit-other-file ()
+  "Visit another blob related to the current chunk."
+  (interactive)
+  (with-slots (prev-rev prev-file orig-line)
+      (magit-current-blame-chunk)
+    (unless prev-rev
+      (user-error "Chunk has no further history"))
+    (magit-with-toplevel
+      (magit-find-file prev-rev prev-file))
+    ;; TODO Adjust line like magit-diff-visit-file.
+    (goto-char (point-min))
+    (forward-line (1- orig-line))))
+
+(defun magit-blame-visit-file ()
+  "Visit the blob related to the current chunk."
+  (interactive)
+  (with-slots (orig-rev orig-file orig-line)
+      (magit-current-blame-chunk)
+    (magit-with-toplevel
+      (magit-find-file orig-rev orig-file))
+    (goto-char (point-min))
+    (forward-line (1- orig-line))))
+
+(transient-define-suffix magit-blame-quit ()
+  "Turn off Magit-Blame mode.
+If the buffer was created during a recursive blame,
+then also kill the buffer."
+  :if-non-nil 'magit-blame-mode
+  (interactive)
+  (magit-blame-mode -1)
+  (when magit-blame-recursive-p
+    (kill-buffer)))
+
+(defun magit-blame-next-chunk ()
+  "Move to the next chunk."
+  (interactive)
+  (if-let ((next (next-single-char-property-change
+                  (point) 'magit-blame-chunk)))
+      (goto-char next)
+    (user-error "No more chunks")))
+
+(defun magit-blame-previous-chunk ()
+  "Move to the previous chunk."
+  (interactive)
+  (if-let ((prev (previous-single-char-property-change
+                  (point) 'magit-blame-chunk)))
+      (goto-char prev)
+    (user-error "No more chunks")))
+
+(defun magit-blame-next-chunk-same-commit (&optional previous)
+  "Move to the next chunk from the same commit.\n\n(fn)"
+  (interactive)
+  (if-let ((rev (oref (magit-current-blame-chunk) orig-rev)))
+      (let ((pos (point)) ov)
+        (save-excursion
+          (while (and (not ov)
+                      (not (= pos (if previous (point-min) (point-max))))
+                      (setq pos (funcall
+                                 (if previous
+                                     #'previous-single-char-property-change
+                                   #'next-single-char-property-change)
+                                 pos 'magit-blame-chunk)))
+            (when-let ((o (magit-blame--overlay-at pos)))
+              (when (equal (oref (magit-blame-chunk-at pos) orig-rev) rev)
+                (setq ov o)))))
+        (if ov
+            (goto-char (overlay-start ov))
+          (user-error "No more chunks from same commit")))
+    (user-error "This chunk hasn't been blamed yet")))
+
+(defun magit-blame-previous-chunk-same-commit ()
+  "Move to the previous chunk from the same commit."
+  (interactive)
+  (magit-blame-next-chunk-same-commit #'previous-single-char-property-change))
+
+(defun magit-blame-cycle-style ()
+  "Change how blame information is visualized.
+Cycle through the elements of option `magit-blame-styles'."
+  (interactive)
+  (setq magit-blame--style
+        (or (cadr (cl-member (car magit-blame--style)
+                             magit-blame-styles :key #'car))
+            (car magit-blame-styles)))
+  (magit-blame--update-margin)
+  (magit-blame--update-overlays))
+
+(defun magit-blame-copy-hash ()
+  "Save hash of the current chunk's commit to the kill ring.
+
+When the region is active, then save the region's content
+instead of the hash, like `kill-ring-save' would."
+  (interactive)
+  (if (use-region-p)
+      (call-interactively #'copy-region-as-kill)
+    (kill-new (message "%s" (oref (magit-current-blame-chunk) orig-rev)))))
+
+;;; Popup
+
+;;;###autoload (autoload 'magit-blame "magit-blame" nil t)
+(transient-define-prefix magit-blame ()
+  "Show the commits that added or removed lines in the visited file."
+  :man-page "git-blame"
+  :value '("-w")
+  ["Arguments"
+   ("-w" "Ignore whitespace" "-w")
+   ("-r" "Do not treat root commits as boundaries" "--root")
+   ("-P" "Follow only first parent" "--first-parent")
+   (magit-blame:-M)
+   (magit-blame:-C)]
+  ["Actions"
+   ("b" "Show commits adding lines" magit-blame-addition)
+   ("r" "Show commits removing lines" magit-blame-removal)
+   ("f" "Show last commits that still have lines" magit-blame-reverse)
+   ("m" "Blame echo" magit-blame-echo)
+   ("q" "Quit blaming" magit-blame-quit)]
+  ["Refresh"
+   :if-non-nil magit-blame-mode
+   ("c" "Cycle style" magit-blame-cycle-style :transient t)])
+
+(defun magit-blame-arguments ()
+  (transient-args 'magit-blame))
+
+(transient-define-argument magit-blame:-M ()
+  :description "Detect lines moved or copied within a file"
+  :class 'transient-option
+  :argument "-M"
+  :allow-empty t
+  :reader #'transient-read-number-N+)
+
+(transient-define-argument magit-blame:-C ()
+  :description "Detect lines moved or copied between files"
+  :class 'transient-option
+  :argument "-C"
+  :allow-empty t
+  :reader #'transient-read-number-N+)
+
+;;; Utilities
+
+(defun magit-blame-maybe-update-revision-buffer ()
+  (when-let* ((chunk  (magit-current-blame-chunk))
+              (commit (oref chunk orig-rev))
+              (buffer (magit-get-mode-buffer 'magit-revision-mode nil t)))
+    (if magit--update-revision-buffer
+        (setq magit--update-revision-buffer (list commit buffer))
+      (setq magit--update-revision-buffer (list commit buffer))
+      (run-with-idle-timer
+       magit-update-other-window-delay nil
+       (lambda ()
+         (pcase-let ((`(,rev ,buf) magit--update-revision-buffer))
+           (setq magit--update-revision-buffer nil)
+           (when (buffer-live-p buf)
+             (let ((magit-display-buffer-noselect t))
+               (apply #'magit-show-commit rev
+                      (magit-diff-arguments 'magit-revision-mode))))))))))
+
+;;; _
+(provide 'magit-blame)
+;;; magit-blame.el ends here
diff --git a/emacs/elpa/magit-20241001.2052/magit-blame.elc b/emacs/elpa/magit-20241001.2052/magit-blame.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240930.1805/magit-bookmark.el b/emacs/elpa/magit-20241001.2052/magit-bookmark.el
diff --git a/emacs/elpa/magit-20240930.1805/magit-bookmark.elc b/emacs/elpa/magit-20241001.2052/magit-bookmark.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240930.1805/magit-branch.el b/emacs/elpa/magit-20241001.2052/magit-branch.el
diff --git a/emacs/elpa/magit-20240930.1805/magit-branch.elc b/emacs/elpa/magit-20241001.2052/magit-branch.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240930.1805/magit-bundle.el b/emacs/elpa/magit-20241001.2052/magit-bundle.el
diff --git a/emacs/elpa/magit-20240930.1805/magit-bundle.elc b/emacs/elpa/magit-20241001.2052/magit-bundle.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240930.1805/magit-clone.el b/emacs/elpa/magit-20241001.2052/magit-clone.el
diff --git a/emacs/elpa/magit-20240930.1805/magit-clone.elc b/emacs/elpa/magit-20241001.2052/magit-clone.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240930.1805/magit-commit.el b/emacs/elpa/magit-20241001.2052/magit-commit.el
diff --git a/emacs/elpa/magit-20240930.1805/magit-commit.elc b/emacs/elpa/magit-20241001.2052/magit-commit.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240930.1805/magit-core.el b/emacs/elpa/magit-20241001.2052/magit-core.el
diff --git a/emacs/elpa/magit-20240930.1805/magit-core.elc b/emacs/elpa/magit-20241001.2052/magit-core.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240930.1805/magit-diff.el b/emacs/elpa/magit-20241001.2052/magit-diff.el
diff --git a/emacs/elpa/magit-20241001.2052/magit-diff.elc b/emacs/elpa/magit-20241001.2052/magit-diff.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240930.1805/magit-ediff.el b/emacs/elpa/magit-20241001.2052/magit-ediff.el
diff --git a/emacs/elpa/magit-20240930.1805/magit-ediff.elc b/emacs/elpa/magit-20241001.2052/magit-ediff.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240930.1805/magit-extras.el b/emacs/elpa/magit-20241001.2052/magit-extras.el
diff --git a/emacs/elpa/magit-20240930.1805/magit-extras.elc b/emacs/elpa/magit-20241001.2052/magit-extras.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240930.1805/magit-fetch.el b/emacs/elpa/magit-20241001.2052/magit-fetch.el
diff --git a/emacs/elpa/magit-20240930.1805/magit-fetch.elc b/emacs/elpa/magit-20241001.2052/magit-fetch.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240930.1805/magit-files.el b/emacs/elpa/magit-20241001.2052/magit-files.el
diff --git a/emacs/elpa/magit-20240930.1805/magit-files.elc b/emacs/elpa/magit-20241001.2052/magit-files.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20241001.2052/magit-git.el b/emacs/elpa/magit-20241001.2052/magit-git.el
@@ -0,0 +1,2889 @@
+;;; magit-git.el --- Git functionality  -*- lexical-binding:t -*-
+
+;; Copyright (C) 2008-2024 The Magit Project Contributors
+
+;; Author: Jonas Bernoulli <emacs.magit@jonas.bernoulli.dev>
+;; Maintainer: Jonas Bernoulli <emacs.magit@jonas.bernoulli.dev>
+
+;; SPDX-License-Identifier: GPL-3.0-or-later
+
+;; Magit is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+;;
+;; Magit is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+;; or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
+;; License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with Magit.  If not, see <https://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; This library implements wrappers for various Git plumbing commands.
+
+;;; Code:
+
+(require 'magit-base)
+
+(require 'format-spec)
+
+;; From `magit-branch'.
+(defvar magit-branch-prefer-remote-upstream)
+(defvar magit-published-branches)
+
+;; From `magit-margin'.
+(declare-function magit-maybe-make-margin-overlay "magit-margin" ())
+
+;; From `magit-mode'.
+(declare-function magit-get-mode-buffer "magit-mode"
+                  (mode &optional value frame))
+(declare-function magit-refresh "magit-mode" ())
+(defvar magit-buffer-diff-type)
+(defvar magit-buffer-diff-args)
+(defvar magit-buffer-file-name)
+(defvar magit-buffer-log-args)
+(defvar magit-buffer-log-files)
+(defvar magit-buffer-refname)
+(defvar magit-buffer-revision)
+
+;; From `magit-process'.
+(declare-function magit-call-git "magit-process" (&rest args))
+(declare-function magit-git "magit-process" (&rest args))
+(declare-function magit-process-buffer "magit-process" (&optional nodisplay))
+(declare-function magit-process-file "magit-process"
+                  (process &optional infile buffer display &rest args))
+(declare-function magit-process-git "magit-process" (destination &rest args))
+(declare-function magit-process-insert-section "magit-process"
+                  (pwd program args &optional errcode errlog))
+(defvar magit-this-error)
+(defvar magit-process-error-message-regexps)
+
+(eval-when-compile
+  (cl-pushnew 'orig-rev eieio--known-slot-names)
+  (cl-pushnew 'number eieio--known-slot-names))
+
+;;; Options
+
+;; For now this is shared between `magit-process' and `magit-git'.
+(defgroup magit-process nil
+  "Git and other external processes used by Magit."
+  :group 'magit)
+
+(defvar magit-git-environment
+  (list (format "INSIDE_EMACS=%s,magit" emacs-version))
+  "Prepended to `process-environment' while running git.")
+
+(defcustom magit-git-output-coding-system
+  (and (eq system-type 'windows-nt) 'utf-8)
+  "Coding system for receiving output from Git.
+
+If non-nil, the Git config value `i18n.logOutputEncoding' should
+be set via `magit-git-global-arguments' to value consistent with
+this."
+  :package-version '(magit . "2.9.0")
+  :group 'magit-process
+  :type '(choice (coding-system :tag "Coding system to decode Git output")
+                 (const :tag "Use system default" nil)))
+
+(defvar magit-git-w32-path-hack nil
+  "Alist of (EXE . (PATHENTRY)).
+This specifies what additional PATH setting needs to be added to
+the environment in order to run the non-wrapper git executables
+successfully.")
+
+(defcustom magit-git-executable
+  (or (and (eq system-type 'windows-nt)
+           ;; Avoid the wrappers "cmd/git.exe" and "cmd/git.cmd",
+           ;; which are much slower than using "bin/git.exe" directly.
+           (and-let* ((exec (executable-find "git")))
+             (ignore-errors
+               ;; Git for Windows 2.x provides cygpath so we can
+               ;; ask it for native paths.
+               (let* ((core-exe
+                       (car
+                        (process-lines
+                         exec "-c"
+                         "alias.X=!x() { which \"$1\" | cygpath -mf -; }; x"
+                         "X" "git")))
+                      (hack-entry (assoc core-exe magit-git-w32-path-hack))
+                      ;; Running the libexec/git-core executable
+                      ;; requires some extra PATH entries.
+                      (path-hack
+                       (list (concat "PATH="
+                                     (car (process-lines
+                                           exec "-c"
+                                           "alias.P=!cygpath -wp \"$PATH\""
+                                           "P"))))))
+                 ;; The defcustom STANDARD expression can be
+                 ;; evaluated many times, so make sure it is
+                 ;; idempotent.
+                 (if hack-entry
+                     (setcdr hack-entry path-hack)
+                   (push (cons core-exe path-hack) magit-git-w32-path-hack))
+                 core-exe))))
+      (and (eq system-type 'darwin)
+           (executable-find "git"))
+      "git")
+  "The Git executable used by Magit on the local host.
+On remote machines `magit-remote-git-executable' is used instead."
+  :package-version '(magit . "3.2.0")
+  :group 'magit-process
+  :type 'string)
+
+(defcustom magit-remote-git-executable "git"
+  "The Git executable used by Magit on remote machines.
+On the local host `magit-git-executable' is used instead.
+Consider customizing `tramp-remote-path' instead of this
+option."
+  :package-version '(magit . "3.2.0")
+  :group 'magit-process
+  :type 'string)
+
+(defcustom magit-git-global-arguments
+  `("--no-pager" "--literal-pathspecs"
+    "-c" "core.preloadindex=true"
+    "-c" "log.showSignature=false"
+    "-c" "color.ui=false"
+    "-c" "color.diff=false"
+    ,@(and (eq system-type 'windows-nt)
+           (list "-c" "i18n.logOutputEncoding=UTF-8")))
+  "Global Git arguments.
+
+The arguments set here are used every time the git executable is
+run as a subprocess.  They are placed right after the executable
+itself and before the git command - as in `git HERE... COMMAND
+REST'.  See the manpage `git(1)' for valid arguments.
+
+Be careful what you add here, especially if you are using Tramp
+to connect to servers with ancient Git versions.  Never remove
+anything that is part of the default value, unless you really
+know what you are doing.  And think very hard before adding
+something; it will be used every time Magit runs Git for any
+purpose."
+  :package-version '(magit . "2.9.0")
+  :group 'magit-commands
+  :group 'magit-process
+  :type '(repeat string))
+
+(defcustom magit-prefer-remote-upstream nil
+  "Whether to favor remote branches when reading the upstream branch.
+
+This controls whether commands that read a branch from the user
+and then set it as the upstream branch, offer a local or a remote
+branch as default completion candidate, when they have the choice.
+
+This affects all commands that use `magit-read-upstream-branch'
+or `magit-read-starting-point', which includes most commands
+that change the upstream and many that create new branches."
+  :package-version '(magit . "2.4.2")
+  :group 'magit-commands
+  :type 'boolean)
+
+(defcustom magit-list-refs-namespaces
+  '("refs/heads"
+    "refs/remotes"
+    "refs/tags"
+    "refs/pullreqs")
+  "List of ref namespaces considered when reading a ref.
+
+This controls the order of refs returned by `magit-list-refs',
+which is called by functions like `magit-list-branch-names' to
+generate the collection of refs."
+  :package-version '(magit . "3.1.0")
+  :group 'magit-commands
+  :type '(repeat string))
+
+(defcustom magit-list-refs-sortby nil
+  "How to sort the ref collection in the prompt.
+
+This affects commands that read a ref.  More specifically, it
+controls the order of refs returned by `magit-list-refs', which
+is called by functions like `magit-list-branch-names' to generate
+the collection of refs.  By default, refs are sorted according to
+their full refname (i.e., \"refs/...\").
+
+Any value accepted by the `--sort' flag of \"git for-each-ref\" can
+be used.  For example, \"-creatordate\" places refs with more
+recent committer or tagger dates earlier in the list.  A list of
+strings can also be given in order to pass multiple sort keys to
+\"git for-each-ref\".
+
+Note that, depending on the completion framework you use, this
+may not be sufficient to change the order in which the refs are
+displayed.  It only controls the order of the collection passed
+to `magit-completing-read' or, for commands that support reading
+multiple strings, `read-from-minibuffer'.  The completion
+framework ultimately determines how the collection is displayed."
+  :package-version '(magit . "2.11.0")
+  :group 'magit-miscellaneous
+  :type '(choice string (repeat string)))
+
+;;; Git
+
+(defvar magit-git-debug nil
+  "Whether to enable additional reporting of git errors.
+
+Magit basically calls git for one of these two reasons: for
+side-effects or to do something with its standard output.
+
+When git is run for side-effects then its output, including error
+messages, go into the process buffer which is shown when using \
+\\<magit-status-mode-map>\\[magit-process-buffer].
+
+When git's output is consumed in some way, then it would be too
+expensive to also insert it into this buffer, but when this
+option is non-nil and git returns with a non-zero exit status,
+then at least its standard error is inserted into this buffer.
+
+This is only intended for debugging purposes.  Do not enable this
+permanently, that would negatively affect performance.  Also note
+that just because git exits with a non-zero exit status and prints
+an error message that usually doesn't mean that it is an error as
+far as Magit is concerned, which is another reason we usually hide
+these error messages.  Whether some error message is relevant in
+the context of some unexpected behavior has to be judged on a case
+by case basis.
+
+The command `magit-toggle-git-debug' changes the value of this
+variable.
+
+Also see `magit-process-extreme-logging'.")
+
+(defun magit-toggle-git-debug ()
+  "Toggle whether additional git errors are reported.
+See info node `(magit)Debugging Tools' for more information."
+  (interactive)
+  (setq magit-git-debug (not magit-git-debug))
+  (message "Additional reporting of Git errors %s"
+           (if magit-git-debug "enabled" "disabled")))
+
+(defvar magit--refresh-cache nil)
+
+(defmacro magit--with-refresh-cache (key &rest body)
+  (declare (indent 1) (debug (form body)))
+  (let ((k (cl-gensym))
+        (hit (cl-gensym)))
+    `(if magit--refresh-cache
+         (let ((,k ,key))
+           (if-let ((,hit (assoc ,k (cdr magit--refresh-cache))))
+               (progn (cl-incf (caar magit--refresh-cache))
+                      (cdr ,hit))
+             (cl-incf (cdar magit--refresh-cache))
+             (let ((value ,(macroexp-progn body)))
+               (push (cons ,k value)
+                     (cdr magit--refresh-cache))
+               value)))
+       ,@body)))
+
+(defvar magit-with-editor-envvar "GIT_EDITOR"
+  "The environment variable exported by `magit-with-editor'.
+Set this to \"GIT_SEQUENCE_EDITOR\" if you do not want to use
+Emacs to edit commit messages but would like to do so to edit
+rebase sequences.")
+
+(defmacro magit-with-editor (&rest body)
+  "Like `with-editor*' but let-bind some more variables.
+Also respect the value of `magit-with-editor-envvar'."
+  (declare (indent 0) (debug (body)))
+  `(let ((magit-process-popup-time -1)
+         ;; The user may have customized `shell-file-name' to
+         ;; something which results in `w32-shell-dos-semantics' nil
+         ;; (which changes the quoting style used by
+         ;; `shell-quote-argument'), but Git for Windows expects shell
+         ;; quoting in the dos style.
+         (shell-file-name (if (and (eq system-type 'windows-nt)
+                                   ;; If we have Cygwin mount points,
+                                   ;; the git flavor is cygwin, so dos
+                                   ;; shell quoting is probably wrong.
+                                   (not magit-cygwin-mount-points))
+                              "cmdproxy"
+                            shell-file-name)))
+     (with-editor* magit-with-editor-envvar
+       ,@body)))
+
+(defmacro magit--with-temp-process-buffer (&rest body)
+  "Like `with-temp-buffer', but always propagate `process-environment'.
+When that var is buffer-local in the calling buffer, it is not
+propagated by `with-temp-buffer', so we explicitly ensure that
+happens, so that processes will be invoked consistently.  BODY is
+as for that macro."
+  (declare (indent 0) (debug (body)))
+  (let ((p (cl-gensym)))
+    `(let ((,p process-environment))
+       (with-temp-buffer
+         (setq-local process-environment ,p)
+         ,@body))))
+
+(defsubst magit-git-executable ()
+  "Return value of `magit-git-executable' or `magit-remote-git-executable'.
+The variable is chosen depending on whether `default-directory'
+is remote."
+  (if (file-remote-p default-directory)
+      magit-remote-git-executable
+    magit-git-executable))
+
+(defun magit-process-git-arguments (args)
+  "Prepare ARGS for a function that invokes Git.
+
+Magit has many specialized functions for running Git; they all
+pass arguments through this function before handing them to Git,
+to do the following.
+
+* Flatten ARGS, removing nil arguments.
+* Prepend `magit-git-global-arguments' to ARGS.
+* On w32 systems, encode to `w32-ansi-code-page'."
+  (setq args (append magit-git-global-arguments (flatten-tree args)))
+  (if (and (eq system-type 'windows-nt) (boundp 'w32-ansi-code-page))
+      ;; On w32, the process arguments *must* be encoded in the
+      ;; current code-page (see #3250).
+      (mapcar (lambda (arg)
+                (encode-coding-string
+                 arg (intern (format "cp%d" w32-ansi-code-page))))
+              args)
+    args))
+
+(defun magit-git-exit-code (&rest args)
+  "Execute Git with ARGS, returning its exit code."
+  (magit-process-git nil args))
+
+(defun magit-git-success (&rest args)
+  "Execute Git with ARGS, returning t if its exit code is 0."
+  (= (magit-git-exit-code args) 0))
+
+(defun magit-git-failure (&rest args)
+  "Execute Git with ARGS, returning t if its exit code is 1."
+  (= (magit-git-exit-code args) 1))
+
+(defun magit-git-string-p (&rest args)
+  "Execute Git with ARGS, returning the first line of its output.
+If the exit code isn't zero or if there is no output, then return
+nil.  Neither of these results is considered an error; if that is
+what you want, then use `magit-git-string-ng' instead.
+
+This is an experimental replacement for `magit-git-string', and
+still subject to major changes."
+  (magit--with-refresh-cache (cons default-directory args)
+    (magit--with-temp-process-buffer
+      (and (zerop (magit-process-git t args))
+           (not (bobp))
+           (progn
+             (goto-char (point-min))
+             (buffer-substring-no-properties (point) (line-end-position)))))))
+
+(defun magit-git-string-ng (&rest args)
+  "Execute Git with ARGS, returning the first line of its output.
+If the exit code isn't zero or if there is no output, then that
+is considered an error, but instead of actually signaling an
+error, return nil.  Additionally the output is put in the process
+buffer (creating it if necessary) and the error message is shown
+in the status buffer (provided it exists).
+
+This is an experimental replacement for `magit-git-string', and
+still subject to major changes.  Also see `magit-git-string-p'."
+  (magit--with-refresh-cache
+      (list default-directory 'magit-git-string-ng args)
+    (magit--with-temp-process-buffer
+      (let* ((args (magit-process-git-arguments args))
+             (status (magit-process-git t args)))
+        (if (zerop status)
+            (and (not (bobp))
+                 (progn
+                   (goto-char (point-min))
+                   (buffer-substring-no-properties
+                    (point) (line-end-position))))
+          (let ((buf (current-buffer)))
+            (with-current-buffer (magit-process-buffer t)
+              (magit-process-insert-section default-directory
+                                            magit-git-executable args
+                                            status buf)))
+          (when-let ((status-buf (magit-get-mode-buffer 'magit-status-mode)))
+            (let ((msg (magit--locate-error-message)))
+              (with-current-buffer status-buf
+                (setq magit-this-error msg))))
+          nil)))))
+
+(defun magit-git-str (&rest args)
+  "Execute Git with ARGS, returning the first line of its output.
+If there is no output, return nil.  If the output begins with a
+newline, return an empty string.  Like `magit-git-string' but
+ignore `magit-git-debug'."
+  (setq args (flatten-tree args))
+  (magit--with-refresh-cache (cons default-directory args)
+    (magit--with-temp-process-buffer
+      (magit-process-git (list t nil) args)
+      (unless (bobp)
+        (goto-char (point-min))
+        (buffer-substring-no-properties (point) (line-end-position))))))
+
+(defun magit-git-output (&rest args)
+  "Execute Git with ARGS, returning its output."
+  (setq args (flatten-tree args))
+  (magit--with-refresh-cache (cons default-directory args)
+    (magit--with-temp-process-buffer
+      (magit-process-git (list t nil) args)
+      (buffer-substring-no-properties (point-min) (point-max)))))
+
+(define-error 'magit-invalid-git-boolean "Not a Git boolean")
+
+(defun magit-git-true (&rest args)
+  "Execute Git with ARGS, returning t if it prints \"true\".
+If it prints \"false\", then return nil.  For any other output
+signal `magit-invalid-git-boolean'."
+  (pcase (magit-git-output args)
+    ((or "true"  "true\n")  t)
+    ((or "false" "false\n") nil)
+    (output (signal 'magit-invalid-git-boolean (list output)))))
+
+(defun magit-git-false (&rest args)
+  "Execute Git with ARGS, returning t if it prints \"false\".
+If it prints \"true\", then return nil.  For any other output
+signal `magit-invalid-git-boolean'."
+  (pcase (magit-git-output args)
+    ((or "true"  "true\n")  nil)
+    ((or "false" "false\n") t)
+    (output (signal 'magit-invalid-git-boolean (list output)))))
+
+(defun magit-git-config-p (variable &optional default)
+  "Return the boolean value of the Git variable VARIABLE.
+VARIABLE has to be specified as a string.  Return DEFAULT (which
+defaults to nil) if VARIABLE is unset.  If VARIABLE's value isn't
+a boolean, then raise an error."
+  (let ((args (list "config" "--bool" "--default" (if default "true" "false")
+                    variable)))
+    (magit--with-refresh-cache (cons default-directory args)
+      (magit--with-temp-process-buffer
+        (let ((status (magit-process-git t args))
+              (output (buffer-substring (point-min) (1- (point-max)))))
+          (if (zerop status)
+              (equal output "true")
+            (signal 'magit-invalid-git-boolean (list output))))))))
+
+(defun magit-git-insert (&rest args)
+  "Execute Git with ARGS, inserting its output at point.
+If Git exits with a non-zero exit status, then show a message and
+add a section in the respective process buffer."
+  (apply #'magit--git-insert nil args))
+
+(defun magit--git-insert (return-error &rest args)
+  (setq args (magit-process-git-arguments args))
+  (if (or return-error magit-git-debug)
+      (let (log)
+        (unwind-protect
+            (let (exit errmsg)
+              (setq log (make-temp-file "magit-stderr"))
+              (delete-file log)
+              (setq exit (magit-process-git (list t log) args))
+              (when (> exit 0)
+                (when (file-exists-p log)
+                  (with-temp-buffer
+                    (insert-file-contents log)
+                    (goto-char (point-max))
+                    (setq errmsg
+                          (if (functionp magit-git-debug)
+                              (funcall magit-git-debug (buffer-string))
+                            (magit--locate-error-message))))
+                  (unless return-error
+                    (let ((magit-git-debug nil))
+                      (with-current-buffer (magit-process-buffer t)
+                        (magit-process-insert-section default-directory
+                                                      magit-git-executable
+                                                      args exit log)))))
+                (unless return-error
+                  (if errmsg
+                      (message "%s" errmsg)
+                    (message "Git returned with exit-code %s" exit))))
+              (or errmsg exit))
+          (ignore-errors (delete-file log))))
+    (magit-process-git (list t nil) args)))
+
+(defun magit--locate-error-message ()
+  (goto-char (point-max))
+  (and (run-hook-wrapped 'magit-process-error-message-regexps
+                         (lambda (re) (re-search-backward re nil t)))
+       (match-string-no-properties 1)))
+
+(defun magit-git-string (&rest args)
+  "Execute Git with ARGS, returning the first line of its output.
+If there is no output, return nil.  If the output begins with a
+newline, return an empty string."
+  (setq args (flatten-tree args))
+  (magit--with-refresh-cache (cons default-directory args)
+    (magit--with-temp-process-buffer
+      (apply #'magit-git-insert args)
+      (unless (bobp)
+        (goto-char (point-min))
+        (buffer-substring-no-properties (point) (line-end-position))))))
+
+(defun magit-git-lines (&rest args)
+  "Execute Git with ARGS, returning its output as a list of lines.
+Empty lines anywhere in the output are omitted.
+
+If Git exits with a non-zero exit status, then report show a
+message and add a section in the respective process buffer."
+  (magit--with-temp-process-buffer
+    (apply #'magit-git-insert args)
+    (split-string (buffer-string) "\n" t)))
+
+(defun magit-git-items (&rest args)
+  "Execute Git with ARGS, returning its null-separated output as a list.
+Empty items anywhere in the output are omitted.
+
+If Git exits with a non-zero exit status, then report show a
+message and add a section in the respective process buffer."
+  (magit--with-temp-process-buffer
+    (apply #'magit-git-insert args)
+    (split-string (buffer-string) "\0" t)))
+
+(defvar magit--git-wash-keep-error nil) ; experimental
+
+(defun magit-git-wash (washer &rest args)
+  "Execute Git with ARGS, inserting washed output at point.
+Actually first insert the raw output at point.  If there is no
+output, call `magit-cancel-section'.  Otherwise temporarily narrow
+the buffer to the inserted text, move to its beginning, and then
+call function WASHER with ARGS as its sole argument."
+  (declare (indent 1))
+  (apply #'magit--git-wash washer magit--git-wash-keep-error args))
+
+(defun magit--git-wash (washer keep-error &rest args)
+  (declare (indent 2))
+  (setq args (flatten-tree args))
+  (let ((beg (point))
+        (exit (magit--git-insert keep-error args)))
+    (when (stringp exit)
+      (goto-char beg)
+      (insert (propertize exit 'face 'error))
+      (unless (bolp)
+        (insert "\n")))
+    (if (= (point) beg)
+        (magit-cancel-section)
+      (unless (bolp)
+        (insert "\n"))
+      (when (or (equal exit 0)
+                (eq keep-error 'wash-anyway))
+        (save-restriction
+          (narrow-to-region beg (point))
+          (goto-char beg)
+          (funcall washer args))
+        (when (or (= (point) beg)
+                  (= (point) (1+ beg)))
+          (magit-cancel-section))
+        (magit-maybe-make-margin-overlay)))
+    exit))
+
+(defun magit-git-executable-find (command)
+  "Search for COMMAND in Git's exec path, falling back to `exec-path'.
+Like `executable-find', return the absolute file name of the
+executable."
+  (or (locate-file command
+                   (list (concat
+                          (file-remote-p default-directory)
+                          (or (magit-git-string "--exec-path")
+                              (error "`git --exec-path' failed"))))
+                   exec-suffixes
+                   #'file-executable-p)
+      (compat-call executable-find command t)))
+
+;;; Git Version
+
+(defconst magit--git-version-regexp
+  "\\`git version \\([0-9]+\\(\\.[0-9]+\\)\\{1,2\\}\\)")
+
+(defvar magit--host-git-version-cache nil)
+
+(defun magit-git-version>= (n)
+  "Return t if `magit-git-version's value is greater than or equal to N."
+  (magit--version>= (magit-git-version) n))
+
+(defun magit-git-version< (n)
+  "Return t if `magit-git-version's value is smaller than N."
+  (version< (magit-git-version) n))
+
+(defun magit-git-version ()
+  "Return the Git version used for `default-directory'.
+Raise an error if Git cannot be found, if it exits with a
+non-zero status, or the output does not have the expected
+format."
+  (magit--with-refresh-cache default-directory
+    (let ((host (file-remote-p default-directory)))
+      (or (cdr (assoc host magit--host-git-version-cache))
+          (magit--with-temp-process-buffer
+            ;; Unset global arguments for ancient Git versions.
+            (let* ((magit-git-global-arguments nil)
+                   (status (magit-process-git t "version"))
+                   (output (buffer-string)))
+              (cond
+               ((not (zerop status))
+                (display-warning
+                 'magit
+                 (format "%S\n\nRunning \"%s --version\" failed with output:\n\n%s"
+                         (if host
+                             (format "Magit cannot find Git on host %S.\n
+Check the value of `magit-remote-git-executable' using
+`magit-debug-git-executable' and consult the info node
+`(tramp)Remote programs'." host)
+                           "Magit cannot find Git.\n
+Check the values of `magit-git-executable' and `exec-path'
+using `magit-debug-git-executable'.")
+                         (magit-git-executable)
+                         output)))
+               ((save-match-data
+                  (and (string-match magit--git-version-regexp output)
+                       (let ((version (match-string 1 output)))
+                         (push (cons host version)
+                               magit--host-git-version-cache)
+                         version))))
+               ((error "Unexpected \"%s --version\" output: %S"
+                       (magit-git-executable)
+                       output)))))))))
+
+(defun magit-git-version-assert (&optional minimal who)
+  "Assert that the used Git version is greater than or equal to MINIMAL.
+If optional MINIMAL is nil, compare with `magit--minimal-git'
+instead.  Optional WHO if non-nil specifies what functionality
+needs at least MINIMAL, otherwise it defaults to \"Magit\"."
+  (when (magit-git-version< (or minimal magit--minimal-git))
+    (let* ((host (file-remote-p default-directory))
+           (msg (format-spec
+                 (cond (host "\
+%w requires Git %m or greater, but on %h the version is %v.
+
+If multiple Git versions are installed on the host, then the
+problem might be that TRAMP uses the wrong executable.
+
+Check the value of `magit-remote-git-executable' and consult
+the info node `(tramp)Remote programs'.\n")
+                       (t "\
+%w requires Git %m or greater, but you are using %v.
+
+If you have multiple Git versions installed, then check the
+values of `magit-remote-git-executable' and `exec-path'.\n"))
+                 `((?w . ,(or who "Magit"))
+                   (?m . ,(or minimal magit--minimal-git))
+                   (?v . ,(magit-git-version))
+                   (?h . ,host)))))
+      (display-warning 'magit msg :error))))
+
+(defun magit--safe-git-version ()
+  "Return the Git version used for `default-directory' or an error message."
+  (magit--with-temp-process-buffer
+    (let* ((magit-git-global-arguments nil)
+           (status (magit-process-git t "version"))
+           (output (buffer-string)))
+      (cond ((not (zerop status)) output)
+            ((save-match-data
+               (and (string-match magit--git-version-regexp output)
+                    (match-string 1 output))))
+            (t output)))))
+
+(defun magit-debug-git-executable ()
+  "Display a buffer with information about `magit-git-executable'.
+Also include information about `magit-remote-git-executable'.
+See info node `(magit)Debugging Tools' for more information."
+  (interactive)
+  (with-current-buffer (get-buffer-create "*magit-git-debug*")
+    (pop-to-buffer (current-buffer))
+    (erase-buffer)
+    (insert (format "magit-remote-git-executable: %S\n"
+                    magit-remote-git-executable))
+    (insert (concat
+             (format "magit-git-executable: %S" magit-git-executable)
+             (and (not (file-name-absolute-p magit-git-executable))
+                  (format " [%S]" (executable-find magit-git-executable)))
+             (format " (%s)\n" (magit--safe-git-version))))
+    (insert (format "exec-path: %S\n" exec-path))
+    (when-let ((diff (cl-set-difference
+                      (seq-filter #'file-exists-p (remq nil (parse-colon-path
+                                                             (getenv "PATH"))))
+                      (seq-filter #'file-exists-p (remq nil exec-path))
+                      :test #'file-equal-p)))
+      (insert (format "  entries in PATH, but not in exec-path: %S\n" diff)))
+    (dolist (execdir exec-path)
+      (insert (format "  %s (%s)\n" execdir (car (file-attributes execdir))))
+      (when (file-directory-p execdir)
+        (dolist (exec (directory-files
+                       execdir t (concat
+                                  "\\`git" (regexp-opt exec-suffixes) "\\'")))
+          (insert (format "    %s (%s)\n" exec
+                          (magit--safe-git-version))))))))
+
+;;; Variables
+
+(defun magit-config-get-from-cached-list (key)
+  (gethash
+   ;; `git config --list' downcases first and last components of the key.
+   (let* ((key (replace-regexp-in-string "\\`[^.]+" #'downcase key t t))
+          (key (replace-regexp-in-string "[^.]+\\'" #'downcase key t t)))
+     key)
+   (magit--with-refresh-cache (cons (magit-toplevel) 'config)
+     (let ((configs (make-hash-table :test #'equal)))
+       (dolist (conf (magit-git-items "config" "--list" "-z"))
+         (let* ((nl-pos (cl-position ?\n conf))
+                (key (substring conf 0 nl-pos))
+                (val (if nl-pos (substring conf (1+ nl-pos)) "")))
+           (puthash key (nconc (gethash key configs) (list val)) configs)))
+       configs))))
+
+(defun magit-get (&rest keys)
+  "Return the value of the Git variable specified by KEYS."
+  (car (last (apply #'magit-get-all keys))))
+
+(defun magit-get-all (&rest keys)
+  "Return all values of the Git variable specified by KEYS."
+  (let ((magit-git-debug nil)
+        (arg (and (or (null (car keys))
+                      (string-prefix-p "--" (car keys)))
+                  (pop keys)))
+        (key (string-join keys ".")))
+    (if (and magit--refresh-cache (not arg))
+        (magit-config-get-from-cached-list key)
+      (magit-git-items "config" arg "-z" "--get-all" "--include" key))))
+
+(defun magit-get-boolean (&rest keys)
+  "Return the boolean value of the Git variable specified by KEYS.
+Also see `magit-git-config-p'."
+  (let ((arg (and (or (null (car keys))
+                      (string-prefix-p "--" (car keys)))
+                  (pop keys)))
+        (key (string-join keys ".")))
+    (equal (if magit--refresh-cache
+               (car (last (magit-config-get-from-cached-list key)))
+             (magit-git-str "config" arg "--bool" "--include" key))
+           "true")))
+
+(defun magit-set (value &rest keys)
+  "Set the value of the Git variable specified by KEYS to VALUE."
+  (let ((arg (and (or (null (car keys))
+                      (string-prefix-p "--" (car keys)))
+                  (pop keys)))
+        (key (string-join keys ".")))
+    (if value
+        (magit-git-success "config" arg key value)
+      (magit-git-success "config" arg "--unset" key))
+    value))
+
+(gv-define-setter magit-get (val &rest keys)
+  `(magit-set ,val ,@keys))
+
+(defun magit-set-all (values &rest keys)
+  "Set all values of the Git variable specified by KEYS to VALUES."
+  (let ((arg (and (or (null (car keys))
+                      (string-prefix-p "--" (car keys)))
+                  (pop keys)))
+        (var (string-join keys ".")))
+    (when (magit-get var)
+      (magit-call-git "config" arg "--unset-all" var))
+    (dolist (v values)
+      (magit-call-git "config" arg "--add" var v))))
+
+;;; Files
+
+(defun magit--safe-default-directory (&optional file)
+  (catch 'unsafe-default-dir
+    (let ((dir (file-name-as-directory
+                (expand-file-name (or file default-directory))))
+          (previous nil))
+      (while (not (file-accessible-directory-p dir))
+        (setq dir (file-name-directory (directory-file-name dir)))
+        (when (equal dir previous)
+          (throw 'unsafe-default-dir nil))
+        (setq previous dir))
+      dir)))
+
+(defmacro magit--with-safe-default-directory (file &rest body)
+  (declare (indent 1) (debug (form body)))
+  `(when-let ((default-directory (magit--safe-default-directory ,file)))
+     ,@body))
+
+(defun magit-git-dir (&optional path)
+  "Like (expand-file-name PATH (magit-gitdir)) or just (magit-gitdir)."
+  (declare (obsolete 'magit-gitdir "Magit 4.0.0"))
+  (and-let* ((dir (magit-gitdir)))
+    (if path
+        (expand-file-name (convert-standard-filename path) dir)
+      dir)))
+
+(defun magit-gitdir (&optional directory)
+  "Return the absolute and resolved path of the .git directory.
+
+If the `GIT_DIR' environment variable is defined, return that.
+Otherwise return the .git directory for DIRECTORY, or if that is
+nil, then for `default-directory' instead.  If the directory is
+not located inside a Git repository, then return nil."
+  (let ((default-directory (or directory default-directory)))
+    (magit--with-refresh-cache (list default-directory 'magit-gitdir)
+      (magit--with-safe-default-directory nil
+        (and-let*
+            ((dir (magit-rev-parse-safe "--git-dir"))
+             (dir (file-name-as-directory (magit-expand-git-file-name dir))))
+          (if (file-remote-p dir)
+              dir
+            (concat (file-remote-p default-directory) dir)))))))
+
+(defvar magit--separated-gitdirs nil)
+
+(defun magit--record-separated-gitdir ()
+  (let ((topdir (magit-toplevel))
+        (gitdir (magit-gitdir)))
+    ;; Kludge: git-annex converts submodule gitdirs to symlinks. See #3599.
+    (when (file-symlink-p (directory-file-name gitdir))
+      (setq gitdir (file-truename gitdir)))
+    ;; We want to delete the entry for `topdir' here, rather than within
+    ;; (unless ...), in case a `--separate-git-dir' repository was switched to
+    ;; the standard structure (i.e., "topdir/.git/").
+    (setq magit--separated-gitdirs (cl-delete topdir
+                                              magit--separated-gitdirs
+                                              :key #'car :test #'equal))
+    (unless (equal (file-name-as-directory (expand-file-name ".git" topdir))
+                   gitdir)
+      (push (cons topdir gitdir) magit--separated-gitdirs))))
+
+(defun magit-toplevel (&optional directory)
+  "Return the absolute path to the toplevel of the current repository.
+
+From within the working tree or control directory of a repository
+return the absolute path to the toplevel directory of the working
+tree.  As a special case, from within a bare repository return
+the control directory instead.  When called outside a repository
+then return nil.
+
+When optional DIRECTORY is non-nil then return the toplevel for
+that directory instead of the one for `default-directory'.
+
+Try to respect the option `find-file-visit-truename', i.e.,  when
+the value of that option is nil, then avoid needlessly returning
+the truename.  When a symlink to a sub-directory of the working
+tree is involved, or when called from within a sub-directory of
+the gitdir or from the toplevel of a gitdir, which itself is not
+located within the working tree, then it is not possible to avoid
+returning the truename."
+  (or
+   (magit--with-refresh-cache
+       (cons (or directory default-directory) 'magit-toplevel)
+     (magit--with-safe-default-directory directory
+       (if-let ((topdir (magit-rev-parse-safe "--show-toplevel")))
+           (let (updir)
+             (setq topdir (magit-expand-git-file-name topdir))
+             (cond
+              ((and
+                ;; Always honor these settings.
+                (not find-file-visit-truename)
+                (not (getenv "GIT_WORK_TREE"))
+                ;; `--show-cdup' is the relative path to the toplevel
+                ;; from `(file-truename default-directory)'.  Here we
+                ;; pretend it is relative to `default-directory', and
+                ;; go to that directory.  Then we check whether
+                ;; `--show-toplevel' still returns the same value and
+                ;; whether `--show-cdup' now is the empty string.  If
+                ;; both is the case, then we are at the toplevel of
+                ;; the same working tree, but also avoided needlessly
+                ;; following any symlinks.
+                (progn
+                  (setq updir (file-name-as-directory
+                               (magit-rev-parse-safe "--show-cdup")))
+                  (setq updir (if (file-name-absolute-p updir)
+                                  (concat (file-remote-p default-directory)
+                                          updir)
+                                (expand-file-name updir)))
+                  (and-let*
+                      ((default-directory updir)
+                       (top (and (string-equal
+                                  (magit-rev-parse-safe "--show-cdup") "")
+                                 (magit-rev-parse-safe "--show-toplevel"))))
+                    (string-equal (magit-expand-git-file-name top) topdir))))
+               updir)
+              ((concat (file-remote-p default-directory)
+                       (file-name-as-directory topdir)))))
+         (and-let* ((gitdir (magit-rev-parse-safe "--git-dir"))
+                    (gitdir (file-name-as-directory
+                             (if (file-name-absolute-p gitdir)
+                                 ;; We might have followed a symlink.
+                                 (concat (file-remote-p default-directory)
+                                         (magit-expand-git-file-name gitdir))
+                               (expand-file-name gitdir)))))
+           (if (magit-bare-repo-p)
+               gitdir
+             (let* ((link (expand-file-name "gitdir" gitdir))
+                    (wtree (and (file-exists-p link)
+                                (magit-file-line link))))
+               (cond
+                ((and wtree
+                      ;; Ignore .git/gitdir files that result from a
+                      ;; Git bug.  See #2364.
+                      (not (equal wtree ".git")))
+                 ;; Return the linked working tree.
+                 (concat (file-remote-p default-directory)
+                         (file-name-directory wtree)))
+                ;; The working directory may not be the parent
+                ;; directory of .git if it was set up with
+                ;; "git init --separate-git-dir".  See #2955.
+                ((car (rassoc gitdir magit--separated-gitdirs)))
+                (;; Step outside the control directory to enter the
+                 ;; working tree.
+                 (file-name-directory (directory-file-name gitdir))))))))))))
+
+(defun magit--toplevel-safe ()
+  (or (magit-toplevel)
+      (magit--not-inside-repository-error)))
+
+(defmacro magit-with-toplevel (&rest body)
+  (declare (indent defun) (debug (body)))
+  `(let ((default-directory (magit--toplevel-safe)))
+     ,@body))
+
+(define-error 'magit-outside-git-repo "Not inside Git repository")
+(define-error 'magit-corrupt-git-config "Corrupt Git configuration")
+(define-error 'magit-git-executable-not-found
+              (concat "Git executable cannot be found "
+                      "(see https://magit.vc/goto/e6a78ed2)"))
+
+(defun magit--assert-usable-git ()
+  (if (not (compat-call executable-find (magit-git-executable) t))
+      (signal 'magit-git-executable-not-found (magit-git-executable))
+    (let ((magit-git-debug
+           (lambda (err)
+             (signal 'magit-corrupt-git-config
+                     (format "%s: %s" default-directory err)))))
+      ;; This should always succeed unless there's a corrupt config
+      ;; (or at least a similarly severe failing state).  Note that
+      ;; git-config's --default is avoided because it's not available
+      ;; until Git 2.18.
+      (magit-git-string "config" "--get-color" "" "reset"))
+    nil))
+
+(defun magit--not-inside-repository-error ()
+  (magit--assert-usable-git)
+  (signal 'magit-outside-git-repo default-directory))
+
+(defun magit-inside-gitdir-p (&optional noerror)
+  "Return t if `default-directory' is below the repository directory.
+If it is below the working directory, then return nil.
+If it isn't below either, then signal an error unless NOERROR
+is non-nil, in which case return nil."
+  (and (magit--assert-default-directory noerror)
+       ;; Below a repository directory that is not located below the
+       ;; working directory "git rev-parse --is-inside-git-dir" prints
+       ;; "false", which is wrong.
+       (let ((gitdir (magit-gitdir)))
+         (cond (gitdir (file-in-directory-p default-directory gitdir))
+               (noerror nil)
+               ((signal 'magit-outside-git-repo default-directory))))))
+
+(defun magit-inside-worktree-p (&optional noerror)
+  "Return t if `default-directory' is below the working directory.
+If it is below the repository directory, then return nil.
+If it isn't below either, then signal an error unless NOERROR
+is non-nil, in which case return nil."
+  (and (magit--assert-default-directory noerror)
+       (condition-case nil
+           (magit-rev-parse-true "--is-inside-work-tree")
+         (magit-invalid-git-boolean
+          (and (not noerror)
+               (signal 'magit-outside-git-repo default-directory))))))
+
+(cl-defgeneric magit-bare-repo-p (&optional noerror)
+  "Return t if the current repository is bare.
+If it is non-bare, then return nil.  If `default-directory'
+isn't below a Git repository, then signal an error unless
+NOERROR is non-nil, in which case return nil."
+  (and (magit--assert-default-directory noerror)
+       (condition-case nil
+           (magit-rev-parse-true "--is-bare-repository")
+         (magit-invalid-git-boolean
+          (and (not noerror)
+               (signal 'magit-outside-git-repo default-directory))))))
+
+(defun magit--assert-default-directory (&optional noerror)
+  (or (file-directory-p default-directory)
+      (and (not noerror)
+           (let ((exists (file-exists-p default-directory)))
+             (signal (if exists 'file-error 'file-missing)
+                     (list "Running git in directory"
+                           (if exists
+                               "Not a directory"
+                             "No such file or directory")
+                           default-directory))))))
+
+(defun magit-git-repo-p (directory &optional non-bare)
+  "Return t if DIRECTORY is a Git repository.
+When optional NON-BARE is non-nil also return nil if DIRECTORY is
+a bare repository."
+  (and (file-directory-p directory) ; Avoid archives, see #3397.
+       (or (file-regular-p (expand-file-name ".git" directory))
+           (file-directory-p (expand-file-name ".git" directory))
+           (and (not non-bare)
+                (file-regular-p (expand-file-name "HEAD" directory))
+                (file-directory-p (expand-file-name "refs" directory))
+                (file-directory-p (expand-file-name "objects" directory))))))
+
+(defun magit-file-relative-name (&optional file tracked)
+  "Return the path of FILE relative to the repository root.
+
+If optional FILE is nil or omitted, return the relative path of
+the file being visited in the current buffer, if any, else nil.
+If the file is not inside a Git repository, then return nil.
+
+If TRACKED is non-nil, return the path only if it matches a
+tracked file."
+  (unless file
+    (with-current-buffer (or (buffer-base-buffer)
+                             (current-buffer))
+      (setq file (or magit-buffer-file-name buffer-file-name
+                     (and (derived-mode-p 'dired-mode) default-directory)))))
+  (when (and file (or (not tracked)
+                      (magit-file-tracked-p (file-relative-name file))))
+    (and-let* ((dir (magit-toplevel
+                     (magit--safe-default-directory
+                      (directory-file-name (file-name-directory file))))))
+      (file-relative-name file dir))))
+
+(defun magit-file-ignored-p (file)
+  (magit-git-string-p "ls-files" "--others" "--ignored" "--exclude-standard"
+                      "--" (magit-convert-filename-for-git file)))
+
+(defun magit-file-tracked-p (file)
+  (magit-git-success "ls-files" "--error-unmatch"
+                     "--" (magit-convert-filename-for-git file)))
+
+(defun magit-list-files (&rest args)
+  (apply #'magit-git-items "ls-files" "-z" "--full-name" args))
+
+(defun magit-tracked-files ()
+  (magit-list-files "--cached"))
+
+(defun magit-untracked-files (&optional all files compact)
+  (if compact
+      (--mapcat (and (eq (aref it 0) ??)
+                     (list (substring it 3)))
+                (magit-git-items "status" "-z" "--porcelain"
+                                 (magit-ignore-submodules-p t)
+                                 "--" files))
+    (magit-list-files "--other"
+                      (and (not all) "--exclude-standard")
+                      "--" files)))
+
+(defun magit-modified-files (&optional nomodules files)
+  (magit-git-items "diff-index" "-z" "--name-only"
+                   ;; Work around a bug in Git v2.46.0. See #5212 and #5221.
+                   (if nomodules "--ignore-submodules" "--submodule=short")
+                   (magit-headish) "--" files))
+
+(defun magit-unstaged-files (&optional nomodules files)
+  (magit-git-items "diff-files" "-z" "--name-only" "--diff-filter=u"
+                   ;; Work around a bug in Git v2.46.0. See #5212 and #5221.
+                   (if nomodules "--ignore-submodules" "--submodule=short")
+                   "--" files))
+
+(defun magit-staged-files (&optional nomodules files)
+  (magit-git-items "diff-index" "-z" "--name-only" "--cached"
+                   ;; Work around a bug in Git v2.46.0. See #5212 and #5221.
+                   (if nomodules "--ignore-submodules" "--submodule=short")
+                   (magit-headish) "--" files))
+
+(defun magit-binary-files (&rest args)
+  (--mapcat (and (string-match "^-\t-\t\\(.+\\)" it)
+                 (list (match-string 1 it)))
+            (apply #'magit-git-items
+                   "diff" "-z" "--numstat" "--ignore-submodules"
+                   args)))
+
+(defun magit-unmerged-files ()
+  (magit-git-items "diff-files" "-z" "--name-only" "--diff-filter=U"))
+
+(defun magit-ignored-files ()
+  (magit-git-items "ls-files" "-z" "--others" "--ignored"
+                   "--exclude-standard" "--directory"))
+
+(defun magit-stashed-files (stash)
+  (magit-git-items "stash" "show" "-z" "--name-only" stash))
+
+(defun magit-skip-worktree-files ()
+  (--keep (and (= (aref it 0) ?S)
+               (substring it 2))
+          (magit-list-files "-t")))
+
+(defun magit-assume-unchanged-files ()
+  (--keep (and (memq (aref it 0) '(?h ?s ?m ?r ?c ?k))
+               (substring it 2))
+          (magit-list-files "-v")))
+
+(defun magit-revision-files (rev)
+  (magit-with-toplevel
+    (magit-git-items "ls-tree" "-z" "-r" "--name-only" rev)))
+
+(defun magit-revision-directories (rev)
+  "List directories that contain a tracked file in revision REV."
+  (magit-with-toplevel
+    (mapcar #'file-name-as-directory
+            (magit-git-items "ls-tree" "-z" "-r" "-d" "--name-only" rev))))
+
+(defun magit-changed-files (rev-or-range &optional other-rev)
+  "Return list of files the have changed between two revisions.
+If OTHER-REV is non-nil, REV-OR-RANGE should be a revision, not a
+range.  Otherwise, it can be any revision or range accepted by
+\"git diff\" (i.e., <rev>, <revA>..<revB>, or <revA>...<revB>)."
+  (magit-with-toplevel
+    (magit-git-items "diff" "-z" "--name-only" rev-or-range other-rev)))
+
+(defun magit-renamed-files (revA revB)
+  (mapcar (pcase-lambda (`(,_status ,fileA ,fileB))
+            (cons fileA fileB))
+          (seq-partition (magit-git-items "diff" "-z" "--name-status"
+                                          "--find-renames"
+                                          "--diff-filter=R" revA revB)
+                         3)))
+
+(defun magit--rev-file-name (file rev other-rev)
+  "For FILE, potentially renamed between REV and OTHER-REV, return name in REV.
+Return nil, if FILE appears neither in REV nor OTHER-REV,
+or if no rename is detected."
+  (or (car (member file (magit-revision-files rev)))
+      (and-let* ((renamed (magit-renamed-files rev other-rev)))
+        (car (rassoc file renamed)))))
+
+(defun magit-file-status (&rest args)
+  (magit--with-temp-process-buffer
+    (save-excursion (magit-git-insert "status" "-z" args))
+    (let ((pos (point)) status)
+      (while (> (skip-chars-forward "[:print:]") 0)
+        (let ((x (char-after     pos))
+              (y (char-after (1+ pos)))
+              (file (buffer-substring (+ pos 3) (point))))
+          (forward-char)
+          (if (memq x '(?R ?C))
+              (progn
+                (setq pos (point))
+                (skip-chars-forward "[:print:]")
+                (push (list file (buffer-substring pos (point)) x y) status)
+                (forward-char))
+            (push (list file nil x y) status)))
+        (setq pos (point)))
+      status)))
+
+(defcustom magit-cygwin-mount-points
+  (and (eq system-type 'windows-nt)
+       (cl-sort (--map (if (string-match "^\\(.*\\) on \\(.*\\) type" it)
+                           (cons (file-name-as-directory (match-string 2 it))
+                                 (file-name-as-directory (match-string 1 it)))
+                         (lwarn '(magit) :error
+                                "Failed to parse Cygwin mount: %S" it))
+                       ;; If --exec-path is not a native Windows path,
+                       ;; then we probably have a cygwin git.
+                       (let ((process-environment
+                              (append magit-git-environment
+                                      process-environment)))
+                         (and (not (string-match-p
+                                    "\\`[a-zA-Z]:"
+                                    (car (process-lines
+                                          magit-git-executable "--exec-path"))))
+                              (ignore-errors (process-lines "mount")))))
+                #'> :key (pcase-lambda (`(,cyg . ,_win)) (length cyg))))
+  "Alist of (CYGWIN . WIN32) directory names.
+Sorted from longest to shortest CYGWIN name."
+  :package-version '(magit . "2.3.0")
+  :group 'magit-process
+  :type '(alist :key-type string :value-type directory))
+
+(defun magit-expand-git-file-name (filename)
+  (unless (file-name-absolute-p filename)
+    (setq filename (expand-file-name filename)))
+  (if-let ((cyg:win (and (not (file-remote-p default-directory)) ; see #4976
+                         (cl-assoc filename magit-cygwin-mount-points
+                                   :test (lambda (f cyg) (string-prefix-p cyg f))))))
+      (concat (cdr cyg:win)
+              (substring filename (length (car cyg:win))))
+    filename))
+
+(defun magit-convert-filename-for-git (filename)
+  "Convert FILENAME so that it can be passed to git.
+1. If it is a absolute filename, then pass it through
+   `expand-file-name' to replace things such as \"~/\" that
+   Git does not understand.
+2. If it is a remote filename, then remove the remote part.
+3. Deal with an `windows-nt' Emacs vs. Cygwin Git incompatibility."
+  (if (file-name-absolute-p filename)
+      (if-let ((cyg:win (cl-rassoc filename magit-cygwin-mount-points
+                                   :test (lambda (f win) (string-prefix-p win f)))))
+          (concat (car cyg:win)
+                  (substring filename (length (cdr cyg:win))))
+        (let ((expanded (expand-file-name filename)))
+          (or (file-remote-p expanded 'localname)
+              expanded)))
+    filename))
+
+(defun magit-decode-git-path (path)
+  (if (eq (aref path 0) ?\")
+      (decode-coding-string (read path)
+                            (or magit-git-output-coding-system
+                                (car default-process-coding-system))
+                            t)
+    path))
+
+(defun magit-file-at-point (&optional expand assert)
+  (if-let ((file (magit-section-case
+                   (file (oref it value))
+                   (hunk (magit-section-parent-value it)))))
+      (if expand
+          (expand-file-name file (magit-toplevel))
+        file)
+    (when assert
+      (user-error "No file at point"))))
+
+(defun magit-current-file ()
+  (or (magit-file-relative-name)
+      (magit-file-at-point)
+      (and (derived-mode-p 'magit-log-mode)
+           (car magit-buffer-log-files))))
+
+;;; Predicates
+
+(defun magit-no-commit-p ()
+  "Return t if there is no commit in the current Git repository."
+  (not (magit-rev-verify "HEAD")))
+
+(defun magit-merge-commit-p (commit)
+  "Return t if COMMIT is a merge commit."
+  (length> (magit-commit-parents commit) 1))
+
+(defun magit-anything-staged-p (&optional ignore-submodules &rest files)
+  "Return t if there are any staged changes.
+If optional FILES is non-nil, then only changes to those files
+are considered."
+  (magit-git-failure "diff" "--quiet" "--cached"
+                     (if ignore-submodules
+                         "--ignore-submodules"
+                       ;; Work around a bug in Git v2.46.0. See #5212 and #5221.
+                       "--submodule=short")
+                     "--" files))
+
+(defun magit-anything-unstaged-p (&optional ignore-submodules &rest files)
+  "Return t if there are any unstaged changes.
+If optional FILES is non-nil, then only changes to those files
+are considered."
+  (magit-git-failure "diff" "--quiet"
+                     (if ignore-submodules
+                         "--ignore-submodules"
+                       ;; Work around a bug in Git v2.46.0. See #5212 and #5221.
+                       "--submodule=short")
+                     "--" files))
+
+(defun magit-anything-modified-p (&optional ignore-submodules &rest files)
+  "Return t if there are any staged or unstaged changes.
+If optional FILES is non-nil, then only changes to those files
+are considered."
+  (or (apply #'magit-anything-staged-p   ignore-submodules files)
+      (apply #'magit-anything-unstaged-p ignore-submodules files)))
+
+(defun magit-anything-unmerged-p (&rest files)
+  "Return t if there are any merge conflicts.
+If optional FILES is non-nil, then only conflicts in those files
+are considered."
+  (and (magit-git-string "ls-files" "--unmerged" files) t))
+
+(defun magit-module-worktree-p (module)
+  (magit-with-toplevel
+    (file-exists-p (expand-file-name ".git" module))))
+
+(defun magit-module-no-worktree-p (module)
+  (not (magit-module-worktree-p module)))
+
+(defun magit-ignore-submodules-p (&optional return-argument)
+  (or (cl-find-if (lambda (arg)
+                    (string-prefix-p "--ignore-submodules" arg))
+                  magit-buffer-diff-args)
+      (and-let* ((value (magit-get "diff.ignoreSubmodules")))
+        (if return-argument
+            (concat "--ignore-submodules=" value)
+          (concat "diff.ignoreSubmodules=" value)))))
+
+;;; Revisions and References
+
+(defun magit-rev-parse (&rest args)
+  "Execute `git rev-parse ARGS', returning first line of output.
+If there is no output, return nil."
+  (apply #'magit-git-string "rev-parse" args))
+
+(defun magit-rev-parse-safe (&rest args)
+  "Execute `git rev-parse ARGS', returning first line of output.
+If there is no output, return nil.  Like `magit-rev-parse' but
+ignore `magit-git-debug'."
+  (apply #'magit-git-str "rev-parse" args))
+
+(defun magit-rev-parse-true (&rest args)
+  "Execute `git rev-parse ARGS', returning t if it prints \"true\".
+If it prints \"false\", then return nil.  For any other output
+signal an error."
+  (magit-git-true "rev-parse" args))
+
+(defun magit-rev-parse-false (&rest args)
+  "Execute `git rev-parse ARGS', returning t if it prints \"false\".
+If it prints \"true\", then return nil.  For any other output
+signal an error."
+  (magit-git-false "rev-parse" args))
+
+(defun magit-rev-parse-p (&rest args)
+  "Execute `git rev-parse ARGS', returning t if it prints \"true\".
+Return t if the first (and usually only) output line is the
+string \"true\", otherwise return nil."
+  (equal (magit-git-str "rev-parse" args) "true"))
+
+(defun magit-rev-verify (rev)
+  (magit-git-string-p "rev-parse" "--verify" rev))
+
+(defun magit-commit-p (rev)
+  "Return full hash for REV if it names an existing commit."
+  (magit-rev-verify (magit--rev-dereference rev)))
+
+(defalias 'magit-rev-verify-commit #'magit-commit-p)
+
+(defalias 'magit-rev-hash #'magit-commit-p)
+
+(defun magit--rev-dereference (rev)
+  "Return a rev that forces Git to interpret REV as a commit.
+If REV is nil or has the form \":/TEXT\", return REV itself."
+  (cond ((not rev) nil)
+        ((string-match-p "^:/" rev) rev)
+        ((concat rev "^{commit}"))))
+
+(defun magit-rev-equal (a b)
+  "Return t if there are no differences between the commits A and B."
+  (magit-git-success "diff" "--quiet" a b))
+
+(defun magit-rev-eq (a b)
+  "Return t if A and B refer to the same commit."
+  (let ((a (magit-commit-p a))
+        (b (magit-commit-p b)))
+    (and a b (equal a b))))
+
+(defun magit-rev-ancestor-p (a b)
+  "Return non-nil if commit A is an ancestor of commit B."
+  (magit-git-success "merge-base" "--is-ancestor" a b))
+
+(defun magit-rev-head-p (rev)
+  (or (equal rev "HEAD")
+      (and rev
+           (not (string-search ".." rev))
+           (equal (magit-rev-parse rev)
+                  (magit-rev-parse "HEAD")))))
+
+(defun magit-rev-author-p (rev)
+  "Return t if the user is the author of REV.
+More precisely return t if `user.name' is equal to the author
+name of REV and/or `user.email' is equal to the author email
+of REV."
+  (or (equal (magit-get "user.name")  (magit-rev-format "%an" rev))
+      (equal (magit-get "user.email") (magit-rev-format "%ae" rev))))
+
+(defun magit-rev-name (rev &optional pattern not-anchored)
+  "Return a symbolic name for REV using `git-name-rev'.
+
+PATTERN can be used to limit the result to a matching ref.
+Unless NOT-ANCHORED is non-nil, the beginning of the ref must
+match PATTERN.
+
+An anchored lookup is done using the arguments
+\"--exclude=*/<PATTERN> --exclude=*/HEAD\" in addition to
+\"--refs=<PATTERN>\", provided at least version v2.13 of Git is
+used.  Older versions did not support the \"--exclude\" argument.
+When \"--exclude\" cannot be used and `git-name-rev' returns a
+ref that should have been excluded, then that is discarded and
+this function returns nil instead.  This is unfortunate because
+there might be other refs that do match.  To fix that, update
+Git."
+  (if (magit-git-version< "2.13")
+      (and-let*
+          ((ref (magit-git-string "name-rev" "--name-only" "--no-undefined"
+                                  (and pattern (concat "--refs=" pattern))
+                                  rev)))
+        (if (and pattern
+                 (string-match-p "\\`refs/[^/]+/\\*\\'" pattern))
+            (let ((namespace (substring pattern 0 -1)))
+              (and (not (or (string-suffix-p "HEAD" ref)
+                            (and (string-match-p namespace ref)
+                                 (not (magit-rev-verify
+                                       (concat namespace ref))))))
+                   ref))
+          ref))
+    (magit-git-string "name-rev" "--name-only" "--no-undefined"
+                      (and pattern (concat "--refs=" pattern))
+                      (and pattern
+                           (not not-anchored)
+                           (list "--exclude=*/HEAD"
+                                 (concat "--exclude=*/" pattern)))
+                      rev)))
+
+(defun magit-rev-branch (rev)
+  (and-let* ((name (magit-rev-name rev "refs/heads/*")))
+    (and (not (string-match-p "[~^]" name)) name)))
+
+(defun magit-rev-fixup-target (rev)
+  (let ((msg (magit-rev-format "%s" rev)))
+    (save-match-data
+      (and (string-match "\\`\\(fixup\\|squash\\)! \\(.+\\)" msg)
+           (magit-rev-format
+            "%h" (format "%s^{/^%s}" rev
+                         (magit--ext-regexp-quote (match-string 2 msg))))))))
+
+(defun magit-get-shortname (rev)
+  (let* ((fn (apply-partially #'magit-rev-name rev))
+         (name (or (funcall fn "refs/tags/*")
+                   (funcall fn "refs/heads/*")
+                   (funcall fn "refs/remotes/*"))))
+    (cond ((not name)
+           (magit-rev-parse "--short" rev))
+          ((string-match "^\\(?:tags\\|remotes\\)/\\(.+\\)" name)
+           (if (magit-ref-ambiguous-p (match-string 1 name))
+               name
+             (match-string 1 name)))
+          ((magit-ref-maybe-qualify name)))))
+
+(defun magit-name-branch (rev &optional lax)
+  (or (magit-name-local-branch rev)
+      (magit-name-remote-branch rev)
+      (and lax (or (magit-name-local-branch rev t)
+                   (magit-name-remote-branch rev t)))))
+
+(defun magit-name-local-branch (rev &optional lax)
+  (and-let* ((name (magit-rev-name rev "refs/heads/*")))
+    (and (or lax (not (string-match-p "[~^]" name))) name)))
+
+(defun magit-name-remote-branch (rev &optional lax)
+  (and-let* ((name (magit-rev-name rev "refs/remotes/*")))
+    (and (or lax (not (string-match-p "[~^]" name)))
+         (substring name 8))))
+
+(defun magit-name-tag (rev &optional lax)
+  (and-let* ((name (magit-rev-name rev "refs/tags/*")))
+    ;; The progn is necessary to work around debbugs#31840.  This, and all
+    ;; the other instances, can be removed once we require at least Emacs 27.
+    (progn
+      (when (string-suffix-p "^0" name)
+        (setq name (substring name 0 -2)))
+      (and (or lax (not (string-match-p "[~^]" name)))
+           (substring name 5)))))
+
+(defun magit-ref-abbrev (refname)
+  "Return an unambiguous abbreviation of REFNAME."
+  (magit-rev-parse "--verify" "--abbrev-ref" refname))
+
+(defun magit-ref-fullname (refname)
+  "Return fully qualified refname for REFNAME.
+If REFNAME is ambiguous, return nil."
+  (magit-rev-parse "--verify" "--symbolic-full-name" refname))
+
+(defun magit-ref-ambiguous-p (refname)
+  (save-match-data
+    (if (string-match "\\`\\([^^~]+\\)\\(.*\\)" refname)
+        (not (magit-ref-fullname (match-string 1 refname)))
+      (error "%S has an unrecognized format" refname))))
+
+(defun magit-ref-maybe-qualify (refname &optional prefix)
+  "If REFNAME is ambiguous, try to disambiguate it by prepend PREFIX to it.
+Return an unambiguous refname, either REFNAME or that prefixed
+with PREFIX, nil otherwise.  If REFNAME has an offset suffix
+such as \"~1\", then that is preserved.  If optional PREFIX is
+nil, then use \"heads/\".  "
+  (if (magit-ref-ambiguous-p refname)
+      (let ((refname (concat (or prefix "heads/") refname)))
+        (and (not (magit-ref-ambiguous-p refname)) refname))
+    refname))
+
+(defun magit-ref-exists-p (ref)
+  (magit-git-success "show-ref" "--verify" ref))
+
+(defun magit-ref-equal (a b)
+  "Return t if the refnames A and B are `equal'.
+A symbolic-ref pointing to some ref, is `equal' to that ref,
+as are two symbolic-refs pointing to the same ref.  Refnames
+may be abbreviated."
+  (let ((a (magit-ref-fullname a))
+        (b (magit-ref-fullname b)))
+    (and a b (equal a b))))
+
+(defun magit-ref-eq (a b)
+  "Return t if the refnames A and B are `eq'.
+A symbolic-ref is `eq' to itself, but not to the ref it points
+to, or to some other symbolic-ref that points to the same ref."
+  (let ((symbolic-a (magit-symbolic-ref-p a))
+        (symbolic-b (magit-symbolic-ref-p b)))
+    (or (and symbolic-a
+             symbolic-b
+             (equal a b))
+        (and (not symbolic-a)
+             (not symbolic-b)
+             (magit-ref-equal a b)))))
+
+(defun magit-headish ()
+  "Return the `HEAD' or if that doesn't exist the hash of the empty tree."
+  (if (magit-no-commit-p)
+      (magit-git-string "mktree")
+    "HEAD"))
+
+(defun magit-branch-at-point ()
+  (magit-section-case
+    (branch (oref it value))
+    (commit (or (magit--painted-branch-at-point)
+                (magit-name-branch (oref it value))))))
+
+(defun magit--painted-branch-at-point (&optional type)
+  (or (and (not (eq type 'remote))
+           (memq (get-text-property (magit-point) 'font-lock-face)
+                 (list 'magit-branch-local
+                       'magit-branch-current))
+           (and-let* ((branch (magit-thing-at-point 'git-revision t)))
+             (cdr (magit-split-branch-name branch))))
+      (and (not (eq type 'local))
+           (memq (get-text-property (magit-point) 'font-lock-face)
+                 (list 'magit-branch-remote
+                       'magit-branch-remote-head))
+           (thing-at-point 'git-revision t))))
+
+(defun magit-local-branch-at-point ()
+  (magit-section-case
+    (branch (let ((branch (magit-ref-maybe-qualify (oref it value))))
+              (when (member branch (magit-list-local-branch-names))
+                branch)))
+    (commit (or (magit--painted-branch-at-point 'local)
+                (magit-name-local-branch (oref it value))))))
+
+(defun magit-remote-branch-at-point ()
+  (magit-section-case
+    (branch (let ((branch (oref it value)))
+              (when (member branch (magit-list-remote-branch-names))
+                branch)))
+    (commit (or (magit--painted-branch-at-point 'remote)
+                (magit-name-remote-branch (oref it value))))))
+
+(defun magit-commit-at-point ()
+  (or (magit-section-value-if 'commit)
+      (magit-thing-at-point 'git-revision t)
+      (and-let* ((chunk (and (bound-and-true-p magit-blame-mode)
+                             (fboundp 'magit-current-blame-chunk)
+                             (magit-current-blame-chunk))))
+        (oref chunk orig-rev))
+      (and (derived-mode-p 'magit-stash-mode
+                           'magit-merge-preview-mode
+                           'magit-revision-mode)
+           magit-buffer-revision)))
+
+(defun magit-branch-or-commit-at-point ()
+  (or (magit-section-case
+        (branch (magit-ref-maybe-qualify (oref it value)))
+        (commit (or (magit--painted-branch-at-point)
+                    (let ((rev (oref it value)))
+                      (or (magit-name-branch rev) rev))))
+        (tag (magit-ref-maybe-qualify (oref it value) "tags/"))
+        (pullreq (or (and (fboundp 'forge--pullreq-branch)
+                          (magit-branch-p
+                           (forge--pullreq-branch (oref it value))))
+                     (magit-ref-p (format "refs/pullreqs/%s"
+                                          (oref (oref it value) number)))))
+        ((unpulled unpushed)
+         (magit-ref-abbrev
+          (replace-regexp-in-string "\\.\\.\\.?" "" (oref it value)))))
+      (magit-thing-at-point 'git-revision t)
+      (and-let* ((chunk (and (bound-and-true-p magit-blame-mode)
+                             (fboundp 'magit-current-blame-chunk)
+                             (magit-current-blame-chunk))))
+        (oref chunk orig-rev))
+      (and magit-buffer-file-name
+           magit-buffer-refname)
+      (and (derived-mode-p 'magit-stash-mode
+                           'magit-merge-preview-mode
+                           'magit-revision-mode)
+           magit-buffer-revision)))
+
+(defun magit-tag-at-point ()
+  (magit-section-case
+    (tag    (oref it value))
+    (commit (magit-name-tag (oref it value)))))
+
+(defun magit-stash-at-point ()
+  (magit-section-value-if 'stash))
+
+(defun magit-remote-at-point ()
+  (magit-section-case
+    (remote (oref it value))
+    ([branch remote] (magit-section-parent-value it))))
+
+(defun magit-module-at-point (&optional predicate)
+  (when (magit-section-match 'module)
+    (let ((module (oref (magit-current-section) value)))
+      (and (or (not predicate)
+               (funcall predicate module))
+           module))))
+
+(defun magit-get-current-branch ()
+  "Return the refname of the currently checked out branch.
+Return nil if no branch is currently checked out."
+  (magit-git-string "symbolic-ref" "--short" "HEAD"))
+
+(defvar magit-get-previous-branch-timeout 0.5
+  "Maximum time to spend in `magit-get-previous-branch'.
+Given as a number of seconds.")
+
+(defun magit-get-previous-branch ()
+  "Return the refname of the previously checked out branch.
+Return nil if no branch can be found in the `HEAD' reflog
+which is different from the current branch and still exists.
+The amount of time spent searching is limited by
+`magit-get-previous-branch-timeout'."
+  (let ((t0 (float-time))
+        (current (magit-get-current-branch))
+        (i 1) prev)
+    (while (if (> (- (float-time) t0) magit-get-previous-branch-timeout)
+               (setq prev nil) ;; Timed out.
+             (and (setq prev (magit-rev-verify (format "@{-%d}" i)))
+                  (or (not (setq prev (magit-rev-branch prev)))
+                      (equal prev current))))
+      (cl-incf i))
+    prev))
+
+(defun magit--set-default-branch (newname oldname)
+  (let ((remote (or (magit-primary-remote)
+                    (user-error "Cannot determine primary remote")))
+        (branches (mapcar (lambda (line) (split-string line "\t"))
+                          (magit-git-lines
+                           "for-each-ref" "refs/heads"
+                           "--format=%(refname:short)\t%(upstream:short)"))))
+    (when-let ((old (assoc oldname branches)))
+      (unless (assoc newname branches)
+        (magit-call-git "branch" "-m" oldname newname)
+        (setcar old newname)))
+    (let ((new (if (magit-branch-p newname)
+                   newname
+                 (concat remote "/" newname))))
+      (pcase-dolist (`(,branch ,upstream) branches)
+        (cond
+         ((equal upstream oldname)
+          (magit-set-upstream-branch branch new))
+         ((equal upstream (concat remote "/" oldname))
+          (magit-set-upstream-branch branch (concat remote "/" newname))))))))
+
+(defun magit--get-default-branch (&optional update)
+  (let ((remote (magit-primary-remote)))
+    (when update
+      (if (not remote)
+          (user-error "Cannot determine primary remote")
+        (message "Determining default branch...")
+        (magit-git "fetch" "--prune")
+        (magit-git "remote" "set-head" "--auto" remote)
+        (message "Determining default branch...done")))
+    (let ((branch (magit-git-string "symbolic-ref" "--short"
+                                    (format "refs/remotes/%s/HEAD" remote))))
+      (when (and update (not branch))
+        (error "Cannot determine new default branch"))
+      (list remote (and branch (cdr (magit-split-branch-name branch)))))))
+
+(defun magit-set-upstream-branch (branch upstream)
+  "Set UPSTREAM as the upstream of BRANCH.
+If UPSTREAM is nil, then unset BRANCH's upstream.
+Otherwise UPSTREAM has to be an existing branch."
+  (if upstream
+      (magit-call-git "branch" "--set-upstream-to" upstream branch)
+    (magit-call-git "branch" "--unset-upstream" branch)))
+
+(defun magit-get-upstream-ref (&optional branch)
+  "Return the upstream branch of BRANCH as a fully qualified ref.
+It BRANCH is nil, then return the upstream of the current branch,
+if any, nil otherwise.  If the upstream is not configured, the
+configured remote is an url, or the named branch does not exist,
+then return nil.  I.e.,  return an existing local or
+remote-tracking branch ref."
+  (and-let* ((branch (or branch (magit-get-current-branch))))
+    (magit-ref-fullname (concat branch "@{upstream}"))))
+
+(defun magit-get-upstream-branch (&optional branch)
+  "Return the name of the upstream branch of BRANCH.
+It BRANCH is nil, then return the upstream of the current branch
+if any, nil otherwise.  If the upstream is not configured, the
+configured remote is an url, or the named branch does not exist,
+then return nil.  I.e., return the name of an existing local or
+remote-tracking branch.  The returned string is colorized
+according to the branch type."
+  (magit--with-refresh-cache
+      (list default-directory 'magit-get-upstream-branch branch)
+    (and-let* ((branch (or branch (magit-get-current-branch)))
+               (upstream (magit-ref-abbrev (concat branch "@{upstream}"))))
+      (magit--propertize-face
+       upstream (if (equal (magit-get "branch" branch "remote") ".")
+                    'magit-branch-local
+                  'magit-branch-remote)))))
+
+(defun magit-get-indirect-upstream-branch (branch &optional force)
+  (let ((remote (magit-get "branch" branch "remote")))
+    (and remote (not (equal remote "."))
+         ;; The user has opted in...
+         (or force
+             (--some (if (magit-git-success "check-ref-format" "--branch" it)
+                         (equal it branch)
+                       (string-match-p it branch))
+                     magit-branch-prefer-remote-upstream))
+         ;; and local BRANCH tracks a remote branch...
+         (let ((upstream (magit-get-upstream-branch branch)))
+           ;; whose upstream...
+           (and upstream
+                ;; has the same name as BRANCH...
+                (equal (substring upstream (1+ (length remote))) branch)
+                ;; and can be fast-forwarded to BRANCH.
+                (magit-rev-ancestor-p upstream branch)
+                upstream)))))
+
+(defun magit-get-upstream-remote (&optional branch allow-unnamed)
+  (and-let* ((branch (or branch (magit-get-current-branch)))
+             (remote (magit-get "branch" branch "remote")))
+    (and (not (equal remote "."))
+         (cond ((member remote (magit-list-remotes))
+                (magit--propertize-face remote 'magit-branch-remote))
+               ((and allow-unnamed
+                     (string-match-p "\\(\\`.\\{0,2\\}/\\|[:@]\\)" remote))
+                (magit--propertize-face remote 'bold))))))
+
+(defun magit-get-unnamed-upstream (&optional branch)
+  (and-let* ((branch (or branch (magit-get-current-branch)))
+             (remote (magit-get "branch" branch "remote"))
+             (merge  (magit-get "branch" branch "merge")))
+    (and (magit--unnamed-upstream-p remote merge)
+         (list (magit--propertize-face remote 'bold)
+               (magit--propertize-face merge 'magit-branch-remote)))))
+
+(defun magit--unnamed-upstream-p (remote merge)
+  (and remote (string-match-p "\\(\\`\\.\\{0,2\\}/\\|[:@]\\)" remote)
+       merge  (string-prefix-p "refs/" merge)))
+
+(defun magit--valid-upstream-p (remote merge)
+  (and (or (equal remote ".")
+           (member remote (magit-list-remotes)))
+       (string-prefix-p "refs/" merge)))
+
+(defun magit-get-current-remote (&optional allow-unnamed)
+  (or (magit-get-upstream-remote nil allow-unnamed)
+      (and-let* ((remotes (magit-list-remotes))
+                 (remote (if (length= remotes 1)
+                             (car remotes)
+                           (magit-primary-remote))))
+        (magit--propertize-face remote 'magit-branch-remote))))
+
+(defun magit-get-push-remote (&optional branch)
+  (and-let* ((remote
+              (or (and (or branch (setq branch (magit-get-current-branch)))
+                       (magit-get "branch" branch "pushRemote"))
+                  (magit-get "remote.pushDefault"))))
+    (magit--propertize-face remote 'magit-branch-remote)))
+
+(defun magit-get-push-branch (&optional branch verify)
+  (magit--with-refresh-cache
+      (list default-directory 'magit-get-push-branch branch verify)
+    (and-let* ((branch (or branch (setq branch (magit-get-current-branch))))
+               (remote (magit-get-push-remote branch))
+               (target (concat remote "/" branch)))
+      (and (or (not verify)
+               (magit-rev-verify target))
+           (magit--propertize-face target 'magit-branch-remote)))))
+
+(defun magit-get-@{push}-branch (&optional branch)
+  (let ((ref (magit-rev-parse "--symbolic-full-name"
+                              (concat branch "@{push}"))))
+    (and ref
+         (string-prefix-p "refs/remotes/" ref)
+         (substring ref 13))))
+
+(defun magit-get-remote (&optional branch)
+  (and (or branch (setq branch (magit-get-current-branch)))
+       (let ((remote (magit-get "branch" branch "remote")))
+         (and (not (equal remote "."))
+              remote))))
+
+(defun magit-get-some-remote (&optional branch)
+  (or (magit-get-remote branch)
+      (and-let* ((main (magit-main-branch)))
+        (magit-get-remote main))
+      (magit-primary-remote)
+      (car (magit-list-remotes))))
+
+(defvar magit-primary-remote-names
+  '("upstream" "origin"))
+
+(defun magit-primary-remote ()
+  "Return the primary remote.
+
+The primary remote is the remote that tracks the repository that
+other repositories are forked from.  It often is called \"origin\"
+but because many people name their own fork \"origin\", using that
+term would be ambiguous.  Likewise we avoid the term \"upstream\"
+because a branch's @{upstream} branch may be a local branch or a
+branch from a remote other than the primary remote.
+
+If a remote exists whose name matches `magit.primaryRemote', then
+that is considered the primary remote.  If no remote by that name
+exists, then remotes in `magit-primary-remote-names' are tried in
+order and the first remote from that list that actually exists in
+the current repository is considered its primary remote."
+  (let ((remotes (magit-list-remotes)))
+    (seq-find (lambda (name)
+                (member name remotes))
+              (delete-dups
+               (delq nil
+                     (cons (magit-get "magit.primaryRemote")
+                           magit-primary-remote-names))))))
+
+(defun magit-branch-merged-p (branch &optional target)
+  "Return non-nil if BRANCH is merged into its upstream and TARGET.
+
+TARGET defaults to the current branch.  If `HEAD' is detached and
+TARGET is nil, then always return nil.  As a special case, if
+TARGET is t, then return non-nil if BRANCH is merged into any one
+of the other local branches.
+
+If, and only if, BRANCH has an upstream, then only return non-nil
+if BRANCH is merged into both TARGET (as described above) as well
+as into its upstream."
+  (and (if-let ((upstream (and (magit-branch-p branch)
+                               (magit-get-upstream-branch branch))))
+           (magit-rev-ancestor-p branch upstream)
+         t)
+       (if (eq target t)
+           (delete (magit-name-local-branch branch)
+                   (magit-list-containing-branches branch))
+         (and-let* ((target (or target (magit-get-current-branch))))
+           (magit-rev-ancestor-p branch target)))))
+
+(defun magit-get-tracked (refname)
+  "Return the remote branch tracked by the remote-tracking branch REFNAME.
+The returned value has the form (REMOTE . REF), where REMOTE is
+the name of a remote and REF is the ref local to the remote."
+  (and-let* ((ref (magit-ref-fullname refname)))
+    (save-match-data
+      (seq-some (lambda (line)
+                  (and (string-match "\
+\\`remote\\.\\([^.]+\\)\\.fetch=\\+?\\([^:]+\\):\\(.+\\)" line)
+                       (let ((rmt (match-string 1 line))
+                             (src (match-string 2 line))
+                             (dst (match-string 3 line)))
+                         (and (string-match (format "\\`%s\\'"
+                                                    (string-replace
+                                                     "*" "\\(.+\\)" dst))
+                                            ref)
+                              (cons rmt (string-replace
+                                         "*" (match-string 1 ref) src))))))
+                (magit-git-lines "config" "--local" "--list")))))
+
+(defun magit-split-branch-name (branch)
+  (cond ((member branch (magit-list-local-branch-names))
+         (cons "." branch))
+        ((string-match "/" branch)
+         (or (seq-some (lambda (remote)
+                         (and (string-match
+                               (format "\\`\\(%s\\)/\\(.+\\)\\'" remote)
+                               branch)
+                              (cons (match-string 1 branch)
+                                    (match-string 2 branch))))
+                       (magit-list-remotes))
+             (error "Invalid branch name %s" branch)))))
+
+(defun magit-get-current-tag (&optional rev with-distance)
+  "Return the closest tag reachable from REV.
+
+If optional REV is nil, then default to `HEAD'.
+If optional WITH-DISTANCE is non-nil then return (TAG COMMITS),
+if it is `dirty' return (TAG COMMIT DIRTY). COMMITS is the number
+of commits in `HEAD' but not in TAG and DIRTY is t if there are
+uncommitted changes, nil otherwise."
+  (and-let* ((str (magit-git-str "describe" "--long" "--tags"
+                                 (and (eq with-distance 'dirty) "--dirty")
+                                 rev)))
+    (save-match-data
+      (string-match
+       "\\(.+\\)-\\(?:0[0-9]*\\|\\([0-9]+\\)\\)-g[0-9a-z]+\\(-dirty\\)?$" str)
+      (if with-distance
+          `(,(match-string 1 str)
+            ,(string-to-number (or (match-string 2 str) "0"))
+            ,@(and (match-string 3 str) (list t)))
+        (match-string 1 str)))))
+
+(defun magit-get-next-tag (&optional rev with-distance)
+  "Return the closest tag from which REV is reachable.
+
+If optional REV is nil, then default to `HEAD'.
+If no such tag can be found or if the distance is 0 (in which
+case it is the current tag, not the next), return nil instead.
+If optional WITH-DISTANCE is non-nil, then return (TAG COMMITS)
+where COMMITS is the number of commits in TAG but not in REV."
+  (and-let* ((str (magit-git-str "describe" "--contains" (or rev "HEAD"))))
+    (save-match-data
+      (when (string-match "^[^^~]+" str)
+        (setq str (match-string 0 str))
+        (unless (equal str (magit-get-current-tag rev))
+          (if with-distance
+              (list str (car (magit-rev-diff-count str rev)))
+            str))))))
+
+(defun magit-list-refs (&optional namespaces format sortby)
+  "Return list of references, excluding symbolic references.
+
+When NAMESPACES is non-nil, list refs from these namespaces
+rather than those from `magit-list-refs-namespaces'.
+
+FORMAT is passed to the `--format' flag of `git for-each-ref'
+and defaults to \"%(refname)\".
+
+SORTBY is a key or list of keys to pass to the `--sort' flag of
+`git for-each-ref'.  When nil, use `magit-list-refs-sortby'"
+  (unless format
+    (setq format "%(refname)"))
+  (seq-keep (lambda (line)
+              (pcase-let* ((`(,symrefp ,value)
+                            (split-string line ""))
+                           (symrefp (not (equal symrefp ""))))
+                (and (not symrefp) value)))
+            (magit-git-lines "for-each-ref"
+                             (concat "--format=%(symref)" format)
+                             (--map (concat "--sort=" it)
+                                    (pcase (or sortby magit-list-refs-sortby)
+                                      ((and val (pred stringp)) (list val))
+                                      ((and val (pred listp)) val)))
+                             (or namespaces magit-list-refs-namespaces))))
+
+(defun magit-list-branches ()
+  (magit-list-refs (list "refs/heads" "refs/remotes")))
+
+(defun magit-list-local-branches ()
+  (magit-list-refs "refs/heads"))
+
+(defun magit-list-remote-branches (&optional remote)
+  (magit-list-refs (concat "refs/remotes/" remote)))
+
+(defun magit-list-related-branches (relation &optional commit &rest args)
+  (--remove (string-match-p "\\(\\`(HEAD\\|HEAD -> \\)" it)
+            (--map (substring it 2)
+                   (magit-git-lines "branch" args relation commit))))
+
+(defun magit-list-containing-branches (&optional commit &rest args)
+  (magit-list-related-branches "--contains" commit args))
+
+(defun magit-list-publishing-branches (&optional commit)
+  (--filter (magit-rev-ancestor-p (or commit "HEAD") it)
+            magit-published-branches))
+
+(defun magit-list-merged-branches (&optional commit &rest args)
+  (magit-list-related-branches "--merged" commit args))
+
+(defun magit-list-unmerged-branches (&optional commit &rest args)
+  (magit-list-related-branches "--no-merged" commit args))
+
+(defun magit-list-unmerged-to-upstream-branches ()
+  (--filter (and-let* ((upstream (magit-get-upstream-branch it)))
+              (member it (magit-list-unmerged-branches upstream)))
+            (magit-list-local-branch-names)))
+
+(defun magit-list-branches-pointing-at (commit)
+  (let ((re (format "\\`%s refs/\\(heads\\|remotes\\)/\\(.*\\)\\'"
+                    (magit-rev-verify commit))))
+    (--keep (and (string-match re it)
+                 (let ((name (match-string 2 it)))
+                   (and (not (string-suffix-p "HEAD" name))
+                        name)))
+            (magit-git-lines "show-ref"))))
+
+(defun magit-list-refnames (&optional namespaces include-special)
+  (nconc (magit-list-refs namespaces "%(refname:short)")
+         (and include-special
+              (magit-list-special-refnames))))
+
+(defvar magit-special-refnames
+  '("HEAD" "ORIG_HEAD" "FETCH_HEAD" "MERGE_HEAD" "CHERRY_PICK_HEAD"))
+
+(defun magit-list-special-refnames ()
+  (let ((gitdir (magit-gitdir)))
+    (cl-mapcan (lambda (name)
+                 (and (file-exists-p (expand-file-name name gitdir))
+                      (list name)))
+               magit-special-refnames)))
+
+(defun magit-list-branch-names ()
+  (magit-list-refnames (list "refs/heads" "refs/remotes")))
+
+(defun magit-list-local-branch-names ()
+  (magit-list-refnames "refs/heads"))
+
+(defun magit-list-remote-branch-names (&optional remote relative)
+  (if (and remote relative)
+      (let ((regexp (format "^refs/remotes/%s/\\(.+\\)" remote)))
+        (--mapcat (when (string-match regexp it)
+                    (list (match-string 1 it)))
+                  (magit-list-remote-branches remote)))
+    (magit-list-refnames (concat "refs/remotes/" remote))))
+
+(defun magit-format-refs (format &rest args)
+  (let ((lines (magit-git-lines
+                "for-each-ref" (concat "--format=" format)
+                (or args (list "refs/heads" "refs/remotes" "refs/tags")))))
+    (if (string-search "\f" format)
+        (--map (split-string it "\f") lines)
+      lines)))
+
+(defun magit-list-remotes ()
+  (magit-git-lines "remote"))
+
+(defun magit-list-tags ()
+  (magit-git-lines "tag"))
+
+(defun magit-list-stashes (&optional format)
+  (magit-git-lines "stash" "list" (concat "--format=" (or format "%gd"))))
+
+(defun magit-list-active-notes-refs ()
+  "Return notes refs according to `core.notesRef' and `notes.displayRef'."
+  (magit-git-lines "for-each-ref" "--format=%(refname)"
+                   (or (magit-get "core.notesRef") "refs/notes/commits")
+                   (magit-get-all "notes.displayRef")))
+
+(defun magit-list-notes-refnames ()
+  (--map (substring it 6) (magit-list-refnames "refs/notes")))
+
+(defun magit-remote-list-tags (remote)
+  (--keep (and (not (string-suffix-p "^{}" it))
+               (substring it 51))
+          (magit-git-lines "ls-remote" "--tags" remote)))
+
+(defun magit-remote-list-branches (remote)
+  (--keep (and (not (string-suffix-p "^{}" it))
+               (substring it 52))
+          (magit-git-lines "ls-remote" "--heads" remote)))
+
+(defun magit-remote-list-refs (remote)
+  (--keep (and (not (string-suffix-p "^{}" it))
+               (substring it 41))
+          (magit-git-lines "ls-remote" remote)))
+
+(defun magit-remote-head (remote)
+  (and-let* ((line (cl-find-if
+                    (lambda (line)
+                      (string-match
+                       "\\`ref: refs/heads/\\([^\s\t]+\\)[\s\t]HEAD\\'" line))
+                    (magit-git-lines "ls-remote" "--symref" remote "HEAD"))))
+    (match-string 1 line)))
+
+(defun magit-list-modified-modules ()
+  (--keep (and (string-match "\\`\\+\\([^ ]+\\) \\(.+\\) (.+)\\'" it)
+               (match-string 2 it))
+          (magit-git-lines "submodule" "status")))
+
+(defun magit-list-module-paths ()
+  (magit-with-toplevel
+    (--mapcat (and (string-match "^160000 [0-9a-z]\\{40,\\} 0\t\\(.+\\)$" it)
+                   (list (match-string 1 it)))
+              (magit-git-items "ls-files" "-z" "--stage"))))
+
+(defun magit-list-module-names ()
+  (mapcar #'magit-get-submodule-name (magit-list-module-paths)))
+
+(defun magit-get-submodule-name (path)
+  "Return the name of the submodule at PATH.
+PATH has to be relative to the super-repository."
+  (if (magit-git-version>= "2.38.0")
+      ;; "git submodule--helper name" was removed,
+      ;; but might still come back in another form.
+      (substring
+       (car (split-string
+             (car (or (magit-git-items
+                       "config" "-z"
+                       "-f" (expand-file-name ".gitmodules" (magit-toplevel))
+                       "--get-regexp" "^submodule\\..*\\.path$"
+                       (concat "^" (regexp-quote (directory-file-name path)) "$"))
+                      (error "No such submodule `%s'" path)))
+             "\n"))
+       10 -5)
+    (magit-git-string "submodule--helper" "name" path)))
+
+(defun magit-list-worktrees ()
+  "Return list of the worktrees of this repository.
+
+The returned list has the form (PATH COMMIT BRANCH BARE DETACHED
+LOCKED PRUNABLE).  The last four elements are booleans, with the
+exception of LOCKED and PRUNABLE, which may also be strings.
+See git-worktree(1) manpage for the meaning of the various parts.
+
+This function corrects a situation where \"git worktree list\"
+would claim a worktree is bare, even though the working tree is
+specified using `core.worktree'."
+  (let ((remote (file-remote-p default-directory))
+        worktrees worktree)
+    (dolist (line (let ((magit-git-global-arguments
+                         ;; KLUDGE At least in Git v2.8.3 this argument
+                         ;; would trigger a segfault.
+                         (remove "--no-pager" magit-git-global-arguments)))
+                    (if (magit-git-version>= "2.36")
+                        (magit-git-items "worktree" "list" "--porcelain" "-z")
+                      (magit-git-lines "worktree" "list" "--porcelain"))))
+      (cond ((string-prefix-p "worktree" line)
+             (let ((path (substring line 9)))
+               (when remote
+                 (setq path (concat remote path)))
+               ;; If the git directory is separate from the main
+               ;; worktree, then "git worktree" returns the git
+               ;; directory instead of the worktree, which isn't
+               ;; what it is supposed to do and not what we want.
+               ;; However, if the worktree has been removed, then
+               ;; we want to return it anyway; instead of nil.
+               (setq path (or (magit-toplevel path) path))
+               (setq worktree (list path nil nil nil nil nil nil))
+               (push worktree worktrees)))
+            ((string-prefix-p "HEAD" line)
+             (setf (nth 1 worktree) (substring line 5)))
+            ((string-prefix-p "branch" line)
+             (setf (nth 2 worktree) (substring line 18)))
+            ((string-equal line "bare")
+             (let* ((default-directory (car worktree))
+                    (wt (and (not (magit-get-boolean "core.bare"))
+                             (magit-get "core.worktree"))))
+               (if (and wt (file-exists-p (expand-file-name wt)))
+                   (progn (setf (nth 0 worktree) (expand-file-name wt))
+                          (setf (nth 2 worktree) (magit-rev-parse "HEAD"))
+                          (setf (nth 3 worktree) (magit-get-current-branch)))
+                 (setf (nth 3 worktree) t))))
+            ((string-equal line "detached")
+             (setf (nth 4 worktree) t))
+            ((string-prefix-p line "locked")
+             (setf (nth 5 worktree)
+                   (if (> (length line) 6) (substring line 7) t)))
+            ((string-prefix-p line "prunable")
+             (setf (nth 6 worktree)
+                   (if (> (length line) 8) (substring line 9) t)))))
+    (nreverse worktrees)))
+
+(defun magit-symbolic-ref-p (name)
+  (magit-git-success "symbolic-ref" "--quiet" name))
+
+(defun magit-ref-p (rev)
+  (or (car (member rev (magit-list-refs "refs/")))
+      (car (member rev (magit-list-refnames "refs/")))))
+
+(defun magit-branch-p (rev)
+  (or (car (member rev (magit-list-branches)))
+      (car (member rev (magit-list-branch-names)))))
+
+(defun magit-local-branch-p (rev)
+  (or (car (member rev (magit-list-local-branches)))
+      (car (member rev (magit-list-local-branch-names)))))
+
+(defun magit-remote-branch-p (rev)
+  (or (car (member rev (magit-list-remote-branches)))
+      (car (member rev (magit-list-remote-branch-names)))))
+
+(defun magit-branch-set-face (branch)
+  (magit--propertize-face branch (if (magit-local-branch-p branch)
+                                     'magit-branch-local
+                                   'magit-branch-remote)))
+
+(defun magit-tag-p (rev)
+  (car (member rev (magit-list-tags))))
+
+(defun magit-remote-p (string)
+  (car (member string (magit-list-remotes))))
+
+(defvar magit-main-branch-names
+  '("main" "master" "trunk" "development")
+  "Branch names reserved for use by the primary branch.
+Use function `magit-main-branch' to get the name actually used in
+the current repository.")
+
+(defvar magit-long-lived-branches
+  (append magit-main-branch-names (list "maint" "next"))
+  "Branch names reserved for use by long lived branches.")
+
+(defun magit-main-branch ()
+  "Return the main branch.
+
+If a branch exists whose name matches `init.defaultBranch', then
+that is considered the main branch.  If no branch by that name
+exists, then the branch names in `magit-main-branch-names' are
+tried in order.  The first branch from that list that actually
+exists in the current repository is considered its main branch."
+  (let ((branches (magit-list-local-branch-names)))
+    (seq-find (lambda (name)
+                (member name branches))
+              (delete-dups
+               (delq nil
+                     (cons (magit-get "init.defaultBranch")
+                           magit-main-branch-names))))))
+
+(defun magit-rev-diff-count (a b &optional first-parent)
+  "Return the commits in A but not B and vice versa.
+Return a list of two integers: (A>B B>A).
+
+If `first-parent' is set, traverse only first parents."
+  (mapcar #'string-to-number
+          (split-string (magit-git-string "rev-list"
+                                          "--count" "--left-right"
+                                          (and first-parent "--first-parent")
+                                          (concat a "..." b))
+                        "\t")))
+
+(defun magit-abbrev-length ()
+  (let ((abbrev (magit-get "core.abbrev")))
+    (if (and abbrev (not (equal abbrev "auto")))
+        (string-to-number abbrev)
+      ;; Guess the length git will be using based on an example
+      ;; abbreviation.  Actually HEAD's abbreviation might be an
+      ;; outlier, so use the shorter of the abbreviations for two
+      ;; commits.  See #3034.
+      (if-let ((head (magit-rev-parse "--short" "HEAD"))
+               (head-len (length head)))
+          (min head-len
+               (if-let ((rev (magit-rev-parse "--short" "HEAD~")))
+                   (length rev)
+                 head-len))
+        ;; We're on an unborn branch, but perhaps the repository has
+        ;; other commits.  See #4123.
+        (if-let ((commits (magit-git-lines "rev-list" "-n2" "--all"
+                                           "--abbrev-commit")))
+            (apply #'min (mapcar #'length commits))
+          ;; A commit does not exist.  Fall back to the default of 7.
+          7)))))
+
+(defun magit-abbrev-arg (&optional arg)
+  (format "--%s=%d" (or arg "abbrev") (magit-abbrev-length)))
+
+(defun magit-rev-abbrev (rev)
+  (magit-rev-parse (magit-abbrev-arg "short") rev))
+
+(defun magit-commit-children (commit &optional args)
+  (mapcar #'car
+          (--filter (member commit (cdr it))
+                    (--map (split-string it " ")
+                           (magit-git-lines
+                            "log" "--format=%H %P"
+                            (or args (list "--branches" "--tags" "--remotes"))
+                            "--not" commit)))))
+
+(defun magit-commit-parents (commit)
+  (and-let* ((str (magit-git-string "rev-list" "-1" "--parents" commit)))
+    (cdr (split-string str))))
+
+(defun magit-patch-id (rev)
+  (magit--with-connection-local-variables
+    (magit--with-temp-process-buffer
+      (magit-process-file
+       shell-file-name nil '(t nil) nil shell-command-switch
+       (let ((exec (shell-quote-argument (magit-git-executable))))
+         (format "%s diff-tree -u %s | %s patch-id" exec rev exec)))
+      (car (split-string (buffer-string))))))
+
+(defun magit-rev-format (format &optional rev args)
+  ;; Prefer `git log --no-walk' to `git show --no-patch' because it
+  ;; performs better in some scenarios.
+  (let ((str (magit-git-string "log" "--no-walk"
+                               (concat "--format=" format) args
+                               (if rev (magit--rev-dereference rev) "HEAD")
+                               "--")))
+    (and (not (string-equal str ""))
+         str)))
+
+(defun magit-rev-insert-format (format &optional rev args)
+  ;; Prefer `git log --no-walk' to `git show --no-patch' because it
+  ;; performs better in some scenarios.
+  (magit-git-insert "log" "--no-walk"
+                    (concat "--format=" format) args
+                    (if rev (magit--rev-dereference rev) "HEAD")
+                    "--"))
+
+(defun magit-format-rev-summary (rev)
+  (and-let* ((str (magit-rev-format "%h %s" rev)))
+    (progn
+      (magit--put-face 0 (string-match " " str) 'magit-hash str)
+      str)))
+
+(defvar magit-ref-namespaces
+  '(("\\`HEAD\\'"                  . magit-head)
+    ("\\`refs/tags/\\(.+\\)"       . magit-tag)
+    ("\\`refs/heads/\\(.+\\)"      . magit-branch-local)
+    ("\\`refs/remotes/\\(.+\\)"    . magit-branch-remote)
+    ("\\`refs/bisect/\\(bad\\)"    . magit-bisect-bad)
+    ("\\`refs/bisect/\\(skip.*\\)" . magit-bisect-skip)
+    ("\\`refs/bisect/\\(good.*\\)" . magit-bisect-good)
+    ("\\`refs/stash$"              . magit-refname-stash)
+    ("\\`refs/wip/\\(.+\\)"        . magit-refname-wip)
+    ("\\`refs/pullreqs/\\(.+\\)"   . magit-refname-pullreq)
+    ("\\`\\(bad\\):"               . magit-bisect-bad)
+    ("\\`\\(skip\\):"              . magit-bisect-skip)
+    ("\\`\\(good\\):"              . magit-bisect-good)
+    ("\\`\\(.+\\)"                 . magit-refname))
+  "How refs are formatted for display.
+
+Each entry controls how a certain type of ref is displayed, and
+has the form (REGEXP . FACE).  REGEXP is a regular expression
+used to match full refs.  The first entry whose REGEXP matches
+the reference is used.
+
+In log and revision buffers the first regexp submatch becomes the
+\"label\" that represents the ref and is propertized with FONT.
+In refs buffers the displayed text is controlled by other means
+and this option only controls what face is used.")
+
+(defun magit-format-ref-labels (string)
+  (save-match-data
+    (let ((regexp "\\(, \\|tag: \\|HEAD -> \\)")
+          names)
+      (if (and (derived-mode-p 'magit-log-mode)
+               (member "--simplify-by-decoration" magit-buffer-log-args))
+          (let ((branches (magit-list-local-branch-names))
+                (re (format "^%s/.+" (regexp-opt (magit-list-remotes)))))
+            (setq names
+                  (--map (cond ((string-equal it "HEAD")     it)
+                               ((string-prefix-p "refs/" it) it)
+                               ((member it branches) (concat "refs/heads/" it))
+                               ((string-match re it) (concat "refs/remotes/" it))
+                               (t                    (concat "refs/" it)))
+                         (split-string
+                          (string-replace "tag: " "refs/tags/" string)
+                          regexp t))))
+        (setq names (split-string string regexp t)))
+      (let (state head upstream tags branches remotes other combined)
+        (dolist (ref names)
+          (let* ((face (cdr (--first (string-match (car it) ref)
+                                     magit-ref-namespaces)))
+                 (name (magit--propertize-face
+                        (or (match-string 1 ref) ref) face)))
+            (cl-case face
+              ((magit-bisect-bad magit-bisect-skip magit-bisect-good)
+               (setq state name))
+              (magit-head
+               (setq head (magit--propertize-face "@" 'magit-head)))
+              (magit-tag            (push name tags))
+              (magit-branch-local   (push name branches))
+              (magit-branch-remote  (push name remotes))
+              (t                    (push name other)))))
+        (setq remotes
+              (seq-keep
+               (lambda (name)
+                 (if (string-match "\\`\\([^/]*\\)/\\(.*\\)\\'" name)
+                     (let ((r (match-string 1 name))
+                           (b (match-string 2 name)))
+                       (and (not (equal b "HEAD"))
+                            (if (equal (concat "refs/remotes/" name)
+                                       (magit-git-string
+                                        "symbolic-ref"
+                                        (format "refs/remotes/%s/HEAD" r)))
+                                (magit--propertize-face
+                                 name 'magit-branch-remote-head)
+                              name)))
+                   name))
+               remotes))
+        (let* ((current (magit-get-current-branch))
+               (target  (magit-get-upstream-branch current)))
+          (dolist (name branches)
+            (let ((push (car (member (magit-get-push-branch name) remotes))))
+              (when push
+                (setq remotes (delete push remotes))
+                (string-match "^[^/]*/" push)
+                (setq push (substring push 0 (match-end 0))))
+              (cond
+               ((equal name current)
+                (setq head
+                      (concat push
+                              (magit--propertize-face
+                               name 'magit-branch-current))))
+               ((equal name target)
+                (setq upstream
+                      (concat push
+                              (magit--propertize-face
+                               name '(magit-branch-upstream
+                                      magit-branch-local)))))
+               (t
+                (push (concat push name) combined)))))
+          (when (and target (not upstream))
+            (if (member target remotes)
+                (progn
+                  (magit--add-face-text-property
+                   0 (length target) 'magit-branch-upstream nil target)
+                  (setq upstream target)
+                  (setq remotes  (delete target remotes)))
+              (when-let ((target (car (member target combined))))
+                (magit--add-face-text-property
+                 0 (length target) 'magit-branch-upstream nil target)
+                (setq upstream target)
+                (setq combined (delete target combined))))))
+        (string-join (flatten-tree `(,state
+                                     ,head
+                                     ,upstream
+                                     ,@(nreverse tags)
+                                     ,@(nreverse combined)
+                                     ,@(nreverse remotes)
+                                     ,@other))
+                     " ")))))
+
+(defun magit-object-type (object)
+  (magit-git-string "cat-file" "-t" object))
+
+(defmacro magit-with-blob (commit file &rest body)
+  (declare (indent 2)
+           (debug (form form body)))
+  `(magit--with-temp-process-buffer
+     (let ((buffer-file-name ,file))
+       (save-excursion
+         (magit-git-insert "cat-file" "-p"
+                           (concat ,commit ":" buffer-file-name)))
+       (decode-coding-inserted-region
+        (point-min) (point-max) buffer-file-name t nil nil t)
+       ,@body)))
+
+(defmacro magit-with-temp-index (tree arg &rest body)
+  (declare (indent 2) (debug (form form body)))
+  (let ((file (cl-gensym "file")))
+    `(let ((magit--refresh-cache nil)
+           (,file (magit-convert-filename-for-git
+                   (make-temp-name
+                    (expand-file-name "index.magit." (magit-gitdir))))))
+       (unwind-protect
+           (magit-with-toplevel
+             (when-let ((tree ,tree))
+               (unless (magit-git-success "read-tree" ,arg tree
+                                          (concat "--index-output=" ,file))
+                 (error "Cannot read tree %s" tree)))
+             (with-environment-variables (("GIT_INDEX_FILE" ,file))
+               ,@body))
+         (ignore-errors
+           (delete-file (concat (file-remote-p default-directory) ,file)))))))
+
+(defun magit-commit-tree (message &optional tree &rest parents)
+  (magit-git-string "commit-tree" "--no-gpg-sign" "-m" message
+                    (--mapcat (list "-p" it) (delq nil parents))
+                    (or tree
+                        (magit-git-string "write-tree")
+                        (error "Cannot write tree"))))
+
+(defun magit-commit-worktree (message &optional arg &rest other-parents)
+  (magit-with-temp-index "HEAD" arg
+    (and (magit-update-files (magit-unstaged-files))
+         (apply #'magit-commit-tree message nil "HEAD" other-parents))))
+
+(defun magit-update-files (files)
+  (magit-git-success "update-index" "--add" "--remove" "--" files))
+
+(defun magit-update-ref (ref message rev &optional stashish)
+  (let ((magit--refresh-cache nil))
+    (or (if (magit-git-version>= "2.6.0")
+            (zerop (magit-call-git "update-ref" "--create-reflog"
+                                   "-m" message ref rev
+                                   (or (magit-rev-verify ref) "")))
+          ;; `--create-reflog' didn't exist before v2.6.0
+          (let ((oldrev  (magit-rev-verify ref))
+                (logfile (expand-file-name (concat "logs/" ref)
+                                           (magit-gitdir))))
+            (unless (file-exists-p logfile)
+              (when oldrev
+                (magit-git-success "update-ref" "-d" ref oldrev))
+              (make-directory (file-name-directory logfile) t)
+              (with-temp-file logfile)
+              (when (and oldrev (not stashish))
+                (magit-git-success "update-ref" "-m" "enable reflog"
+                                   ref oldrev ""))))
+          (magit-git-success "update-ref" "-m" message ref rev
+                             (or (magit-rev-verify ref) "")))
+        (error "Cannot update %s with %s" ref rev))))
+
+(defconst magit-range-re
+  (concat "\\`\\([^ \t]*[^.]\\)?"       ; revA
+          "\\(\\.\\.\\.?\\)"            ; range marker
+          "\\([^.][^ \t]*\\)?\\'"))     ; revB
+
+(defun magit-split-range (range)
+  (pcase-let ((`(,beg ,end ,sep) (magit--split-range-raw range)))
+    (and sep
+         (let ((beg (or beg "HEAD"))
+               (end (or end "HEAD")))
+           (if (string-equal (match-string 2 range) "...")
+               (and-let* ((base (magit-git-string "merge-base" beg end)))
+                 (cons base end))
+             (cons beg end))))))
+
+(defun magit--split-range-raw (range)
+  (and (string-match magit-range-re range)
+       (let ((beg (match-string 1 range))
+             (end (match-string 3 range)))
+         (and (or beg end)
+              (list beg end (match-string 2 range))))))
+
+(defun magit-hash-range (range)
+  (if (string-match magit-range-re range)
+      (let ((beg (match-string 1 range))
+            (end (match-string 3 range)))
+        (and (or beg end)
+             (let ((beg-hash (and beg (magit-rev-hash (match-string 1 range))))
+                   (end-hash (and end (magit-rev-hash (match-string 3 range)))))
+               (and (or (not beg) beg-hash)
+                    (or (not end) end-hash)
+                    (concat beg-hash (match-string 2 range) end-hash)))))
+    (magit-rev-hash range)))
+
+(defvar magit-revision-faces
+  '(magit-hash
+    magit-tag
+    magit-branch-remote
+    magit-branch-remote-head
+    magit-branch-local
+    magit-branch-current
+    magit-branch-upstream
+    magit-branch-warning
+    magit-head
+    magit-refname
+    magit-refname-stash
+    magit-refname-wip
+    magit-refname-pullreq))
+
+(put 'git-revision 'thing-at-point #'magit-thingatpt--git-revision)
+(defun magit-thingatpt--git-revision (&optional disallow)
+  ;; Support hashes and references.
+  (and-let* ((bounds
+              (let ((c (concat "\s\n\t~^:?*[\\" disallow)))
+                (cl-letf
+                    (((get 'git-revision 'beginning-op)
+                      (lambda ()
+                        (if (re-search-backward (format "[%s]" c) nil t)
+                            (forward-char)
+                          (goto-char (point-min)))))
+                     ((get 'git-revision 'end-op)
+                      (lambda ()
+                        (re-search-forward (format "\\=[^%s]*" c) nil t))))
+                  (bounds-of-thing-at-point 'git-revision))))
+             (string (buffer-substring-no-properties (car bounds) (cdr bounds)))
+             ;; References are allowed to contain most parentheses and
+             ;; most punctuation, but if those characters appear at the
+             ;; edges of a possible reference in arbitrary text, then
+             ;; they are much more likely to be intended as just that:
+             ;; punctuation and delimiters.
+             (string (thread-first string
+                       (string-trim-left  "[(</]")
+                       (string-trim-right "[])>/.,;!]"))))
+    (let (disallow)
+      (when (or (string-match-p "\\.\\." string)
+                (string-match-p "/\\." string))
+        (setq disallow (concat disallow ".")))
+      (when (string-match-p "@{" string)
+        (setq disallow (concat disallow "@{")))
+      (if disallow
+          ;; These additional restrictions overcompensate,
+          ;; but that only matters in rare cases.
+          (magit-thingatpt--git-revision disallow)
+        (and (not (equal string "@"))
+             (or (and (>= (length string) 7)
+                      (string-match-p "[a-z]" string)
+                      (magit-commit-p string))
+                 (and (magit-ref-p string)
+                      (let ((face (get-text-property (point) 'face)))
+                        (or (not face)
+                            (member face magit-revision-faces)))))
+             string)))))
+
+(put 'git-revision-range 'thing-at-point #'magit-thingatpt--git-revision-range)
+(defun magit-thingatpt--git-revision-range ()
+  ;; Support hashes but no references.
+  (and-let* ((bounds
+              (cl-letf (((get 'git-revision 'beginning-op)
+                         (lambda ()
+                           (if (re-search-backward "[^a-z0-9.]" nil t)
+                               (forward-char)
+                             (goto-char (point-min)))))
+                        ((get 'git-revision 'end-op)
+                         (lambda ()
+                           (and (re-search-forward "[^a-z0-9.]" nil t)
+                                (backward-char)))))
+                (bounds-of-thing-at-point 'git-revision)))
+             (range (buffer-substring-no-properties (car bounds) (cdr bounds))))
+    ;; Validate but return as-is.
+    (and (magit-hash-range range) range)))
+
+;;; Completion
+
+(defvar magit-revision-history nil)
+
+(defun magit--minibuf-default-add-commit ()
+  (let ((fn minibuffer-default-add-function))
+    (setq-local
+     minibuffer-default-add-function
+     (lambda ()
+       (let ((rest (and (functionp fn) (funcall fn))))
+         (if-let ((commit (with-selected-window (minibuffer-selected-window)
+                            (or (magit-thing-at-point 'git-revision-range t)
+                                (magit-commit-at-point)))))
+             (let ((rest (cons commit (delete commit rest)))
+                   (def minibuffer-default))
+               (if (listp def)
+                   (append def rest)
+                 (cons def (delete def rest))))
+           rest))))))
+
+(defun magit-read-branch (prompt &optional secondary-default)
+  (magit-completing-read prompt (magit-list-branch-names)
+                         nil t nil 'magit-revision-history
+                         (or (magit-branch-at-point)
+                             secondary-default
+                             (magit-get-current-branch))))
+
+(defun magit-read-branch-or-commit (prompt &optional secondary-default exclude)
+  (let ((current (magit-get-current-branch))
+        (branch-at-point (magit-branch-at-point))
+        (commit-at-point (magit-commit-at-point))
+        (choices (delete exclude (magit-list-refnames nil t))))
+    (when (equal current exclude)
+      (setq current nil))
+    (when (equal branch-at-point exclude)
+      (setq branch-at-point nil))
+    (when (and commit-at-point (not branch-at-point))
+      (setq choices (cons commit-at-point choices)))
+    (minibuffer-with-setup-hook #'magit--minibuf-default-add-commit
+      (or (magit-completing-read
+           prompt choices nil nil nil 'magit-revision-history
+           (or branch-at-point commit-at-point secondary-default current))
+          (user-error "Nothing selected")))))
+
+(defun magit-read-range-or-commit (prompt &optional secondary-default)
+  (magit-read-range
+   prompt
+   (or (and-let* ((revs (magit-region-values '(commit branch) t)))
+         (progn
+           (deactivate-mark)
+           (concat (car (last revs)) ".." (car revs))))
+       (magit-branch-or-commit-at-point)
+       secondary-default
+       (magit-get-current-branch))))
+
+(defun magit-read-range (prompt &optional default)
+  (minibuffer-with-setup-hook
+      (lambda ()
+        (magit--minibuf-default-add-commit)
+        (setq-local crm-separator "\\.\\.\\.?"))
+    (magit-completing-read-multiple
+     (concat prompt ": ")
+     (magit-list-refnames)
+     nil nil nil 'magit-revision-history default nil t)))
+
+(defun magit-read-remote-branch
+    (prompt &optional remote default local-branch require-match)
+  (let ((choice (magit-completing-read
+                 prompt
+                 (cl-union (and local-branch
+                                (if remote
+                                    (list local-branch)
+                                  (--map (concat it "/" local-branch)
+                                         (magit-list-remotes))))
+                           (magit-list-remote-branch-names remote t)
+                           :test #'equal)
+                 nil require-match nil 'magit-revision-history default)))
+    (if (or remote (string-match "\\`\\([^/]+\\)/\\(.+\\)" choice))
+        choice
+      (user-error "`%s' doesn't have the form REMOTE/BRANCH" choice))))
+
+(defun magit-read-refspec (prompt remote)
+  (magit-completing-read prompt
+                         (prog2 (message "Determining available refs...")
+                             (magit-remote-list-refs remote)
+                           (message "Determining available refs...done"))))
+
+(defun magit-read-local-branch (prompt &optional secondary-default)
+  (magit-completing-read prompt (magit-list-local-branch-names)
+                         nil t nil 'magit-revision-history
+                         (or (magit-local-branch-at-point)
+                             secondary-default
+                             (magit-get-current-branch))))
+
+(defun magit-read-local-branch-or-commit (prompt)
+  (let ((choices (nconc (magit-list-local-branch-names)
+                        (magit-list-special-refnames)))
+        (commit (magit-commit-at-point)))
+    (when commit
+      (push commit choices))
+    (minibuffer-with-setup-hook #'magit--minibuf-default-add-commit
+      (or (magit-completing-read prompt choices
+                                 nil nil nil 'magit-revision-history
+                                 (or (magit-local-branch-at-point) commit))
+          (user-error "Nothing selected")))))
+
+(defun magit-read-local-branch-or-ref (prompt &optional secondary-default)
+  (magit-completing-read prompt (nconc (magit-list-local-branch-names)
+                                       (magit-list-refs "refs/"))
+                         nil t nil 'magit-revision-history
+                         (or (magit-local-branch-at-point)
+                             secondary-default
+                             (magit-get-current-branch))))
+
+(defun magit-read-other-branch
+    (prompt &optional exclude secondary-default no-require-match)
+  (let* ((current (magit-get-current-branch))
+         (atpoint (magit-branch-at-point))
+         (exclude (or exclude current))
+         (default (or (and (not (equal atpoint exclude)) atpoint)
+                      (and (not (equal current exclude)) current)
+                      secondary-default
+                      (magit-get-previous-branch))))
+    (magit-completing-read prompt (delete exclude (magit-list-branch-names))
+                           nil (not no-require-match)
+                           nil 'magit-revision-history default)))
+
+(defun magit-read-other-branch-or-commit
+    (prompt &optional exclude secondary-default)
+  (let* ((current (magit-get-current-branch))
+         (atpoint (magit-branch-or-commit-at-point))
+         (exclude (or exclude current))
+         (default (or (and (not (equal atpoint exclude))
+                           (not (and (not current)
+                                     (magit-rev-equal atpoint "HEAD")))
+                           atpoint)
+                      (and (not (equal current exclude)) current)
+                      secondary-default
+                      (magit-get-previous-branch))))
+    (minibuffer-with-setup-hook #'magit--minibuf-default-add-commit
+      (or (magit-completing-read prompt (delete exclude (magit-list-refnames))
+                                 nil nil nil 'magit-revision-history default)
+          (user-error "Nothing selected")))))
+
+(defun magit-read-other-local-branch
+    (prompt &optional exclude secondary-default no-require-match)
+  (let* ((current (magit-get-current-branch))
+         (atpoint (magit-local-branch-at-point))
+         (exclude (or exclude current))
+         (default (or (and (not (equal atpoint exclude)) atpoint)
+                      (and (not (equal current exclude)) current)
+                      secondary-default
+                      (magit-get-previous-branch))))
+    (magit-completing-read prompt
+                           (delete exclude (magit-list-local-branch-names))
+                           nil (not no-require-match)
+                           nil 'magit-revision-history default)))
+
+(defun magit-read-branch-prefer-other (prompt)
+  (let* ((current (magit-get-current-branch))
+         (commit  (magit-commit-at-point))
+         (atrev   (and commit (magit-list-branches-pointing-at commit)))
+         (atpoint (magit--painted-branch-at-point)))
+    (magit-completing-read prompt (magit-list-branch-names)
+                           nil t nil 'magit-revision-history
+                           (or (magit-section-value-if 'branch)
+                               atpoint
+                               (and (not (cdr atrev)) (car atrev))
+                               (--first (not (equal it current)) atrev)
+                               (magit-get-previous-branch)
+                               (car atrev)))))
+
+(defun magit-read-upstream-branch (&optional branch prompt)
+  "Read the upstream for BRANCH using PROMPT.
+If optional BRANCH is nil, then read the upstream for the
+current branch, or raise an error if no branch is checked
+out.  Only existing branches can be selected."
+  (unless branch
+    (setq branch (or (magit-get-current-branch)
+                     (error "Need a branch to set its upstream"))))
+  (let ((branches (delete branch (magit-list-branch-names))))
+    (magit-completing-read
+     (or prompt (format "Change upstream of %s to" branch))
+     branches nil t nil 'magit-revision-history
+     (or (let ((r (car (member (magit-remote-branch-at-point) branches)))
+               (l (car (member (magit-local-branch-at-point) branches))))
+           (if magit-prefer-remote-upstream (or r l) (or l r)))
+         (and-let* ((main (magit-main-branch)))
+           (let ((r (car (member (concat "origin/" main) branches)))
+                 (l (car (member main branches))))
+             (if magit-prefer-remote-upstream (or r l) (or l r))))
+         (car (member (magit-get-previous-branch) branches))))))
+
+(defun magit-read-starting-point (prompt &optional branch default)
+  (or (magit-completing-read
+       (concat prompt
+               (and branch
+                    (if (bound-and-true-p ivy-mode)
+                        ;; Ivy-mode strips faces from prompt.
+                        (format  " `%s'" branch)
+                      (concat " " (magit--propertize-face
+                                   branch 'magit-branch-local))))
+               " starting at")
+       (nconc (list "HEAD")
+              (magit-list-refnames)
+              (directory-files (magit-gitdir) nil "_HEAD\\'"))
+       nil nil nil 'magit-revision-history
+       (or default (magit--default-starting-point)))
+      (user-error "Nothing selected")))
+
+(defun magit--default-starting-point ()
+  (or (let ((r (magit-remote-branch-at-point))
+            (l (magit-local-branch-at-point)))
+        (if magit-prefer-remote-upstream (or r l) (or l r)))
+      (magit-commit-at-point)
+      (magit-stash-at-point)
+      (magit-get-current-branch)))
+
+(defun magit-read-tag (prompt &optional require-match)
+  (magit-completing-read prompt (magit-list-tags) nil
+                         require-match nil 'magit-revision-history
+                         (magit-tag-at-point)))
+
+(defun magit-read-stash (prompt)
+  (let* ((atpoint (magit-stash-at-point))
+         (default (and atpoint
+                       (concat atpoint (magit-rev-format " %s" atpoint))))
+         (choices (mapcar (lambda (c)
+                            (pcase-let ((`(,rev ,msg) (split-string c "\0")))
+                              (concat (propertize rev 'face 'magit-hash)
+                                      " " msg)))
+                          (magit-list-stashes "%gd%x00%s")))
+         (choice  (magit-completing-read prompt choices
+                                         nil t nil nil
+                                         default
+                                         (car choices))))
+    (and choice
+         (string-match "^\\([^ ]+\\) \\(.+\\)" choice)
+         (substring-no-properties (match-string 1 choice)))))
+
+(defun magit-read-remote (prompt &optional default use-only)
+  (let ((remotes (magit-list-remotes)))
+    (if (and use-only (length= remotes 1))
+        (car remotes)
+      (magit-completing-read prompt remotes
+                             nil t nil nil
+                             (or default
+                                 (magit-remote-at-point)
+                                 (magit-get-remote))))))
+
+(defun magit-read-remote-or-url (prompt &optional default)
+  (magit-completing-read prompt
+                         (nconc (magit-list-remotes)
+                                (list "https://" "git://" "git@"))
+                         nil nil nil nil
+                         (or default
+                             (magit-remote-at-point)
+                             (magit-get-remote))))
+
+(defun magit-read-module-path (prompt &optional predicate)
+  (magit-completing-read prompt (magit-list-module-paths)
+                         predicate t nil nil
+                         (magit-module-at-point predicate)))
+
+(defun magit-module-confirm (verb &optional predicate)
+  ;; Some predicates use the inefficient `magit-toplevel'
+  ;; and some repositories have thousands of submodules.
+  (let ((magit--refresh-cache (list (cons 0 0)))
+        (modules nil))
+    (if current-prefix-arg
+        (progn
+          (setq modules (magit-list-module-paths))
+          (when predicate
+            (setq modules (seq-filter predicate modules)))
+          (unless modules
+            (if predicate
+                (user-error "No modules satisfying %s available" predicate)
+              (user-error "No modules available"))))
+      (setq modules (magit-region-values 'module))
+      (when modules
+        (when predicate
+          (setq modules (seq-filter predicate modules)))
+        (unless modules
+          (user-error "No modules satisfying %s selected" predicate))))
+    (if (or (length> modules 1) current-prefix-arg)
+        (magit-confirm t nil (format "%s %%d modules" verb) nil modules)
+      (list (magit-read-module-path (format "%s module" verb) predicate)))))
+
+;;; _
+(provide 'magit-git)
+;;; magit-git.el ends here
diff --git a/emacs/elpa/magit-20241001.2052/magit-git.elc b/emacs/elpa/magit-20241001.2052/magit-git.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240930.1805/magit-gitignore.el b/emacs/elpa/magit-20241001.2052/magit-gitignore.el
diff --git a/emacs/elpa/magit-20240930.1805/magit-gitignore.elc b/emacs/elpa/magit-20241001.2052/magit-gitignore.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240930.1805/magit-log.el b/emacs/elpa/magit-20241001.2052/magit-log.el
diff --git a/emacs/elpa/magit-20241001.2052/magit-log.elc b/emacs/elpa/magit-20241001.2052/magit-log.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240930.1805/magit-margin.el b/emacs/elpa/magit-20241001.2052/magit-margin.el
diff --git a/emacs/elpa/magit-20240930.1805/magit-margin.elc b/emacs/elpa/magit-20241001.2052/magit-margin.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240930.1805/magit-merge.el b/emacs/elpa/magit-20241001.2052/magit-merge.el
diff --git a/emacs/elpa/magit-20240930.1805/magit-merge.elc b/emacs/elpa/magit-20241001.2052/magit-merge.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240930.1805/magit-mode.el b/emacs/elpa/magit-20241001.2052/magit-mode.el
diff --git a/emacs/elpa/magit-20240930.1805/magit-mode.elc b/emacs/elpa/magit-20241001.2052/magit-mode.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240930.1805/magit-notes.el b/emacs/elpa/magit-20241001.2052/magit-notes.el
diff --git a/emacs/elpa/magit-20240930.1805/magit-notes.elc b/emacs/elpa/magit-20241001.2052/magit-notes.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240930.1805/magit-patch.el b/emacs/elpa/magit-20241001.2052/magit-patch.el
diff --git a/emacs/elpa/magit-20240930.1805/magit-patch.elc b/emacs/elpa/magit-20241001.2052/magit-patch.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20241001.2052/magit-pkg.el b/emacs/elpa/magit-20241001.2052/magit-pkg.el
@@ -0,0 +1,18 @@
+;; -*- no-byte-compile: t; lexical-binding: nil -*-
+(define-package "magit" "20241001.2052"
+  "A Git porcelain inside Emacs."
+  '((emacs         "26.1")
+    (compat        "30.0.0.0")
+    (dash          "2.19.1")
+    (magit-section "4.1.1")
+    (seq           "2.24")
+    (transient     "0.7.6")
+    (with-editor   "3.4.2"))
+  :url "https://github.com/magit/magit"
+  :commit "93e86ceca7bf5b0ff9023d7f138e5f06990fc276"
+  :revdesc "93e86ceca7bf"
+  :keywords '("git" "tools" "vc")
+  :authors '(("Marius Vollmer" . "marius.vollmer@gmail.com")
+             ("Jonas Bernoulli" . "emacs.magit@jonas.bernoulli.dev"))
+  :maintainers '(("Jonas Bernoulli" . "emacs.magit@jonas.bernoulli.dev")
+                 ("Kyle Meyer" . "kyle@kyleam.com")))
diff --git a/emacs/elpa/magit-20240930.1805/magit-process.el b/emacs/elpa/magit-20241001.2052/magit-process.el
diff --git a/emacs/elpa/magit-20240930.1805/magit-process.elc b/emacs/elpa/magit-20241001.2052/magit-process.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240930.1805/magit-pull.el b/emacs/elpa/magit-20241001.2052/magit-pull.el
diff --git a/emacs/elpa/magit-20240930.1805/magit-pull.elc b/emacs/elpa/magit-20241001.2052/magit-pull.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240930.1805/magit-push.el b/emacs/elpa/magit-20241001.2052/magit-push.el
diff --git a/emacs/elpa/magit-20240930.1805/magit-push.elc b/emacs/elpa/magit-20241001.2052/magit-push.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240930.1805/magit-reflog.el b/emacs/elpa/magit-20241001.2052/magit-reflog.el
diff --git a/emacs/elpa/magit-20240930.1805/magit-reflog.elc b/emacs/elpa/magit-20241001.2052/magit-reflog.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240930.1805/magit-refs.el b/emacs/elpa/magit-20241001.2052/magit-refs.el
diff --git a/emacs/elpa/magit-20240930.1805/magit-refs.elc b/emacs/elpa/magit-20241001.2052/magit-refs.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240930.1805/magit-remote.el b/emacs/elpa/magit-20241001.2052/magit-remote.el
diff --git a/emacs/elpa/magit-20240930.1805/magit-remote.elc b/emacs/elpa/magit-20241001.2052/magit-remote.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240930.1805/magit-repos.el b/emacs/elpa/magit-20241001.2052/magit-repos.el
diff --git a/emacs/elpa/magit-20240930.1805/magit-repos.elc b/emacs/elpa/magit-20241001.2052/magit-repos.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240930.1805/magit-reset.el b/emacs/elpa/magit-20241001.2052/magit-reset.el
diff --git a/emacs/elpa/magit-20240930.1805/magit-reset.elc b/emacs/elpa/magit-20241001.2052/magit-reset.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240930.1805/magit-sequence.el b/emacs/elpa/magit-20241001.2052/magit-sequence.el
diff --git a/emacs/elpa/magit-20240930.1805/magit-sequence.elc b/emacs/elpa/magit-20241001.2052/magit-sequence.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240930.1805/magit-sparse-checkout.el b/emacs/elpa/magit-20241001.2052/magit-sparse-checkout.el
diff --git a/emacs/elpa/magit-20240930.1805/magit-sparse-checkout.elc b/emacs/elpa/magit-20241001.2052/magit-sparse-checkout.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240930.1805/magit-stash.el b/emacs/elpa/magit-20241001.2052/magit-stash.el
diff --git a/emacs/elpa/magit-20240930.1805/magit-stash.elc b/emacs/elpa/magit-20241001.2052/magit-stash.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240930.1805/magit-status.el b/emacs/elpa/magit-20241001.2052/magit-status.el
diff --git a/emacs/elpa/magit-20240930.1805/magit-status.elc b/emacs/elpa/magit-20241001.2052/magit-status.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240930.1805/magit-submodule.el b/emacs/elpa/magit-20241001.2052/magit-submodule.el
diff --git a/emacs/elpa/magit-20240930.1805/magit-submodule.elc b/emacs/elpa/magit-20241001.2052/magit-submodule.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240930.1805/magit-subtree.el b/emacs/elpa/magit-20241001.2052/magit-subtree.el
diff --git a/emacs/elpa/magit-20240930.1805/magit-subtree.elc b/emacs/elpa/magit-20241001.2052/magit-subtree.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240930.1805/magit-tag.el b/emacs/elpa/magit-20241001.2052/magit-tag.el
diff --git a/emacs/elpa/magit-20240930.1805/magit-tag.elc b/emacs/elpa/magit-20241001.2052/magit-tag.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240930.1805/magit-transient.el b/emacs/elpa/magit-20241001.2052/magit-transient.el
diff --git a/emacs/elpa/magit-20240930.1805/magit-transient.elc b/emacs/elpa/magit-20241001.2052/magit-transient.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240930.1805/magit-wip.el b/emacs/elpa/magit-20241001.2052/magit-wip.el
diff --git a/emacs/elpa/magit-20240930.1805/magit-wip.elc b/emacs/elpa/magit-20241001.2052/magit-wip.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240930.1805/magit-worktree.el b/emacs/elpa/magit-20241001.2052/magit-worktree.el
diff --git a/emacs/elpa/magit-20240930.1805/magit-worktree.elc b/emacs/elpa/magit-20241001.2052/magit-worktree.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20241001.2052/magit.el b/emacs/elpa/magit-20241001.2052/magit.el
@@ -0,0 +1,789 @@
+;;; magit.el --- A Git porcelain inside Emacs  -*- lexical-binding:t; coding:utf-8 -*-
+
+;; Copyright (C) 2008-2024 The Magit Project Contributors
+
+;; Author: Marius Vollmer <marius.vollmer@gmail.com>
+;;     Jonas Bernoulli <emacs.magit@jonas.bernoulli.dev>
+;; Maintainer: Jonas Bernoulli <emacs.magit@jonas.bernoulli.dev>
+;;     Kyle Meyer <kyle@kyleam.com>
+;; Former-Maintainers:
+;;     Nicolas Dudebout <nicolas.dudebout@gatech.edu>
+;;     Noam Postavsky <npostavs@users.sourceforge.net>
+;;     Peter J. Weisberg <pj@irregularexpressions.net>
+;;     Phil Jackson <phil@shellarchive.co.uk>
+;;     Rémi Vanicat <vanicat@debian.org>
+;;     Yann Hodique <yann.hodique@gmail.com>
+
+;; Homepage: https://github.com/magit/magit
+;; Keywords: git tools vc
+
+;; Package-Version: 20241001.2052
+;; Package-Revision: 93e86ceca7bf
+;; Package-Requires: (
+;;     (emacs "26.1")
+;;     (compat "30.0.0.0")
+;;     (dash "2.19.1")
+;;     (magit-section "4.1.1")
+;;     (seq "2.24")
+;;     (transient "0.7.6")
+;;     (with-editor "3.4.2"))
+
+;; SPDX-License-Identifier: GPL-3.0-or-later
+
+;; Magit is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published
+;; by the Free Software Foundation, either version 3 of the License,
+;; or (at your option) any later version.
+;;
+;; Magit is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with Magit.  If not, see <https://www.gnu.org/licenses/>.
+
+;; You should have received a copy of the AUTHORS.md file, which
+;; lists all contributors.  If not, see https://magit.vc/authors.
+
+;;; Commentary:
+
+;; Magit is a text-based Git user interface that puts an unmatched focus
+;; on streamlining workflows.  Commands are invoked using short mnemonic
+;; key sequences that take the cursor’s position in the highly actionable
+;; interface into account to provide context-sensitive behavior.
+
+;; With Magit you can do nearly everything that you can do when using Git
+;; on the command-line, but at greater speed and while taking advantage
+;; of advanced features that previously seemed too daunting to use on a
+;; daily basis.  Many users will find that by using Magit they can become
+;; more effective Git user.
+
+;;; Code:
+
+(require 'magit-core)
+(require 'magit-diff)
+(require 'magit-log)
+(require 'magit-wip)
+(require 'magit-apply)
+(require 'magit-repos)
+(require 'git-commit)
+
+(require 'format-spec)
+(require 'package nil t) ; used in `magit-version'
+(require 'with-editor)
+
+;; For `magit:--gpg-sign'
+(declare-function epg-list-keys "epg" (context &optional name mode))
+(declare-function epg-decode-dn "epg" (alist))
+(defvar epa-protocol)
+
+;;; Options
+
+(defcustom magit-openpgp-default-signing-key nil
+  "Fingerprint of your default Openpgp key used for signing.
+If the specified primary key has signing capacity then it is used
+as the value of the `--gpg-sign' argument without prompting, even
+when other such keys exist.  To be able to select another key you
+must then use a prefix argument."
+  :package-version '(magit . "4.0.0")
+  :group 'magit-commands
+  :type 'string)
+
+;;; Faces
+
+(defface magit-header-line
+  '((t :inherit magit-section-heading))
+  "Face for the `header-line' in some Magit modes.
+Note that some modes, such as `magit-log-select-mode', have their
+own faces for the `header-line', or for parts of the
+`header-line'."
+  :group 'magit-faces)
+
+(defface magit-header-line-key
+  '((t :inherit font-lock-builtin-face))
+  "Face for keys in the `header-line'."
+  :group 'magit-faces)
+
+(defface magit-dimmed
+  '((((class color) (background light)) :foreground "grey50")
+    (((class color) (background  dark)) :foreground "grey50"))
+  "Face for text that shouldn't stand out."
+  :group 'magit-faces)
+
+(defface magit-hash
+  '((((class color) (background light)) :foreground "grey60")
+    (((class color) (background  dark)) :foreground "grey40"))
+  "Face for the commit object name in the log output."
+  :group 'magit-faces)
+
+(defface magit-tag
+  '((((class color) (background light)) :foreground "Goldenrod4")
+    (((class color) (background  dark)) :foreground "LightGoldenrod2"))
+  "Face for tag labels shown in log buffer."
+  :group 'magit-faces)
+
+(defface magit-branch-remote
+  '((((class color) (background light)) :foreground "DarkOliveGreen4")
+    (((class color) (background  dark)) :foreground "DarkSeaGreen2"))
+  "Face for remote branch head labels shown in log buffer."
+  :group 'magit-faces)
+
+(defface magit-branch-remote-head
+  '((((supports (:box t))) :inherit magit-branch-remote :box t)
+    (t                     :inherit magit-branch-remote :inverse-video t))
+  "Face for current branch."
+  :group 'magit-faces)
+
+(defface magit-branch-local
+  '((((class color) (background light)) :foreground "SkyBlue4")
+    (((class color) (background  dark)) :foreground "LightSkyBlue1"))
+  "Face for local branches."
+  :group 'magit-faces)
+
+(defface magit-branch-current
+  '((((supports (:box t))) :inherit magit-branch-local :box t)
+    (t                     :inherit magit-branch-local :inverse-video t))
+  "Face for current branch."
+  :group 'magit-faces)
+
+(defface magit-branch-upstream
+  '((t :slant italic))
+  "Face for upstream branch.
+This face is only used in logs and it gets combined
+ with `magit-branch-local', `magit-branch-remote'
+and/or `magit-branch-remote-head'."
+  :group 'magit-faces)
+
+(defface magit-branch-warning
+  '((t :inherit warning))
+  "Face for warning about (missing) branch."
+  :group 'magit-faces)
+
+(defface magit-head
+  '((((class color) (background light)) :inherit magit-branch-local)
+    (((class color) (background  dark)) :inherit magit-branch-local))
+  "Face for the symbolic ref `HEAD'."
+  :group 'magit-faces)
+
+(defface magit-refname
+  '((((class color) (background light)) :foreground "grey30")
+    (((class color) (background  dark)) :foreground "grey80"))
+  "Face for refnames without a dedicated face."
+  :group 'magit-faces)
+
+(defface magit-refname-stash
+  '((t :inherit magit-refname))
+  "Face for stash refnames."
+  :group 'magit-faces)
+
+(defface magit-refname-wip
+  '((t :inherit magit-refname))
+  "Face for wip refnames."
+  :group 'magit-faces)
+
+(defface magit-refname-pullreq
+  '((t :inherit magit-refname))
+  "Face for pullreq refnames."
+  :group 'magit-faces)
+
+(defface magit-keyword
+  '((t :inherit font-lock-string-face))
+  "Face for parts of commit messages inside brackets."
+  :group 'magit-faces)
+
+(defface magit-keyword-squash
+  '((t :inherit font-lock-warning-face))
+  "Face for squash! and fixup! keywords in commit messages."
+  :group 'magit-faces)
+
+(defface magit-signature-good
+  '((t :foreground "green"))
+  "Face for good signatures."
+  :group 'magit-faces)
+
+(defface magit-signature-bad
+  '((t :foreground "red" :weight bold))
+  "Face for bad signatures."
+  :group 'magit-faces)
+
+(defface magit-signature-untrusted
+  '((t :foreground "medium aquamarine"))
+  "Face for good untrusted signatures."
+  :group 'magit-faces)
+
+(defface magit-signature-expired
+  '((t :foreground "orange"))
+  "Face for signatures that have expired."
+  :group 'magit-faces)
+
+(defface magit-signature-expired-key
+  '((t :inherit magit-signature-expired))
+  "Face for signatures made by an expired key."
+  :group 'magit-faces)
+
+(defface magit-signature-revoked
+  '((t :foreground "violet red"))
+  "Face for signatures made by a revoked key."
+  :group 'magit-faces)
+
+(defface magit-signature-error
+  '((t :foreground "light blue"))
+  "Face for signatures that cannot be checked (e.g., missing key)."
+  :group 'magit-faces)
+
+(defface magit-cherry-unmatched
+  '((t :foreground "cyan"))
+  "Face for unmatched cherry commits."
+  :group 'magit-faces)
+
+(defface magit-cherry-equivalent
+  '((t :foreground "magenta"))
+  "Face for equivalent cherry commits."
+  :group 'magit-faces)
+
+(defface magit-filename
+  '((t :weight normal))
+  "Face for filenames."
+  :group 'magit-faces)
+
+;;; Global Bindings
+
+;;;###autoload
+(defcustom magit-define-global-key-bindings 'default
+  "Which set of key bindings to add to the global keymap, if any.
+
+This option controls which set of Magit key bindings, if any, may
+be added to the global keymap, even before Magit is first used in
+the current Emacs session.
+
+If the value is nil, no bindings are added.
+
+If `default', maybe add:
+
+    C-x g     `magit-status'
+    C-x M-g   `magit-dispatch'
+    C-c M-g   `magit-file-dispatch'
+
+If `recommended', maybe add:
+
+    C-x g     `magit-status'
+    C-c g     `magit-dispatch'
+    C-c f     `magit-file-dispatch'
+
+    These bindings are strongly recommended, but we cannot use
+    them by default, because the \"C-c <LETTER>\" namespace is
+    strictly reserved for bindings added by the user.
+
+The bindings in the chosen set may be added when
+`after-init-hook' is run.  Each binding is added if, and only
+if, at that time no other key is bound to the same command,
+and no other command is bound to the same key.  In other words
+we try to avoid adding bindings that are unnecessary, as well
+as bindings that conflict with other bindings.
+
+Adding these bindings is delayed until `after-init-hook' is
+run to allow users to set the variable anywhere in their init
+file (without having to make sure to do so before `magit' is
+loaded or autoloaded) and to increase the likelihood that all
+the potentially conflicting user bindings have already been
+added.
+
+To set this variable use either `setq' or the Custom interface.
+Do not use the function `customize-set-variable' because doing
+that would cause Magit to be loaded immediately, when that form
+is evaluated (this differs from `custom-set-variables', which
+doesn't load the libraries that define the customized variables).
+
+Setting this variable has no effect if `after-init-hook' has
+already been run."
+  :package-version '(magit . "4.0.0")
+  :group 'magit-essentials
+  :type '(choice (const :tag "Add no binding" nil)
+                 (const :tag "Use default bindings" default)
+                 (const :tag "Use recommended bindings" recommended)))
+
+;;;###autoload
+(progn
+  (defun magit-maybe-define-global-key-bindings (&optional force)
+    "See variable `magit-define-global-key-bindings'."
+    (when magit-define-global-key-bindings
+      (let ((map (current-global-map)))
+        (pcase-dolist (`(,key . ,def)
+                       (cond ((eq magit-define-global-key-bindings 'recommended)
+                              '(("C-x g"   . magit-status)
+                                ("C-c g"   . magit-dispatch)
+                                ("C-c f"   . magit-file-dispatch)))
+                             ('(("C-x g"   . magit-status)
+                                ("C-x M-g" . magit-dispatch)
+                                ("C-c M-g" . magit-file-dispatch)))))
+          ;; This is autoloaded and thus is used before `compat' is
+          ;; loaded, so we cannot use `keymap-lookup' and `keymap-set'.
+          (when (or force
+                    (not (or (lookup-key map (kbd key))
+                             (where-is-internal def (make-sparse-keymap) t))))
+            (define-key map (kbd key) def))))))
+  (if after-init-time
+      (magit-maybe-define-global-key-bindings)
+    (add-hook 'after-init-hook #'magit-maybe-define-global-key-bindings t)))
+
+;;; Dispatch Popup
+
+;;;###autoload (autoload 'magit-dispatch "magit" nil t)
+(transient-define-prefix magit-dispatch ()
+  "Invoke a Magit command from a list of available commands."
+  :info-manual "(magit)Top"
+  ["Transient and dwim commands"
+   ;; → bound in magit-mode-map or magit-section-mode-map
+   ;; ↓ bound below
+   [("A" "Apply"          magit-cherry-pick)
+    ;; a                  ↓
+    ("b" "Branch"         magit-branch)
+    ("B" "Bisect"         magit-bisect)
+    ("c" "Commit"         magit-commit)
+    ("C" "Clone"          magit-clone)
+    ("d" "Diff"           magit-diff)
+    ("D" "Diff (change)"  magit-diff-refresh)
+    ("e" "Ediff (dwim)"   magit-ediff-dwim)
+    ("E" "Ediff"          magit-ediff)
+    ("f" "Fetch"          magit-fetch)
+    ("F" "Pull"           magit-pull)
+    ;; g                  ↓
+    ;; G                → magit-refresh-all
+    ("h" "Help"           magit-info)
+    ("H" "Section info"   magit-describe-section :if-derived magit-mode)]
+   [("i" "Ignore"         magit-gitignore)
+    ("I" "Init"           magit-init)
+    ("j" "Jump to section"magit-status-jump  :if-mode     magit-status-mode)
+    ("j" "Display status" magit-status-quick :if-not-mode magit-status-mode)
+    ("J" "Display buffer" magit-display-repository-buffer)
+    ;; k                  ↓
+    ;; K                → magit-file-untrack
+    ("l" "Log"            magit-log)
+    ("L" "Log (change)"   magit-log-refresh)
+    ("m" "Merge"          magit-merge)
+    ("M" "Remote"         magit-remote)
+    ;; n                → magit-section-forward
+    ;; N       reserved → forge-dispatch
+    ("o" "Submodule"      magit-submodule)
+    ("O" "Subtree"        magit-subtree)
+    ;; p                → magit-section-backward
+    ("P" "Push"           magit-push)
+    ;; q                → magit-mode-bury-buffer
+    ("Q" "Command"        magit-git-command)]
+   [("r" "Rebase"         magit-rebase)
+    ;; R                → magit-file-rename
+    ;; s                  ↓
+    ;; S                  ↓
+    ("t" "Tag"            magit-tag)
+    ("T" "Note"           magit-notes)
+    ;; u                  ↓
+    ;; U                  ↓
+    ;; v                  ↓
+    ("V" "Revert"         magit-revert)
+    ("w" "Apply patches"  magit-am)
+    ("W" "Format patches" magit-patch)
+    ;; x                → magit-reset-quickly
+    ("X" "Reset"          magit-reset)
+    ("y" "Show Refs"      magit-show-refs)
+    ("Y" "Cherries"       magit-cherry)
+    ("z" "Stash"          magit-stash)
+    ("Z" "Worktree"       magit-worktree)
+    ("!" "Run"            magit-run)]]
+  ["Applying changes"
+   :if-derived magit-mode
+   [("a" "Apply"          magit-apply)
+    ("v" "Reverse"        magit-reverse)
+    ("k" "Discard"        magit-discard)]
+   [("s" "Stage"          magit-stage)
+    ("u" "Unstage"        magit-unstage)]
+   [("S" "Stage all"      magit-stage-modified)
+    ("U" "Unstage all"    magit-unstage-all)]]
+  ["Essential commands"
+   :if-derived magit-mode
+   [("g" "       Refresh current buffer"   magit-refresh)
+    ("q" "       Bury current buffer"      magit-mode-bury-buffer)
+    ("<tab>" "   Toggle section at point"  magit-section-toggle)
+    ("<return>" "Visit thing at point"     magit-visit-thing)]
+   [("C-x m"    "Show all key bindings"    describe-mode)
+    ("C-x i"    "Show Info manual"         magit-info)]])
+
+;;; Git Popup
+
+(defcustom magit-shell-command-verbose-prompt t
+  "Whether to show the working directory when reading a command.
+This affects `magit-git-command', `magit-git-command-topdir',
+`magit-shell-command', and `magit-shell-command-topdir'."
+  :package-version '(magit . "2.11.0")
+  :group 'magit-commands
+  :type 'boolean)
+
+(defvar magit-git-command-history nil)
+
+;;;###autoload (autoload 'magit-run "magit" nil t)
+(transient-define-prefix magit-run ()
+  "Run git or another command, or launch a graphical utility."
+  [["Run git subcommand"
+    ("!" "in repository root"   magit-git-command-topdir)
+    ("p" "in working directory" magit-git-command)]
+   ["Run shell command"
+    ("s" "in repository root"   magit-shell-command-topdir)
+    ("S" "in working directory" magit-shell-command)]
+   ["Launch"
+    ("k" "gitk"                 magit-run-gitk)
+    ("a" "gitk --all"           magit-run-gitk-all)
+    ("b" "gitk --branches"      magit-run-gitk-branches)
+    ("g" "git gui"              magit-run-git-gui)
+    ("m" "git mergetool --gui"  magit-git-mergetool)]])
+
+;;;###autoload
+(defun magit-git-command (command)
+  "Execute COMMAND asynchronously; display output.
+
+Interactively, prompt for COMMAND in the minibuffer. \"git \" is
+used as initial input, but can be deleted to run another command.
+
+With a prefix argument COMMAND is run in the top-level directory
+of the current working tree, otherwise in `default-directory'."
+  (interactive (list (magit-read-shell-command nil "git ")))
+  (magit--shell-command command))
+
+;;;###autoload
+(defun magit-git-command-topdir (command)
+  "Execute COMMAND asynchronously; display output.
+
+Interactively, prompt for COMMAND in the minibuffer. \"git \" is
+used as initial input, but can be deleted to run another command.
+
+COMMAND is run in the top-level directory of the current
+working tree."
+  (interactive (list (magit-read-shell-command t "git ")))
+  (magit--shell-command command (magit-toplevel)))
+
+;;;###autoload
+(defun magit-shell-command (command)
+  "Execute COMMAND asynchronously; display output.
+
+Interactively, prompt for COMMAND in the minibuffer.  With a
+prefix argument COMMAND is run in the top-level directory of
+the current working tree, otherwise in `default-directory'."
+  (interactive (list (magit-read-shell-command)))
+  (magit--shell-command command))
+
+;;;###autoload
+(defun magit-shell-command-topdir (command)
+  "Execute COMMAND asynchronously; display output.
+
+Interactively, prompt for COMMAND in the minibuffer.  COMMAND
+is run in the top-level directory of the current working tree."
+  (interactive (list (magit-read-shell-command t)))
+  (magit--shell-command command (magit-toplevel)))
+
+(defun magit--shell-command (command &optional directory)
+  (let ((default-directory (or directory default-directory)))
+    (with-environment-variables (("GIT_PAGER" "cat"))
+      (magit--with-connection-local-variables
+        (magit-with-editor
+          (magit-start-process shell-file-name nil
+                               shell-command-switch command)))))
+  (magit-process-buffer))
+
+(defun magit-read-shell-command (&optional toplevel initial-input)
+  (let ((default-directory
+         (if (or toplevel current-prefix-arg)
+             (or (magit-toplevel)
+                 (magit--not-inside-repository-error))
+           default-directory)))
+    (read-shell-command (if magit-shell-command-verbose-prompt
+                            (format "Async shell command in %s: "
+                                    (abbreviate-file-name default-directory))
+                          "Async shell command: ")
+                        initial-input 'magit-git-command-history)))
+
+;;; Shared Infix Arguments
+
+(transient-define-argument magit:--gpg-sign ()
+  :description "Sign using gpg"
+  :class 'transient-option
+  :shortarg "-S"
+  :argument "--gpg-sign="
+  :allow-empty t
+  :reader #'magit-read-gpg-signing-key)
+
+(defvar magit-gpg-secret-key-hist nil)
+
+(defun magit-read-gpg-secret-key
+    (prompt &optional initial-input history predicate default)
+  (require 'epa)
+  (let* ((keys (cl-mapcan
+                (lambda (cert)
+                  (and (or (not predicate)
+                           (funcall predicate cert))
+                       (let* ((key (car (epg-key-sub-key-list cert)))
+                              (fpr (epg-sub-key-fingerprint key))
+                              (id  (epg-sub-key-id key))
+                              (author
+                               (and-let* ((id-obj
+                                           (car (epg-key-user-id-list cert))))
+                                 (let ((id-str (epg-user-id-string id-obj)))
+                                   (if (stringp id-str)
+                                       id-str
+                                     (epg-decode-dn id-obj))))))
+                         (list
+                          (propertize fpr 'display
+                                      (concat (substring fpr 0 (- (length id)))
+                                              (propertize id 'face 'highlight)
+                                              " " author))))))
+                (epg-list-keys (epg-make-context epa-protocol) nil t)))
+         (choice (or (and (not current-prefix-arg)
+                          (or (and (length= keys 1) (car keys))
+                              (and default (car (member default keys)))))
+                     (completing-read prompt keys nil nil nil
+                                      history nil initial-input))))
+    (set-text-properties 0 (length choice) nil choice)
+    choice))
+
+(defun magit-read-gpg-signing-key (prompt &optional initial-input history)
+  (magit-read-gpg-secret-key
+   prompt initial-input history
+   (lambda (cert)
+     (cl-some (lambda (key)
+                (memq 'sign (epg-sub-key-capability key)))
+              (epg-key-sub-key-list cert)))
+   magit-openpgp-default-signing-key))
+
+;;; Font-Lock Keywords
+
+(defconst magit-font-lock-keywords
+  (eval-when-compile
+    `((,(concat "(\\(magit-define-section-jumper\\)\\_>"
+                "[ \t'(]*"
+                "\\(\\(?:\\sw\\|\\s_\\)+\\)?")
+       (1 'font-lock-keyword-face)
+       (2 'font-lock-function-name-face nil t))
+      (,(concat "(" (regexp-opt '("magit-insert-section"
+                                  "magit-section-case"
+                                  "magit-bind-match-strings"
+                                  "magit-with-temp-index"
+                                  "magit-with-blob"
+                                  "magit-with-toplevel")
+                                t)
+                "\\_>")
+       . 1))))
+
+(font-lock-add-keywords 'emacs-lisp-mode magit-font-lock-keywords)
+
+;;; Version
+
+(defvar magit-version #'undefined
+  "The version of Magit that you're using.
+Use the function by the same name instead of this variable.")
+
+;;;###autoload
+(defun magit-version (&optional print-dest interactive nowarn)
+  "Return the version of Magit currently in use.
+
+If optional argument PRINT-DEST is non-nil, also print the used
+versions of Magit, Transient, Git and Emacs to the output stream
+selected by that argument.  Interactively use the echo area, or
+with a prefix argument use the current buffer.  Additionally put
+the output in the kill ring.
+\n(fn &optional PRINT-DEST)"
+  (interactive (list (if current-prefix-arg (current-buffer) t) t))
+  (let ((magit-git-global-arguments nil)
+        (toplib (or load-file-name buffer-file-name))
+        debug)
+    (unless (and toplib
+                 (member (file-name-nondirectory toplib)
+                         '("magit.el" "magit.el.gz")))
+      (let ((load-suffixes (reverse load-suffixes))) ; prefer .el than .elc
+        (setq toplib (locate-library "magit"))))
+    (setq toplib (and toplib (magit--chase-links toplib)))
+    (push toplib debug)
+    (when toplib
+      (let* ((topdir (file-name-directory toplib))
+             (gitdir (expand-file-name
+                      ".git" (file-name-directory
+                              (directory-file-name topdir))))
+             (static (locate-library "magit-version.el" nil (list topdir)))
+             (static (and static (magit--chase-links static))))
+        (or (progn
+              (push 'repo debug)
+              (when (and (file-exists-p gitdir)
+                         ;; It is a repo, but is it the Magit repo?
+                         (file-exists-p
+                          (expand-file-name "../lisp/magit.el" gitdir)))
+                (push t debug)
+                ;; Inside the repo the version file should only exist
+                ;; while running make.
+                (when (and static (not noninteractive))
+                  (ignore-errors (delete-file static)))
+                (setq magit-version
+                      (let ((default-directory topdir))
+                        (magit-git-string "describe"
+                                          "--tags" "--dirty" "--always")))))
+            (progn
+              (push 'static debug)
+              (when (and static (file-exists-p static))
+                (push t debug)
+                (load-file static)
+                magit-version))
+            (when (featurep 'package)
+              (push 'elpa debug)
+              (ignore-errors
+                (when-let ((version (cadr (assq 'magit package-alist))))
+                  (push t debug)
+                  (setq magit-version
+                        (and (fboundp 'package-desc-version)
+                             (package-version-join
+                              (package-desc-version version)))))))
+            (progn
+              (push 'dirname debug)
+              (let ((dirname (file-name-nondirectory
+                              (directory-file-name topdir))))
+                (when (string-match "\\`magit-\\([0-9].*\\)" dirname)
+                  (setq magit-version (match-string 1 dirname)))))
+            ;; If all else fails, just report the commit hash. It's
+            ;; better than nothing and we cannot do better in the case
+            ;; of e.g., a shallow clone.
+            (progn
+              (push 'hash debug)
+              ;; Same check as above to see if it's really the Magit repo.
+              (when (and (file-exists-p gitdir)
+                         (file-exists-p
+                          (expand-file-name "../lisp/magit.el" gitdir)))
+                (setq magit-version
+                      (let ((default-directory topdir))
+                        (magit-git-string "rev-parse" "HEAD"))))))))
+    (if (stringp magit-version)
+        (when print-dest
+          (let ((str (format
+                      "Magit %s%s, Transient %s,%s Git %s, Emacs %s, %s"
+                      (or magit-version "(unknown)")
+                      (or (and (ignore-errors
+                                 (magit--version>= magit-version "2008"))
+                               (ignore-errors
+                                 (require 'lisp-mnt)
+                                 (and (fboundp 'lm-header)
+                                      (format
+                                       " [>= %s]"
+                                       (with-temp-buffer
+                                         (insert-file-contents
+                                          (locate-library "magit.el" t))
+                                         (lm-header "Package-Version"))))))
+                          "")
+                      (or (ignore-errors
+                            (require 'lisp-mnt)
+                            (and (fboundp 'lm-header)
+                                 (with-temp-buffer
+                                   (insert-file-contents
+                                    (locate-library "transient.el" t))
+                                   (lm-header "Package-Version"))))
+                          "(unknown)")
+                      (let ((lib (locate-library "forge.el" t)))
+                        (or (and lib
+                                 (format
+                                  " Forge %s,"
+                                  (or (ignore-errors
+                                        (require 'lisp-mnt)
+                                        (with-temp-buffer
+                                          (insert-file-contents lib)
+                                          (and (fboundp 'lm-header)
+                                               (lm-header "Package-Version"))))
+                                      "(unknown)")))
+                            ""))
+                      (magit--safe-git-version)
+                      emacs-version
+                      system-type)))
+            (when interactive
+              (kill-new str))
+            (princ str print-dest)))
+      (setq debug (reverse debug))
+      (setq magit-version 'error)
+      (when magit-version
+        (push magit-version debug))
+      (unless (or nowarn (equal (getenv "CI") "true"))
+        (message "Cannot determine Magit's version %S" debug)))
+    magit-version))
+
+;;; Startup Asserts
+
+(defun magit-startup-asserts ()
+  (when-let ((val (getenv "GIT_DIR")))
+    (setenv "GIT_DIR")
+    (message
+     "Magit unset $GIT_DIR (was %S).  See %s" val
+     ;; Note: Pass URL as argument rather than embedding in the format
+     ;; string to prevent the single quote from being rendered
+     ;; according to `text-quoting-style'.
+     "https://github.com/magit/magit/wiki/Don't-set-$GIT_DIR-and-alike"))
+  (when-let ((val (getenv "GIT_WORK_TREE")))
+    (setenv "GIT_WORK_TREE")
+    (message
+     "Magit unset $GIT_WORK_TREE (was %S).  See %s" val
+     ;; See comment above.
+     "https://github.com/magit/magit/wiki/Don't-set-$GIT_DIR-and-alike"))
+  ;; Git isn't required while building Magit.
+  (unless (bound-and-true-p byte-compile-current-file)
+    (magit-git-version-assert))
+  (when (version< emacs-version magit--minimal-emacs)
+    (display-warning 'magit (format "\
+Magit requires Emacs >= %s, you are using %s.
+
+If this comes as a surprise to you, because you do actually have
+a newer version installed, then that probably means that the
+older version happens to appear earlier on the `$PATH'.  If you
+always start Emacs from a shell, then that can be fixed in the
+shell's init file.  If you start Emacs by clicking on an icon,
+or using some sort of application launcher, then you probably
+have to adjust the environment as seen by graphical interface.
+For X11 something like ~/.xinitrc should work.\n"
+                                    magit--minimal-emacs emacs-version)
+                     :error)))
+
+;;; Loading Libraries
+
+(provide 'magit)
+
+(cl-eval-when (load eval)
+  (require 'magit-status)
+  (require 'magit-refs)
+  (require 'magit-files)
+  (require 'magit-reset)
+  (require 'magit-branch)
+  (require 'magit-merge)
+  (require 'magit-tag)
+  (require 'magit-worktree)
+  (require 'magit-notes)
+  (require 'magit-sequence)
+  (require 'magit-commit)
+  (require 'magit-remote)
+  (require 'magit-clone)
+  (require 'magit-fetch)
+  (require 'magit-pull)
+  (require 'magit-push)
+  (require 'magit-bisect)
+  (require 'magit-stash)
+  (require 'magit-blame)
+  (require 'magit-submodule)
+  (unless (load "magit-autoloads" t t)
+    (require 'magit-patch)
+    (require 'magit-subtree)
+    (require 'magit-ediff)
+    (require 'magit-gitignore)
+    (require 'magit-sparse-checkout)
+    (require 'magit-extras)
+    (require 'git-rebase)
+    (require 'magit-bookmark)))
+
+(with-eval-after-load 'bookmark
+  (require 'magit-bookmark))
+
+(unless (bound-and-true-p byte-compile-current-file)
+  (if after-init-time
+      (progn (magit-startup-asserts)
+             (magit-version nil nil t))
+    (add-hook 'after-init-hook #'magit-startup-asserts t)
+    (add-hook 'after-init-hook #'magit-version t)))
+
+;;; magit.el ends here
diff --git a/emacs/elpa/magit-20240930.1805/magit.elc b/emacs/elpa/magit-20241001.2052/magit.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20241001.2052/magit.info b/emacs/elpa/magit-20241001.2052/magit.info
@@ -0,0 +1,11592 @@
+This is magit.info, produced by makeinfo version 6.8 from magit.texi.
+
+     Copyright (C) 2015-2024 Jonas Bernoulli
+     <emacs.magit@jonas.bernoulli.dev>
+
+     You can redistribute this document and/or modify it under the terms
+     of the GNU General Public License as published by the Free Software
+     Foundation, either version 3 of the License, or (at your option)
+     any later version.
+
+     This document is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+
+INFO-DIR-SECTION Emacs
+START-INFO-DIR-ENTRY
+* Magit: (magit).       Using Git from Emacs with Magit.
+END-INFO-DIR-ENTRY
+
+
+File: magit.info,  Node: Top,  Next: Introduction,  Up: (dir)
+
+Magit User Manual
+*****************
+
+Magit is an interface to the version control system Git, implemented as
+an Emacs package.  Magit aspires to be a complete Git porcelain.  While
+we cannot (yet) claim that Magit wraps and improves upon each and every
+Git command, it is complete enough to allow even experienced Git users
+to perform almost all of their daily version control tasks directly from
+within Emacs.  While many fine Git clients exist, only Magit and Git
+itself deserve to be called porcelains.
+
+This manual is for Magit version 4.1.1.
+
+     Copyright (C) 2015-2024 Jonas Bernoulli
+     <emacs.magit@jonas.bernoulli.dev>
+
+     You can redistribute this document and/or modify it under the terms
+     of the GNU General Public License as published by the Free Software
+     Foundation, either version 3 of the License, or (at your option)
+     any later version.
+
+     This document is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+
+* Menu:
+
+* Introduction::
+* Installation::
+* Getting Started::
+* Interface Concepts::
+* Inspecting::
+* Manipulating::
+* Transferring::
+* Miscellaneous::
+* Customizing::
+* Plumbing::
+* FAQ::
+* Debugging Tools::
+* Keystroke Index::
+* Function and Command Index::
+* Variable Index::
+
+— The Detailed Node Listing —
+
+Installation
+
+* Installing from Melpa::
+* Installing from the Git Repository::
+* Post-Installation Tasks::
+
+Interface Concepts
+
+* Modes and Buffers::
+* Sections::
+* Transient Commands::
+* Transient Arguments and Buffer Variables::
+* Completion, Confirmation and the Selection: Completion Confirmation and the Selection.
+* Mouse Support::
+* Running Git::
+
+Modes and Buffers
+
+* Switching Buffers::
+* Naming Buffers::
+* Quitting Windows::
+* Automatic Refreshing of Magit Buffers::
+* Automatic Saving of File-Visiting Buffers::
+* Automatic Reverting of File-Visiting Buffers::
+
+
+Sections
+
+* Section Movement::
+* Section Visibility::
+* Section Hooks::
+* Section Types and Values::
+* Section Options::
+
+
+Completion, Confirmation and the Selection
+
+* Action Confirmation::
+* Completion and Confirmation::
+* The Selection::
+* The hunk-internal region::
+* Support for Completion Frameworks::
+* Additional Completion Options::
+
+
+Running Git
+
+* Viewing Git Output::
+* Git Process Status::
+* Running Git Manually::
+* Git Executable::
+* Global Git Arguments::
+
+
+Inspecting
+
+* Status Buffer::
+* Repository List::
+* Logging::
+* Diffing::
+* Ediffing::
+* References Buffer::
+* Bisecting::
+* Visiting Files and Blobs::
+* Blaming::
+
+Status Buffer
+
+* Status Sections::
+* Status Header Sections::
+* Status Module Sections::
+* Status Options::
+
+
+Logging
+
+* Refreshing Logs::
+* Log Buffer::
+* Log Margin::
+* Select from Log::
+* Reflog::
+* Cherries::
+
+
+Diffing
+
+* Refreshing Diffs::
+* Commands Available in Diffs::
+* Diff Options::
+* Revision Buffer::
+
+
+References Buffer
+
+* References Sections::
+
+
+Visiting Files and Blobs
+
+* General-Purpose Visit Commands::
+* Visiting Files and Blobs from a Diff::
+
+
+Manipulating
+
+* Creating Repository::
+* Cloning Repository::
+* Staging and Unstaging::
+* Applying::
+* Committing::
+* Branching::
+* Merging::
+* Resolving Conflicts::
+* Rebasing::
+* Cherry Picking::
+* Resetting::
+* Stashing::
+
+Staging and Unstaging
+
+* Staging from File-Visiting Buffers::
+
+
+Committing
+
+* Initiating a Commit::
+* Editing Commit Messages::
+
+
+Branching
+
+* The Two Remotes::
+* Branch Commands::
+* Branch Git Variables::
+* Auxiliary Branch Commands::
+
+
+Rebasing
+
+* Editing Rebase Sequences::
+* Information About In-Progress Rebase::
+
+
+Cherry Picking
+
+* Reverting::
+
+
+Transferring
+
+* Remotes::
+* Fetching::
+* Pulling::
+* Pushing::
+* Plain Patches::
+* Maildir Patches::
+
+Remotes
+
+* Remote Commands::
+* Remote Git Variables::
+
+
+Miscellaneous
+
+* Tagging::
+* Notes::
+* Submodules::
+* Subtree::
+* Worktree::
+* Sparse checkouts::
+* Bundle::
+* Common Commands::
+* Wip Modes::
+* Commands for Buffers Visiting Files::
+* Minor Mode for Buffers Visiting Blobs::
+
+Submodules
+
+* Listing Submodules::
+* Submodule Transient::
+
+
+Wip Modes
+
+* Wip Graph::
+* Legacy Wip Modes::
+
+
+Customizing
+
+* Per-Repository Configuration::
+* Essential Settings::
+
+Essential Settings
+
+* Safety::
+* Performance::
+* Global Bindings::
+
+
+Plumbing
+
+* Calling Git::
+* Section Plumbing::
+* Refreshing Buffers::
+* Conventions::
+
+Calling Git
+
+* Getting a Value from Git::
+* Calling Git for Effect::
+
+
+Section Plumbing
+
+* Creating Sections::
+* Section Selection::
+* Matching Sections::
+
+
+Conventions
+
+* Theming Faces::
+
+
+FAQ
+
+* FAQ - How to ...?::
+* FAQ - Issues and Errors::
+
+FAQ - How to ...?
+
+* How to pronounce Magit?::
+* How to show git's output?::
+* How to install the gitman info manual?::
+* How to show diffs for gpg-encrypted files?::
+* How does branching and pushing work?::
+* Should I disable VC?::
+
+
+FAQ - Issues and Errors
+
+* Magit is slow::
+* I changed several thousand files at once and now Magit is unusable::
+* I am having problems committing::
+* I am using MS Windows and cannot push with Magit::
+* I am using macOS and SOMETHING works in shell, but not in Magit: I am using macOS and SOMETHING works in shell but not in Magit.
+* Expanding a file to show the diff causes it to disappear::
+* Point is wrong in the COMMIT_EDITMSG buffer::
+* The mode-line information isn't always up-to-date::
+* A branch and tag sharing the same name breaks SOMETHING::
+* My Git hooks work on the command-line but not inside Magit::
+* git-commit-mode isn't used when committing from the command-line::
+* Point ends up inside invisible text when jumping to a file-visiting buffer::
+* I am no longer able to save popup defaults::
+
+
+
+
+File: magit.info,  Node: Introduction,  Next: Installation,  Prev: Top,  Up: Top
+
+1 Introduction
+**************
+
+Magit is an interface to the version control system Git, implemented as
+an Emacs package.  Magit aspires to be a complete Git porcelain.  While
+we cannot (yet) claim that Magit wraps and improves upon each and every
+Git command, it is complete enough to allow even experienced Git users
+to perform almost all of their daily version control tasks directly from
+within Emacs.  While many fine Git clients exist, only Magit and Git
+itself deserve to be called porcelains.
+
+   Staging and otherwise applying changes is one of the most important
+features in a Git porcelain and here Magit outshines anything else,
+including Git itself.  Git’s own staging interface (‘git add --patch’)
+is so cumbersome that many users only use it in exceptional cases.  In
+Magit staging a hunk or even just part of a hunk is as trivial as
+staging all changes made to a file.
+
+   The most visible part of Magit’s interface is the status buffer,
+which displays information about the current repository.  Its content is
+created by running several Git commands and making their output
+actionable.  Among other things, it displays information about the
+current branch, lists unpulled and unpushed changes and contains
+sections displaying the staged and unstaged changes.  That might sound
+noisy, but, since sections are collapsible, it’s not.
+
+   To stage or unstage a change one places the cursor on the change and
+then types ‘s’ or ‘u’.  The change can be a file or a hunk, or when the
+region is active (i.e., when there is a selection) several files or
+hunks, or even just part of a hunk.  The change or changes that these
+commands - and many others - would act on are highlighted.
+
+   Magit also implements several other "apply variants" in addition to
+staging and unstaging.  One can discard or reverse a change, or apply it
+to the working tree.  Git’s own porcelain only supports this for staging
+and unstaging and you would have to do something like ‘git diff ... |
+??? | git apply ...’ to discard, revert, or apply a single hunk on the
+command line.  In fact that’s exactly what Magit does internally (which
+is what lead to the term "apply variants").
+
+   Magit isn’t just for Git experts, but it does assume some prior
+experience with Git as well as Emacs.  That being said, many users have
+reported that using Magit was what finally taught them what Git is
+capable of and how to use it to its fullest.  Other users wished they
+had switched to Emacs sooner so that they would have gotten their hands
+on Magit earlier.
+
+   While one has to know the basic features of Emacs to be able to make
+full use of Magit, acquiring just enough Emacs skills doesn’t take long
+and is worth it, even for users who prefer other editors.  Vim users are
+advised to give Evil (https://github.com/emacs-evil/evil), the
+"Extensible VI Layer for Emacs", and Spacemacs
+(https://github.com/syl20bnr/spacemacs), an "Emacs starter-kit focused
+on Evil" a try.
+
+   Magit provides a consistent and efficient Git porcelain.  After a
+short learning period, you will be able to perform most of your daily
+version control tasks faster than you would on the command line.  You
+will likely also start using features that seemed too daunting in the
+past.
+
+   Magit fully embraces Git.  It exposes many advanced features using a
+simple but flexible interface instead of only wrapping the trivial ones
+like many GUI clients do.  Of course Magit supports logging, cloning,
+pushing, and other commands that usually don’t fail in spectacular ways;
+but it also supports tasks that often cannot be completed in a single
+step.  Magit fully supports tasks such as merging, rebasing,
+cherry-picking, reverting, and blaming by not only providing a command
+to initiate these tasks but also by displaying context sensitive
+information along the way and providing commands that are useful for
+resolving conflicts and resuming the sequence after doing so.
+
+   Magit wraps and in many cases improves upon at least the following
+Git porcelain commands: ‘add’, ‘am’, ‘bisect’, ‘blame’, ‘branch’,
+‘checkout’, ‘cherry’, ‘cherry-pick’, ‘clean’, ‘clone’, ‘commit’,
+‘config’, ‘describe’, ‘diff’, ‘fetch’, ‘format-patch’, ‘init’, ‘log’,
+‘merge’, ‘merge-tree’, ‘mv’, ‘notes’, ‘pull’, ‘rebase’, ‘reflog’,
+‘remote’, ‘request-pull’, ‘reset’, ‘revert’, ‘rm’, ‘show’, ‘stash’,
+‘submodule’, ‘subtree’, ‘tag’, and ‘worktree.’ Many more Magit porcelain
+commands are implemented on top of Git plumbing commands.
+
+
+File: magit.info,  Node: Installation,  Next: Getting Started,  Prev: Introduction,  Up: Top
+
+2 Installation
+**************
+
+Magit can be installed using Emacs’ package manager or manually from its
+development repository.
+
+* Menu:
+
+* Installing from Melpa::
+* Installing from the Git Repository::
+* Post-Installation Tasks::
+
+
+File: magit.info,  Node: Installing from Melpa,  Next: Installing from the Git Repository,  Up: Installation
+
+2.1 Installing from Melpa
+=========================
+
+Magit is available from Melpa and Melpa-Stable.  If you haven’t used
+Emacs’ package manager before, then it is high time you familiarize
+yourself with it by reading the documentation in the Emacs manual, see
+*note (emacs)Packages::.  Then add one of the archives to
+‘package-archives’:
+
+   • To use Melpa:
+
+     (require 'package)
+     (add-to-list 'package-archives
+                  '("melpa" . "https://melpa.org/packages/") t)
+
+   • To use Melpa-Stable:
+
+     (require 'package)
+     (add-to-list 'package-archives
+                  '("melpa-stable" . "https://stable.melpa.org/packages/") t)
+
+   Once you have added your preferred archive, you need to update the
+local package list using:
+
+     M-x package-refresh-contents RET
+
+   Once you have done that, you can install Magit and its dependencies
+using:
+
+     M-x package-install RET magit RET
+
+   Now see *note Post-Installation Tasks::.
+
+
+File: magit.info,  Node: Installing from the Git Repository,  Next: Post-Installation Tasks,  Prev: Installing from Melpa,  Up: Installation
+
+2.2 Installing from the Git Repository
+======================================
+
+Magit depends on the ‘compat’, ‘dash’, ‘transient’ and ‘with-editor’
+libraries which are available from Melpa and Melpa-Stable.  Install them
+using ‘M-x package-install RET <package> RET’.  Of course you may also
+install them manually from their repository.
+
+   Then clone the Magit repository:
+
+     $ git clone https://github.com/magit/magit.git ~/.emacs.d/site-lisp/magit
+     $ cd ~/.emacs.d/site-lisp/magit
+
+   Then compile the libraries and generate the info manuals:
+
+     $ make
+
+   If you haven’t installed ‘compat’, ‘dash’, ‘transient’ and
+‘with-editor’ from Melpa or at ‘/path/to/magit/../<package>’, then you
+have to tell ‘make’ where to find them.  To do so create the file
+‘/path/to/magit/config.mk’ with the following content before running
+‘make’:
+
+     LOAD_PATH  = -L ~/.emacs.d/site-lisp/magit/lisp
+     LOAD_PATH += -L ~/.emacs.d/site-lisp/dash
+     LOAD_PATH += -L ~/.emacs.d/site-lisp/transient/lisp
+     LOAD_PATH += -L ~/.emacs.d/site-lisp/with-editor/lisp
+     LOAD_PATH += -L ~/.emacs.d/site-lisp/compat
+
+   Finally add this to your init file:
+
+     (add-to-list 'load-path "~/.emacs.d/site-lisp/magit/lisp")
+     (require 'magit)
+
+     (with-eval-after-load 'info
+       (info-initialize)
+       (add-to-list 'Info-directory-list
+                    "~/.emacs.d/site-lisp/magit/Documentation/"))
+
+   Of course if you installed the dependencies manually as well, then
+you have to tell Emacs about them too, by prefixing the above with:
+
+     (add-to-list 'load-path "~/.emacs.d/site-lisp/dash")
+     (add-to-list 'load-path "~/.emacs.d/site-lisp/transient/lisp")
+     (add-to-list 'load-path "~/.emacs.d/site-lisp/with-editor")
+
+   Note that you have to add the ‘lisp’ subdirectory to the ‘load-path’,
+not the top-level of the repository, and that elements of ‘load-path’
+should not end with a slash, while those of ‘Info-directory-list’
+should.
+
+   Instead of requiring the feature ‘magit’, you could load just the
+autoload definitions, by loading the file ‘magit-autoloads.el’.
+
+     (load "/path/to/magit/lisp/magit-autoloads")
+
+   Instead of running Magit directly from the repository by adding that
+to the ‘load-path’, you might want to instead install it in some other
+directory using ‘sudo make install’ and setting ‘load-path’ accordingly.
+
+   To update Magit use:
+
+     $ git pull
+     $ make
+
+   At times it might be necessary to run ‘make clean all’ instead.
+
+   To view all available targets use ‘make help’.
+
+   Now see *note Post-Installation Tasks::.
+
+
+File: magit.info,  Node: Post-Installation Tasks,  Prev: Installing from the Git Repository,  Up: Installation
+
+2.3 Post-Installation Tasks
+===========================
+
+After installing Magit you should verify that you are indeed using the
+Magit, Git, and Emacs releases you think you are using.  It’s best to
+restart Emacs before doing so, to make sure you are not using an
+outdated value for ‘load-path’.
+
+     M-x magit-version RET
+
+   should display something like
+
+     Magit 2.8.0, Git 2.10.2, Emacs 25.1.1, gnu/linux
+
+   Then you might also want to read about options that many users likely
+want to customize.  See *note Essential Settings::.
+
+   To be able to follow cross references to Git manpages found in this
+manual, you might also have to manually install the ‘gitman’ info
+manual, or advice ‘Info-follow-nearest-node’ to instead open the actual
+manpage.  See *note How to install the gitman info manual?::.
+
+   If you are completely new to Magit then see *note Getting Started::.
+
+   If you run into problems, then please see the *note FAQ::.  Also see
+the *note Debugging Tools::.
+
+   And last but not least please consider making a donation, to ensure
+that I can keep working on Magit.  See <https://magit.vc/donations>.
+for various donation options.
+
+
+File: magit.info,  Node: Getting Started,  Next: Interface Concepts,  Prev: Installation,  Up: Top
+
+3 Getting Started
+*****************
+
+This short tutorial describes the most essential features that many
+Magitians use on a daily basis.  It only scratches the surface but
+should be enough to get you started.
+
+   IMPORTANT: It is safest if you clone some repository just for this
+tutorial.  Alternatively you can use an existing local repository, but
+if you do that, then you should commit all uncommitted changes before
+proceeding.
+
+   Type ‘C-x g’ to display information about the current Git repository
+in a dedicated buffer, called the status buffer.
+
+   Most Magit commands are commonly invoked from the status buffer.  It
+can be considered the primary interface for interacting with Git using
+Magit.  Many other Magit buffers may exist at a given time, but they are
+often created from this buffer.
+
+   Depending on what state your repository is in, this buffer may
+contain sections titled "Staged changes", "Unstaged changes", "Unmerged
+into origin/master", "Unpushed to origin/master", and many others.
+
+   Since we are starting from a safe state, which you can easily return
+to (by doing a ‘git reset --hard PRE-MAGIT-STATE’), there currently are
+no staged or unstaged changes.  Edit some files and save the changes.
+Then go back to the status buffer, while at the same time refreshing it,
+by typing ‘C-x g’.  (When the status buffer, or any Magit buffer for
+that matter, is the current buffer, then you can also use just ‘g’ to
+refresh it).
+
+   Move between sections using ‘p’ and ‘n’.  Note that the bodies of
+some sections are hidden.  Type ‘TAB’ to expand or collapse the section
+at point.  You can also use ‘C-tab’ to cycle the visibility of the
+current section and its children.  Move to a file section inside the
+section named "Unstaged changes" and type ‘s’ to stage the changes you
+have made to that file.  That file now appears under "Staged changes".
+
+   Magit can stage and unstage individual hunks, not just complete
+files.  Move to the file you have just staged, expand it using ‘TAB’,
+move to one of the hunks using ‘n’, and unstage just that by typing ‘u’.
+Note how the staging (‘s’) and unstaging (‘u’) commands operate on the
+change at point.  Many other commands behave the same way.
+
+   You can also un-/stage just part of a hunk.  Inside the body of a
+hunk section (move there using ‘C-n’), set the mark using ‘C-SPC’ and
+move down until some added and/or removed lines fall inside the region
+but not all of them.  Again type ‘s’ to stage.
+
+   It is also possible to un-/stage multiple files at once.  Move to a
+file section, type ‘C-SPC’, move to the next file using ‘n’, and then
+‘s’ to stage both files.  Note that both the mark and point have to be
+on the headings of sibling sections for this to work.  If the region
+looks like it does in other buffers, then it doesn’t select Magit
+sections that can be acted on as a unit.
+
+   And then of course you want to commit your changes.  Type ‘c’.  This
+shows the available commit commands and arguments in a buffer at the
+bottom of the frame.  Each command and argument is prefixed with the key
+that invokes/sets it.  Do not worry about this for now.  We want to
+create a "normal" commit, which is done by typing ‘c’ again.
+
+   Now two new buffers appear.  One is for writing the commit message,
+the other shows a diff with the changes that you are about to commit.
+Write a message and then type ‘C-c C-c’ to actually create the commit.
+
+   You probably don’t want to push the commit you just created because
+you just committed some random changes, but if that is not the case you
+could push it by typing ‘P’ to show all the available push commands and
+arguments and then ‘p’ to push to a branch with the same name as the
+local branch onto the remote configured as the push-remote.  (If the
+push-remote is not configured yet, then you would first be prompted for
+the remote to push to.)
+
+   So far we have mentioned the commit and push menu commands.  These
+are probably among the menus you will be using the most, but many others
+exist.  To show a menu that lists all other menus (as well as the
+various apply commands and some other essential commands), type ‘h’.
+Try a few.  (Such menus are also called "transient prefix commands" or
+just "transients".)
+
+   The key bindings in that menu correspond to the bindings in Magit
+buffers, including but not limited to the status buffer.  So you could
+type ‘h d’ to bring up the diff menu, but once you remember that "d"
+stands for "diff", you would usually do so by just typing ‘d’.
+
+   This "prefix of prefixes" is useful even once you have memorized all
+the bindings, as it can provide easy access to Magit commands from
+non-Magit buffers.  So, by default, it is globally bound to ‘C-x M-g’.
+
+   A similar menu featuring (for the most part) commands that act on
+just the file being visited in the current buffer, is globally bound to
+‘C-c M-g’.  That binding can also be used in buffers, which do not visit
+a file, but then only a subset of the commands is available.
+
+   The global key bindings mentioned in the previous two paragraphs are
+quite inconvenient.  We recommend using ‘C-c g’ and ‘C-c f’ instead, but
+cannot use those key sequences by default because they are strictly
+reserved for bindings added by the user.  See *note Global Bindings::,
+if you want to explicitly opt-in to the recommended key bindings.
+
+   Magit also provides context menus and other mouse commands, see *note
+Mouse Support::.
+
+   It is not necessary that you do so now, but if you stick with Magit,
+then it is highly recommended that you read the next section too.
+
+
+File: magit.info,  Node: Interface Concepts,  Next: Inspecting,  Prev: Getting Started,  Up: Top
+
+4 Interface Concepts
+********************
+
+* Menu:
+
+* Modes and Buffers::
+* Sections::
+* Transient Commands::
+* Transient Arguments and Buffer Variables::
+* Completion, Confirmation and the Selection: Completion Confirmation and the Selection.
+* Mouse Support::
+* Running Git::
+
+
+File: magit.info,  Node: Modes and Buffers,  Next: Sections,  Up: Interface Concepts
+
+4.1 Modes and Buffers
+=====================
+
+Magit provides several major-modes.  For each of these modes there
+usually exists only one buffer per repository.  Separate modes and thus
+buffers exist for commits, diffs, logs, and some other things.
+
+   Besides these special purpose buffers, there also exists an overview
+buffer, called the *status buffer*.  It’s usually from this buffer that
+the user invokes Git commands, or creates or visits other buffers.
+
+   In this manual we often speak about "Magit buffers".  By that we mean
+buffers whose major-modes derive from ‘magit-mode’.
+
+‘M-x magit-toggle-buffer-lock’
+     This command locks the current buffer to its value or if the buffer
+     is already locked, then it unlocks it.
+
+     Locking a buffer to its value prevents it from being reused to
+     display another value.  The name of a locked buffer contains its
+     value, which allows telling it apart from other locked buffers and
+     the unlocked buffer.
+
+     Not all Magit buffers can be locked to their values; for example,
+     it wouldn’t make sense to lock a status buffer.
+
+     There can only be a single unlocked buffer using a certain
+     major-mode per repository.  So when a buffer is being unlocked and
+     another unlocked buffer already exists for that mode and
+     repository, then the former buffer is instead deleted and the
+     latter is displayed in its place.
+
+* Menu:
+
+* Switching Buffers::
+* Naming Buffers::
+* Quitting Windows::
+* Automatic Refreshing of Magit Buffers::
+* Automatic Saving of File-Visiting Buffers::
+* Automatic Reverting of File-Visiting Buffers::
+
+
+File: magit.info,  Node: Switching Buffers,  Next: Naming Buffers,  Up: Modes and Buffers
+
+4.1.1 Switching Buffers
+-----------------------
+
+ -- Function: magit-display-buffer buffer &optional display-function
+     This function is a wrapper around ‘display-buffer’ and is used to
+     display any Magit buffer.  It displays BUFFER in some window and,
+     unlike ‘display-buffer’, also selects that window, provided
+     ‘magit-display-buffer-noselect’ is ‘nil’.  It also runs the hooks
+     mentioned below.
+
+     If optional DISPLAY-FUNCTION is non-nil, then that is used to
+     display the buffer.  Usually that is ‘nil’ and the function
+     specified by ‘magit-display-buffer-function’ is used.
+
+ -- Variable: magit-display-buffer-noselect
+     When this is non-nil, then ‘magit-display-buffer’ only displays the
+     buffer but forgoes also selecting the window.  This variable should
+     not be set globally, it is only intended to be let-bound, by code
+     that automatically updates "the other window".  This is used for
+     example when the revision buffer is updated when you move inside
+     the log buffer.
+
+ -- User Option: magit-display-buffer-function
+     The function specified here is called by ‘magit-display-buffer’
+     with one argument, a buffer, to actually display that buffer.  This
+     function should call ‘display-buffer’ with that buffer as first and
+     a list of display actions as second argument.
+
+     Magit provides several functions, listed below, that are suitable
+     values for this option.  If you want to use different rules, then a
+     good way of doing that is to start with a copy of one of these
+     functions and then adjust it to your needs.
+
+     Instead of using a wrapper around ‘display-buffer’, that function
+     itself can be used here, in which case the display actions have to
+     be specified by adding them to ‘display-buffer-alist’ instead.
+
+     To learn about display actions, see *note (elisp)Choosing Window::.
+
+ -- Function: magit-display-buffer-traditional buffer
+     This function is the current default value of the option
+     ‘magit-display-buffer-function’.  Before that option and this
+     function were added, the behavior was hard-coded in many places all
+     over the code base but now all the rules are contained in this one
+     function (except for the "noselect" special case mentioned above).
+
+ -- Function: magit-display-buffer-same-window-except-diff-v1
+     This function displays most buffers in the currently selected
+     window.  If a buffer’s mode derives from ‘magit-diff-mode’ or
+     ‘magit-process-mode’, it is displayed in another window.
+
+ -- Function: magit-display-buffer-fullframe-status-v1
+     This function fills the entire frame when displaying a status
+     buffer.  Otherwise, it behaves like
+     ‘magit-display-buffer-traditional’.
+
+ -- Function: magit-display-buffer-fullframe-status-topleft-v1
+     This function fills the entire frame when displaying a status
+     buffer.  It behaves like ‘magit-display-buffer-fullframe-status-v1’
+     except that it displays buffers that derive from ‘magit-diff-mode’
+     or ‘magit-process-mode’ to the top or left of the current buffer
+     rather than to the bottom or right.  As a result, Magit buffers
+     tend to pop up on the same side as they would if
+     ‘magit-display-buffer-traditional’ were in use.
+
+ -- Function: magit-display-buffer-fullcolumn-most-v1
+     This function displays most buffers so that they fill the entire
+     height of the frame.  However, the buffer is displayed in another
+     window if (1) the buffer’s mode derives from ‘magit-process-mode’,
+     or (2) the buffer’s mode derives from ‘magit-diff-mode’, provided
+     that the mode of the current buffer derives from ‘magit-log-mode’
+     or ‘magit-cherry-mode’.
+
+ -- User Option: magit-pre-display-buffer-hook
+     This hook is run by ‘magit-display-buffer’ before displaying the
+     buffer.
+
+ -- Function: magit-save-window-configuration
+     This function saves the current window configuration.  Later when
+     the buffer is buried, it may be restored by
+     ‘magit-restore-window-configuration’.
+
+ -- User Option: magit-post-display-buffer-hook
+     This hook is run by ‘magit-display-buffer’ after displaying the
+     buffer.
+
+ -- Function: magit-maybe-set-dedicated
+     This function remembers if a new window had to be created to
+     display the buffer, or whether an existing window was reused.  This
+     information is later used by ‘magit-mode-quit-window’, to determine
+     whether the window should be deleted when its last Magit buffer is
+     buried.
+
+
+File: magit.info,  Node: Naming Buffers,  Next: Quitting Windows,  Prev: Switching Buffers,  Up: Modes and Buffers
+
+4.1.2 Naming Buffers
+--------------------
+
+ -- User Option: magit-generate-buffer-name-function
+     The function used to generate the names of Magit buffers.
+
+     Such a function should take the options
+     ‘magit-uniquify-buffer-names’ as well as ‘magit-buffer-name-format’
+     into account.  If it doesn’t, then should be clearly stated in the
+     doc-string.  And if it supports %-sequences beyond those mentioned
+     in the doc-string of the option ‘magit-buffer-name-format’, then
+     its own doc-string should describe the additions.
+
+ -- Function: magit-generate-buffer-name-default-function mode
+     This function returns a buffer name suitable for a buffer whose
+     major-mode is MODE and which shows information about the repository
+     in which ‘default-directory’ is located.
+
+     This function uses ‘magit-buffer-name-format’ and supporting all of
+     the %-sequences mentioned the documentation of that option.  It
+     also respects the option ‘magit-uniquify-buffer-names’.
+
+ -- User Option: magit-buffer-name-format
+     The format string used to name Magit buffers.
+
+     At least the following %-sequences are supported:
+
+        • ‘%m’
+
+          The name of the major-mode, but with the ‘-mode’ suffix
+          removed.
+
+        • ‘%M’
+
+          Like ‘%m’ but abbreviate ‘magit-status-mode’ as ‘magit’.
+
+        • ‘%v’
+
+          The value the buffer is locked to, in parentheses, or an empty
+          string if the buffer is not locked to a value.
+
+        • ‘%V’
+
+          Like ‘%v’, but the string is prefixed with a space, unless it
+          is an empty string.
+
+        • ‘%t’
+
+          The top-level directory of the working tree of the repository,
+          or if ‘magit-uniquify-buffer-names’ is non-nil an abbreviation
+          of that.
+
+        • ‘%x’
+
+          If ‘magit-uniquify-buffer-names’ is nil "*", otherwise the
+          empty string.  Due to limitations of the ‘uniquify’ package,
+          buffer names must end with the path.
+
+     The value should always contain ‘%m’ or ‘%M’, ‘%v’ or ‘%V’, and
+     ‘%t’.  If ‘magit-uniquify-buffer-names’ is non-nil, then the value
+     must end with ‘%t’ or ‘%t%x’.  See issue #2841.
+
+ -- User Option: magit-uniquify-buffer-names
+     This option controls whether the names of Magit buffers are
+     uniquified.  If the names are not being uniquified, then they
+     contain the full path of the top-level of the working tree of the
+     corresponding repository.  If they are being uniquified, then they
+     end with the basename of the top-level, or if that would conflict
+     with the name used for other buffers, then the names of all these
+     buffers are adjusted until they no longer conflict.
+
+     This is done using the ‘uniquify’ package; customize its options to
+     control how buffer names are uniquified.
+
+
+File: magit.info,  Node: Quitting Windows,  Next: Automatic Refreshing of Magit Buffers,  Prev: Naming Buffers,  Up: Modes and Buffers
+
+4.1.3 Quitting Windows
+----------------------
+
+‘q’ (‘magit-mode-bury-buffer’)
+     This command buries or kills the current Magit buffer.  The
+     function specified by option ‘magit-bury-buffer-function’ is used
+     to bury the buffer when called without a prefix argument or to kill
+     it when called with a single prefix argument.
+
+     When called with two or more prefix arguments then it always kills
+     all Magit buffers, associated with the current project, including
+     the current buffer.
+
+ -- User Option: magit-bury-buffer-function
+     The function used to actually bury or kill the current buffer.
+
+     ‘magit-mode-bury-buffer’ calls this function with one argument.  If
+     the argument is non-nil, then the function has to kill the current
+     buffer.  Otherwise it has to bury it alive.  The default value
+     currently is ‘magit-mode-quit-window’.
+
+ -- Function: magit-restore-window-configuration kill-buffer
+     Bury or kill the current buffer using ‘quit-window’, which is
+     called with KILL-BUFFER as first and the selected window as second
+     argument.
+
+     Then restore the window configuration that existed right before the
+     current buffer was displayed in the selected frame.  Unfortunately
+     that also means that point gets adjusted in all the buffers, which
+     are being displayed in the selected frame.
+
+ -- Function: magit-mode-quit-window kill-buffer
+     Bury or kill the current buffer using ‘quit-window’, which is
+     called with KILL-BUFFER as first and the selected window as second
+     argument.
+
+     Then, if the window was originally created to display a Magit
+     buffer and the buried buffer was the last remaining Magit buffer
+     that was ever displayed in the window, then that is deleted.
+
+
+File: magit.info,  Node: Automatic Refreshing of Magit Buffers,  Next: Automatic Saving of File-Visiting Buffers,  Prev: Quitting Windows,  Up: Modes and Buffers
+
+4.1.4 Automatic Refreshing of Magit Buffers
+-------------------------------------------
+
+After running a command which may change the state of the current
+repository, the current Magit buffer and the corresponding status buffer
+are refreshed.  The status buffer can be automatically refreshed
+whenever a buffer is saved to a file inside the respective repository by
+adding a hook, like so:
+
+     (with-eval-after-load 'magit-mode
+       (add-hook 'after-save-hook 'magit-after-save-refresh-status t))
+
+   Automatically refreshing Magit buffers ensures that the displayed
+information is up-to-date most of the time but can lead to a noticeable
+delay in big repositories.  Other Magit buffers are not refreshed to
+keep the delay to a minimum and also because doing so can sometimes be
+undesirable.
+
+   Buffers can also be refreshed explicitly, which is useful in buffers
+that weren’t current during the last refresh and after changes were made
+to the repository outside of Magit.
+
+‘g’ (‘magit-refresh’)
+     This command refreshes the current buffer if its major mode derives
+     from ‘magit-mode’ as well as the corresponding status buffer.
+
+     If the option ‘magit-revert-buffers’ calls for it, then it also
+     reverts all unmodified buffers that visit files being tracked in
+     the current repository.
+
+‘G’ (‘magit-refresh-all’)
+     This command refreshes all Magit buffers belonging to the current
+     repository and also reverts all unmodified buffers that visit files
+     being tracked in the current repository.
+
+     The file-visiting buffers are always reverted, even if
+     ‘magit-revert-buffers’ is nil.
+
+ -- User Option: magit-refresh-buffer-hook
+     This hook is run in each Magit buffer that was refreshed during the
+     current refresh - normally the current buffer and the status
+     buffer.
+
+ -- User Option: magit-refresh-status-buffer
+     When this option is non-nil, then the status buffer is
+     automatically refreshed after running git for side-effects, in
+     addition to the current Magit buffer, which is always refreshed
+     automatically.
+
+     Only set this to nil after exhausting all other options to improve
+     performance.
+
+ -- Function: magit-after-save-refresh-status
+     This function is intended to be added to ‘after-save-hook’.  After
+     doing that the corresponding status buffer is refreshed whenever a
+     buffer is saved to a file inside a repository.
+
+     Note that refreshing a Magit buffer is done by re-creating its
+     contents from scratch, which can be slow in large repositories.  If
+     you are not satisfied with Magit’s performance, then you should
+     obviously not add this function to that hook.
+
+
+File: magit.info,  Node: Automatic Saving of File-Visiting Buffers,  Next: Automatic Reverting of File-Visiting Buffers,  Prev: Automatic Refreshing of Magit Buffers,  Up: Modes and Buffers
+
+4.1.5 Automatic Saving of File-Visiting Buffers
+-----------------------------------------------
+
+File-visiting buffers are by default saved at certain points in time.
+This doesn’t guarantee that Magit buffers are always up-to-date, but,
+provided one only edits files by editing them in Emacs and uses only
+Magit to interact with Git, one can be fairly confident.  When in doubt
+or after outside changes, type ‘g’ (‘magit-refresh’) to save and refresh
+explicitly.
+
+ -- User Option: magit-save-repository-buffers
+     This option controls whether file-visiting buffers are saved before
+     certain events.
+
+     If this is non-nil then all modified file-visiting buffers
+     belonging to the current repository may be saved before running
+     commands, before creating new Magit buffers, and before explicitly
+     refreshing such buffers.  If this is ‘dontask’ then this is done
+     without user intervention.  If it is ‘t’ then the user has to
+     confirm each save.
+
+
+File: magit.info,  Node: Automatic Reverting of File-Visiting Buffers,  Prev: Automatic Saving of File-Visiting Buffers,  Up: Modes and Buffers
+
+4.1.6 Automatic Reverting of File-Visiting Buffers
+--------------------------------------------------
+
+By default Magit automatically reverts buffers that are visiting files
+that are being tracked in a Git repository, after they have changed on
+disk.  When using Magit one often changes files on disk by running Git,
+i.e., "outside Emacs", making this a rather important feature.
+
+   For example, if you discard a change in the status buffer, then that
+is done by running ‘git apply --reverse ...’, and Emacs considers the
+file to have "changed on disk".  If Magit did not automatically revert
+the buffer, then you would have to type ‘M-x revert-buffer RET RET’ in
+the visiting buffer before you could continue making changes.
+
+ -- User Option: magit-auto-revert-mode
+     When this mode is enabled, then buffers that visit tracked files
+     are automatically reverted after the visited files change on disk.
+
+ -- User Option: global-auto-revert-mode
+     When this mode is enabled, then any file-visiting buffer is
+     automatically reverted after the visited file changes on disk.
+
+     If you like buffers that visit tracked files to be automatically
+     reverted, then you might also like any buffer to be reverted, not
+     just those visiting tracked files.  If that is the case, then
+     enable this mode _instead of_ ‘magit-auto-revert-mode’.
+
+ -- User Option: magit-auto-revert-immediately
+     This option controls whether Magit reverts buffers immediately.
+
+     If this is non-nil and either ‘global-auto-revert-mode’ or
+     ‘magit-auto-revert-mode’ is enabled, then Magit immediately reverts
+     buffers by explicitly calling ‘auto-revert-buffers’ after running
+     Git for side-effects.
+
+     If ‘auto-revert-use-notify’ is non-nil (and file notifications are
+     actually supported), then ‘magit-auto-revert-immediately’ does not
+     have to be non-nil, because the reverts happen immediately anyway.
+
+     If ‘magit-auto-revert-immediately’ and ‘auto-revert-use-notify’ are
+     both ‘nil’, then reverts happen after ‘auto-revert-interval’
+     seconds of user inactivity.  That is not desirable.
+
+ -- User Option: auto-revert-use-notify
+     This option controls whether file notification functions should be
+     used.  Note that this variable unfortunately defaults to ‘t’ even
+     on systems on which file notifications cannot be used.
+
+ -- User Option: magit-auto-revert-tracked-only
+     This option controls whether ‘magit-auto-revert-mode’ only reverts
+     tracked files or all files that are located inside Git
+     repositories, including untracked files and files located inside
+     Git’s control directory.
+
+ -- User Option: auto-revert-mode
+     The global mode ‘magit-auto-revert-mode’ works by turning on this
+     local mode in the appropriate buffers (but
+     ‘global-auto-revert-mode’ is implemented differently).  You can
+     also turn it on or off manually, which might be necessary if Magit
+     does not notice that a previously untracked file now is being
+     tracked or vice-versa.
+
+ -- User Option: auto-revert-stop-on-user-input
+     This option controls whether the arrival of user input suspends the
+     automatic reverts for ‘auto-revert-interval’ seconds.
+
+ -- User Option: auto-revert-interval
+     This option controls how many seconds Emacs waits for before
+     resuming suspended reverts.
+
+ -- User Option: auto-revert-buffer-list-filter
+     This option specifies an additional filter used by
+     ‘auto-revert-buffers’ to determine whether a buffer should be
+     reverted or not.
+
+     This option is provided by Magit, which also advises
+     ‘auto-revert-buffers’ to respect it.  Magit users who do not turn
+     on the local mode ‘auto-revert-mode’ themselves, are best served by
+     setting the value to ‘magit-auto-revert-repository-buffer-p’.
+
+     However the default is nil, so as not to disturb users who do use
+     the local mode directly.  If you experience delays when running
+     Magit commands, then you should consider using one of the
+     predicates provided by Magit - especially if you also use Tramp.
+
+     Users who do turn on ‘auto-revert-mode’ in buffers in which Magit
+     doesn’t do that for them, should likely not use any filter.  Users
+     who turn on ‘global-auto-revert-mode’, do not have to worry about
+     this option, because it is disregarded if the global mode is
+     enabled.
+
+ -- User Option: auto-revert-verbose
+     This option controls whether Emacs reports when a buffer has been
+     reverted.
+
+   The options with the ‘auto-revert-’ prefix are located in the Custom
+group named ‘auto-revert’.  The other, Magit-specific, options are
+located in the ‘magit’ group.
+
+* Menu:
+
+* Risk of Reverting Automatically::
+
+
+File: magit.info,  Node: Risk of Reverting Automatically,  Up: Automatic Reverting of File-Visiting Buffers
+
+Risk of Reverting Automatically
+...............................
+
+For the vast majority of users, automatically reverting file-visiting
+buffers after they have changed on disk is harmless.
+
+   If a buffer is modified (i.e., it contains changes that haven’t been
+saved yet), then Emacs will refuse to automatically revert it.  If you
+save a previously modified buffer, then that results in what is seen by
+Git as an uncommitted change.  Git will then refuse to carry out any
+commands that would cause these changes to be lost.  In other words, if
+there is anything that could be lost, then either Git or Emacs will
+refuse to discard the changes.
+
+   However, if you use file-visiting buffers as a sort of ad hoc
+"staging area", then the automatic reverts could potentially cause data
+loss.  So far I have heard from only one user who uses such a workflow.
+
+   An example: You visit some file in a buffer, edit it, and save the
+changes.  Then, outside of Emacs (or at least not using Magit or by
+saving the buffer) you change the file on disk again.  At this point the
+buffer is the only place where the intermediate version still exists.
+You have saved the changes to disk, but that has since been overwritten.
+Meanwhile Emacs considers the buffer to be unmodified (because you have
+not made any changes to it since you last saved it to the visited file)
+and therefore would not object to it being automatically reverted.  At
+this point an Auto-Revert mode would kick in.  It would check whether
+the buffer is modified and since that is not the case it would revert
+it.  The intermediate version would be lost.  (Actually you could still
+get it back using the ‘undo’ command.)
+
+   If your workflow depends on Emacs preserving the intermediate version
+in the buffer, then you have to disable all Auto-Revert modes.  But
+please consider that such a workflow would be dangerous even without
+using an Auto-Revert mode, and should therefore be avoided.  If Emacs
+crashes or if you quit Emacs by mistake, then you would also lose the
+buffer content.  There would be no autosave file still containing the
+intermediate version (because that was deleted when you saved the
+buffer) and you would not be asked whether you want to save the buffer
+(because it isn’t modified).
+
+
+File: magit.info,  Node: Sections,  Next: Transient Commands,  Prev: Modes and Buffers,  Up: Interface Concepts
+
+4.2 Sections
+============
+
+Magit buffers are organized into nested sections, which can be collapsed
+and expanded, similar to how sections are handled in Org mode.  Each
+section also has a type, and some sections also have a value.  For each
+section type there can also be a local keymap, shared by all sections of
+that type.
+
+   Taking advantage of the section value and type, many commands operate
+on the current section, or when the region is active and selects
+sections of the same type, all of the selected sections.  Commands that
+only make sense for a particular section type (as opposed to just
+behaving differently depending on the type) are usually bound in section
+type keymaps.
+
+* Menu:
+
+* Section Movement::
+* Section Visibility::
+* Section Hooks::
+* Section Types and Values::
+* Section Options::
+
+
+File: magit.info,  Node: Section Movement,  Next: Section Visibility,  Up: Sections
+
+4.2.1 Section Movement
+----------------------
+
+To move within a section use the usual keys (‘C-p’, ‘C-n’, ‘C-b’, ‘C-f’
+etc), whose global bindings are not shadowed.  To move to another
+section use the following commands.
+
+‘p’ (‘magit-section-backward’)
+     When not at the beginning of a section, then move to the beginning
+     of the current section.  At the beginning of a section, instead
+     move to the beginning of the previous visible section.
+
+‘n’ (‘magit-section-forward’)
+     Move to the beginning of the next visible section.
+
+‘M-p’ (‘magit-section-backward-siblings’)
+     Move to the beginning of the previous sibling section.  If there is
+     no previous sibling section, then move to the parent section
+     instead.
+
+‘M-n’ (‘magit-section-forward-siblings’)
+     Move to the beginning of the next sibling section.  If there is no
+     next sibling section, then move to the parent section instead.
+
+‘^’ (‘magit-section-up’)
+     Move to the beginning of the parent of the current section.
+
+   The above commands all call the hook ‘magit-section-movement-hook’.
+Any of the functions listed below can be used as members of this hook.
+
+   You might want to remove some of the functions that Magit adds using
+‘add-hook’.  In doing so you have to make sure you do not attempt to
+remove function that haven’t even been added yet, for example:
+
+     (with-eval-after-load 'magit-diff
+       (remove-hook 'magit-section-movement-hook
+                    'magit-hunk-set-window-start))
+
+ -- Variable: magit-section-movement-hook
+     This hook is run by all of the above movement commands, after
+     arriving at the destination.
+
+ -- Function: magit-hunk-set-window-start
+     This hook function ensures that the beginning of the current
+     section is visible, provided it is a ‘hunk’ section.  Otherwise, it
+     does nothing.
+
+     Loading ‘magit-diff’ adds this function to the hook.
+
+ -- Function: magit-section-set-window-start
+     This hook function ensures that the beginning of the current
+     section is visible, regardless of the section’s type.  If you add
+     this to ‘magit-section-movement-hook’, then you must remove the
+     hunk-only variant in turn.
+
+ -- Function: magit-log-maybe-show-more-commits
+     This hook function only has an effect in log buffers, and ‘point’
+     is on the "show more" section.  If that is the case, then it
+     doubles the number of commits that are being shown.
+
+     Loading ‘magit-log’ adds this function to the hook.
+
+ -- Function: magit-log-maybe-update-revision-buffer
+     When moving inside a log buffer, then this function updates the
+     revision buffer, provided it is already being displayed in another
+     window of the same frame.
+
+     Loading ‘magit-log’ adds this function to the hook.
+
+ -- Function: magit-log-maybe-update-blob-buffer
+     When moving inside a log buffer and another window of the same
+     frame displays a blob buffer, then this function instead displays
+     the blob buffer for the commit at point in that window.
+
+ -- Function: magit-status-maybe-update-revision-buffer
+     When moving inside a status buffer, then this function updates the
+     revision buffer, provided it is already being displayed in another
+     window of the same frame.
+
+ -- Function: magit-status-maybe-update-stash-buffer
+     When moving inside a status buffer, then this function updates the
+     stash buffer, provided it is already being displayed in another
+     window of the same frame.
+
+ -- Function: magit-status-maybe-update-blob-buffer
+     When moving inside a status buffer and another window of the same
+     frame displays a blob buffer, then this function instead displays
+     the blob buffer for the commit at point in that window.
+
+ -- Function: magit-stashes-maybe-update-stash-buffer
+     When moving inside a buffer listing stashes, then this function
+     updates the stash buffer, provided it is already being displayed in
+     another window of the same frame.
+
+ -- User Option: magit-update-other-window-delay
+     Delay before automatically updating the other window.
+
+     When moving around in certain buffers, then certain other buffers,
+     which are being displayed in another window, may optionally be
+     updated to display information about the section at point.
+
+     When holding down a key to move by more than just one section, then
+     that would update that buffer for each section on the way.  To
+     prevent that, updating the revision buffer is delayed, and this
+     option controls for how long.  For optimal experience you might
+     have to adjust this delay and/or the keyboard repeat rate and delay
+     of your graphical environment or operating system.
+
+
+File: magit.info,  Node: Section Visibility,  Next: Section Hooks,  Prev: Section Movement,  Up: Sections
+
+4.2.2 Section Visibility
+------------------------
+
+Magit provides many commands for changing the visibility of sections,
+but all you need to get started are the next two.
+
+‘<TAB>’ (‘magit-section-toggle’)
+     Toggle the visibility of the body of the current section.
+
+‘C-c <TAB>’ (‘magit-section-cycle’)
+‘C-<tab>’ (‘magit-section-cycle’)
+     Cycle the visibility of current section and its children.
+
+     If this command is invoked using ‘C-<tab>’ and that is globally
+     bound to ‘tab-next’, then this command pivots to behave like that
+     command, and you must instead use ‘C-c TAB’ to cycle section
+     visibility.
+
+     If you would like to keep using ‘C-<tab>’ to cycle section
+     visibility but also want to use ‘tab-bar-mode’, then you have to
+     prevent that mode from using this key and instead bind another key
+     to ‘tab-next’.  Because ‘tab-bar-mode’ does not use a mode map but
+     instead manipulates the global map, this involves advising
+     ‘tab-bar--define-keys’.
+
+‘M-<tab>’ (‘magit-section-cycle-diffs’)
+     Cycle the visibility of diff-related sections in the current
+     buffer.
+
+‘S-<tab>’ (‘magit-section-cycle-global’)
+     Cycle the visibility of all sections in the current buffer.
+
+‘1’ (‘magit-section-show-level-1’)
+‘2’ (‘magit-section-show-level-2’)
+‘3’ (‘magit-section-show-level-3’)
+‘4’ (‘magit-section-show-level-4’)
+     Show sections surrounding the current section up to level N.
+
+‘M-1’ (‘magit-section-show-level-1-all’)
+‘M-2’ (‘magit-section-show-level-2-all’)
+‘M-3’ (‘magit-section-show-level-3-all’)
+‘M-4’ (‘magit-section-show-level-4-all’)
+     Show all sections up to level N.
+
+   Some functions, which are used to implement the above commands, are
+also exposed as commands themselves.  By default no keys are bound to
+these commands, as they are generally perceived to be much less useful.
+But your mileage may vary.
+
+ -- Command: magit-section-show
+     Show the body of the current section.
+
+ -- Command: magit-section-hide
+     Hide the body of the current section.
+
+ -- Command: magit-section-show-headings
+     Recursively show headings of children of the current section.  Only
+     show the headings.  Previously shown text-only bodies are hidden.
+
+ -- Command: magit-section-show-children
+     Recursively show the bodies of children of the current section.
+     With a prefix argument show children down to the level of the
+     current section, and hide deeper children.
+
+ -- Command: magit-section-hide-children
+     Recursively hide the bodies of children of the current section.
+
+ -- Command: magit-section-toggle-children
+     Toggle visibility of bodies of children of the current section.
+
+   When a buffer is first created then some sections are shown expanded
+while others are not.  This is hard coded.  When a buffer is refreshed
+then the previous visibility is preserved.  The initial visibility of
+certain sections can also be overwritten using the hook
+‘magit-section-set-visibility-hook’.
+
+ -- User Option: magit-section-initial-visibility-alist
+     This options can be used to override the initial visibility of
+     sections.  In the future it will also be used to define the
+     defaults, but currently a section’s default is still hardcoded.
+
+     The value is an alist.  Each element maps a section type or lineage
+     to the initial visibility state for such sections.  The state has
+     to be one of ‘show’ or ‘hide’, or a function that returns one of
+     these symbols.  A function is called with the section as the only
+     argument.
+
+     Use the command ‘magit-describe-section-briefly’ to determine a
+     section’s lineage or type.  The vector in the output is the section
+     lineage and the type is the first element of that vector.
+     Wildcards can be used, see ‘magit-section-match’.
+
+ -- User Option: magit-section-cache-visibility
+     This option controls for which sections the previous visibility
+     state should be restored if a section disappears and later appears
+     again.  The value is a boolean or a list of section types.  If t,
+     then the visibility of all sections is cached.  Otherwise this is
+     only done for sections whose type matches one of the listed types.
+
+     This requires that the function ‘magit-section-cached-visibility’
+     is a member of ‘magit-section-set-visibility-hook’.
+
+ -- Variable: magit-section-set-visibility-hook
+     This hook is run when first creating a buffer and also when
+     refreshing an existing buffer, and is used to determine the
+     visibility of the section currently being inserted.
+
+     Each function is called with one argument, the section being
+     inserted.  It should return ‘hide’ or ‘show’, or to leave the
+     visibility undefined ‘nil’.  If no function decides on the
+     visibility and the buffer is being refreshed, then the visibility
+     is preserved; or if the buffer is being created, then the hard
+     coded default is used.
+
+     Usually this should only be used to set the initial visibility but
+     not during refreshes.  If ‘magit-insert-section--oldroot’ is
+     non-nil, then the buffer is being refreshed and these functions
+     should immediately return ‘nil’.
+
+ -- User Option: magit-section-visibility-indicator
+     This option controls whether and how to indicate that a section can
+     be expanded/collapsed.
+
+     If nil, then no visibility indicators are shown.  Otherwise the
+     value has to have one of these two forms:
+
+        • ‘(EXPANDABLE-BITMAP . COLLAPSIBLE-BITMAP)’
+
+          Both values have to be variables whose values are fringe
+          bitmaps.  In this case every section that can be expanded or
+          collapsed gets an indicator in the left fringe.
+
+          To provide extra padding around the indicator, set
+          ‘left-fringe-width’ in ‘magit-mode-hook’, e.g.:
+
+               (add-hook 'magit-mode-hook (lambda ()
+                                            (setq left-fringe-width 20)))
+
+        • ‘(STRING . BOOLEAN)’
+
+          In this case STRING (usually an ellipsis) is shown at the end
+          of the heading of every collapsed section.  Expanded sections
+          get no indicator.  The cdr controls whether the appearance of
+          these ellipsis take section highlighting into account.  Doing
+          so might potentially have an impact on performance, while not
+          doing so is kinda ugly.
+
+
+File: magit.info,  Node: Section Hooks,  Next: Section Types and Values,  Prev: Section Visibility,  Up: Sections
+
+4.2.3 Section Hooks
+-------------------
+
+Which sections are inserted into certain buffers is controlled with
+hooks.  This includes the status and the refs buffers.  For other
+buffers, e.g., log and diff buffers, this is not possible.  The command
+‘magit-describe-section’ can be used to see which hook (if any) was
+responsible for inserting the section at point.
+
+   For buffers whose sections can be customized by the user, a hook
+variable called ‘magit-TYPE-sections-hook’ exists.  This hook should be
+changed using ‘magit-add-section-hook’.  Avoid using ‘add-hooks’ or the
+Custom interface.
+
+   The various available section hook variables are described later in
+this manual along with the appropriate "section inserter functions".
+
+ -- Function: magit-add-section-hook hook function &optional at append
+          local
+     Add the function FUNCTION to the value of section hook HOOK.
+
+     Add FUNCTION at the beginning of the hook list unless optional
+     APPEND is non-nil, in which case FUNCTION is added at the end.  If
+     FUNCTION already is a member then move it to the new location.
+
+     If optional AT is non-nil and a member of the hook list, then add
+     FUNCTION next to that instead.  Add before or after AT, or replace
+     AT with FUNCTION depending on APPEND.  If APPEND is the symbol
+     ‘replace’, then replace AT with FUNCTION.  For any other non-nil
+     value place FUNCTION right after AT.  If nil, then place FUNCTION
+     right before AT.  If FUNCTION already is a member of the list but
+     AT is not, then leave FUNCTION where ever it already is.
+
+     If optional LOCAL is non-nil, then modify the hook’s buffer-local
+     value rather than its global value.  This makes the hook local by
+     copying the default value.  That copy is then modified.
+
+     HOOK should be a symbol.  If HOOK is void, it is first set to nil.
+     HOOK’s value must not be a single hook function.  FUNCTION should
+     be a function that takes no arguments and inserts one or multiple
+     sections at point, moving point forward.  FUNCTION may choose not
+     to insert its section(s), when doing so would not make sense.  It
+     should not be abused for other side-effects.
+
+   To remove a function from a section hook, use ‘remove-hook’.
+
+
+File: magit.info,  Node: Section Types and Values,  Next: Section Options,  Prev: Section Hooks,  Up: Sections
+
+4.2.4 Section Types and Values
+------------------------------
+
+Each section has a type, for example ‘hunk’, ‘file’, and ‘commit’.
+Instances of certain section types also have a value.  The value of a
+section of type ‘file’, for example, is a file name.
+
+   Users usually do not have to worry about a section’s type and value,
+but knowing them can be handy at times.
+
+‘H’ (‘magit-describe-section’)
+     This command shows information about the section at point in a
+     separate buffer.
+
+ -- Command: magit-describe-section-briefly
+     This command shows information about the section at point in the
+     echo area, as ‘#<magit-section VALUE [TYPE PARENT-TYPE...]
+     BEGINNING-END>’.
+
+   Many commands behave differently depending on the type of the section
+at point and/or somehow consume the value of that section.  But that is
+only one of the reasons why the same key may do something different,
+depending on what section is current.
+
+   Additionally for each section type a keymap *might* be defined, named
+‘magit-TYPE-section-map’.  That keymap is used as text property keymap
+of all text belonging to any section of the respective type.  If such a
+map does not exist for a certain type, then you can define it yourself,
+and it will automatically be used.
+
+
+File: magit.info,  Node: Section Options,  Prev: Section Types and Values,  Up: Sections
+
+4.2.5 Section Options
+---------------------
+
+This section describes options that have an effect on more than just a
+certain type of sections.  As you can see there are not many of those.
+
+ -- User Option: magit-section-show-child-count
+     Whether to append the number of children to section headings.  This
+     only affects sections that could benefit from this information.
+
+
+File: magit.info,  Node: Transient Commands,  Next: Transient Arguments and Buffer Variables,  Prev: Sections,  Up: Interface Concepts
+
+4.3 Transient Commands
+======================
+
+Many Magit commands are implemented as *transient* commands.  First the
+user invokes a *prefix* command, which causes its *infix* arguments and
+*suffix* commands to be displayed in the echo area.  The user then
+optionally sets some infix arguments and finally invokes one of the
+suffix commands.
+
+   This is implemented in the library ‘transient’.  Earlier Magit
+releases used the package ‘magit-popup’ and even earlier versions
+library ‘magit-key-mode’.
+
+   Transient is documented in *note (transient)Top::.
+
+‘C-x M-g’ (‘magit-dispatch’)
+‘C-c g’ (‘magit-dispatch’)
+     This transient prefix command binds most of Magit’s other prefix
+     commands as suffix commands and displays them in a temporary buffer
+     until one of them is invoked.  Invoking such a sub-prefix causes
+     the suffixes of that command to be bound and displayed instead of
+     those of ‘magit-dispatch’.
+
+     This command is also, or especially, useful outside Magit buffers,
+     so Magit by default binds it to ‘C-c M-g’ in the global keymap.
+     ‘C-c g’ would be a better binding, but we cannot use that by
+     default, because that key sequence is reserved for the user.  See
+     *note Global Bindings:: to learn more default and recommended key
+     bindings.
+
+
+File: magit.info,  Node: Transient Arguments and Buffer Variables,  Next: Completion Confirmation and the Selection,  Prev: Transient Commands,  Up: Interface Concepts
+
+4.4 Transient Arguments and Buffer Variables
+============================================
+
+The infix arguments of many of Magit’s transient prefix commands cease
+to have an effect once the ‘git’ command that is called with those
+arguments has returned.  Commands that create a commit are a good
+example for this.  If the user changes the arguments, then that only
+affects the next invocation of a suffix command.  If the same transient
+prefix command is later invoked again, then the arguments are initially
+reset to the default value.  This default value can be set for the
+current Emacs session or saved permanently, see *note (transient)Saving
+Values::.  It is also possible to cycle through previously used sets of
+arguments using ‘C-M-p’ and ‘C-M-n’, see *note (transient)Using
+History::.
+
+   However the infix arguments of many other transient commands continue
+to have an effect even after the ‘git’ command that was called with
+those arguments has returned.  The most important commands like this are
+those that display a diff or log in a dedicated buffer.  Their arguments
+obviously continue to have an effect for as long as the respective diff
+or log is being displayed.  Furthermore the used arguments are stored in
+buffer-local variables for future reference.
+
+   For commands in the second group it isn’t always desirable to reset
+their arguments to the global value when the transient prefix command is
+invoked again.
+
+   As mentioned above, it is possible to cycle through previously used
+sets of arguments while a transient popup is visible.  That means that
+we could always reset the infix arguments to the default because the set
+of arguments that is active in the existing buffer is only a few ‘C-M-p’
+away.  Magit can be configured to behave like that, but because I expect
+that most users would not find that very convenient, it is not the
+default.
+
+   Also note that it is possible to change the diff and log arguments
+used in the current buffer (including the status buffer, which contains
+both diff and log sections) using the respective "refresh" transient
+prefix commands on ‘D’ and ‘L’.  (‘d’ and ‘l’ on the other hand are
+intended to change *what* diff or log is being displayed.  It is
+possible to also change *how* the diff or log is being displayed at the
+same time, but if you only want to do the latter, then you should use
+the refresh variants.)  Because these secondary diff and log transient
+prefixes are about *changing* the arguments used in the current buffer,
+they *always* start out with the set of arguments that are currently in
+effect in that buffer.
+
+   Some commands are usually invoked directly even though they can also
+be invoked as the suffix of a transient prefix command.  Most
+prominently ‘magit-show-commit’ is usually invoked by typing ‘RET’ while
+point is on a commit in a log, but it can also be invoked from the
+‘magit-diff’ transient prefix.
+
+   When such a command is invoked directly, then it is important to
+reuse the arguments as specified by the respective buffer-local values,
+instead of using the default arguments.  Imagine you press ‘RET’ in a
+log to display the commit at point in a different buffer and then use
+‘D’ to change how the diff is displayed in that buffer.  And then you
+press ‘RET’ on another commit to show that instead and the diff
+arguments are reset to the default.  Not cool; so Magit does not do that
+by default.
+
+ -- User Option: magit-prefix-use-buffer-arguments
+     This option controls whether the infix arguments initially shown in
+     certain transient prefix commands are based on the arguments that
+     are currently in effect in the buffer that their suffixes update.
+
+     The ‘magit-diff’ and ‘magit-log’ transient prefix commands are
+     affected by this option.
+
+ -- User Option: magit-direct-use-buffer-arguments
+     This option controls whether certain commands, when invoked
+     directly (i.e., not as the suffix of a transient prefix command),
+     use the arguments that are currently active in the buffer that they
+     are about to update.  The alternative is to use the default value
+     for these arguments, which might change the arguments that are used
+     in the buffer.
+
+Valid values for both of the above options are:
+
+   • ‘always’: Always use the set of arguments that is currently active
+     in the respective buffer, provided that buffer exists of course.
+   • ‘selected’ or ‘t’: Use the set of arguments from the respective
+     buffer, but only if it is displayed in a window of the current
+     frame.  This is the default for both variables.
+   • ‘current’: Use the set of arguments from the respective buffer, but
+     only if it is the current buffer.
+   • ‘never’: Never use the set of arguments from the respective buffer.
+
+I am afraid it gets more complicated still:
+
+   • The global diff and log arguments are set for each supported mode
+     individually.  The diff arguments for example have different values
+     in ‘magit-diff-mode’, ‘magit-revision-mode’,
+     ‘magit-merge-preview-mode’ and ‘magit-status-mode’ buffers.
+     Setting or saving the value for one mode does not change the value
+     for other modes.  The history however is shared.
+
+   • When ‘magit-show-commit’ is invoked directly from a log buffer,
+     then the file filter is picked up from that buffer, not from the
+     revision buffer or the mode’s global diff arguments.
+
+   • Even though they are suffixes of the diff prefix
+     ‘magit-show-commit’ and ‘magit-stash-show’ do not use the diff
+     buffer used by the diff commands, instead they use the dedicated
+     revision and stash buffers.
+
+     At the time you invoke the diff prefix it is unknown to Magit which
+     of the suffix commands you are going to invoke.  While not certain,
+     more often than not users invoke one of the commands that use the
+     diff buffer, so the initial infix arguments are those used in that
+     buffer.  However if you invoke one of these commands directly, then
+     Magit knows that it should use the arguments from the revision
+     resp.  stash buffer.
+
+   • The log prefix also features reflog commands, but these commands do
+     not use the log arguments.
+
+   • If ‘magit-show-refs’ is invoked from a ‘magit-refs-mode’ buffer,
+     then it acts as a refresh prefix and therefore unconditionally uses
+     the buffer’s arguments as initial arguments.  If it is invoked
+     elsewhere with a prefix argument, then it acts as regular prefix
+     and therefore respects ‘magit-prefix-use-buffer-arguments’.  If it
+     is invoked elsewhere without a prefix argument, then it acts as a
+     direct command and therefore respects
+     ‘magit-direct-use-buffer-arguments’.
+
+
+File: magit.info,  Node: Completion Confirmation and the Selection,  Next: Mouse Support,  Prev: Transient Arguments and Buffer Variables,  Up: Interface Concepts
+
+4.5 Completion, Confirmation and the Selection
+==============================================
+
+* Menu:
+
+* Action Confirmation::
+* Completion and Confirmation::
+* The Selection::
+* The hunk-internal region::
+* Support for Completion Frameworks::
+* Additional Completion Options::
+
+
+File: magit.info,  Node: Action Confirmation,  Next: Completion and Confirmation,  Up: Completion Confirmation and the Selection
+
+4.5.1 Action Confirmation
+-------------------------
+
+By default many actions that could potentially lead to data loss have to
+be confirmed.  This includes many very common actions, so this can
+quickly become annoying.  Many of these actions can be undone and if you
+have thought about how to undo certain mistakes, then it should be safe
+to disable confirmation for the respective actions.
+
+   The option ‘magit-no-confirm’ can be used to tell Magit to perform
+certain actions without the user having to confirm them.  Note that
+while this option can only be used to disable confirmation for a
+specific set of actions, the next section explains another way of
+telling Magit to ask fewer questions.
+
+ -- User Option: magit-no-confirm
+     The value of this option is a list of symbols, representing actions
+     that do not have to be confirmed by the user before being carried
+     out.
+
+     By default many potentially dangerous commands ask the user for
+     confirmation.  Each of the below symbols stands for an action
+     which, when invoked unintentionally or without being fully aware of
+     the consequences, could lead to tears.  In many cases there are
+     several commands that perform variations of a certain action, so we
+     don’t use the command names but more generic symbols.
+
+        • Applying changes:
+
+             • ‘discard’ Discarding one or more changes (i.e., hunks or
+               the complete diff for a file) loses that change,
+               obviously.
+
+             • ‘reverse’ Reverting one or more changes can usually be
+               undone by reverting the reversion.
+
+             • ‘stage-all-changes’, ‘unstage-all-changes’ When there are
+               both staged and unstaged changes, then un-/staging
+               everything would destroy that distinction.  Of course
+               that also applies when un-/staging a single change, but
+               then less is lost and one does that so often that having
+               to confirm every time would be unacceptable.
+
+        • Files:
+
+             • ‘delete’ When a file that isn’t yet tracked by Git is
+               deleted, then it is completely lost, not just the last
+               changes.  Very dangerous.
+
+             • ‘trash’ Instead of deleting a file it can also be move to
+               the system trash.  Obviously much less dangerous than
+               deleting it.
+
+               Also see option ‘magit-delete-by-moving-to-trash’.
+
+             • ‘resurrect’ A deleted file can easily be resurrected by
+               "deleting" the deletion, which is done using the same
+               command that was used to delete the same file in the
+               first place.
+
+             • ‘untrack’ Untracking a file can be undone by tracking it
+               again.
+
+             • ‘rename’ Renaming a file can easily be undone.
+
+        • Sequences:
+
+             • ‘reset-bisect’ Aborting (known to Git as "resetting") a
+               bisect operation loses all information collected so far.
+
+             • ‘abort-cherry-pick’ Aborting a cherry-pick throws away
+               all conflict resolutions which have already been carried
+               out by the user.
+
+             • ‘abort-revert’ Aborting a revert throws away all conflict
+               resolutions which have already been carried out by the
+               user.
+
+             • ‘abort-rebase’ Aborting a rebase throws away all already
+               modified commits, but it’s possible to restore those from
+               the reflog.
+
+             • ‘abort-merge’ Aborting a merge throws away all conflict
+               resolutions which have already been carried out by the
+               user.
+
+             • ‘merge-dirty’ Merging with a dirty worktree can make it
+               hard to go back to the state before the merge was
+               initiated.
+
+        • References:
+
+             • ‘delete-unmerged-branch’ Once a branch has been deleted,
+               it can only be restored using low-level recovery tools
+               provided by Git.  And even then the reflog is gone.  The
+               user always has to confirm the deletion of a branch by
+               accepting the default choice (or selecting another
+               branch), but when a branch has not been merged yet, also
+               make sure the user is aware of that.
+
+             • ‘delete-pr-remote’ When deleting a branch that was
+               created from a pull-request and if no other branches
+               still exist on that remote, then ‘magit-branch-delete’
+               offers to delete the remote as well.  This should be safe
+               because it only happens if no other refs exist in the
+               remotes namespace, and you can recreate the remote if
+               necessary.
+
+             • ‘drop-stashes’ Dropping a stash is dangerous because Git
+               stores stashes in the reflog.  Once a stash is removed,
+               there is no going back without using low-level recovery
+               tools provided by Git.  When a single stash is dropped,
+               then the user always has to confirm by accepting the
+               default (or selecting another).  This action only
+               concerns the deletion of multiple stashes at once.
+
+        • Publishing:
+
+             • ‘set-and-push’ When pushing to the upstream or the
+               push-remote and that isn’t actually configured yet, then
+               the user can first set the target.  If s/he confirms the
+               default too quickly, then s/he might end up pushing to
+               the wrong branch and if the remote repository is
+               configured to disallow fixing such mistakes, then that
+               can be quite embarrassing and annoying.
+
+        • Edit published history:
+
+          Without adding these symbols here, you will be warned before
+          editing commits that have already been pushed to one of the
+          branches listed in ‘magit-published-branches’.
+
+             • ‘amend-published’ Affects most commands that amend to
+               "HEAD".
+
+             • ‘rebase-published’ Affects commands that perform
+               interactive rebases.  This includes commands from the
+               commit transient that modify a commit other than "HEAD",
+               namely the various fixup and squash variants.
+
+             • ‘edit-published’ Affects the commands
+               ‘magit-edit-line-commit’ and
+               ‘magit-diff-edit-hunk-commit’.  These two commands make
+               it quite easy to accidentally edit a published commit, so
+               you should think twice before configuring them not to ask
+               for confirmation.
+
+          To disable confirmation completely, add all three symbols here
+          or set ‘magit-published-branches’ to ‘nil’.
+
+        • Various:
+
+             • ‘stash-apply-3way’ When a stash cannot be applied using
+               ‘git stash apply’, then Magit uses ‘git apply’ instead,
+               possibly using the ‘--3way’ argument, which isn’t always
+               perfectly safe.  See also ‘magit-stash-apply’.
+
+             • ‘kill-process’ There seldom is a reason to kill a
+               process.
+
+        • Global settings:
+
+          Instead of adding all of the above symbols to the value of
+          this option, you can also set it to the atom ‘t’, which has
+          the same effect as adding all of the above symbols.  Doing
+          that most certainly is a bad idea, especially because other
+          symbols might be added in the future.  So even if you don’t
+          want to be asked for confirmation for any of these actions,
+          you are still better of adding all of the respective symbols
+          individually.
+
+          When ‘magit-wip-before-change-mode’ is enabled, then the
+          following actions can be undone fairly easily: ‘discard’,
+          ‘reverse’, ‘stage-all-changes’, and ‘unstage-all-changes’.  If
+          and only if this mode is enabled, then ‘safe-with-wip’ has the
+          same effect as adding all of these symbols individually.
+
+
+File: magit.info,  Node: Completion and Confirmation,  Next: The Selection,  Prev: Action Confirmation,  Up: Completion Confirmation and the Selection
+
+4.5.2 Completion and Confirmation
+---------------------------------
+
+Many Magit commands ask the user to select from a list of possible
+things to act on, while offering the most likely choice as the default.
+For many of these commands the default is the thing at point, provided
+that it actually is a valid thing to act on.  For many commands that act
+on a branch, the current branch serves as the default if there is no
+branch at point.
+
+   These commands combine asking for confirmation and asking for a
+target to act on into a single action.  The user can confirm the default
+target using ‘RET’ or abort using ‘C-g’.  This is similar to a
+‘y-or-n-p’ prompt, but the keys to confirm or abort differ.
+
+   At the same time the user is also given the opportunity to select
+another target, which is useful because for some commands and/or in some
+situations you might want to select the action before selecting the
+target by moving to it.
+
+   However you might find that for some commands you always want to use
+the default target, if any, or even that you want the command to act on
+the default without requiring any confirmation at all.  The option
+‘magit-dwim-selection’ can be used to configure certain commands to that
+effect.
+
+   Note that when the region is active then many commands act on the
+things that are selected using a mechanism based on the region, in many
+cases after asking for confirmation.  This region-based mechanism is
+called the "selection" and is described in detail in the next section.
+When a selection exists that is valid for the invoked command, then that
+command never offers to act on something else, and whether it asks for
+confirmation is not controlled by this option.
+
+   Also note that Magit asks for confirmation of certain actions that
+are not coupled with completion (or the selection).  Such dialogs are
+also not affected by this option and are described in the previous
+section.
+
+ -- User Option: magit-dwim-selection
+   This option can be used to tell certain commands to use the thing at
+point instead of asking the user to select a candidate to act on, with
+or without confirmation.
+
+   The value has the form ‘((COMMAND nil|PROMPT DEFAULT)...)’.
+
+   • COMMAND is the command that should not prompt for a choice.  To
+     have an effect, the command has to use the function
+     ‘magit-completing-read’ or a utility function which in turn uses
+     that function.
+
+   • If the command uses ‘magit-completing-read’ multiple times, then
+     PROMPT can be used to only affect one of these uses.  PROMPT, if
+     non-nil, is a regular expression that is used to match against the
+     PROMPT argument passed to ‘magit-completing-read’.
+
+   • DEFAULT specifies how to use the default.  If it is ‘t’, then the
+     DEFAULT argument passed to ‘magit-completing-read’ is used without
+     confirmation.  If it is ‘ask’, then the user is given a chance to
+     abort.  DEFAULT can also be ‘nil’, in which case the entry has no
+     effect.
+
+
+File: magit.info,  Node: The Selection,  Next: The hunk-internal region,  Prev: Completion and Confirmation,  Up: Completion Confirmation and the Selection
+
+4.5.3 The Selection
+-------------------
+
+If the region is active, then many Magit commands act on the things that
+are selected using a mechanism based on the region instead of one single
+thing.  When the region is not active, then these commands act on the
+thing at point or read a single thing to act on.  This is described in
+the previous section — this section only covers how multiple things are
+selected, how that is visualized, and how certain commands behave when
+that is the case.
+
+   Magit’s mechanism for selecting multiple things, or rather sections
+that represent these things, is based on the Emacs region, but the area
+that Magit considers to be selected is typically larger than the region
+and additional restrictions apply.
+
+   Magit makes a distinction between a region that qualifies as forming
+a valid Magit selection and a region that does not.  If the region does
+not qualify, then it is displayed as it is in other Emacs buffers.  If
+the region does qualify as a Magit selection, then the selection is
+always visualized, while the region itself is only visualized if it
+begins and ends on the same line.
+
+   For a region to qualify as a Magit selection, it must begin in the
+heading of one section and end in the heading of a sibling section.
+Note that if the end of the region is at the very beginning of section
+heading (i.e., at the very beginning of a line) then that section is
+considered to be *inside* the selection.
+
+   This is not consistent with how the region is normally treated in
+Emacs — if the region ends at the beginning of a line, then that line is
+outside the region.  Due to how Magit visualizes the selection, it
+should be obvious that this difference exists.
+
+   Not every command acts on every valid selection.  Some commands do
+not even consider the location of point, others may act on the section
+at point but not support acting on the selection, and even commands that
+do support the selection of course only do so if it selects things that
+they can act on.
+
+   This is the main reason why the selection must include the section at
+point.  Even if a selection exists, the invoked command may disregard
+it, in which case it may act on the current section only.  It is much
+safer to only act on the current section but not the other selected
+sections than it is to act on the current section *instead* of the
+selected sections.  The latter would be much more surprising and if the
+current section always is part of the selection, then that cannot
+happen.
+
+ -- Variable: magit-keep-region-overlay
+     This variable controls whether the region is visualized as usual
+     even when a valid Magit selection or a hunk-internal region exists.
+     See the doc-string for more information.
+
+
+File: magit.info,  Node: The hunk-internal region,  Next: Support for Completion Frameworks,  Prev: The Selection,  Up: Completion Confirmation and the Selection
+
+4.5.4 The hunk-internal region
+------------------------------
+
+Somewhat related to the Magit selection described in the previous
+section is the hunk-internal region.
+
+   Like the selection, the hunk-internal region is based on the Emacs
+region but causes that region to not be visualized as it would in other
+Emacs buffers, and includes the line on which the region ends even if it
+ends at the very beginning of that line.
+
+   Unlike the selection, which is based on a region that must begin in
+the heading of one section and ends in the section of a sibling section,
+the hunk-internal region must begin inside the *body* of a hunk section
+and end in the body of the *same* section.
+
+   The hunk-internal region is honored by "apply" commands, which can,
+among other targets, act on a hunk.  If the hunk-internal region is
+active, then such commands act only on the marked part of the hunk
+instead of on the complete hunk.
+
+
+File: magit.info,  Node: Support for Completion Frameworks,  Next: Additional Completion Options,  Prev: The hunk-internal region,  Up: Completion Confirmation and the Selection
+
+4.5.5 Support for Completion Frameworks
+---------------------------------------
+
+The built-in option ‘completing-read-function’ specifies the low-level
+function used by ‘completing-read’ to ask a user to select from a list
+of choices.  Its default value is ‘completing-read-default’.
+Alternative completion frameworks typically activate themselves by
+substituting their own implementation.
+
+   Mostly for historic reasons Magit provides a similar option named
+‘magit-completing-read-function’, which only controls the low-level
+function used by ‘magit-completing-read’.  This option also makes it
+possible to use a different completing mechanism for Magit than for the
+rest of Emacs, but doing that is not recommend.
+
+   You most likely don’t have to customize the magit-specific option to
+use an alternative completion framework.  For example, if you enable
+‘ivy-mode’, then Magit will respect that, and if you enable ‘helm-mode’,
+then you are done too.
+
+   However if you want to use Ido, then ‘ido-mode’ won’t do the trick.
+You will also have to install the ‘ido-completing-read+’ package and use
+‘magit-ido-completing-read’ as ‘magit-completing-read-function’.
+
+ -- User Option: magit-completing-read-function
+     The value of this variable is the low-level function used to
+     perform completion by code that uses ‘magit-completing-read’ (as
+     opposed to the built-in ‘completing-read’).
+
+     The default value, ‘magit-builtin-completing-read’, is suitable for
+     the standard completion mechanism, ‘ivy-mode’, and ‘helm-mode’ at
+     least.
+
+     The built-in ‘completing-read’ and ‘completing-read-default’ are
+     *not* suitable to be used here.  ‘magit-builtin-completing-read’
+     performs some additional work, and any function used in its place
+     has to do the same.
+
+ -- Function: magit-builtin-completing-read prompt choices &optional
+          predicate require-match initial-input hist def
+     This function performs completion using the built-in
+     ‘completing-read’ and does some additional magit-specific work.
+
+ -- Function: magit-ido-completing-read prompt choices &optional
+          predicate require-match initial-input hist def
+     This function performs completion using ‘ido-completing-read+’ from
+     the package by the same name (which you have to explicitly install)
+     and does some additional magit-specific work.
+
+     We have to use ‘ido-completing-read+’ instead of the
+     ‘ido-completing-read’ that comes with Ido itself, because the
+     latter, while intended as a drop-in replacement, cannot serve that
+     purpose because it violates too many of the implicit conventions.
+
+ -- Function: magit-completing-read prompt choices &optional predicate
+          require-match initial-input hist def fallback
+     This is the function that Magit commands use when they need the
+     user to select a single thing to act on.  The arguments have the
+     same meaning as for ‘completing-read’, except for FALLBACK, which
+     is unique to this function and is described below.
+
+     Instead of asking the user to choose from a list of possible
+     candidates, this function may just return the default specified by
+     DEF, with or without requiring user confirmation.  Whether that is
+     the case depends on PROMPT, ‘this-command’ and
+     ‘magit-dwim-selection’.  See the documentation of the latter for
+     more information.
+
+     If it does read a value in the minibuffer, then this function acts
+     similar to ‘completing-read’, except for the following:
+
+        • COLLECTION must be a list of choices.  A function is not
+          supported.
+
+        • If REQUIRE-MATCH is ‘nil’ and the user exits without a choice,
+          then ‘nil’ is returned instead of an empty string.
+
+        • If REQUIRE-MATCH is non-nil and the users exits without a
+          choice, an user-error is raised.
+
+        • FALLBACK specifies a secondary default that is only used if
+          the primary default DEF is ‘nil’.  The secondary default is
+          not subject to ‘magit-dwim-selection’ — if DEF is ‘nil’ but
+          FALLBACK is not, then this function always asks the user to
+          choose a candidate, just as if both defaults were ‘nil’.
+
+        • ‘format-prompt’ is called on PROMPT and DEF (or FALLBACK if
+          DEF is ‘nil’).  This appends ": " to the prompt and may also
+          add the default to the prompt, using the format specified by
+          ‘minibuffer-default-prompt-format’ and depending on
+          ‘magit-completing-read-default-prompt-predicate’.
+
+
+File: magit.info,  Node: Additional Completion Options,  Prev: Support for Completion Frameworks,  Up: Completion Confirmation and the Selection
+
+4.5.6 Additional Completion Options
+-----------------------------------
+
+ -- User Option: magit-list-refs-sortby
+     For many commands that read a ref or refs from the user, the value
+     of this option can be used to control the order of the refs.  Valid
+     values include any key accepted by the ‘--sort’ flag of ‘git
+     for-each-ref’.  By default, refs are sorted alphabetically by their
+     full name (e.g., "refs/heads/master").
+
+
+File: magit.info,  Node: Mouse Support,  Next: Running Git,  Prev: Completion Confirmation and the Selection,  Up: Interface Concepts
+
+4.6 Mouse Support
+=================
+
+Double clicking on a section heading toggles the visibility of its body,
+if any.  Likewise clicking in the left fringe toggles the visibility of
+the appropriate section.
+
+   A context menu is provided but has to be enabled explicitly.  In
+Emacs 28 and greater, enable the global mode ‘context-menu-mode’.  If
+you use an older Emacs release, set
+‘magit-section-show-context-menu-for-emacs<28’.
+
+
+File: magit.info,  Node: Running Git,  Prev: Mouse Support,  Up: Interface Concepts
+
+4.7 Running Git
+===============
+
+* Menu:
+
+* Viewing Git Output::
+* Git Process Status::
+* Running Git Manually::
+* Git Executable::
+* Global Git Arguments::
+
+
+File: magit.info,  Node: Viewing Git Output,  Next: Git Process Status,  Up: Running Git
+
+4.7.1 Viewing Git Output
+------------------------
+
+Magit runs Git either for side-effects (e.g., when pushing) or to get
+some value (e.g., the name of the current branch).
+
+   When Git is run for side-effects, the process output is logged in a
+per-repository log buffer, which can be consulted using the
+‘magit-process’ command when things don’t go as expected.
+
+   The output/errors for up to ‘magit-process-log-max’ Git commands are
+retained.
+
+‘$’ (‘magit-process’)
+     This commands displays the process buffer for the current
+     repository.
+
+   Inside that buffer, the usual key bindings for navigating and showing
+sections are available.  There is one additional command.
+
+‘k’ (‘magit-process-kill’)
+     This command kills the process represented by the section at point.
+
+ -- Variable: magit-git-debug
+     This option controls whether additional reporting of git errors is
+     enabled.
+
+     Magit basically calls git for one of these two reasons: for
+     side-effects or to do something with its standard output.
+
+     When git is run for side-effects then its output, including error
+     messages, go into the process buffer which is shown when using ‘$’.
+
+     When git’s output is consumed in some way, then it would be too
+     expensive to also insert it into this buffer, but when this option
+     is non-nil and git returns with a non-zero exit status, then at
+     least its standard error is inserted into this buffer.
+
+     This is only intended for debugging purposes.  Do not enable this
+     permanently, that would negatively affect performance.
+
+     This is only intended for debugging purposes.  Do not enable this
+     permanently, that would negatively affect performance.  Also note
+     that just because git exits with a non-zero exit status and prints
+     an error message that usually doesn’t mean that it is an error as
+     far as Magit is concerned, which is another reason we usually hide
+     these error messages.  Whether some error message is relevant in
+     the context of some unexpected behavior has to be judged on a case
+     by case basis.
+
+     The command ‘magit-toggle-git-debug’ changes the value of this
+     variable.
+
+ -- Variable: magit-process-extreme-logging
+     This option controls whether ‘magit-process-file’ logs to the
+     ‘*Messages*’ buffer.
+
+     Only intended for temporary use when you try to figure out how
+     Magit uses Git behind the scene.  Output that normally goes to the
+     magit-process buffer continues to go there.  Not all output goes to
+     either of these two buffers.
+
+
+File: magit.info,  Node: Git Process Status,  Next: Running Git Manually,  Prev: Viewing Git Output,  Up: Running Git
+
+4.7.2 Git Process Status
+------------------------
+
+When a Git process is running for side-effects, Magit displays an
+indicator in the mode line, using the ‘magit-mode-line-process’ face.
+
+   If the Git process exits successfully, the process indicator is
+removed from the mode line immediately.
+
+   In the case of a Git error, the process indicator is not removed, but
+is instead highlighted with the ‘magit-mode-line-process-error’ face,
+and the error details from the process buffer are provided as a tooltip
+for mouse users.  This error indicator persists in the mode line until
+the next magit buffer refresh.
+
+   If you do not wish process errors to be indicated in the mode line,
+customize the ‘magit-process-display-mode-line-error’ user option.
+
+   Process errors are additionally indicated at the top of the status
+buffer.
+
+
+File: magit.info,  Node: Running Git Manually,  Next: Git Executable,  Prev: Git Process Status,  Up: Running Git
+
+4.7.3 Running Git Manually
+--------------------------
+
+While Magit provides many Emacs commands to interact with Git, it does
+not cover everything.  In those cases your existing Git knowledge will
+come in handy.  Magit provides some commands for running arbitrary Git
+commands by typing them into the minibuffer, instead of having to switch
+to a shell.
+
+‘!’ (‘magit-run’)
+     This transient prefix command binds the following suffix commands
+     and displays them in a temporary buffer until a suffix is invoked.
+
+‘! !’ (‘magit-git-command-topdir’)
+     This command reads a command from the user and executes it in the
+     top-level directory of the current working tree.
+
+     The string "git " is used as initial input when prompting the user
+     for the command.  It can be removed to run another command.
+
+‘:’ (‘magit-git-command’)
+‘! p’
+     This command reads a command from the user and executes it in
+     ‘default-directory’.  With a prefix argument the command is
+     executed in the top-level directory of the current working tree
+     instead.
+
+     The string "git " is used as initial input when prompting the user
+     for the command.  It can be removed to run another command.
+
+‘! s’ (‘magit-shell-command-topdir’)
+     This command reads a command from the user and executes it in the
+     top-level directory of the current working tree.
+
+‘! S’ (‘magit-shell-command’)
+     This command reads a command from the user and executes it in
+     ‘default-directory’.  With a prefix argument the command is
+     executed in the top-level directory of the current working tree
+     instead.
+
+ -- User Option: magit-shell-command-verbose-prompt
+     Whether the prompt, used by the above commands when reading a shell
+     command, shows the directory in which it will be run.
+
+   These suffix commands start external gui tools.
+
+‘! k’ (‘magit-run-gitk’)
+     This command runs ‘gitk’ in the current repository.
+
+‘! a’ (‘magit-run-gitk-all’)
+     This command runs ‘gitk --all’ in the current repository.
+
+‘! b’ (‘magit-run-gitk-branches’)
+     This command runs ‘gitk --branches’ in the current repository.
+
+‘! g’ (‘magit-run-git-gui’)
+     This command runs ‘git gui’ in the current repository.
+
+‘! m’ (‘magit-git-mergetool’)
+     This command runs ‘git mergetool --gui’ in the current repository.
+
+     With a prefix argument this acts as a transient prefix command,
+     allowing the user to select the mergetool and change some settings.
+
+
+File: magit.info,  Node: Git Executable,  Next: Global Git Arguments,  Prev: Running Git Manually,  Up: Running Git
+
+4.7.4 Git Executable
+--------------------
+
+When Magit calls Git, then it may do so using the absolute path to the
+‘git’ executable, or using just its name.
+
+   When running ‘git’ locally and the ‘system-type’ is ‘windows-nt’ (any
+Windows version) or ‘darwin’ (macOS) then ‘magit-git-executable’ is set
+to an absolute path when Magit is loaded.
+
+   On Windows it is necessary to use an absolute path because Git comes
+with several wrapper scripts for the actual ‘git’ binary, which are also
+placed on ‘$PATH’, and using one of these wrappers instead of the binary
+would degrade performance horribly.  For some macOS users using just the
+name of the executable also performs horribly, so we avoid doing that on
+that platform as well.  On other platforms, using just the name seems to
+work just fine.
+
+   Using an absolute path when running ‘git’ on a remote machine over
+Tramp, would be problematic to use an absolute path that is suitable on
+the local machine, so a separate option is used to control the name or
+path that is used on remote machines.
+
+ -- User Option: magit-git-executable
+     The ‘git’ executable used by Magit on the local host.  This should
+     be either the absolute path to the executable, or the string "git"
+     to let Emacs find the executable itself, using the standard
+     mechanism for doing such things.
+
+ -- User Option: magit-remote-git-executable
+     The ‘git’ executable used by Magit on remote machines over Tramp.
+     Normally this should be just the string "git".  Consider
+     customizing ‘tramp-remote-path’ instead of this option.
+
+   If Emacs is unable to find the correct executable, then you can work
+around that by explicitly setting the value of one of these two options.
+Doing that should be considered a kludge; it is better to make sure that
+the order in ‘exec-path’ or ‘tramp-remote-path’ is correct.
+
+   Note that ‘exec-path’ is set based on the value of the ‘PATH’
+environment variable that is in effect when Emacs is started.  If you
+set ‘PATH’ in your shell’s init files, then that only has an effect on
+Emacs if you start it from that shell (because the environment of a
+process is only passed to its child processes, not to arbitrary other
+processes).  If that is not how you start Emacs, then the
+‘exec-path-from-shell’ package can help; though honestly I consider that
+a kludge too.
+
+   The command ‘magit-debug-git-executable’ can be useful to find out
+where Emacs is searching for ‘git’.
+
+‘M-x magit-debug-git-executable’
+     This command displays a buffer with information about
+     ‘magit-git-executable’ and ‘magit-remote-git-executable’.
+
+‘M-x magit-version’
+     This command shows the currently used versions of Magit, Git, and
+     Emacs in the echo area.  Non-interactively this just returns the
+     Magit version.
+
+
+File: magit.info,  Node: Global Git Arguments,  Prev: Git Executable,  Up: Running Git
+
+4.7.5 Global Git Arguments
+--------------------------
+
+ -- User Option: magit-git-global-arguments
+     The arguments set here are used every time the git executable is
+     run as a subprocess.  They are placed right after the executable
+     itself and before the git command - as in ‘git HERE... COMMAND
+     REST’.  For valid arguments see *note (gitman)git::.
+
+     Be careful what you add here, especially if you are using Tramp to
+     connect to servers with ancient Git versions.  Never remove
+     anything that is part of the default value, unless you really know
+     what you are doing.  And think very hard before adding something;
+     it will be used every time Magit runs Git for any purpose.
+
+
+File: magit.info,  Node: Inspecting,  Next: Manipulating,  Prev: Interface Concepts,  Up: Top
+
+5 Inspecting
+************
+
+The functionality provided by Magit can be roughly divided into three
+groups: inspecting existing data, manipulating existing data or adding
+new data, and transferring data.  Of course that is a rather crude
+distinction that often falls short, but it’s more useful than no
+distinction at all.  This section is concerned with inspecting data, the
+next two with manipulating and transferring it.  Then follows a section
+about miscellaneous functionality, which cannot easily be fit into this
+distinction.
+
+   Of course other distinctions make sense too, e.g., Git’s distinction
+between porcelain and plumbing commands, which for the most part is
+equivalent to Emacs’ distinction between interactive commands and
+non-interactive functions.  All of the sections mentioned before are
+mainly concerned with the porcelain – Magit’s plumbing layer is
+described later.
+
+* Menu:
+
+* Status Buffer::
+* Repository List::
+* Logging::
+* Diffing::
+* Ediffing::
+* References Buffer::
+* Bisecting::
+* Visiting Files and Blobs::
+* Blaming::
+
+
+File: magit.info,  Node: Status Buffer,  Next: Repository List,  Up: Inspecting
+
+5.1 Status Buffer
+=================
+
+While other Magit buffers contain, e.g., one particular diff or one
+particular log, the status buffer contains the diffs for staged and
+unstaged changes, logs for unpushed and unpulled commits, lists of
+stashes and untracked files, and information related to the current
+branch.
+
+   During certain incomplete operations – for example when a merge
+resulted in a conflict – additional information is displayed that helps
+proceeding with or aborting the operation.
+
+   The command ‘magit-status’ displays the status buffer belonging to
+the current repository in another window.  This command is used so often
+that it should be bound globally.  We recommend using ‘C-x g’:
+
+     (global-set-key (kbd "C-x g") 'magit-status)
+
+‘C-x g’ (‘magit-status’)
+     When invoked from within an existing Git repository, then this
+     command shows the status of that repository in a buffer.
+
+     If the current directory isn’t located within a Git repository,
+     then this command prompts for an existing repository or an
+     arbitrary directory, depending on the option
+     ‘magit-repository-directories’, and the status for the selected
+     repository is shown instead.
+
+        • If that option specifies any existing repositories, then the
+          user is asked to select one of them.
+
+        • Otherwise the user is asked to select an arbitrary directory
+          using regular file-name completion.  If the selected directory
+          is the top-level directory of an existing working tree, then
+          the status buffer for that is shown.
+
+        • Otherwise the user is offered to initialize the selected
+          directory as a new repository.  After creating the repository
+          its status buffer is shown.
+
+     These fallback behaviors can also be forced using one or more
+     prefix arguments:
+
+        • With two prefix arguments (or more precisely a numeric prefix
+          value of 16 or greater) an arbitrary directory is read, which
+          is then acted on as described above.  The same could be
+          accomplished using the command ‘magit-init’.
+
+        • With a single prefix argument an existing repository is read
+          from the user, or if no repository can be found based on the
+          value of ‘magit-repository-directories’, then the behavior is
+          the same as with two prefix arguments.
+
+ -- User Option: magit-repository-directories
+     List of directories that are Git repositories or contain Git
+     repositories.
+
+     Each element has the form ‘(DIRECTORY . DEPTH)’.  DIRECTORY has to
+     be a directory or a directory file-name, a string.  DEPTH, an
+     integer, specifies the maximum depth to look for Git repositories.
+     If it is 0, then only add DIRECTORY itself.
+
+     This option controls which repositories are being listed by
+     ‘magit-list-repositories’.  It also affects ‘magit-status’ (which
+     see) in potentially surprising ways (see above).
+
+ -- Command: magit-status-quick
+     This command is an alternative to ‘magit-status’ that usually
+     avoids refreshing the status buffer.
+
+     If the status buffer of the current Git repository exists but isn’t
+     being displayed in the selected frame, then it is displayed without
+     being refreshed.
+
+     If the status buffer is being displayed in the selected frame, then
+     this command refreshes it.
+
+     Prefix arguments have the same meaning as for ‘magit-status’, and
+     additionally cause the buffer to be refresh.
+
+     To use this command add this to your init file:
+
+          (global-set-key (kbd "C-x g") 'magit-status-quick).
+
+     If you do that and then for once want to redisplay the buffer and
+     also immediately refresh it, then type ‘C-x g’ followed by ‘g’.
+
+     A possible alternative command is
+     ‘magit-display-repository-buffer’.  It supports displaying any
+     existing Magit buffer that belongs to the current repository; not
+     just the status buffer.
+
+ -- Command: ido-enter-magit-status
+     From an Ido prompt used to open a file, instead drop into
+     ‘magit-status’.  This is similar to ‘ido-magic-delete-char’, which,
+     despite its name, usually causes a Dired buffer to be created.
+
+     To make this command available, use something like:
+
+          (add-hook 'ido-setup-hook
+                    (lambda ()
+                      (define-key ido-completion-map
+                        (kbd \"C-x g\") 'ido-enter-magit-status)))
+
+     Starting with Emacs 25.1 the Ido keymaps are defined just once
+     instead of every time Ido is invoked, so now you can modify it like
+     pretty much every other keymap:
+
+          (define-key ido-common-completion-map
+            (kbd \"C-x g\") 'ido-enter-magit-status)
+
+* Menu:
+
+* Status Sections::
+* Status Header Sections::
+* Status Module Sections::
+* Status Options::
+
+
+File: magit.info,  Node: Status Sections,  Next: Status Header Sections,  Up: Status Buffer
+
+5.1.1 Status Sections
+---------------------
+
+The contents of status buffers is controlled using the hook
+‘magit-status-sections-hook’.  See *note Section Hooks:: to learn about
+such hooks and how to customize them.
+
+ -- User Option: magit-status-sections-hook
+     Hook run to insert sections into a status buffer.
+
+   The first function on that hook by default is
+‘magit-insert-status-headers’; it is described in the next section.  By
+default the following functions are also members of that hook:
+
+ -- Function: magit-insert-merge-log
+     Insert section for the on-going merge.  Display the heads that are
+     being merged.  If no merge is in progress, do nothing.
+
+ -- Function: magit-insert-rebase-sequence
+     Insert section for the on-going rebase sequence.  If no such
+     sequence is in progress, do nothing.
+
+ -- Function: magit-insert-am-sequence
+     Insert section for the on-going patch applying sequence.  If no
+     such sequence is in progress, do nothing.
+
+ -- Function: magit-insert-sequencer-sequence
+     Insert section for the on-going cherry-pick or revert sequence.  If
+     no such sequence is in progress, do nothing.
+
+ -- Function: magit-insert-bisect-output
+     While bisecting, insert section with output from ‘git bisect’.
+
+ -- Function: magit-insert-bisect-rest
+     While bisecting, insert section visualizing the bisect state.
+
+ -- Function: magit-insert-bisect-log
+     While bisecting, insert section logging bisect progress.
+
+ -- Function: magit-insert-untracked-files
+     Maybe insert a list or tree of untracked files.
+
+     Do so depending on the value of ‘status.showUntrackedFiles’.  Note
+     that even if the value is ‘all’, Magit still initially only shows
+     directories.  But the directory sections can then be expanded using
+     ‘TAB’.
+
+ -- Function: magit-insert-unstaged-changes
+     Insert section showing unstaged changes.
+
+ -- Function: magit-insert-staged-changes
+     Insert section showing staged changes.
+
+ -- Function: magit-insert-stashes &optional ref heading
+     Insert the ‘stashes’ section showing reflog for "refs/stash".  If
+     optional REF is non-nil show reflog for that instead.  If optional
+     HEADING is non-nil use that as section heading instead of
+     "Stashes:".
+
+ -- Function: magit-insert-unpulled-from-upstream
+     Insert section showing commits that haven’t been pulled from the
+     upstream branch yet.
+
+ -- Function: magit-insert-unpulled-from-pushremote
+     Insert section showing commits that haven’t been pulled from the
+     push-remote branch yet.
+
+ -- Function: magit-insert-unpushed-to-upstream
+     Insert section showing commits that haven’t been pushed to the
+     upstream yet.
+
+ -- Function: magit-insert-unpushed-to-pushremote
+     Insert section showing commits that haven’t been pushed to the
+     push-remote yet.
+
+   The following functions can also be added to the above hook:
+
+ -- Function: magit-insert-tracked-files
+     Insert a tree of tracked files.
+
+ -- Function: magit-insert-ignored-files
+     Insert a tree of ignored files.  Its possible to limit the logs in
+     the current buffer to a certain directory using ‘D = f <DIRECTORY>
+     RET g’.  If you do that, then that that also affects this command.
+
+     The log filter can be used to limit to multiple files.  In that
+     case this function only respects the first of the files and only if
+     it is a directory.
+
+ -- Function: magit-insert-skip-worktree-files
+     Insert a tree of skip-worktree files.  If the first element of
+     ‘magit-buffer-diff-files’ is a directory, then limit the list to
+     files below that.  The value of that variable can be set using ‘D
+     -- DIRECTORY RET g’.
+
+ -- Function: magit-insert-assumed-unchanged-files
+     Insert a tree of files that are assumed to be unchanged.  If the
+     first element of ‘magit-buffer-diff-files’ is a directory, then
+     limit the list to files below that.  The value of that variable can
+     be set using ‘D -- DIRECTORY RET g’.
+
+ -- Function: magit-insert-unpulled-or-recent-commits
+     Insert section showing unpulled or recent commits.  If an upstream
+     is configured for the current branch and it is ahead of the current
+     branch, then show the missing commits.  Otherwise, show the last
+     ‘magit-log-section-commit-count’ commits.
+
+ -- Function: magit-insert-recent-commits
+     Insert section showing the last ‘magit-log-section-commit-count’
+     commits.
+
+ -- User Option: magit-log-section-commit-count
+     How many recent commits ‘magit-insert-recent-commits’ and
+     ‘magit-insert-unpulled-or-recent-commits’ (provided there are no
+     unpulled commits) show.
+
+ -- Function: magit-insert-unpulled-cherries
+     Insert section showing unpulled commits.  Like
+     ‘magit-insert-unpulled-commits’ but prefix each commit that has not
+     been applied yet (i.e., a commit with a patch-id not shared with
+     any local commit) with "+", and all others with "-".
+
+ -- Function: magit-insert-unpushed-cherries
+     Insert section showing unpushed commits.  Like
+     ‘magit-insert-unpushed-commits’ but prefix each commit which has
+     not been applied to upstream yet (i.e., a commit with a patch-id
+     not shared with any upstream commit) with "+" and all others with
+     "-".
+
+   See *note References Buffer:: for some more section inserters, which
+could be used here.
+
+
+File: magit.info,  Node: Status Header Sections,  Next: Status Module Sections,  Prev: Status Sections,  Up: Status Buffer
+
+5.1.2 Status Header Sections
+----------------------------
+
+The contents of status buffers is controlled using the hook
+‘magit-status-sections-hook’ (see *note Status Sections::).
+
+   By default ‘magit-insert-status-headers’ is the first member of that
+hook variable.
+
+ -- Function: magit-insert-status-headers
+     Insert headers sections appropriate for ‘magit-status-mode’
+     buffers.  The sections are inserted by running the functions on the
+     hook ‘magit-status-headers-hook’.
+
+ -- User Option: magit-status-headers-hook
+     Hook run to insert headers sections into the status buffer.
+
+     This hook is run by ‘magit-insert-status-headers’, which in turn
+     has to be a member of ‘magit-status-sections-hook’ to be used at
+     all.
+
+   By default the following functions are members of the above hook:
+
+ -- Function: magit-insert-error-header
+     Insert a header line showing the message about the Git error that
+     just occurred.
+
+     This function is only aware of the last error that occur when Git
+     was run for side-effects.  If, for example, an error occurs while
+     generating a diff, then that error won’t be inserted.  Refreshing
+     the status buffer causes this section to disappear again.
+
+ -- Function: magit-insert-diff-filter-header
+     Insert a header line showing the effective diff filters.
+
+ -- Function: magit-insert-head-branch-header
+     Insert a header line about the current branch or detached ‘HEAD’.
+
+ -- Function: magit-insert-upstream-branch-header
+     Insert a header line about the branch that is usually pulled into
+     the current branch.
+
+ -- Function: magit-insert-push-branch-header
+     Insert a header line about the branch that the current branch is
+     usually pushed to.
+
+ -- Function: magit-insert-tags-header
+     Insert a header line about the current and/or next tag, along with
+     the number of commits between the tag and ‘HEAD’.
+
+   The following functions can also be added to the above hook:
+
+ -- Function: magit-insert-repo-header
+     Insert a header line showing the path to the repository top-level.
+
+ -- Function: magit-insert-remote-header
+     Insert a header line about the remote of the current branch.
+
+     If no remote is configured for the current branch, then fall back
+     showing the "origin" remote, or if that does not exist the first
+     remote in alphabetic order.
+
+ -- Function: magit-insert-user-header
+     Insert a header line about the current user.
+
+
+File: magit.info,  Node: Status Module Sections,  Next: Status Options,  Prev: Status Header Sections,  Up: Status Buffer
+
+5.1.3 Status Module Sections
+----------------------------
+
+The contents of status buffers is controlled using the hook
+‘magit-status-sections-hook’ (see *note Status Sections::).
+
+   By default ‘magit-insert-modules’ is _not_ a member of that hook
+variable.
+
+ -- Function: magit-insert-modules
+     Insert submodule sections.
+
+     Hook ‘magit-module-sections-hook’ controls which module sections
+     are inserted, and option ‘magit-module-sections-nested’ controls
+     whether they are wrapped in an additional section.
+
+ -- User Option: magit-module-sections-hook
+     Hook run by ‘magit-insert-modules’.
+
+ -- User Option: magit-module-sections-nested
+     This option controls whether ‘magit-insert-modules’ wraps inserted
+     sections in an additional section.
+
+     If this is non-nil, then only a single top-level section is
+     inserted.  If it is nil, then all sections listed in
+     ‘magit-module-sections-hook’ become top-level sections.
+
+ -- Function: magit-insert-modules-overview
+     Insert sections for all submodules.  For each section insert the
+     path, the branch, and the output of ‘git describe --tags’, or,
+     failing that, the abbreviated HEAD commit hash.
+
+     Press ‘RET’ on such a submodule section to show its own status
+     buffer.  Press ‘RET’ on the "Modules" section to display a list of
+     submodules in a separate buffer.  This shows additional information
+     not displayed in the super-repository’s status buffer.
+
+ -- Function: magit-insert-modules-unpulled-from-upstream
+     Insert sections for modules that haven’t been pulled from the
+     upstream yet.  These sections can be expanded to show the
+     respective commits.
+
+ -- Function: magit-insert-modules-unpulled-from-pushremote
+     Insert sections for modules that haven’t been pulled from the
+     push-remote yet.  These sections can be expanded to show the
+     respective commits.
+
+ -- Function: magit-insert-modules-unpushed-to-upstream
+     Insert sections for modules that haven’t been pushed to the
+     upstream yet.  These sections can be expanded to show the
+     respective commits.
+
+ -- Function: magit-insert-modules-unpushed-to-pushremote
+     Insert sections for modules that haven’t been pushed to the
+     push-remote yet.  These sections can be expanded to show the
+     respective commits.
+
+
+File: magit.info,  Node: Status Options,  Prev: Status Module Sections,  Up: Status Buffer
+
+5.1.4 Status Options
+--------------------
+
+ -- User Option: magit-status-margin
+     This option specifies whether the margin is initially shown in
+     Magit-Status mode buffers and how it is formatted.
+
+     The value has the form ‘(INIT STYLE WIDTH AUTHOR AUTHOR-WIDTH)’.
+
+        • If INIT is non-nil, then the margin is shown initially.
+        • STYLE controls how to format the author or committer date.  It
+          can be one of ‘age’ (to show the age of the commit),
+          ‘age-abbreviated’ (to abbreviate the time unit to a
+          character), or a string (suitable for ‘format-time-string’) to
+          show the actual date.  Option
+          ‘magit-log-margin-show-committer-date’ controls which date is
+          being displayed.
+        • WIDTH controls the width of the margin.  This exists for
+          forward compatibility and currently the value should not be
+          changed.
+        • AUTHOR controls whether the name of the author is also shown
+          by default.
+        • AUTHOR-WIDTH has to be an integer.  When the name of the
+          author is shown, then this specifies how much space is used to
+          do so.
+
+   Also see the proceeding section for more options concerning status
+buffers.
+
+
+File: magit.info,  Node: Repository List,  Next: Logging,  Prev: Status Buffer,  Up: Inspecting
+
+5.2 Repository List
+===================
+
+ -- Command: magit-list-repositories
+     This command displays a list of repositories in a separate buffer.
+
+     The option ‘magit-repository-directories’ controls which
+     repositories are displayed.
+
+ -- User Option: magit-repolist-columns
+     This option controls what columns are displayed by the command
+     ‘magit-list-repositories’ and how they are displayed.
+
+     Each element has the form ‘(HEADER WIDTH FORMAT PROPS)’.
+
+     HEADER is the string displayed in the header.  WIDTH is the width
+     of the column.  FORMAT is a function that is called with one
+     argument, the repository identification (usually its basename), and
+     with ‘default-directory’ bound to the toplevel of its working tree.
+     It has to return a string to be inserted or nil.  PROPS is an alist
+     that supports the keys ‘:right-align’, ‘:pad-right’ and ‘:sort’.
+
+     The ‘:sort’ function has a weird interface described in the
+     docstring of ‘tabulated-list--get-sort’.  Alternatively ‘<’ and
+     ‘magit-repolist-version<’ can be used as those functions are
+     automatically replaced with functions that satisfy the interface.
+     Set ‘:sort’ to ‘nil’ to inhibit sorting; if unspecified, then the
+     column is sortable using the default sorter.
+
+     You may wish to display a range of numeric columns using just one
+     character per column and without any padding between columns, in
+     which case you should use an appropriate HEADER, set WIDTH to 1,
+     and set ‘:pad-right’ to 9.  ‘+’ is substituted for numbers higher
+     than 9.
+
+The following functions can be added to the above option:
+
+ -- Function: magit-repolist-column-ident
+     This function inserts the identification of the repository.
+     Usually this is just its basename.
+
+ -- Function: magit-repolist-column-path
+     This function inserts the absolute path of the repository.
+
+ -- Function: magit-repolist-column-version
+     This function inserts a description of the repository’s ‘HEAD’
+     revision.
+
+ -- Function: magit-repolist-column-branch
+     This function inserts the name of the current branch.
+
+ -- Function: magit-repolist-column-upstream
+     This function inserts the name of the upstream branch of the
+     current branch.
+
+ -- Function: magit-repolist-column-branches
+     This function inserts the number of branches.
+
+ -- Function: magit-repolist-column-stashes
+     This function inserts the number of stashes.
+
+ -- Function: magit-repolist-column-flag
+     This function inserts a flag as specified by
+     ‘magit-repolist-column-flag-alist’.
+
+     By default this indicates whether there are uncommitted changes.
+
+        • ‘N’ if there is at least one untracked file.
+        • ‘U’ if there is at least one unstaged file.
+        • ‘S’ if there is at least one staged file.
+
+     Only the first one of these that applies is shown.
+
+ -- Function: magit-repolist-column-flags
+     This functions insert all flags as specified by
+     ‘magit-repolist-column-flag-alist’.
+
+     This is an alternative to function ‘magit-repolist-column-flag’,
+     which only lists the first one found.
+
+ -- Function: magit-repolist-column-unpulled-from-upstream
+     This function inserts the number of upstream commits not in the
+     current branch.
+
+ -- Function: magit-repolist-column-unpulled-from-pushremote
+     This function inserts the number of commits in the push branch but
+     not the current branch.
+
+ -- Function: magit-repolist-column-unpushed-to-upstream
+     This function inserts the number of commits in the current branch
+     but not its upstream.
+
+ -- Function: magit-repolist-column-unpushed-to-pushremote
+     This function inserts the number of commits in the current branch
+     but not its push branch.
+
+The following commands are available in repolist buffers:
+
+‘<RET>’ (‘magit-repolist-status’)
+     This command shows the status for the repository at point.
+
+‘m’ (‘magit-repolist-mark’)
+     This command marks the repository at point.
+
+‘u’ (‘magit-repolist-unmark’)
+     This command unmarks the repository at point.
+
+‘f’ (‘magit-repolist-fetch’)
+     This command fetches all marked repositories.  If no repositories
+     are marked, then it offers to fetch all displayed repositories.
+
+‘5’ (‘magit-repolist-find-file-other-frame’)
+     This command reads a relative file-name (without completion) and
+     opens the respective file in each marked repository in a new frame.
+     If no repositories are marked, then it offers to do this for all
+     displayed repositories.
+
+
+File: magit.info,  Node: Logging,  Next: Diffing,  Prev: Repository List,  Up: Inspecting
+
+5.3 Logging
+===========
+
+The status buffer contains logs for the unpushed and unpulled commits,
+but that obviously isn’t enough.  The transient prefix command
+‘magit-log’, on ‘l’, features several suffix commands, which show a
+specific log in a separate log buffer.
+
+   Like other transient prefix commands, ‘magit-log’ also features
+several infix arguments that can be changed before invoking one of the
+suffix commands.  However, in the case of the log transient, these
+arguments may be taken from those currently in use in the current
+repository’s log buffer, depending on the value of
+‘magit-prefix-use-buffer-arguments’ (see *note Transient Arguments and
+Buffer Variables::).
+
+   For information about the various arguments, see *note
+(gitman)git-log::.  The switch ‘++order=VALUE’ is converted to one of
+‘--author-date-order’, ‘--date-order’, or ‘--topo-order’ before being
+passed to ‘git log’.
+
+   The log transient also features several reflog commands.  See *note
+Reflog::.
+
+‘l’ (‘magit-log’)
+     This transient prefix command binds the following suffix commands
+     along with the appropriate infix arguments and displays them in a
+     temporary buffer until a suffix is invoked.
+
+‘l l’ (‘magit-log-current’)
+     Show log for the current branch.  When ‘HEAD’ is detached or with a
+     prefix argument, show log for one or more revs read from the
+     minibuffer.
+
+‘l h’ (‘magit-log-head’)
+     Show log for ‘HEAD’.
+
+‘l u’ (‘magit-log-related’)
+     Show log for the current branch, its upstream and its push target.
+     When the upstream is a local branch, then also show its own
+     upstream.  When ‘HEAD’ is detached, then show log for that, the
+     previously checked out branch and its upstream and push-target.
+
+‘l o’ (‘magit-log-other’)
+     Show log for one or more revs read from the minibuffer.  The user
+     can input any revision or revisions separated by a space, or even
+     ranges, but only branches, tags, and a representation of the commit
+     at point are available as completion candidates.
+
+‘l L’ (‘magit-log-branches’)
+     Show log for all local branches and ‘HEAD’.
+
+‘l b’ (‘magit-log-all-branches’)
+     Show log for all local and remote branches and ‘HEAD’.
+
+‘l a’ (‘magit-log-all’)
+     Show log for all references and ‘HEAD’.
+
+   Two additional commands that show the log for the file or blob that
+is being visited in the current buffer exists, see *note Commands for
+Buffers Visiting Files::.  The command ‘magit-cherry’ also shows a log,
+see *note Cherries::.
+
+* Menu:
+
+* Refreshing Logs::
+* Log Buffer::
+* Log Margin::
+* Select from Log::
+* Reflog::
+* Cherries::
+
+
+File: magit.info,  Node: Refreshing Logs,  Next: Log Buffer,  Up: Logging
+
+5.3.1 Refreshing Logs
+---------------------
+
+The transient prefix command ‘magit-log-refresh’, on ‘L’, can be used to
+change the log arguments used in the current buffer, without changing
+which log is shown.  This works in dedicated log buffers, but also in
+the status buffer.
+
+‘L’ (‘magit-log-refresh’)
+     This transient prefix command binds the following suffix commands
+     along with the appropriate infix arguments and displays them in a
+     temporary buffer until a suffix is invoked.
+
+‘L g’ (‘magit-log-refresh’)
+     This suffix command sets the local log arguments for the current
+     buffer.
+
+‘L s’ (‘magit-log-set-default-arguments’)
+     This suffix command sets the default log arguments for buffers of
+     the same type as that of the current buffer.  Other existing
+     buffers of the same type are not affected because their local
+     values have already been initialized.
+
+‘L w’ (‘magit-log-save-default-arguments’)
+     This suffix command sets the default log arguments for buffers of
+     the same type as that of the current buffer, and saves the value
+     for future sessions.  Other existing buffers of the same type are
+     not affected because their local values have already been
+     initialized.
+
+‘L L’ (‘magit-toggle-margin’)
+     Show or hide the margin.
+
+
+File: magit.info,  Node: Log Buffer,  Next: Log Margin,  Prev: Refreshing Logs,  Up: Logging
+
+5.3.2 Log Buffer
+----------------
+
+‘L’ (‘magit-log-refresh’)
+     This transient prefix command binds the following suffix commands
+     along with the appropriate infix arguments and displays them in a
+     temporary buffer until a suffix is invoked.
+
+     See *note Refreshing Logs::.
+
+‘q’ (‘magit-log-bury-buffer’)
+     Bury the current buffer or the revision buffer in the same frame.
+     Like ‘magit-mode-bury-buffer’ (which see) but with a negative
+     prefix argument instead bury the revision buffer, provided it is
+     displayed in the current frame.
+
+‘C-c C-b’ (‘magit-go-backward’)
+     Move backward in current buffer’s history.
+
+‘C-c C-f’ (‘magit-go-forward’)
+     Move forward in current buffer’s history.
+
+‘C-c C-n’ (‘magit-log-move-to-parent’)
+     Move to a parent of the current commit.  By default, this is the
+     first parent, but a numeric prefix can be used to specify another
+     parent.
+
+‘j’ (‘magit-log-move-to-revision’)
+     Read a revision and move to it in current log buffer.
+
+     If the chosen reference or revision isn’t being displayed in the
+     current log buffer, then inform the user about that and do nothing
+     else.
+
+     If invoked outside any log buffer, then display the log buffer of
+     the current repository first; creating it if necessary.
+
+‘<SPC>’ (‘magit-diff-show-or-scroll-up’)
+     Update the commit or diff buffer for the thing at point.
+
+     Either show the commit or stash at point in the appropriate buffer,
+     or if that buffer is already being displayed in the current frame
+     and contains information about that commit or stash, then instead
+     scroll the buffer up.  If there is no commit or stash at point,
+     then prompt for a commit.
+
+‘<DEL>’ (‘magit-diff-show-or-scroll-down’)
+     Update the commit or diff buffer for the thing at point.
+
+     Either show the commit or stash at point in the appropriate buffer,
+     or if that buffer is already being displayed in the current frame
+     and contains information about that commit or stash, then instead
+     scroll the buffer down.  If there is no commit or stash at point,
+     then prompt for a commit.
+
+‘=’ (‘magit-log-toggle-commit-limit’)
+     Toggle the number of commits the current log buffer is limited to.
+     If the number of commits is currently limited, then remove that
+     limit.  Otherwise set it to 256.
+
+‘+’ (‘magit-log-double-commit-limit’)
+     Double the number of commits the current log buffer is limited to.
+
+‘-’ (‘magit-log-half-commit-limit’)
+     Half the number of commits the current log buffer is limited to.
+
+ -- User Option: magit-log-auto-more
+     Insert more log entries automatically when moving past the last
+     entry.  Only considered when moving past the last entry with
+     ‘magit-goto-*-section’ commands.
+
+ -- User Option: magit-log-show-refname-after-summary
+     Whether to show the refnames after the commit summaries.  This is
+     useful if you use really long branch names.
+
+ -- User Option: magit-log-show-color-graph-limit
+     When showing more commits than specified by this option, then the
+     ‘--color’ argument, if specified, is silently dropped.  This is
+     necessary because the ‘ansi-color’ library, which is used to turn
+     control sequences into faces, is just too slow.
+
+ -- User Option: magit-log-show-signatures-limit
+     When showing more commits than specified by this option, then the
+     ‘--show-signature’ argument, if specified, is silently dropped.
+     This is necessary because checking the signature of a large number
+     of commits is just too slow.
+
+   Magit displays references in logs a bit differently from how Git does
+it.
+
+   Local branches are blue and remote branches are green.  Of course
+that depends on the used theme, as do the colors used for other types of
+references.  The current branch has a box around it, as do remote
+branches that are their respective remote’s ‘HEAD’ branch.
+
+   If a local branch and its push-target point at the same commit, then
+their names are combined to preserve space and to make that relationship
+visible.  For example:
+
+     origin/feature
+     [green][blue-]
+
+     instead of
+
+     feature origin/feature
+     [blue-] [green-------]
+
+   Also note that while the transient features the ‘--show-signature’
+argument, that won’t actually be used when enabled, because Magit
+defaults to use just one line per commit.  Instead the commit colorized
+to indicate the validity of the signed commit object, using the faces
+named ‘magit-signature-*’ (which see).
+
+   For a description of ‘magit-log-margin’ see *note Log Margin::.
+
+
+File: magit.info,  Node: Log Margin,  Next: Select from Log,  Prev: Log Buffer,  Up: Logging
+
+5.3.3 Log Margin
+----------------
+
+In buffers which show one or more logs, it is possible to show
+additional information about each commit in the margin.  The options
+used to configure the margin are named ‘magit-INFIX-margin’, where INFIX
+is the same as in the respective major-mode ‘magit-INFIX-mode’.  In
+regular log buffers that would be ‘magit-log-margin’.
+
+ -- User Option: magit-log-margin
+     This option specifies whether the margin is initially shown in
+     Magit-Log mode buffers and how it is formatted.
+
+     The value has the form ‘(INIT STYLE WIDTH AUTHOR AUTHOR-WIDTH)’.
+
+        • If INIT is non-nil, then the margin is shown initially.
+        • STYLE controls how to format the author or committer date.  It
+          can be one of ‘age’ (to show the age of the commit),
+          ‘age-abbreviated’ (to abbreviate the time unit to a
+          character), or a string (suitable for ‘format-time-string’) to
+          show the actual date.  Option
+          ‘magit-log-margin-show-committer-date’ controls which date is
+          being displayed.
+        • WIDTH controls the width of the margin.  This exists for
+          forward compatibility and currently the value should not be
+          changed.
+        • AUTHOR controls whether the name of the author is also shown
+          by default.
+        • AUTHOR-WIDTH has to be an integer.  When the name of the
+          author is shown, then this specifies how much space is used to
+          do so.
+
+   You can change the STYLE and AUTHOR-WIDTH of all ‘magit-INFIX-margin’
+options to the same values by customizing ‘magit-log-margin’ *before*
+‘magit’ is loaded.  If you do that, then the respective values for the
+other options will default to what you have set for that variable.
+Likewise if you set INIT in ‘magit-log-margin’ to ‘nil’, then that is
+used in the default of all other options.  But setting it to ‘t’, i.e.
+re-enforcing the default for that option, does not carry to other
+options.
+
+ -- User Option: magit-log-margin-show-committer-date
+     This option specifies whether to show the committer date in the
+     margin.  This option only controls whether the committer date is
+     displayed instead of the author date.  Whether some date is
+     displayed in the margin and whether the margin is displayed at all
+     is controlled by other options.
+
+‘L’ (‘magit-margin-settings’)
+     This transient prefix command binds the following suffix commands,
+     each of which changes the appearance of the margin in some way.
+
+   In some buffers that support the margin, ‘L’ is instead bound to
+‘magit-log-refresh’, but that transient features the same commands, and
+then some other unrelated commands.
+
+‘L L’ (‘magit-toggle-margin’)
+     This command shows or hides the margin.
+
+‘L l’ (‘magit-cycle-margin-style’)
+     This command cycles the style used for the margin.
+
+‘L d’ (‘magit-toggle-margin-details’)
+     This command shows or hides details in the margin.
+
+
+File: magit.info,  Node: Select from Log,  Next: Reflog,  Prev: Log Margin,  Up: Logging
+
+5.3.4 Select from Log
+---------------------
+
+When the user has to select a recent commit that is reachable from
+‘HEAD’, using regular completion would be inconvenient (because most
+humans cannot remember hashes or "HEAD~5", at least not without double
+checking).  Instead a log buffer is used to select the commit, which has
+the advantage that commits are presented in order and with the commit
+message.
+
+   Such selection logs are used when selecting the beginning of a rebase
+and when selecting the commit to be squashed into.
+
+   In addition to the key bindings available in all log buffers, the
+following additional key bindings are available in selection log
+buffers:
+
+‘C-c C-c’ (‘magit-log-select-pick’)
+     Select the commit at point and act on it.  Call
+     ‘magit-log-select-pick-function’ with the selected commit as
+     argument.
+
+‘C-c C-k’ (‘magit-log-select-quit’)
+     Abort selecting a commit, don’t act on any commit.
+
+ -- User Option: magit-log-select-margin
+     This option specifies whether the margin is initially shown in
+     Magit-Log-Select mode buffers and how it is formatted.
+
+     The value has the form ‘(INIT STYLE WIDTH AUTHOR AUTHOR-WIDTH)’.
+
+        • If INIT is non-nil, then the margin is shown initially.
+        • STYLE controls how to format the author or committer date.  It
+          can be one of ‘age’ (to show the age of the commit),
+          ‘age-abbreviated’ (to abbreviate the time unit to a
+          character), or a string (suitable for ‘format-time-string’) to
+          show the actual date.  Option
+          ‘magit-log-margin-show-committer-date’ controls which date is
+          being displayed.
+        • WIDTH controls the width of the margin.  This exists for
+          forward compatibility and currently the value should not be
+          changed.
+        • AUTHOR controls whether the name of the author is also shown
+          by default.
+        • AUTHOR-WIDTH has to be an integer.  When the name of the
+          author is shown, then this specifies how much space is used to
+          do so.
+
+
+File: magit.info,  Node: Reflog,  Next: Cherries,  Prev: Select from Log,  Up: Logging
+
+5.3.5 Reflog
+------------
+
+Also see *note (gitman)git-reflog::.
+
+   These reflog commands are available from the log transient.  See
+*note Logging::.
+
+‘l r’ (‘magit-reflog-current’)
+     Display the reflog of the current branch.
+
+‘l O’ (‘magit-reflog-other’)
+     Display the reflog of a branch or another ref.
+
+‘l H’ (‘magit-reflog-head’)
+     Display the ‘HEAD’ reflog.
+
+ -- User Option: magit-reflog-margin
+     This option specifies whether the margin is initially shown in
+     Magit-Reflog mode buffers and how it is formatted.
+
+     The value has the form ‘(INIT STYLE WIDTH AUTHOR AUTHOR-WIDTH)’.
+
+        • If INIT is non-nil, then the margin is shown initially.
+        • STYLE controls how to format the author or committer date.  It
+          can be one of ‘age’ (to show the age of the commit),
+          ‘age-abbreviated’ (to abbreviate the time unit to a
+          character), or a string (suitable for ‘format-time-string’) to
+          show the actual date.  Option
+          ‘magit-log-margin-show-committer-date’ controls which date is
+          being displayed.
+        • WIDTH controls the width of the margin.  This exists for
+          forward compatibility and currently the value should not be
+          changed.
+        • AUTHOR controls whether the name of the author is also shown
+          by default.
+        • AUTHOR-WIDTH has to be an integer.  When the name of the
+          author is shown, then this specifies how much space is used to
+          do so.
+
+
+File: magit.info,  Node: Cherries,  Prev: Reflog,  Up: Logging
+
+5.3.6 Cherries
+--------------
+
+Cherries are commits that haven’t been applied upstream (yet), and are
+usually visualized using a log.  Each commit is prefixed with ‘-’ if it
+has an equivalent in the upstream and ‘+’ if it does not, i.e., if it is
+a cherry.
+
+   The command ‘magit-cherry’ shows cherries for a single branch, but
+the references buffer (see *note References Buffer::) can show cherries
+for multiple "upstreams" at once.
+
+   Also see *note (gitman)git-reflog::.
+
+‘Y’ (‘magit-cherry’)
+     Show commits that are in a certain branch but that have not been
+     merged in the upstream branch.
+
+ -- User Option: magit-cherry-margin
+     This option specifies whether the margin is initially shown in
+     Magit-Cherry mode buffers and how it is formatted.
+
+     The value has the form ‘(INIT STYLE WIDTH AUTHOR AUTHOR-WIDTH)’.
+
+        • If INIT is non-nil, then the margin is shown initially.
+        • STYLE controls how to format the author or committer date.  It
+          can be one of ‘age’ (to show the age of the commit),
+          ‘age-abbreviated’ (to abbreviate the time unit to a
+          character), or a string (suitable for ‘format-time-string’) to
+          show the actual date.  Option
+          ‘magit-log-margin-show-committer-date’ controls which date is
+          being displayed.
+        • WIDTH controls the width of the margin.  This exists for
+          forward compatibility and currently the value should not be
+          changed.
+        • AUTHOR controls whether the name of the author is also shown
+          by default.
+        • AUTHOR-WIDTH has to be an integer.  When the name of the
+          author is shown, then this specifies how much space is used to
+          do so.
+
+
+File: magit.info,  Node: Diffing,  Next: Ediffing,  Prev: Logging,  Up: Inspecting
+
+5.4 Diffing
+===========
+
+The status buffer contains diffs for the staged and unstaged commits,
+but that obviously isn’t enough.  The transient prefix command
+‘magit-diff’, on ‘d’, features several suffix commands, which show a
+specific diff in a separate diff buffer.
+
+   Like other transient prefix commands, ‘magit-diff’ also features
+several infix arguments that can be changed before invoking one of the
+suffix commands.  However, in the case of the diff transient, these
+arguments may be taken from those currently in use in the current
+repository’s diff buffer, depending on the value of
+‘magit-prefix-use-buffer-arguments’ (see *note Transient Arguments and
+Buffer Variables::).
+
+   Also see *note (gitman)git-diff::.
+
+‘d’ (‘magit-diff’)
+     This transient prefix command binds the following suffix commands
+     along with the appropriate infix arguments and displays them in a
+     temporary buffer until a suffix is invoked.
+
+‘d d’ (‘magit-diff-dwim’)
+     Show changes for the thing at point.
+
+‘d r’ (‘magit-diff-range’)
+     Show differences between two commits.
+
+     RANGE should be a range (A..B or A...B) but can also be a single
+     commit.  If one side of the range is omitted, then it defaults to
+     ‘HEAD’.  If just a commit is given, then changes in the working
+     tree relative to that commit are shown.
+
+     If the region is active, use the revisions on the first and last
+     line of the region.  With a prefix argument, instead of diffing the
+     revisions, choose a revision to view changes along, starting at the
+     common ancestor of both revisions (i.e., use a "..." range).
+
+‘d w’ (‘magit-diff-working-tree’)
+     Show changes between the current working tree and the ‘HEAD’
+     commit.  With a prefix argument show changes between the working
+     tree and a commit read from the minibuffer.
+
+‘d s’ (‘magit-diff-staged’)
+     Show changes between the index and the ‘HEAD’ commit.  With a
+     prefix argument show changes between the index and a commit read
+     from the minibuffer.
+
+‘d u’ (‘magit-diff-unstaged’)
+     Show changes between the working tree and the index.
+
+‘d p’ (‘magit-diff-paths’)
+     Show changes between any two files on disk.
+
+   All of the above suffix commands update the repository’s diff buffer.
+The diff transient also features two commands which show differences in
+another buffer:
+
+‘d c’ (‘magit-show-commit’)
+     Show the commit at point.  If there is no commit at point or with a
+     prefix argument, prompt for a commit.
+
+‘d t’ (‘magit-stash-show’)
+     Show all diffs of a stash in a buffer.
+
+   Two additional commands that show the diff for the file or blob that
+is being visited in the current buffer exists, see *note Commands for
+Buffers Visiting Files::.
+
+* Menu:
+
+* Refreshing Diffs::
+* Commands Available in Diffs::
+* Diff Options::
+* Revision Buffer::
+
+
+File: magit.info,  Node: Refreshing Diffs,  Next: Commands Available in Diffs,  Up: Diffing
+
+5.4.1 Refreshing Diffs
+----------------------
+
+The transient prefix command ‘magit-diff-refresh’, on ‘D’, can be used
+to change the diff arguments used in the current buffer, without
+changing which diff is shown.  This works in dedicated diff buffers, but
+also in the status buffer.
+
+   (There is one exception; diff arguments cannot be changed in buffers
+created by ‘magit-merge-preview’ because the underlying Git command does
+not support these arguments.)
+
+‘D’ (‘magit-diff-refresh’)
+     This transient prefix command binds the following suffix commands
+     along with the appropriate infix arguments and displays them in a
+     temporary buffer until a suffix is invoked.
+
+‘D g’ (‘magit-diff-refresh’)
+     This suffix command sets the local diff arguments for the current
+     buffer.
+
+‘D s’ (‘magit-diff-set-default-arguments’)
+     This suffix command sets the default diff arguments for buffers of
+     the same type as that of the current buffer.  Other existing
+     buffers of the same type are not affected because their local
+     values have already been initialized.
+
+‘D w’ (‘magit-diff-save-default-arguments’)
+     This suffix command sets the default diff arguments for buffers of
+     the same type as that of the current buffer, and saves the value
+     for future sessions.  Other existing buffers of the same type are
+     not affected because their local values have already been
+     initialized.
+
+‘D t’ (‘magit-diff-toggle-refine-hunk’)
+     This command toggles hunk refinement on or off.
+
+‘D r’ (‘magit-diff-switch-range-type’)
+     This command converts the diff range type from "revA..revB" to
+     "revB...revA", or vice versa.
+
+‘D f’ (‘magit-diff-flip-revs’)
+     This command swaps revisions in the diff range from "revA..revB" to
+     "revB..revA", or vice versa.
+
+‘D F’ (‘magit-diff-toggle-file-filter’)
+     This command toggles the file restriction of the diffs in the
+     current buffer, allowing you to quickly switch between viewing all
+     the changes in the commit and the restricted subset.  As a special
+     case, when this command is called from a log buffer, it toggles the
+     file restriction in the repository’s revision buffer, which is
+     useful when you display a revision from a log buffer that is
+     restricted to a file or files.
+
+   In addition to the above transient, which allows changing any of the
+supported arguments, there also exist some commands that change only a
+particular argument.
+
+‘-’ (‘magit-diff-less-context’)
+     This command decreases the context for diff hunks by COUNT lines.
+
+‘+’ (‘magit-diff-more-context’)
+     This command increases the context for diff hunks by COUNT lines.
+
+‘0’ (‘magit-diff-default-context’)
+     This command resets the context for diff hunks to the default
+     height.
+
+   The following commands quickly change what diff is being displayed
+without having to using one of the diff transient.
+
+‘C-c C-d’ (‘magit-diff-while-committing’)
+     While committing, this command shows the changes that are about to
+     be committed.  While amending, invoking the command again toggles
+     between showing just the new changes or all the changes that will
+     be committed.
+
+     This binding is available in the diff buffer as well as the commit
+     message buffer.
+
+‘C-c C-b’ (‘magit-go-backward’)
+     This command moves backward in current buffer’s history.
+
+‘C-c C-f’ (‘magit-go-forward’)
+     This command moves forward in current buffer’s history.
+
+
+File: magit.info,  Node: Commands Available in Diffs,  Next: Diff Options,  Prev: Refreshing Diffs,  Up: Diffing
+
+5.4.2 Commands Available in Diffs
+---------------------------------
+
+Some commands are only available if point is inside a diff.
+
+   ‘magit-diff-visit-file’ and related commands visit the appropriate
+version of the file that the diff at point is about.  Likewise
+‘magit-diff-visit-worktree-file’ and related commands visit the worktree
+version of the file that the diff at point is about.  See *note Visiting
+Files and Blobs from a Diff:: for more information and the key bindings.
+
+‘C-c C-t’ (‘magit-diff-trace-definition’)
+     This command shows a log for the definition at point.
+
+ -- User Option: magit-log-trace-definition-function
+     The function specified by this option is used by
+     ‘magit-log-trace-definition’ to determine the function at point.
+     For major-modes that have special needs, you could set the local
+     value using the mode’s hook.
+
+‘C-c C-e’ (‘magit-diff-edit-hunk-commit’)
+     From a hunk, this command edits the respective commit and visits
+     the file.
+
+     First it visits the file being modified by the hunk at the correct
+     location using ‘magit-diff-visit-file’.  This actually visits a
+     blob.  When point is on a diff header, not within an individual
+     hunk, then this visits the blob the first hunk is about.
+
+     Then it invokes ‘magit-edit-line-commit’, which uses an interactive
+     rebase to make the commit editable, or if that is not possible
+     because the commit is not reachable from ‘HEAD’ by checking out
+     that commit directly.  This also causes the actual worktree file to
+     be visited.
+
+     Neither the blob nor the file buffer are killed when finishing the
+     rebase.  If that is undesirable, then it might be better to use
+     ‘magit-rebase-edit-commit’ instead of this command.
+
+‘j’ (‘magit-jump-to-diffstat-or-diff’)
+     This command jumps to the diffstat or diff.  When point is on a
+     file inside the diffstat section, then jump to the respective diff
+     section.  Otherwise, jump to the diffstat section or a child
+     thereof.
+
+   The next two commands are not specific to Magit-Diff mode (or and
+Magit buffer for that matter), but it might be worth pointing out that
+they are available here too.
+
+‘<SPC>’ (‘scroll-up’)
+     This command scrolls text upward.
+
+‘<DEL>’ (‘scroll-down’)
+     This command scrolls text downward.
+
+
+File: magit.info,  Node: Diff Options,  Next: Revision Buffer,  Prev: Commands Available in Diffs,  Up: Diffing
+
+5.4.3 Diff Options
+------------------
+
+ -- User Option: magit-diff-refine-hunk
+     Whether to show word-granularity differences within diff hunks.
+
+        • ‘nil’ Never show fine differences.
+        • ‘t’ Show fine differences for the current diff hunk only.
+        • ‘all’ Show fine differences for all displayed diff hunks.
+
+ -- User Option: magit-diff-refine-ignore-whitespace
+     Whether to ignore whitespace changes in word-granularity
+     differences.
+
+ -- User Option: magit-diff-adjust-tab-width
+     Whether to adjust the width of tabs in diffs.
+
+     Determining the correct width can be expensive if it requires
+     opening large and/or many files, so the widths are cached in the
+     variable ‘magit-diff--tab-width-cache’.  Set that to nil to
+     invalidate the cache.
+
+        • ‘nil’ Never adjust tab width.  Use ‘tab-width’s value from the
+          Magit buffer itself instead.
+
+        • ‘t’ If the corresponding file-visiting buffer exits, then use
+          ‘tab-width’’s value from that buffer.  Doing this is cheap, so
+          this value is used even if a corresponding cache entry exists.
+
+        • ‘always’ If there is no such buffer, then temporarily visit
+          the file to determine the value.
+
+        • NUMBER Like ‘always’, but don’t visit files larger than NUMBER
+          bytes.
+
+ -- User Option: magit-diff-paint-whitespace
+     Specify where to highlight whitespace errors.
+
+     See ‘magit-diff-highlight-trailing’,
+     ‘magit-diff-highlight-indentation’.  The symbol ‘t’ means in all
+     diffs, ‘status’ means only in the status buffer, and nil means
+     nowhere.
+
+        • ‘nil’ Never highlight whitespace errors.
+        • ‘t’ Highlight whitespace errors everywhere.
+        • ‘uncommitted’ Only highlight whitespace errors in diffs
+          showing uncommitted changes.  For backward compatibility
+          ‘status’ is treated as a synonym.
+
+ -- User Option: magit-diff-paint-whitespace-lines
+     Specify in what kind of lines to highlight whitespace errors.
+
+        • ‘t’ Highlight only in added lines.
+        • ‘both’ Highlight in added and removed lines.
+        • ‘all’ Highlight in added, removed and context lines.
+
+ -- User Option: magit-diff-highlight-trailing
+     Whether to highlight whitespace at the end of a line in diffs.
+     Used only when ‘magit-diff-paint-whitespace’ is non-nil.
+
+ -- User Option: magit-diff-highlight-indentation
+     This option controls whether to highlight the indentation in case
+     it used the "wrong" indentation style.  Indentation is only
+     highlighted if ‘magit-diff-paint-whitespace’ is also non-nil.
+
+     The value is an alist of the form ‘((REGEXP . INDENT)...)’.  The
+     path to the current repository is matched against each element in
+     reverse order.  Therefore if a REGEXP matches, then earlier
+     elements are not tried.
+
+     If the used INDENT is ‘tabs’, highlight indentation with tabs.  If
+     INDENT is an integer, highlight indentation with at least that many
+     spaces.  Otherwise, highlight neither.
+
+ -- User Option: magit-diff-hide-trailing-cr-characters
+     Whether to hide ^M characters at the end of a line in diffs.
+
+ -- User Option: magit-diff-highlight-hunk-region-functions
+     This option specifies the functions used to highlight the
+     hunk-internal region.
+
+     ‘magit-diff-highlight-hunk-region-dim-outside’ overlays the outside
+     of the hunk internal selection with a face that causes the added
+     and removed lines to have the same background color as context
+     lines.  This function should not be removed from the value of this
+     option.
+
+     ‘magit-diff-highlight-hunk-region-using-overlays’ and
+     ‘magit-diff-highlight-hunk-region-using-underline’ emphasize the
+     region by placing delimiting horizontal lines before and after it.
+     Both of these functions have glitches which cannot be fixed due to
+     limitations of Emacs’ display engine.  For more information see
+     <https://github.com/magit/magit/issues/2758> ff.
+
+     Instead of, or in addition to, using delimiting horizontal lines,
+     to emphasize the boundaries, you may wish to emphasize the text
+     itself, using ‘magit-diff-highlight-hunk-region-using-face’.
+
+     In terminal frames it’s not possible to draw lines as the overlay
+     and underline variants normally do, so there they fall back to
+     calling the face function instead.
+
+ -- User Option: magit-diff-unmarked-lines-keep-foreground
+     This option controls whether added and removed lines outside the
+     hunk-internal region only lose their distinct background color or
+     also the foreground color.  Whether the outside of the region is
+     dimmed at all depends on
+     ‘magit-diff-highlight-hunk-region-functions’.
+
+ -- User Option: magit-diff-extra-stat-arguments
+     This option specifies additional arguments to be used alongside
+     ‘--stat’.
+
+     The value is a list of zero or more arguments or a function that
+     takes no argument and returns such a list.  These arguments are
+     allowed here: ‘--stat-width’, ‘--stat-name-width’,
+     ‘--stat-graph-width’ and ‘--compact-summary’.  Also see *note
+     (gitman)git-diff::.
+
+
+File: magit.info,  Node: Revision Buffer,  Prev: Diff Options,  Up: Diffing
+
+5.4.4 Revision Buffer
+---------------------
+
+ -- User Option: magit-revision-insert-related-refs
+     Whether to show related branches in revision buffers.
+
+        • ‘nil’ Don’t show any related branches.
+        • ‘t’ Show related local branches.
+        • ‘all’ Show related local and remote branches.
+        • ‘mixed’ Show all containing branches and local merged
+          branches.
+
+ -- User Option: magit-revision-show-gravatars
+     Whether to show gravatar images in revision buffers.
+
+     If ‘nil’, then don’t insert any gravatar images.  If ‘t’, then
+     insert both images.  If ‘author’ or ‘committer’, then insert only
+     the respective image.
+
+     If you have customized the option ‘magit-revision-headers-format’
+     and want to insert the images then you might also have to specify
+     where to do so.  In that case the value has to be a cons-cell of
+     two regular expressions.  The car specifies where to insert the
+     author’s image.  The top half of the image is inserted right after
+     the matched text, the bottom half on the next line in the same
+     column.  The cdr specifies where to insert the committer’s image,
+     accordingly.  Either the car or the cdr may be nil."
+
+ -- User Option: magit-revision-use-hash-sections
+     Whether to turn hashes inside the commit message into sections.
+
+     If non-nil, then hashes inside the commit message are turned into
+     ‘commit’ sections.  There is a trade off to be made between
+     performance and reliability:
+
+        • ‘slow’ calls git for every word to be absolutely sure.
+        • ‘quick’ skips words less than seven characters long.
+        • ‘quicker’ additionally skips words that don’t contain a
+          number.
+        • ‘quickest’ uses all words that are at least seven characters
+          long and which contain at least one number as well as at least
+          one letter.
+
+     If nil, then no hashes are turned into sections, but you can still
+     visit the commit at point using "RET".
+
+   The diffs shown in the revision buffer may be automatically
+restricted to a subset of the changed files.  If the revision buffer is
+displayed from a log buffer, the revision buffer will share the same
+file restriction as that log buffer (also see the command
+‘magit-diff-toggle-file-filter’).
+
+ -- User Option: magit-revision-filter-files-on-follow
+     Whether showing a commit from a log buffer honors the log’s file
+     filter when the log arguments include ‘--follow’.
+
+     When this option is nil, displaying a commit from a log ignores the
+     log’s file filter if the log arguments include ‘--follow’.  Doing
+     so avoids showing an empty diff in revision buffers for commits
+     before a rename event.  In such cases, the ‘--patch’ argument of
+     the log transient can be used to show the file-restricted diffs
+     inline.
+
+     Set this option to non-nil to keep the log’s file restriction even
+     if ‘--follow’ is present in the log arguments.
+
+   If the revision buffer is not displayed from a log buffer, the file
+restriction is determined as usual (see *note Transient Arguments and
+Buffer Variables::).
+
+
+File: magit.info,  Node: Ediffing,  Next: References Buffer,  Prev: Diffing,  Up: Inspecting
+
+5.5 Ediffing
+============
+
+This section describes how to enter Ediff from Magit buffers.  For
+information on how to use Ediff itself, see *note (ediff)Top::.
+
+‘e’ (‘magit-ediff-dwim’)
+     Compare, stage, or resolve using Ediff.
+
+     This command tries to guess what file, and what commit or range the
+     user wants to compare, stage, or resolve using Ediff.  It might
+     only be able to guess either the file, or range/commit, in which
+     case the user is asked about the other.  It might not always guess
+     right, in which case the appropriate ‘magit-ediff-*’ command has to
+     be used explicitly.  If it cannot read the user’s mind at all, then
+     it asks the user for a command to run.
+
+‘E’ (‘magit-ediff’)
+     This transient prefix command binds the following suffix commands
+     and displays them in a temporary buffer until a suffix is invoked.
+
+‘E r’ (‘magit-ediff-compare’)
+     Compare two revisions of a file using Ediff.
+
+     If the region is active, use the revisions on the first and last
+     line of the region.  With a prefix argument, instead of diffing the
+     revisions, choose a revision to view changes along, starting at the
+     common ancestor of both revisions (i.e., use a "..." range).
+
+‘E m’ (‘magit-ediff-resolve-rest’)
+     This command allows you to resolve outstanding conflicts in the
+     file at point using Ediff.  If there is no file at point or if it
+     doesn’t have any unmerged changes, then this command prompts for a
+     file.
+
+     Provided that the value of ‘merge.conflictstyle’ is ‘diff3’, you
+     can view the file’s merge-base revision using ‘/’ in the Ediff
+     control buffer.
+
+     The A, B and Ancestor buffers are constructed from the conflict
+     markers in the worktree file.  Because you and/or Git may have
+     already resolved some conflicts, that means that these buffers may
+     not contain the actual versions from the respective blobs.
+
+‘E M’ (‘magit-ediff-resolve-all’)
+     This command allows you to resolve all conflicts in the file at
+     point using Ediff.  If there is no file at point or if it doesn’t
+     have any unmerged changes, then this command prompts for a file.
+
+     Provided that the value of ‘merge.conflictstyle’ is ‘diff3’, you
+     can view the file’s merge-base revision using ‘/’ in the Ediff
+     control buffer.
+
+     First the file in the worktree is moved aside, appending the suffix
+     ‘.ORIG’, so that you could later go back to that version.  Then it
+     is reconstructed from the two sides of the conflict and the
+     merge-base, if available.
+
+     It would be nice if the worktree file were just used as-is, but
+     Ediff does not support that.  This means that all conflicts, that
+     Git has already resolved, are restored.  On the other hand Ediff
+     also tries to resolve conflicts, and in many cases Ediff and Git
+     should produce similar results.
+
+     However if you have already resolved some conflicts manually, then
+     those changes are discarded (though you can recover them from the
+     backup file).  In such cases ‘magit-ediff-resolve-rest’ might be
+     more suitable.
+
+     The advantage that this command has over ‘magit-ediff-resolve-rest’
+     is that the A, B and Ancestor buffers correspond to blobs from the
+     respective commits, allowing you to inspect a side in context and
+     to use Magit commands in these buffers to do so.  Blame and log
+     commands are particularly useful here.
+
+‘E t’ (‘magit-git-mergetool’)
+     This command does not actually use Ediff.  While it serves the same
+     purpose as ‘magit-ediff-resolve-rest’, it uses ‘git mergetool
+     --gui’ to resolve conflicts.
+
+     With a prefix argument this acts as a transient prefix command,
+     allowing the user to select the mergetool and change some settings.
+
+‘E s’ (‘magit-ediff-stage’)
+     Stage and unstage changes to a file using Ediff, defaulting to the
+     file at point.
+
+‘E u’ (‘magit-ediff-show-unstaged’)
+     Show unstaged changes to a file using Ediff.
+
+‘E i’ (‘magit-ediff-show-staged’)
+     Show staged changes to a file using Ediff.
+
+‘E w’ (‘magit-ediff-show-working-tree’)
+     Show changes in a file between ‘HEAD’ and working tree using Ediff.
+
+‘E c’ (‘magit-ediff-show-commit’)
+     Show changes to a file introduced by a commit using Ediff.
+
+‘E z’ (‘magit-ediff-show-stash’)
+     Show changes to a file introduced by a stash using Ediff.
+
+ -- User Option: magit-ediff-dwim-resolve-function
+     This option controls which function ‘magit-ediff-dwim’ uses to
+     resolve conflicts.  One of ‘magit-ediff-resolve-rest’,
+     ‘magit-ediff-resolve-all’ or ‘magit-git-mergetool’; which are all
+     discussed above.
+
+ -- User Option: magit-ediff-dwim-show-on-hunks
+     This option controls what command ‘magit-ediff-dwim’ calls when
+     point is on uncommitted hunks.  When nil, always run
+     ‘magit-ediff-stage’.  Otherwise, use ‘magit-ediff-show-staged’ and
+     ‘magit-ediff-show-unstaged’ to show staged and unstaged changes,
+     respectively.
+
+ -- User Option: magit-ediff-show-stash-with-index
+     This option controls whether ‘magit-ediff-show-stash’ includes a
+     buffer containing the file’s state in the index at the time the
+     stash was created.  This makes it possible to tell which changes in
+     the stash were staged.
+
+ -- User Option: magit-ediff-quit-hook
+     This hook is run after quitting an Ediff session that was created
+     using a Magit command.  The hook functions are run inside the Ediff
+     control buffer, and should not change the current buffer.
+
+     This is similar to ‘ediff-quit-hook’ but takes the needs of Magit
+     into account.  The regular ‘ediff-quit-hook’ is ignored by Ediff
+     sessions that were created using a Magit command.
+
+
+File: magit.info,  Node: References Buffer,  Next: Bisecting,  Prev: Ediffing,  Up: Inspecting
+
+5.6 References Buffer
+=====================
+
+‘y’ (‘magit-show-refs’)
+     This command lists branches and tags in a dedicated buffer.
+
+     However if this command is invoked again from this buffer or if it
+     is invoked with a prefix argument, then it acts as a transient
+     prefix command, which binds the following suffix commands and some
+     infix arguments.
+
+   All of the following suffix commands list exactly the same branches
+and tags.  The only difference the optional feature that can be enabled
+by changing the value of ‘magit-refs-show-commit-count’ (see below).
+These commands specify a different branch or commit against which all
+the other references are compared.
+
+‘y y’ (‘magit-show-refs-head’)
+     This command lists branches and tags in a dedicated buffer.  Each
+     reference is being compared with ‘HEAD’.
+
+‘y c’ (‘magit-show-refs-current’)
+     This command lists branches and tags in a dedicated buffer.  Each
+     reference is being compared with the current branch or ‘HEAD’ if it
+     is detached.
+
+‘y o’ (‘magit-show-refs-other’)
+     This command lists branches and tags in a dedicated buffer.  Each
+     reference is being compared with a branch read from the user.
+
+‘y r’ (‘magit-refs-set-show-commit-count’)
+     This command changes for which refs the commit count is shown.
+
+ -- User Option: magit-refs-show-commit-count
+     Whether to show commit counts in Magit-Refs mode buffers.
+
+        • ‘all’ Show counts for branches and tags.
+        • ‘branch’ Show counts for branches only.
+        • ‘nil’ Never show counts.
+
+     The default is ‘nil’ because anything else can be very expensive.
+
+ -- User Option: magit-refs-pad-commit-counts
+     Whether to pad all commit counts on all sides in Magit-Refs mode
+     buffers.
+
+     If this is nil, then some commit counts are displayed right next to
+     one of the branches that appear next to the count, without any
+     space in between.  This might look bad if the branch name faces
+     look too similar to ‘magit-dimmed’.
+
+     If this is non-nil, then spaces are placed on both sides of all
+     commit counts.
+
+ -- User Option: magit-refs-show-remote-prefix
+     Whether to show the remote prefix in lists of remote branches.
+
+     Showing the prefix is redundant because the name of the remote is
+     already shown in the heading preceding the list of its branches.
+
+ -- User Option: magit-refs-primary-column-width
+     Width of the primary column in ‘magit-refs-mode’ buffers.  The
+     primary column is the column that contains the name of the branch
+     that the current row is about.
+
+     If this is an integer, then the column is that many columns wide.
+     Otherwise it has to be a cons-cell of two integers.  The first
+     specifies the minimal width, the second the maximal width.  In that
+     case the actual width is determined using the length of the names
+     of the shown local branches.  (Remote branches and tags are not
+     taken into account when calculating to optimal width.)
+
+ -- User Option: magit-refs-focus-column-width
+     Width of the focus column in ‘magit-refs-mode’ buffers.
+
+     The focus column is the first column, which marks one branch
+     (usually the current branch) as the focused branch using ‘*’ or
+     ‘@’.  For each other reference, this column optionally shows how
+     many commits it is ahead of the focused branch and ‘<’, or if it
+     isn’t ahead then the commits it is behind and ‘>’, or if it isn’t
+     behind either, then a ‘=’.
+
+     This column may also display only ‘*’ or ‘@’ for the focused
+     branch, in which case this option is ignored.  Use ‘L v’ to change
+     the verbosity of this column.
+
+ -- User Option: magit-refs-margin
+     This option specifies whether the margin is initially shown in
+     Magit-Refs mode buffers and how it is formatted.
+
+     The value has the form ‘(INIT STYLE WIDTH AUTHOR AUTHOR-WIDTH)’.
+
+        • If INIT is non-nil, then the margin is shown initially.
+        • STYLE controls how to format the author or committer date.  It
+          can be one of ‘age’ (to show the age of the commit),
+          ‘age-abbreviated’ (to abbreviate the time unit to a
+          character), or a string (suitable for ‘format-time-string’) to
+          show the actual date.  Option
+          ‘magit-log-margin-show-committer-date’ controls which date is
+          being displayed.
+        • WIDTH controls the width of the margin.  This exists for
+          forward compatibility and currently the value should not be
+          changed.
+        • AUTHOR controls whether the name of the author is also shown
+          by default.
+        • AUTHOR-WIDTH has to be an integer.  When the name of the
+          author is shown, then this specifies how much space is used to
+          do so.
+
+ -- User Option: magit-refs-margin-for-tags
+     This option specifies whether to show information about tags in the
+     margin.  This is disabled by default because it is slow if there
+     are many tags.
+
+   The following variables control how individual refs are displayed.
+If you change one of these variables (especially the "%c" part), then
+you should also change the others to keep things aligned.  The following
+%-sequences are supported:
+
+   • ‘%a’ Number of commits this ref has over the one we compare to.
+   • ‘%b’ Number of commits the ref we compare to has over this one.
+   • ‘%c’ Number of commits this ref has over the one we compare to.
+     For the ref which all other refs are compared this is instead "@",
+     if it is the current branch, or "#" otherwise.
+   • ‘%C’ For the ref which all other refs are compared this is "@", if
+     it is the current branch, or "#" otherwise.  For all other refs "
+     ".
+   • ‘%h’ Hash of this ref’s tip.
+   • ‘%m’ Commit summary of the tip of this ref.
+   • ‘%n’ Name of this ref.
+   • ‘%u’ Upstream of this local branch.
+   • ‘%U’ Upstream of this local branch and additional local vs.
+     upstream information.
+
+ -- User Option: magit-refs-filter-alist
+     The purpose of this option is to forgo displaying certain refs
+     based on their name.  If you want to not display any refs of a
+     certain type, then you should remove the appropriate function from
+     ‘magit-refs-sections-hook’ instead.
+
+     This alist controls which tags and branches are omitted from being
+     displayed in ‘magit-refs-mode’ buffers.  If it is ‘nil’, then all
+     refs are displayed (subject to ‘magit-refs-sections-hook’).
+
+     All keys are tried in order until one matches.  Then its value is
+     used and subsequent elements are ignored.  If the value is non-nil,
+     then the reference is displayed, otherwise it is not.  If no
+     element matches, then the reference is displayed.
+
+     A key can either be a regular expression that the refname has to
+     match, or a function that takes the refname as only argument and
+     returns a boolean.  A remote branch such as "origin/master" is
+     displayed as just "master", however for this comparison the former
+     is used.
+
+‘<RET>’ (‘magit-visit-ref’)
+     This command visits the reference or revision at point in another
+     buffer.  If there is no revision at point or with a prefix argument
+     then it prompts for a revision.
+
+     This command behaves just like ‘magit-show-commit’ as described
+     above, except if point is on a reference in a ‘magit-refs-mode’
+     buffer, in which case the behavior may be different, but only if
+     you have customized the option ‘magit-visit-ref-behavior’.
+
+ -- User Option: magit-visit-ref-behavior
+     This option controls how ‘magit-visit-ref’ behaves in
+     ‘magit-refs-mode’ buffers.
+
+     By default ‘magit-visit-ref’ behaves like ‘magit-show-commit’, in
+     all buffers, including ‘magit-refs-mode’ buffers.  When the type of
+     the section at point is ‘commit’ then "RET" is bound to
+     ‘magit-show-commit’, and when the type is either ‘branch’ or ‘tag’
+     then it is bound to ‘magit-visit-ref’.
+
+     "RET" is one of Magit’s most essential keys and at least by default
+     it should behave consistently across all of Magit, especially
+     because users quickly learn that it does something very harmless;
+     it shows more information about the thing at point in another
+     buffer.
+
+     However "RET" used to behave differently in ‘magit-refs-mode’
+     buffers, doing surprising things, some of which cannot really be
+     described as "visit this thing".  If you’ve grown accustomed this
+     behavior, you can restore it by adding one or more of the below
+     symbols to the value of this option.  But keep in mind that by
+     doing so you don’t only introduce inconsistencies, you also lose
+     some functionality and might have to resort to ‘M-x
+     magit-show-commit’ to get it back.
+
+     ‘magit-visit-ref’ looks for these symbols in the order in which
+     they are described here.  If the presence of a symbol applies to
+     the current situation, then the symbols that follow do not affect
+     the outcome.
+
+        • ‘focus-on-ref’
+
+          With a prefix argument update the buffer to show commit counts
+          and lists of cherry commits relative to the reference at point
+          instead of relative to the current buffer or ‘HEAD’.
+
+          Instead of adding this symbol, consider pressing "C-u y o
+          RET".
+
+        • ‘create-branch’
+
+          If point is on a remote branch, then create a new local branch
+          with the same name, use the remote branch as its upstream, and
+          then check out the local branch.
+
+          Instead of adding this symbol, consider pressing "b c RET
+          RET", like you would do in other buffers.
+
+        • ‘checkout-any’
+
+          Check out the reference at point.  If that reference is a tag
+          or a remote branch, then this results in a detached ‘HEAD’.
+
+          Instead of adding this symbol, consider pressing "b b RET",
+          like you would do in other buffers.
+
+        • ‘checkout-branch’
+
+          Check out the local branch at point.
+
+          Instead of adding this symbol, consider pressing "b b RET",
+          like you would do in other buffers.
+
+* Menu:
+
+* References Sections::
+
+
+File: magit.info,  Node: References Sections,  Up: References Buffer
+
+5.6.1 References Sections
+-------------------------
+
+The contents of references buffers is controlled using the hook
+‘magit-refs-sections-hook’.  See *note Section Hooks:: to learn about
+such hooks and how to customize them.  All of the below functions are
+members of the default value.  Note that it makes much less sense to
+customize this hook than it does for the respective hook used for the
+status buffer.
+
+ -- User Option: magit-refs-sections-hook
+     Hook run to insert sections into a references buffer.
+
+ -- Function: magit-insert-local-branches
+     Insert sections showing all local branches.
+
+ -- Function: magit-insert-remote-branches
+     Insert sections showing all remote-tracking branches.
+
+ -- Function: magit-insert-tags
+     Insert sections showing all tags.
+
+
+File: magit.info,  Node: Bisecting,  Next: Visiting Files and Blobs,  Prev: References Buffer,  Up: Inspecting
+
+5.7 Bisecting
+=============
+
+Also see *note (gitman)git-bisect::.
+
+‘B’ (‘magit-bisect’)
+     This transient prefix command binds the following suffix commands
+     and displays them in a temporary buffer until a suffix is invoked.
+
+   When bisecting is not in progress, then the transient features the
+following suffix commands.
+
+‘B B’ (‘magit-bisect-start’)
+     Start a bisect session.
+
+     Bisecting a bug means to find the commit that introduced it.  This
+     command starts such a bisect session by asking for a known good
+     commit and a known bad commit.  If you’re bisecting a change that
+     isn’t a regression, you can select alternate terms that are
+     conceptually more fitting than "bad" and "good", but the infix
+     arguments to do so are disabled by default.
+
+‘B s’ (‘magit-bisect-run’)
+     Bisect automatically by running commands after each step.
+
+   When bisecting in progress, then the transient instead features the
+following suffix commands.
+
+‘B b’ (‘magit-bisect-bad’)
+     Mark the current commit as bad.  Use this after you have asserted
+     that the commit does contain the bug in question.
+
+‘B g’ (‘magit-bisect-good’)
+     Mark the current commit as good.  Use this after you have asserted
+     that the commit does not contain the bug in question.
+
+‘B m’ (‘magit-bisect-mark’)
+     Mark the current commit with one of the bisect terms.  This command
+     provides an alternative to ‘magit-bisect-bad’ and
+     ‘magit-bisect-good’ and is useful when using terms other than "bad"
+     and "good".  This suffix is disabled by default.
+
+‘B k’ (‘magit-bisect-skip’)
+     Skip the current commit.  Use this if for some reason the current
+     commit is not a good one to test.  This command lets Git choose a
+     different one.
+
+‘B r’ (‘magit-bisect-reset’)
+     After bisecting, cleanup bisection state and return to original
+     ‘HEAD’.
+
+   By default the status buffer shows information about the ongoing
+bisect session.
+
+ -- User Option: magit-bisect-show-graph
+     This option controls whether a graph is displayed for the log of
+     commits that still have to be bisected.
+
+
+File: magit.info,  Node: Visiting Files and Blobs,  Next: Blaming,  Prev: Bisecting,  Up: Inspecting
+
+5.8 Visiting Files and Blobs
+============================
+
+Magit provides several commands that visit a file or blob (the version
+of a file that is stored in a certain commit).  Actually it provides
+several *groups* of such commands and the several *variants* within each
+group.
+
+   Also see *note Commands for Buffers Visiting Files::.
+
+* Menu:
+
+* General-Purpose Visit Commands::
+* Visiting Files and Blobs from a Diff::
+
+
+File: magit.info,  Node: General-Purpose Visit Commands,  Next: Visiting Files and Blobs from a Diff,  Up: Visiting Files and Blobs
+
+5.8.1 General-Purpose Visit Commands
+------------------------------------
+
+These commands can be used anywhere to open any blob.  Currently no keys
+are bound to these commands by default, but that is likely to change.
+
+ -- Command: magit-find-file
+     This command reads a filename and revision from the user and visits
+     the respective blob in a buffer.  The buffer is displayed in the
+     selected window.
+
+ -- Command: magit-find-file-other-window
+     This command reads a filename and revision from the user and visits
+     the respective blob in a buffer.  The buffer is displayed in
+     another window.
+
+ -- Command: magit-find-file-other-frame
+     This command reads a filename and revision from the user and visits
+     the respective blob in a buffer.  The buffer is displayed in
+     another frame.
+
+
+File: magit.info,  Node: Visiting Files and Blobs from a Diff,  Prev: General-Purpose Visit Commands,  Up: Visiting Files and Blobs
+
+5.8.2 Visiting Files and Blobs from a Diff
+------------------------------------------
+
+These commands can only be used when point is inside a diff.
+
+‘<RET>’ (‘magit-diff-visit-file’)
+     This command visits the appropriate version of the file that the
+     diff at point is about.
+
+     This commands visits the worktree version of the appropriate file.
+     The location of point inside the diff determines which file is
+     being visited.  The visited version depends on what changes the
+     diff is about.
+
+       1. If the diff shows uncommitted changes (i.e., staged or
+          unstaged changes), then visit the file in the working tree
+          (i.e., the same "real" file that ‘find-file’ would visit.  In
+          all other cases visit a "blob" (i.e., the version of a file as
+          stored in some commit).
+
+       2. If point is on a removed line, then visit the blob for the
+          first parent of the commit that removed that line, i.e., the
+          last commit where that line still exists.
+
+       3. If point is on an added or context line, then visit the blob
+          that adds that line, or if the diff shows from more than a
+          single commit, then visit the blob from the last of these
+          commits.
+
+     In the file-visiting buffer this command goes to the line that
+     corresponds to the line that point is on in the diff.
+
+     The buffer is displayed in the selected window.  With a prefix
+     argument the buffer is displayed in another window instead.
+
+ -- User Option: magit-diff-visit-previous-blob
+     This option controls whether ‘magit-diff-visit-file’ may visit the
+     previous blob.  When this is ‘t’ (the default) and point is on a
+     removed line in a diff for a committed change, then
+     ‘magit-diff-visit-file’ visits the blob from the last revision
+     which still had that line.
+
+     Currently this is only supported for committed changes, for staged
+     and unstaged changes ‘magit-diff-visit-file’ always visits the file
+     in the working tree.
+
+‘C-<return>’ (‘magit-diff-visit-file-worktree’)
+     This command visits the worktree version of the appropriate file.
+     The location of point inside the diff determines which file is
+     being visited.  Unlike ‘magit-diff-visit-file’ it always visits the
+     "real" file in the working tree, i.e the "current version" of the
+     file.
+
+     In the file-visiting buffer this command goes to the line that
+     corresponds to the line that point is on in the diff.  Lines that
+     were added or removed in the working tree, the index and other
+     commits in between are automatically accounted for.
+
+     The buffer is displayed in the selected window.  With a prefix
+     argument the buffer is displayed in another window instead.
+
+   Variants of the above two commands exist that instead visit the file
+in another window or in another frame.  If you prefer such behavior,
+then you may want to change the above key bindings, but note that the
+above commands also use another window when invoked with a prefix
+argument.
+
+ -- Command: magit-diff-visit-file-other-window
+ -- Command: magit-diff-visit-file-other-frame
+ -- Command: magit-diff-visit-worktree-file-other-window
+ -- Command: magit-diff-visit-worktree-file-other-frame
+
+
+File: magit.info,  Node: Blaming,  Prev: Visiting Files and Blobs,  Up: Inspecting
+
+5.9 Blaming
+===========
+
+Also see *note (gitman)git-blame::.
+
+   To start blaming, invoke the ‘magit-file-dispatch’ transient prefix
+command.  When using the default key bindings, that can be done by
+pressing ‘C-c M-g’.  When using the recommended bindings, this command
+is instead bound to ‘C-c f’.  Also see *note Global Bindings::.
+
+   The blaming suffix commands can be invoked directly from the file
+dispatch transient.  However if you want to set an infix argument, then
+you have to enter the blaming sub-prefix first.
+
+‘C-c f B’ (‘magit-blame’)
+‘C-c f b’ (‘magit-blame-addition’)
+‘C-c f B b’
+‘C-c f r’ (‘magit-blame-removal’)
+‘C-c f B r’
+‘C-c f f’ (‘magit-blame-reverse’)
+‘C-c f B f’
+‘C-c f e’ (‘magit-blame-echo’)
+‘C-c f B e’
+‘C-c f q’ (‘magit-blame-quit’)
+‘C-c f B q’
+     Each of these commands is documented individually right below,
+     alongside their default key bindings.  The bindings shown above are
+     the recommended bindings, which you can enable by following the
+     instructions in *note Global Bindings::.
+
+‘C-c M-g B’ (‘magit-blame’)
+     This transient prefix command binds the following suffix commands
+     along with the appropriate infix arguments and displays them in a
+     temporary buffer until a suffix is invoked.
+
+   Note that not all of the following suffixes are available at all
+times.  For example if ‘magit-blame-mode’ is not enabled, then the
+command whose purpose is to turn off that mode would not be of any use
+and therefore isn’t available.
+
+‘C-c M-g b’ (‘magit-blame-addition’)
+‘C-c M-g B b’
+     This command augments each line or chunk of lines in the current
+     file-visiting or blob-visiting buffer with information about what
+     commits last touched these lines.
+
+     If the buffer visits a revision of that file, then history up to
+     that revision is considered.  Otherwise, the file’s full history is
+     considered, including uncommitted changes.
+
+     If Magit-Blame mode is already turned on in the current buffer then
+     blaming is done recursively, by visiting REVISION:FILE (using
+     ‘magit-find-file’), where REVISION is a parent of the revision that
+     added the current line or chunk of lines.
+
+‘C-c M-g r’ (‘magit-blame-removal’)
+‘C-c M-g B r’
+     This command augments each line or chunk of lines in the current
+     blob-visiting buffer with information about the revision that
+     removes it.  It cannot be used in file-visiting buffers.
+
+     Like ‘magit-blame-addition’, this command can be used recursively.
+
+‘C-c M-g f’ (‘magit-blame-reverse’)
+‘C-c M-g B f’
+     This command augments each line or chunk of lines in the current
+     file-visiting or blob-visiting buffer with information about the
+     last revision in which a line still existed.
+
+     Like ‘magit-blame-addition’, this command can be used recursively.
+
+‘C-c M-g e’ (‘magit-blame-echo’)
+‘C-c M-g B e’
+     This command is like ‘magit-blame-addition’ except that it doesn’t
+     turn on ‘read-only-mode’ and that it initially uses the
+     visualization style specified by option ‘magit-blame-echo-style’.
+
+   The following key bindings are available when Magit-Blame mode is
+enabled and Read-Only mode is not enabled.  These commands are also
+available in other buffers; here only the behavior is described that is
+relevant in file-visiting buffers that are being blamed.
+
+‘C-c M-g q’ (‘magit-blame-quit’)
+‘C-c M-g B q’
+     This command turns off Magit-Blame mode.  If the buffer was created
+     during a recursive blame, then it also kills the buffer.
+
+‘<RET>’ (‘magit-show-commit’)
+     This command shows the commit that last touched the line at point.
+
+‘<SPC>’ (‘magit-diff-show-or-scroll-up’)
+     This command updates the commit buffer.
+
+     This either shows the commit that last touched the line at point in
+     the appropriate buffer, or if that buffer is already being
+     displayed in the current frame and if that buffer contains
+     information about that commit, then the buffer is scrolled up
+     instead.
+
+‘<DEL>’ (‘magit-diff-show-or-scroll-down’)
+     This command updates the commit buffer.
+
+     This either shows the commit that last touched the line at point in
+     the appropriate buffer, or if that buffer is already being
+     displayed in the current frame and if that buffer contains
+     information about that commit, then the buffer is scrolled down
+     instead.
+
+   The following key bindings are available when both Magit-Blame mode
+and Read-Only mode are enabled.
+
+‘b’ (‘magit-blame’)
+     See above.
+
+‘n’ (‘magit-blame-next-chunk’)
+     This command moves to the next chunk.
+
+‘N’ (‘magit-blame-next-chunk-same-commit’)
+     This command moves to the next chunk from the same commit.
+
+‘p’ (‘magit-blame-previous-chunk’)
+     This command moves to the previous chunk.
+
+‘P’ (‘magit-blame-previous-chunk-same-commit’)
+     This command moves to the previous chunk from the same commit.
+
+‘q’ (‘magit-blame-quit’)
+     This command turns off Magit-Blame mode.  If the buffer was created
+     during a recursive blame, then it also kills the buffer.
+
+‘M-w’ (‘magit-blame-copy-hash’)
+     This command saves the hash of the current chunk’s commit to the
+     kill ring.
+
+     When the region is active, the command saves the region’s content
+     instead of the hash, like ‘kill-ring-save’ would.
+
+‘c’ (‘magit-blame-cycle-style’)
+     This command changes how blame information is visualized in the
+     current buffer by cycling through the styles specified using the
+     option ‘magit-blame-styles’.
+
+   Blaming is also controlled using the following options.
+
+ -- User Option: magit-blame-styles
+     This option defines a list of styles used to visualize blame
+     information.  For now see its doc-string to learn more.
+
+ -- User Option: magit-blame-echo-style
+     This option specifies the blame visualization style used by the
+     command ‘magit-blame-echo’.  This must be a symbol that is used as
+     the identifier for one of the styles defined in
+     ‘magit-blame-styles’.
+
+ -- User Option: magit-blame-time-format
+     This option specifies the format string used to display times when
+     showing blame information.
+
+ -- User Option: magit-blame-read-only
+     This option controls whether blaming a buffer also makes
+     temporarily read-only.
+
+ -- User Option: magit-blame-disable-modes
+     This option lists incompatible minor-modes that should be disabled
+     temporarily when a buffer contains blame information.  They are
+     enabled again when the buffer no longer shows blame information.
+
+ -- User Option: magit-blame-goto-chunk-hook
+     This hook is run when moving between chunks.
+
+
+File: magit.info,  Node: Manipulating,  Next: Transferring,  Prev: Inspecting,  Up: Top
+
+6 Manipulating
+**************
+
+* Menu:
+
+* Creating Repository::
+* Cloning Repository::
+* Staging and Unstaging::
+* Applying::
+* Committing::
+* Branching::
+* Merging::
+* Resolving Conflicts::
+* Rebasing::
+* Cherry Picking::
+* Resetting::
+* Stashing::
+
+
+File: magit.info,  Node: Creating Repository,  Next: Cloning Repository,  Up: Manipulating
+
+6.1 Creating Repository
+=======================
+
+‘I’ (‘magit-init’)
+     This command initializes a repository and then shows the status
+     buffer for the new repository.
+
+     If the directory is below an existing repository, then the user has
+     to confirm that a new one should be created inside.  If the
+     directory is the root of the existing repository, then the user has
+     to confirm that it should be reinitialized.
+
+
+File: magit.info,  Node: Cloning Repository,  Next: Staging and Unstaging,  Prev: Creating Repository,  Up: Manipulating
+
+6.2 Cloning Repository
+======================
+
+To clone a remote or local repository use ‘C’, which is bound to the
+command ‘magit-clone’.  This command either act as a transient prefix
+command, which binds several infix arguments and suffix commands, or it
+can invoke ‘git clone’ directly, depending on whether a prefix argument
+is used and on the value of ‘magit-clone-always-transient’.
+
+ -- User Option: magit-clone-always-transient
+     This option controls whether the command ‘magit-clone’ always acts
+     as a transient prefix command, regardless of whether a prefix
+     argument is used or not.  If ‘t’, then that command always acts as
+     a transient prefix.  If ‘nil’, then a prefix argument has to be
+     used for it to act as a transient.
+
+‘C’ (‘magit-clone’)
+     This command either acts as a transient prefix command as described
+     above or does the same thing as ‘transient-clone-regular’ as
+     described below.
+
+     If it acts as a transient prefix, then it binds the following
+     suffix commands and several infix arguments.
+
+‘C C’ (‘magit-clone-regular’)
+     This command creates a regular clone of an existing repository.
+     The repository and the target directory are read from the user.
+
+‘C s’ (‘magit-clone-shallow’)
+     This command creates a shallow clone of an existing repository.
+     The repository and the target directory are read from the user.  By
+     default the depth of the cloned history is a single commit, but
+     with a prefix argument the depth is read from the user.
+
+‘C >’ (‘magit-clone-sparse’)
+     This command creates a clone of an existing repository and
+     initializes a sparse checkout, avoiding a checkout of the full
+     working tree.  To add more directories, use the
+     ‘magit-sparse-checkout’ transient (see *note Sparse checkouts::).
+
+‘C b’ (‘magit-clone-bare’)
+     This command creates a bare clone of an existing repository.  The
+     repository and the target directory are read from the user.
+
+‘C m’ (‘magit-clone-mirror’)
+     This command creates a mirror of an existing repository.  The
+     repository and the target directory are read from the user.
+
+   The following suffixes are disabled by default.  See *note
+(transient)Enabling and Disabling Suffixes:: for how to enable them.
+
+‘C d’ (‘magit-clone-shallow-since’)
+     This command creates a shallow clone of an existing repository.
+     Only commits that were committed after a date are cloned, which is
+     read from the user.  The repository and the target directory are
+     also read from the user.
+
+‘C e’ (‘magit-clone-shallow-exclude’)
+     This command creates a shallow clone of an existing repository.
+     This reads a branch or tag from the user.  Commits that are
+     reachable from that are not cloned.  The repository and the target
+     directory are also read from the user.
+
+ -- User Option: magit-clone-set-remote-head
+     This option controls whether cloning causes the reference
+     ‘refs/remotes/<remote>/HEAD’ to be created in the clone.  The
+     default is to delete the reference after running ‘git clone’, which
+     insists on creating it.  This is because the reference has not been
+     found to be particularly useful as it is not automatically updated
+     when the ‘HEAD’ of the remote changes.  Setting this option to ‘t’
+     preserves Git’s default behavior of creating the reference.
+
+ -- User Option: magit-clone-set-remote.pushDefault
+     This option controls whether the value of the Git variable
+     ‘remote.pushDefault’ is set after cloning.
+
+        • If ‘t’, then it is always set without asking.
+        • If ‘ask’, then the users are asked every time they clone a
+          repository.
+        • If ‘nil’, then it is never set.
+
+ -- User Option: magit-clone-default-directory
+     This option control the default directory name used when reading
+     the destination for a cloning operation.
+
+        • If ‘nil’ (the default), then the value of ‘default-directory’
+          is used.
+        • If a directory, then that is used.
+        • If a function, then that is called with the remote url as the
+          only argument and the returned value is used.
+
+ -- User Option: magit-clone-name-alist
+     This option maps regular expressions, which match repository names,
+     to repository urls, making it possible for users to enter short
+     names instead of urls when cloning repositories.
+
+     Each element has the form ‘(REGEXP HOSTNAME USER)’.  When the user
+     enters a name when a cloning command asks for a name or url, then
+     that is looked up in this list.  The first element whose REGEXP
+     matches is used.
+
+     The format specified by option ‘magit-clone-url-format’ is used to
+     turn the name into an url, using HOSTNAME and the repository name.
+     If the provided name contains a slash, then that is used.
+     Otherwise if the name omits the owner of the repository, then the
+     default user specified in the matched entry is used.
+
+     If USER contains a dot, then it is treated as a Git variable and
+     the value of that is used as the username.  Otherwise it is used as
+     the username itself.
+
+ -- User Option: magit-clone-url-format
+     The format specified by this option is used when turning repository
+     names into urls.  ‘%h’ is the hostname and ‘%n’ is the repository
+     name, including the name of the owner.  The value can be a string
+     (representing a single static format) or an alist with elements
+     ‘(HOSTNAME . FORMAT)’ mapping hostnames to formats.  When an alist
+     is used, the ‘t’ key represents the default format.
+
+     Example of a single format string:
+
+          (setq magit-clone-url-format
+                "git@%h:%n.git")
+
+     Example of by-hostname format strings:
+
+          (setq magit-clone-url-format
+                '(("git.example.com" . "git@%h:~%n")
+                  (nil . "git@%h:%n.git")))
+
+ -- User Option: magit-post-clone-hook
+     Hook run after the Git process has successfully finished cloning
+     the repository.  When the hook is called, ‘default-directory’ is
+     let-bound to the directory where the repository has been cloned.
+
+
+File: magit.info,  Node: Staging and Unstaging,  Next: Applying,  Prev: Cloning Repository,  Up: Manipulating
+
+6.3 Staging and Unstaging
+=========================
+
+Like Git, Magit can of course stage and unstage complete files.  Unlike
+Git, it also allows users to gracefully un-/stage individual hunks and
+even just part of a hunk.  To stage individual hunks and parts of hunks
+using Git directly, one has to use the very modal and rather clumsy
+interface of a ‘git add --interactive’ session.
+
+   With Magit, on the other hand, one can un-/stage individual hunks by
+just moving point into the respective section inside a diff displayed in
+the status buffer or a separate diff buffer and typing ‘s’ or ‘u’.  To
+operate on just parts of a hunk, mark the changes that should be
+un-/staged using the region and then press the same key that would be
+used to un-/stage.  To stage multiple files or hunks at once use a
+region that starts inside the heading of such a section and ends inside
+the heading of a sibling section of the same type.
+
+   Besides staging and unstaging, Magit also provides several other
+"apply variants" that can also operate on a file, multiple files at
+once, a hunk, multiple hunks at once, and on parts of a hunk.  These
+apply variants are described in the next section.
+
+   You can also use Ediff to stage and unstage.  See *note Ediffing::.
+
+‘s’ (‘magit-stage’)
+     Add the change at point to the staging area.
+
+     With a prefix argument and an untracked file (or files) at point,
+     stage the file but not its content.  This makes it possible to
+     stage only a subset of the new file’s changes.
+
+‘S’ (‘magit-stage-modified’)
+     Stage all changes to files modified in the worktree.  Stage all new
+     content of tracked files and remove tracked files that no longer
+     exist in the working tree from the index also.  With a prefix
+     argument also stage previously untracked (but not ignored) files.
+
+‘u’ (‘magit-unstage’)
+     Remove the change at point from the staging area.
+
+     Only staged changes can be unstaged.  But by default this command
+     performs an action that is somewhat similar to unstaging, when it
+     is called on a committed change: it reverses the change in the
+     index but not in the working tree.
+
+‘U’ (‘magit-unstage-all’)
+     Remove all changes from the staging area.
+
+ -- User Option: magit-unstage-committed
+     This option controls whether ‘magit-unstage’ "unstages" committed
+     changes by reversing them in the index but not the working tree.
+     The alternative is to raise an error.
+
+‘M-x magit-reverse-in-index’
+     This command reverses the committed change at point in the index
+     but not the working tree.  By default no key is bound directly to
+     this command, but it is indirectly called when ‘u’
+     (‘magit-unstage’) is pressed on a committed change.
+
+     This allows extracting a change from ‘HEAD’, while leaving it in
+     the working tree, so that it can later be committed using a
+     separate commit.  A typical workflow would be:
+
+       1. Optionally make sure that there are no uncommitted changes.
+       2. Visit the ‘HEAD’ commit and navigate to the change that should
+          not have been included in that commit.
+       3. Type ‘u’ (‘magit-unstage’) to reverse it in the index.  This
+          assumes that ‘magit-unstage-committed’ is non-nil.
+       4. Type ‘c e’ to extend ‘HEAD’ with the staged changes, including
+          those that were already staged before.
+       5. Optionally stage the remaining changes using ‘s’ or ‘S’ and
+          then type ‘c c’ to create a new commit.
+
+‘M-x magit-reset-index’
+     Reset the index to some commit.  The commit is read from the user
+     and defaults to the commit at point.  If there is no commit at
+     point, then it defaults to ‘HEAD’.
+
+* Menu:
+
+* Staging from File-Visiting Buffers::
+
+
+File: magit.info,  Node: Staging from File-Visiting Buffers,  Up: Staging and Unstaging
+
+6.3.1 Staging from File-Visiting Buffers
+----------------------------------------
+
+Fine-grained un-/staging has to be done from the status or a diff
+buffer, but it’s also possible to un-/stage all changes made to the file
+visited in the current buffer right from inside that buffer.
+
+‘M-x magit-stage-file’
+     When invoked inside a file-visiting buffer, then stage all changes
+     to that file.  In a Magit buffer, stage the file at point if any.
+     Otherwise prompt for a file to be staged.  With a prefix argument
+     always prompt the user for a file, even in a file-visiting buffer
+     or when there is a file section at point.
+
+‘M-x magit-unstage-file’
+     When invoked inside a file-visiting buffer, then unstage all
+     changes to that file.  In a Magit buffer, unstage the file at point
+     if any.  Otherwise prompt for a file to be unstaged.  With a prefix
+     argument always prompt the user for a file, even in a file-visiting
+     buffer or when there is a file section at point.
+
+
+File: magit.info,  Node: Applying,  Next: Committing,  Prev: Staging and Unstaging,  Up: Manipulating
+
+6.4 Applying
+============
+
+Magit provides several "apply variants": stage, unstage, discard,
+reverse, and "regular apply".  At least when operating on a hunk they
+are all implemented using ‘git apply’, which is why they are called
+"apply variants".
+
+   • Stage.  Apply a change from the working tree to the index.  The
+     change also remains in the working tree.
+
+   • Unstage.  Remove a change from the index.  The change remains in
+     the working tree.
+
+   • Discard.  On a staged change, remove it from the working tree and
+     the index.  On an unstaged change, remove it from the working tree
+     only.
+
+   • Reverse.  Reverse a change in the working tree.  Both committed and
+     staged changes can be reversed.  Unstaged changes cannot be
+     reversed.  Discard them instead.
+
+   • Apply.  Apply a change to the working tree.  Both committed and
+     staged changes can be applied.  Unstaged changes cannot be applied
+     - as they already have been applied.
+
+   The previous section described the staging and unstaging commands.
+What follows are the commands which implement the remaining apply
+variants.
+
+‘a’ (‘magit-apply’)
+     Apply the change at point to the working tree.
+
+     With a prefix argument fallback to a 3-way merge.  Doing so causes
+     the change to be applied to the index as well.
+
+‘k’ (‘magit-discard’)
+     Remove the change at point from the working tree.
+
+     On a hunk or file with unresolved conflicts prompt which side to
+     keep (while discarding the other).  If point is within the text of
+     a side, then keep that side without prompting.
+
+‘v’ (‘magit-reverse’)
+     Reverse the change at point in the working tree.
+
+     With a prefix argument fallback to a 3-way merge.  Doing so causes
+     the change to be applied to the index as well.
+
+   With a prefix argument all apply variants attempt a 3-way merge when
+appropriate (i.e., when ‘git apply’ is used internally).
+
+
+File: magit.info,  Node: Committing,  Next: Branching,  Prev: Applying,  Up: Manipulating
+
+6.5 Committing
+==============
+
+When the user initiates a commit, Magit calls ‘git commit’ without any
+arguments, so Git has to get it from the user.  It creates the file
+‘.git/COMMIT_EDITMSG’ and then opens that file in an editor.  Magit
+arranges for that editor to be the Emacsclient.  Once the user finishes
+the editing session, the Emacsclient exits and Git creates the commit
+using the file’s content as message.
+
+* Menu:
+
+* Initiating a Commit::
+* Editing Commit Messages::
+
+
+File: magit.info,  Node: Initiating a Commit,  Next: Editing Commit Messages,  Up: Committing
+
+6.5.1 Initiating a Commit
+-------------------------
+
+Also see *note (gitman)git-commit::.
+
+‘c’ (‘magit-commit’)
+     This transient prefix command binds the following suffix commands
+     along with the appropriate infix arguments and displays them in a
+     temporary buffer until a suffix is invoked.
+
+‘c c’ (‘magit-commit-create’)
+     Create a new commit on ‘HEAD’.  With a prefix argument amend to the
+     commit at ‘HEAD’ instead.
+
+‘c a’ (‘magit-commit-amend’)
+     Amend the last commit.
+
+‘c e’ (‘magit-commit-extend’)
+     Amend the last commit, without editing the message.  With a prefix
+     argument keep the committer date, otherwise change it.  The option
+     ‘magit-commit-extend-override-date’ can be used to inverse the
+     meaning of the prefix argument.
+
+     Non-interactively respect the optional OVERRIDE-DATE argument and
+     ignore the option.
+
+‘c w’ (‘magit-commit-reword’)
+     Reword the last commit, ignoring staged changes.  With a prefix
+     argument keep the committer date, otherwise change it.  The option
+     ‘magit-commit-reword-override-date’ can be used to inverse the
+     meaning of the prefix argument.
+
+     Non-interactively respect the optional OVERRIDE-DATE argument and
+     ignore the option.
+
+‘c f’ (‘magit-commit-fixup’)
+     Create a fixup commit.
+
+     With a prefix argument the target commit has to be confirmed.
+     Otherwise the commit at point may be used without confirmation
+     depending on the value of option ‘magit-commit-squash-confirm’.
+
+‘c F’ (‘magit-commit-instant-fixup’)
+     Create a fixup commit and instantly rebase.
+
+‘c s’ (‘magit-commit-squash’)
+     Create a squash commit, without editing the squash message.
+
+     With a prefix argument the target commit has to be confirmed.
+     Otherwise the commit at point may be used without confirmation
+     depending on the value of option ‘magit-commit-squash-confirm’.
+
+‘c S’ (‘magit-commit-instant-squash’)
+     Create a squash commit and instantly rebase.
+
+‘c A’ (‘magit-commit-augment’)
+     Create a squash commit, editing the squash message.
+
+     With a prefix argument the target commit has to be confirmed.
+     Otherwise the commit at point may be used without confirmation
+     depending on the value of option ‘magit-commit-squash-confirm’.
+
+ -- User Option: magit-commit-ask-to-stage
+     Whether to ask to stage all unstaged changes when committing and
+     nothing is staged.
+
+ -- User Option: magit-commit-show-diff
+     Whether the relevant diff is automatically shown when committing.
+
+ -- User Option: magit-commit-extend-override-date
+     Whether using ‘magit-commit-extend’ changes the committer date.
+
+ -- User Option: magit-commit-reword-override-date
+     Whether using ‘magit-commit-reword’ changes the committer date.
+
+ -- User Option: magit-commit-squash-confirm
+     Whether the commit targeted by squash and fixup has to be
+     confirmed.  When non-nil then the commit at point (if any) is used
+     as default choice.  Otherwise it has to be confirmed.  This option
+     only affects ‘magit-commit-squash’ and ‘magit-commit-fixup’.  The
+     "instant" variants always require confirmation because making an
+     error while using those is harder to recover from.
+
+ -- User Option: magit-post-commit-hook
+     Hook run after creating a commit without the user editing a
+     message.
+
+     This hook is run by ‘magit-refresh’ if ‘this-command’ is a member
+     of ‘magit-post-commit-hook-commands’.  This only includes commands
+     named ‘magit-commit-*’ that do *not* require that the user edits
+     the commit message in a buffer.
+
+     Also see ‘git-commit-post-finish-hook’.
+
+ -- User Option: magit-commit-diff-inhibit-same-window
+     Whether to inhibit use of same window when showing diff while
+     committing.
+
+     When writing a commit, then a diff of the changes to be committed
+     is automatically shown.  The idea is that the diff is shown in a
+     different window of the same frame and for most users that just
+     works.  In other words most users can completely ignore this option
+     because its value doesn’t make a difference for them.
+
+     However for users who configured Emacs to never create a new window
+     even when the package explicitly tries to do so, then displaying
+     two new buffers necessarily means that the first is immediately
+     replaced by the second.  In our case the message buffer is
+     immediately replaced by the diff buffer, which is of course highly
+     undesirable.
+
+     A workaround is to suppress this user configuration in this
+     particular case.  Users have to explicitly opt-in by toggling this
+     option.  We cannot enable the workaround unconditionally because
+     that again causes issues for other users: if the frame is too tiny
+     or the relevant settings too aggressive, then the diff buffer would
+     end up being displayed in a new frame.
+
+     Also see <https://github.com/magit/magit/issues/4132>.
+
+
+File: magit.info,  Node: Editing Commit Messages,  Prev: Initiating a Commit,  Up: Committing
+
+6.5.2 Editing Commit Messages
+-----------------------------
+
+After initiating a commit as described in the previous section, two new
+buffers appear.  One shows the changes that are about to be committed,
+while the other is used to write the message.
+
+   Commit messages are edited in an edit session - in the background
+‘git’ is waiting for the editor, in our case ‘emacsclient’, to save the
+commit message in a file (in most cases ‘.git/COMMIT_EDITMSG’) and then
+return.  If the editor returns with a non-zero exit status then ‘git’
+does not create the commit.  So the most important commands are those
+for finishing and aborting the commit.
+
+‘C-c C-c’ (‘with-editor-finish’)
+     Finish the current editing session by returning with exit code 0.
+     Git then creates the commit using the message it finds in the file.
+
+‘C-c C-k’ (‘with-editor-cancel’)
+     Cancel the current editing session by returning with exit code 1.
+     Git then cancels the commit, but leaves the file untouched.
+
+   In addition to being used by ‘git commit’, messages may also be
+stored in a ring that persists until Emacs is closed.  By default the
+message is stored at the beginning and the end of an edit session
+(regardless of whether the session is finished successfully or was
+canceled).  It is sometimes useful to bring back messages from that
+ring.
+
+‘C-c M-s’ (‘git-commit-save-message’)
+     Save the current buffer content to the commit message ring.
+
+‘M-p’ (‘git-commit-prev-message’)
+     Cycle backward through the commit message ring, after saving the
+     current message to the ring.  With a numeric prefix ARG, go back
+     ARG comments.
+
+‘M-n’ (‘git-commit-next-message’)
+     Cycle forward through the commit message ring, after saving the
+     current message to the ring.  With a numeric prefix ARG, go back
+     ARG comments.
+
+   By default the diff for the changes that are about to be committed
+are automatically shown when invoking the commit.  To prevent that,
+remove ‘magit-commit-diff’ from ‘server-switch-hook’.
+
+   When amending to an existing commit it may be useful to show either
+the changes that are about to be added to that commit or to show those
+changes alongside those that have already been committed.
+
+‘C-c C-d’ (‘magit-diff-while-committing’)
+     While committing, show the changes that are about to be committed.
+     While amending, invoking the command again toggles between showing
+     just the new changes or all the changes that will be committed.
+
+* Menu:
+
+* Using the Revision Stack::
+* Commit Pseudo Headers::
+* Commit Mode and Hooks::
+* Commit Message Conventions::
+
+
+File: magit.info,  Node: Using the Revision Stack,  Next: Commit Pseudo Headers,  Up: Editing Commit Messages
+
+Using the Revision Stack
+........................
+
+‘C-c C-w’ (‘magit-pop-revision-stack’)
+     This command inserts a representation of a revision into the
+     current buffer.  It can be used inside buffers used to write commit
+     messages but also in other buffers such as buffers used to edit
+     emails or ChangeLog files.
+
+     By default this command pops the revision which was last added to
+     the ‘magit-revision-stack’ and inserts it into the current buffer
+     according to ‘magit-pop-revision-stack-format’.  Revisions can be
+     put on the stack using ‘magit-copy-section-value’ and
+     ‘magit-copy-buffer-revision’.
+
+     If the stack is empty or with a prefix argument it instead reads a
+     revision in the minibuffer.  By using the minibuffer history this
+     allows selecting an item which was popped earlier or to insert an
+     arbitrary reference or revision without first pushing it onto the
+     stack.
+
+     When reading the revision from the minibuffer, then it might not be
+     possible to guess the correct repository.  When this command is
+     called inside a repository (e.g., while composing a commit
+     message), then that repository is used.  Otherwise (e.g., while
+     composing an email) then the repository recorded for the top
+     element of the stack is used (even though we insert another
+     revision).  If not called inside a repository and with an empty
+     stack, or with two prefix arguments, then read the repository in
+     the minibuffer too.
+
+ -- User Option: magit-pop-revision-stack-format
+     This option controls how the command ‘magit-pop-revision-stack’
+     inserts a revision into the current buffer.
+
+     The entries on the stack have the format ‘(HASH TOPLEVEL)’ and this
+     option has the format ‘(POINT-FORMAT EOB-FORMAT INDEX-REGEXP)’, all
+     of which may be nil or a string (though either one of EOB-FORMAT or
+     POINT-FORMAT should be a string, and if INDEX-REGEXP is non-nil,
+     then the two formats should be too).
+
+     First INDEX-REGEXP is used to find the previously inserted entry,
+     by searching backward from point.  The first submatch must match
+     the index number.  That number is incremented by one, and becomes
+     the index number of the entry to be inserted.  If you don’t want to
+     number the inserted revisions, then use nil for INDEX-REGEXP.
+
+     If INDEX-REGEXP is non-nil then both POINT-FORMAT and EOB-FORMAT
+     should contain \"%N\", which is replaced with the number that was
+     determined in the previous step.
+
+     Both formats, if non-nil and after removing %N, are then expanded
+     using ‘git show --format=FORMAT ...’ inside TOPLEVEL.
+
+     The expansion of POINT-FORMAT is inserted at point, and the
+     expansion of EOB-FORMAT is inserted at the end of the buffer (if
+     the buffer ends with a comment, then it is inserted right before
+     that).
+
+
+File: magit.info,  Node: Commit Pseudo Headers,  Next: Commit Mode and Hooks,  Prev: Using the Revision Stack,  Up: Editing Commit Messages
+
+Commit Pseudo Headers
+.....................
+
+Some projects use pseudo headers in commit messages.  Magit colorizes
+such headers and provides some commands to insert such headers.
+
+ -- User Option: git-commit-known-pseudo-headers
+     A list of Git pseudo headers to be highlighted.
+
+‘C-c C-i’ (‘git-commit-insert-pseudo-header’)
+     Insert a commit message pseudo header.
+
+‘C-c C-a’ (‘git-commit-ack’)
+     Insert a header acknowledging that you have looked at the commit.
+
+‘C-c C-r’ (‘git-commit-review’)
+     Insert a header acknowledging that you have reviewed the commit.
+
+‘C-c C-s’ (‘git-commit-signoff’)
+     Insert a header to sign off the commit.
+
+‘C-c C-t’ (‘git-commit-test’)
+     Insert a header acknowledging that you have tested the commit.
+
+‘C-c C-o’ (‘git-commit-cc’)
+     Insert a header mentioning someone who might be interested.
+
+‘C-c C-p’ (‘git-commit-reported’)
+     Insert a header mentioning the person who reported the issue being
+     fixed by the commit.
+
+‘C-c M-i’ (‘git-commit-suggested’)
+     Insert a header mentioning the person who suggested the change.
+
+
+File: magit.info,  Node: Commit Mode and Hooks,  Next: Commit Message Conventions,  Prev: Commit Pseudo Headers,  Up: Editing Commit Messages
+
+Commit Mode and Hooks
+.....................
+
+‘git-commit-mode’ is a minor mode that is only used to establish certain
+key bindings.  This makes it possible to use an arbitrary major mode in
+buffers used to edit commit messages.  It is even possible to use
+different major modes in different repositories, which is useful when
+different projects impose different commit message conventions.
+
+ -- User Option: git-commit-major-mode
+     The value of this option is the major mode used to edit Git commit
+     messages.
+
+   Because ‘git-commit-mode’ is a minor mode, we don’t use its mode hook
+to setup the buffer, except for the key bindings.  All other setup
+happens in the function ‘git-commit-setup’, which among other things
+runs the hook ‘git-commit-setup-hook’.
+
+ -- User Option: git-commit-setup-hook
+     Hook run at the end of ‘git-commit-setup’.
+
+The following functions are suitable for this hook:
+
+ -- Function: git-commit-save-message
+     Save the current buffer content to the commit message ring.
+
+ -- Function: git-commit-setup-changelog-support
+     After this function is called, ChangeLog entries are treated as
+     paragraphs.
+
+ -- Function: git-commit-turn-on-auto-fill
+     Turn on ‘auto-fill-mode’.
+
+ -- Function: git-commit-turn-on-flyspell
+     Turn on Flyspell mode.  Also prevent comments from being checked
+     and finally check current non-comment text.
+
+ -- Function: git-commit-propertize-diff
+     Propertize the diff shown inside the commit message buffer.  Git
+     inserts such diffs into the commit message template when the
+     ‘--verbose’ argument is used.  ‘magit-commit’ by default does not
+     offer that argument because the diff that is shown in a separate
+     buffer is more useful.  But some users disagree, which is why this
+     function exists.
+
+ -- Function: bug-reference-mode
+     Hyperlink bug references in the buffer.
+
+ -- Function: with-editor-usage-message
+     Show usage information in the echo area.
+
+ -- User Option: git-commit-post-finish-hook
+     Hook run after the user finished writing a commit message.
+
+     This hook is only run after pressing ‘C-c C-c’ in a buffer used to
+     edit a commit message.  If a commit is created without the user
+     typing a message into a buffer, then this hook is not run.
+
+     This hook is not run until the new commit has been created.  If
+     doing so takes Git longer than one second, then this hook isn’t run
+     at all.  For certain commands such as ‘magit-rebase-continue’ this
+     hook is never run because doing so would lead to a race condition.
+
+     This hook is only run if ‘magit’ is available.
+
+     Also see ‘magit-post-commit-hook’.
+
+
+File: magit.info,  Node: Commit Message Conventions,  Prev: Commit Mode and Hooks,  Up: Editing Commit Messages
+
+Commit Message Conventions
+..........................
+
+Git-Commit highlights certain violations of commonly accepted commit
+message conventions.  Certain violations even cause Git-Commit to ask
+you to confirm that you really want to do that.  This nagging can of
+course be turned off, but the result of doing that usually is that
+instead of some code it’s now the human who is reviewing your commits
+who has to waste some time telling you to fix your commits.
+
+ -- User Option: git-commit-summary-max-length
+     The intended maximal length of the summary line of commit messages.
+     Characters beyond this column are colorized to indicate that this
+     preference has been violated.
+
+ -- User Option: git-commit-finish-query-functions
+     List of functions called to query before performing commit.
+
+     The commit message buffer is current while the functions are
+     called.  If any of them returns nil, then the commit is not
+     performed and the buffer is not killed.  The user should then fix
+     the issue and try again.
+
+     The functions are called with one argument.  If it is non-nil then
+     that indicates that the user used a prefix argument to force
+     finishing the session despite issues.  Functions should usually
+     honor this wish and return non-nil.
+
+     By default the only member is ‘git-commit-check-style-conventions’.
+
+ -- Function: git-commit-check-style-conventions
+     This function checks for violations of certain basic style
+     conventions.  For each violation it asks users if they want to
+     proceed anyway.
+
+ -- User Option: git-commit-style-convention-checks
+     This option controls what conventions the function by the same name
+     tries to enforce.  The value is a list of self-explanatory symbols
+     identifying certain conventions; ‘non-empty-second-line’ and
+     ‘overlong-summary-line’.
+
+
+File: magit.info,  Node: Branching,  Next: Merging,  Prev: Committing,  Up: Manipulating
+
+6.6 Branching
+=============
+
+* Menu:
+
+* The Two Remotes::
+* Branch Commands::
+* Branch Git Variables::
+* Auxiliary Branch Commands::
+
+
+File: magit.info,  Node: The Two Remotes,  Next: Branch Commands,  Up: Branching
+
+6.6.1 The Two Remotes
+---------------------
+
+The upstream branch of some local branch is the branch into which the
+commits on that local branch should eventually be merged, usually
+something like ‘origin/master’.  For the ‘master’ branch itself the
+upstream branch and the branch it is being pushed to, are usually the
+same remote branch.  But for a feature branch the upstream branch and
+the branch it is being pushed to should differ.
+
+   The commits on feature branches too should _eventually_ end up in a
+remote branch such as ‘origin/master’ or ‘origin/maint’.  Such a branch
+should therefore be used as the upstream.  But feature branches
+shouldn’t be pushed directly to such branches.  Instead a feature branch
+‘my-feature’ is usually pushed to ‘my-fork/my-feature’ or if you are a
+contributor ‘origin/my-feature’.  After the new feature has been
+reviewed, the maintainer merges the feature into ‘master’.  And finally
+‘master’ (not ‘my-feature’ itself) is pushed to ‘origin/master’.
+
+   But new features seldom are perfect on the first try, and so feature
+branches usually have to be reviewed, improved, and re-pushed several
+times.  Pushing should therefore be easy to do, and for that reason many
+Git users have concluded that it is best to use the remote branch to
+which the local feature branch is being pushed as its upstream.
+
+   But luckily Git has long ago gained support for a push-remote which
+can be configured separately from the upstream branch, using the
+variables ‘branch.<name>.pushRemote’ and ‘remote.pushDefault’.  So we no
+longer have to choose which of the two remotes should be used as "the
+remote".
+
+   Each of the fetching, pulling, and pushing transient commands
+features three suffix commands that act on the current branch and some
+other branch.  Of these, ‘p’ is bound to a command which acts on the
+push-remote, ‘u’ is bound to a command which acts on the upstream, and
+‘e’ is bound to a command which acts on any other branch.  The status
+buffer shows unpushed and unpulled commits for both the push-remote and
+the upstream.
+
+   It’s fairly simple to configure these two remotes.  The values of all
+the variables that are related to fetching, pulling, and pushing (as
+well as some other branch-related variables) can be inspected and
+changed using the command ‘magit-branch-configure’, which is available
+from many transient prefix commands that deal with branches.  It is also
+possible to set the push-remote or upstream while pushing (see *note
+Pushing::).
+
+
+File: magit.info,  Node: Branch Commands,  Next: Branch Git Variables,  Prev: The Two Remotes,  Up: Branching
+
+6.6.2 Branch Commands
+---------------------
+
+The transient prefix command ‘magit-branch’ is used to create and
+checkout branches, and to make changes to existing branches.  It is not
+used to fetch, pull, merge, rebase, or push branches, i.e., this command
+deals with branches themselves, not with the commits reachable from
+them.  Those features are available from separate transient command.
+
+‘b’ (‘magit-branch’)
+     This transient prefix command binds the following suffix commands
+     and displays them in a temporary buffer until a suffix is invoked.
+
+     By default it also binds and displays the values of some
+     branch-related Git variables and allows changing their values.
+
+ -- User Option: magit-branch-direct-configure
+     This option controls whether the transient command ‘magit-branch’
+     can be used to directly change the values of Git variables.  This
+     defaults to ‘t’ (to avoid changing key bindings).  When set to
+     ‘nil’, then no variables are displayed by that transient command,
+     and its suffix command ‘magit-branch-configure’ has to be used
+     instead to view and change branch related variables.
+
+‘b C’ (‘magit-branch-configure’)
+‘f C’
+‘F C’
+‘P C’
+     This transient prefix command binds commands that set the value of
+     branch-related variables and displays them in a temporary buffer
+     until the transient is exited.
+
+     With a prefix argument, this command always prompts for a branch.
+
+     Without a prefix argument this depends on whether it was invoked as
+     a suffix of ‘magit-branch’ and on the
+     ‘magit-branch-direct-configure’ option.  If ‘magit-branch’ already
+     displays the variables for the current branch, then it isn’t useful
+     to invoke another transient that displays them for the same branch.
+     In that case this command prompts for a branch.
+
+   The variables are described in *note Branch Git Variables::.
+
+‘b b’ (‘magit-checkout’)
+     Checkout a revision read in the minibuffer and defaulting to the
+     branch or arbitrary revision at point.  If the revision is a local
+     branch then that becomes the current branch.  If it is something
+     else then ‘HEAD’ becomes detached.  Checkout fails if the working
+     tree or the staging area contain changes.
+
+‘b n’ (‘magit-branch-create’)
+     Create a new branch.  The user is asked for a branch or arbitrary
+     revision to use as the starting point of the new branch.  When a
+     branch name is provided, then that becomes the upstream branch of
+     the new branch.  The name of the new branch is also read in the
+     minibuffer.
+
+     Also see option ‘magit-branch-prefer-remote-upstream’.
+
+‘b c’ (‘magit-branch-and-checkout’)
+     This command creates a new branch like ‘magit-branch-create’, but
+     then also checks it out.
+
+     Also see option ‘magit-branch-prefer-remote-upstream’.
+
+‘b l’ (‘magit-branch-checkout’)
+     This command checks out an existing or new local branch.  It reads
+     a branch name from the user offering all local branches and a
+     subset of remote branches as candidates.  Remote branches for which
+     a local branch by the same name exists are omitted from the list of
+     candidates.  The user can also enter a completely new branch name.
+
+        • If the user selects an existing local branch, then that is
+          checked out.
+
+        • If the user selects a remote branch, then it creates and
+          checks out a new local branch with the same name, and
+          configures the selected remote branch as the push target.
+
+        • If the user enters a new branch name, then it creates and
+          checks that out, after also reading the starting-point from
+          the user.
+
+     In the latter two cases the upstream is also set.  Whether it is
+     set to the chosen starting point or something else depends on the
+     value of ‘magit-branch-adjust-remote-upstream-alist’.
+
+‘b s’ (‘magit-branch-spinoff’)
+     This command creates and checks out a new branch starting at and
+     tracking the current branch.  That branch in turn is reset to the
+     last commit it shares with its upstream.  If the current branch has
+     no upstream or no unpushed commits, then the new branch is created
+     anyway and the previously current branch is not touched.
+
+     This is useful to create a feature branch after work has already
+     begun on the old branch (likely but not necessarily "master").
+
+     If the current branch is a member of the value of option
+     ‘magit-branch-prefer-remote-upstream’ (which see), then the current
+     branch will be used as the starting point as usual, but the
+     upstream of the starting-point may be used as the upstream of the
+     new branch, instead of the starting-point itself.
+
+     If optional FROM is non-nil, then the source branch is reset to
+     ‘FROM~’, instead of to the last commit it shares with its upstream.
+     Interactively, FROM is only ever non-nil, if the region selects
+     some commits, and among those commits, FROM is the commit that is
+     the fewest commits ahead of the source branch.
+
+     The commit at the other end of the selection actually does not
+     matter, all commits between FROM and ‘HEAD’ are moved to the new
+     branch.  If FROM is not reachable from ‘HEAD’ or is reachable from
+     the source branch’s upstream, then an error is raised.
+
+‘b S’ (‘magit-branch-spinout’)
+     This command behaves like ‘magit-branch-spinoff’, except that it
+     does not change the current branch.  If there are any uncommitted
+     changes, then it behaves exactly like ‘magit-branch-spinoff’.
+
+‘b x’ (‘magit-branch-reset’)
+     This command resets a branch, defaulting to the branch at point, to
+     the tip of another branch or any other commit.
+
+     When the branch being reset is the current branch, then a hard
+     reset is performed.  If there are any uncommitted changes, then the
+     user has to confirm the reset because those changes would be lost.
+
+     This is useful when you have started work on a feature branch but
+     realize it’s all crap and want to start over.
+
+     When resetting to another branch and a prefix argument is used,
+     then the target branch is set as the upstream of the branch that is
+     being reset.
+
+‘b k’ (‘magit-branch-delete’)
+     Delete one or multiple branches.  If the region marks multiple
+     branches, then offer to delete those.  Otherwise, prompt for a
+     single branch to be deleted, defaulting to the branch at point.
+
+     Require confirmation when deleting branches is dangerous in some
+     way.  Option ‘magit-no-confirm’ can be customized to not require
+     confirmation in certain cases.  See its docstring to learn why
+     confirmation is required by default in certain cases or if a prompt
+     is confusing.
+
+‘b m’ (‘magit-branch-rename’)
+     Rename a branch.  The branch and the new name are read in the
+     minibuffer.  With prefix argument the branch is renamed even if
+     that name conflicts with an existing branch.
+
+ -- User Option: magit-branch-read-upstream-first
+     When creating a branch, whether to read the upstream branch before
+     the name of the branch that is to be created.  The default is ‘t’,
+     and I recommend you leave it at that.
+
+ -- User Option: magit-branch-prefer-remote-upstream
+     This option specifies whether remote upstreams are favored over
+     local upstreams when creating new branches.
+
+     When a new branch is created, then the branch, commit, or stash at
+     point is suggested as the starting point of the new branch, or if
+     there is no such revision at point the current branch.  In either
+     case the user may choose another starting point.
+
+     If the chosen starting point is a branch, then it may also be set
+     as the upstream of the new branch, depending on the value of the
+     Git variable ‘branch.autoSetupMerge’.  By default this is done for
+     remote branches, but not for local branches.
+
+     You might prefer to always use some remote branch as upstream.  If
+     the chosen starting point is (1) a local branch, (2) whose name
+     matches a member of the value of this option, (3) the upstream of
+     that local branch is a remote branch with the same name, and (4)
+     that remote branch can be fast-forwarded to the local branch, then
+     the chosen branch is used as starting point, but its own upstream
+     is used as the upstream of the new branch.
+
+     Members of this option’s value are treated as branch names that
+     have to match exactly unless they contain a character that makes
+     them invalid as a branch name.  Recommended characters to use to
+     trigger interpretation as a regexp are "*" and "^".  Some other
+     characters which you might expect to be invalid, actually are not,
+     e.g., ".+$" are all perfectly valid.  More precisely, if ‘git
+     check-ref-format --branch STRING’ exits with a non-zero status,
+     then treat STRING as a regexp.
+
+     Assuming the chosen branch matches these conditions you would end
+     up with with e.g.:
+
+          feature --upstream--> origin/master
+
+     instead of
+
+          feature --upstream--> master --upstream--> origin/master
+
+     Which you prefer is a matter of personal preference.  If you do
+     prefer the former, then you should add branches such as ‘master’,
+     ‘next’, and ‘maint’ to the value of this options.
+
+ -- User Option: magit-branch-adjust-remote-upstream-alist
+     The value of this option is an alist of branches to be used as the
+     upstream when branching a remote branch.
+
+     When creating a local branch from an ephemeral branch located on a
+     remote, e.g., a feature or hotfix branch, then that remote branch
+     should usually not be used as the upstream branch, since the
+     push-remote already allows accessing it and having both the
+     upstream and the push-remote reference the same related branch
+     would be wasteful.  Instead a branch like "maint" or "master"
+     should be used as the upstream.
+
+     This option allows specifying the branch that should be used as the
+     upstream when branching certain remote branches.  The value is an
+     alist of the form ‘((UPSTREAM . RULE)...)’.  The first matching
+     element is used, the following elements are ignored.
+
+     UPSTREAM is the branch to be used as the upstream for branches
+     specified by RULE.  It can be a local or a remote branch.
+
+     RULE can either be a regular expression, matching branches whose
+     upstream should be the one specified by UPSTREAM.  Or it can be a
+     list of the only branches that should *not* use UPSTREAM; all other
+     branches will.  Matching is done after stripping the remote part of
+     the name of the branch that is being branched from.
+
+     If you use a finite set of non-ephemeral branches across all your
+     repositories, then you might use something like:
+
+          (("origin/master" . ("master" "next" "maint")))
+
+     Or if the names of all your ephemeral branches contain a slash, at
+     least in some repositories, then a good value could be:
+
+          (("origin/master" . "/"))
+
+     Of course you can also fine-tune:
+
+          (("origin/maint" . "\\`hotfix/")
+           ("origin/master" . "\\`feature/"))
+
+     UPSTREAM can be a local branch:
+
+          (("master" . ("master" "next" "maint")))
+
+   Because the main branch is no longer almost always named "master" you
+should also account for other common names:
+
+     (("main"  . ("main" "master" "next" "maint"))
+      ("master" . ("main" "master" "next" "maint")))
+
+ -- Command: magit-branch-orphan
+     This command creates and checks out a new orphan branch with
+     contents from a given revision.
+
+ -- Command: magit-branch-or-checkout
+     This command is a hybrid between ‘magit-checkout’ and
+     ‘magit-branch-and-checkout’ and is intended as a replacement for
+     the former in ‘magit-branch’.
+
+     It first asks the user for an existing branch or revision.  If the
+     user input actually can be resolved as a branch or revision, then
+     it checks that out, just like ‘magit-checkout’ would.
+
+     Otherwise it creates and checks out a new branch using the input as
+     its name.  Before doing so it reads the starting-point for the new
+     branch.  This is similar to what ‘magit-branch-and-checkout’ does.
+
+     To use this command instead of ‘magit-checkout’ add this to your
+     init file:
+
+          (transient-replace-suffix 'magit-branch 'magit-checkout
+            '("b" "dwim" magit-branch-or-checkout))
+
+
+File: magit.info,  Node: Branch Git Variables,  Next: Auxiliary Branch Commands,  Prev: Branch Commands,  Up: Branching
+
+6.6.3 Branch Git Variables
+--------------------------
+
+These variables can be set from the transient prefix command
+‘magit-branch-configure’.  By default they can also be set from
+‘magit-branch’.  See *note Branch Commands::.
+
+ -- Variable: branch.NAME.merge
+     Together with ‘branch.NAME.remote’ this variable defines the
+     upstream branch of the local branch named NAME.  The value of this
+     variable is the full reference of the upstream _branch_.
+
+ -- Variable: branch.NAME.remote
+     Together with ‘branch.NAME.merge’ this variable defines the
+     upstream branch of the local branch named NAME.  The value of this
+     variable is the name of the upstream _remote_.
+
+ -- Variable: branch.NAME.rebase
+     This variable controls whether pulling into the branch named NAME
+     is done by rebasing or by merging the fetched branch.
+
+        • When ‘true’ then pulling is done by rebasing.
+        • When ‘false’ then pulling is done by merging.
+        • When undefined then the value of ‘pull.rebase’ is used.  The
+          default of that variable is ‘false’.
+
+ -- Variable: branch.NAME.pushRemote
+     This variable specifies the remote that the branch named NAME is
+     usually pushed to.  The value has to be the name of an existing
+     remote.
+
+     It is not possible to specify the name of _branch_ to push the
+     local branch to.  The name of the remote branch is always the same
+     as the name of the local branch.
+
+     If this variable is undefined but ‘remote.pushDefault’ is defined,
+     then the value of the latter is used.  By default
+     ‘remote.pushDefault’ is undefined.
+
+ -- Variable: branch.NAME.description
+     This variable can be used to describe the branch named NAME.  That
+     description is used, e.g., when turning the branch into a series of
+     patches.
+
+   The following variables specify defaults which are used if the above
+branch-specific variables are not set.
+
+ -- Variable: pull.rebase
+     This variable specifies whether pulling is done by rebasing or by
+     merging.  It can be overwritten using ‘branch.NAME.rebase’.
+
+        • When ‘true’ then pulling is done by rebasing.
+        • When ‘false’ (the default) then pulling is done by merging.
+
+     Since it is never a good idea to merge the upstream branch into a
+     feature or hotfix branch and most branches are such branches, you
+     should consider setting this to ‘true’, and ‘branch.master.rebase’
+     to ‘false’.
+
+ -- Variable: remote.pushDefault
+     This variable specifies what remote the local branches are usually
+     pushed to.  This can be overwritten per branch using
+     ‘branch.NAME.pushRemote’.
+
+   The following variables are used during the creation of a branch and
+control whether the various branch-specific variables are automatically
+set at this time.
+
+ -- Variable: branch.autoSetupMerge
+     This variable specifies under what circumstances creating a branch
+     NAME should result in the variables ‘branch.NAME.merge’ and
+     ‘branch.NAME.remote’ being set according to the starting point used
+     to create the branch.  If the starting point isn’t a branch, then
+     these variables are never set.
+
+        • When ‘always’ then the variables are set regardless of whether
+          the starting point is a local or a remote branch.
+        • When ‘true’ (the default) then the variables are set when the
+          starting point is a remote branch, but not when it is a local
+          branch.
+        • When ‘false’ then the variables are never set.
+
+ -- Variable: branch.autoSetupRebase
+     This variable specifies whether creating a branch NAME should
+     result in the variable ‘branch.NAME.rebase’ being set to ‘true’.
+
+        • When ‘always’ then the variable is set regardless of whether
+          the starting point is a local or a remote branch.
+        • When ‘local’ then the variable are set when the starting point
+          is a local branch, but not when it is a remote branch.
+        • When ‘remote’ then the variable are set when the starting
+          point is a remote branch, but not when it is a local branch.
+        • When ‘never’ (the default) then the variable is never set.
+
+   Note that the respective commands always change the repository-local
+values.  If you want to change the global value, which is used when the
+local value is undefined, then you have to do so on the command line,
+e.g.:
+
+     git config --global remote.autoSetupMerge always
+
+   For more information about these variables you should also see *note
+(gitman)git-config::.  Also see *note (gitman)git-branch::.  , *note
+(gitman)git-checkout::.  and *note Pushing::.
+
+ -- User Option: magit-prefer-remote-upstream
+     This option controls whether commands that read a branch from the
+     user and then set it as the upstream branch, offer a local or a
+     remote branch as default completion candidate, when they have the
+     choice.
+
+     This affects all commands that use ‘magit-read-upstream-branch’ or
+     ‘magit-read-starting-point’, which includes all commands that
+     change the upstream and many which create new branches.
+
+
+File: magit.info,  Node: Auxiliary Branch Commands,  Prev: Branch Git Variables,  Up: Branching
+
+6.6.4 Auxiliary Branch Commands
+-------------------------------
+
+These commands are not available from the transient ‘magit-branch’ by
+default.
+
+ -- Command: magit-branch-shelve
+     This command shelves a branch.  This is done by deleting the
+     branch, and creating a new reference "refs/shelved/BRANCH-NAME"
+     pointing at the same commit as the branch pointed at.  If the
+     deleted branch had a reflog, then that is preserved as the reflog
+     of the new reference.
+
+     This is useful if you want to move a branch out of sight, but are
+     not ready to completely discard it yet.
+
+ -- Command: magit-branch-unshelve
+     This command unshelves a branch that was previously shelved using
+     ‘magit-branch-shelve’.  This is done by deleting the reference
+     "refs/shelved/BRANCH-NAME" and creating a branch "BRANCH-NAME"
+     pointing at the same commit as the deleted reference pointed at.
+     If the deleted reference had a reflog, then that is restored as the
+     reflog of the branch.
+
+
+File: magit.info,  Node: Merging,  Next: Resolving Conflicts,  Prev: Branching,  Up: Manipulating
+
+6.7 Merging
+===========
+
+Also see *note (gitman)git-merge::.  For information on how to resolve
+merge conflicts see the next section.
+
+‘m’ (‘magit-merge’)
+     This transient prefix command binds the following suffix commands
+     along with the appropriate infix arguments and displays them in a
+     temporary buffer until a suffix is invoked.
+
+   When no merge is in progress, then the transient features the
+following suffix commands.
+
+‘m m’ (‘magit-merge-plain’)
+     This command merges another branch or an arbitrary revision into
+     the current branch.  The branch or revision to be merged is read in
+     the minibuffer and defaults to the branch at point.
+
+     Unless there are conflicts or a prefix argument is used, then the
+     resulting merge commit uses a generic commit message, and the user
+     does not get a chance to inspect or change it before the commit is
+     created.  With a prefix argument this does not actually create the
+     merge commit, which makes it possible to inspect how conflicts were
+     resolved and to adjust the commit message.
+
+‘m e’ (‘magit-merge-editmsg’)
+     This command merges another branch or an arbitrary revision into
+     the current branch and opens a commit message buffer, so that the
+     user can make adjustments.  The commit is not actually created
+     until the user finishes with ‘C-c C-c’.
+
+‘m n’ (‘magit-merge-nocommit’)
+     This command merges another branch or an arbitrary revision into
+     the current branch, but does not actually create the merge commit.
+     The user can then further adjust the merge, even when automatic
+     conflict resolution succeeded and/or adjust the commit message.
+
+‘m a’ (‘magit-merge-absorb’)
+     This command merges another local branch into the current branch
+     and then removes the former.
+
+     Before the source branch is merged, it is first force pushed to its
+     push-remote, provided the respective remote branch already exists.
+     This ensures that the respective pull-request (if any) won’t get
+     stuck on some obsolete version of the commits that are being
+     merged.  Finally, if ‘magit-branch-pull-request’ was used to create
+     the merged branch, then the respective remote branch is also
+     removed.
+
+‘m i’ (‘magit-merge-into’)
+     This command merges the current branch into another local branch
+     and then removes the former.  The latter becomes the new current
+     branch.
+
+     Before the source branch is merged, it is first force pushed to its
+     push-remote, provided the respective remote branch already exists.
+     This ensures that the respective pull-request (if any) won’t get
+     stuck on some obsolete version of the commits that are being
+     merged.  Finally, if ‘magit-branch-pull-request’ was used to create
+     the merged branch, then the respective remote branch is also
+     removed.
+
+‘m s’ (‘magit-merge-squash’)
+     This command squashes the changes introduced by another branch or
+     an arbitrary revision into the current branch.  This only applies
+     the changes made by the squashed commits.  No information is
+     preserved that would allow creating an actual merge commit.
+     Instead of this command you should probably use a command from the
+     apply transient.
+
+‘m p’ (‘magit-merge-preview’)
+     This command shows a preview of merging another branch or an
+     arbitrary revision into the current branch.
+
+     Note that commands, that normally change how a diff is displayed,
+     do not work in buffers created by this command, because the
+     underlying Git command does not support diff arguments.
+
+   When a merge is in progress, then the transient instead features the
+following suffix commands.
+
+‘m m’ (‘magit-merge’)
+     After the user resolved conflicts, this command proceeds with the
+     merge.  If some conflicts weren’t resolved, then this command
+     fails.
+
+‘m a’ (‘magit-merge-abort’)
+     This command aborts the current merge operation.
+
+
+File: magit.info,  Node: Resolving Conflicts,  Next: Rebasing,  Prev: Merging,  Up: Manipulating
+
+6.8 Resolving Conflicts
+=======================
+
+When merging branches (or otherwise combining or changing history)
+conflicts can occur.  If you edited two completely different parts of
+the same file in two branches and then merge one of these branches into
+the other, then Git can resolve that on its own, but if you edit the
+same area of a file, then a human is required to decide how the two
+versions, or "sides of the conflict", are to be combined into one.
+
+   Here we can only provide a brief introduction to the subject and
+point you toward some tools that can help.  If you are new to this, then
+please also consult Git’s own documentation as well as other resources.
+
+   If a file has conflicts and Git cannot resolve them by itself, then
+it puts both versions into the affected file along with special markers
+whose purpose is to denote the boundaries of the unresolved part of the
+file and between the different versions.  These boundary lines begin
+with the strings consisting of seven times the same character, one of
+‘<’, ‘|’, ‘=’ and ‘>’, and are followed by information about the source
+of the respective versions, e.g.:
+
+     <<<<<<< HEAD
+     Take the blue pill.
+     =======
+     Take the red pill.
+     >>>>>>> feature
+
+   In this case you have chosen to take the red pill on one branch and
+on another you picked the blue pill.  Now that you are merging these two
+diverging branches, Git cannot possibly know which pill you want to
+take.
+
+   To resolve that conflict you have to create a version of the affected
+area of the file by keeping only one of the sides, possibly by editing
+it in order to bring in the changes from the other side, remove the
+other versions as well as the markers, and then stage the result.  A
+possible resolution might be:
+
+     Take both pills.
+
+   Often it is useful to see not only the two sides of the conflict but
+also the "original" version from before the same area of the file was
+modified twice on different branches.  Instruct Git to insert that
+version as well by running this command once:
+
+     git config --global merge.conflictStyle diff3
+
+   The above conflict might then have looked like this:
+
+     <<<<<<< HEAD
+     Take the blue pill.
+     ||||||| merged common ancestors
+     Take either the blue or the red pill, but not both.
+     =======
+     Take the red pill.
+     >>>>>>> feature
+
+   If that were the case, then the above conflict resolution would not
+have been correct, which demonstrates why seeing the original version
+alongside the conflicting versions can be useful.
+
+   You can perform the conflict resolution completely by hand, but Emacs
+also provides some packages that help in the process: Smerge, Ediff
+(*note (ediff)Top::), and Emerge (*note (emacs)Emerge::).  Magit does
+not provide its own tools for conflict resolution, but it does make
+using Smerge and Ediff more convenient.  (Ediff supersedes Emerge, so
+you probably don’t want to use the latter anyway.)
+
+   In the Magit status buffer, files with unresolved conflicts are
+listed in the "Unstaged changes" and/or "Staged changes" sections.  They
+are prefixed with the word "unmerged", which in this context essentially
+is a synonym for "unresolved".
+
+   Pressing ‘RET’ while point is on such a file section shows a buffer
+visiting that file, turns on ‘smerge-mode’ in that buffer, and places
+point inside the first area with conflicts.  You should then resolve
+that conflict using regular edit commands and/or Smerge commands.
+
+   Unfortunately Smerge does not have a manual, but you can get a list
+of commands and binding ‘C-c ^ C-h’ and press ‘RET’ while point is on a
+command name to read its documentation.
+
+   Normally you would edit one version and then tell Smerge to keep only
+that version.  Use ‘C-c ^ m’ (‘smerge-keep-mine’) to keep the ‘HEAD’
+version or ‘C-c ^ o’ (‘smerge-keep-other’) to keep the version that
+follows "|||||||".  Then use ‘C-c ^ n’ to move to the next conflicting
+area in the same file.  Once you are done resolving conflicts, return to
+the Magit status buffer.  The file should now be shown as "modified", no
+longer as "unmerged", because Smerge automatically stages the file when
+you save the buffer after resolving the last conflict.
+
+   Magit now wraps the mentioned Smerge commands, allowing you to use
+these key bindings without having to go to the file-visiting buffer.
+Additionally ‘k’ (‘magit-discard’) on a hunk with unresolved conflicts
+asks which side to keep or, if point is on a side, then it keeps it
+without prompting.  Similarly ‘k’ on a unresolved file ask which side to
+keep.
+
+   Alternatively you could use Ediff, which uses separate buffers for
+the different versions of the file.  To resolve conflicts in a file
+using Ediff press ‘e’ while point is on such a file in the status
+buffer.
+
+   Ediff can be used for other purposes as well.  For more information
+on how to enter Ediff from Magit, see *note Ediffing::.  Explaining how
+to use Ediff is beyond the scope of this manual, instead see *note
+(ediff)Top::.
+
+   If you are unsure whether you should Smerge or Ediff, then use the
+former.  It is much easier to understand and use, and except for truly
+complex conflicts, the latter is usually overkill.
+
+
+File: magit.info,  Node: Rebasing,  Next: Cherry Picking,  Prev: Resolving Conflicts,  Up: Manipulating
+
+6.9 Rebasing
+============
+
+Also see *note (gitman)git-rebase::.  For information on how to resolve
+conflicts that occur during rebases see the preceding section.
+
+‘r’ (‘magit-rebase’)
+     This transient prefix command binds the following suffix commands
+     along with the appropriate infix arguments and displays them in a
+     temporary buffer until a suffix is invoked.
+
+   When no rebase is in progress, then the transient features the
+following suffix commands.
+
+   Using one of these commands _starts_ a rebase sequence.  Git might
+then stop somewhere along the way, either because you told it to do so,
+or because applying a commit failed due to a conflict.  When that
+happens, then the status buffer shows information about the rebase
+sequence which is in progress in a section similar to a log section.
+See *note Information About In-Progress Rebase::.
+
+   For information about the upstream and the push-remote, see *note The
+Two Remotes::.
+
+‘r p’ (‘magit-rebase-onto-pushremote’)
+     This command rebases the current branch onto its push-remote.
+
+     With a prefix argument or when the push-remote is either not
+     configured or unusable, then let the user first configure the
+     push-remote.
+
+‘r u’ (‘magit-rebase-onto-upstream’)
+     This command rebases the current branch onto its upstream branch.
+
+     With a prefix argument or when the upstream is either not
+     configured or unusable, then let the user first configure the
+     upstream.
+
+‘r e’ (‘magit-rebase-branch’)
+     This command rebases the current branch onto a branch read in the
+     minibuffer.  All commits that are reachable from head but not from
+     the selected branch TARGET are being rebased.
+
+‘r s’ (‘magit-rebase-subset’)
+     This command starts a non-interactive rebase sequence to transfer
+     commits from START to ‘HEAD’ onto NEWBASE.  START has to be
+     selected from a list of recent commits.
+
+   By default Magit uses the ‘--autostash’ argument, which causes
+uncommitted changes to be stored in a stash before the rebase begins.
+These changes are restored after the rebase completes and if possible
+the stash is removed.  If the stash does not apply cleanly, then the
+stash is not removed.  In case something goes wrong when resolving the
+conflicts, this allows you to start over.
+
+   Even though one of the actions is dedicated to interactive rebases,
+the transient also features the infix argument ‘--interactive’.  This
+can be used to turn one of the other, non-interactive rebase variants
+into an interactive rebase.
+
+   For example if you want to clean up a feature branch and at the same
+time rebase it onto ‘master’, then you could use ‘r-iu’.  But we
+recommend that you instead do that in two steps.  First use ‘ri’ to
+cleanup the feature branch, and then in a second step ‘ru’ to rebase it
+onto ‘master’.  That way if things turn out to be more complicated than
+you thought and/or you make a mistake and have to start over, then you
+only have to redo half the work.
+
+   Explicitly enabling ‘--interactive’ won’t have an effect on the
+following commands as they always use that argument anyway, even if it
+is not enabled in the transient.
+
+‘r i’ (‘magit-rebase-interactive’)
+     This command starts an interactive rebase sequence.
+
+‘r f’ (‘magit-rebase-autosquash’)
+     This command combines squash and fixup commits with their intended
+     targets.
+
+‘r m’ (‘magit-rebase-edit-commit’)
+     This command starts an interactive rebase sequence that lets the
+     user edit a single older commit.
+
+‘r w’ (‘magit-rebase-reword-commit’)
+     This command starts an interactive rebase sequence that lets the
+     user reword a single older commit.
+
+‘r k’ (‘magit-rebase-remove-commit’)
+     This command removes a single older commit using rebase.
+
+   When a rebase is in progress, then the transient instead features the
+following suffix commands.
+
+‘r r’ (‘magit-rebase-continue’)
+     This command restart the current rebasing operation.
+
+     In some cases this pops up a commit message buffer for you do edit.
+     With a prefix argument the old message is reused as-is.
+
+‘r s’ (‘magit-rebase-skip’)
+     This command skips the current commit and restarts the current
+     rebase operation.
+
+‘r e’ (‘magit-rebase-edit’)
+     This command lets the user edit the todo list of the current rebase
+     operation.
+
+‘r a’ (‘magit-rebase-abort’)
+     This command aborts the current rebase operation, restoring the
+     original branch.
+
+* Menu:
+
+* Editing Rebase Sequences::
+* Information About In-Progress Rebase::
+
+
+File: magit.info,  Node: Editing Rebase Sequences,  Next: Information About In-Progress Rebase,  Up: Rebasing
+
+6.9.1 Editing Rebase Sequences
+------------------------------
+
+‘C-c C-c’ (‘with-editor-finish’)
+     Finish the current editing session by returning with exit code 0.
+     Git then uses the rebase instructions it finds in the file.
+
+‘C-c C-k’ (‘with-editor-cancel’)
+     Cancel the current editing session by returning with exit code 1.
+     Git then forgoes starting the rebase sequence.
+
+‘<RET>’ (‘git-rebase-show-commit’)
+     Show the commit on the current line in another buffer and select
+     that buffer.
+
+‘<SPC>’ (‘git-rebase-show-or-scroll-up’)
+     Show the commit on the current line in another buffer without
+     selecting that buffer.  If the revision buffer is already visible
+     in another window of the current frame, then instead scroll that
+     window up.
+
+‘<DEL>’ (‘git-rebase-show-or-scroll-down’)
+     Show the commit on the current line in another buffer without
+     selecting that buffer.  If the revision buffer is already visible
+     in another window of the current frame, then instead scroll that
+     window down.
+
+‘p’ (‘git-rebase-backward-line’)
+     Move to previous line.
+
+‘n’ (‘forward-line’)
+     Move to next line.
+
+‘M-p’ (‘git-rebase-move-line-up’)
+     Move the current commit (or command) up.
+
+‘M-n’ (‘git-rebase-move-line-down’)
+     Move the current commit (or command) down.
+
+‘r’ (‘git-rebase-reword’)
+     Edit message of commit on current line.
+
+‘e’ (‘git-rebase-edit’)
+     Stop at the commit on the current line.
+
+‘s’ (‘git-rebase-squash’)
+     Meld commit on current line into previous commit, and edit message.
+
+‘f’ (‘git-rebase-fixup’)
+     Meld commit on current line into previous commit, discarding the
+     current commit’s message.
+
+‘k’ (‘git-rebase-kill-line’)
+     Kill the current action line.
+
+‘c’ (‘git-rebase-pick’)
+     Use commit on current line.
+
+‘x’ (‘git-rebase-exec’)
+     Insert a shell command to be run after the proceeding commit.
+
+     If there already is such a command on the current line, then edit
+     that instead.  With a prefix argument insert a new command even
+     when there already is one on the current line.  With empty input
+     remove the command on the current line, if any.
+
+‘b’ (‘git-rebase-break’)
+     Insert a break action before the current line, instructing Git to
+     return control to the user.
+
+‘y’ (‘git-rebase-insert’)
+     Read an arbitrary commit and insert it below current line.
+
+‘C-x u’ (‘git-rebase-undo’)
+     Undo some previous changes.  Like ‘undo’ but works in read-only
+     buffers.
+
+ -- User Option: git-rebase-auto-advance
+     Whether to move to next line after changing a line.
+
+ -- User Option: git-rebase-show-instructions
+     Whether to show usage instructions inside the rebase buffer.
+
+ -- User Option: git-rebase-confirm-cancel
+     Whether confirmation is required to cancel.
+
+   When a rebase is performed with the ‘--rebase-merges’ option, the
+sequence will include a few other types of actions and the following
+commands become relevant.
+
+‘l’ (‘git-rebase-label’)
+     This commands inserts a label action or edits the one at point.
+
+‘t’ (‘git-rebase-reset’)
+     This command inserts a reset action or edits the one at point.  The
+     prompt will offer the labels that are currently present in the
+     buffer.
+
+‘MM’ (‘git-rebase-merge’)
+     The command inserts a merge action or edits the one at point.  The
+     prompt will offer the labels that are currently present in the
+     buffer.  Specifying a message to reuse via ‘-c’ or ‘-C’ is not
+     supported; an editor will always be invoked for the merge.
+
+‘Mt’ (‘git-rebase-merge-toggle-editmsg’)
+     This command toggles between the ‘-C’ and ‘-c’ options of the merge
+     action at point.  These options both specify a commit whose message
+     should be reused.  The lower-case variant instructs Git to invoke
+     the editor when creating the merge, allowing the user to edit the
+     message.
+
+
+File: magit.info,  Node: Information About In-Progress Rebase,  Prev: Editing Rebase Sequences,  Up: Rebasing
+
+6.9.2 Information About In-Progress Rebase
+------------------------------------------
+
+While a rebase sequence is in progress, the status buffer features a
+section that lists the commits that have already been applied as well as
+the commits that still have to be applied.
+
+   The commits are split in two halves.  When rebase stops at a commit,
+either because the user has to deal with a conflict or because s/he
+explicitly requested that rebase stops at that commit, then point is
+placed on the commit that separates the two groups, i.e., on ‘HEAD’.
+The commits above it have not been applied yet, while the ‘HEAD’ and the
+commits below it have already been applied.  In between these two groups
+of applied and yet-to-be applied commits, there sometimes is a commit
+which has been dropped.
+
+   Each commit is prefixed with a word and these words are additionally
+shown in different colors to indicate the status of the commits.
+
+   The following colors are used:
+
+   • Commits that use the same foreground color as the ‘default’ face
+     have not been applied yet.
+
+   • Yellow commits have some special relationship to the commit rebase
+     stopped at.  This is used for the words "join", "goal", "same" and
+     "work" (see below).
+
+   • Gray commits have already been applied.
+
+   • The blue commit is the ‘HEAD’ commit.
+
+   • The green commit is the commit the rebase sequence stopped at.  If
+     this is the same commit as ‘HEAD’ (e.g., because you haven’t done
+     anything yet after rebase stopped at the commit, then this commit
+     is shown in blue, not green).  There can only be a green *and* a
+     blue commit at the same time, if you create one or more new commits
+     after rebase stops at a commit.
+
+   • Red commits have been dropped.  They are shown for reference only,
+     e.g., to make it easier to diff.
+
+   Of course these colors are subject to the color-theme in use.
+
+   The following words are used:
+
+   • Commits prefixed with ‘pick’, ‘reword’, ‘edit’, ‘squash’, and
+     ‘fixup’ have not been applied yet.  These words have the same
+     meaning here as they do in the buffer used to edit the rebase
+     sequence.  See *note Editing Rebase Sequences::.  When the
+     ‘--rebase-merges’ option was specified, ‘reset’, ‘label’, and
+     ‘merge’ lines may also be present.
+
+   • Commits prefixed with ‘done’ and ‘onto’ have already been applied.
+     It is possible for such a commit to be the ‘HEAD’, in which case it
+     is blue.  Otherwise it is grey.
+
+        • The commit prefixed with ‘onto’ is the commit on top of which
+          all the other commits are being re-applied.  This commit
+          itself did not have to be re-applied, it is the commit rebase
+          did rewind to before starting to re-apply other commits.
+
+        • Commits prefixed with ‘done’ have already been re-applied.
+          This includes commits that have been re-applied but also new
+          commits that you have created during the rebase.
+
+   • All other commits, those not prefixed with any of the above words,
+     are in some way related to the commit at which rebase stopped.
+
+     To determine whether a commit is related to the stopped-at commit
+     their hashes, trees and patch-ids (1) are being compared.  The
+     commit message is not used for this purpose.
+
+     Generally speaking commits that are related to the stopped-at
+     commit can have any of the used colors, though not all color/word
+     combinations are possible.
+
+     Words used for stopped-at commits are:
+
+        • When a commit is prefixed with ‘void’, then that indicates
+          that Magit knows for sure that all the changes in that commit
+          have been applied using several new commits.  This commit is
+          no longer reachable from ‘HEAD’, and it also isn’t one of the
+          commits that will be applied when resuming the session.
+
+        • When a commit is prefixed with ‘join’, then that indicates
+          that the rebase sequence stopped at that commit due to a
+          conflict - you now have to join (merge) the changes with what
+          has already been applied.  In a sense this is the commit
+          rebase stopped at, but while its effect is already in the
+          index and in the worktree (with conflict markers), the commit
+          itself has not actually been applied yet (it isn’t the
+          ‘HEAD’).  So it is shown in yellow, like the other commits
+          that still have to be applied.
+
+        • When a commit is prefixed with ‘stop’ or a _blue_ or _green_
+          ‘same’, then that indicates that rebase stopped at this
+          commit, that it is still applied or has been applied again,
+          and that at least its patch-id is unchanged.
+
+             • When a commit is prefixed with ‘stop’, then that
+               indicates that rebase stopped at that commit because you
+               requested that earlier, and its patch-id is unchanged.
+               It might even still be the exact same commit.
+
+             • When a commit is prefixed with a _blue_ or _green_
+               ‘same’, then that indicates that while its tree or hash
+               changed, its patch-id did not.  If it is blue, then it is
+               the ‘HEAD’ commit (as always for blue).  When it is
+               green, then it no longer is ‘HEAD’ because other commit
+               have been created since (but before continuing the
+               rebase).
+
+        • When a commit is prefixed with ‘goal’, a _yellow_ ‘same,’ or
+          ‘work’, then that indicates that rebase applied that commit
+          but that you then reset ‘HEAD’ to an earlier commit (likely to
+          split it up into multiple commits), and that there are some
+          uncommitted changes remaining which likely (but not
+          necessarily) originate from that commit.
+
+             • When a commit is prefixed with ‘goal’, then that
+               indicates that it is still possible to create a new
+               commit with the exact same tree (the "goal") without
+               manually editing any files, by committing the index, or
+               by staging all changes and then committing that.  This is
+               the case when the original tree still exists in the index
+               or worktree in untainted form.
+
+             • When a commit is prefixed with a yellow ‘same’, then that
+               indicates that it is no longer possible to create a
+               commit with the exact same tree, but that it is still
+               possible to create a commit with the same patch-id.  This
+               would be the case if you created a new commit with other
+               changes, but the changes from the original commit still
+               exist in the index or working tree in untainted form.
+
+             • When a commit is prefixed with ‘work’, then that
+               indicates that you reset ‘HEAD’ to an earlier commit, and
+               that there are some staged and/or unstaged changes
+               (likely, but not necessarily) originating from that
+               commit.  However it is no longer possible to create a new
+               commit with the same tree or at least the same patch-id
+               because you have already made other changes.
+
+        • When a commit is prefixed with ‘poof’ or ‘gone’, then that
+          indicates that rebase applied that commit but that you then
+          reset ‘HEAD’ to an earlier commit (likely to split it up into
+          multiple commits), and that there are no uncommitted changes.
+
+             • When a commit is prefixed with ‘poof’, then that
+               indicates that it is no longer reachable from ‘HEAD’, but
+               that it has been replaced with one or more commits, which
+               together have the exact same effect.
+
+             • When a commit is prefixed with ‘gone’, then that
+               indicates that it is no longer reachable from ‘HEAD’ and
+               that we also cannot determine whether its changes are
+               still in effect in one or more new commits.  They might
+               be, but if so, then there must also be other changes
+               which makes it impossible to know for sure.
+
+   Do not worry if you do not fully understand the above.  That’s okay,
+you will acquire a good enough understanding through practice.
+
+   For other sequence operations such as cherry-picking, a similar
+section is displayed, but they lack some of the features described
+above, due to limitations in the git commands used to implement them.
+Most importantly these sequences only support "picking" a commit but not
+other actions such as "rewording", and they do not keep track of the
+commits which have already been applied.
+
+   ---------- Footnotes ----------
+
+   (1) The patch-id is a hash of the _changes_ introduced by a commit.
+It differs from the hash of the commit itself, which is a hash of the
+result of applying that change (i.e., the resulting trees and blobs) as
+well as author and committer information, the commit message, and the
+hashes of the parents of the commit.  The patch-id hash on the other
+hand is created only from the added and removed lines, even line numbers
+and whitespace changes are ignored when calculating this hash.  The
+patch-ids of two commits can be used to answer the question "Do these
+commits make the same change?".
+
+
+File: magit.info,  Node: Cherry Picking,  Next: Resetting,  Prev: Rebasing,  Up: Manipulating
+
+6.10 Cherry Picking
+===================
+
+Also see *note (gitman)git-cherry-pick::.
+
+‘A’ (‘magit-cherry-pick’)
+     This transient prefix command binds the following suffix commands
+     along with the appropriate infix arguments and displays them in a
+     temporary buffer until a suffix is invoked.
+
+   When no cherry-pick or revert is in progress, then the transient
+features the following suffix commands.
+
+‘A A’ (‘magit-cherry-copy’)
+     This command copies COMMITS from another branch onto the current
+     branch.  If the region selects multiple commits, then those are
+     copied, without prompting.  Otherwise the user is prompted for a
+     commit or range, defaulting to the commit at point.
+
+‘A a’ (‘magit-cherry-apply’)
+     This command applies the changes in COMMITS from another branch
+     onto the current branch.  If the region selects multiple commits,
+     then those are used, without prompting.  Otherwise the user is
+     prompted for a commit or range, defaulting to the commit at point.
+
+     This command also has a top-level binding, which can be invoked
+     without using the transient by typing ‘a’ at the top-level.
+
+   The following commands not only apply some commits to some branch,
+but also remove them from some other branch.  The removal is performed
+using either ‘git-update-ref’ or if necessary ‘git-rebase’.  Both
+applying commits as well as removing them using ‘git-rebase’ can lead to
+conflicts.  If that happens, then these commands abort and you not only
+have to resolve the conflicts but also finish the process the same way
+you would have to if these commands didn’t exist at all.
+
+‘A h’ (‘magit-cherry-harvest’)
+     This command moves the selected COMMITS that must be located on
+     another BRANCH onto the current branch instead, removing them from
+     the former.  When this command succeeds, then the same branch is
+     current as before.
+
+     Applying the commits on the current branch or removing them from
+     the other branch can lead to conflicts.  When that happens, then
+     this command stops and you have to resolve the conflicts and then
+     finish the process manually.
+
+‘A d’ (‘magit-cherry-donate’)
+     This command moves the selected COMMITS from the current branch
+     onto another existing BRANCH, removing them from the former.  When
+     this command succeeds, then the same branch is current as before.
+     ‘HEAD’ is allowed to be detached initially.
+
+     Applying the commits on the other branch or removing them from the
+     current branch can lead to conflicts.  When that happens, then this
+     command stops and you have to resolve the conflicts and then finish
+     the process manually.
+
+‘A n’ (‘magit-cherry-spinout’)
+     This command moves the selected COMMITS from the current branch
+     onto a new branch BRANCH, removing them from the former.  When this
+     command succeeds, then the same branch is current as before.
+
+     Applying the commits on the other branch or removing them from the
+     current branch can lead to conflicts.  When that happens, then this
+     command stops and you have to resolve the conflicts and then finish
+     the process manually.
+
+‘A s’ (‘magit-cherry-spinoff’)
+     This command moves the selected COMMITS from the current branch
+     onto a new branch BRANCH, removing them from the former.  When this
+     command succeeds, then the new branch is checked out.
+
+     Applying the commits on the other branch or removing them from the
+     current branch can lead to conflicts.  When that happens, then this
+     command stops and you have to resolve the conflicts and then finish
+     the process manually.
+
+   When a cherry-pick or revert is in progress, then the transient
+instead features the following suffix commands.
+
+‘A A’ (‘magit-sequence-continue’)
+     Resume the current cherry-pick or revert sequence.
+
+‘A s’ (‘magit-sequence-skip’)
+     Skip the stopped at commit during a cherry-pick or revert sequence.
+
+‘A a’ (‘magit-sequence-abort’)
+     Abort the current cherry-pick or revert sequence.  This discards
+     all changes made since the sequence started.
+
+* Menu:
+
+* Reverting::
+
+
+File: magit.info,  Node: Reverting,  Up: Cherry Picking
+
+6.10.1 Reverting
+----------------
+
+‘V’ (‘magit-revert’)
+     This transient prefix command binds the following suffix commands
+     along with the appropriate infix arguments and displays them in a
+     temporary buffer until a suffix is invoked.
+
+   When no cherry-pick or revert is in progress, then the transient
+features the following suffix commands.
+
+‘V V’ (‘magit-revert-and-commit’)
+     Revert a commit by creating a new commit.  Prompt for a commit,
+     defaulting to the commit at point.  If the region selects multiple
+     commits, then revert all of them, without prompting.
+
+‘V v’ (‘magit-revert-no-commit’)
+     Revert a commit by applying it in reverse to the working tree.
+     Prompt for a commit, defaulting to the commit at point.  If the
+     region selects multiple commits, then revert all of them, without
+     prompting.
+
+   When a cherry-pick or revert is in progress, then the transient
+instead features the following suffix commands.
+
+‘V V’ (‘magit-sequence-continue’)
+     Resume the current cherry-pick or revert sequence.
+
+‘V s’ (‘magit-sequence-skip’)
+     Skip the stopped at commit during a cherry-pick or revert sequence.
+
+‘V a’ (‘magit-sequence-abort’)
+     Abort the current cherry-pick or revert sequence.  This discards
+     all changes made since the sequence started.
+
+
+File: magit.info,  Node: Resetting,  Next: Stashing,  Prev: Cherry Picking,  Up: Manipulating
+
+6.11 Resetting
+==============
+
+Also see *note (gitman)git-reset::.
+
+‘x’ (‘magit-reset-quickly’)
+     Reset the ‘HEAD’ and index to some commit read from the user and
+     defaulting to the commit at point, and possibly also reset the
+     working tree.  With a prefix argument reset the working tree
+     otherwise don’t.
+
+‘X m’ (‘magit-reset-mixed’)
+     Reset the ‘HEAD’ and index to some commit read from the user and
+     defaulting to the commit at point.  The working tree is kept as-is.
+
+‘X s’ (‘magit-reset-soft’)
+     Reset the ‘HEAD’ to some commit read from the user and defaulting
+     to the commit at point.  The index and the working tree are kept
+     as-is.
+
+‘X h’ (‘magit-reset-hard’)
+     Reset the ‘HEAD’, index, and working tree to some commit read from
+     the user and defaulting to the commit at point.
+
+‘X k’ (‘magit-reset-keep’)
+     Reset the ‘HEAD’, index, and working tree to some commit read from
+     the user and defaulting to the commit at point.  Uncommitted
+     changes are kept as-is.
+
+‘X i’ (‘magit-reset-index’)
+     Reset the index to some commit read from the user and defaulting to
+     the commit at point.  Keep the ‘HEAD’ and working tree as-is, so if
+     the commit refers to the ‘HEAD’, then this effectively unstages all
+     changes.
+
+‘X w’ (‘magit-reset-worktree’)
+     Reset the working tree to some commit read from the user and
+     defaulting to the commit at point.  Keep the ‘HEAD’ and index
+     as-is.
+
+‘X f’ (‘magit-file-checkout’)
+     Update file in the working tree and index to the contents from a
+     revision.  Both the revision and file are read from the user.
+
+
+File: magit.info,  Node: Stashing,  Prev: Resetting,  Up: Manipulating
+
+6.12 Stashing
+=============
+
+Also see *note (gitman)git-stash::.
+
+‘z’ (‘magit-stash’)
+     This transient prefix command binds the following suffix commands
+     along with the appropriate infix arguments and displays them in a
+     temporary buffer until a suffix is invoked.
+
+‘z z’ (‘magit-stash-both’)
+     Create a stash of the index and working tree.  Untracked files are
+     included according to infix arguments.  One prefix argument is
+     equivalent to ‘--include-untracked’ while two prefix arguments are
+     equivalent to ‘--all’.
+
+‘z i’ (‘magit-stash-index’)
+     Create a stash of the index only.  Unstaged and untracked changes
+     are not stashed.
+
+‘z w’ (‘magit-stash-worktree’)
+     Create a stash of unstaged changes in the working tree.  Untracked
+     files are included according to infix arguments.  One prefix
+     argument is equivalent to ‘--include-untracked’ while two prefix
+     arguments are equivalent to ‘--all’.
+
+‘z x’ (‘magit-stash-keep-index’)
+     Create a stash of the index and working tree, keeping index intact.
+     Untracked files are included according to infix arguments.  One
+     prefix argument is equivalent to ‘--include-untracked’ while two
+     prefix arguments are equivalent to ‘--all’.
+
+‘z Z’ (‘magit-snapshot-both’)
+     Create a snapshot of the index and working tree.  Untracked files
+     are included according to infix arguments.  One prefix argument is
+     equivalent to ‘--include-untracked’ while two prefix arguments are
+     equivalent to ‘--all’.
+
+‘z I’ (‘magit-snapshot-index’)
+     Create a snapshot of the index only.  Unstaged and untracked
+     changes are not stashed.
+
+‘z W’ (‘magit-snapshot-worktree’)
+     Create a snapshot of unstaged changes in the working tree.
+     Untracked files are included according to infix arguments.  One
+     prefix argument is equivalent to ‘--include-untracked’ while two
+     prefix arguments are equivalent to ‘--all’-.
+
+‘z a’ (‘magit-stash-apply’)
+     Apply a stash to the working tree.
+
+     First try ‘git stash apply --index’, which tries to preserve the
+     index stored in the stash, if any.  This may fail because applying
+     the stash could result in conflicts and those have to be stored in
+     the index, making it impossible to also store the stash’s index
+     there as well.
+
+     If the above failed, then try ‘git stash apply’.  This fails (with
+     or without ‘--index’) if there are any uncommitted changes to files
+     that are also modified in the stash.
+
+     If both of the above failed, then apply using ‘git apply’.  If
+     there are no conflicting files, use ‘--3way’.  If there are
+     conflicting files, then using ‘--3way’ requires that those files
+     are staged first, which may be undesirable, so prompt the user
+     whether to use ‘--3way’ or ‘--reject’.
+
+     Customize ‘magit-no-confirm’ if you want to always use ‘--3way’,
+     without being prompted.
+
+‘z p’ (‘magit-stash-pop’)
+     Apply a stash to the working tree.  On complete success (if the
+     stash can be applied without any conflicts, and while preserving
+     the stash’s index) then remove the stash from stash list.
+
+     First try ‘git stash pop --index’, which tries to preserve the
+     index stored in the stash, if any.  This may fail because applying
+     the stash could result in conflicts and those have to be stored in
+     the index, making it impossible to also store the stash’s index
+     there as well.
+
+     If the above failed, then try ‘git stash apply’.  This fails (with
+     or without ‘--index’) if there are any uncommitted changes to files
+     that are also modified in the stash.
+
+     If both of the above failed, then apply using ‘git apply’.  If
+     there are no conflicting files, use ‘--3way’.  If there are
+     conflicting files, then using ‘--3way’ requires that those files
+     are staged first, which may be undesirable, so prompt the user
+     whether to use ‘--3way’ or ‘--reject’.
+
+     Customize ‘magit-no-confirm’ if you want to always use ‘--3way’,
+     without being prompted.
+
+‘z k’ (‘magit-stash-drop’)
+     Remove a stash from the stash list.  When the region is active,
+     offer to drop all contained stashes.
+
+‘z v’ (‘magit-stash-show’)
+     Show all diffs of a stash in a buffer.
+
+‘z b’ (‘magit-stash-branch’)
+     Create and checkout a new branch from an existing stash.  The new
+     branch starts at the commit that was current when the stash was
+     created.
+
+‘z B’ (‘magit-stash-branch-here’)
+     Create and checkout a new branch from an existing stash.  Use the
+     current branch or ‘HEAD’ as the starting-point of the new branch.
+     Then apply the stash, dropping it if it applies cleanly.
+
+‘z f’ (‘magit-stash-format-patch’)
+     Create a patch from STASH.
+
+‘k’ (‘magit-stash-clear’)
+     Remove all stashes saved in REF’s reflog by deleting REF.
+
+‘z l’ (‘magit-stash-list’)
+     List all stashes in a buffer.
+
+ -- User Option: magit-stashes-margin
+     This option specifies whether the margin is initially shown in
+     stashes buffers and how it is formatted.
+
+     The value has the form ‘(INIT STYLE WIDTH AUTHOR AUTHOR-WIDTH)’.
+
+        • If INIT is non-nil, then the margin is shown initially.
+        • STYLE controls how to format the author or committer date.  It
+          can be one of ‘age’ (to show the age of the commit),
+          ‘age-abbreviated’ (to abbreviate the time unit to a
+          character), or a string (suitable for ‘format-time-string’) to
+          show the actual date.  Option
+          ‘magit-log-margin-show-committer-date’ controls which date is
+          being displayed.
+        • WIDTH controls the width of the margin.  This exists for
+          forward compatibility and currently the value should not be
+          changed.
+        • AUTHOR controls whether the name of the author is also shown
+          by default.
+        • AUTHOR-WIDTH has to be an integer.  When the name of the
+          author is shown, then this specifies how much space is used to
+          do so.
+
+
+File: magit.info,  Node: Transferring,  Next: Miscellaneous,  Prev: Manipulating,  Up: Top
+
+7 Transferring
+**************
+
+* Menu:
+
+* Remotes::
+* Fetching::
+* Pulling::
+* Pushing::
+* Plain Patches::
+* Maildir Patches::
+
+
+File: magit.info,  Node: Remotes,  Next: Fetching,  Up: Transferring
+
+7.1 Remotes
+===========
+
+* Menu:
+
+* Remote Commands::
+* Remote Git Variables::
+
+
+File: magit.info,  Node: Remote Commands,  Next: Remote Git Variables,  Up: Remotes
+
+7.1.1 Remote Commands
+---------------------
+
+The transient prefix command ‘magit-remote’ is used to add remotes and
+to make changes to existing remotes.  This command only deals with
+remotes themselves, not with branches or the transfer of commits.  Those
+features are available from separate transient commands.
+
+   Also see *note (gitman)git-remote::.
+
+‘M’ (‘magit-remote’)
+     This transient prefix command binds the following suffix commands
+     and displays them in a temporary buffer until a suffix is invoked.
+
+     By default it also binds and displays the values of some
+     remote-related Git variables and allows changing their values.
+
+ -- User Option: magit-remote-direct-configure
+     This option controls whether remote-related Git variables are
+     accessible directly from the transient ‘magit-remote’.
+
+     If ‘t’ (the default) and a local branch is checked out, then
+     ‘magit-remote’ features the variables for the upstream remote of
+     that branch, or if ‘HEAD’ is detached, for ‘origin’, provided that
+     exists.
+
+     If ‘nil’, then ‘magit-remote-configure’ has to be used to do so.
+
+‘M C’ (‘magit-remote-configure’)
+     This transient prefix command binds commands that set the value of
+     remote-related variables and displays them in a temporary buffer
+     until the transient is exited.
+
+     With a prefix argument, this command always prompts for a remote.
+
+     Without a prefix argument this depends on whether it was invoked as
+     a suffix of ‘magit-remote’ and on the
+     ‘magit-remote-direct-configure’ option.  If ‘magit-remote’ already
+     displays the variables for the upstream, then it does not make
+     sense to invoke another transient that displays them for the same
+     remote.  In that case this command prompts for a remote.
+
+   The variables are described in *note Remote Git Variables::.
+
+‘M a’ (‘magit-remote-add’)
+     This command add a remote and fetches it.  The remote name and url
+     are read in the minibuffer.
+
+‘M r’ (‘magit-remote-rename’)
+     This command renames a remote.  Both the old and the new names are
+     read in the minibuffer.
+
+‘M u’ (‘magit-remote-set-url’)
+     This command changes the url of a remote.  Both the remote and the
+     new url are read in the minibuffer.
+
+‘M k’ (‘magit-remote-remove’)
+     This command deletes a remote, read in the minibuffer.
+
+‘M p’ (‘magit-remote-prune’)
+     This command removes stale remote-tracking branches for a remote
+     read in the minibuffer.
+
+‘M P’ (‘magit-remote-prune-refspecs’)
+     This command removes stale refspecs for a remote read in the
+     minibuffer.
+
+     A refspec is stale if there no longer exists at least one branch on
+     the remote that would be fetched due to that refspec.  A stale
+     refspec is problematic because its existence causes Git to refuse
+     to fetch according to the remaining non-stale refspecs.
+
+     If only stale refspecs remain, then this command offers to either
+     delete the remote or to replace the stale refspecs with the default
+     refspec ("+refs/heads/*:refs/remotes/REMOTE/*").
+
+     This command also removes the remote-tracking branches that were
+     created due to the now stale refspecs.  Other stale branches are
+     not removed.
+
+ -- User Option: magit-remote-add-set-remote.pushDefault
+     This option controls whether the user is asked whether they want to
+     set ‘remote.pushDefault’ after adding a remote.
+
+     If ‘ask’, then users is always ask.  If ‘ask-if-unset’, then the
+     user is only if the variable isn’t set already.  If ‘nil’, then the
+     user isn’t asked and the variable isn’t set.  If the value is a
+     string, then the variable is set without the user being asked,
+     provided that the name of the added remote is equal to that string
+     and the variable isn’t already set.
+
+
+File: magit.info,  Node: Remote Git Variables,  Prev: Remote Commands,  Up: Remotes
+
+7.1.2 Remote Git Variables
+--------------------------
+
+These variables can be set from the transient prefix command
+‘magit-remote-configure’.  By default they can also be set from
+‘magit-remote’.  See *note Remote Commands::.
+
+ -- Variable: remote.NAME.url
+     This variable specifies the url of the remote named NAME.  It can
+     have multiple values.
+
+ -- Variable: remote.NAME.fetch
+     The refspec used when fetching from the remote named NAME.  It can
+     have multiple values.
+
+ -- Variable: remote.NAME.pushurl
+     This variable specifies the url used for pushing to the remote
+     named NAME.  If it is not specified, then ‘remote.NAME.url’ is used
+     instead.  It can have multiple values.
+
+ -- Variable: remote.NAME.push
+     The refspec used when pushing to the remote named NAME.  It can
+     have multiple values.
+
+ -- Variable: remote.NAME.tagOpts
+     This variable specifies what tags are fetched by default.  If the
+     value is ‘--no-tags’ then no tags are fetched.  If the value is
+     ‘--tags’, then all tags are fetched.  If this variable has no
+     value, then only tags are fetched that are reachable from fetched
+     branches.
+
+
+File: magit.info,  Node: Fetching,  Next: Pulling,  Prev: Remotes,  Up: Transferring
+
+7.2 Fetching
+============
+
+Also see *note (gitman)git-fetch::.  For information about the upstream
+and the push-remote, see *note The Two Remotes::.
+
+‘f’ (‘magit-fetch’)
+     This transient prefix command binds the following suffix commands
+     along with the appropriate infix arguments and displays them in a
+     temporary buffer until a suffix is invoked.
+
+‘f p’ (‘magit-fetch-from-pushremote’)
+     This command fetches from the current push-remote.
+
+     With a prefix argument or when the push-remote is either not
+     configured or unusable, then let the user first configure the
+     push-remote.
+
+‘f u’ (‘magit-fetch-from-upstream’)
+     This command fetch from the upstream of the current branch.
+
+     If the upstream is configured for the current branch and names an
+     existing remote, then use that.  Otherwise try to use another
+     remote: If only a single remote is configured, then use that.
+     Otherwise if a remote named "origin" exists, then use that.
+
+     If no remote can be determined, then this command is not available
+     from the ‘magit-fetch’ transient prefix and invoking it directly
+     results in an error.
+
+‘f e’ (‘magit-fetch-other’)
+     This command fetch from a repository read from the minibuffer.
+
+‘f o’ (‘magit-fetch-branch’)
+     This command fetches a branch from a remote, both of which are read
+     from the minibuffer.
+
+‘f r’ (‘magit-fetch-refspec’)
+     This command fetches from a remote using an explicit refspec, both
+     of which are read from the minibuffer.
+
+‘f a’ (‘magit-fetch-all’)
+     This command fetches from all remotes.
+
+‘f m’ (‘magit-fetch-modules’)
+     This command fetches all submodules.  With a prefix argument, it
+     acts as a transient prefix command, allowing the caller to set
+     options.
+
+ -- User Option: magit-pull-or-fetch
+     By default fetch and pull commands are available from separate
+     transient prefix command.  Setting this to ‘t’ adds some (but not
+     all) of the above suffix commands to the ‘magit-pull’ transient.
+
+     If you do that, then you might also want to change the key binding
+     for these prefix commands, e.g.:
+
+          (setq magit-pull-or-fetch t)
+          (define-key magit-mode-map "f" 'magit-pull) ; was magit-fetch
+          (define-key magit-mode-map "F" nil)         ; was magit-pull
+
+
+File: magit.info,  Node: Pulling,  Next: Pushing,  Prev: Fetching,  Up: Transferring
+
+7.3 Pulling
+===========
+
+Also see *note (gitman)git-pull::.  For information about the upstream
+and the push-remote, see *note The Two Remotes::.
+
+‘F’ (‘magit-pull’)
+     This transient prefix command binds the following suffix commands
+     and displays them in a temporary buffer until a suffix is invoked.
+
+‘F p’ (‘magit-pull-from-pushremote’)
+     This command pulls from the push-remote of the current branch.
+
+     With a prefix argument or when the push-remote is either not
+     configured or unusable, then let the user first configure the
+     push-remote.
+
+‘F u’ (‘magit-pull-from-upstream’)
+     This command pulls from the upstream of the current branch.
+
+     With a prefix argument or when the upstream is either not
+     configured or unusable, then let the user first configure the
+     upstream.
+
+‘F e’ (‘magit-pull-branch’)
+     This command pulls from a branch read in the minibuffer.
+
+
+File: magit.info,  Node: Pushing,  Next: Plain Patches,  Prev: Pulling,  Up: Transferring
+
+7.4 Pushing
+===========
+
+Also see *note (gitman)git-push::.  For information about the upstream
+and the push-remote, see *note The Two Remotes::.
+
+‘P’ (‘magit-push’)
+     This transient prefix command binds the following suffix commands
+     along with the appropriate infix arguments and displays them in a
+     temporary buffer until a suffix is invoked.
+
+‘P p’ (‘magit-push-current-to-pushremote’)
+     This command pushes the current branch to its push-remote.
+
+     With a prefix argument or when the push-remote is either not
+     configured or unusable, then let the user first configure the
+     push-remote.
+
+‘P u’ (‘magit-push-current-to-upstream’)
+     This command pushes the current branch to its upstream branch.
+
+     With a prefix argument or when the upstream is either not
+     configured or unusable, then let the user first configure the
+     upstream.
+
+‘P e’ (‘magit-push-current’)
+     This command pushes the current branch to a branch read in the
+     minibuffer.
+
+‘P o’ (‘magit-push-other’)
+     This command pushes an arbitrary branch or commit somewhere.  Both
+     the source and the target are read in the minibuffer.
+
+‘P r’ (‘magit-push-refspecs’)
+     This command pushes one or multiple refspecs to a remote, both of
+     which are read in the minibuffer.
+
+     To use multiple refspecs, separate them with commas.  Completion is
+     only available for the part before the colon, or when no colon is
+     used.
+
+‘P m’ (‘magit-push-matching’)
+     This command pushes all matching branches to another repository.
+
+     If only one remote exists, then push to that.  Otherwise prompt for
+     a remote, offering the remote configured for the current branch as
+     default.
+
+‘P t’ (‘magit-push-tags’)
+     This command pushes all tags to another repository.
+
+     If only one remote exists, then push to that.  Otherwise prompt for
+     a remote, offering the remote configured for the current branch as
+     default.
+
+‘P T’ (‘magit-push-tag’)
+     This command pushes a tag to another repository.
+
+   One of the infix arguments, ‘--force-with-lease’, deserves a word of
+caution.  It is passed without a value, which means "permit a force push
+as long as the remote-tracking branches match their counterparts on the
+remote end".  If you’ve set up a tool to do automatic fetches (Magit
+itself does not provide such functionality), using ‘--force-with-lease’
+can be dangerous because you don’t actually control or know the state of
+the remote-tracking refs.  In that case, you should consider setting
+‘push.useForceIfIncludes’ to ‘true’ (available since Git 2.30).
+
+   Two more push commands exist, which by default are not available from
+the push transient.  See their doc-strings for instructions on how to
+add them to the transient.
+
+ -- Command: magit-push-implicitly args
+     This command pushes somewhere without using an explicit refspec.
+
+     This command simply runs ‘git push -v [ARGS]’.  ARGS are the infix
+     arguments.  No explicit refspec arguments are used.  Instead the
+     behavior depends on at least these Git variables: ‘push.default’,
+     ‘remote.pushDefault’, ‘branch.<branch>.pushRemote’,
+     ‘branch.<branch>.remote’, ‘branch.<branch>.merge’, and
+     ‘remote.<remote>.push’.
+
+     If you add this suffix to a transient prefix without explicitly
+     specifying the description, then an attempt is made to predict what
+     this command will do.  For example:
+
+          (transient-insert-suffix 'magit-push \"p\"
+            '(\"i\" magit-push-implicitly))"
+
+ -- Command: magit-push-to-remote remote args
+     This command pushes to the remote REMOTE without using an explicit
+     refspec.  The remote is read in the minibuffer.
+
+     This command simply runs ‘git push -v [ARGS] REMOTE’.  ARGS are the
+     infix arguments.  No refspec arguments are used.  Instead the
+     behavior depends on at least these Git variables: ‘push.default’,
+     ‘remote.pushDefault’, ‘branch.<branch>.pushRemote’,
+     ‘branch.<branch>.remote’, ‘branch.<branch>.merge’, and
+     ‘remote.<remote>.push’.
+
+
+File: magit.info,  Node: Plain Patches,  Next: Maildir Patches,  Prev: Pushing,  Up: Transferring
+
+7.5 Plain Patches
+=================
+
+‘W’ (‘magit-patch’)
+     This transient prefix command binds the following suffix commands
+     along with the appropriate infix arguments and displays them in a
+     temporary buffer until a suffix is invoked.
+
+‘W c’ (‘magit-patch-create’)
+     This command creates patches for a set commits.  If the region
+     marks several commits, then it creates patches for all of them.
+     Otherwise it functions as a transient prefix command, which
+     features several infix arguments and binds itself as a suffix
+     command.  When this command is invoked as a suffix of itself, then
+     it creates a patch using the specified infix arguments.
+
+‘w a’ (‘magit-patch-apply’)
+     This command applies a patch.  This is a transient prefix command,
+     which features several infix arguments and binds itself as a suffix
+     command.  When this command is invoked as a suffix of itself, then
+     it applies a patch using the specified infix arguments.
+
+‘W s’ (‘magit-patch-save’)
+     This command creates a patch from the current diff.
+
+     Inside ‘magit-diff-mode’ or ‘magit-revision-mode’ buffers, ‘C-x
+     C-w’ is also bound to this command.
+
+   It is also possible to save a plain patch file by using ‘C-x C-w’
+inside a ‘magit-diff-mode’ or ‘magit-revision-mode’ buffer.
+
+
+File: magit.info,  Node: Maildir Patches,  Prev: Plain Patches,  Up: Transferring
+
+7.6 Maildir Patches
+===================
+
+Also see *note (gitman)git-am::.  and *note (gitman)git-apply::.
+
+‘w’ (‘magit-am’)
+     This transient prefix command binds the following suffix commands
+     along with the appropriate infix arguments and displays them in a
+     temporary buffer until a suffix is invoked.
+
+‘w w’ (‘magit-am-apply-patches’)
+     This command applies one or more patches.  If the region marks
+     files, then those are applied as patches.  Otherwise this command
+     reads a file-name in the minibuffer, defaulting to the file at
+     point.
+
+‘w m’ (‘magit-am-apply-maildir’)
+     This command applies patches from a maildir.
+
+‘w a’ (‘magit-patch-apply’)
+     This command applies a plain patch.  For a longer description see
+     *note Plain Patches::.  This command is only available from the
+     ‘magit-am’ transient for historic reasons.
+
+   When an "am" operation is in progress, then the transient instead
+features the following suffix commands.
+
+‘w w’ (‘magit-am-continue’)
+     This command resumes the current patch applying sequence.
+
+‘w s’ (‘magit-am-skip’)
+     This command skips the stopped at patch during a patch applying
+     sequence.
+
+‘w a’ (‘magit-am-abort’)
+     This command aborts the current patch applying sequence.  This
+     discards all changes made since the sequence started.
+
+
+File: magit.info,  Node: Miscellaneous,  Next: Customizing,  Prev: Transferring,  Up: Top
+
+8 Miscellaneous
+***************
+
+* Menu:
+
+* Tagging::
+* Notes::
+* Submodules::
+* Subtree::
+* Worktree::
+* Sparse checkouts::
+* Bundle::
+* Common Commands::
+* Wip Modes::
+* Commands for Buffers Visiting Files::
+* Minor Mode for Buffers Visiting Blobs::
+
+
+File: magit.info,  Node: Tagging,  Next: Notes,  Up: Miscellaneous
+
+8.1 Tagging
+===========
+
+Also see *note (gitman)git-tag::.
+
+‘t’ (‘magit-tag’)
+     This transient prefix command binds the following suffix commands
+     along with the appropriate infix arguments and displays them in a
+     temporary buffer until a suffix is invoked.
+
+‘t t’ (‘magit-tag-create’)
+     This command creates a new tag with the given NAME at REV.  With a
+     prefix argument it creates an annotated tag.
+
+‘t r’ (‘magit-tag-release’)
+     This commands creates a release tag.  It assumes that release tags
+     match ‘magit-release-tag-regexp’.
+
+     First it prompts for the name of the new tag using the highest
+     existing tag as initial input and leaving it to the user to
+     increment the desired part of the version string.  If you use
+     unconventional release tags or version numbers (e.g.,
+     ‘v1.2.3-custom.1’), you can set the ‘magit-release-tag-regexp’ and
+     ‘magit-tag-version-regexp-alist’ variables.
+
+     If ‘--annotate’ is enabled then it prompts for the message of the
+     new tag.  The proposed tag message is based on the message of the
+     highest tag, provided that that contains the corresponding version
+     string and substituting the new version string for that.  Otherwise
+     it proposes something like "Foo-Bar 1.2.3", given, for example, a
+     TAG "v1.2.3" and a repository located at something like
+     "/path/to/foo-bar".
+
+‘t k’ (‘magit-tag-delete’)
+     This command deletes one or more tags.  If the region marks
+     multiple tags (and nothing else), then it offers to delete those.
+     Otherwise, it prompts for a single tag to be deleted, defaulting to
+     the tag at point.
+
+‘t p’ (‘magit-tag-prune’)
+     This command offers to delete tags missing locally from REMOTE, and
+     vice versa.
+
+
+File: magit.info,  Node: Notes,  Next: Submodules,  Prev: Tagging,  Up: Miscellaneous
+
+8.2 Notes
+=========
+
+Also see *note (gitman)git-notes::.
+
+‘T’ (‘magit-notes’)
+     This transient prefix command binds the following suffix commands
+     along with the appropriate infix arguments and displays them in a
+     temporary buffer until a suffix is invoked.
+
+‘T T’ (‘magit-notes-edit’)
+     Edit the note attached to a commit, defaulting to the commit at
+     point.
+
+     By default use the value of Git variable ‘core.notesRef’ or
+     "refs/notes/commits" if that is undefined.
+
+‘T r’ (‘magit-notes-remove’)
+     Remove the note attached to a commit, defaulting to the commit at
+     point.
+
+     By default use the value of Git variable ‘core.notesRef’ or
+     "refs/notes/commits" if that is undefined.
+
+‘T p’ (‘magit-notes-prune’)
+     Remove notes about unreachable commits.
+
+   It is possible to merge one note ref into another.  That may result
+in conflicts which have to resolved in the temporary worktree
+".git/NOTES_MERGE_WORKTREE".
+
+‘T m’ (‘magit-notes-merge’)
+     Merge the notes of a ref read from the user into the current notes
+     ref.  The current notes ref is the value of Git variable
+     ‘core.notesRef’ or "refs/notes/commits" if that is undefined.
+
+   When a notes merge is in progress then the transient features the
+following suffix commands, instead of those listed above.
+
+‘T c’ (‘magit-notes-merge-commit’)
+     Commit the current notes ref merge, after manually resolving
+     conflicts.
+
+‘T a’ (‘magit-notes-merge-abort’)
+     Abort the current notes ref merge.
+
+   The following variables control what notes reference ‘magit-notes-*’,
+‘git notes’ and ‘git show’ act on and display.  Both the local and
+global values are displayed and can be modified.
+
+ -- Variable: core.notesRef
+     This variable specifies the notes ref that is displayed by default
+     and which commands act on by default.
+
+ -- Variable: notes.displayRef
+     This variable specifies additional notes ref to be displayed in
+     addition to the ref specified by ‘core.notesRef’.  It can have
+     multiple values and may end with ‘*’ to display all refs in the
+     ‘refs/notes/’ namespace (or ‘**’ if some names contain slashes).
+
+
+File: magit.info,  Node: Submodules,  Next: Subtree,  Prev: Notes,  Up: Miscellaneous
+
+8.3 Submodules
+==============
+
+Also see *note (gitman)git-submodule::.
+
+* Menu:
+
+* Listing Submodules::
+* Submodule Transient::
+
+
+File: magit.info,  Node: Listing Submodules,  Next: Submodule Transient,  Up: Submodules
+
+8.3.1 Listing Submodules
+------------------------
+
+The command ‘magit-list-submodules’ displays a list of the current
+repository’s submodules in a separate buffer.  It’s also possible to
+display information about submodules directly in the status buffer of
+the super-repository by adding ‘magit-insert-modules’ to the hook
+‘magit-status-sections-hook’ as described in *note Status Module
+Sections::.
+
+ -- Command: magit-list-submodules
+     This command displays a list of the current repository’s populated
+     submodules in a separate buffer.
+
+     It can be invoked by pressing ‘RET’ on the section titled
+     "Modules".
+
+ -- User Option: magit-submodule-list-columns
+     This option controls what columns are displayed by the command
+     ‘magit-list-submodules’ and how they are displayed.
+
+     Each element has the form ‘(HEADER WIDTH FORMAT PROPS)’.
+
+     HEADER is the string displayed in the header.  WIDTH is the width
+     of the column.  FORMAT is a function that is called with one
+     argument, the repository identification (usually its basename), and
+     with ‘default-directory’ bound to the toplevel of its working tree.
+     It has to return a string to be inserted or nil.  PROPS is an alist
+     that supports the keys ‘:right-align’, ‘:pad-right’ and ‘:sort’.
+
+     The ‘:sort’ function has a weird interface described in the
+     docstring of ‘tabulated-list--get-sort’.  Alternatively ‘<’ and
+     ‘magit-repolist-version<’ can be used as those functions are
+     automatically replaced with functions that satisfy the interface.
+     Set ‘:sort’ to ‘nil’ to inhibit sorting; if unspecified, then the
+     column is sortable using the default sorter.
+
+     You may wish to display a range of numeric columns using just one
+     character per column and without any padding between columns, in
+     which case you should use an appropriate HEADER, set WIDTH to 1,
+     and set ‘:pad-right’ to 9.  ‘+’ is substituted for numbers higher
+     than 9.
+
+
+File: magit.info,  Node: Submodule Transient,  Prev: Listing Submodules,  Up: Submodules
+
+8.3.2 Submodule Transient
+-------------------------
+
+‘o’ (‘magit-submodule’)
+     This transient prefix command binds the following suffix commands
+     along with the appropriate infix arguments and displays them in a
+     temporary buffer until a suffix is invoked.
+
+   Some of the below commands default to act on the modules that are
+selected using the region.  For brevity their description talk about
+"the selected modules", but if no modules are selected, then they act on
+the current module instead, or if point isn’t on a module, then the read
+a single module to act on.  With a prefix argument these commands ignore
+the selection and the current module and instead act on all suitable
+modules.
+
+‘o a’ (‘magit-submodule-add’)
+     This commands adds the repository at URL as a module.  Optional
+     PATH is the path to the module relative to the root of the
+     super-project.  If it is nil then the path is determined based on
+     URL.
+
+‘o r’ (‘magit-submodule-register’)
+     This command registers the selected modules by copying their urls
+     from ".gitmodules" to "$GIT_DIR/config".  These values can then be
+     edited before running ‘magit-submodule-populate’.  If you don’t
+     need to edit any urls, then use the latter directly.
+
+‘o p’ (‘magit-submodule-populate’)
+     This command creates the working directory or directories of the
+     selected modules, checking out the recorded commits.
+
+‘o u’ (‘magit-submodule-update’)
+     This command updates the selected modules checking out the recorded
+     commits.
+
+‘o s’ (‘magit-submodule-synchronize’)
+     This command synchronizes the urls of the selected modules, copying
+     the values from ".gitmodules" to the ".git/config" of the
+     super-project as well those of the modules.
+
+‘o d’ (‘magit-submodule-unpopulate’)
+     This command removes the working directory of the selected modules.
+
+‘o l’ (‘magit-list-submodules’)
+     This command displays a list of the current repository’s modules.
+
+‘o f’ (‘magit-fetch-modules’)
+     This command fetches all populated modules.  With a prefix
+     argument, it acts as a transient prefix command, allowing the
+     caller to set options.
+
+     Also fetch the super-repository, because ‘git fetch’ does not
+     support not doing that.
+
+
+File: magit.info,  Node: Subtree,  Next: Worktree,  Prev: Submodules,  Up: Miscellaneous
+
+8.4 Subtree
+===========
+
+Also see *note (gitman)git-subtree::.
+
+‘O’ (‘magit-subtree’)
+     This transient prefix command binds the two sub-transients; one for
+     importing a subtree and one for exporting a subtree.
+
+‘O i’ (‘magit-subtree-import’)
+     This transient prefix command binds the following suffix commands
+     along with the appropriate infix arguments and displays them in a
+     temporary buffer until a suffix is invoked.
+
+     The suffixes of this command import subtrees.
+
+     If the ‘--prefix’ argument is set, then the suffix commands use
+     that prefix without prompting the user.  If it is unset, then they
+     read the prefix in the minibuffer.
+
+‘O i a’ (‘magit-subtree-add’)
+     This command adds COMMIT from REPOSITORY as a new subtree at
+     PREFIX.
+
+‘O i c’ (‘magit-subtree-add-commit’)
+     This command add COMMIT as a new subtree at PREFIX.
+
+‘O i m’ (‘magit-subtree-merge’)
+     This command merges COMMIT into the PREFIX subtree.
+
+‘O i f’ (‘magit-subtree-pull’)
+     This command pulls COMMIT from REPOSITORY into the PREFIX subtree.
+
+‘O e’ (‘magit-subtree-export’)
+     This transient prefix command binds the following suffix commands
+     along with the appropriate infix arguments and displays them in a
+     temporary buffer until a suffix is invoked.
+
+     The suffixes of this command export subtrees.
+
+     If the ‘--prefix’ argument is set, then the suffix commands use
+     that prefix without prompting the user.  If it is unset, then they
+     read the prefix in the minibuffer.
+
+‘O e p’ (‘magit-subtree-push’)
+     This command extract the history of the subtree PREFIX and pushes
+     it to REF on REPOSITORY.
+
+‘O e s’ (‘magit-subtree-split’)
+     This command extracts the history of the subtree PREFIX.
+
+
+File: magit.info,  Node: Worktree,  Next: Sparse checkouts,  Prev: Subtree,  Up: Miscellaneous
+
+8.5 Worktree
+============
+
+Also see *note (gitman)git-worktree::.
+
+‘Z’ (‘magit-worktree’)
+     This transient prefix command binds the following suffix commands
+     and displays them in a temporary buffer until a suffix is invoked.
+
+‘Z b’ (‘magit-worktree-checkout’)
+     Checkout BRANCH in a new worktree at PATH.
+
+‘Z c’ (‘magit-worktree-branch’)
+     Create a new BRANCH and check it out in a new worktree at PATH.
+
+‘Z m’ (‘magit-worktree-move’)
+     Move an existing worktree to a new PATH.
+
+‘Z k’ (‘magit-worktree-delete’)
+     Delete a worktree, defaulting to the worktree at point.  The
+     primary worktree cannot be deleted.
+
+‘Z g’ (‘magit-worktree-status’)
+     Show the status for the worktree at point.
+
+     If there is no worktree at point, then read one in the minibuffer.
+     If the worktree at point is the one whose status is already being
+     displayed in the current buffer, then show it in Dired instead.
+
+
+File: magit.info,  Node: Sparse checkouts,  Next: Bundle,  Prev: Worktree,  Up: Miscellaneous
+
+8.6 Sparse checkouts
+====================
+
+Sparse checkouts provide a way to restrict the working tree to a subset
+of directories.  See *note (gitman)git-sparse-checkout::.
+
+   *Warning*: Git introduced the ‘git sparse-checkout’ command in
+version 2.25 and still advertises it as experimental and subject to
+change.  Magit’s interface should be considered the same.  In
+particular, if Git introduces a backward incompatible change, Magit’s
+sparse checkout functionality may be updated in a way that requires a
+more recent Git version.
+
+‘>’ (‘magit-sparse-checkout’)
+     This transient prefix command binds the following suffix commands
+     and displays them in a temporary buffer until a suffix is invoked.
+
+‘> e’ (‘magit-sparse-checkout-enable’)
+     This command initializes a sparse checkout that includes only the
+     files in the top-level directory.
+
+     Note that ‘magit-sparse-checkout-set’ and
+     ‘magit-sparse-checkout-add’ automatically initialize a sparse
+     checkout if necessary.  However, you may want to call
+     ‘magit-sparse-checkout-enable’ explicitly to re-initialize a sparse
+     checkout after calling ‘magit-sparse-checkout-disable’, to pass
+     additional arguments to ‘git sparse-checkout init’, or to execute
+     the initialization asynchronously.
+
+‘> s’ (‘magit-sparse-checkout-set’)
+     This command takes a list of directories and configures the sparse
+     checkout to include only files in those subdirectories.  Any
+     previously included directories are excluded unless they are in the
+     provided list of directories.
+
+‘> a’ (‘magit-sparse-checkout-add’)
+     This command is like ‘magit-sparse-checkout-set’, but instead adds
+     the specified list of directories to the set of directories that is
+     already included in the sparse checkout.
+
+‘> r’ (‘magit-sparse-checkout-reapply’)
+     This command applies the currently configured sparse checkout
+     patterns to the working tree.  This is useful to call if excluded
+     files have been checked out after operations such as merging or
+     rebasing.
+
+‘> d’ (‘magit-sparse-checkout-disable’)
+     This command restores the full checkout.  To return to the previous
+     sparse checkout, call ‘magit-sparse-checkout-enable’.
+
+   A sparse checkout can also be initiated when cloning a repository by
+using the ‘magit-clone-sparse’ command in the ‘magit-clone’ transient
+(see *note Cloning Repository::).
+
+   If you want the status buffer to indicate when a sparse checkout is
+enabled, add the function ‘magit-sparse-checkout-insert-header’ to
+‘magit-status-headers-hook’.
+
+
+File: magit.info,  Node: Bundle,  Next: Common Commands,  Prev: Sparse checkouts,  Up: Miscellaneous
+
+8.7 Bundle
+==========
+
+Also see *note (gitman)git-bundle::.
+
+ -- Command: magit-bundle
+     This transient prefix command binds several suffix commands for
+     running ‘git bundle’ subcommands and displays them in a temporary
+     buffer until a suffix is invoked.
+
+
+File: magit.info,  Node: Common Commands,  Next: Wip Modes,  Prev: Bundle,  Up: Miscellaneous
+
+8.8 Common Commands
+===================
+
+ -- Command: magit-switch-to-repository-buffer
+ -- Command: magit-switch-to-repository-buffer-other-window
+ -- Command: magit-switch-to-repository-buffer-other-frame
+ -- Command: magit-display-repository-buffer
+     These commands read any existing Magit buffer that belongs to the
+     current repository from the user and then switch to the selected
+     buffer (without refreshing it).
+
+     The last variant uses ‘magit-display-buffer’ to do so and thus
+     respects ‘magit-display-buffer-function’.
+
+   These are some of the commands that can be used in all buffers whose
+major-modes derive from ‘magit-mode’.  There are other common commands
+beside the ones below, but these didn’t fit well anywhere else.
+
+‘C-w’ (‘magit-copy-section-value’)
+     This command saves the value of the current section to the
+     ‘kill-ring’, and, provided that the current section is a commit,
+     branch, or tag section, it also pushes the (referenced) revision to
+     the ‘magit-revision-stack’.
+
+     When the current section is a branch or a tag, and a prefix
+     argument is used, then it saves the revision at its tip to the
+     ‘kill-ring’ instead of the reference name.
+
+     When the region is active, this command saves that to the
+     ‘kill-ring’, like ‘kill-ring-save’ would, instead of behaving as
+     described above.  If a prefix argument is used and the region is
+     within a hunk, then it strips the diff marker column and keeps only
+     either the added or removed lines, depending on the sign of the
+     prefix argument.
+
+‘M-w’ (‘magit-copy-buffer-revision’)
+     This command saves the revision being displayed in the current
+     buffer to the ‘kill-ring’ and also pushes it to the
+     ‘magit-revision-stack’.  It is mainly intended for use in
+     ‘magit-revision-mode’ buffers, the only buffers where it is always
+     unambiguous exactly which revision should be saved.
+
+     Most other Magit buffers usually show more than one revision, in
+     some way or another, so this command has to select one of them, and
+     that choice might not always be the one you think would have been
+     the best pick.
+
+   Outside of Magit ‘M-w’ and ‘C-w’ are usually bound to
+‘kill-ring-save’ and ‘kill-region’, and these commands would also be
+useful in Magit buffers.  Therefore when the region is active, then both
+of these commands behave like ‘kill-ring-save’ instead of as described
+above.
+
+
+File: magit.info,  Node: Wip Modes,  Next: Commands for Buffers Visiting Files,  Prev: Common Commands,  Up: Miscellaneous
+
+8.9 Wip Modes
+=============
+
+Git keeps *committed* changes around long enough for users to recover
+changes they have accidentally deleted.  It does so by not garbage
+collecting any committed but no longer referenced objects for a certain
+period of time, by default 30 days.
+
+   But Git does *not* keep track of *uncommitted* changes in the working
+tree and not even the index (the staging area).  Because Magit makes it
+so convenient to modify uncommitted changes, it also makes it easy to
+shoot yourself in the foot in the process.
+
+   For that reason Magit provides a global mode that saves *tracked*
+files to work-in-progress references after or before certain actions.
+(At present untracked files are never saved and for technical reasons
+nothing is saved before the first commit has been created).
+
+   Two separate work-in-progress references are used to track the state
+of the index and of the working tree: ‘refs/wip/index/<branchref>’ and
+‘refs/wip/wtree/<branchref>’, where ‘<branchref>’ is the full ref of the
+current branch, e.g., ‘refs/heads/master’.  When the ‘HEAD’ is detached
+then ‘HEAD’ is used in place of ‘<branchref>’.
+
+   Checking out another branch (or detaching ‘HEAD’) causes the use of
+different wip refs for subsequent changes.
+
+ -- User Option: magit-wip-mode
+     When this mode is enabled, then uncommitted changes are committed
+     to dedicated work-in-progress refs whenever appropriate (i.e., when
+     dataloss would be a possibility otherwise).
+
+     Setting this variable directly does not take effect; either use the
+     Custom interface to do so or call the respective mode function.
+
+     For historic reasons this mode is implemented on top of four other
+     ‘magit-wip-*’ modes, which can also be used individually, if you
+     want finer control over when the wip refs are updated; but that is
+     discouraged.  See *note Legacy Wip Modes::.
+
+   To view the log for a branch and its wip refs use the commands
+‘magit-wip-log’ and ‘magit-wip-log-current’.  You should use ‘--graph’
+when using these commands.
+
+ -- Command: magit-wip-log
+     This command shows the log for a branch and its wip refs.  With a
+     negative prefix argument only the worktree wip ref is shown.
+
+     The absolute numeric value of the prefix argument controls how many
+     "branches" of each wip ref are shown.  This is only relevant if the
+     value of ‘magit-wip-merge-branch’ is ‘nil’.
+
+ -- Command: magit-wip-log-current
+     This command shows the log for the current branch and its wip refs.
+     With a negative prefix argument only the worktree wip ref is shown.
+
+     The absolute numeric value of the prefix argument controls how many
+     "branches" of each wip ref are shown.  This is only relevant if the
+     value of ‘magit-wip-merge-branch’ is ‘nil’.
+
+‘X w’ (‘magit-reset-worktree’)
+     This command resets the working tree to some commit read from the
+     user and defaulting to the commit at point, while keeping the
+     ‘HEAD’ and index as-is.
+
+     This can be used to restore files to the state committed to a wip
+     ref.  Note that this will discard any unstaged changes that might
+     have existed before invoking this command (but of course only after
+     committing that to the working tree wip ref).
+
+   Note that even if you enable ‘magit-wip-mode’ this won’t give you
+perfect protection.  The most likely scenario for losing changes despite
+the use of ‘magit-wip-mode’ is making a change outside Emacs and then
+destroying it also outside Emacs.  In some such a scenario, Magit, being
+an Emacs package, didn’t get the opportunity to keep you from shooting
+yourself in the foot.
+
+   When you are unsure whether Magit did commit a change to the wip
+refs, then you can explicitly request that all changes to all tracked
+files are being committed.
+
+‘M-x magit-wip-commit’
+     This command commits all changes to all tracked files to the index
+     and working tree work-in-progress refs.  Like the modes described
+     above, it does not commit untracked files, but it does check all
+     tracked files for changes.  Use this command when you suspect that
+     the modes might have overlooked a change made outside Emacs/Magit.
+
+ -- User Option: magit-wip-namespace
+     The namespace used for work-in-progress refs.  It has to end with a
+     slash.  The wip refs are named ‘<namespace>index/<branchref>’ and
+     ‘<namespace>wtree/<branchref>’.  When snapshots are created while
+     the ‘HEAD’ is detached then ‘HEAD’ is used in place of
+     ‘<branchref>’.
+
+ -- User Option: magit-wip-mode-lighter
+     Mode-line lighter for ‘magit-wip--mode’.
+
+* Menu:
+
+* Wip Graph::
+* Legacy Wip Modes::
+
+
+File: magit.info,  Node: Wip Graph,  Next: Legacy Wip Modes,  Up: Wip Modes
+
+8.9.1 Wip Graph
+---------------
+
+ -- User Option: magit-wip-merge-branch
+     This option controls whether the current branch is merged into the
+     wip refs after a new commit was created on the branch.
+
+     If non-nil and the current branch has new commits, then it is
+     merged into the wip ref before creating a new wip commit.  This
+     makes it easier to inspect wip history and the wip commits are
+     never garbage collected.
+
+     If nil and the current branch has new commits, then the wip ref is
+     reset to the tip of the branch before creating a new wip commit.
+     With this setting wip commits are eventually garbage collected.
+
+   When ‘magit-wip-merge-branch’ is ‘t’, then the history looks like
+this:
+
+       *--*--*--*--*--*       refs/wip/index/refs/heads/master
+      /     /     /
+     A-----B-----C            refs/heads/master
+
+   When ‘magit-wip-merge-branch’ is ‘nil’, then creating a commit on the
+real branch and then making a change causes the wip refs to be recreated
+to fork from the new commit.  But the old commits on the wip refs are
+not lost.  They are still available from the reflog.  To make it easier
+to see when the fork point of a wip ref was changed, an additional
+commit with the message "restart autosaving" is created on it (‘xxO’
+commits below are such boundary commits).
+
+   Starting with
+
+           BI0---BI1    refs/wip/index/refs/heads/master
+          /
+     A---B              refs/heads/master
+          \
+           BW0---BW1    refs/wip/wtree/refs/heads/master
+
+   and committing the staged changes and editing and saving a file would
+result in
+
+           BI0---BI1        refs/wip/index/refs/heads/master
+          /
+     A---B---C              refs/heads/master
+          \   \
+           \   CW0---CW1    refs/wip/wtree/refs/heads/master
+            \
+             BW0---BW1      refs/wip/wtree/refs/heads/master@{2}
+
+   The fork-point of the index wip ref is not changed until some change
+is being staged.  Likewise just checking out a branch or creating a
+commit does not change the fork-point of the working tree wip ref.  The
+fork-points are not adjusted until there actually is a change that
+should be committed to the respective wip ref.
+
+
+File: magit.info,  Node: Legacy Wip Modes,  Prev: Wip Graph,  Up: Wip Modes
+
+8.9.2 Legacy Wip Modes
+----------------------
+
+It is recommended that you use the mode ‘magit-wip-mode’ (which see) and
+ignore the existence of the following modes, which are preserved for
+historic reasons.
+
+   Setting the following variables directly does not take effect; either
+use the Custom interface to do so or call the respective mode functions.
+
+ -- User Option: magit-wip-after-save-mode
+     When this mode is enabled, then saving a buffer that visits a file
+     tracked in a Git repository causes its current state to be
+     committed to the working tree wip ref for the current branch.
+
+ -- User Option: magit-wip-after-apply-mode
+     When this mode is enabled, then applying (i.e., staging, unstaging,
+     discarding, reversing, and regularly applying) a change to a file
+     tracked in a Git repository causes its current state to be
+     committed to the index and/or working tree wip refs for the current
+     branch.
+
+   If you only ever edit files using Emacs and only ever interact with
+Git using Magit, then the above two modes should be enough to protect
+each and every change from accidental loss.  In practice nobody does
+that.  Two additional modes exists that do commit to the wip refs before
+making changes that could cause the loss of earlier changes.
+
+ -- User Option: magit-wip-before-change-mode
+     When this mode is enabled, then certain commands commit the
+     existing changes to the files they are about to make changes to.
+
+ -- User Option: magit-wip-initial-backup-mode
+     When this mode is enabled, then the current version of a file is
+     committed to the worktree wip ref before the buffer visiting that
+     file is saved for the first time since the buffer was created.
+
+     This backs up the same version of the file that ‘backup-buffer’
+     would save.  While ‘backup-buffer’ uses a backup file, this mode
+     uses the same worktree wip ref as used by the other Magit Wip
+     modes.  Like ‘backup-buffer’, it only does this once; unless you
+     kill the buffer and visit the file again only one backup will be
+     created per Emacs session.
+
+     This mode ignores the variables that affect ‘backup-buffer’ and can
+     be used along-side that function, which is recommended because it
+     only backs up files that are tracked in a Git repository.
+
+ -- User Option: magit-wip-after-save-local-mode-lighter
+     Mode-line lighter for ‘magit-wip-after-save-local-mode’.
+
+ -- User Option: magit-wip-after-apply-mode-lighter
+     Mode-line lighter for ‘magit-wip-after-apply-mode’.
+
+ -- User Option: magit-wip-before-change-mode-lighter
+     Mode-line lighter for ‘magit-wip-before-change-mode’.
+
+ -- User Option: magit-wip-initial-backup-mode-lighter
+     Mode-line lighter for ‘magit-wip-initial-backup-mode’.
+
+
+File: magit.info,  Node: Commands for Buffers Visiting Files,  Next: Minor Mode for Buffers Visiting Blobs,  Prev: Wip Modes,  Up: Miscellaneous
+
+8.10 Commands for Buffers Visiting Files
+========================================
+
+By default Magit defines a few global key bindings.  These bindings are
+a compromise between providing no bindings at all and providing the
+better bindings I would have liked to use instead.  Magit cannot provide
+the set of recommended bindings by default because those key sequences
+are strictly reserved for bindings added by the user.  Also see *note
+Global Bindings:: and *note (elisp)Key Binding Conventions::.
+
+   To use the recommended bindings, add this to your init file and
+restart Emacs.
+
+     (setq magit-define-global-key-bindings 'recommended)
+
+   If you don’t want Magit to add any bindings to the global keymap at
+all, add this to your init file and restart Emacs.
+
+     (setq magit-define-global-key-bindings nil)
+
+‘C-c f’ (‘magit-file-dispatch’)
+‘C-c f s’ (‘magit-stage-file’)
+‘C-c f s’ (‘magit-stage-buffer-file’)
+‘C-c f u’ (‘magit-unstage-file’)
+‘C-c f u’ (‘magit-unstage-buffer-file’)
+‘C-c f , x’ (‘magit-file-untrack’)
+‘C-c f , r’ (‘magit-file-rename’)
+‘C-c f , k’ (‘magit-file-delete’)
+‘C-c f , c’ (‘magit-file-checkout’)
+‘C-c f D’ (‘magit-diff’)
+‘C-c f d’ (‘magit-diff-buffer-file’)
+‘C-c f L’ (‘magit-log’)
+‘C-c f l’ (‘magit-log-buffer-file’)
+‘C-c f t’ (‘magit-log-trace-definition’)
+‘C-c f M’ (‘magit-log-merged’)
+‘C-c f B’ (‘magit-blame’)
+‘C-c f b’ (‘magit-blame-additions’)
+‘C-c f r’ (‘magit-blame-removal’)
+‘C-c f f’ (‘magit-blame-reverse’)
+‘C-c f m’ (‘magit-blame-echo’)
+‘C-c f q’ (‘magit-blame-quit’)
+‘C-c f p’ (‘magit-blob-previous’)
+‘C-c f n’ (‘magit-blob-next’)
+‘C-c f v’ (‘magit-find-file’)
+‘C-c f V’ (‘magit-blob-visit-file’)
+‘C-c f g’ (‘magit-status-here’)
+‘C-c f G’ (‘magit-display-repository-buffer’)
+‘C-c f c’ (‘magit-commit’)
+‘C-c f e’ (‘magit-edit-line-commit’)
+     Each of these commands is documented individually right below,
+     alongside their default key bindings.  The bindings shown above are
+     the recommended bindings, which you can enable by following the
+     instructions further up.
+
+‘C-c M-g’ (‘magit-file-dispatch’)
+     This transient prefix command binds the following suffix commands
+     and displays them in a temporary buffer until a suffix is invoked.
+
+‘C-c M-g s’ (‘magit-stage-file’)
+‘C-c M-g s’ (‘magit-stage-buffer-file’)
+     Stage all changes to the file being visited in the current buffer.
+     When not visiting a file, then the first command is used, which
+     prompts for a file.
+
+‘C-c M-g u’ (‘magit-unstage-file’)
+‘C-c M-g u’ (‘magit-unstage-buffer-file’)
+     Unstage all changes to the file being visited in the current
+     buffer.  When not visiting a file, then the first command is used,
+     which prompts for a file.
+
+‘C-c M-g , x’ (‘magit-file-untrack’)
+     This command untracks a file read from the user, defaulting to the
+     visited file.
+
+‘C-c M-g , r’ (‘magit-file-rename’)
+     This command renames a file read from the user, defaulting to the
+     visited file.
+
+‘C-c M-g , k’ (‘magit-file-delete’)
+     This command deletes a file read from the user, defaulting to the
+     visited file.
+
+‘C-c M-g , c’ (‘magit-file-checkout’)
+     This command updates a file in the working tree and index to the
+     contents from a revision.  Both the revision and file are read from
+     the user.
+
+‘C-c M-g D’ (‘magit-diff’)
+     This transient prefix command binds several diff suffix commands
+     and infix arguments and displays them in a temporary buffer until a
+     suffix is invoked.  See *note Diffing::.
+
+     This is the same command that ‘d’ is bound to in Magit buffers.  If
+     this command is invoked from a file-visiting buffer, then the
+     initial value of the option (‘--’) that limits the diff to certain
+     file(s) is set to the visited file.
+
+‘C-c M-g d’ (‘magit-diff-buffer-file’)
+     This command shows the diff for the file of blob that the current
+     buffer visits.
+
+ -- User Option: magit-diff-buffer-file-locked
+     This option controls whether ‘magit-diff-buffer-file’ uses a
+     dedicated buffer.  See *note Modes and Buffers::.
+
+‘C-c M-g L’ (‘magit-log’)
+     This transient prefix command binds several log suffix commands and
+     infix arguments and displays them in a temporary buffer until a
+     suffix is invoked.  See *note Logging::.
+
+     This is the same command that ‘l’ is bound to in Magit buffers.  If
+     this command is invoked from a file-visiting buffer, then the
+     initial value of the option (‘--’) that limits the log to certain
+     file(s) is set to the visited file.
+
+‘C-c M-g l’ (‘magit-log-buffer-file’)
+     This command shows the log for the file of blob that the current
+     buffer visits.  Renames are followed when a prefix argument is used
+     or when ‘--follow’ is an active log argument.  When the region is
+     active, the log is restricted to the selected line range.
+
+ -- User Option: magit-log-buffer-file-locked
+     This option controls whether ‘magit-log-buffer-file’ uses a
+     dedicated buffer.  See *note Modes and Buffers::.
+
+‘C-c M-g t’ (‘magit-log-trace-definition’)
+     This command shows the log for the definition at point.
+
+‘C-c M-g M’ (‘magit-log-merged’)
+     This command reads a commit and a branch in shows a log concerning
+     the merge of the former into the latter.  This shows multiple
+     commits even in case of a fast-forward merge.
+
+‘C-c M-g B’ (‘magit-blame’)
+     This transient prefix command binds all blaming suffix commands
+     along with the appropriate infix arguments and displays them in a
+     temporary buffer until a suffix is invoked.
+
+     For more information about this and the following commands also see
+     *note Blaming::.
+
+     In addition to the ‘magit-blame’ sub-transient, the dispatch
+     transient also binds several blaming suffix commands directly.  See
+     *note Blaming:: for information about those commands and bindings.
+
+‘C-c M-g p’ (‘magit-blob-previous’)
+     This command visits the previous blob which modified the current
+     file.
+
+‘C-c M-g n’ (‘magit-blob-next’)
+     This command visits the next blob which modified the current file.
+
+‘C-c M-g v’ (‘magit-find-file’)
+     This command reads a revision and file and visits the respective
+     blob.
+
+‘C-c M-g V’ (‘magit-blob-visit-file’)
+     This command visits the file from the working tree, corresponding
+     to the current blob.  When visiting a blob or the version from the
+     index, then it goes to the same location in the respective file in
+     the working tree.
+
+‘C-c M-g g’ (‘magit-status-here’)
+     This command displays the status of the current repository in a
+     buffer, like ‘magit-status’ does.  Additionally it tries to go to
+     the position in that buffer, which corresponds to the position in
+     the current file-visiting buffer (if any).
+
+‘C-c M-g G’ (‘magit-display-repository-buffer’)
+     This command reads and displays a Magit buffer belonging to the
+     current repository, without refreshing it.
+
+‘C-c M-g c’ (‘magit-commit’)
+     This transient prefix command binds the following suffix commands
+     along with the appropriate infix arguments and displays them in a
+     temporary buffer until a suffix is invoked.  See *note Initiating a
+     Commit::.
+
+‘C-c M-g e’ (‘magit-edit-line-commit’)
+     This command makes the commit editable that added the current line.
+
+     With a prefix argument it makes the commit editable that removes
+     the line, if any.  The commit is determined using ‘git blame’ and
+     made editable using ‘git rebase --interactive’ if it is reachable
+     from ‘HEAD’, or by checking out the commit (or a branch that points
+     at it) otherwise.
+
+
+File: magit.info,  Node: Minor Mode for Buffers Visiting Blobs,  Prev: Commands for Buffers Visiting Files,  Up: Miscellaneous
+
+8.11 Minor Mode for Buffers Visiting Blobs
+==========================================
+
+The ‘magit-blob-mode’ enables certain Magit features in blob-visiting
+buffers.  Such buffers can be created using ‘magit-find-file’ and some
+of the commands mentioned below, which also take care of turning on this
+minor mode.  Currently this mode only establishes a few key bindings,
+but this might be extended.
+
+‘p’ (‘magit-blob-previous’)
+     Visit the previous blob which modified the current file.
+
+‘n’ (‘magit-blob-next’)
+     Visit the next blob which modified the current file.
+
+‘q’ (‘magit-kill-this-buffer’)
+     Kill the current buffer.
+
+
+File: magit.info,  Node: Customizing,  Next: Plumbing,  Prev: Miscellaneous,  Up: Top
+
+9 Customizing
+*************
+
+Both Git and Emacs are highly customizable.  Magit is both a Git
+porcelain as well as an Emacs package, so it makes sense to customize it
+using both Git variables as well as Emacs options.  However this
+flexibility doesn’t come without problems, including but not limited to
+the following.
+
+   • Some Git variables automatically have an effect in Magit without
+     requiring any explicit support.  Sometimes that is desirable - in
+     other cases, it breaks Magit.
+
+     When a certain Git setting breaks Magit but you want to keep using
+     that setting on the command line, then that can be accomplished by
+     overriding the value for Magit only by appending something like
+     ‘("-c" "some.variable=compatible-value")’ to
+     ‘magit-git-global-arguments’.
+
+   • Certain settings like ‘fetch.prune=true’ are respected by Magit
+     commands (because they simply call the respective Git command) but
+     their value is not reflected in the respective transient buffers.
+     In this case the ‘--prune’ argument in ‘magit-fetch’ might be
+     active or inactive, but that doesn’t keep the Git variable from
+     being honored by the suffix commands anyway.  So pruning might
+     happen despite the ‘--prune’ arguments being displayed in a way
+     that seems to indicate that no pruning will happen.
+
+   I intend to address these and similar issues in a future release.
+
+* Menu:
+
+* Per-Repository Configuration::
+* Essential Settings::
+
+
+File: magit.info,  Node: Per-Repository Configuration,  Next: Essential Settings,  Up: Customizing
+
+9.1 Per-Repository Configuration
+================================
+
+Magit can be configured on a per-repository level using both Git
+variables as well as Emacs options.
+
+   To set a Git variable for one repository only, simply set it in
+‘/path/to/repo/.git/config’ instead of ‘$HOME/.gitconfig’ or
+‘/etc/gitconfig’.  See *note (gitman)git-config::.
+
+   Similarly, Emacs options can be set for one repository only by
+editing ‘/path/to/repo/.dir-locals.el’.  See *note (emacs)Directory
+Variables::.  For example to disable automatic refreshes of
+file-visiting buffers in just one huge repository use this:
+
+   • ‘/path/to/huge/repo/.dir-locals.el’
+
+          ((nil . ((magit-refresh-buffers . nil))))
+
+   It might only be costly to insert certain information into Magit
+buffers for repositories that are exceptionally large, in which case you
+can disable the respective section inserters just for that repository:
+
+   • ‘/path/to/tag/invested/repo/.dir-locals.el’
+
+          ((magit-status-mode
+            . ((eval . (magit-disable-section-inserter 'magit-insert-tags-header)))))
+
+ -- Function: magit-disable-section-inserter fn
+     This function disables the section inserter FN in the current
+     repository.  It is only intended for use in ‘.dir-locals.el’ and
+     ‘.dir-locals-2.el’.
+
+   If you want to apply the same settings to several, but not all,
+repositories then keeping the repository-local config files in sync
+would quickly become annoying.  To avoid that you can create config
+files for certain classes of repositories (e.g., "huge repositories")
+and then include those files in the per-repository config files.  For
+example:
+
+   • ‘/path/to/huge/repo/.git/config’
+
+          [include]
+                  path = /path/to/huge-gitconfig
+
+   • ‘/path/to/huge-gitconfig’
+
+          [status]
+                  showUntrackedFiles = no
+
+   • ‘$HOME/.emacs.d/init.el’
+
+          (dir-locals-set-class-variables 'huge-git-repository
+             '((nil . ((magit-refresh-buffers . nil)))))
+
+          (dir-locals-set-directory-class
+             "/path/to/huge/repo/" 'huge-git-repository)
+
+
+File: magit.info,  Node: Essential Settings,  Prev: Per-Repository Configuration,  Up: Customizing
+
+9.2 Essential Settings
+======================
+
+The next three sections list and discuss several variables that many
+users might want to customize, for safety and/or performance reasons.
+
+* Menu:
+
+* Safety::
+* Performance::
+* Global Bindings::
+
+
+File: magit.info,  Node: Safety,  Next: Performance,  Up: Essential Settings
+
+9.2.1 Safety
+------------
+
+This section discusses various variables that you might want to change
+(or *not* change) for safety reasons.
+
+   Git keeps *committed* changes around long enough for users to recover
+changes they have accidentally been deleted.  It does not do the same
+for *uncommitted* changes in the working tree and not even the index
+(the staging area).  Because Magit makes it so easy to modify
+uncommitted changes, it also makes it easy to shoot yourself in the foot
+in the process.  For that reason Magit provides three global modes that
+save *tracked* files to work-in-progress references after or before
+certain actions.  See *note Wip Modes::.
+
+   These modes are not enabled by default because of performance
+concerns.  Instead a lot of potentially destructive commands require
+confirmation every time they are used.  In many cases this can be
+disabled by adding a symbol to ‘magit-no-confirm’ (see *note Completion
+and Confirmation::).  If you enable the various wip modes then you
+should add ‘safe-with-wip’ to this list.
+
+   Similarly it isn’t necessary to require confirmation before moving a
+file to the system trash - if you trashed a file by mistake then you can
+recover it from there.  Option ‘magit-delete-by-moving-to-trash’
+controls whether the system trash is used, which is the case by default.
+Nevertheless, ‘trash’ isn’t a member of ‘magit-no-confirm’ - you might
+want to change that.
+
+   By default buffers visiting files are automatically reverted when the
+visited file changes on disk.  This isn’t as risky as it might seem, but
+to make an informed decision you should see *note Risk of Reverting
+Automatically::.
+
+
+File: magit.info,  Node: Performance,  Next: Global Bindings,  Prev: Safety,  Up: Essential Settings
+
+9.2.2 Performance
+-----------------
+
+After Magit has run ‘git’ for side-effects, it also refreshes the
+current Magit buffer and the respective status buffer.  This is
+necessary because otherwise outdated information might be displayed
+without the user noticing.  Magit buffers are updated by recreating
+their content from scratch, which makes updating simpler and less
+error-prone, but also more costly.  Keeping it simple and just
+re-creating everything from scratch is an old design decision and
+departing from that will require major refactoring.
+
+   Meanwhile you can tell Magit to only automatically refresh the
+current Magit buffer, but not the status buffer.  If you do that, then
+the status buffer is only refreshed automatically if it is the current
+buffer.
+
+     (setq magit-refresh-status-buffer nil)
+
+   You should also check whether any third-party packages have added
+anything to ‘magit-refresh-buffer-hook’, ‘magit-pre-refresh-hook’, and
+‘magit-post-refresh-hook’.  If so, then check whether those additions
+impact performance significantly.
+
+   Magit can be told to refresh buffers verbosely using ‘M-x
+magit-toggle-verbose-refresh’.  Enabling this helps figuring out which
+sections are bottlenecks.  Each line printed to the ‘*Messages*’ buffer
+contains a section name, the number of seconds it took to show this
+section, and from 0 to 2 exclamation marks: the more exclamation marks
+the slower the section is.
+
+   Magit also reverts buffers for visited files located inside the
+current repository when the visited file changes on disk.  That is
+implemented on top of ‘auto-revert-mode’ from the built-in library
+‘autorevert’.  To figure out whether that impacts performance, check
+whether performance is significantly worse, when many buffers exist
+and/or when some buffers visit files using TRAMP.  If so, then this
+should help.
+
+     (setq auto-revert-buffer-list-filter
+           'magit-auto-revert-repository-buffer-p)
+
+   For alternative approaches see *note Automatic Reverting of
+File-Visiting Buffers::.
+
+   If you have enabled any features that are disabled by default, then
+you should check whether they impact performance significantly.  It’s
+likely that they were not enabled by default because it is known that
+they reduce performance at least in large repositories.
+
+   If performance is only slow inside certain unusually large
+repositories, then you might want to disable certain features on a
+per-repository or per-repository-class basis only.  See *note
+Per-Repository Configuration::.  For example it takes a long time to
+determine the next and current tag in repository with exceptional
+numbers of tags.  It would therefore be a good idea to disable
+‘magit-insert-tags-headers’, as explained at the mentioned node.
+
+* Menu:
+
+* Microsoft Windows Performance::
+* MacOS Performance::
+
+Log Performance
+...............
+
+When showing logs, Magit limits the number of commits initially shown in
+the hope that this avoids unnecessary work.  When ‘--graph’ is used,
+then this unfortunately does not have the desired effect for large
+histories.  Junio, Git’s maintainer, said on the Git mailing list
+(<https://www.spinics.net/lists/git/msg232230.html>): "‘--graph’ wants
+to compute the whole history and the max-count only affects the output
+phase after ‘--graph’ does its computation".
+
+   In other words, it’s not that Git is slow at outputting the
+differences, or that Magit is slow at parsing the output - the problem
+is that Git first goes outside and has a smoke.
+
+   We actually work around this issue by limiting the number of commits
+not only by using ‘-<N>’ but by also using a range.  But unfortunately
+that’s not always possible.
+
+   When more than a few thousand commits are shown, then the use of
+‘--graph’ can slow things down.
+
+   Using ‘--color --graph’ is even slower.  Magit uses code that is part
+of Emacs to turn control characters into faces.  That code is pretty
+slow and this is quite noticeable when showing a log with many branches
+and merges.  For that reason ‘--color’ is not enabled by default
+anymore.  Consider leaving it at that.
+
+Diff Performance
+................
+
+If diffs are slow, then consider turning off some optional diff features
+by setting all or some of the following variables to ‘nil’:
+‘magit-diff-highlight-indentation’, ‘magit-diff-highlight-trailing’,
+‘magit-diff-paint-whitespace’, ‘magit-diff-highlight-hunk-body’, and
+‘magit-diff-refine-hunk’.
+
+   When showing a commit instead of some arbitrary diff, then some
+additional information is displayed.  Calculating this information can
+be quite expensive given certain circumstances.  If looking at a commit
+using ‘magit-revision-mode’ takes considerably more time than looking at
+the same commit in ‘magit-diff-mode’, then consider setting
+‘magit-revision-insert-related-refs’ to ‘nil’.
+
+   When you are often confronted with diffs that contain deleted files,
+then you might want to enable the ‘--irreversible-delete’ argument.  If
+you do that then diffs still show that a file was deleted but without
+also showing the complete deleted content of the file.  This argument is
+not available by default, see *note (transient)Enabling and Disabling
+Suffixes::.  Once you have done that you should enable it and save that
+setting, see *note (transient)Saving Values::.  You should do this in
+both the diff (‘d’) and the diff refresh (‘D’) transient popups.
+
+Refs Buffer Performance
+.......................
+
+When refreshing the "references buffer" is slow, then that’s usually
+because several hundred refs are being displayed.  The best way to
+address that is to display fewer refs, obviously.
+
+   If you are not, or only mildly, interested in seeing the list of
+tags, then start by not displaying them:
+
+     (remove-hook 'magit-refs-sections-hook 'magit-insert-tags)
+
+   Then you should also make sure that the listed remote branches
+actually all exist.  You can do so by pruning branches which no longer
+exist using ‘f-pa’.
+
+Committing Performance
+......................
+
+When you initiate a commit, then Magit by default automatically shows a
+diff of the changes you are about to commit.  For large commits this can
+take a long time, which is especially distracting when you are
+committing large amounts of generated data which you don’t actually
+intend to inspect before committing.  This behavior can be turned off
+using:
+
+     (remove-hook 'server-switch-hook 'magit-commit-diff)
+     (remove-hook 'with-editor-filter-visit-hook 'magit-commit-diff)
+
+   Then you can type ‘C-c C-d’ to show the diff when you actually want
+to see it, but only then.  Alternatively you can leave the hook alone
+and just type ‘C-g’ in those cases when it takes too long to generate
+the diff.  If you do that, then you will end up with a broken diff
+buffer, but doing it this way has the advantage that you usually get to
+see the diff, which is useful because it increases the odds that you
+spot potential issues.
+
+
+File: magit.info,  Node: Microsoft Windows Performance,  Next: MacOS Performance,  Up: Performance
+
+Microsoft Windows Performance
+.............................
+
+In order to update the status buffer, ‘git’ has to be run a few dozen
+times.  That is problematic on Microsoft Windows, because that operating
+system is exceptionally slow at starting processes.  Sadly this is an
+issue that can only be fixed by Microsoft itself, and they don’t appear
+to be particularly interested in doing so.
+
+   Beside the subprocess issue, there are also other Windows-specific
+performance issues.  Some of these have workarounds.  The maintainers of
+"Git for Windows" try to improve performance on Windows.  Always use the
+latest release in order to benefit from the latest performance tweaks.
+Magit too tries to work around some Windows-specific issues.
+
+   According to some sources, setting the following Git variables can
+also help.
+
+     git config --global core.preloadindex true   # default since v2.1
+     git config --global core.fscache true        # default since v2.8
+     git config --global gc.auto 256
+
+   You should also check whether an anti-virus program is affecting
+performance.
+
+
+File: magit.info,  Node: MacOS Performance,  Prev: Microsoft Windows Performance,  Up: Performance
+
+MacOS Performance
+.................
+
+Before Emacs 26.1 child processes were created using ‘fork’ on macOS.
+That needlessly copied GUI resources, which is expensive.  The result
+was that forking took about 30 times as long on Darwin than on Linux,
+and because Magit starts many ‘git’ processes that made quite a
+difference.
+
+   So make sure that you are using at least Emacs 26.1, in which case
+the faster ‘vfork’ will be used.  (The creation of child processes still
+takes about twice as long on Darwin compared to Linux.)  See (1) for
+more information.
+
+   Additionally, ‘git’ installed from a package manager like ‘brew’ or
+‘nix’ seems to be slower than the native executable.  Profile the ‘git’
+executable you’re running against the one at ‘/usr/bin/git’, and if you
+notice a notable difference try using the latter as
+‘magit-git-executable’.
+
+   ---------- Footnotes ----------
+
+   (1) 
+<https://lists.gnu.org/archive/html/bug-gnu-emacs/2017-04/msg00201.html>
+
+
+File: magit.info,  Node: Global Bindings,  Prev: Performance,  Up: Essential Settings
+
+9.2.3 Global Bindings
+---------------------
+
+ -- User Option: magit-define-global-key-bindings
+     This option controls which set of Magit key bindings, if any, may
+     be added to the global keymap, even before Magit is first used in
+     the current Emacs session.
+
+        • If the value is ‘nil’, no bindings are added.
+
+        • If ‘default’, maybe add:
+
+          ‘C-x g’     ‘magit-status’
+          ‘C-x M-g’   ‘magit-dispatch’
+          ‘C-c M-g’   ‘magit-file-dispatch’
+
+        • If ‘recommended’, maybe add:
+
+          ‘C-x g’   ‘magit-status’
+          ‘C-c g’   ‘magit-dispatch’
+          ‘C-c f’   ‘magit-file-dispatch’
+
+          These bindings are strongly recommended, but we cannot use
+          them by default, because the ‘C-c <LETTER>’ namespace is
+          strictly reserved for bindings added by the user (see *note
+          (elisp)Key Binding Conventions::).
+
+     The bindings in the chosen set may be added when ‘after-init-hook’
+     is run.  Each binding is added if, and only if, at that time no
+     other key is bound to the same command, and no other command is
+     bound to the same key.  In other words we try to avoid adding
+     bindings that are unnecessary, as well as bindings that conflict
+     with other bindings.
+
+     Adding these bindings is delayed until ‘after-init-hook’ is run to
+     allow users to set the variable anywhere in their init file
+     (without having to make sure to do so before ‘magit’ is loaded or
+     autoloaded) and to increase the likelihood that all the potentially
+     conflicting user bindings have already been added.
+
+     To set this variable use either ‘setq’ or the Custom interface.  Do
+     not use the function ‘customize-set-variable’ because doing that
+     would cause Magit to be loaded immediately, when that form is
+     evaluated (this differs from ‘custom-set-variables’, which doesn’t
+     load the libraries that define the customized variables).
+
+     Setting this variable has no effect if ‘after-init-hook’ has
+     already been run.
+
+
+File: magit.info,  Node: Plumbing,  Next: FAQ,  Prev: Customizing,  Up: Top
+
+10 Plumbing
+***********
+
+The following sections describe how to use several of Magit’s core
+abstractions to extend Magit itself or implement a separate extension.
+
+   A few of the low-level features used by Magit have been factored out
+into separate libraries/packages, so that they can be used by other
+packages, without having to depend on Magit.  See *note
+(with-editor)Top:: for information about ‘with-editor’.  ‘transient’
+doesn’t have a manual yet.
+
+   If you are trying to find an unused key that you can bind to a
+command provided by your own Magit extension, then checkout
+<https://github.com/magit/magit/wiki/Plugin-Dispatch-Key-Registry>.
+
+* Menu:
+
+* Calling Git::
+* Section Plumbing::
+* Refreshing Buffers::
+* Conventions::
+
+
+File: magit.info,  Node: Calling Git,  Next: Section Plumbing,  Up: Plumbing
+
+10.1 Calling Git
+================
+
+Magit provides many specialized functions for calling Git.  All of these
+functions are defined in either ‘magit-git.el’ or ‘magit-process.el’ and
+have one of the prefixes ‘magit-run-’, ‘magit-call-’, ‘magit-start-’, or
+‘magit-git-’ (which is also used for other things).
+
+   All of these functions accept an indefinite number of arguments,
+which are strings that specify command line arguments for Git (or in
+some cases an arbitrary executable).  These arguments are flattened
+before being passed on to the executable; so instead of strings they can
+also be lists of strings and arguments that are ‘nil’ are silently
+dropped.  Some of these functions also require a single mandatory
+argument before these command line arguments.
+
+   Roughly speaking, these functions run Git either to get some value or
+for side-effects.  The functions that return a value are useful to
+collect the information necessary to populate a Magit buffer, while the
+others are used to implement Magit commands.
+
+   The functions in the value-only group always run synchronously, and
+they never trigger a refresh.  The function in the side-effect group can
+be further divided into subgroups depending on whether they run Git
+synchronously or asynchronously, and depending on whether they trigger a
+refresh when the executable has finished.
+
+* Menu:
+
+* Getting a Value from Git::
+* Calling Git for Effect::
+
+
+File: magit.info,  Node: Getting a Value from Git,  Next: Calling Git for Effect,  Up: Calling Git
+
+10.1.1 Getting a Value from Git
+-------------------------------
+
+These functions run Git in order to get a value, an exit status, or
+output.  Of course you could also use them to run Git commands that have
+side-effects, but that should be avoided.
+
+ -- Function: magit-git-exit-code &rest args
+     Executes git with ARGS and returns its exit code.
+
+ -- Function: magit-git-success &rest args
+     Executes git with ARGS and returns ‘t’ if the exit code is ‘0’,
+     ‘nil’ otherwise.
+
+ -- Function: magit-git-failure &rest args
+     Executes git with ARGS and returns ‘t’ if the exit code is ‘1’,
+     ‘nil’ otherwise.
+
+ -- Function: magit-git-true &rest args
+     Executes git with ARGS and returns ‘t’ if the first line printed by
+     git is the string "true", ‘nil’ otherwise.
+
+ -- Function: magit-git-false &rest args
+     Executes git with ARGS and returns ‘t’ if the first line printed by
+     git is the string "false", ‘nil’ otherwise.
+
+ -- Function: magit-git-insert &rest args
+     Executes git with ARGS and inserts its output at point.
+
+ -- Function: magit-git-string &rest args
+     Executes git with ARGS and returns the first line of its output.
+     If there is no output or if it begins with a newline character,
+     then this returns ‘nil’.
+
+ -- Function: magit-git-lines &rest args
+     Executes git with ARGS and returns its output as a list of lines.
+     Empty lines anywhere in the output are omitted.
+
+ -- Function: magit-git-items &rest args
+     Executes git with ARGS and returns its null-separated output as a
+     list.  Empty items anywhere in the output are omitted.
+
+     If the value of option ‘magit-git-debug’ is non-nil and git exits
+     with a non-zero exit status, then warn about that in the echo area
+     and add a section containing git’s standard error in the current
+     repository’s process buffer.
+
+ -- Function: magit-process-git destination &rest args
+     Calls Git synchronously in a separate process, returning its exit
+     code.  DESTINATION specifies how to handle the output, like for
+     ‘call-process’, except that file handlers are supported.  Enables
+     Cygwin’s "noglob" option during the call and ensures unix eol
+     conversion.
+
+ -- Function: magit-process-file process &optional infile buffer display
+          &rest args
+     Processes files synchronously in a separate process.  Identical to
+     ‘process-file’ but temporarily enables Cygwin’s "noglob" option
+     during the call and ensures unix eol conversion.
+
+   If an error occurs when using one of the above functions, then that
+is usually due to a bug, i.e., using an argument which is not actually
+supported.  Such errors are usually not reported, but when they occur we
+need to be able to debug them.
+
+ -- User Option: magit-git-debug
+     Whether to report errors that occur when using ‘magit-git-insert’,
+     ‘magit-git-string’, ‘magit-git-lines’, or ‘magit-git-items’.  This
+     does not actually raise an error.  Instead a message is shown in
+     the echo area, and git’s standard error is insert into a new
+     section in the current repository’s process buffer.
+
+ -- Function: magit-git-str &rest args
+     This is a variant of ‘magit-git-string’ that ignores the option
+     ‘magit-git-debug’.  It is mainly intended to be used while handling
+     errors in functions that do respect that option.  Using such a
+     function while handing an error could cause yet another error and
+     therefore lead to an infinite recursion.  You probably won’t ever
+     need to use this function.
+
+
+File: magit.info,  Node: Calling Git for Effect,  Prev: Getting a Value from Git,  Up: Calling Git
+
+10.1.2 Calling Git for Effect
+-----------------------------
+
+These functions are used to run git to produce some effect.  Most Magit
+commands that actually run git do so by using such a function.
+
+   Because we do not need to consume git’s output when using these
+functions, their output is instead logged into a per-repository buffer,
+which can be shown using ‘$’ from a Magit buffer or ‘M-x magit-process’
+elsewhere.
+
+   These functions can have an effect in two distinct ways.  Firstly,
+running git may change something, i.e., create or push a new commit.
+Secondly, that change may require that Magit buffers are refreshed to
+reflect the changed state of the repository.  But refreshing isn’t
+always desirable, so only some of these functions do perform such a
+refresh after git has returned.
+
+   Sometimes it is useful to run git asynchronously.  For example, when
+the user has just initiated a push, then there is no reason to make her
+wait until that has completed.  In other cases it makes sense to wait
+for git to complete before letting the user do something else.  For
+example after staging a change it is useful to wait until after the
+refresh because that also automatically moves to the next change.
+
+ -- Function: magit-call-git &rest args
+     Calls git synchronously with ARGS.
+
+ -- Function: magit-call-process program &rest args
+     Calls PROGRAM synchronously with ARGS.
+
+ -- Function: magit-run-git &rest args
+     Calls git synchronously with ARGS and then refreshes.
+
+ -- Function: magit-run-git-with-input &rest args
+     Calls git synchronously with ARGS and sends it the content of the
+     current buffer on standard input.
+
+     If the current buffer’s ‘default-directory’ is on a remote
+     filesystem, this function actually runs git asynchronously.  But
+     then it waits for the process to return, so the function itself is
+     synchronous.
+
+ -- Function: magit-git &rest args
+     Calls git synchronously with ARGS for side-effects only.  This
+     function does not refresh the buffer.
+
+ -- Function: magit-git-wash washer &rest args
+     Execute Git with ARGS, inserting washed output at point.  Actually
+     first insert the raw output at point.  If there is no output call
+     ‘magit-cancel-section’.  Otherwise temporarily narrow the buffer to
+     the inserted text, move to its beginning, and then call function
+     WASHER with ARGS as its sole argument.
+
+   And now for the asynchronous variants.
+
+ -- Function: magit-run-git-async &rest args
+     Start Git, prepare for refresh, and return the process object.
+     ARGS is flattened and then used as arguments to Git.
+
+     Display the command line arguments in the echo area.
+
+     After Git returns some buffers are refreshed: the buffer that was
+     current when this function was called (if it is a Magit buffer and
+     still alive), as well as the respective Magit status buffer.
+     Unmodified buffers visiting files that are tracked in the current
+     repository are reverted if ‘magit-revert-buffers’ is non-nil.
+
+ -- Function: magit-run-git-with-editor &rest args
+     Export GIT_EDITOR and start Git.  Also prepare for refresh and
+     return the process object.  ARGS is flattened and then used as
+     arguments to Git.
+
+     Display the command line arguments in the echo area.
+
+     After Git returns some buffers are refreshed: the buffer that was
+     current when this function was called (if it is a Magit buffer and
+     still alive), as well as the respective Magit status buffer.
+
+ -- Function: magit-start-git input &rest args
+     Start Git, prepare for refresh, and return the process object.
+
+     If INPUT is non-nil, it has to be a buffer or the name of an
+     existing buffer.  The buffer content becomes the processes standard
+     input.
+
+     Option ‘magit-git-executable’ specifies the Git executable and
+     option ‘magit-git-global-arguments’ specifies constant arguments.
+     The remaining arguments ARGS specify arguments to Git.  They are
+     flattened before use.
+
+     After Git returns, some buffers are refreshed: the buffer that was
+     current when this function was called (if it is a Magit buffer and
+     still alive), as well as the respective Magit status buffer.
+     Unmodified buffers visiting files that are tracked in the current
+     repository are reverted if ‘magit-revert-buffers’ is non-nil.
+
+ -- Function: magit-start-process &rest args
+     Start PROGRAM, prepare for refresh, and return the process object.
+
+     If optional argument INPUT is non-nil, it has to be a buffer or the
+     name of an existing buffer.  The buffer content becomes the
+     processes standard input.
+
+     The process is started using ‘start-file-process’ and then setup to
+     use the sentinel ‘magit-process-sentinel’ and the filter
+     ‘magit-process-filter’.  Information required by these functions is
+     stored in the process object.  When this function returns the
+     process has not started to run yet so it is possible to override
+     the sentinel and filter.
+
+     After the process returns, ‘magit-process-sentinel’ refreshes the
+     buffer that was current when ‘magit-start-process’ was called (if
+     it is a Magit buffer and still alive), as well as the respective
+     Magit status buffer.  Unmodified buffers visiting files that are
+     tracked in the current repository are reverted if
+     ‘magit-revert-buffers’ is non-nil.
+
+ -- Variable: magit-this-process
+     The child process which is about to start.  This can be used to
+     change the filter and sentinel.
+
+ -- Variable: magit-process-raise-error
+     When this is non-nil, then ‘magit-process-sentinel’ raises an error
+     if git exits with a non-zero exit status.  For debugging purposes.
+
+
+File: magit.info,  Node: Section Plumbing,  Next: Refreshing Buffers,  Prev: Calling Git,  Up: Plumbing
+
+10.2 Section Plumbing
+=====================
+
+* Menu:
+
+* Creating Sections::
+* Section Selection::
+* Matching Sections::
+
+
+File: magit.info,  Node: Creating Sections,  Next: Section Selection,  Up: Section Plumbing
+
+10.2.1 Creating Sections
+------------------------
+
+ -- Macro: magit-insert-section &rest args
+     Insert a section at point.
+
+     TYPE is the section type, a symbol.  Many commands that act on the
+     current section behave differently depending on that type.  Also if
+     a variable ‘magit-TYPE-section-map’ exists, then use that as the
+     text-property ‘keymap’ of all text belonging to the section (but
+     this may be overwritten in subsections).  TYPE can also have the
+     form ‘(eval FORM)’ in which case FORM is evaluated at runtime.
+
+     Optional VALUE is the value of the section, usually a string that
+     is required when acting on the section.
+
+     When optional HIDE is non-nil collapse the section body by default,
+     i.e., when first creating the section, but not when refreshing the
+     buffer.  Otherwise, expand it by default.  This can be overwritten
+     using ‘magit-section-set-visibility-hook’.  When a section is
+     recreated during a refresh, then the visibility of predecessor is
+     inherited and HIDE is ignored (but the hook is still honored).
+
+     BODY is any number of forms that actually insert the section’s
+     heading and body.  Optional NAME, if specified, has to be a symbol,
+     which is then bound to the struct of the section being inserted.
+
+     Before BODY is evaluated the ‘start’ of the section object is set
+     to the value of ‘point’ and after BODY was evaluated its ‘end’ is
+     set to the new value of ‘point’; BODY is responsible for moving
+     ‘point’ forward.
+
+     If it turns out inside BODY that the section is empty, then
+     ‘magit-cancel-section’ can be used to abort and remove all traces
+     of the partially inserted section.  This can happen when creating a
+     section by washing Git’s output and Git didn’t actually output
+     anything this time around.
+
+ -- Function: magit-insert-heading &rest args
+     Insert the heading for the section currently being inserted.
+
+     This function should only be used inside ‘magit-insert-section’.
+
+     When called without any arguments, then just set the ‘content’ slot
+     of the object representing the section being inserted to a marker
+     at ‘point’.  The section should only contain a single line when
+     this function is used like this.
+
+     When called with arguments ARGS, which have to be strings, then
+     insert those strings at point.  The section should not contain any
+     text before this happens and afterwards it should again only
+     contain a single line.  If the ‘face’ property is set anywhere
+     inside any of these strings, then insert all of them unchanged.
+     Otherwise use the ‘magit-section-heading’ face for all inserted
+     text.
+
+     The ‘content’ property of the section struct is the end of the
+     heading (which lasts from ‘start’ to ‘content’) and the beginning
+     of the body (which lasts from ‘content’ to ‘end’).  If the value of
+     ‘content’ is nil, then the section has no heading and its body
+     cannot be collapsed.  If a section does have a heading then its
+     height must be exactly one line, including a trailing newline
+     character.  This isn’t enforced; you are responsible for getting it
+     right.  The only exception is that this function does insert a
+     newline character if necessary.
+
+ -- Function: magit-cancel-section
+     Cancel the section currently being inserted.  This exits the
+     innermost call to ‘magit-insert-section’ and removes all traces of
+     what has already happened inside that call.
+
+ -- Function: magit-define-section-jumper sym title &optional value
+     Define an interactive function to go to section SYM.  TITLE is the
+     displayed title of the section.
+
+
+File: magit.info,  Node: Section Selection,  Next: Matching Sections,  Prev: Creating Sections,  Up: Section Plumbing
+
+10.2.2 Section Selection
+------------------------
+
+ -- Function: magit-current-section
+     Return the section at point.
+
+ -- Function: magit-region-sections &optional condition multiple
+     Return a list of the selected sections.
+
+     When the region is active and constitutes a valid section
+     selection, then return a list of all selected sections.  This is
+     the case when the region begins in the heading of a section and
+     ends in the heading of the same section or in that of a sibling
+     section.  If optional MULTIPLE is non-nil, then the region cannot
+     begin and end in the same section.
+
+     When the selection is not valid, then return nil.  In this case,
+     most commands that can act on the selected sections will instead
+     act on the section at point.
+
+     When the region looks like it would in any other buffer then the
+     selection is invalid.  When the selection is valid then the region
+     uses the ‘magit-section-highlight’ face.  This does not apply to
+     diffs where things get a bit more complicated, but even here if the
+     region looks like it usually does, then that’s not a valid
+     selection as far as this function is concerned.
+
+     If optional CONDITION is non-nil, then the selection not only has
+     to be valid; all selected sections additionally have to match
+     CONDITION, or nil is returned.  See ‘magit-section-match’ for the
+     forms CONDITION can take.
+
+ -- Function: magit-region-values &optional condition multiple
+     Return a list of the values of the selected sections.
+
+     Return the values that themselves would be returned by
+     ‘magit-region-sections’ (which see).
+
+
+File: magit.info,  Node: Matching Sections,  Prev: Section Selection,  Up: Section Plumbing
+
+10.2.3 Matching Sections
+------------------------
+
+‘M-x magit-describe-section-briefly’
+     Show information about the section at point.  This command is
+     intended for debugging purposes.
+
+ -- Function: magit-section-ident section
+     Return an unique identifier for SECTION.  The return value has the
+     form ‘((TYPE . VALUE)...)’.
+
+ -- Function: magit-get-section ident &optional root
+     Return the section identified by IDENT.  IDENT has to be a list as
+     returned by ‘magit-section-ident’.
+
+ -- Function: magit-section-match condition &optional section
+     Return ‘t’ if SECTION matches CONDITION.  SECTION defaults to the
+     section at point.  If SECTION is not specified and there also is no
+     section at point, then return ‘nil’.
+
+     CONDITION can take the following forms:
+        • ‘(CONDITION...)’
+
+          matches if any of the CONDITIONs matches.
+
+        • ‘[CLASS...]’
+
+          matches if the section’s class is the same as the first CLASS
+          or a subclass of that; the section’s parent class matches the
+          second CLASS; and so on.
+
+        • ‘[* CLASS...]’
+
+          matches sections that match ‘[CLASS...]’ and also recursively
+          all their child sections.
+
+        • ‘CLASS’
+
+          matches if the section’s class is the same as CLASS or a
+          subclass of that; regardless of the classes of the parent
+          sections.
+
+     Each CLASS should be a class symbol, identifying a class that
+     derives from ‘magit-section’.  For backward compatibility CLASS can
+     also be a "type symbol".  A section matches such a symbol if the
+     value of its ‘type’ slot is ‘eq’.  If a type symbol has an entry in
+     ‘magit--section-type-alist’, then a section also matches that type
+     if its class is a subclass of the class that corresponds to the
+     type as per that alist.
+
+     Note that it is not necessary to specify the complete section
+     lineage as printed by ‘magit-describe-section-briefly’, unless of
+     course you want to be that precise.
+
+ -- Function: magit-section-value-if condition &optional section
+     If the section at point matches CONDITION, then return its value.
+
+     If optional SECTION is non-nil then test whether that matches
+     instead.  If there is no section at point and SECTION is nil, then
+     return nil.  If the section does not match, then return nil.
+
+     See ‘magit-section-match’ for the forms CONDITION can take.
+
+ -- Function: magit-section-case &rest clauses
+     Choose among clauses on the type of the section at point.
+
+     Each clause looks like (CONDITION BODY...).  The type of the
+     section is compared against each CONDITION; the BODY forms of the
+     first match are evaluated sequentially and the value of the last
+     form is returned.  Inside BODY the symbol ‘it’ is bound to the
+     section at point.  If no clause succeeds or if there is no section
+     at point return nil.
+
+     See ‘magit-section-match’ for the forms CONDITION can take.
+     Additionally a CONDITION of t is allowed in the final clause and
+     matches if no other CONDITION match, even if there is no section at
+     point.
+
+ -- Variable: magit-root-section
+     The root section in the current buffer.  All other sections are
+     descendants of this section.  The value of this variable is set by
+     ‘magit-insert-section’ and you should never modify it.
+
+   For diff related sections a few additional tools exist.
+
+ -- Function: magit-diff-type &optional section
+     Return the diff type of SECTION.
+
+     The returned type is one of the symbols ‘staged’, ‘unstaged’,
+     ‘committed’, or ‘undefined’.  This type serves a similar purpose as
+     the general type common to all sections (which is stored in the
+     ‘type’ slot of the corresponding ‘magit-section’ struct) but takes
+     additional information into account.  When the SECTION isn’t
+     related to diffs and the buffer containing it also isn’t a
+     diff-only buffer, then return nil.
+
+     Currently the type can also be one of ‘tracked’ and ‘untracked’,
+     but these values are not handled explicitly in every place they
+     should be.  A possible fix could be to just return nil here.
+
+     The section has to be a ‘diff’ or ‘hunk’ section, or a section
+     whose children are of type ‘diff’.  If optional SECTION is nil,
+     return the diff type for the current section.  In buffers whose
+     major mode is ‘magit-diff-mode’ SECTION is ignored and the type is
+     determined using other means.  In ‘magit-revision-mode’ buffers the
+     type is always ‘committed’.
+
+ -- Function: magit-diff-scope &optional section strict
+     Return the diff scope of SECTION or the selected section(s).
+
+     A diff’s "scope" describes what part of a diff is selected, it is a
+     symbol, one of ‘region’, ‘hunk’, ‘hunks’, ‘file’, ‘files’, or
+     ‘list’.  Do not confuse this with the diff "type", as returned by
+     ‘magit-diff-type’.
+
+     If optional SECTION is non-nil, then return the scope of that,
+     ignoring the sections selected by the region.  Otherwise return the
+     scope of the current section, or if the region is active and
+     selects a valid group of diff related sections, the type of these
+     sections, i.e., ‘hunks’ or ‘files’.  If SECTION (or if the current
+     section that is nil) is a ‘hunk’ section and the region starts and
+     ends inside the body of a that section, then the type is ‘region’.
+
+     If optional STRICT is non-nil then return nil if the diff type of
+     the section at point is ‘untracked’ or the section at point is not
+     actually a ‘diff’ but a ‘diffstat’ section.
+
+
+File: magit.info,  Node: Refreshing Buffers,  Next: Conventions,  Prev: Section Plumbing,  Up: Plumbing
+
+10.3 Refreshing Buffers
+=======================
+
+All commands that create a new Magit buffer or change what is being
+displayed in an existing buffer do so by calling ‘magit-mode-setup’.
+Among other things, that function sets the buffer local values of
+‘default-directory’ (to the top-level of the repository),
+‘magit-refresh-function’, and ‘magit-refresh-args’.
+
+   Buffers are refreshed by calling the function that is the local value
+of ‘magit-refresh-function’ (a function named ‘magit-*-refresh-buffer’,
+where ‘*’ may be something like ‘diff’) with the value of
+‘magit-refresh-args’ as arguments.
+
+ -- Macro: magit-mode-setup buffer switch-func mode refresh-func
+          &optional refresh-args
+     This function displays and selects BUFFER, turns on MODE, and
+     refreshes a first time.
+
+     This function displays and optionally selects BUFFER by calling
+     ‘magit-mode-display-buffer’ with BUFFER, MODE and SWITCH-FUNC as
+     arguments.  Then it sets the local value of
+     ‘magit-refresh-function’ to REFRESH-FUNC and that of
+     ‘magit-refresh-args’ to REFRESH-ARGS.  Finally it creates the
+     buffer content by calling REFRESH-FUNC with REFRESH-ARGS as
+     arguments.
+
+     All arguments are evaluated before switching to BUFFER.
+
+ -- Function: magit-mode-display-buffer buffer mode &optional
+          switch-function
+     This function display BUFFER in some window and select it.  BUFFER
+     may be a buffer or a string, the name of a buffer.  The buffer is
+     returned.
+
+     Unless BUFFER is already displayed in the selected frame, store the
+     previous window configuration as a buffer local value, so that it
+     can later be restored by ‘magit-mode-bury-buffer’.
+
+     The buffer is displayed and selected using SWITCH-FUNCTION.  If
+     that is ‘nil’ then ‘pop-to-buffer’ is used if the current buffer’s
+     major mode derives from ‘magit-mode’.  Otherwise ‘switch-to-buffer’
+     is used.
+
+ -- Variable: magit-refresh-function
+     The value of this buffer-local variable is the function used to
+     refresh the current buffer.  It is called with ‘magit-refresh-args’
+     as arguments.
+
+ -- Variable: magit-refresh-args
+     The list of arguments used by ‘magit-refresh-function’ to refresh
+     the current buffer.  ‘magit-refresh-function’ is called with these
+     arguments.
+
+     The value is usually set using ‘magit-mode-setup’, but in some
+     cases it’s also useful to provide commands that can change the
+     value.  For example, the ‘magit-diff-refresh’ transient can be used
+     to change any of the arguments used to display the diff, without
+     having to specify again which differences should be shown, but
+     ‘magit-diff-more-context’, ‘magit-diff-less-context’ and
+     ‘magit-diff-default-context’ change just the ‘-U<N>’ argument.  In
+     both case this is done by changing the value of this variable and
+     then calling this ‘magit-refresh-function’.
+
+
+File: magit.info,  Node: Conventions,  Prev: Refreshing Buffers,  Up: Plumbing
+
+10.4 Conventions
+================
+
+Also see *note Completion and Confirmation::.
+
+* Menu:
+
+* Theming Faces::
+
+
+File: magit.info,  Node: Theming Faces,  Up: Conventions
+
+10.4.1 Theming Faces
+--------------------
+
+The default theme uses blue for local branches, green for remote
+branches, and goldenrod (brownish yellow) for tags.  When creating a new
+theme, you should probably follow that example.  If your theme already
+uses other colors, then stick to that.
+
+   In older releases these reference faces used to have a background
+color and a box around them.  The basic default faces no longer do so,
+to make Magit buffers much less noisy, and you should follow that
+example at least with regards to boxes.  (Boxes were used in the past to
+work around a conflict between the highlighting overlay and text
+property backgrounds.  That’s no longer necessary because highlighting
+no longer causes other background colors to disappear.)  Alternatively
+you can keep the background color and/or box, but then have to take
+special care to adjust ‘magit-branch-current’ accordingly.  By default
+it looks mostly like ‘magit-branch-local’, but with a box (by default
+the former is the only face that uses a box, exactly so that it sticks
+out).  If the former also uses a box, then you have to make sure that it
+differs in some other way from the latter.
+
+   The most difficult faces to theme are those related to diffs,
+headings, highlighting, and the region.  There are faces that fall into
+all four groups - expect to spend some time getting this right.
+
+   The ‘region’ face in the default theme, in both the light and dark
+variants, as well as in many other themes, distributed with Emacs or by
+third-parties, is very ugly.  It is common to use a background color
+that really sticks out, which is ugly but if that were the only problem
+then it would be acceptable.  Unfortunately many themes also set the
+foreground color, which ensures that all text within the region is
+readable.  Without doing that there might be cases where some foreground
+color is too close to the region background color to still be readable.
+But it also means that text within the region loses all syntax
+highlighting.
+
+   I consider the work that went into getting the ‘region’ face right to
+be a good indicator for the general quality of a theme.  My
+recommendation for the ‘region’ face is this: use a background color
+slightly different from the background color of the ‘default’ face, and
+do not set the foreground color at all.  So for a light theme you might
+use a light (possibly tinted) gray as the background color of ‘default’
+and a somewhat darker gray for the background of ‘region’.  That should
+usually be enough to not collide with the foreground color of any other
+face.  But if some other faces also set a light gray as background
+color, then you should also make sure it doesn’t collide with those (in
+some cases it might be acceptable though).
+
+   Magit only uses the ‘region’ face when the region is "invalid" by its
+own definition.  In a Magit buffer the region is used to either select
+multiple sibling sections, so that commands which support it act on all
+of these sections instead of just the current section, or to select
+lines within a single hunk section.  In all other cases, the section is
+considered invalid and Magit won’t act on it.  But such invalid sections
+happen, either because the user has not moved point enough yet to make
+it valid or because she wants to use a non-magit command to act on the
+region, e.g., ‘kill-region’.
+
+   So using the regular ‘region’ face for invalid sections is a feature.
+It tells the user that Magit won’t be able to act on it.  It’s
+acceptable if that face looks a bit odd and even (but less so) if it
+collides with the background colors of section headings and other things
+that have a background color.
+
+   Magit highlights the current section.  If a section has subsections,
+then all of them are highlighted.  This is done using faces that have
+"highlight" in their names.  For most sections,
+‘magit-section-highlight’ is used for both the body and the heading.
+Like the ‘region’ face, it should only set the background color to
+something similar to that of ‘default’.  The highlight background color
+must be different from both the ‘region’ background color and the
+‘default’ background color.
+
+   For diff related sections Magit uses various faces to highlight
+different parts of the selected section(s).  Note that hunk headings,
+unlike all other section headings, by default have a background color,
+because it is useful to have very visible separators between hunks.
+That face ‘magit-diff-hunk-heading’, should be different from both
+‘magit-diff-hunk-heading-highlight’ and ‘magit-section-highlight’, as
+well as from ‘magit-diff-context’ and ‘magit-diff-context-highlight’.
+By default we do that by changing the foreground color.  Changing the
+background color would lead to complications, and there are already
+enough we cannot get around.  (Also note that it is generally a good
+idea for section headings to always be bold, but only for sections that
+have subsections).
+
+   When there is a valid region selecting diff-related sibling sections,
+i.e., multiple files or hunks, then the bodies of all these sections use
+the respective highlight faces, but additionally the headings instead
+use one of the faces ‘magit-diff-file-heading-selection’ or
+‘magit-diff-hunk-heading-selection’.  These faces have to be different
+from the regular highlight variants to provide explicit visual
+indication that the region is active.
+
+   When theming diff related faces, start by setting the option
+‘magit-diff-refine-hunk’ to ‘all’.  You might personally prefer to only
+refine the current hunk or not use hunk refinement at all, but some of
+the users of your theme want all hunks to be refined, so you have to
+cater to that.
+
+   (Also turn on ‘magit-diff-highlight-indentation’,
+‘magit-diff-highlight-trailing’, and ‘magit-diff-paint-whitespace’; and
+insert some whitespace errors into the code you use for testing.)
+
+   For added lines you have to adjust three faces: ‘magit-diff-added’,
+‘magit-diff-added-highlight’, and ‘diff-refined-added’.  Make sure that
+the latter works well with both of the former, as well as ‘smerge-other’
+and ‘diff-added’.  Then do the same for the removed lines, context
+lines, lines added by us, and lines added by them.  Also make sure the
+respective added, removed, and context faces use approximately the same
+saturation for both the highlighted and unhighlighted variants.  Also
+make sure the file and diff headings work nicely with context lines
+(e.g., make them look different).  Line faces should set both the
+foreground and the background color.  For example, for added lines use
+two different greens.
+
+   It’s best if the foreground color of both the highlighted and the
+unhighlighted variants are the same, so you will need to have to find a
+color that works well on the highlight and unhighlighted background, the
+refine background, and the highlight context background.  When there is
+an hunk internal region, then the added- and removed-lines background
+color is used only within that region.  Outside the region the
+highlighted context background color is used.  This makes it easier to
+see what is being staged.  With an hunk internal region the hunk heading
+is shown using ‘magit-diff-hunk-heading-selection’, and so are the thin
+lines that are added around the lines that fall within the region.  The
+background color of that has to be distinct enough from the various
+other involved background colors.
+
+   Nobody said this would be easy.  If your theme restricts itself to a
+certain set of colors, then you should make an exception here.
+Otherwise it would be impossible to make the diffs look good in each and
+every variation.  Actually you might want to just stick to the default
+definitions for these faces.  You have been warned.  Also please note
+that if you do not get this right, this will in some cases look to users
+like bugs in Magit - so please do it right or not at all.
+
+
+File: magit.info,  Node: FAQ,  Next: Debugging Tools,  Prev: Plumbing,  Up: Top
+
+Appendix A FAQ
+**************
+
+The next two nodes lists frequently asked questions.  For a list of
+frequently *and recently* asked questions, i.e., questions that haven’t
+made it into the manual yet, see
+<https://github.com/magit/magit/wiki/FAQ>.
+
+   Please also see *note Debugging Tools::.
+
+* Menu:
+
+* FAQ - How to ...?::
+* FAQ - Issues and Errors::
+
+
+File: magit.info,  Node: FAQ - How to ...?,  Next: FAQ - Issues and Errors,  Up: FAQ
+
+A.1 FAQ - How to ...?
+=====================
+
+* Menu:
+
+* How to pronounce Magit?::
+* How to show git's output?::
+* How to install the gitman info manual?::
+* How to show diffs for gpg-encrypted files?::
+* How does branching and pushing work?::
+* Should I disable VC?::
+
+
+File: magit.info,  Node: How to pronounce Magit?,  Next: How to show git's output?,  Up: FAQ - How to ...?
+
+A.1.1 How to pronounce Magit?
+-----------------------------
+
+Either ‘mu[m's] git’ or ‘magi{c => t}’ is fine.
+
+   The slogan is "It’s Magit!  The magical Git client", so it makes
+sense to pronounce Magit like magic, while taking into account that C
+and T do not sound the same.
+
+   The German "Magie" is not pronounced the same as the English "magic",
+so if you speak German then you can use the above rationale to justify
+using the former pronunciation; ‘Mag{ie => it}’.
+
+   You can also choose to use the former pronunciation just because you
+like it better.
+
+   Also see <https://magit.vc/assets/videos/magic.mp4>.  Also see
+<https://emacs.stackexchange.com/questions/13696>.
+
+
+File: magit.info,  Node: How to show git's output?,  Next: How to install the gitman info manual?,  Prev: How to pronounce Magit?,  Up: FAQ - How to ...?
+
+A.1.2 How to show git’s output?
+-------------------------------
+
+To show the output of recently run git commands, press ‘$’ (or, if that
+isn’t available, ‘M-x magit-process-buffer’).  This will show a buffer
+containing a section per git invocation; as always press ‘TAB’ to expand
+or collapse them.
+
+   By default, git’s output is only inserted into the process buffer if
+it is run for side-effects.  When the output is consumed in some way,
+also inserting it into the process buffer would be too expensive.  For
+debugging purposes, it’s possible to do so anyway by setting
+‘magit-git-debug’ to ‘t’.
+
+
+File: magit.info,  Node: How to install the gitman info manual?,  Next: How to show diffs for gpg-encrypted files?,  Prev: How to show git's output?,  Up: FAQ - How to ...?
+
+A.1.3 How to install the gitman info manual?
+--------------------------------------------
+
+Git’s manpages can be exported as an info manual called ‘gitman’.
+Magit’s own info manual links to nodes in that manual instead of the
+actual manpages because Info doesn’t support linking to manpages.
+
+   Unfortunately some distributions do not install the ‘gitman’ manual
+by default and you will have to install a separate documentation package
+to get it.
+
+   Magit patches Info adding the ability to visit links to the ‘gitman’
+Info manual by instead viewing the respective manpage.  If you prefer
+that approach, then set the value of ‘magit-view-git-manual-method’ to
+one of the supported packages ‘man’ or ‘woman’, e.g.:
+
+     (setq magit-view-git-manual-method 'man)
+
+
+File: magit.info,  Node: How to show diffs for gpg-encrypted files?,  Next: How does branching and pushing work?,  Prev: How to install the gitman info manual?,  Up: FAQ - How to ...?
+
+A.1.4 How to show diffs for gpg-encrypted files?
+------------------------------------------------
+
+Git supports showing diffs for encrypted files, but has to be told to do
+so.  Since Magit just uses Git to get the diffs, configuring Git also
+affects the diffs displayed inside Magit.
+
+     git config --global diff.gpg.textconv "gpg --no-tty --decrypt"
+     echo "*.gpg filter=gpg diff=gpg" > .gitattributes
+
+
+File: magit.info,  Node: How does branching and pushing work?,  Next: Should I disable VC?,  Prev: How to show diffs for gpg-encrypted files?,  Up: FAQ - How to ...?
+
+A.1.5 How does branching and pushing work?
+------------------------------------------
+
+Please see *note Branching:: and
+<https://emacsair.me/2016/01/17/magit-2.4>
+
+
+File: magit.info,  Node: Should I disable VC?,  Prev: How does branching and pushing work?,  Up: FAQ - How to ...?
+
+A.1.6 Should I disable VC?
+--------------------------
+
+If you don’t use VC (the built-in version control interface) then you
+might be tempted to disable it, not least because we used to recommend
+that you do that.
+
+   We no longer recommend that you disable VC.  Doing so would break
+useful third-party packages (such as ‘diff-hl’), which depend on VC
+being enabled.
+
+   If you choose to disable VC anyway, then you can do so by changing
+the value of ‘vc-handled-backends’.
+
+
+File: magit.info,  Node: FAQ - Issues and Errors,  Prev: FAQ - How to ...?,  Up: FAQ
+
+A.2 FAQ - Issues and Errors
+===========================
+
+* Menu:
+
+* Magit is slow::
+* I changed several thousand files at once and now Magit is unusable::
+* I am having problems committing::
+* I am using MS Windows and cannot push with Magit::
+* I am using macOS and SOMETHING works in shell, but not in Magit: I am using macOS and SOMETHING works in shell but not in Magit.
+* Expanding a file to show the diff causes it to disappear::
+* Point is wrong in the COMMIT_EDITMSG buffer::
+* The mode-line information isn't always up-to-date::
+* A branch and tag sharing the same name breaks SOMETHING::
+* My Git hooks work on the command-line but not inside Magit::
+* git-commit-mode isn't used when committing from the command-line::
+* Point ends up inside invisible text when jumping to a file-visiting buffer::
+* I am no longer able to save popup defaults::
+
+
+File: magit.info,  Node: Magit is slow,  Next: I changed several thousand files at once and now Magit is unusable,  Up: FAQ - Issues and Errors
+
+A.2.1 Magit is slow
+-------------------
+
+See *note Performance:: and *note I changed several thousand files at
+once and now Magit is unusable::.
+
+
+File: magit.info,  Node: I changed several thousand files at once and now Magit is unusable,  Next: I am having problems committing,  Prev: Magit is slow,  Up: FAQ - Issues and Errors
+
+A.2.2 I changed several thousand files at once and now Magit is unusable
+------------------------------------------------------------------------
+
+Magit is currently not expected to work well under such conditions.  It
+sure would be nice if it did.  Reaching satisfactory performance under
+such conditions will require some heavy refactoring.  This is no small
+task but I hope to eventually find the time to make it happen.
+
+   But for now we recommend you use the command line to complete this
+one commit.  Also see *note Performance::.
+
+
+File: magit.info,  Node: I am having problems committing,  Next: I am using MS Windows and cannot push with Magit,  Prev: I changed several thousand files at once and now Magit is unusable,  Up: FAQ - Issues and Errors
+
+A.2.3 I am having problems committing
+-------------------------------------
+
+That likely means that Magit is having problems finding an appropriate
+emacsclient executable.  See *note (with-editor)Configuring
+With-Editor:: and *note (with-editor)Debugging::.
+
+
+File: magit.info,  Node: I am using MS Windows and cannot push with Magit,  Next: I am using macOS and SOMETHING works in shell but not in Magit,  Prev: I am having problems committing,  Up: FAQ - Issues and Errors
+
+A.2.4 I am using MS Windows and cannot push with Magit
+------------------------------------------------------
+
+It’s almost certain that Magit is only incidental to this issue.  It is
+much more likely that this is a configuration issue, even if you can
+push on the command line.
+
+   Detailed setup instructions can be found at
+<https://github.com/magit/magit/wiki/Pushing-with-Magit-from-Windows>.
+
+
+File: magit.info,  Node: I am using macOS and SOMETHING works in shell but not in Magit,  Next: Expanding a file to show the diff causes it to disappear,  Prev: I am using MS Windows and cannot push with Magit,  Up: FAQ - Issues and Errors
+
+A.2.5 I am using macOS and SOMETHING works in shell, but not in Magit
+---------------------------------------------------------------------
+
+This usually occurs because Emacs doesn’t have the same environment
+variables as your shell.  Try installing and configuring
+<https://github.com/purcell/exec-path-from-shell>.  By default it
+synchronizes ‘$PATH’, which helps Magit find the same ‘git’ as the one
+you are using on the shell.
+
+   If SOMETHING is "passphrase caching with gpg-agent for commit and/or
+tag signing", then you’ll also need to synchronize ‘$GPG_AGENT_INFO’.
+
+
+File: magit.info,  Node: Expanding a file to show the diff causes it to disappear,  Next: Point is wrong in the COMMIT_EDITMSG buffer,  Prev: I am using macOS and SOMETHING works in shell but not in Magit,  Up: FAQ - Issues and Errors
+
+A.2.6 Expanding a file to show the diff causes it to disappear
+--------------------------------------------------------------
+
+This is probably caused by a customization of a ‘diff.*’ Git variable.
+You probably set that variable for a reason, and should therefore only
+undo that setting in Magit by customizing ‘magit-git-global-arguments’.
+
+
+File: magit.info,  Node: Point is wrong in the COMMIT_EDITMSG buffer,  Next: The mode-line information isn't always up-to-date,  Prev: Expanding a file to show the diff causes it to disappear,  Up: FAQ - Issues and Errors
+
+A.2.7 Point is wrong in the ‘COMMIT_EDITMSG’ buffer
+---------------------------------------------------
+
+Neither Magit nor ‘git-commit.el’ fiddle with point in the buffer used
+to write commit messages, so something else must be doing it.
+
+   You have probably globally enabled a mode which restores point in
+file-visiting buffers.  It might be a bit surprising, but when you write
+a commit message, then you are actually editing a file.
+
+   So you have to figure out which package is doing it.  ‘saveplace’,
+‘pointback’, and ‘session’ are likely candidates.  These snippets might
+help:
+
+     (setq session-name-disable-regexp "\\(?:\\`'\\.git/[A-Z_]+\\'\\)")
+
+     (with-eval-after-load 'pointback
+       (lambda ()
+         (when (or git-commit-mode git-rebase-mode)
+           (pointback-mode -1))))
+
+
+File: magit.info,  Node: The mode-line information isn't always up-to-date,  Next: A branch and tag sharing the same name breaks SOMETHING,  Prev: Point is wrong in the COMMIT_EDITMSG buffer,  Up: FAQ - Issues and Errors
+
+A.2.8 The mode-line information isn’t always up-to-date
+-------------------------------------------------------
+
+Magit is not responsible for the version control information that is
+being displayed in the mode-line and looks something like ‘Git-master’.
+The built-in "Version Control" package, also known as "VC", updates that
+information, and can be told to do so more often:
+
+     (setq auto-revert-check-vc-info t)
+
+   But doing so isn’t good for performance.  For more (overly
+optimistic) information see *note (emacs)VC Mode Line::.
+
+   If you don’t really care about seeing this information in the
+mode-line, but just don’t want to see _incorrect_ information, then
+consider simply not displaying it in the mode-line:
+
+     (setq-default mode-line-format
+                   (delete '(vc-mode vc-mode) mode-line-format))
+
+
+File: magit.info,  Node: A branch and tag sharing the same name breaks SOMETHING,  Next: My Git hooks work on the command-line but not inside Magit,  Prev: The mode-line information isn't always up-to-date,  Up: FAQ - Issues and Errors
+
+A.2.9 A branch and tag sharing the same name breaks SOMETHING
+-------------------------------------------------------------
+
+Or more generally, ambiguous refnames break SOMETHING.
+
+   Magit assumes that refs are named non-ambiguously across the
+"refs/heads/", "refs/tags/", and "refs/remotes/" namespaces (i.e., all
+the names remain unique when those prefixes are stripped).  We consider
+ambiguous refnames unsupported and recommend that you use a
+non-ambiguous naming scheme.  However, if you do work with a repository
+that has ambiguous refnames, please report any issues you encounter, so
+that we can investigate whether there is a simple fix.
+
+
+File: magit.info,  Node: My Git hooks work on the command-line but not inside Magit,  Next: git-commit-mode isn't used when committing from the command-line,  Prev: A branch and tag sharing the same name breaks SOMETHING,  Up: FAQ - Issues and Errors
+
+A.2.10 My Git hooks work on the command-line but not inside Magit
+-----------------------------------------------------------------
+
+When Magit calls ‘git’ it adds a few global arguments including
+‘--literal-pathspecs’ and the ‘git’ process started by Magit then passes
+that setting on to other ‘git’ process it starts itself.  It does so by
+setting the environment variable ‘GIT_LITERAL_PATHSPECS’, not by calling
+subprocesses with the ‘--literal-pathspecs’ argument.  You can therefore
+override this setting in hook scripts using ‘unset
+GIT_LITERAL_PATHSPECS’.
+
+
+File: magit.info,  Node: git-commit-mode isn't used when committing from the command-line,  Next: Point ends up inside invisible text when jumping to a file-visiting buffer,  Prev: My Git hooks work on the command-line but not inside Magit,  Up: FAQ - Issues and Errors
+
+A.2.11 ‘git-commit-mode’ isn’t used when committing from the command-line
+-------------------------------------------------------------------------
+
+The reason for this is that ‘git-commit.el’ has not been loaded yet
+and/or that the server has not been started yet.  These things have
+always already been taken care of when you commit from Magit because in
+order to do so, Magit has to be loaded and doing that involves loading
+‘git-commit’ and starting the server.
+
+   If you want to commit from the command-line, then you have to take
+care of these things yourself.  Your ‘init.el’ file should contain:
+
+     (require 'git-commit)
+     (server-mode)
+
+   Instead of ‘(require ’git-commit)‘ you may also use:
+
+     (load "/path/to/magit-autoloads.el")
+
+   You might want to do that because loading ‘git-commit’ causes large
+parts of Magit to be loaded.
+
+   There are also some variations of ‘(server-mode)’ that you might want
+to try.  Personally I use:
+
+     (use-package server
+       :config (or (server-running-p) (server-mode)))
+
+   Now you can use:
+
+     $ emacs&
+     $ EDITOR=emacsclient git commit
+
+   However you cannot use:
+
+     $ killall emacs
+     $ EDITOR="emacsclient --alternate-editor emacs" git commit
+
+   This will actually end up using ‘emacs’, not ‘emacsclient’.  If you
+do this, then you can still edit the commit message but
+‘git-commit-mode’ won’t be used and you have to exit ‘emacs’ to finish
+the process.
+
+   Tautology ahead.  If you want to be able to use ‘emacsclient’ to
+connect to a running ‘emacs’ instance, even though no ‘emacs’ instance
+is running, then you cannot use ‘emacsclient’ directly.
+
+   Instead you have to create a script that does something like this:
+
+   Try to use ‘emacsclient’ (without using ‘--alternate-editor’).  If
+that succeeds, do nothing else.  Otherwise start ‘emacs &’ (and
+‘init.el’ must call ‘server-start’) and try to use ‘emacsclient’ again.
+
+
+File: magit.info,  Node: Point ends up inside invisible text when jumping to a file-visiting buffer,  Next: I am no longer able to save popup defaults,  Prev: git-commit-mode isn't used when committing from the command-line,  Up: FAQ - Issues and Errors
+
+A.2.12 Point ends up inside invisible text when jumping to a file-visiting buffer
+---------------------------------------------------------------------------------
+
+This can happen when you type ‘RET’ on a hunk to visit the respective
+file at the respective position.  One solution to this problem is to use
+‘global-reveal-mode’.  It makes sure that text around point is always
+visible.  If that is too drastic for your taste, then you may instead
+use ‘magit-diff-visit-file-hook’ to reveal the text, possibly using
+‘reveal-post-command’ or for Org buffers ‘org-reveal’.
+
+
+File: magit.info,  Node: I am no longer able to save popup defaults,  Prev: Point ends up inside invisible text when jumping to a file-visiting buffer,  Up: FAQ - Issues and Errors
+
+A.2.13 I am no longer able to save popup defaults
+-------------------------------------------------
+
+Magit used to use Magit-Popup to implement the transient popup menus.
+Now it used Transient instead, which is Magit-Popup’s successor.
+
+   In the older Magit-Popup menus, it was possible to save user settings
+(e.g., setting the gpg signing key for commits) by using ‘C-c C-c’ in
+the popup buffer.  This would dismiss the popup, but save the settings
+as the defaults for future popups.
+
+   When switching to Transient menus, this functionality is now
+available via ‘C-x C-s’ instead; the ‘C-x’ prefix has other options as
+well when using Transient, which will be displayed when it is typed.
+See <https://magit.vc/manual/transient/Saving-Values.html#Saving-Values>
+for more details.
+
+
+File: magit.info,  Node: Debugging Tools,  Next: Keystroke Index,  Prev: FAQ,  Up: Top
+
+B Debugging Tools
+*****************
+
+Magit and its dependencies provide a few debugging tools, and we
+appreciate it very much if you use those tools before reporting an
+issue.  Please include all relevant output when reporting an issue.
+
+‘M-x magit-version’
+     This command shows the currently used versions of Magit, Git, and
+     Emacs in the echo area.  Non-interactively this just returns the
+     Magit version.
+
+‘M-x magit-emacs-Q-command’
+     This command shows a debugging shell command in the echo area and
+     adds it to the kill ring.  Paste that command into a shell and run
+     it.
+
+     This shell command starts ‘emacs’ with only ‘magit’ and its
+     dependencies loaded.  Neither your configuration nor other
+     installed packages are loaded.  This makes it easier to determine
+     whether some issue lays with Magit or something else.
+
+     If you run Magit from its Git repository, then you should be able
+     to use ‘make emacs-Q’ instead of the output of this command.
+
+‘M-x magit-toggle-git-debug’
+     This command toggles whether additional git errors are reported.
+
+     Magit basically calls git for one of these two reasons: for
+     side-effects or to do something with its standard output.
+
+     When git is run for side-effects then its output, including error
+     messages, go into the process buffer which is shown when using ‘$’.
+
+     When git’s output is consumed in some way, then it would be too
+     expensive to also insert it into this buffer, but when this option
+     is non-nil and git returns with a non-zero exit status, then at
+     least its standard error is inserted into this buffer.
+
+     This is only intended for debugging purposes.  Do not enable this
+     permanently, that would negatively affect performance.  Also note
+     that just because git exits with a non-zero exit status and prints
+     an error message that usually doesn’t mean that it is an error as
+     far as Magit is concerned, which is another reason we usually hide
+     these error messages.  Whether some error message is relevant in
+     the context of some unexpected behavior has to be judged on a case
+     by case basis.
+
+‘M-x magit-toggle-verbose-refresh’
+     This command toggles whether Magit refreshes buffers verbosely.
+     Enabling this helps figuring out which sections are bottlenecks.
+     The additional output can be found in the ‘*Messages*’ buffer.
+
+‘M-x magit-debug-git-executable’
+     This command displays a buffer containing information about the
+     available and used ‘git’ executable(s), and can be useful when
+     investigating ‘exec-path’ issues.
+
+     Also see *note Git Executable::.
+
+‘M-x with-editor-debug’
+     This command displays a buffer containing information about the
+     available and used ‘emacsclient’ executable(s), and can be useful
+     when investigating why Magit (or rather ‘with-editor’) cannot find
+     an appropriate ‘emacsclient’ executable.
+
+     Also see *note (with-editor)Debugging::.
+
+Please also see *note FAQ::.
+
+
+File: magit.info,  Node: Keystroke Index,  Next: Function and Command Index,  Prev: Debugging Tools,  Up: Top
+
+Appendix C Keystroke Index
+**************************
+
+
+* Menu:
+
+* !:                                     Running Git Manually.
+                                                              (line  13)
+* ! !:                                   Running Git Manually.
+                                                              (line  17)
+* ! a:                                   Running Git Manually.
+                                                              (line  53)
+* ! b:                                   Running Git Manually.
+                                                              (line  56)
+* ! g:                                   Running Git Manually.
+                                                              (line  59)
+* ! k:                                   Running Git Manually.
+                                                              (line  50)
+* ! m:                                   Running Git Manually.
+                                                              (line  62)
+* ! p:                                   Running Git Manually.
+                                                              (line  25)
+* ! s:                                   Running Git Manually.
+                                                              (line  34)
+* ! S:                                   Running Git Manually.
+                                                              (line  38)
+* $:                                     Viewing Git Output.  (line  17)
+* +:                                     Log Buffer.          (line  64)
+* + <1>:                                 Refreshing Diffs.    (line  65)
+* -:                                     Log Buffer.          (line  67)
+* - <1>:                                 Refreshing Diffs.    (line  62)
+* 0:                                     Refreshing Diffs.    (line  68)
+* 1:                                     Section Visibility.  (line  39)
+* 2:                                     Section Visibility.  (line  39)
+* 3:                                     Section Visibility.  (line  39)
+* 4:                                     Section Visibility.  (line  39)
+* 5:                                     Repository List.     (line 115)
+* ::                                     Running Git Manually.
+                                                              (line  25)
+* =:                                     Log Buffer.          (line  59)
+* >:                                     Sparse checkouts.    (line  17)
+* > a:                                   Sparse checkouts.    (line  39)
+* > d:                                   Sparse checkouts.    (line  50)
+* > e:                                   Sparse checkouts.    (line  21)
+* > r:                                   Sparse checkouts.    (line  44)
+* > s:                                   Sparse checkouts.    (line  33)
+* ^:                                     Section Movement.    (line  28)
+* a:                                     Applying.            (line  34)
+* A:                                     Cherry Picking.      (line   9)
+* A A:                                   Cherry Picking.      (line  17)
+* A a:                                   Cherry Picking.      (line  23)
+* A A <1>:                               Cherry Picking.      (line  85)
+* A a <1>:                               Cherry Picking.      (line  91)
+* A d:                                   Cherry Picking.      (line  51)
+* A h:                                   Cherry Picking.      (line  40)
+* A n:                                   Cherry Picking.      (line  62)
+* A s:                                   Cherry Picking.      (line  72)
+* A s <1>:                               Cherry Picking.      (line  88)
+* B:                                     Bisecting.           (line   9)
+* b:                                     Blaming.             (line 115)
+* b <1>:                                 Branch Commands.     (line  13)
+* b <2>:                                 Editing Rebase Sequences.
+                                                              (line  70)
+* B B:                                   Bisecting.           (line  16)
+* B b:                                   Bisecting.           (line  32)
+* b b:                                   Branch Commands.     (line  47)
+* b C:                                   Branch Commands.     (line  31)
+* b c:                                   Branch Commands.     (line  63)
+* B g:                                   Bisecting.           (line  36)
+* B k:                                   Bisecting.           (line  46)
+* b k:                                   Branch Commands.     (line 138)
+* b l:                                   Branch Commands.     (line  69)
+* B m:                                   Bisecting.           (line  40)
+* b m:                                   Branch Commands.     (line 149)
+* b n:                                   Branch Commands.     (line  54)
+* B r:                                   Bisecting.           (line  51)
+* B s:                                   Bisecting.           (line  26)
+* b s:                                   Branch Commands.     (line  91)
+* b S:                                   Branch Commands.     (line 118)
+* b x:                                   Branch Commands.     (line 123)
+* c:                                     Blaming.             (line 141)
+* C:                                     Cloning Repository.  (line  20)
+* c <1>:                                 Initiating a Commit. (line   9)
+* c <2>:                                 Editing Rebase Sequences.
+                                                              (line  59)
+* C >:                                   Cloning Repository.  (line  38)
+* c a:                                   Initiating a Commit. (line  18)
+* c A:                                   Initiating a Commit. (line  59)
+* C b:                                   Cloning Repository.  (line  44)
+* C C:                                   Cloning Repository.  (line  28)
+* c c:                                   Initiating a Commit. (line  14)
+* C d:                                   Cloning Repository.  (line  55)
+* C e:                                   Cloning Repository.  (line  61)
+* c e:                                   Initiating a Commit. (line  21)
+* c f:                                   Initiating a Commit. (line  39)
+* c F:                                   Initiating a Commit. (line  46)
+* C m:                                   Cloning Repository.  (line  48)
+* C s:                                   Cloning Repository.  (line  32)
+* c s:                                   Initiating a Commit. (line  49)
+* c S:                                   Initiating a Commit. (line  56)
+* c w:                                   Initiating a Commit. (line  30)
+* C-<return>:                            Visiting Files and Blobs from a Diff.
+                                                              (line  50)
+* C-<tab>:                               Section Visibility.  (line  14)
+* C-c C-a:                               Commit Pseudo Headers.
+                                                              (line  16)
+* C-c C-b:                               Log Buffer.          (line  20)
+* C-c C-b <1>:                           Refreshing Diffs.    (line  84)
+* C-c C-c:                               Select from Log.     (line  21)
+* C-c C-c <1>:                           Editing Commit Messages.
+                                                              (line  18)
+* C-c C-c <2>:                           Editing Rebase Sequences.
+                                                              (line   7)
+* C-c C-d:                               Refreshing Diffs.    (line  75)
+* C-c C-d <1>:                           Editing Commit Messages.
+                                                              (line  54)
+* C-c C-e:                               Commands Available in Diffs.
+                                                              (line  24)
+* C-c C-f:                               Log Buffer.          (line  23)
+* C-c C-f <1>:                           Refreshing Diffs.    (line  87)
+* C-c C-i:                               Commit Pseudo Headers.
+                                                              (line  13)
+* C-c C-k:                               Select from Log.     (line  26)
+* C-c C-k <1>:                           Editing Commit Messages.
+                                                              (line  22)
+* C-c C-k <2>:                           Editing Rebase Sequences.
+                                                              (line  11)
+* C-c C-n:                               Log Buffer.          (line  26)
+* C-c C-o:                               Commit Pseudo Headers.
+                                                              (line  28)
+* C-c C-p:                               Commit Pseudo Headers.
+                                                              (line  31)
+* C-c C-r:                               Commit Pseudo Headers.
+                                                              (line  19)
+* C-c C-s:                               Commit Pseudo Headers.
+                                                              (line  22)
+* C-c C-t:                               Commands Available in Diffs.
+                                                              (line  15)
+* C-c C-t <1>:                           Commit Pseudo Headers.
+                                                              (line  25)
+* C-c C-w:                               Using the Revision Stack.
+                                                              (line   7)
+* C-c f:                                 Commands for Buffers Visiting Files.
+                                                              (line  52)
+* C-c f , c:                             Commands for Buffers Visiting Files.
+                                                              (line  52)
+* C-c f , k:                             Commands for Buffers Visiting Files.
+                                                              (line  52)
+* C-c f , r:                             Commands for Buffers Visiting Files.
+                                                              (line  52)
+* C-c f , x:                             Commands for Buffers Visiting Files.
+                                                              (line  52)
+* C-c f B:                               Blaming.             (line  28)
+* C-c f b:                               Blaming.             (line  28)
+* C-c f B <1>:                           Commands for Buffers Visiting Files.
+                                                              (line  52)
+* C-c f b <1>:                           Commands for Buffers Visiting Files.
+                                                              (line  52)
+* C-c f B b:                             Blaming.             (line  28)
+* C-c f B e:                             Blaming.             (line  28)
+* C-c f B f:                             Blaming.             (line  28)
+* C-c f B q:                             Blaming.             (line  28)
+* C-c f B r:                             Blaming.             (line  28)
+* C-c f c:                               Commands for Buffers Visiting Files.
+                                                              (line  52)
+* C-c f D:                               Commands for Buffers Visiting Files.
+                                                              (line  52)
+* C-c f d:                               Commands for Buffers Visiting Files.
+                                                              (line  52)
+* C-c f e:                               Blaming.             (line  28)
+* C-c f e <1>:                           Commands for Buffers Visiting Files.
+                                                              (line  52)
+* C-c f f:                               Blaming.             (line  28)
+* C-c f f <1>:                           Commands for Buffers Visiting Files.
+                                                              (line  52)
+* C-c f g:                               Commands for Buffers Visiting Files.
+                                                              (line  52)
+* C-c f G:                               Commands for Buffers Visiting Files.
+                                                              (line  52)
+* C-c f L:                               Commands for Buffers Visiting Files.
+                                                              (line  52)
+* C-c f l:                               Commands for Buffers Visiting Files.
+                                                              (line  52)
+* C-c f M:                               Commands for Buffers Visiting Files.
+                                                              (line  52)
+* C-c f m:                               Commands for Buffers Visiting Files.
+                                                              (line  52)
+* C-c f n:                               Commands for Buffers Visiting Files.
+                                                              (line  52)
+* C-c f p:                               Commands for Buffers Visiting Files.
+                                                              (line  52)
+* C-c f q:                               Blaming.             (line  28)
+* C-c f q <1>:                           Commands for Buffers Visiting Files.
+                                                              (line  52)
+* C-c f r:                               Blaming.             (line  28)
+* C-c f r <1>:                           Commands for Buffers Visiting Files.
+                                                              (line  52)
+* C-c f s:                               Commands for Buffers Visiting Files.
+                                                              (line  52)
+* C-c f s <1>:                           Commands for Buffers Visiting Files.
+                                                              (line  52)
+* C-c f t:                               Commands for Buffers Visiting Files.
+                                                              (line  52)
+* C-c f u:                               Commands for Buffers Visiting Files.
+                                                              (line  52)
+* C-c f u <1>:                           Commands for Buffers Visiting Files.
+                                                              (line  52)
+* C-c f v:                               Commands for Buffers Visiting Files.
+                                                              (line  52)
+* C-c f V:                               Commands for Buffers Visiting Files.
+                                                              (line  52)
+* C-c g:                                 Transient Commands.  (line  20)
+* C-c M-g:                               Commands for Buffers Visiting Files.
+                                                              (line  58)
+* C-c M-g , c:                           Commands for Buffers Visiting Files.
+                                                              (line  86)
+* C-c M-g , k:                           Commands for Buffers Visiting Files.
+                                                              (line  82)
+* C-c M-g , r:                           Commands for Buffers Visiting Files.
+                                                              (line  78)
+* C-c M-g , x:                           Commands for Buffers Visiting Files.
+                                                              (line  74)
+* C-c M-g B:                             Blaming.             (line  34)
+* C-c M-g b:                             Blaming.             (line  45)
+* C-c M-g B <1>:                         Commands for Buffers Visiting Files.
+                                                              (line 137)
+* C-c M-g B b:                           Blaming.             (line  45)
+* C-c M-g B e:                           Blaming.             (line  76)
+* C-c M-g B f:                           Blaming.             (line  68)
+* C-c M-g B q:                           Blaming.             (line  87)
+* C-c M-g B r:                           Blaming.             (line  60)
+* C-c M-g c:                             Commands for Buffers Visiting Files.
+                                                              (line 176)
+* C-c M-g D:                             Commands for Buffers Visiting Files.
+                                                              (line  91)
+* C-c M-g d:                             Commands for Buffers Visiting Files.
+                                                              (line 101)
+* C-c M-g e:                             Blaming.             (line  76)
+* C-c M-g e <1>:                         Commands for Buffers Visiting Files.
+                                                              (line 182)
+* C-c M-g f:                             Blaming.             (line  68)
+* C-c M-g g:                             Commands for Buffers Visiting Files.
+                                                              (line 166)
+* C-c M-g G:                             Commands for Buffers Visiting Files.
+                                                              (line 172)
+* C-c M-g L:                             Commands for Buffers Visiting Files.
+                                                              (line 109)
+* C-c M-g l:                             Commands for Buffers Visiting Files.
+                                                              (line 119)
+* C-c M-g M:                             Commands for Buffers Visiting Files.
+                                                              (line 132)
+* C-c M-g n:                             Commands for Buffers Visiting Files.
+                                                              (line 153)
+* C-c M-g p:                             Commands for Buffers Visiting Files.
+                                                              (line 149)
+* C-c M-g q:                             Blaming.             (line  87)
+* C-c M-g r:                             Blaming.             (line  60)
+* C-c M-g s:                             Commands for Buffers Visiting Files.
+                                                              (line  63)
+* C-c M-g s <1>:                         Commands for Buffers Visiting Files.
+                                                              (line  63)
+* C-c M-g t:                             Commands for Buffers Visiting Files.
+                                                              (line 129)
+* C-c M-g u:                             Commands for Buffers Visiting Files.
+                                                              (line  69)
+* C-c M-g u <1>:                         Commands for Buffers Visiting Files.
+                                                              (line  69)
+* C-c M-g v:                             Commands for Buffers Visiting Files.
+                                                              (line 156)
+* C-c M-g V:                             Commands for Buffers Visiting Files.
+                                                              (line 160)
+* C-c M-i:                               Commit Pseudo Headers.
+                                                              (line  35)
+* C-c M-s:                               Editing Commit Messages.
+                                                              (line  33)
+* C-c TAB:                               Section Visibility.  (line  14)
+* C-w:                                   Common Commands.     (line  22)
+* C-x g:                                 Status Buffer.       (line  23)
+* C-x M-g:                               Transient Commands.  (line  20)
+* C-x u:                                 Editing Rebase Sequences.
+                                                              (line  77)
+* d:                                     Diffing.             (line  22)
+* D:                                     Refreshing Diffs.    (line  16)
+* d c:                                   Diffing.             (line  63)
+* d d:                                   Diffing.             (line  27)
+* D f:                                   Refreshing Diffs.    (line  45)
+* D F:                                   Refreshing Diffs.    (line  49)
+* D g:                                   Refreshing Diffs.    (line  21)
+* d p:                                   Diffing.             (line  56)
+* d r:                                   Diffing.             (line  30)
+* D r:                                   Refreshing Diffs.    (line  41)
+* d s:                                   Diffing.             (line  48)
+* D s:                                   Refreshing Diffs.    (line  25)
+* d t:                                   Diffing.             (line  67)
+* D t:                                   Refreshing Diffs.    (line  38)
+* d u:                                   Diffing.             (line  53)
+* d w:                                   Diffing.             (line  43)
+* D w:                                   Refreshing Diffs.    (line  31)
+* DEL:                                   Log Buffer.          (line  50)
+* DEL <1>:                               Commands Available in Diffs.
+                                                              (line  56)
+* DEL <2>:                               Blaming.             (line 103)
+* DEL <3>:                               Editing Rebase Sequences.
+                                                              (line  25)
+* e:                                     Ediffing.            (line  10)
+* E:                                     Ediffing.            (line  21)
+* e <1>:                                 Editing Rebase Sequences.
+                                                              (line  46)
+* E c:                                   Ediffing.            (line 100)
+* E i:                                   Ediffing.            (line  94)
+* E m:                                   Ediffing.            (line  33)
+* E M:                                   Ediffing.            (line  48)
+* E r:                                   Ediffing.            (line  25)
+* E s:                                   Ediffing.            (line  87)
+* E t:                                   Ediffing.            (line  79)
+* E u:                                   Ediffing.            (line  91)
+* E w:                                   Ediffing.            (line  97)
+* E z:                                   Ediffing.            (line 103)
+* f:                                     Repository List.     (line 111)
+* f <1>:                                 Editing Rebase Sequences.
+                                                              (line  52)
+* f <2>:                                 Fetching.            (line  10)
+* F:                                     Pulling.             (line  10)
+* f a:                                   Fetching.            (line  45)
+* f C:                                   Branch Commands.     (line  31)
+* F C:                                   Branch Commands.     (line  31)
+* f e:                                   Fetching.            (line  34)
+* F e:                                   Pulling.             (line  28)
+* f m:                                   Fetching.            (line  48)
+* f o:                                   Fetching.            (line  37)
+* f p:                                   Fetching.            (line  15)
+* F p:                                   Pulling.             (line  14)
+* f r:                                   Fetching.            (line  41)
+* f u:                                   Fetching.            (line  22)
+* F u:                                   Pulling.             (line  21)
+* g:                                     Automatic Refreshing of Magit Buffers.
+                                                              (line  26)
+* G:                                     Automatic Refreshing of Magit Buffers.
+                                                              (line  34)
+* H:                                     Section Types and Values.
+                                                              (line  14)
+* I:                                     Creating Repository. (line   7)
+* j:                                     Log Buffer.          (line  31)
+* j <1>:                                 Commands Available in Diffs.
+                                                              (line  43)
+* k:                                     Viewing Git Output.  (line  24)
+* k <1>:                                 Applying.            (line  40)
+* k <2>:                                 Editing Rebase Sequences.
+                                                              (line  56)
+* k <3>:                                 Stashing.            (line 118)
+* l:                                     Logging.             (line  28)
+* L:                                     Refreshing Logs.     (line  12)
+* L <1>:                                 Log Buffer.          (line   7)
+* L <2>:                                 Log Margin.          (line  52)
+* l <1>:                                 Editing Rebase Sequences.
+                                                              (line  94)
+* l a:                                   Logging.             (line  59)
+* l b:                                   Logging.             (line  56)
+* L d:                                   Log Margin.          (line  66)
+* L g:                                   Refreshing Logs.     (line  17)
+* l h:                                   Logging.             (line  38)
+* l H:                                   Reflog.              (line  18)
+* l l:                                   Logging.             (line  33)
+* l L:                                   Logging.             (line  53)
+* L L:                                   Refreshing Logs.     (line  34)
+* L L <1>:                               Log Margin.          (line  60)
+* L l:                                   Log Margin.          (line  63)
+* l o:                                   Logging.             (line  47)
+* l O:                                   Reflog.              (line  15)
+* l r:                                   Reflog.              (line  12)
+* L s:                                   Refreshing Logs.     (line  21)
+* l u:                                   Logging.             (line  41)
+* L w:                                   Refreshing Logs.     (line  27)
+* m:                                     Repository List.     (line 105)
+* m <1>:                                 Merging.             (line  10)
+* M:                                     Remote Commands.     (line  14)
+* m a:                                   Merging.             (line  42)
+* m a <1>:                               Merging.             (line  91)
+* M a:                                   Remote Commands.     (line  48)
+* M C:                                   Remote Commands.     (line  32)
+* m e:                                   Merging.             (line  30)
+* m i:                                   Merging.             (line  54)
+* M k:                                   Remote Commands.     (line  60)
+* m m:                                   Merging.             (line  18)
+* m m <1>:                               Merging.             (line  86)
+* m n:                                   Merging.             (line  36)
+* m p:                                   Merging.             (line  75)
+* M p:                                   Remote Commands.     (line  63)
+* M P:                                   Remote Commands.     (line  67)
+* M r:                                   Remote Commands.     (line  52)
+* m s:                                   Merging.             (line  67)
+* M u:                                   Remote Commands.     (line  56)
+* M-1:                                   Section Visibility.  (line  45)
+* M-2:                                   Section Visibility.  (line  45)
+* M-3:                                   Section Visibility.  (line  45)
+* M-4:                                   Section Visibility.  (line  45)
+* M-<tab>:                               Section Visibility.  (line  29)
+* M-n:                                   Section Movement.    (line  24)
+* M-n <1>:                               Editing Commit Messages.
+                                                              (line  41)
+* M-n <2>:                               Editing Rebase Sequences.
+                                                              (line  40)
+* M-p:                                   Section Movement.    (line  19)
+* M-p <1>:                               Editing Commit Messages.
+                                                              (line  36)
+* M-p <2>:                               Editing Rebase Sequences.
+                                                              (line  37)
+* M-w:                                   Blaming.             (line 134)
+* M-w <1>:                               Common Commands.     (line  39)
+* MM:                                    Editing Rebase Sequences.
+                                                              (line 102)
+* Mt:                                    Editing Rebase Sequences.
+                                                              (line 108)
+* n:                                     Section Movement.    (line  16)
+* n <1>:                                 Blaming.             (line 118)
+* N:                                     Blaming.             (line 121)
+* n <2>:                                 Editing Rebase Sequences.
+                                                              (line  34)
+* n <3>:                                 Minor Mode for Buffers Visiting Blobs.
+                                                              (line  16)
+* o:                                     Submodule Transient. (line   7)
+* O:                                     Subtree.             (line   9)
+* o a:                                   Submodule Transient. (line  20)
+* o d:                                   Submodule Transient. (line  45)
+* O e:                                   Subtree.             (line  37)
+* O e p:                                 Subtree.             (line  48)
+* O e s:                                 Subtree.             (line  52)
+* o f:                                   Submodule Transient. (line  51)
+* O i:                                   Subtree.             (line  13)
+* O i a:                                 Subtree.             (line  24)
+* O i c:                                 Subtree.             (line  28)
+* O i f:                                 Subtree.             (line  34)
+* O i m:                                 Subtree.             (line  31)
+* o l:                                   Submodule Transient. (line  48)
+* o p:                                   Submodule Transient. (line  32)
+* o r:                                   Submodule Transient. (line  26)
+* o s:                                   Submodule Transient. (line  40)
+* o u:                                   Submodule Transient. (line  36)
+* p:                                     Section Movement.    (line  11)
+* p <1>:                                 Blaming.             (line 124)
+* P:                                     Blaming.             (line 127)
+* p <2>:                                 Editing Rebase Sequences.
+                                                              (line  31)
+* P <1>:                                 Pushing.             (line  10)
+* p <3>:                                 Minor Mode for Buffers Visiting Blobs.
+                                                              (line  13)
+* P C:                                   Branch Commands.     (line  31)
+* P e:                                   Pushing.             (line  29)
+* P m:                                   Pushing.             (line  45)
+* P o:                                   Pushing.             (line  33)
+* P p:                                   Pushing.             (line  15)
+* P r:                                   Pushing.             (line  37)
+* P t:                                   Pushing.             (line  52)
+* P T:                                   Pushing.             (line  59)
+* P u:                                   Pushing.             (line  22)
+* q:                                     Quitting Windows.    (line   7)
+* q <1>:                                 Log Buffer.          (line  14)
+* q <2>:                                 Blaming.             (line 130)
+* q <3>:                                 Minor Mode for Buffers Visiting Blobs.
+                                                              (line  19)
+* r:                                     Rebasing.            (line  10)
+* r <1>:                                 Editing Rebase Sequences.
+                                                              (line  43)
+* r a:                                   Rebasing.            (line 111)
+* r e:                                   Rebasing.            (line  42)
+* r e <1>:                               Rebasing.            (line 107)
+* r f:                                   Rebasing.            (line  79)
+* r i:                                   Rebasing.            (line  76)
+* r k:                                   Rebasing.            (line  91)
+* r m:                                   Rebasing.            (line  83)
+* r p:                                   Rebasing.            (line  28)
+* r r:                                   Rebasing.            (line  97)
+* r s:                                   Rebasing.            (line  47)
+* r s <1>:                               Rebasing.            (line 103)
+* r u:                                   Rebasing.            (line  35)
+* r w:                                   Rebasing.            (line  87)
+* RET:                                   Repository List.     (line 102)
+* RET <1>:                               References Buffer.   (line 159)
+* RET <2>:                               Visiting Files and Blobs from a Diff.
+                                                              (line   9)
+* RET <3>:                               Blaming.             (line  91)
+* RET <4>:                               Editing Rebase Sequences.
+                                                              (line  15)
+* s:                                     Staging and Unstaging.
+                                                              (line  29)
+* S:                                     Staging and Unstaging.
+                                                              (line  36)
+* s <1>:                                 Editing Rebase Sequences.
+                                                              (line  49)
+* S-<tab>:                               Section Visibility.  (line  33)
+* SPC:                                   Log Buffer.          (line  41)
+* SPC <1>:                               Commands Available in Diffs.
+                                                              (line  53)
+* SPC <2>:                               Blaming.             (line  94)
+* SPC <3>:                               Editing Rebase Sequences.
+                                                              (line  19)
+* t:                                     Editing Rebase Sequences.
+                                                              (line  97)
+* t <1>:                                 Tagging.             (line   9)
+* T:                                     Notes.               (line   9)
+* T a:                                   Notes.               (line  47)
+* T c:                                   Notes.               (line  43)
+* t k:                                   Tagging.             (line  37)
+* T m:                                   Notes.               (line  35)
+* t p:                                   Tagging.             (line  43)
+* T p:                                   Notes.               (line  28)
+* t r:                                   Tagging.             (line  18)
+* T r:                                   Notes.               (line  21)
+* t t:                                   Tagging.             (line  14)
+* T T:                                   Notes.               (line  14)
+* TAB:                                   Section Visibility.  (line  10)
+* u:                                     Repository List.     (line 108)
+* u <1>:                                 Staging and Unstaging.
+                                                              (line  42)
+* U:                                     Staging and Unstaging.
+                                                              (line  50)
+* v:                                     Applying.            (line  47)
+* V:                                     Reverting.           (line   7)
+* V a:                                   Reverting.           (line  35)
+* V s:                                   Reverting.           (line  32)
+* V V:                                   Reverting.           (line  15)
+* V v:                                   Reverting.           (line  20)
+* V V <1>:                               Reverting.           (line  29)
+* W:                                     Plain Patches.       (line   7)
+* w:                                     Maildir Patches.     (line   9)
+* w a:                                   Plain Patches.       (line  20)
+* w a <1>:                               Maildir Patches.     (line  23)
+* w a <2>:                               Maildir Patches.     (line  38)
+* W c:                                   Plain Patches.       (line  12)
+* w m:                                   Maildir Patches.     (line  20)
+* W s:                                   Plain Patches.       (line  26)
+* w s:                                   Maildir Patches.     (line  34)
+* w w:                                   Maildir Patches.     (line  14)
+* w w <1>:                               Maildir Patches.     (line  31)
+* x:                                     Editing Rebase Sequences.
+                                                              (line  62)
+* x <1>:                                 Resetting.           (line   9)
+* X f:                                   Resetting.           (line  44)
+* X h:                                   Resetting.           (line  24)
+* X i:                                   Resetting.           (line  33)
+* X k:                                   Resetting.           (line  28)
+* X m:                                   Resetting.           (line  15)
+* X s:                                   Resetting.           (line  19)
+* X w:                                   Resetting.           (line  39)
+* X w <1>:                               Wip Modes.           (line  64)
+* Y:                                     Cherries.            (line  18)
+* y:                                     References Buffer.   (line   7)
+* y <1>:                                 Editing Rebase Sequences.
+                                                              (line  74)
+* y c:                                   References Buffer.   (line  25)
+* y o:                                   References Buffer.   (line  30)
+* y r:                                   References Buffer.   (line  34)
+* y y:                                   References Buffer.   (line  21)
+* z:                                     Stashing.            (line   9)
+* Z:                                     Worktree.            (line   9)
+* z a:                                   Stashing.            (line  52)
+* z b:                                   Stashing.            (line 105)
+* z B:                                   Stashing.            (line 110)
+* Z b:                                   Worktree.            (line  13)
+* Z c:                                   Worktree.            (line  16)
+* z f:                                   Stashing.            (line 115)
+* Z g:                                   Worktree.            (line  26)
+* z i:                                   Stashing.            (line  20)
+* z I:                                   Stashing.            (line  42)
+* z k:                                   Stashing.            (line  98)
+* Z k:                                   Worktree.            (line  22)
+* z l:                                   Stashing.            (line 121)
+* Z m:                                   Worktree.            (line  19)
+* z p:                                   Stashing.            (line  74)
+* z v:                                   Stashing.            (line 102)
+* z w:                                   Stashing.            (line  24)
+* z W:                                   Stashing.            (line  46)
+* z x:                                   Stashing.            (line  30)
+* z z:                                   Stashing.            (line  14)
+* z Z:                                   Stashing.            (line  36)
+
+
+File: magit.info,  Node: Function and Command Index,  Next: Variable Index,  Prev: Keystroke Index,  Up: Top
+
+Appendix D Function and Command Index
+*************************************
+
+
+* Menu:
+
+* bug-reference-mode:                    Commit Mode and Hooks.
+                                                              (line  48)
+* forward-line:                          Editing Rebase Sequences.
+                                                              (line  34)
+* git-commit-ack:                        Commit Pseudo Headers.
+                                                              (line  16)
+* git-commit-cc:                         Commit Pseudo Headers.
+                                                              (line  28)
+* git-commit-check-style-conventions:    Commit Message Conventions.
+                                                              (line  33)
+* git-commit-insert-pseudo-header:       Commit Pseudo Headers.
+                                                              (line  13)
+* git-commit-next-message:               Editing Commit Messages.
+                                                              (line  41)
+* git-commit-prev-message:               Editing Commit Messages.
+                                                              (line  36)
+* git-commit-propertize-diff:            Commit Mode and Hooks.
+                                                              (line  40)
+* git-commit-reported:                   Commit Pseudo Headers.
+                                                              (line  31)
+* git-commit-review:                     Commit Pseudo Headers.
+                                                              (line  19)
+* git-commit-save-message:               Editing Commit Messages.
+                                                              (line  33)
+* git-commit-save-message <1>:           Commit Mode and Hooks.
+                                                              (line  26)
+* git-commit-setup-changelog-support:    Commit Mode and Hooks.
+                                                              (line  29)
+* git-commit-signoff:                    Commit Pseudo Headers.
+                                                              (line  22)
+* git-commit-suggested:                  Commit Pseudo Headers.
+                                                              (line  35)
+* git-commit-test:                       Commit Pseudo Headers.
+                                                              (line  25)
+* git-commit-turn-on-auto-fill:          Commit Mode and Hooks.
+                                                              (line  33)
+* git-commit-turn-on-flyspell:           Commit Mode and Hooks.
+                                                              (line  36)
+* git-rebase-backward-line:              Editing Rebase Sequences.
+                                                              (line  31)
+* git-rebase-break:                      Editing Rebase Sequences.
+                                                              (line  70)
+* git-rebase-edit:                       Editing Rebase Sequences.
+                                                              (line  46)
+* git-rebase-exec:                       Editing Rebase Sequences.
+                                                              (line  62)
+* git-rebase-fixup:                      Editing Rebase Sequences.
+                                                              (line  52)
+* git-rebase-insert:                     Editing Rebase Sequences.
+                                                              (line  74)
+* git-rebase-kill-line:                  Editing Rebase Sequences.
+                                                              (line  56)
+* git-rebase-label:                      Editing Rebase Sequences.
+                                                              (line  94)
+* git-rebase-merge:                      Editing Rebase Sequences.
+                                                              (line 102)
+* git-rebase-merge-toggle-editmsg:       Editing Rebase Sequences.
+                                                              (line 108)
+* git-rebase-move-line-down:             Editing Rebase Sequences.
+                                                              (line  40)
+* git-rebase-move-line-up:               Editing Rebase Sequences.
+                                                              (line  37)
+* git-rebase-pick:                       Editing Rebase Sequences.
+                                                              (line  59)
+* git-rebase-reset:                      Editing Rebase Sequences.
+                                                              (line  97)
+* git-rebase-reword:                     Editing Rebase Sequences.
+                                                              (line  43)
+* git-rebase-show-commit:                Editing Rebase Sequences.
+                                                              (line  15)
+* git-rebase-show-or-scroll-down:        Editing Rebase Sequences.
+                                                              (line  25)
+* git-rebase-show-or-scroll-up:          Editing Rebase Sequences.
+                                                              (line  19)
+* git-rebase-squash:                     Editing Rebase Sequences.
+                                                              (line  49)
+* git-rebase-undo:                       Editing Rebase Sequences.
+                                                              (line  77)
+* ido-enter-magit-status:                Status Buffer.       (line  96)
+* magit-add-section-hook:                Section Hooks.       (line  20)
+* magit-after-save-refresh-status:       Automatic Refreshing of Magit Buffers.
+                                                              (line  55)
+* magit-am:                              Maildir Patches.     (line   9)
+* magit-am-abort:                        Maildir Patches.     (line  38)
+* magit-am-apply-maildir:                Maildir Patches.     (line  20)
+* magit-am-apply-patches:                Maildir Patches.     (line  14)
+* magit-am-continue:                     Maildir Patches.     (line  31)
+* magit-am-skip:                         Maildir Patches.     (line  34)
+* magit-apply:                           Applying.            (line  34)
+* magit-bisect:                          Bisecting.           (line   9)
+* magit-bisect-bad:                      Bisecting.           (line  32)
+* magit-bisect-good:                     Bisecting.           (line  36)
+* magit-bisect-mark:                     Bisecting.           (line  40)
+* magit-bisect-reset:                    Bisecting.           (line  51)
+* magit-bisect-run:                      Bisecting.           (line  26)
+* magit-bisect-skip:                     Bisecting.           (line  46)
+* magit-bisect-start:                    Bisecting.           (line  16)
+* magit-blame:                           Blaming.             (line  28)
+* magit-blame <1>:                       Blaming.             (line  34)
+* magit-blame <2>:                       Blaming.             (line 115)
+* magit-blame <3>:                       Commands for Buffers Visiting Files.
+                                                              (line  52)
+* magit-blame <4>:                       Commands for Buffers Visiting Files.
+                                                              (line 137)
+* magit-blame-addition:                  Blaming.             (line  28)
+* magit-blame-addition <1>:              Blaming.             (line  45)
+* magit-blame-additions:                 Commands for Buffers Visiting Files.
+                                                              (line  52)
+* magit-blame-copy-hash:                 Blaming.             (line 134)
+* magit-blame-cycle-style:               Blaming.             (line 141)
+* magit-blame-echo:                      Blaming.             (line  28)
+* magit-blame-echo <1>:                  Blaming.             (line  76)
+* magit-blame-echo <2>:                  Commands for Buffers Visiting Files.
+                                                              (line  52)
+* magit-blame-next-chunk:                Blaming.             (line 118)
+* magit-blame-next-chunk-same-commit:    Blaming.             (line 121)
+* magit-blame-previous-chunk:            Blaming.             (line 124)
+* magit-blame-previous-chunk-same-commit: Blaming.            (line 127)
+* magit-blame-quit:                      Blaming.             (line  28)
+* magit-blame-quit <1>:                  Blaming.             (line  87)
+* magit-blame-quit <2>:                  Blaming.             (line 130)
+* magit-blame-quit <3>:                  Commands for Buffers Visiting Files.
+                                                              (line  52)
+* magit-blame-removal:                   Blaming.             (line  28)
+* magit-blame-removal <1>:               Blaming.             (line  60)
+* magit-blame-removal <2>:               Commands for Buffers Visiting Files.
+                                                              (line  52)
+* magit-blame-reverse:                   Blaming.             (line  28)
+* magit-blame-reverse <1>:               Blaming.             (line  68)
+* magit-blame-reverse <2>:               Commands for Buffers Visiting Files.
+                                                              (line  52)
+* magit-blob-next:                       Commands for Buffers Visiting Files.
+                                                              (line  52)
+* magit-blob-next <1>:                   Commands for Buffers Visiting Files.
+                                                              (line 153)
+* magit-blob-next <2>:                   Minor Mode for Buffers Visiting Blobs.
+                                                              (line  16)
+* magit-blob-previous:                   Commands for Buffers Visiting Files.
+                                                              (line  52)
+* magit-blob-previous <1>:               Commands for Buffers Visiting Files.
+                                                              (line 149)
+* magit-blob-previous <2>:               Minor Mode for Buffers Visiting Blobs.
+                                                              (line  13)
+* magit-blob-visit-file:                 Commands for Buffers Visiting Files.
+                                                              (line  52)
+* magit-blob-visit-file <1>:             Commands for Buffers Visiting Files.
+                                                              (line 160)
+* magit-branch:                          Branch Commands.     (line  13)
+* magit-branch-and-checkout:             Branch Commands.     (line  63)
+* magit-branch-checkout:                 Branch Commands.     (line  69)
+* magit-branch-configure:                Branch Commands.     (line  31)
+* magit-branch-create:                   Branch Commands.     (line  54)
+* magit-branch-delete:                   Branch Commands.     (line 138)
+* magit-branch-or-checkout:              Branch Commands.     (line 257)
+* magit-branch-orphan:                   Branch Commands.     (line 253)
+* magit-branch-rename:                   Branch Commands.     (line 149)
+* magit-branch-reset:                    Branch Commands.     (line 123)
+* magit-branch-shelve:                   Auxiliary Branch Commands.
+                                                              (line   9)
+* magit-branch-spinoff:                  Branch Commands.     (line  91)
+* magit-branch-spinout:                  Branch Commands.     (line 118)
+* magit-branch-unshelve:                 Auxiliary Branch Commands.
+                                                              (line  19)
+* magit-builtin-completing-read:         Support for Completion Frameworks.
+                                                              (line  41)
+* magit-bundle:                          Bundle.              (line   8)
+* magit-call-git:                        Calling Git for Effect.
+                                                              (line  28)
+* magit-call-process:                    Calling Git for Effect.
+                                                              (line  31)
+* magit-cancel-section:                  Creating Sections.   (line  69)
+* magit-checkout:                        Branch Commands.     (line  47)
+* magit-cherry:                          Cherries.            (line  18)
+* magit-cherry-apply:                    Cherry Picking.      (line  23)
+* magit-cherry-copy:                     Cherry Picking.      (line  17)
+* magit-cherry-donate:                   Cherry Picking.      (line  51)
+* magit-cherry-harvest:                  Cherry Picking.      (line  40)
+* magit-cherry-pick:                     Cherry Picking.      (line   9)
+* magit-cherry-spinoff:                  Cherry Picking.      (line  72)
+* magit-cherry-spinout:                  Cherry Picking.      (line  62)
+* magit-clone:                           Cloning Repository.  (line  20)
+* magit-clone-bare:                      Cloning Repository.  (line  44)
+* magit-clone-mirror:                    Cloning Repository.  (line  48)
+* magit-clone-regular:                   Cloning Repository.  (line  28)
+* magit-clone-shallow:                   Cloning Repository.  (line  32)
+* magit-clone-shallow-exclude:           Cloning Repository.  (line  61)
+* magit-clone-shallow-since:             Cloning Repository.  (line  55)
+* magit-clone-sparse:                    Cloning Repository.  (line  38)
+* magit-commit:                          Initiating a Commit. (line   9)
+* magit-commit <1>:                      Commands for Buffers Visiting Files.
+                                                              (line  52)
+* magit-commit <2>:                      Commands for Buffers Visiting Files.
+                                                              (line 176)
+* magit-commit-amend:                    Initiating a Commit. (line  18)
+* magit-commit-augment:                  Initiating a Commit. (line  59)
+* magit-commit-create:                   Initiating a Commit. (line  14)
+* magit-commit-extend:                   Initiating a Commit. (line  21)
+* magit-commit-fixup:                    Initiating a Commit. (line  39)
+* magit-commit-instant-fixup:            Initiating a Commit. (line  46)
+* magit-commit-instant-squash:           Initiating a Commit. (line  56)
+* magit-commit-reword:                   Initiating a Commit. (line  30)
+* magit-commit-squash:                   Initiating a Commit. (line  49)
+* magit-completing-read:                 Support for Completion Frameworks.
+                                                              (line  57)
+* magit-copy-buffer-revision:            Common Commands.     (line  39)
+* magit-copy-section-value:              Common Commands.     (line  22)
+* magit-current-section:                 Section Selection.   (line   6)
+* magit-cycle-margin-style:              Log Margin.          (line  63)
+* magit-debug-git-executable:            Git Executable.      (line  55)
+* magit-debug-git-executable <1>:        Debugging Tools.     (line  57)
+* magit-define-section-jumper:           Creating Sections.   (line  74)
+* magit-describe-section:                Section Types and Values.
+                                                              (line  14)
+* magit-describe-section-briefly:        Section Types and Values.
+                                                              (line  17)
+* magit-describe-section-briefly <1>:    Matching Sections.   (line   7)
+* magit-diff:                            Diffing.             (line  22)
+* magit-diff <1>:                        Commands for Buffers Visiting Files.
+                                                              (line  52)
+* magit-diff <2>:                        Commands for Buffers Visiting Files.
+                                                              (line  91)
+* magit-diff-buffer-file:                Commands for Buffers Visiting Files.
+                                                              (line  52)
+* magit-diff-buffer-file <1>:            Commands for Buffers Visiting Files.
+                                                              (line 101)
+* magit-diff-default-context:            Refreshing Diffs.    (line  68)
+* magit-diff-dwim:                       Diffing.             (line  27)
+* magit-diff-edit-hunk-commit:           Commands Available in Diffs.
+                                                              (line  24)
+* magit-diff-flip-revs:                  Refreshing Diffs.    (line  45)
+* magit-diff-less-context:               Refreshing Diffs.    (line  62)
+* magit-diff-more-context:               Refreshing Diffs.    (line  65)
+* magit-diff-paths:                      Diffing.             (line  56)
+* magit-diff-range:                      Diffing.             (line  30)
+* magit-diff-refresh:                    Refreshing Diffs.    (line  16)
+* magit-diff-refresh <1>:                Refreshing Diffs.    (line  21)
+* magit-diff-save-default-arguments:     Refreshing Diffs.    (line  31)
+* magit-diff-scope:                      Matching Sections.   (line 110)
+* magit-diff-set-default-arguments:      Refreshing Diffs.    (line  25)
+* magit-diff-show-or-scroll-down:        Log Buffer.          (line  50)
+* magit-diff-show-or-scroll-down <1>:    Blaming.             (line 103)
+* magit-diff-show-or-scroll-up:          Log Buffer.          (line  41)
+* magit-diff-show-or-scroll-up <1>:      Blaming.             (line  94)
+* magit-diff-staged:                     Diffing.             (line  48)
+* magit-diff-switch-range-type:          Refreshing Diffs.    (line  41)
+* magit-diff-toggle-file-filter:         Refreshing Diffs.    (line  49)
+* magit-diff-toggle-refine-hunk:         Refreshing Diffs.    (line  38)
+* magit-diff-trace-definition:           Commands Available in Diffs.
+                                                              (line  15)
+* magit-diff-type:                       Matching Sections.   (line  88)
+* magit-diff-unstaged:                   Diffing.             (line  53)
+* magit-diff-visit-file:                 Visiting Files and Blobs from a Diff.
+                                                              (line   9)
+* magit-diff-visit-file-other-frame:     Visiting Files and Blobs from a Diff.
+                                                              (line  71)
+* magit-diff-visit-file-other-window:    Visiting Files and Blobs from a Diff.
+                                                              (line  70)
+* magit-diff-visit-file-worktree:        Visiting Files and Blobs from a Diff.
+                                                              (line  50)
+* magit-diff-visit-worktree-file-other-frame: Visiting Files and Blobs from a Diff.
+                                                              (line  73)
+* magit-diff-visit-worktree-file-other-window: Visiting Files and Blobs from a Diff.
+                                                              (line  72)
+* magit-diff-while-committing:           Refreshing Diffs.    (line  75)
+* magit-diff-while-committing <1>:       Editing Commit Messages.
+                                                              (line  54)
+* magit-diff-working-tree:               Diffing.             (line  43)
+* magit-disable-section-inserter:        Per-Repository Configuration.
+                                                              (line  31)
+* magit-discard:                         Applying.            (line  40)
+* magit-dispatch:                        Transient Commands.  (line  20)
+* magit-display-buffer:                  Switching Buffers.   (line   6)
+* magit-display-buffer-fullcolumn-most-v1: Switching Buffers. (line  68)
+* magit-display-buffer-fullframe-status-topleft-v1: Switching Buffers.
+                                                              (line  59)
+* magit-display-buffer-fullframe-status-v1: Switching Buffers.
+                                                              (line  54)
+* magit-display-buffer-same-window-except-diff-v1: Switching Buffers.
+                                                              (line  49)
+* magit-display-buffer-traditional:      Switching Buffers.   (line  42)
+* magit-display-repository-buffer:       Common Commands.     (line   9)
+* magit-display-repository-buffer <1>:   Commands for Buffers Visiting Files.
+                                                              (line  52)
+* magit-display-repository-buffer <2>:   Commands for Buffers Visiting Files.
+                                                              (line 172)
+* magit-ediff:                           Ediffing.            (line  21)
+* magit-ediff-compare:                   Ediffing.            (line  25)
+* magit-ediff-dwim:                      Ediffing.            (line  10)
+* magit-ediff-resolve-all:               Ediffing.            (line  48)
+* magit-ediff-resolve-rest:              Ediffing.            (line  33)
+* magit-ediff-show-commit:               Ediffing.            (line 100)
+* magit-ediff-show-staged:               Ediffing.            (line  94)
+* magit-ediff-show-stash:                Ediffing.            (line 103)
+* magit-ediff-show-unstaged:             Ediffing.            (line  91)
+* magit-ediff-show-working-tree:         Ediffing.            (line  97)
+* magit-ediff-stage:                     Ediffing.            (line  87)
+* magit-edit-line-commit:                Commands for Buffers Visiting Files.
+                                                              (line  52)
+* magit-edit-line-commit <1>:            Commands for Buffers Visiting Files.
+                                                              (line 182)
+* magit-emacs-Q-command:                 Debugging Tools.     (line  16)
+* magit-fetch:                           Fetching.            (line  10)
+* magit-fetch-all:                       Fetching.            (line  45)
+* magit-fetch-branch:                    Fetching.            (line  37)
+* magit-fetch-from-pushremote:           Fetching.            (line  15)
+* magit-fetch-from-upstream:             Fetching.            (line  22)
+* magit-fetch-modules:                   Fetching.            (line  48)
+* magit-fetch-modules <1>:               Submodule Transient. (line  51)
+* magit-fetch-other:                     Fetching.            (line  34)
+* magit-fetch-refspec:                   Fetching.            (line  41)
+* magit-file-checkout:                   Resetting.           (line  44)
+* magit-file-checkout <1>:               Commands for Buffers Visiting Files.
+                                                              (line  52)
+* magit-file-checkout <2>:               Commands for Buffers Visiting Files.
+                                                              (line  86)
+* magit-file-delete:                     Commands for Buffers Visiting Files.
+                                                              (line  52)
+* magit-file-delete <1>:                 Commands for Buffers Visiting Files.
+                                                              (line  82)
+* magit-file-dispatch:                   Commands for Buffers Visiting Files.
+                                                              (line  52)
+* magit-file-dispatch <1>:               Commands for Buffers Visiting Files.
+                                                              (line  58)
+* magit-file-rename:                     Commands for Buffers Visiting Files.
+                                                              (line  52)
+* magit-file-rename <1>:                 Commands for Buffers Visiting Files.
+                                                              (line  78)
+* magit-file-untrack:                    Commands for Buffers Visiting Files.
+                                                              (line  52)
+* magit-file-untrack <1>:                Commands for Buffers Visiting Files.
+                                                              (line  74)
+* magit-find-file:                       General-Purpose Visit Commands.
+                                                              (line   9)
+* magit-find-file <1>:                   Commands for Buffers Visiting Files.
+                                                              (line  52)
+* magit-find-file <2>:                   Commands for Buffers Visiting Files.
+                                                              (line 156)
+* magit-find-file-other-frame:           General-Purpose Visit Commands.
+                                                              (line  19)
+* magit-find-file-other-window:          General-Purpose Visit Commands.
+                                                              (line  14)
+* magit-generate-buffer-name-default-function: Naming Buffers.
+                                                              (line  16)
+* magit-get-section:                     Matching Sections.   (line  14)
+* magit-git:                             Calling Git for Effect.
+                                                              (line  46)
+* magit-git-command:                     Running Git Manually.
+                                                              (line  25)
+* magit-git-command-topdir:              Running Git Manually.
+                                                              (line  17)
+* magit-git-exit-code:                   Getting a Value from Git.
+                                                              (line  10)
+* magit-git-failure:                     Getting a Value from Git.
+                                                              (line  17)
+* magit-git-false:                       Getting a Value from Git.
+                                                              (line  25)
+* magit-git-insert:                      Getting a Value from Git.
+                                                              (line  29)
+* magit-git-items:                       Getting a Value from Git.
+                                                              (line  41)
+* magit-git-lines:                       Getting a Value from Git.
+                                                              (line  37)
+* magit-git-mergetool:                   Running Git Manually.
+                                                              (line  62)
+* magit-git-mergetool <1>:               Ediffing.            (line  79)
+* magit-git-str:                         Getting a Value from Git.
+                                                              (line  75)
+* magit-git-string:                      Getting a Value from Git.
+                                                              (line  32)
+* magit-git-success:                     Getting a Value from Git.
+                                                              (line  13)
+* magit-git-true:                        Getting a Value from Git.
+                                                              (line  21)
+* magit-git-wash:                        Calling Git for Effect.
+                                                              (line  50)
+* magit-go-backward:                     Log Buffer.          (line  20)
+* magit-go-backward <1>:                 Refreshing Diffs.    (line  84)
+* magit-go-forward:                      Log Buffer.          (line  23)
+* magit-go-forward <1>:                  Refreshing Diffs.    (line  87)
+* magit-hunk-set-window-start:           Section Movement.    (line  45)
+* magit-ido-completing-read:             Support for Completion Frameworks.
+                                                              (line  46)
+* magit-init:                            Creating Repository. (line   7)
+* magit-insert-am-sequence:              Status Sections.     (line  25)
+* magit-insert-assumed-unchanged-files:  Status Sections.     (line  98)
+* magit-insert-bisect-log:               Status Sections.     (line  39)
+* magit-insert-bisect-output:            Status Sections.     (line  33)
+* magit-insert-bisect-rest:              Status Sections.     (line  36)
+* magit-insert-diff-filter-header:       Status Header Sections.
+                                                              (line  35)
+* magit-insert-error-header:             Status Header Sections.
+                                                              (line  26)
+* magit-insert-head-branch-header:       Status Header Sections.
+                                                              (line  38)
+* magit-insert-heading:                  Creating Sections.   (line  41)
+* magit-insert-ignored-files:            Status Sections.     (line  83)
+* magit-insert-local-branches:           References Sections. (line  16)
+* magit-insert-merge-log:                Status Sections.     (line  17)
+* magit-insert-modules:                  Status Module Sections.
+                                                              (line  12)
+* magit-insert-modules-overview:         Status Module Sections.
+                                                              (line  30)
+* magit-insert-modules-unpulled-from-pushremote: Status Module Sections.
+                                                              (line  45)
+* magit-insert-modules-unpulled-from-upstream: Status Module Sections.
+                                                              (line  40)
+* magit-insert-modules-unpushed-to-pushremote: Status Module Sections.
+                                                              (line  55)
+* magit-insert-modules-unpushed-to-upstream: Status Module Sections.
+                                                              (line  50)
+* magit-insert-push-branch-header:       Status Header Sections.
+                                                              (line  45)
+* magit-insert-rebase-sequence:          Status Sections.     (line  21)
+* magit-insert-recent-commits:           Status Sections.     (line 110)
+* magit-insert-remote-branches:          References Sections. (line  19)
+* magit-insert-remote-header:            Status Header Sections.
+                                                              (line  58)
+* magit-insert-repo-header:              Status Header Sections.
+                                                              (line  55)
+* magit-insert-section:                  Creating Sections.   (line   6)
+* magit-insert-sequencer-sequence:       Status Sections.     (line  29)
+* magit-insert-skip-worktree-files:      Status Sections.     (line  92)
+* magit-insert-staged-changes:           Status Sections.     (line  53)
+* magit-insert-stashes:                  Status Sections.     (line  56)
+* magit-insert-status-headers:           Status Header Sections.
+                                                              (line  12)
+* magit-insert-tags:                     References Sections. (line  22)
+* magit-insert-tags-header:              Status Header Sections.
+                                                              (line  49)
+* magit-insert-tracked-files:            Status Sections.     (line  80)
+* magit-insert-unpulled-cherries:        Status Sections.     (line 119)
+* magit-insert-unpulled-from-pushremote: Status Sections.     (line  66)
+* magit-insert-unpulled-from-upstream:   Status Sections.     (line  62)
+* magit-insert-unpulled-or-recent-commits: Status Sections.   (line 104)
+* magit-insert-unpushed-cherries:        Status Sections.     (line 125)
+* magit-insert-unpushed-to-pushremote:   Status Sections.     (line  74)
+* magit-insert-unpushed-to-upstream:     Status Sections.     (line  70)
+* magit-insert-unstaged-changes:         Status Sections.     (line  50)
+* magit-insert-untracked-files:          Status Sections.     (line  42)
+* magit-insert-upstream-branch-header:   Status Header Sections.
+                                                              (line  41)
+* magit-insert-user-header:              Status Header Sections.
+                                                              (line  65)
+* magit-jump-to-diffstat-or-diff:        Commands Available in Diffs.
+                                                              (line  43)
+* magit-kill-this-buffer:                Minor Mode for Buffers Visiting Blobs.
+                                                              (line  19)
+* magit-list-repositories:               Repository List.     (line   6)
+* magit-list-submodules:                 Listing Submodules.  (line  13)
+* magit-list-submodules <1>:             Submodule Transient. (line  48)
+* magit-log:                             Logging.             (line  28)
+* magit-log <1>:                         Commands for Buffers Visiting Files.
+                                                              (line  52)
+* magit-log <2>:                         Commands for Buffers Visiting Files.
+                                                              (line 109)
+* magit-log-all:                         Logging.             (line  59)
+* magit-log-all-branches:                Logging.             (line  56)
+* magit-log-branches:                    Logging.             (line  53)
+* magit-log-buffer-file:                 Commands for Buffers Visiting Files.
+                                                              (line  52)
+* magit-log-buffer-file <1>:             Commands for Buffers Visiting Files.
+                                                              (line 119)
+* magit-log-bury-buffer:                 Log Buffer.          (line  14)
+* magit-log-current:                     Logging.             (line  33)
+* magit-log-double-commit-limit:         Log Buffer.          (line  64)
+* magit-log-half-commit-limit:           Log Buffer.          (line  67)
+* magit-log-head:                        Logging.             (line  38)
+* magit-log-maybe-show-more-commits:     Section Movement.    (line  58)
+* magit-log-maybe-update-blob-buffer:    Section Movement.    (line  72)
+* magit-log-maybe-update-revision-buffer: Section Movement.   (line  65)
+* magit-log-merged:                      Commands for Buffers Visiting Files.
+                                                              (line  52)
+* magit-log-merged <1>:                  Commands for Buffers Visiting Files.
+                                                              (line 132)
+* magit-log-move-to-parent:              Log Buffer.          (line  26)
+* magit-log-move-to-revision:            Log Buffer.          (line  31)
+* magit-log-other:                       Logging.             (line  47)
+* magit-log-refresh:                     Refreshing Logs.     (line  12)
+* magit-log-refresh <1>:                 Refreshing Logs.     (line  17)
+* magit-log-refresh <2>:                 Log Buffer.          (line   7)
+* magit-log-related:                     Logging.             (line  41)
+* magit-log-save-default-arguments:      Refreshing Logs.     (line  27)
+* magit-log-select-pick:                 Select from Log.     (line  21)
+* magit-log-select-quit:                 Select from Log.     (line  26)
+* magit-log-set-default-arguments:       Refreshing Logs.     (line  21)
+* magit-log-toggle-commit-limit:         Log Buffer.          (line  59)
+* magit-log-trace-definition:            Commands for Buffers Visiting Files.
+                                                              (line  52)
+* magit-log-trace-definition <1>:        Commands for Buffers Visiting Files.
+                                                              (line 129)
+* magit-margin-settings:                 Log Margin.          (line  52)
+* magit-maybe-set-dedicated:             Switching Buffers.   (line  89)
+* magit-merge:                           Merging.             (line  10)
+* magit-merge <1>:                       Merging.             (line  86)
+* magit-merge-abort:                     Merging.             (line  91)
+* magit-merge-absorb:                    Merging.             (line  42)
+* magit-merge-editmsg:                   Merging.             (line  30)
+* magit-merge-into:                      Merging.             (line  54)
+* magit-merge-nocommit:                  Merging.             (line  36)
+* magit-merge-plain:                     Merging.             (line  18)
+* magit-merge-preview:                   Merging.             (line  75)
+* magit-merge-squash:                    Merging.             (line  67)
+* magit-mode-bury-buffer:                Quitting Windows.    (line   7)
+* magit-mode-display-buffer:             Refreshing Buffers.  (line  32)
+* magit-mode-quit-window:                Quitting Windows.    (line  34)
+* magit-mode-setup:                      Refreshing Buffers.  (line  17)
+* magit-notes:                           Notes.               (line   9)
+* magit-notes-edit:                      Notes.               (line  14)
+* magit-notes-merge:                     Notes.               (line  35)
+* magit-notes-merge-abort:               Notes.               (line  47)
+* magit-notes-merge-commit:              Notes.               (line  43)
+* magit-notes-prune:                     Notes.               (line  28)
+* magit-notes-remove:                    Notes.               (line  21)
+* magit-patch:                           Plain Patches.       (line   7)
+* magit-patch-apply:                     Plain Patches.       (line  20)
+* magit-patch-apply <1>:                 Maildir Patches.     (line  23)
+* magit-patch-create:                    Plain Patches.       (line  12)
+* magit-patch-save:                      Plain Patches.       (line  26)
+* magit-pop-revision-stack:              Using the Revision Stack.
+                                                              (line   7)
+* magit-process:                         Viewing Git Output.  (line  17)
+* magit-process-file:                    Getting a Value from Git.
+                                                              (line  57)
+* magit-process-git:                     Getting a Value from Git.
+                                                              (line  50)
+* magit-process-kill:                    Viewing Git Output.  (line  24)
+* magit-pull:                            Pulling.             (line  10)
+* magit-pull-branch:                     Pulling.             (line  28)
+* magit-pull-from-pushremote:            Pulling.             (line  14)
+* magit-pull-from-upstream:              Pulling.             (line  21)
+* magit-push:                            Pushing.             (line  10)
+* magit-push-current:                    Pushing.             (line  29)
+* magit-push-current-to-pushremote:      Pushing.             (line  15)
+* magit-push-current-to-upstream:        Pushing.             (line  22)
+* magit-push-implicitly:                 Pushing.             (line  74)
+* magit-push-matching:                   Pushing.             (line  45)
+* magit-push-other:                      Pushing.             (line  33)
+* magit-push-refspecs:                   Pushing.             (line  37)
+* magit-push-tag:                        Pushing.             (line  59)
+* magit-push-tags:                       Pushing.             (line  52)
+* magit-push-to-remote:                  Pushing.             (line  91)
+* magit-rebase:                          Rebasing.            (line  10)
+* magit-rebase-abort:                    Rebasing.            (line 111)
+* magit-rebase-autosquash:               Rebasing.            (line  79)
+* magit-rebase-branch:                   Rebasing.            (line  42)
+* magit-rebase-continue:                 Rebasing.            (line  97)
+* magit-rebase-edit:                     Rebasing.            (line 107)
+* magit-rebase-edit-commit:              Rebasing.            (line  83)
+* magit-rebase-interactive:              Rebasing.            (line  76)
+* magit-rebase-onto-pushremote:          Rebasing.            (line  28)
+* magit-rebase-onto-upstream:            Rebasing.            (line  35)
+* magit-rebase-remove-commit:            Rebasing.            (line  91)
+* magit-rebase-reword-commit:            Rebasing.            (line  87)
+* magit-rebase-skip:                     Rebasing.            (line 103)
+* magit-rebase-subset:                   Rebasing.            (line  47)
+* magit-reflog-current:                  Reflog.              (line  12)
+* magit-reflog-head:                     Reflog.              (line  18)
+* magit-reflog-other:                    Reflog.              (line  15)
+* magit-refresh:                         Automatic Refreshing of Magit Buffers.
+                                                              (line  26)
+* magit-refresh-all:                     Automatic Refreshing of Magit Buffers.
+                                                              (line  34)
+* magit-refs-set-show-commit-count:      References Buffer.   (line  34)
+* magit-region-sections:                 Section Selection.   (line   9)
+* magit-region-values:                   Section Selection.   (line  35)
+* magit-remote:                          Remote Commands.     (line  14)
+* magit-remote-add:                      Remote Commands.     (line  48)
+* magit-remote-configure:                Remote Commands.     (line  32)
+* magit-remote-prune:                    Remote Commands.     (line  63)
+* magit-remote-prune-refspecs:           Remote Commands.     (line  67)
+* magit-remote-remove:                   Remote Commands.     (line  60)
+* magit-remote-rename:                   Remote Commands.     (line  52)
+* magit-remote-set-url:                  Remote Commands.     (line  56)
+* magit-repolist-column-branch:          Repository List.     (line  51)
+* magit-repolist-column-branches:        Repository List.     (line  58)
+* magit-repolist-column-flag:            Repository List.     (line  64)
+* magit-repolist-column-flags:           Repository List.     (line  76)
+* magit-repolist-column-ident:           Repository List.     (line  40)
+* magit-repolist-column-path:            Repository List.     (line  44)
+* magit-repolist-column-stashes:         Repository List.     (line  61)
+* magit-repolist-column-unpulled-from-pushremote: Repository List.
+                                                              (line  87)
+* magit-repolist-column-unpulled-from-upstream: Repository List.
+                                                              (line  83)
+* magit-repolist-column-unpushed-to-pushremote: Repository List.
+                                                              (line  95)
+* magit-repolist-column-unpushed-to-upstream: Repository List.
+                                                              (line  91)
+* magit-repolist-column-upstream:        Repository List.     (line  54)
+* magit-repolist-column-version:         Repository List.     (line  47)
+* magit-repolist-fetch:                  Repository List.     (line 111)
+* magit-repolist-find-file-other-frame:  Repository List.     (line 115)
+* magit-repolist-mark:                   Repository List.     (line 105)
+* magit-repolist-status:                 Repository List.     (line 102)
+* magit-repolist-unmark:                 Repository List.     (line 108)
+* magit-reset-hard:                      Resetting.           (line  24)
+* magit-reset-index:                     Staging and Unstaging.
+                                                              (line  78)
+* magit-reset-index <1>:                 Resetting.           (line  33)
+* magit-reset-keep:                      Resetting.           (line  28)
+* magit-reset-mixed:                     Resetting.           (line  15)
+* magit-reset-quickly:                   Resetting.           (line   9)
+* magit-reset-soft:                      Resetting.           (line  19)
+* magit-reset-worktree:                  Resetting.           (line  39)
+* magit-reset-worktree <1>:              Wip Modes.           (line  64)
+* magit-restore-window-configuration:    Quitting Windows.    (line  24)
+* magit-reverse:                         Applying.            (line  47)
+* magit-reverse-in-index:                Staging and Unstaging.
+                                                              (line  58)
+* magit-revert:                          Reverting.           (line   7)
+* magit-revert-and-commit:               Reverting.           (line  15)
+* magit-revert-no-commit:                Reverting.           (line  20)
+* magit-run:                             Running Git Manually.
+                                                              (line  13)
+* magit-run-git:                         Calling Git for Effect.
+                                                              (line  34)
+* magit-run-git-async:                   Calling Git for Effect.
+                                                              (line  59)
+* magit-run-git-gui:                     Running Git Manually.
+                                                              (line  59)
+* magit-run-git-with-editor:             Calling Git for Effect.
+                                                              (line  71)
+* magit-run-git-with-input:              Calling Git for Effect.
+                                                              (line  37)
+* magit-run-gitk:                        Running Git Manually.
+                                                              (line  50)
+* magit-run-gitk-all:                    Running Git Manually.
+                                                              (line  53)
+* magit-run-gitk-branches:               Running Git Manually.
+                                                              (line  56)
+* magit-save-window-configuration:       Switching Buffers.   (line  80)
+* magit-section-backward:                Section Movement.    (line  11)
+* magit-section-backward-siblings:       Section Movement.    (line  19)
+* magit-section-case:                    Matching Sections.   (line  66)
+* magit-section-cycle:                   Section Visibility.  (line  14)
+* magit-section-cycle-diffs:             Section Visibility.  (line  29)
+* magit-section-cycle-global:            Section Visibility.  (line  33)
+* magit-section-forward:                 Section Movement.    (line  16)
+* magit-section-forward-siblings:        Section Movement.    (line  24)
+* magit-section-hide:                    Section Visibility.  (line  55)
+* magit-section-hide-children:           Section Visibility.  (line  67)
+* magit-section-ident:                   Matching Sections.   (line  10)
+* magit-section-match:                   Matching Sections.   (line  18)
+* magit-section-set-window-start:        Section Movement.    (line  52)
+* magit-section-show:                    Section Visibility.  (line  52)
+* magit-section-show-children:           Section Visibility.  (line  62)
+* magit-section-show-headings:           Section Visibility.  (line  58)
+* magit-section-show-level-1:            Section Visibility.  (line  39)
+* magit-section-show-level-1-all:        Section Visibility.  (line  45)
+* magit-section-show-level-2:            Section Visibility.  (line  39)
+* magit-section-show-level-2-all:        Section Visibility.  (line  45)
+* magit-section-show-level-3:            Section Visibility.  (line  39)
+* magit-section-show-level-3-all:        Section Visibility.  (line  45)
+* magit-section-show-level-4:            Section Visibility.  (line  39)
+* magit-section-show-level-4-all:        Section Visibility.  (line  45)
+* magit-section-toggle:                  Section Visibility.  (line  10)
+* magit-section-toggle-children:         Section Visibility.  (line  70)
+* magit-section-up:                      Section Movement.    (line  28)
+* magit-section-value-if:                Matching Sections.   (line  57)
+* magit-sequence-abort:                  Cherry Picking.      (line  91)
+* magit-sequence-abort <1>:              Reverting.           (line  35)
+* magit-sequence-continue:               Cherry Picking.      (line  85)
+* magit-sequence-continue <1>:           Reverting.           (line  29)
+* magit-sequence-skip:                   Cherry Picking.      (line  88)
+* magit-sequence-skip <1>:               Reverting.           (line  32)
+* magit-shell-command:                   Running Git Manually.
+                                                              (line  38)
+* magit-shell-command-topdir:            Running Git Manually.
+                                                              (line  34)
+* magit-show-commit:                     Diffing.             (line  63)
+* magit-show-commit <1>:                 Blaming.             (line  91)
+* magit-show-refs:                       References Buffer.   (line   7)
+* magit-show-refs-current:               References Buffer.   (line  25)
+* magit-show-refs-head:                  References Buffer.   (line  21)
+* magit-show-refs-other:                 References Buffer.   (line  30)
+* magit-snapshot-both:                   Stashing.            (line  36)
+* magit-snapshot-index:                  Stashing.            (line  42)
+* magit-snapshot-worktree:               Stashing.            (line  46)
+* magit-sparse-checkout:                 Sparse checkouts.    (line  17)
+* magit-sparse-checkout-add:             Sparse checkouts.    (line  39)
+* magit-sparse-checkout-disable:         Sparse checkouts.    (line  50)
+* magit-sparse-checkout-enable:          Sparse checkouts.    (line  21)
+* magit-sparse-checkout-reapply:         Sparse checkouts.    (line  44)
+* magit-sparse-checkout-set:             Sparse checkouts.    (line  33)
+* magit-stage:                           Staging and Unstaging.
+                                                              (line  29)
+* magit-stage-buffer-file:               Commands for Buffers Visiting Files.
+                                                              (line  52)
+* magit-stage-buffer-file <1>:           Commands for Buffers Visiting Files.
+                                                              (line  63)
+* magit-stage-file:                      Staging from File-Visiting Buffers.
+                                                              (line  11)
+* magit-stage-file <1>:                  Commands for Buffers Visiting Files.
+                                                              (line  52)
+* magit-stage-file <2>:                  Commands for Buffers Visiting Files.
+                                                              (line  63)
+* magit-stage-modified:                  Staging and Unstaging.
+                                                              (line  36)
+* magit-start-git:                       Calling Git for Effect.
+                                                              (line  82)
+* magit-start-process:                   Calling Git for Effect.
+                                                              (line 100)
+* magit-stash:                           Stashing.            (line   9)
+* magit-stash-apply:                     Stashing.            (line  52)
+* magit-stash-both:                      Stashing.            (line  14)
+* magit-stash-branch:                    Stashing.            (line 105)
+* magit-stash-branch-here:               Stashing.            (line 110)
+* magit-stash-clear:                     Stashing.            (line 118)
+* magit-stash-drop:                      Stashing.            (line  98)
+* magit-stash-format-patch:              Stashing.            (line 115)
+* magit-stash-index:                     Stashing.            (line  20)
+* magit-stash-keep-index:                Stashing.            (line  30)
+* magit-stash-list:                      Stashing.            (line 121)
+* magit-stash-pop:                       Stashing.            (line  74)
+* magit-stash-show:                      Diffing.             (line  67)
+* magit-stash-show <1>:                  Stashing.            (line 102)
+* magit-stash-worktree:                  Stashing.            (line  24)
+* magit-stashes-maybe-update-stash-buffer: Section Movement.  (line  92)
+* magit-status:                          Status Buffer.       (line  23)
+* magit-status-here:                     Commands for Buffers Visiting Files.
+                                                              (line  52)
+* magit-status-here <1>:                 Commands for Buffers Visiting Files.
+                                                              (line 166)
+* magit-status-maybe-update-blob-buffer: Section Movement.    (line  87)
+* magit-status-maybe-update-revision-buffer: Section Movement.
+                                                              (line  77)
+* magit-status-maybe-update-stash-buffer: Section Movement.   (line  82)
+* magit-status-quick:                    Status Buffer.       (line  70)
+* magit-submodule:                       Submodule Transient. (line   7)
+* magit-submodule-add:                   Submodule Transient. (line  20)
+* magit-submodule-populate:              Submodule Transient. (line  32)
+* magit-submodule-register:              Submodule Transient. (line  26)
+* magit-submodule-synchronize:           Submodule Transient. (line  40)
+* magit-submodule-unpopulate:            Submodule Transient. (line  45)
+* magit-submodule-update:                Submodule Transient. (line  36)
+* magit-subtree:                         Subtree.             (line   9)
+* magit-subtree-add:                     Subtree.             (line  24)
+* magit-subtree-add-commit:              Subtree.             (line  28)
+* magit-subtree-export:                  Subtree.             (line  37)
+* magit-subtree-import:                  Subtree.             (line  13)
+* magit-subtree-merge:                   Subtree.             (line  31)
+* magit-subtree-pull:                    Subtree.             (line  34)
+* magit-subtree-push:                    Subtree.             (line  48)
+* magit-subtree-split:                   Subtree.             (line  52)
+* magit-switch-to-repository-buffer:     Common Commands.     (line   6)
+* magit-switch-to-repository-buffer-other-frame: Common Commands.
+                                                              (line   8)
+* magit-switch-to-repository-buffer-other-window: Common Commands.
+                                                              (line   7)
+* magit-tag:                             Tagging.             (line   9)
+* magit-tag-create:                      Tagging.             (line  14)
+* magit-tag-delete:                      Tagging.             (line  37)
+* magit-tag-prune:                       Tagging.             (line  43)
+* magit-tag-release:                     Tagging.             (line  18)
+* magit-toggle-buffer-lock:              Modes and Buffers.   (line  18)
+* magit-toggle-git-debug:                Debugging Tools.     (line  29)
+* magit-toggle-margin:                   Refreshing Logs.     (line  34)
+* magit-toggle-margin <1>:               Log Margin.          (line  60)
+* magit-toggle-margin-details:           Log Margin.          (line  66)
+* magit-toggle-verbose-refresh:          Debugging Tools.     (line  52)
+* magit-unstage:                         Staging and Unstaging.
+                                                              (line  42)
+* magit-unstage-all:                     Staging and Unstaging.
+                                                              (line  50)
+* magit-unstage-buffer-file:             Commands for Buffers Visiting Files.
+                                                              (line  52)
+* magit-unstage-buffer-file <1>:         Commands for Buffers Visiting Files.
+                                                              (line  69)
+* magit-unstage-file:                    Staging from File-Visiting Buffers.
+                                                              (line  18)
+* magit-unstage-file <1>:                Commands for Buffers Visiting Files.
+                                                              (line  52)
+* magit-unstage-file <2>:                Commands for Buffers Visiting Files.
+                                                              (line  69)
+* magit-version:                         Git Executable.      (line  59)
+* magit-version <1>:                     Debugging Tools.     (line  11)
+* magit-visit-ref:                       References Buffer.   (line 159)
+* magit-wip-commit:                      Wip Modes.           (line  85)
+* magit-wip-log:                         Wip Modes.           (line  47)
+* magit-wip-log-current:                 Wip Modes.           (line  55)
+* magit-worktree:                        Worktree.            (line   9)
+* magit-worktree-branch:                 Worktree.            (line  16)
+* magit-worktree-checkout:               Worktree.            (line  13)
+* magit-worktree-delete:                 Worktree.            (line  22)
+* magit-worktree-move:                   Worktree.            (line  19)
+* magit-worktree-status:                 Worktree.            (line  26)
+* scroll-down:                           Commands Available in Diffs.
+                                                              (line  56)
+* scroll-up:                             Commands Available in Diffs.
+                                                              (line  53)
+* with-editor-cancel:                    Editing Commit Messages.
+                                                              (line  22)
+* with-editor-cancel <1>:                Editing Rebase Sequences.
+                                                              (line  11)
+* with-editor-debug:                     Debugging Tools.     (line  64)
+* with-editor-finish:                    Editing Commit Messages.
+                                                              (line  18)
+* with-editor-finish <1>:                Editing Rebase Sequences.
+                                                              (line   7)
+* with-editor-usage-message:             Commit Mode and Hooks.
+                                                              (line  51)
+
+
+File: magit.info,  Node: Variable Index,  Prev: Function and Command Index,  Up: Top
+
+Appendix E Variable Index
+*************************
+
+
+* Menu:
+
+* auto-revert-buffer-list-filter:        Automatic Reverting of File-Visiting Buffers.
+                                                              (line  73)
+* auto-revert-interval:                  Automatic Reverting of File-Visiting Buffers.
+                                                              (line  69)
+* auto-revert-mode:                      Automatic Reverting of File-Visiting Buffers.
+                                                              (line  57)
+* auto-revert-stop-on-user-input:        Automatic Reverting of File-Visiting Buffers.
+                                                              (line  65)
+* auto-revert-use-notify:                Automatic Reverting of File-Visiting Buffers.
+                                                              (line  46)
+* auto-revert-verbose:                   Automatic Reverting of File-Visiting Buffers.
+                                                              (line  94)
+* branch.autoSetupMerge:                 Branch Git Variables.
+                                                              (line  71)
+* branch.autoSetupRebase:                Branch Git Variables.
+                                                              (line  85)
+* branch.NAME.description:               Branch Git Variables.
+                                                              (line  42)
+* branch.NAME.merge:                     Branch Git Variables.
+                                                              (line  10)
+* branch.NAME.pushRemote:                Branch Git Variables.
+                                                              (line  29)
+* branch.NAME.rebase:                    Branch Git Variables.
+                                                              (line  20)
+* branch.NAME.remote:                    Branch Git Variables.
+                                                              (line  15)
+* core.notesRef:                         Notes.               (line  53)
+* git-commit-finish-query-functions:     Commit Message Conventions.
+                                                              (line  18)
+* git-commit-known-pseudo-headers:       Commit Pseudo Headers.
+                                                              (line   9)
+* git-commit-major-mode:                 Commit Mode and Hooks.
+                                                              (line  12)
+* git-commit-post-finish-hook:           Commit Mode and Hooks.
+                                                              (line  54)
+* git-commit-setup-hook:                 Commit Mode and Hooks.
+                                                              (line  21)
+* git-commit-style-convention-checks:    Commit Message Conventions.
+                                                              (line  38)
+* git-commit-summary-max-length:         Commit Message Conventions.
+                                                              (line  13)
+* git-rebase-auto-advance:               Editing Rebase Sequences.
+                                                              (line  80)
+* git-rebase-confirm-cancel:             Editing Rebase Sequences.
+                                                              (line  86)
+* git-rebase-show-instructions:          Editing Rebase Sequences.
+                                                              (line  83)
+* global-auto-revert-mode:               Automatic Reverting of File-Visiting Buffers.
+                                                              (line  21)
+* magit-auto-revert-immediately:         Automatic Reverting of File-Visiting Buffers.
+                                                              (line  30)
+* magit-auto-revert-mode:                Automatic Reverting of File-Visiting Buffers.
+                                                              (line  17)
+* magit-auto-revert-tracked-only:        Automatic Reverting of File-Visiting Buffers.
+                                                              (line  51)
+* magit-bisect-show-graph:               Bisecting.           (line  57)
+* magit-blame-disable-modes:             Blaming.             (line 165)
+* magit-blame-echo-style:                Blaming.             (line 151)
+* magit-blame-goto-chunk-hook:           Blaming.             (line 170)
+* magit-blame-read-only:                 Blaming.             (line 161)
+* magit-blame-styles:                    Blaming.             (line 147)
+* magit-blame-time-format:               Blaming.             (line 157)
+* magit-branch-adjust-remote-upstream-alist: Branch Commands. (line 202)
+* magit-branch-direct-configure:         Branch Commands.     (line  19)
+* magit-branch-prefer-remote-upstream:   Branch Commands.     (line 158)
+* magit-branch-read-upstream-first:      Branch Commands.     (line 153)
+* magit-buffer-name-format:              Naming Buffers.      (line  25)
+* magit-bury-buffer-function:            Quitting Windows.    (line  16)
+* magit-cherry-margin:                   Cherries.            (line  21)
+* magit-clone-always-transient:          Cloning Repository.  (line  12)
+* magit-clone-default-directory:         Cloning Repository.  (line  84)
+* magit-clone-name-alist:                Cloning Repository.  (line  94)
+* magit-clone-set-remote-head:           Cloning Repository.  (line  66)
+* magit-clone-set-remote.pushDefault:    Cloning Repository.  (line  75)
+* magit-clone-url-format:                Cloning Repository.  (line 114)
+* magit-commit-ask-to-stage:             Initiating a Commit. (line  65)
+* magit-commit-diff-inhibit-same-window: Initiating a Commit. (line  97)
+* magit-commit-extend-override-date:     Initiating a Commit. (line  72)
+* magit-commit-reword-override-date:     Initiating a Commit. (line  75)
+* magit-commit-show-diff:                Initiating a Commit. (line  69)
+* magit-commit-squash-confirm:           Initiating a Commit. (line  78)
+* magit-completing-read-function:        Support for Completion Frameworks.
+                                                              (line  27)
+* magit-define-global-key-bindings:      Global Bindings.     (line   6)
+* magit-diff-adjust-tab-width:           Diff Options.        (line  17)
+* magit-diff-buffer-file-locked:         Commands for Buffers Visiting Files.
+                                                              (line 104)
+* magit-diff-extra-stat-arguments:       Diff Options.        (line 112)
+* magit-diff-hide-trailing-cr-characters: Diff Options.       (line  77)
+* magit-diff-highlight-hunk-region-functions: Diff Options.   (line  80)
+* magit-diff-highlight-indentation:      Diff Options.        (line  63)
+* magit-diff-highlight-trailing:         Diff Options.        (line  59)
+* magit-diff-paint-whitespace:           Diff Options.        (line  38)
+* magit-diff-paint-whitespace-lines:     Diff Options.        (line  52)
+* magit-diff-refine-hunk:                Diff Options.        (line   6)
+* magit-diff-refine-ignore-whitespace:   Diff Options.        (line  13)
+* magit-diff-unmarked-lines-keep-foreground: Diff Options.    (line 105)
+* magit-diff-visit-previous-blob:        Visiting Files and Blobs from a Diff.
+                                                              (line  38)
+* magit-direct-use-buffer-arguments:     Transient Arguments and Buffer Variables.
+                                                              (line  73)
+* magit-display-buffer-function:         Switching Buffers.   (line  25)
+* magit-display-buffer-noselect:         Switching Buffers.   (line  17)
+* magit-dwim-selection:                  Completion and Confirmation.
+                                                              (line  42)
+* magit-ediff-dwim-resolve-function:     Ediffing.            (line 105)
+* magit-ediff-dwim-show-on-hunks:        Ediffing.            (line 111)
+* magit-ediff-quit-hook:                 Ediffing.            (line 124)
+* magit-ediff-show-stash-with-index:     Ediffing.            (line 118)
+* magit-generate-buffer-name-function:   Naming Buffers.      (line   6)
+* magit-git-debug:                       Viewing Git Output.  (line  26)
+* magit-git-debug <1>:                   Getting a Value from Git.
+                                                              (line  68)
+* magit-git-executable:                  Git Executable.      (line  26)
+* magit-git-global-arguments:            Global Git Arguments.
+                                                              (line   6)
+* magit-keep-region-overlay:             The Selection.       (line  52)
+* magit-list-refs-sortby:                Additional Completion Options.
+                                                              (line   6)
+* magit-log-auto-more:                   Log Buffer.          (line  69)
+* magit-log-buffer-file-locked:          Commands for Buffers Visiting Files.
+                                                              (line 124)
+* magit-log-margin:                      Log Margin.          (line  12)
+* magit-log-margin-show-committer-date:  Log Margin.          (line  44)
+* magit-log-section-commit-count:        Status Sections.     (line 114)
+* magit-log-select-margin:               Select from Log.     (line  28)
+* magit-log-show-color-graph-limit:      Log Buffer.          (line  78)
+* magit-log-show-refname-after-summary:  Log Buffer.          (line  74)
+* magit-log-show-signatures-limit:       Log Buffer.          (line  84)
+* magit-log-trace-definition-function:   Commands Available in Diffs.
+                                                              (line  17)
+* magit-module-sections-hook:            Status Module Sections.
+                                                              (line  19)
+* magit-module-sections-nested:          Status Module Sections.
+                                                              (line  22)
+* magit-no-confirm:                      Action Confirmation. (line  18)
+* magit-pop-revision-stack-format:       Using the Revision Stack.
+                                                              (line  34)
+* magit-post-clone-hook:                 Cloning Repository.  (line 133)
+* magit-post-commit-hook:                Initiating a Commit. (line  86)
+* magit-post-display-buffer-hook:        Switching Buffers.   (line  85)
+* magit-pre-display-buffer-hook:         Switching Buffers.   (line  76)
+* magit-prefer-remote-upstream:          Branch Git Variables.
+                                                              (line 108)
+* magit-prefix-use-buffer-arguments:     Transient Arguments and Buffer Variables.
+                                                              (line  65)
+* magit-process-extreme-logging:         Viewing Git Output.  (line  56)
+* magit-process-raise-error:             Calling Git for Effect.
+                                                              (line 125)
+* magit-pull-or-fetch:                   Fetching.            (line  52)
+* magit-reflog-margin:                   Reflog.              (line  20)
+* magit-refresh-args:                    Refreshing Buffers.  (line  52)
+* magit-refresh-buffer-hook:             Automatic Refreshing of Magit Buffers.
+                                                              (line  41)
+* magit-refresh-function:                Refreshing Buffers.  (line  47)
+* magit-refresh-status-buffer:           Automatic Refreshing of Magit Buffers.
+                                                              (line  46)
+* magit-refs-filter-alist:               References Buffer.   (line 137)
+* magit-refs-focus-column-width:         References Buffer.   (line  75)
+* magit-refs-margin:                     References Buffer.   (line  89)
+* magit-refs-margin-for-tags:            References Buffer.   (line 112)
+* magit-refs-pad-commit-counts:          References Buffer.   (line  45)
+* magit-refs-primary-column-width:       References Buffer.   (line  63)
+* magit-refs-sections-hook:              References Sections. (line  13)
+* magit-refs-show-commit-count:          References Buffer.   (line  36)
+* magit-refs-show-remote-prefix:         References Buffer.   (line  57)
+* magit-remote-add-set-remote.pushDefault: Remote Commands.   (line  83)
+* magit-remote-direct-configure:         Remote Commands.     (line  20)
+* magit-remote-git-executable:           Git Executable.      (line  32)
+* magit-repolist-columns:                Repository List.     (line  12)
+* magit-repository-directories:          Status Buffer.       (line  57)
+* magit-revision-filter-files-on-follow: Revision Buffer.     (line  55)
+* magit-revision-insert-related-refs:    Revision Buffer.     (line   6)
+* magit-revision-show-gravatars:         Revision Buffer.     (line  15)
+* magit-revision-use-hash-sections:      Revision Buffer.     (line  31)
+* magit-root-section:                    Matching Sections.   (line  81)
+* magit-save-repository-buffers:         Automatic Saving of File-Visiting Buffers.
+                                                              (line  13)
+* magit-section-cache-visibility:        Section Visibility.  (line  95)
+* magit-section-initial-visibility-alist: Section Visibility. (line  79)
+* magit-section-movement-hook:           Section Movement.    (line  41)
+* magit-section-set-visibility-hook:     Section Visibility.  (line 105)
+* magit-section-show-child-count:        Section Options.     (line   9)
+* magit-section-visibility-indicator:    Section Visibility.  (line 122)
+* magit-shell-command-verbose-prompt:    Running Git Manually.
+                                                              (line  43)
+* magit-stashes-margin:                  Stashing.            (line 123)
+* magit-status-headers-hook:             Status Header Sections.
+                                                              (line  17)
+* magit-status-margin:                   Status Options.      (line   6)
+* magit-status-sections-hook:            Status Sections.     (line  10)
+* magit-submodule-list-columns:          Listing Submodules.  (line  20)
+* magit-this-process:                    Calling Git for Effect.
+                                                              (line 121)
+* magit-uniquify-buffer-names:           Naming Buffers.      (line  65)
+* magit-unstage-committed:               Staging and Unstaging.
+                                                              (line  52)
+* magit-update-other-window-delay:       Section Movement.    (line  97)
+* magit-visit-ref-behavior:              References Buffer.   (line 168)
+* magit-wip-after-apply-mode:            Legacy Wip Modes.    (line  18)
+* magit-wip-after-apply-mode-lighter:    Legacy Wip Modes.    (line  54)
+* magit-wip-after-save-local-mode-lighter: Legacy Wip Modes.  (line  51)
+* magit-wip-after-save-mode:             Legacy Wip Modes.    (line  13)
+* magit-wip-before-change-mode:          Legacy Wip Modes.    (line  31)
+* magit-wip-before-change-mode-lighter:  Legacy Wip Modes.    (line  57)
+* magit-wip-initial-backup-mode:         Legacy Wip Modes.    (line  35)
+* magit-wip-initial-backup-mode-lighter: Legacy Wip Modes.    (line  60)
+* magit-wip-merge-branch:                Wip Graph.           (line   6)
+* magit-wip-mode:                        Wip Modes.           (line  30)
+* magit-wip-mode-lighter:                Wip Modes.           (line  98)
+* magit-wip-namespace:                   Wip Modes.           (line  91)
+* notes.displayRef:                      Notes.               (line  57)
+* pull.rebase:                           Branch Git Variables.
+                                                              (line  50)
+* remote.NAME.fetch:                     Remote Git Variables.
+                                                              (line  14)
+* remote.NAME.push:                      Remote Git Variables.
+                                                              (line  23)
+* remote.NAME.pushurl:                   Remote Git Variables.
+                                                              (line  18)
+* remote.NAME.tagOpts:                   Remote Git Variables.
+                                                              (line  27)
+* remote.NAME.url:                       Remote Git Variables.
+                                                              (line  10)
+* remote.pushDefault:                    Branch Git Variables.
+                                                              (line  62)
+
+
+
+Tag Table:
+Node: Top774
+Node: Introduction6559
+Node: Installation11275
+Node: Installing from Melpa11605
+Node: Installing from the Git Repository12680
+Node: Post-Installation Tasks15494
+Node: Getting Started16779
+Node: Interface Concepts22590
+Node: Modes and Buffers22969
+Node: Switching Buffers24680
+Node: Naming Buffers29419
+Node: Quitting Windows32494
+Node: Automatic Refreshing of Magit Buffers34429
+Node: Automatic Saving of File-Visiting Buffers37310
+Node: Automatic Reverting of File-Visiting Buffers38494
+Node: Risk of Reverting Automatically43479
+Node: Sections45861
+Node: Section Movement46787
+Node: Section Visibility51661
+Node: Section Hooks58348
+Node: Section Types and Values60754
+Node: Section Options62169
+Node: Transient Commands62640
+Node: Transient Arguments and Buffer Variables64116
+Node: Completion Confirmation and the Selection71133
+Node: Action Confirmation71579
+Node: Completion and Confirmation80084
+Node: The Selection83269
+Node: The hunk-internal region86167
+Node: Support for Completion Frameworks87256
+Node: Additional Completion Options92141
+Node: Mouse Support92739
+Node: Running Git93315
+Node: Viewing Git Output93560
+Node: Git Process Status96264
+Node: Running Git Manually97229
+Node: Git Executable99919
+Node: Global Git Arguments102927
+Node: Inspecting103732
+Node: Status Buffer104889
+Node: Status Sections109900
+Node: Status Header Sections115427
+Node: Status Module Sections118046
+Node: Status Options120543
+Node: Repository List121906
+Node: Logging126684
+Node: Refreshing Logs129523
+Node: Log Buffer130944
+Node: Log Margin135767
+Node: Select from Log138920
+Node: Reflog141130
+Node: Cherries142767
+Node: Diffing144605
+Node: Refreshing Diffs147639
+Node: Commands Available in Diffs151328
+Node: Diff Options153841
+Node: Revision Buffer159304
+Node: Ediffing162624
+Node: References Buffer168674
+Node: References Sections179268
+Node: Bisecting180125
+Node: Visiting Files and Blobs182436
+Node: General-Purpose Visit Commands182964
+Node: Visiting Files and Blobs from a Diff183917
+Node: Blaming187361
+Node: Manipulating194349
+Node: Creating Repository194691
+Node: Cloning Repository195228
+Node: Staging and Unstaging201669
+Node: Staging from File-Visiting Buffers205642
+Node: Applying206748
+Node: Committing208821
+Node: Initiating a Commit209404
+Node: Editing Commit Messages214594
+Node: Using the Revision Stack217367
+Node: Commit Pseudo Headers220412
+Node: Commit Mode and Hooks221707
+Node: Commit Message Conventions224565
+Node: Branching226552
+Node: The Two Remotes226778
+Node: Branch Commands229431
+Node: Branch Git Variables242281
+Node: Auxiliary Branch Commands247651
+Node: Merging248767
+Node: Resolving Conflicts252923
+Node: Rebasing258297
+Node: Editing Rebase Sequences263086
+Node: Information About In-Progress Rebase267302
+Ref: Information About In-Progress Rebase-Footnote-1276415
+Node: Cherry Picking277011
+Node: Reverting281345
+Node: Resetting282764
+Node: Stashing284590
+Node: Transferring290971
+Node: Remotes291193
+Node: Remote Commands291345
+Node: Remote Git Variables295384
+Node: Fetching296655
+Node: Pulling299138
+Node: Pushing300164
+Node: Plain Patches304455
+Node: Maildir Patches305926
+Node: Miscellaneous307405
+Node: Tagging307751
+Node: Notes309644
+Node: Submodules311979
+Node: Listing Submodules312197
+Node: Submodule Transient314345
+Node: Subtree316790
+Node: Worktree318721
+Node: Sparse checkouts319797
+Node: Bundle322573
+Node: Common Commands322948
+Node: Wip Modes325576
+Node: Wip Graph330467
+Node: Legacy Wip Modes332780
+Node: Commands for Buffers Visiting Files335667
+Node: Minor Mode for Buffers Visiting Blobs343894
+Node: Customizing344692
+Node: Per-Repository Configuration346288
+Node: Essential Settings348542
+Node: Safety348888
+Node: Performance350649
+Ref: Log Performance353612
+Ref: Diff Performance354917
+Ref: Refs Buffer Performance356258
+Ref: Committing Performance356833
+Node: Microsoft Windows Performance357815
+Node: MacOS Performance359006
+Ref: MacOS Performance-Footnote-1360029
+Node: Global Bindings360111
+Node: Plumbing362339
+Node: Calling Git363168
+Node: Getting a Value from Git364693
+Node: Calling Git for Effect368421
+Node: Section Plumbing374315
+Node: Creating Sections374543
+Node: Section Selection378439
+Node: Matching Sections380235
+Node: Refreshing Buffers386156
+Node: Conventions389300
+Node: Theming Faces389492
+Node: FAQ397597
+Node: FAQ - How to ...?398035
+Node: How to pronounce Magit?398392
+Node: How to show git's output?399195
+Node: How to install the gitman info manual?399981
+Node: How to show diffs for gpg-encrypted files?400951
+Node: How does branching and pushing work?401547
+Node: Should I disable VC?401880
+Node: FAQ - Issues and Errors402483
+Node: Magit is slow403428
+Node: I changed several thousand files at once and now Magit is unusable403721
+Node: I am having problems committing404447
+Node: I am using MS Windows and cannot push with Magit404928
+Node: I am using macOS and SOMETHING works in shell but not in Magit405546
+Node: Expanding a file to show the diff causes it to disappear406380
+Node: Point is wrong in the COMMIT_EDITMSG buffer406968
+Node: The mode-line information isn't always up-to-date408016
+Node: A branch and tag sharing the same name breaks SOMETHING409079
+Node: My Git hooks work on the command-line but not inside Magit409966
+Node: git-commit-mode isn't used when committing from the command-line410812
+Node: Point ends up inside invisible text when jumping to a file-visiting buffer413083
+Node: I am no longer able to save popup defaults413932
+Node: Debugging Tools414913
+Node: Keystroke Index418087
+Node: Function and Command Index459701
+Node: Variable Index517902
+
+End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
diff --git a/emacs/elpa/magit-section-20240913.1455/magit-section-pkg.el b/emacs/elpa/magit-section-20240913.1455/magit-section-pkg.el
@@ -1,17 +0,0 @@
-(define-package "magit-section" "20240913.1455" "Sections for read-only buffers"
-  '((emacs "26.1")
-    (compat "30.0.0.0")
-    (dash "2.19.1")
-    (seq "2.24"))
-  :commit "9395de2c94cc430ca865f497046c16f66deccf16" :authors
-  '(("Jonas Bernoulli" . "emacs.magit@jonas.bernoulli.dev"))
-  :maintainers
-  '(("Jonas Bernoulli" . "emacs.magit@jonas.bernoulli.dev"))
-  :maintainer
-  '("Jonas Bernoulli" . "emacs.magit@jonas.bernoulli.dev")
-  :keywords
-  '("tools")
-  :url "https://github.com/magit/magit")
-;; Local Variables:
-;; no-byte-compile: t
-;; End:
diff --git a/emacs/elpa/magit-section-20240913.1455/magit-section.el b/emacs/elpa/magit-section-20240913.1455/magit-section.el
@@ -1,2509 +0,0 @@
-;;; magit-section.el --- Sections for read-only buffers  -*- lexical-binding:t; coding:utf-8 -*-
-
-;; Copyright (C) 2008-2024 The Magit Project Contributors
-
-;; Author: Jonas Bernoulli <emacs.magit@jonas.bernoulli.dev>
-;; Maintainer: Jonas Bernoulli <emacs.magit@jonas.bernoulli.dev>
-
-;; Homepage: https://github.com/magit/magit
-;; Keywords: tools
-
-;; Package-Version: 4.1.0
-;; Package-Requires: (
-;;     (emacs "26.1")
-;;     (compat "30.0.0.0")
-;;     (dash "2.19.1")
-;;     (seq "2.24"))
-
-;; SPDX-License-Identifier: GPL-3.0-or-later
-
-;; Magit is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published
-;; by the Free Software Foundation, either version 3 of the License,
-;; or (at your option) any later version.
-;;
-;; Magit is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-;;
-;; You should have received a copy of the GNU General Public License
-;; along with Magit.  If not, see <https://www.gnu.org/licenses/>.
-
-;; You should have received a copy of the AUTHORS.md file, which
-;; lists all contributors.  If not, see https://magit.vc/authors.
-
-;;; Commentary:
-
-;; This package implements the main user interface of Magit — the
-;; collapsible sections that make up its buffers.  This package used
-;; to be distributed as part of Magit but now it can also be used by
-;; other packages that have nothing to do with Magit or Git.
-
-;;; Code:
-
-(require 'cl-lib)
-(require 'compat)
-(require 'dash)
-(require 'eieio)
-(require 'subr-x)
-
-;; For older Emacs releases we depend on an updated `seq' release from GNU
-;; ELPA, for `seq-keep'.  Unfortunately something else may require `seq'
-;; before `package' had a chance to put this version on the `load-path'.
-(when (and (featurep 'seq)
-           (not (fboundp 'seq-keep)))
-  (unload-feature 'seq 'force))
-(require 'seq)
-;; Furthermore, by default `package' just silently refuses to upgrade.
-(defconst magit--core-upgrade-instructions "\
-Magit requires `%s' >= %s,
-but due to bad defaults, Emacs' package manager, refuses to
-upgrade this and other built-in packages to higher releases
-from GNU Elpa.
-
-To fix this, you have to add this to your init file:
-
-  (setq package-install-upgrade-built-in t)
-
-Then evaluate that expression by placing the cursor after it
-and typing \\[eval-last-sexp].
-
-Once you have done that, you have to explicitly upgrade `%s':
-
-  \\[package-install] %s \\`RET'
-
-Then you also must make sure the updated version is loaded,
-by evaluating this form:
-
-  (progn (unload-feature \\='%s t) (require \\='%s))
-
-If this does not work, then try uninstalling Magit and all of its
-dependencies.  After that exit and restart Emacs, and only then
-reinstalling Magit.
-
-If you don't use the `package' package manager but still get
-this warning, then your chosen package manager likely has a
-similar defect.")
-(unless (fboundp 'seq-keep)
-  (display-warning 'magit (substitute-command-keys
-                           (format magit--core-upgrade-instructions
-                                   'seq "2.24" 'seq 'seq 'seq 'seq))
-                   :emergency))
-
-(require 'cursor-sensor)
-(require 'format-spec)
-
-(eval-when-compile (require 'benchmark))
-
-;; For `magit-section-get-relative-position'
-(declare-function magit-hunk-section-p "magit-diff" (section) t)
-
-;;; Hooks
-
-(defvar magit-section-movement-hook nil
-  "Hook run by `magit-section-goto'.
-That function in turn is used by all section movement commands.")
-
-(defvar magit-section-highlight-hook
-  '(magit-section-highlight
-    magit-section-highlight-selection)
-  "Functions used to highlight the current section.
-Each function is run with the current section as only argument
-until one of them returns non-nil.")
-
-(defvar magit-section-unhighlight-hook nil
-  "Functions used to unhighlight the previously current section.
-Each function is run with the current section as only argument
-until one of them returns non-nil.  Most sections are properly
-unhighlighted without requiring a specialized unhighlighter,
-diff-related sections being the only exception.")
-
-(defvar magit-section-set-visibility-hook
-  '(magit-section-cached-visibility)
-  "Hook used to set the initial visibility of a section.
-Stop at the first function that returns non-nil.  The returned
-value should be `show', `hide' or nil.  If no function returns
-non-nil, determine the visibility as usual, i.e., use the
-hardcoded section specific default (see `magit-insert-section').")
-
-;;; Options
-
-(defgroup magit-section nil
-  "Expandable sections."
-  :link '(info-link "(magit)Sections")
-  :group 'extensions)
-
-(defcustom magit-section-show-child-count t
-  "Whether to append the number of children to section headings.
-This only applies to sections for which doing so makes sense."
-  :package-version '(magit-section . "2.1.0")
-  :group 'magit-section
-  :type 'boolean)
-
-(defcustom magit-section-cache-visibility t
-  "Whether to cache visibility of sections.
-
-Sections always retain their visibility state when they are being
-recreated during a refresh.  But if a section disappears and then
-later reappears again, then this option controls whether this is
-the case.
-
-If t, then cache the visibility of all sections.  If a list of
-section types, then only do so for matching sections.  If nil,
-then don't do so for any sections."
-  :package-version '(magit-section . "2.12.0")
-  :group 'magit-section
-  :type '(choice (const  :tag "Don't cache visibility" nil)
-                 (const  :tag "Cache visibility of all sections" t)
-                 (repeat :tag "Cache visibility for section types" symbol)))
-
-(defcustom magit-section-initial-visibility-alist
-  '((stashes . hide))
-  "Alist controlling the initial visibility of sections.
-
-Each element maps a section type or lineage to the initial
-visibility state for such sections.  The state has to be one of
-`show' or `hide', or a function that returns one of these symbols.
-A function is called with the section as the only argument.
-
-Use the command `magit-describe-section' to determine a section's
-lineage or type.  The vector in the output is the section lineage
-and the type is the first element of that vector.  Wildcards can
-be used, see `magit-section-match'.
-
-Currently this option is only used to override hardcoded defaults,
-but in the future it will also be used set the defaults.
-
-An entry whose key is `magit-status-initial-section' specifies
-the visibility of the section `magit-status-goto-initial-section'
-jumps to.  This does not only override defaults, but also other
-entries of this alist."
-  :package-version '(magit-section . "2.12.0")
-  :group 'magit-section
-  :type '(alist :key-type (sexp :tag "Section type/lineage")
-                :value-type (choice (const hide)
-                                    (const show)
-                                    function)))
-
-(defcustom magit-section-visibility-indicator
-  (if (window-system)
-      '(magit-fringe-bitmap> . magit-fringe-bitmapv)
-    (cons (if (char-displayable-p ?…) "…" "...")
-          t))
-  "Whether and how to indicate that a section can be expanded/collapsed.
-
-If nil, then don't show any indicators.
-Otherwise the value has to have one of these two forms:
-
-\(EXPANDABLE-BITMAP . COLLAPSIBLE-BITMAP)
-
-  Both values have to be variables whose values are fringe
-  bitmaps.  In this case every section that can be expanded or
-  collapsed gets an indicator in the left fringe.
-
-  To provide extra padding around the indicator, set
-  `left-fringe-width' in `magit-mode-hook'.
-
-\(STRING . BOOLEAN)
-
-  In this case STRING (usually an ellipsis) is shown at the end
-  of the heading of every collapsed section.  Expanded sections
-  get no indicator.  The cdr controls whether the appearance of
-  these ellipsis take section highlighting into account.  Doing
-  so might potentially have an impact on performance, while not
-  doing so is kinda ugly."
-  :package-version '(magit-section . "3.0.0")
-  :group 'magit-section
-  :type '(choice (const :tag "No indicators" nil)
-                 (cons  :tag "Use +- fringe indicators"
-                        (const magit-fringe-bitmap+)
-                        (const magit-fringe-bitmap-))
-                 (cons  :tag "Use >v fringe indicators"
-                        (const magit-fringe-bitmap>)
-                        (const magit-fringe-bitmapv))
-                 (cons  :tag "Use bold >v fringe indicators)"
-                        (const magit-fringe-bitmap-bold>)
-                        (const magit-fringe-bitmap-boldv))
-                 (cons  :tag "Use custom fringe indicators"
-                        (variable :tag "Expandable bitmap variable")
-                        (variable :tag "Collapsible bitmap variable"))
-                 (cons  :tag "Use ellipses at end of headings"
-                        (string :tag "Ellipsis" "…")
-                        (choice :tag "Use face kludge"
-                                (const :tag "Yes (potentially slow)" t)
-                                (const :tag "No (kinda ugly)" nil)))))
-
-(define-obsolete-variable-alias 'magit-keep-region-overlay
-  'magit-section-keep-region-overlay "Magit-Section 4.0.0")
-
-(defcustom magit-section-keep-region-overlay nil
-  "Whether to keep the region overlay when there is a valid selection.
-
-By default Magit removes the regular region overlay if, and only
-if, that region constitutes a valid selection as understood by
-Magit commands.  Otherwise it does not remove that overlay, and
-the region looks like it would in other buffers.
-
-There are two types of such valid selections: hunk-internal
-regions and regions that select two or more sibling sections.
-In such cases Magit removes the region overlay and instead
-highlights a slightly larger range.  All text (for hunk-internal
-regions) or the headings of all sections (for sibling selections)
-that are inside that range (not just inside the region) are acted
-on by commands such as the staging command.  This buffer range
-begins at the beginning of the line on which the region begins
-and ends at the end of the line on which the region ends.
-
-Because Magit acts on this larger range and not the region, it is
-actually quite important to visualize that larger range.  If we
-don't do that, then one might think that these commands act on
-the region instead.  If you want to *also* visualize the region,
-then set this option to t.  But please note that when the region
-does *not* constitute a valid selection, then the region is
-*always* visualized as usual, and that it is usually under such
-circumstances that you want to use a non-magit command to act on
-the region.
-
-Besides keeping the region overlay, setting this option to t also
-causes all face properties, except for `:foreground', to be
-ignored for the faces used to highlight headings of selected
-sections.  This avoids the worst conflicts that result from
-displaying the region and the selection overlays at the same
-time.  We are not interested in dealing with other conflicts.
-In fact we *already* provide a way to avoid all of these
-conflicts: *not* changing the value of this option.
-
-It should be clear by now that we consider it a mistake to set
-this to display the region when the Magit selection is also
-visualized, but since it has been requested a few times and
-because it doesn't cost much to offer this option we do so.
-However that might change.  If the existence of this option
-starts complicating other things, then it will be removed."
-  :package-version '(magit-section . "2.3.0")
-  :group 'magit-section
-  :type 'boolean)
-
-(defcustom magit-section-disable-line-numbers t
-  "In Magit buffers, whether to disable modes that display line numbers.
-
-Some users who turn on `global-display-line-numbers-mode' (or
-`global-nlinum-mode' or `global-linum-mode') expect line numbers
-to be displayed everywhere except in Magit buffers.  Other users
-do not expect Magit buffers to be treated differently.  At least
-in theory users in the first group should not use the global mode,
-but that ship has sailed, thus this option."
-  :package-version '(magit-section . "3.0.0")
-  :group 'magit-section
-  :type 'boolean)
-
-(defcustom magit-section-show-context-menu-for-emacs<28 nil
-  "Whether `mouse-3' shows a context menu for Emacs < 28.
-
-This has to be set before loading `magit-section' or it has
-no effect.  This also has no effect for Emacs >= 28, where
-`context-menu-mode' should be enabled instead."
-  :package-version '(magit-section . "4.0.0")
-  :group 'magit-section
-  :type 'boolean)
-
-;;; Variables
-
-(defvar-local magit-section-preserve-visibility t)
-
-(defvar-local magit-section-pre-command-region-p nil)
-(defvar-local magit-section-pre-command-section nil)
-(defvar-local magit-section-highlight-force-update nil)
-(defvar-local magit-section-highlight-overlays nil)
-(defvar-local magit-section-highlighted-sections nil)
-(defvar-local magit-section-unhighlight-sections nil)
-
-(defvar-local magit-section-inhibit-markers nil)
-(defvar-local magit-section-insert-in-reverse nil)
-
-;;; Faces
-
-(defgroup magit-section-faces nil
-  "Faces used by Magit-Section."
-  :group 'magit-section
-  :group 'faces)
-
-(defface magit-section-highlight
-  `((((class color) (background light))
-     ,@(and (>= emacs-major-version 27) '(:extend t))
-     :background "grey95")
-    (((class color) (background  dark))
-     ,@(and (>= emacs-major-version 27) '(:extend t))
-     :background "grey20"))
-  "Face for highlighting the current section."
-  :group 'magit-section-faces)
-
-(defface magit-section-heading
-  `((((class color) (background light))
-     ,@(and (>= emacs-major-version 27) '(:extend t))
-     :foreground "DarkGoldenrod4"
-     :weight bold)
-    (((class color) (background  dark))
-     ,@(and (>= emacs-major-version 27) '(:extend t))
-     :foreground "LightGoldenrod2"
-     :weight bold))
-  "Face for section headings."
-  :group 'magit-section-faces)
-
-(defface magit-section-secondary-heading
-  `((t ,@(and (>= emacs-major-version 27) '(:extend t))
-       :weight bold))
-  "Face for section headings of some secondary headings."
-  :group 'magit-section-faces)
-
-(defface magit-section-heading-selection
-  `((((class color) (background light))
-     ,@(and (>= emacs-major-version 27) '(:extend t))
-     :foreground "salmon4")
-    (((class color) (background  dark))
-     ,@(and (>= emacs-major-version 27) '(:extend t))
-     :foreground "LightSalmon3"))
-  "Face for selected section headings."
-  :group 'magit-section-faces)
-
-(defface magit-section-child-count '((t nil))
-  "Face used for child counts at the end of some section headings."
-  :group 'magit-section-faces)
-
-;;; Classes
-
-(defvar magit--current-section-hook nil
-  "Internal variable used for `magit-describe-section'.")
-
-(defvar magit--section-type-alist nil)
-
-(defclass magit-section ()
-  ((type     :initform nil :initarg :type)
-   (keymap   :initform nil)
-   (value    :initform nil)
-   (start    :initform nil)
-   (content  :initform nil)
-   (end      :initform nil)
-   (hidden)
-   (washer   :initform nil :initarg :washer)
-   (inserter :initform (symbol-value 'magit--current-section-hook))
-   (heading-highlight-face :initform nil :initarg :heading-highlight-face)
-   (parent   :initform nil)
-   (children :initform nil)))
-
-;;; Mode
-
-(defvar symbol-overlay-inhibit-map)
-
-(defvar-keymap magit-section-heading-map
-  :doc "Keymap used in the heading line of all expandable sections.
-This keymap is used in addition to the section-specific keymap,
-if any."
-  "<double-down-mouse-1>" #'ignore
-  "<double-mouse-1>" #'magit-mouse-toggle-section
-  "<double-mouse-2>" #'magit-mouse-toggle-section)
-
-(defvar magit-section-mode-map
-  (let ((map (make-keymap)))
-    (suppress-keymap map t)
-    (when (and magit-section-show-context-menu-for-emacs<28
-               (< emacs-major-version 28))
-      (keymap-set map "<mouse-3>" nil)
-      (keymap-set
-       map "<down-mouse-3>"
-       `( menu-item "" ,(make-sparse-keymap)
-          :filter ,(lambda (_)
-                     (let ((menu (make-sparse-keymap)))
-                       (if (fboundp 'context-menu-local)
-                           (context-menu-local menu last-input-event)
-                         (magit--context-menu-local menu last-input-event))
-                       (magit-section-context-menu menu last-input-event)
-                       menu)))))
-    (keymap-set map "<left-fringe> <mouse-1>" #'magit-mouse-toggle-section)
-    (keymap-set map "<left-fringe> <mouse-2>" #'magit-mouse-toggle-section)
-    (keymap-set map "TAB"       #'magit-section-toggle)
-    (keymap-set map "C-c TAB"   #'magit-section-cycle)
-    (keymap-set map "C-<tab>"   #'magit-section-cycle)
-    (keymap-set map "M-<tab>"   #'magit-section-cycle)
-    ;; <backtab> is the most portable binding for Shift+Tab.
-    (keymap-set map "<backtab>" #'magit-section-cycle-global)
-    (keymap-set map   "^" #'magit-section-up)
-    (keymap-set map   "p" #'magit-section-backward)
-    (keymap-set map   "n" #'magit-section-forward)
-    (keymap-set map "M-p" #'magit-section-backward-sibling)
-    (keymap-set map "M-n" #'magit-section-forward-sibling)
-    (keymap-set map   "1" #'magit-section-show-level-1)
-    (keymap-set map   "2" #'magit-section-show-level-2)
-    (keymap-set map   "3" #'magit-section-show-level-3)
-    (keymap-set map   "4" #'magit-section-show-level-4)
-    (keymap-set map "M-1" #'magit-section-show-level-1-all)
-    (keymap-set map "M-2" #'magit-section-show-level-2-all)
-    (keymap-set map "M-3" #'magit-section-show-level-3-all)
-    (keymap-set map "M-4" #'magit-section-show-level-4-all)
-    map)
-  "Parent keymap for all keymaps of modes derived from `magit-section-mode'.")
-
-(define-derived-mode magit-section-mode special-mode "Magit-Sections"
-  "Parent major mode from which major modes with Magit-like sections inherit.
-
-Magit-Section is documented in info node `(magit-section)'."
-  :interactive nil
-  :group 'magit-section
-  (buffer-disable-undo)
-  (setq truncate-lines t)
-  (setq buffer-read-only t)
-  (setq-local line-move-visual t) ; see #1771
-  ;; Turn off syntactic font locking, but not by setting
-  ;; `font-lock-defaults' because that would enable font locking, and
-  ;; not all magit plugins may be ready for that (see #3950).
-  (setq-local font-lock-syntactic-face-function #'ignore)
-  (setq show-trailing-whitespace nil)
-  (setq-local symbol-overlay-inhibit-map t)
-  (setq list-buffers-directory (abbreviate-file-name default-directory))
-  (make-local-variable 'text-property-default-nonsticky)
-  (push (cons 'keymap t) text-property-default-nonsticky)
-  (add-hook 'pre-command-hook #'magit-section-pre-command-hook nil t)
-  (add-hook 'post-command-hook #'magit-section-post-command-hook t t)
-  (add-hook 'deactivate-mark-hook #'magit-section-deactivate-mark t t)
-  (setq-local redisplay-highlight-region-function
-              #'magit-section--highlight-region)
-  (setq-local redisplay-unhighlight-region-function
-              #'magit-section--unhighlight-region)
-  (add-function :filter-return (local 'filter-buffer-substring-function)
-                #'magit-section--remove-text-properties)
-  (when (fboundp 'magit-section-context-menu)
-    (add-hook 'context-menu-functions #'magit-section-context-menu 10 t))
-  (when magit-section-disable-line-numbers
-    (when (and (fboundp 'linum-mode)
-               (bound-and-true-p global-linum-mode))
-      (linum-mode -1))
-    (when (and (fboundp 'nlinum-mode)
-               (bound-and-true-p global-nlinum-mode))
-      (nlinum-mode -1))
-    (when (and (fboundp 'display-line-numbers-mode)
-               (bound-and-true-p global-display-line-numbers-mode))
-      (display-line-numbers-mode -1)))
-  (when (fboundp 'magit-preserve-section-visibility-cache)
-    (add-hook 'kill-buffer-hook #'magit-preserve-section-visibility-cache)))
-
-(defun magit-section--remove-text-properties (string)
-  "Remove all text-properties from STRING.
-Most importantly `magit-section'."
-  (set-text-properties 0 (length string) nil string)
-  string)
-
-;;; Core
-
-(defvar-local magit-root-section nil
-  "The root section in the current buffer.
-All other sections are descendants of this section.  The value
-of this variable is set by `magit-insert-section' and you should
-never modify it.")
-(put 'magit-root-section 'permanent-local t)
-
-(defvar-local magit--context-menu-section nil "For internal use only.")
-
-(defvar magit--context-menu-buffer nil "For internal use only.")
-
-(defun magit-point ()
-  "Return point or the position where the context menu was invoked.
-When using the context menu, return the position the user clicked
-on, provided the current buffer is the buffer in which the click
-occurred.  Otherwise return the same value as `point'."
-  (if magit--context-menu-section
-      (magit-menu-position)
-    (point)))
-
-(defun magit-thing-at-point (thing &optional no-properties)
-  "Return the THING at point or where the context menu was invoked.
-When using the context menu, return the thing the user clicked
-on, provided the current buffer is the buffer in which the click
-occurred.  Otherwise return the same value as `thing-at-point'.
-For the meaning of THING and NO-PROPERTIES see that function."
-  (if-let ((pos (magit-menu-position)))
-      (save-excursion
-        (goto-char pos)
-        (thing-at-point thing no-properties))
-    (thing-at-point thing no-properties)))
-
-(defun magit-current-section ()
-  "Return the section at point or where the context menu was invoked.
-When using the context menu, return the section that the user
-clicked on, provided the current buffer is the buffer in which
-the click occurred.  Otherwise return the section at point."
-  (or magit--context-menu-section
-      (magit-section-at)
-      magit-root-section))
-
-(defun magit-section-at (&optional position)
-  "Return the section at POSITION, defaulting to point."
-  (get-text-property (or position (point)) 'magit-section))
-
-(defun magit-section-ident (section)
-  "Return an unique identifier for SECTION.
-The return value has the form ((TYPE . VALUE)...)."
-  (cons (cons (oref section type)
-              (magit-section-ident-value section))
-        (and-let* ((parent (oref section parent)))
-          (magit-section-ident parent))))
-
-(cl-defgeneric magit-section-ident-value (object)
-  "Return OBJECT's value, making it constant and unique if necessary.
-
-This is used to correlate different incarnations of the same
-section, see `magit-section-ident' and `magit-get-section'.
-
-Sections whose values that are not constant and/or unique should
-implement a method that return a value that can be used for this
-purpose.")
-
-(cl-defmethod magit-section-ident-value ((section magit-section))
-  "Return the value unless it is an object.
-
-Different object incarnations representing the same value tend to not be
-equal, so call this generic function on the object itself to determine a
-constant value."
-  (let ((value (oref section value)))
-    (if (eieio-object-p value)
-        (magit-section-ident-value value)
-      value)))
-
-(cl-defmethod magit-section-ident-value ((object eieio-default-superclass))
-  "Simply return the object itself.  That likely isn't
-good enough, so you need to implement your own method."
-  object)
-
-(defun magit-get-section (ident &optional root)
-  "Return the section identified by IDENT.
-IDENT has to be a list as returned by `magit-section-ident'.
-If optional ROOT is non-nil, then search in that section tree
-instead of in the one whose root `magit-root-section' is."
-  (setq ident (reverse ident))
-  (let ((section (or root magit-root-section)))
-    (when (eq (car (pop ident))
-              (oref section type))
-      (while (and ident
-                  (pcase-let ((`(,type . ,value) (car ident)))
-                    (setq section
-                          (cl-find-if
-                           (lambda (section)
-                             (and (eq (oref section type) type)
-                                  (equal (magit-section-ident-value section)
-                                         value)))
-                           (oref section children)))))
-        (pop ident))
-      section)))
-
-(defun magit-section-lineage (section &optional raw)
-  "Return the lineage of SECTION.
-If optional RAW is non-nil, return a list of section objects, beginning
-with SECTION, otherwise return a list of section types."
-  (cons (if raw section (oref section type))
-        (and-let* ((parent (oref section parent)))
-          (magit-section-lineage parent raw))))
-
-(defvar magit-insert-section--current nil "For internal use only.")
-(defvar magit-insert-section--parent  nil "For internal use only.")
-(defvar magit-insert-section--oldroot nil "For internal use only.")
-
-;;; Menu
-
-(defvar magit-menu-common-value nil "See function `magit-menu-common-value'.")
-(defvar magit-menu--desc-values nil "For internal use only.")
-
-(defun magit-section-context-menu (menu click)
-  "Populate MENU with Magit-Section commands at CLICK."
-  (when-let ((section (save-excursion
-                        (unless (region-active-p)
-                          (mouse-set-point click))
-                        (magit-section-at))))
-    (unless (region-active-p)
-      (setq magit--context-menu-buffer (current-buffer))
-      (if-let ((alt (save-excursion
-                      (mouse-set-point click)
-                      (run-hook-with-args-until-success
-                       'magit-menu-alternative-section-hook section))))
-          (setq magit--context-menu-section (setq section alt))
-        (setq magit--context-menu-section section)
-        (magit-section-update-highlight t)))
-    (when (magit-section-content-p section)
-      (keymap-set-after menu "<magit-section-toggle>"
-        `(menu-item
-          ,(if (oref section hidden) "Expand section" "Collapse section")
-          magit-section-toggle))
-      (unless (oref section hidden)
-        (when-let ((children (oref section children)))
-          (when (seq-some #'magit-section-content-p children)
-            (when (seq-some (lambda (c) (oref c hidden)) children)
-              (keymap-set-after menu "<magit-section-show-children>"
-                `(menu-item "Expand children"
-                            magit-section-show-children)))
-            (when (seq-some (lambda (c) (not (oref c hidden))) children)
-              (keymap-set-after menu "<magit-section-hide-children>"
-                `(menu-item "Collapse children"
-                            magit-section-hide-children))))))
-      (keymap-set-after menu "<separator-magit-1>" menu-bar-separator))
-    (keymap-set-after menu "<magit-describe-section>"
-      `(menu-item "Describe section" magit-describe-section))
-    (when-let ((map (oref section keymap)))
-      (keymap-set-after menu "<separator-magit-2>" menu-bar-separator)
-      (when (symbolp map)
-        (setq map (symbol-value map)))
-      (setq magit-menu-common-value (magit-menu-common-value section))
-      (setq magit-menu--desc-values (magit-menu--desc-values section))
-      (map-keymap (lambda (key binding)
-                    (when (consp binding)
-                      (define-key-after menu (vector key)
-                        (copy-sequence binding))))
-                  (if (fboundp 'menu-bar-keymap)
-                      (menu-bar-keymap map)
-                    (magit--menu-bar-keymap map)))))
-  menu)
-
-(defun magit-menu-item (desc def &optional props)
-  "Return a menu item named DESC binding DEF and using PROPS.
-
-If DESC contains a supported %-spec, substitute the
-expression (magit-menu-format-desc DESC) for that.
-See `magit-menu-format-desc'."
-  `(menu-item
-    ,(if (and (stringp desc) (string-match-p "%[tTvsmMx]" desc))
-         (list 'magit-menu-format-desc desc)
-       desc)
-    ,def
-    ;; Without this, the keys for point would be shown instead
-    ;; of the relevant ones from where the click occurred.
-    :keys ,(apply-partially #'magit--menu-position-keys def)
-    ,@props))
-
-(defun magit--menu-position-keys (def)
-  (or (ignore-errors
-        (save-excursion
-          (goto-char (magit-menu-position))
-          (and-let* ((key (cl-find-if-not
-                           (lambda (key)
-                             (string-match-p "\\`<[0-9]+>\\'"
-                                             (key-description key)))
-                           (where-is-internal def))))
-            (key-description key))))
-      ""))
-
-(defun magit-menu-position ()
-  "Return the position where the context-menu was invoked.
-If the current command wasn't invoked using the context-menu,
-then return nil."
-  (and magit--context-menu-section
-       (ignore-errors
-         (posn-point (event-start (aref (this-command-keys-vector) 0))))))
-
-(defun magit-menu-highlight-point-section ()
-  (setq magit-section-highlight-force-update t)
-  (if (eq (current-buffer) magit--context-menu-buffer)
-      (setq magit--context-menu-section nil)
-    (if-let ((window (get-buffer-window magit--context-menu-buffer)))
-        (with-selected-window window
-          (setq magit--context-menu-section nil)
-          (magit-section-update-highlight))
-      (with-current-buffer magit--context-menu-buffer
-        (setq magit--context-menu-section nil))))
-  (setq magit--context-menu-buffer nil))
-
-(defvar magit--plural-append-es '(branch))
-
-(cl-defgeneric magit-menu-common-value (_section)
-  "Return some value to be used by multiple menu items.
-This function is called by `magit-section-context-menu', which
-stores the value in `magit-menu-common-value'.  Individual menu
-items can use it, e.g., in the expression used to set their
-description."
-  nil)
-
-(defun magit-menu--desc-values (section)
-  (let ((type (oref section type))
-        (value (oref section value))
-        (multiple (magit-region-sections nil t)))
-    (list type
-          value
-          (format "%s %s" type value)
-          (and multiple (length multiple))
-          (if (memq type magit--plural-append-es) "es" "s"))))
-
-(defun magit-menu-format-desc (format)
-  "Format a string based on FORMAT and menu section or selection.
-The following %-specs are allowed:
-%t means \"TYPE\".
-%T means \"TYPE\", or \"TYPEs\" if multiple sections are selected.
-%v means \"VALUE\".
-%s means \"TYPE VALUE\".
-%m means \"TYPE VALUE\", or \"COUNT TYPEs\" if multiple sections
-   are selected.
-%M means \"VALUE\", or \"COUNT TYPEs\" if multiple sections are
-   selected.
-%x means the value of `magit-menu-common-value'."
-  (pcase-let* ((`(,type ,value ,single ,count ,suffix) magit-menu--desc-values)
-               (multiple (and count (format "%s %s%s" count type suffix))))
-    (format-spec format
-                 `((?t . ,type)
-                   (?T . ,(format "%s%s" type (if count suffix "")))
-                   (?v . ,value)
-                   (?s . ,single)
-                   (?m . ,(or multiple single))
-                   (?M . ,(or multiple value))
-                   (?x . ,(format "%s" magit-menu-common-value))))))
-
-(defun magit--menu-bar-keymap (keymap)
-  "Backport of `menu-bar-keymap' for Emacs < 28.
-Slight trimmed down."
-  (let ((menu-bar nil))
-    (map-keymap (lambda (key binding)
-                  (push (cons key binding) menu-bar))
-                keymap)
-    (cons 'keymap (nreverse menu-bar))))
-
-(defun magit--context-menu-local (menu _click)
-  "Backport of `context-menu-local' for Emacs < 28."
-  (run-hooks 'activate-menubar-hook 'menu-bar-update-hook)
-  (keymap-set-after menu "<separator-local>" menu-bar-separator)
-  (let ((keymap (local-key-binding [menu-bar])))
-    (when keymap
-      (map-keymap (lambda (key binding)
-                    (when (consp binding)
-                      (define-key-after menu (vector key)
-                        (copy-sequence binding))))
-                  (magit--menu-bar-keymap keymap))))
-  menu)
-
-(define-advice context-menu-region (:around (fn menu click) magit-section-mode)
-  "Disable in `magit-section-mode' buffers."
-  (if (derived-mode-p 'magit-section-mode)
-      menu
-    (funcall fn menu click)))
-
-;;; Commands
-;;;; Movement
-
-(defun magit-section-forward ()
-  "Move to the beginning of the next visible section."
-  (interactive)
-  (if (eobp)
-      (user-error "No next section")
-    (let ((section (magit-current-section)))
-      (if (oref section parent)
-          (let ((next (and (not (oref section hidden))
-                           (not (= (oref section end)
-                                   (1+ (point))))
-                           (car (oref section children)))))
-            (while (and section (not next))
-              (unless (setq next (car (magit-section-siblings section 'next)))
-                (setq section (oref section parent))))
-            (if next
-                (magit-section-goto next)
-              (user-error "No next section")))
-        (magit-section-goto 1)))))
-
-(defun magit-section-backward ()
-  "Move to the beginning of the current or the previous visible section.
-When point is at the beginning of a section then move to the
-beginning of the previous visible section.  Otherwise move to
-the beginning of the current section."
-  (interactive)
-  (if (bobp)
-      (user-error "No previous section")
-    (let ((section (magit-current-section)) children)
-      (cond
-       ((and (= (point)
-                (1- (oref section end)))
-             (setq children (oref section children)))
-        (magit-section-goto (car (last children))))
-       ((and (oref section parent)
-             (not (= (point)
-                     (oref section start))))
-        (magit-section-goto section))
-       (t
-        (let ((prev (car (magit-section-siblings section 'prev))))
-          (if prev
-              (while (and (not (oref prev hidden))
-                          (setq children (oref prev children)))
-                (setq prev (car (last children))))
-            (setq prev (oref section parent)))
-          (cond (prev
-                 (magit-section-goto prev))
-                ((oref section parent)
-                 (user-error "No previous section"))
-                ;; Eob special cases.
-                ((not (get-text-property (1- (point)) 'invisible))
-                 (magit-section-goto -1))
-                (t
-                 (goto-char (previous-single-property-change
-                             (1- (point)) 'invisible))
-                 (forward-line -1)
-                 (magit-section-goto (magit-current-section))))))))))
-
-(defun magit-section-up ()
-  "Move to the beginning of the parent section."
-  (interactive)
-  (if-let ((parent (oref (magit-current-section) parent)))
-      (magit-section-goto parent)
-    (user-error "No parent section")))
-
-(defun magit-section-forward-sibling ()
-  "Move to the beginning of the next sibling section.
-If there is no next sibling section, then move to the parent."
-  (interactive)
-  (let ((current (magit-current-section)))
-    (if (oref current parent)
-        (if-let ((next (car (magit-section-siblings current 'next))))
-            (magit-section-goto next)
-          (magit-section-forward))
-      (magit-section-goto 1))))
-
-(defun magit-section-backward-sibling ()
-  "Move to the beginning of the previous sibling section.
-If there is no previous sibling section, then move to the parent."
-  (interactive)
-  (let ((current (magit-current-section)))
-    (if (oref current parent)
-        (if-let ((previous (car (magit-section-siblings current 'prev))))
-            (magit-section-goto previous)
-          (magit-section-backward))
-      (magit-section-goto -1))))
-
-(defun magit-section-goto (arg)
-  (if (integerp arg)
-      (progn (forward-line arg)
-             (setq arg (magit-current-section)))
-    (goto-char (oref arg start)))
-  (run-hook-with-args 'magit-section-movement-hook arg))
-
-(defun magit-section-set-window-start (section)
-  "Ensure the beginning of SECTION is visible."
-  (unless (pos-visible-in-window-p (oref section end))
-    (set-window-start (selected-window) (oref section start))))
-
-(defmacro magit-define-section-jumper
-    (name heading type &optional value inserter &rest properties)
-  "Define an interactive function to go some section.
-Together TYPE and VALUE identify the section.
-HEADING is the displayed heading of the section."
-  (declare (indent defun))
-  `(transient-define-suffix ,name (&optional expand)
-     ,(format "Jump to the section \"%s\".
-With a prefix argument also expand it." heading)
-     ,@properties
-     ,@(and (not (plist-member properties :description))
-            (list :description heading))
-     ,@(and inserter
-            `(:if (lambda () (memq ',inserter
-                              (bound-and-true-p magit-status-sections-hook)))))
-     :inapt-if-not (lambda () (magit-get-section
-                          (cons (cons ',type ,value)
-                                (magit-section-ident magit-root-section))))
-     (interactive "P")
-     (if-let ((section (magit-get-section
-                        (cons (cons ',type ,value)
-                              (magit-section-ident magit-root-section)))))
-         (progn (goto-char (oref section start))
-                (when expand
-                  (with-local-quit (magit-section-show section))
-                  (recenter 0)))
-       (message ,(format "Section \"%s\" wasn't found" heading)))))
-
-;;;; Visibility
-
-(defun magit-section-show (section)
-  "Show the body of the current section."
-  (interactive (list (magit-current-section)))
-  (oset section hidden nil)
-  (magit-section--maybe-wash section)
-  (when-let ((beg (oref section content)))
-    (remove-overlays beg (oref section end) 'invisible t))
-  (magit-section-maybe-update-visibility-indicator section)
-  (magit-section-maybe-cache-visibility section)
-  (dolist (child (oref section children))
-    (if (oref child hidden)
-        (magit-section-hide child)
-      (magit-section-show child))))
-
-(defun magit-section--maybe-wash (section)
-  (when-let ((washer (oref section washer)))
-    (oset section washer nil)
-    (let ((inhibit-read-only t)
-          (magit-insert-section--parent section)
-          (magit-insert-section--current section)
-          (content (oref section content)))
-      (save-excursion
-        (if (and content (< content (oref section end)))
-            (funcall washer section) ; already partially washed (hunk)
-          (goto-char (oref section end))
-          (oset section content (point-marker))
-          (funcall washer)
-          (oset section end (point-marker)))))
-    (setq magit-section-highlight-force-update t)))
-
-(defun magit-section-hide (section)
-  "Hide the body of the current section."
-  (interactive (list (magit-current-section)))
-  (if (eq section magit-root-section)
-      (user-error "Cannot hide root section")
-    (oset section hidden t)
-    (when-let ((beg (oref section content)))
-      (let ((end (oref section end)))
-        (when (< beg (point) end)
-          (goto-char (oref section start)))
-        (remove-overlays beg end 'invisible t)
-        (let ((o (make-overlay beg end)))
-          (overlay-put o 'evaporate t)
-          (overlay-put o 'invisible t)
-          (overlay-put o 'cursor-intangible t))))
-    (magit-section-maybe-update-visibility-indicator section)
-    (magit-section-maybe-cache-visibility section)))
-
-(defun magit-section-toggle (section)
-  "Toggle visibility of the body of the current section."
-  (interactive (list (magit-current-section)))
-  (cond ((eq section magit-root-section)
-         (user-error "Cannot hide root section"))
-        ((oref section hidden)
-         (magit-section-show section))
-        ((magit-section-hide section))))
-
-(defun magit-section-toggle-children (section)
-  "Toggle visibility of bodies of children of the current section."
-  (interactive (list (magit-current-section)))
-  (let* ((children (oref section children))
-         (show (--any-p (oref it hidden) children)))
-    (dolist (c children)
-      (oset c hidden show)))
-  (magit-section-show section))
-
-(defun magit-section-show-children (section &optional depth)
-  "Recursively show the bodies of children of the current section.
-With a prefix argument show children that deep and hide deeper
-children."
-  (interactive (list (magit-current-section)))
-  (magit-section-show-children-1 section depth)
-  (magit-section-show section))
-
-(defun magit-section-show-children-1 (section &optional depth)
-  (dolist (child (oref section children))
-    (oset child hidden nil)
-    (if depth
-        (if (> depth 0)
-            (magit-section-show-children-1 child (1- depth))
-          (magit-section-hide child))
-      (magit-section-show-children-1 child))))
-
-(defun magit-section-hide-children (section)
-  "Recursively hide the bodies of children of the current section."
-  (interactive (list (magit-current-section)))
-  (mapc #'magit-section-hide (oref section children)))
-
-(defun magit-section-show-headings (section)
-  "Recursively show headings of children of the current section.
-Only show the headings, previously shown text-only bodies are
-hidden."
-  (interactive (list (magit-current-section)))
-  (magit-section-show-headings-1 section)
-  (magit-section-show section))
-
-(defun magit-section-show-headings-1 (section)
-  (dolist (child (oref section children))
-    (oset child hidden nil)
-    (when (or (oref child children)
-              (not (oref child content)))
-      (magit-section-show-headings-1 child))))
-
-(defun magit-section-cycle (section)
-  "Cycle visibility of current section and its children.
-
-If this command is invoked using \\`C-<tab>' and that is globally bound
-to `tab-next', then this command pivots to behave like that command, and
-you must instead use \\`C-c TAB' to cycle section visibility.
-
-If you would like to keep using \\`C-<tab>' to cycle section visibility
-but also want to use `tab-bar-mode', then you have to prevent that mode
-from using this key and instead bind another key to `tab-next'.  Because
-`tab-bar-mode' does not use a mode map but instead manipulates the
-global map, this involves advising `tab-bar--define-keys'."
-  (interactive (list (magit-current-section)))
-  (cond
-   ((and (equal (this-command-keys) [C-tab])
-         (eq (global-key-binding [C-tab]) 'tab-next)
-         (fboundp 'tab-bar-switch-to-next-tab))
-    (tab-bar-switch-to-next-tab current-prefix-arg))
-   ((oref section hidden)
-    (magit-section-show section)
-    (magit-section-hide-children section))
-   ((let ((children (oref section children)))
-      (cond ((and (--any-p (oref it hidden)   children)
-                  (--any-p (oref it children) children))
-             (magit-section-show-headings section))
-            ((seq-some #'magit-section-hidden-body children)
-             (magit-section-show-children section))
-            ((magit-section-hide section)))))))
-
-(defun magit-section-cycle-global ()
-  "Cycle visibility of all sections in the current buffer."
-  (interactive)
-  (let ((children (oref magit-root-section children)))
-    (cond ((and (--any-p (oref it hidden)   children)
-                (--any-p (oref it children) children))
-           (magit-section-show-headings magit-root-section))
-          ((seq-some #'magit-section-hidden-body children)
-           (magit-section-show-children magit-root-section))
-          (t
-           (mapc #'magit-section-hide children)))))
-
-(defun magit-section-hidden-body (section &optional pred)
-  (if-let ((children (oref section children)))
-      (funcall (or pred #'-any-p) #'magit-section-hidden-body children)
-    (and (oref section content)
-         (oref section hidden))))
-
-(defun magit-section-content-p (section)
-  "Return non-nil if SECTION has content or an unused washer function."
-  (with-slots (content end washer) section
-    (and content (or (not (= content end)) washer))))
-
-(defun magit-section-invisible-p (section)
-  "Return t if the SECTION's body is invisible.
-When the body of an ancestor of SECTION is collapsed then
-SECTION's body (and heading) obviously cannot be visible."
-  (or (oref section hidden)
-      (and-let* ((parent (oref section parent)))
-        (magit-section-invisible-p parent))))
-
-(defun magit-section-show-level (level)
-  "Show surrounding sections up to LEVEL.
-If LEVEL is negative, show up to the absolute value.
-Sections at higher levels are hidden."
-  (if (< level 0)
-      (let ((s (magit-current-section)))
-        (setq level (- level))
-        (while (> (1- (length (magit-section-ident s))) level)
-          (setq s (oref s parent))
-          (goto-char (oref s start)))
-        (magit-section-show-children magit-root-section (1- level)))
-    (cl-do* ((s (magit-current-section)
-                (oref s parent))
-             (i (1- (length (magit-section-ident s)))
-                (cl-decf i)))
-        ((cond ((< i level) (magit-section-show-children s (- level i 1)) t)
-               ((= i level) (magit-section-hide s) t))
-         (magit-section-goto s)))))
-
-(defun magit-section-show-level-1 ()
-  "Show surrounding sections on first level."
-  (interactive)
-  (magit-section-show-level 1))
-
-(defun magit-section-show-level-1-all ()
-  "Show all sections on first level."
-  (interactive)
-  (magit-section-show-level -1))
-
-(defun magit-section-show-level-2 ()
-  "Show surrounding sections up to second level."
-  (interactive)
-  (magit-section-show-level 2))
-
-(defun magit-section-show-level-2-all ()
-  "Show all sections up to second level."
-  (interactive)
-  (magit-section-show-level -2))
-
-(defun magit-section-show-level-3 ()
-  "Show surrounding sections up to third level."
-  (interactive)
-  (magit-section-show-level 3))
-
-(defun magit-section-show-level-3-all ()
-  "Show all sections up to third level."
-  (interactive)
-  (magit-section-show-level -3))
-
-(defun magit-section-show-level-4 ()
-  "Show surrounding sections up to fourth level."
-  (interactive)
-  (magit-section-show-level 4))
-
-(defun magit-section-show-level-4-all ()
-  "Show all sections up to fourth level."
-  (interactive)
-  (magit-section-show-level -4))
-
-(defun magit-mouse-toggle-section (event)
-  "Toggle visibility of the clicked section.
-Clicks outside either the section heading or the left fringe are
-silently ignored."
-  (interactive "e")
-  (let* ((pos (event-start event))
-         (section (magit-section-at (posn-point pos))))
-    (if (eq (posn-area pos) 'left-fringe)
-        (when section
-          (while (not (magit-section-content-p section))
-            (setq section (oref section parent)))
-          (unless (eq section magit-root-section)
-            (goto-char (oref section start))
-            (magit-section-toggle section)))
-      (magit-section-toggle section))))
-
-;;;; Auxiliary
-
-(defun magit-describe-section-briefly (section &optional ident interactive)
-  "Show information about the section at point.
-With a prefix argument show the section identity instead of the
-section lineage.  This command is intended for debugging purposes.
-\n(fn SECTION &optional IDENT)"
-  (interactive (list (magit-current-section) current-prefix-arg t))
-  (let ((str (format "#<%s %S %S %s-%s%s>"
-                     (eieio-object-class section)
-                     (let ((val (oref section value)))
-                       (cond ((stringp val)
-                              (substring-no-properties val))
-                             ((and (eieio-object-p val)
-                                   (fboundp 'cl-prin1-to-string))
-                              (cl-prin1-to-string val))
-                             (t
-                              val)))
-                     (if ident
-                         (magit-section-ident section)
-                       (apply #'vector (magit-section-lineage section)))
-                     (and-let* ((m (oref section start)))
-                       (if (markerp m) (marker-position m) m))
-                     (if-let ((m (oref section content)))
-                         (format "[%s-]"
-                                 (if (markerp m) (marker-position m) m))
-                       "")
-                     (and-let* ((m (oref section end)))
-                       (if (markerp m) (marker-position m) m)))))
-    (when interactive
-      (message "%s" str))
-    str))
-
-(cl-defmethod cl-print-object ((section magit-section) stream)
-  "Print `magit-describe-section' result of SECTION."
-  ;; Used by debug and edebug as of Emacs 26.
-  (princ (magit-describe-section-briefly section) stream))
-
-(defun magit-describe-section (section &optional interactive-p)
-  "Show information about the section at point."
-  (interactive (list (magit-current-section) t))
-  (let ((inserter-section section))
-    (while (and inserter-section (not (oref inserter-section inserter)))
-      (setq inserter-section (oref inserter-section parent)))
-    (when (and inserter-section (oref inserter-section inserter))
-      (setq section inserter-section)))
-  (pcase (oref section inserter)
-    (`((,hook ,fun) . ,src-src)
-     (help-setup-xref `(magit-describe-section ,section) interactive-p)
-     (with-help-window (help-buffer)
-       (with-current-buffer standard-output
-         (insert (format-message
-                  "%s\n  is inserted by `%s'\n  from `%s'"
-                  (magit-describe-section-briefly section)
-                  (make-text-button (symbol-name fun) nil
-                                    :type 'help-function
-                                    'help-args (list fun))
-                  (make-text-button (symbol-name hook) nil
-                                    :type 'help-variable
-                                    'help-args (list hook))))
-         (pcase-dolist (`(,hook ,fun) src-src)
-           (insert (format-message
-                    ",\n  called by `%s'\n  from `%s'"
-                    (make-text-button (symbol-name fun) nil
-                                      :type 'help-function
-                                      'help-args (list fun))
-                    (make-text-button (symbol-name hook) nil
-                                      :type 'help-variable
-                                      'help-args (list hook)))))
-         (insert ".\n\n")
-         (insert
-          (format-message
-           "`%s' is "
-           (make-text-button (symbol-name fun) nil
-                             :type 'help-function 'help-args (list fun))))
-         (describe-function-1 fun))))
-    (_ (message "%s, inserter unknown"
-                (magit-describe-section-briefly section)))))
-
-;;; Match
-
-(cl-defun magit-section-match
-    (condition &optional (section (magit-current-section)))
-  "Return t if SECTION matches CONDITION.
-
-SECTION defaults to the section at point.  If SECTION is not
-specified and there also is no section at point, then return
-nil.
-
-CONDITION can take the following forms:
-  (CONDITION...)  matches if any of the CONDITIONs matches.
-  [CLASS...]      matches if the section's class is the same
-                  as the first CLASS or a subclass of that;
-                  the section's parent class matches the
-                  second CLASS; and so on.
-  [* CLASS...]    matches sections that match [CLASS...] and
-                  also recursively all their child sections.
-  CLASS           matches if the section's class is the same
-                  as CLASS or a subclass of that; regardless
-                  of the classes of the parent sections.
-
-Each CLASS should be a class symbol, identifying a class that
-derives from `magit-section'.  For backward compatibility CLASS
-can also be a \"type symbol\".  A section matches such a symbol
-if the value of its `type' slot is `eq'.  If a type symbol has
-an entry in `magit--section-type-alist', then a section also
-matches that type if its class is a subclass of the class that
-corresponds to the type as per that alist.
-
-Note that it is not necessary to specify the complete section
-lineage as printed by `magit-describe-section-briefly', unless
-of course you want to be that precise."
-  (and section (magit-section-match-1 condition section)))
-
-(defun magit-section-match-1 (condition section)
-  (cl-assert condition)
-  (and section
-       (if (listp condition)
-           (--first (magit-section-match-1 it section) condition)
-         (magit-section-match-2 (if (symbolp condition)
-                                    (list condition)
-                                  (cl-coerce condition 'list))
-                                section))))
-
-(defun magit-section-match-2 (condition section)
-  (if (eq (car condition) '*)
-      (or (magit-section-match-2 (cdr condition) section)
-          (and-let* ((parent (oref section parent)))
-            (magit-section-match-2 condition parent)))
-    (and (let ((c (car condition)))
-           (if (class-p c)
-               (cl-typep section c)
-             (if-let ((class (cdr (assq c magit--section-type-alist))))
-                 (cl-typep section class)
-               (eq (oref section type) c))))
-         (or (not (setq condition (cdr condition)))
-             (and-let* ((parent (oref section parent)))
-               (magit-section-match-2 condition parent))))))
-
-(defun magit-section-value-if (condition &optional section)
-  "If the section at point matches CONDITION, then return its value.
-
-If optional SECTION is non-nil then test whether that matches
-instead.  If there is no section at point and SECTION is nil,
-then return nil.  If the section does not match, then return
-nil.
-
-See `magit-section-match' for the forms CONDITION can take."
-  (and-let* ((section (or section (magit-current-section))))
-    (and (magit-section-match condition section)
-         (oref section value))))
-
-(defmacro magit-section-case (&rest clauses)
-  "Choose among clauses on the type of the section at point.
-
-Each clause looks like (CONDITION BODY...).  The type of the
-section is compared against each CONDITION; the BODY forms of the
-first match are evaluated sequentially and the value of the last
-form is returned.  Inside BODY the symbol `it' is bound to the
-section at point.  If no clause succeeds or if there is no
-section at point, return nil.
-
-See `magit-section-match' for the forms CONDITION can take.
-Additionally a CONDITION of t is allowed in the final clause, and
-matches if no other CONDITION match, even if there is no section
-at point."
-  (declare (indent 0)
-           (debug (&rest (sexp body))))
-  `(let* ((it (magit-current-section)))
-     (cond ,@(mapcar (lambda (clause)
-                       `(,(or (eq (car clause) t)
-                              `(and it
-                                    (magit-section-match-1 ',(car clause) it)))
-                         ,@(cdr clause)))
-                     clauses))))
-
-(defun magit-section-match-assoc (section alist)
-  "Return the value associated with SECTION's type or lineage in ALIST."
-  (seq-some (pcase-lambda (`(,key . ,val))
-              (and (magit-section-match-1 key section) val))
-            alist))
-
-;;; Create
-
-(defvar magit-insert-section-hook nil
-  "Hook run after `magit-insert-section's BODY.
-Avoid using this hook and only ever do so if you know
-what you are doing and are sure there is no other way.")
-
-(defmacro magit-insert-section (&rest args)
-  "Insert a section at point.
-
-Create a section object of type CLASS, storing VALUE in its
-`value' slot, and insert the section at point.  CLASS is a
-subclass of `magit-section' or has the form `(eval FORM)', in
-which case FORM is evaluated at runtime and should return a
-subclass.  In other places a sections class is often referred
-to as its \"type\".
-
-Many commands behave differently depending on the class of the
-current section and sections of a certain class can have their
-own keymap, which is specified using the `keymap' class slot.
-The value of that slot should be a variable whose value is a
-keymap.
-
-For historic reasons Magit and Forge in most cases use symbols
-as CLASS that don't actually identify a class and that lack the
-appropriate package prefix.  This works due to some undocumented
-kludges, which are not available to other packages.
-
-When optional HIDE is non-nil collapse the section body by
-default, i.e., when first creating the section, but not when
-refreshing the buffer.  Else expand it by default.  This can be
-overwritten using `magit-section-set-visibility-hook'.  When a
-section is recreated during a refresh, then the visibility of
-predecessor is inherited and HIDE is ignored (but the hook is
-still honored).
-
-BODY is any number of forms that actually insert the section's
-heading and body.  Optional NAME, if specified, has to be a
-symbol, which is then bound to the object of the section being
-inserted.
-
-Before BODY is evaluated the `start' of the section object is set
-to the value of `point' and after BODY was evaluated its `end' is
-set to the new value of `point'; BODY is responsible for moving
-`point' forward.
-
-If it turns out inside BODY that the section is empty, then
-`magit-cancel-section' can be used to abort and remove all traces
-of the partially inserted section.  This can happen when creating
-a section by washing Git's output and Git didn't actually output
-anything this time around.
-
-\(fn [NAME] (CLASS &optional VALUE HIDE) &rest BODY)"
-  (declare (indent 1)
-           (debug ([&optional symbolp]
-                   (&or [("eval" form) &optional form form &rest form]
-                        [symbolp &optional form form &rest form])
-                   body)))
-  (pcase-let* ((bind (and (symbolp (car args))
-                          (pop args)))
-               (`((,class ,value ,hide . ,args) . ,body) args)
-               (obj (cl-gensym "section")))
-    `(let* ((,obj (magit-insert-section--create
-                   ,(if (eq (car-safe class) 'eval) (cadr class) `',class)
-                   ,value ,hide ,@args))
-            (magit-insert-section--current ,obj)
-            (magit-insert-section--oldroot
-             (or magit-insert-section--oldroot
-                 (and (not magit-insert-section--parent)
-                      (prog1 magit-root-section
-                        (setq magit-root-section ,obj)))))
-            (magit-insert-section--parent ,obj))
-       (catch 'cancel-section
-         ,@(if bind `((let ((,bind ,obj)) ,@body)) body)
-         (magit-insert-section--finish ,obj))
-       ,obj)))
-
-(defun magit-insert-section--create (class value hide &rest args)
-  (let (type)
-    (if (class-p class)
-        (setq type (or (car (rassq class magit--section-type-alist))
-                       class))
-      (setq type class)
-      (setq class (or (cdr (assq class magit--section-type-alist))
-                      'magit-section)))
-    (let ((obj (apply class :type type args)))
-      (oset obj value value)
-      (oset obj parent magit-insert-section--parent)
-      (oset obj start (if magit-section-inhibit-markers (point) (point-marker)))
-      (unless (slot-boundp obj 'hidden)
-        (oset obj hidden
-              (let (set old)
-                (cond
-                 ((setq set (run-hook-with-args-until-success
-                             'magit-section-set-visibility-hook obj))
-                  (eq set 'hide))
-                 ((setq old (and (not magit-section-preserve-visibility)
-                                 magit-insert-section--oldroot
-                                 (magit-get-section
-                                  (magit-section-ident obj)
-                                  magit-insert-section--oldroot)))
-                  (oref old hidden))
-                 ((setq set (magit-section-match-assoc
-                             obj magit-section-initial-visibility-alist))
-                  (eq (if (functionp set) (funcall set obj) set) 'hide))
-                 (hide)))))
-      (unless (oref obj keymap)
-        (let ((type (oref obj type)))
-          (oset obj keymap
-                (or (let ((sym (intern (format "magit-%s-section-map" type))))
-                      (and (boundp sym) sym))
-                    (let ((sym (intern (format "forge-%s-section-map" type))))
-                      (and (boundp sym) sym))))))
-      obj)))
-
-(defun magit-insert-section--finish (obj)
-  (run-hooks 'magit-insert-section-hook)
-  (let ((beg (oref obj start))
-        (end (oset obj end
-                   (if magit-section-inhibit-markers
-                       (point)
-                     (point-marker))))
-        (props `( magit-section ,obj
-                  ,@(and-let* ((map (symbol-value (oref obj keymap))))
-                      (list 'keymap map)))))
-    (unless magit-section-inhibit-markers
-      (set-marker-insertion-type beg t))
-    (cond ((eq obj magit-root-section))
-          ((oref obj children)
-           (magit-insert-child-count obj)
-           (magit-section-maybe-add-heading-map obj)
-           (save-excursion
-             (goto-char beg)
-             (while (< (point) end)
-               (let ((next (or (next-single-property-change
-                                (point) 'magit-section)
-                               end)))
-                 (unless (magit-section-at)
-                   (add-text-properties (point) next props))
-                 (goto-char next)))))
-          ((add-text-properties beg end props)))
-    (cond ((eq obj magit-root-section)
-           (when (eq magit-section-inhibit-markers 'delay)
-             (setq magit-section-inhibit-markers nil)
-             (magit-map-sections
-              (lambda (section)
-                (oset section start (copy-marker (oref section start) t))
-                (oset section end   (copy-marker (oref section end)   t)))))
-           (let ((magit-section-cache-visibility nil))
-             (magit-section-show obj)))
-          (magit-section-insert-in-reverse
-           (push obj (oref (oref obj parent) children)))
-          ((let ((parent (oref obj parent)))
-             (oset parent children
-                   (nconc (oref parent children)
-                          (list obj))))))
-    (when magit-section-insert-in-reverse
-      (oset obj children (nreverse (oref obj children))))))
-
-(defun magit-cancel-section (&optional if-empty)
-  "Cancel inserting the section that is currently being inserted.
-
-Canceling returns from the inner most use of `magit-insert-section' and
-removes all text that was inserted by that.
-
-If optional IF-EMPTY is non-nil, then only cancel the section, if it is
-empty.  If a section is split into a heading and a body (i.e., when its
-`content' slot is non-nil), then only check if the body is empty."
-  (when (and magit-insert-section--current
-             (or (not if-empty)
-                 (= (point) (or (oref magit-insert-section--current content)
-                                (oref magit-insert-section--current start)))))
-    (if (eq magit-insert-section--current magit-root-section)
-        (insert "(empty)\n")
-      (delete-region (oref magit-insert-section--current start)
-                     (point))
-      (setq magit-insert-section--current nil)
-      (throw 'cancel-section nil))))
-
-(defun magit-insert-heading (&rest args)
-  "Insert the heading for the section currently being inserted.
-
-This function should only be used inside `magit-insert-section'.
-
-When called without any arguments, then just set the `content'
-slot of the object representing the section being inserted to
-a marker at `point'.  The section should only contain a single
-line when this function is used like this.
-
-When called with arguments ARGS, which have to be strings, or
-nil, then insert those strings at point.  The section should not
-contain any text before this happens and afterwards it should
-again only contain a single line.  If the `face' property is set
-anywhere inside any of these strings, then insert all of them
-unchanged.  Otherwise use the `magit-section-heading' face for
-all inserted text.
-
-The `content' property of the section object is the end of the
-heading (which lasts from `start' to `content') and the beginning
-of the the body (which lasts from `content' to `end').  If the
-value of `content' is nil, then the section has no heading and
-its body cannot be collapsed.  If a section does have a heading,
-then its height must be exactly one line, including a trailing
-newline character.  This isn't enforced, you are responsible for
-getting it right.  The only exception is that this function does
-insert a newline character if necessary
-
-If provided, optional CHILD-COUNT must evaluate to an integer or
-boolean.  If t, then the count is determined once the children have been
-inserted, using `magit-insert-child-count' (which see).  For historic
-reasons, if the heading ends with \":\", the count is substituted for
-that, at this time as well.  If `magit-section-show-child-count' is nil,
-no counts are inserted
-
-\n(fn [CHILD-COUNT] &rest STRINGS)"
-  (declare (indent defun))
-  (when args
-    (let ((count (and (or (integerp (car args))
-                          (booleanp (car args)))
-                      (pop args)))
-          (heading (apply #'concat args)))
-      (insert (if (or (text-property-not-all 0 (length heading)
-                                             'font-lock-face nil heading)
-                      (text-property-not-all 0 (length heading)
-                                             'face nil heading))
-                  heading
-                (propertize heading 'font-lock-face 'magit-section-heading)))
-      (when (and count magit-section-show-child-count)
-        (insert (propertize (format " (%s)" count)
-                            'font-lock-face 'magit-section-child-count)))))
-  (unless (bolp)
-    (insert ?\n))
-  (when (fboundp 'magit-maybe-make-margin-overlay)
-    (magit-maybe-make-margin-overlay))
-  (oset magit-insert-section--current content
-        (if magit-section-inhibit-markers (point) (point-marker))))
-
-(defmacro magit-insert-section-body (&rest body)
-  "Use BODY to insert the section body, once the section is expanded.
-If the section is expanded when it is created, then this is
-like `progn'.  Otherwise BODY isn't evaluated until the section
-is explicitly expanded."
-  (declare (indent 0))
-  (let ((f (cl-gensym))
-        (s (cl-gensym))
-        (l (cl-gensym)))
-    `(let ((,f (lambda () ,@body)))
-       (if (oref magit-insert-section--current hidden)
-           (oset magit-insert-section--current washer
-                 (let ((,s magit-insert-section--current))
-                   (lambda ()
-                     (let ((,l (magit-section-lineage ,s t)))
-                       (dolist (s ,l)
-                         (set-marker-insertion-type (oref s end) t))
-                       (funcall ,f)
-                       (dolist (s ,l)
-                         (set-marker-insertion-type (oref s end) nil))
-                       (magit-section-maybe-remove-heading-map ,s)
-                       (magit-section-maybe-remove-visibility-indicator ,s)))))
-         (funcall ,f)))))
-
-(defun magit-insert-headers (hook)
-  (let* ((header-sections nil)
-         (magit-insert-section-hook
-          (cons (lambda ()
-                  (push magit-insert-section--current
-                        header-sections))
-                (ensure-list magit-insert-section-hook))))
-    (magit-run-section-hook hook)
-    (when header-sections
-      (insert "\n")
-      ;; Make the first header into the parent of the rest.
-      (when (cdr header-sections)
-        (cl-callf nreverse header-sections)
-        (let* ((1st-header (pop header-sections))
-               (header-parent (oref 1st-header parent)))
-          (oset header-parent children (list 1st-header))
-          (oset 1st-header children header-sections)
-          (oset 1st-header content (oref (car header-sections) start))
-          (oset 1st-header end (oref (car (last header-sections)) end))
-          (dolist (sub-header header-sections)
-            (oset sub-header parent 1st-header))
-          (magit-section-maybe-add-heading-map 1st-header))))))
-
-(defun magit-section-maybe-add-heading-map (section)
-  (when (magit-section-content-p section)
-    (let ((start (oref section start))
-          (map (oref section keymap)))
-      (when (symbolp map)
-        (setq map (symbol-value map)))
-      (put-text-property
-       start
-       (save-excursion
-         (goto-char start)
-         (line-end-position))
-       'keymap (if map
-                   (make-composed-keymap
-                    (list map magit-section-heading-map))
-                 magit-section-heading-map)))))
-
-(defun magit-section-maybe-remove-heading-map (section)
-  (with-slots (start content end keymap) section
-    (when (= content end)
-      (put-text-property start end 'keymap
-                         (if (symbolp keymap) (symbol-value keymap) keymap)))))
-
-(defun magit-insert-child-count (section)
-  "Modify SECTION's heading to contain number of child sections.
-
-If `magit-section-show-child-count' is non-nil and the SECTION
-has children and its heading ends with \":\", then replace that
-with \" (N)\", where N is the number of child sections.
-
-This function is called by `magit-insert-section' after that has
-evaluated its BODY.  Admittedly that's a bit of a hack."
-  (let (content count)
-    (cond
-     ((not (and magit-section-show-child-count
-                (setq content (oref section content))
-                (setq count (length (oref section children)))
-                (> count 0))))
-     ((eq (char-before (- content 1)) ?:)
-      (save-excursion
-        (goto-char (- content 2))
-        (insert (magit--propertize-face (format " (%s)" count)
-                                        'magit-section-child-count))
-        (delete-char 1)))
-     ((and (eq (char-before (- content 4)) ?\s)
-           (eq (char-before (- content 3)) ?\()
-           (eq (char-before (- content 2)) ?t )
-           (eq (char-before (- content 1)) ?\)))
-      (save-excursion
-        (goto-char (- content 3))
-        (delete-char 1)
-        (insert (format "%s" count)))))))
-
-;;; Highlight
-
-(defun magit-section-pre-command-hook ()
-  (when (and (or magit--context-menu-buffer
-                 magit--context-menu-section)
-             (not (eq (ignore-errors
-                        (event-basic-type (aref (this-command-keys) 0)))
-                      'mouse-3)))
-    ;; This is the earliest opportunity to clean up after an aborted
-    ;; context-menu because that neither causes the command that created
-    ;; the menu to abort nor some abortion hook to be run.  It is not
-    ;; possible to update highlighting before the first command invoked
-    ;; after the menu is aborted.  Here we can only make sure it is
-    ;; updated afterwards.
-    (magit-menu-highlight-point-section))
-  (setq magit-section-pre-command-region-p (region-active-p))
-  (setq magit-section-pre-command-section (magit-current-section)))
-
-(defun magit-section-post-command-hook ()
-  (let ((window (selected-window)))
-    ;; The command may have used `set-window-buffer' to change
-    ;; the window's buffer without changing the current buffer.
-    (when (eq (current-buffer) (window-buffer window))
-      (cursor-sensor-move-to-tangible window)
-      (when (or magit--context-menu-buffer
-                magit--context-menu-section)
-        (magit-menu-highlight-point-section))))
-  (unless (memq this-command '(magit-refresh magit-refresh-all))
-    (magit-section-update-highlight)))
-
-(defun magit-section-deactivate-mark ()
-  (setq magit-section-highlight-force-update t))
-
-(defun magit-section-update-highlight (&optional force)
-  (let ((section (magit-current-section)))
-    (when (or force
-              magit-section-highlight-force-update
-              (xor magit-section-pre-command-region-p (region-active-p))
-              (not (eq magit-section-pre-command-section section)))
-      (let ((inhibit-read-only t)
-            (deactivate-mark nil)
-            (selection (magit-region-sections)))
-        (mapc #'delete-overlay magit-section-highlight-overlays)
-        (setq magit-section-highlight-overlays nil)
-        (setq magit-section-unhighlight-sections
-              magit-section-highlighted-sections)
-        (setq magit-section-highlighted-sections nil)
-        (if (and (fboundp 'long-line-optimizations-p)
-                 (long-line-optimizations-p))
-            (magit-section--enable-long-lines-shortcuts)
-          (unless (eq section magit-root-section)
-            (run-hook-with-args-until-success
-             'magit-section-highlight-hook section selection))
-          (dolist (s magit-section-unhighlight-sections)
-            (run-hook-with-args-until-success
-             'magit-section-unhighlight-hook s selection)))
-        (restore-buffer-modified-p nil)))
-    (setq magit-section-highlight-force-update nil)
-    (magit-section-maybe-paint-visibility-ellipses)))
-
-(defun magit-section-highlight (section selection)
-  "Highlight SECTION and if non-nil all sections in SELECTION.
-This function works for any section but produces undesirable
-effects for diff related sections, which by default are
-highlighted using `magit-diff-highlight'.  Return t."
-  (when-let ((face (oref section heading-highlight-face)))
-    (dolist (section (or selection (list section)))
-      (magit-section-make-overlay
-       (oref section start)
-       (or (oref section content)
-           (oref section end))
-       face)))
-  (cond (selection
-         (magit-section-make-overlay (oref (car selection) start)
-                                     (oref (car (last selection)) end)
-                                     'magit-section-highlight)
-         (magit-section-highlight-selection nil selection))
-        (t
-         (magit-section-make-overlay (oref section start)
-                                     (oref section end)
-                                     'magit-section-highlight)))
-  t)
-
-(defun magit-section-highlight-selection (_ selection)
-  "Highlight the section-selection region.
-If SELECTION is non-nil, then it is a list of sections selected by
-the region.  The headings of these sections are then highlighted.
-
-This is a fallback for people who don't want to highlight the
-current section and therefore removed `magit-section-highlight'
-from `magit-section-highlight-hook'.
-
-This function is necessary to ensure that a representation of
-such a region is visible.  If neither of these functions were
-part of the hook variable, then such a region would be
-invisible."
-  (when (and selection
-             (not (and (eq this-command 'mouse-drag-region))))
-    (dolist (section selection)
-      (magit-section-make-overlay (oref section start)
-                                  (or (oref section content)
-                                      (oref section end))
-                                  'magit-section-heading-selection))
-    t))
-
-(defun magit-section-make-overlay (start end face)
-  ;; Yes, this doesn't belong here.  But the alternative of
-  ;; spreading this hack across the code base is even worse.
-  (when (and magit-section-keep-region-overlay
-             (memq face '(magit-section-heading-selection
-                          magit-diff-file-heading-selection
-                          magit-diff-hunk-heading-selection)))
-    (setq face (list :foreground (face-foreground face))))
-  (let ((ov (make-overlay start end nil t)))
-    (overlay-put ov 'font-lock-face face)
-    (overlay-put ov 'evaporate t)
-    (push ov magit-section-highlight-overlays)
-    ov))
-
-(defvar magit-show-long-lines-warning t)
-
-(defun magit-section--enable-long-lines-shortcuts ()
-  (message "Enabling long lines shortcuts in %S" (current-buffer))
-  (kill-local-variable 'redisplay-highlight-region-function)
-  (kill-local-variable 'redisplay-unhighlight-region-function)
-  (when magit-show-long-lines-warning
-    (setq magit-show-long-lines-warning nil)
-    (display-warning 'magit (format "\
-Emacs has enabled redisplay shortcuts
-in this buffer because there are lines whose length go beyond
-`long-line-threshold' \(%s characters).  As a result, section
-highlighting and the special appearance of the region has been
-disabled.  Some existing highlighting might remain in effect.
-
-These shortcuts remain enabled, even once there no longer are
-any long lines in this buffer.  To disable them again, kill
-and recreate the buffer.
-
-This message won't be shown for this session again.  To disable
-it for all future sessions, set `magit-show-long-lines-warning'
-to nil." (bound-and-true-p long-line-threshold)) :warning)))
-
-(cl-defgeneric magit-section-get-relative-position (section))
-
-(cl-defmethod magit-section-get-relative-position ((section magit-section))
-  (let ((start (oref section start))
-        (point (magit-point)))
-    (list (- (line-number-at-pos point)
-             (line-number-at-pos start))
-          (- point (line-beginning-position)))))
-
-(cl-defgeneric magit-section-goto-successor ())
-
-(cl-defmethod magit-section-goto-successor ((section magit-section)
-                                            line char &optional _arg)
-  (or (magit-section-goto-successor--same section line char)
-      (magit-section-goto-successor--related section)))
-
-(defun magit-section-goto-successor--same (section line char)
-  (let ((ident (magit-section-ident section)))
-    (and-let* ((found (magit-get-section ident)))
-      (let ((start (oref found start)))
-        (goto-char start)
-        (unless (eq found magit-root-section)
-          (ignore-errors
-            (forward-line line)
-            (forward-char char))
-          (unless (eq (magit-current-section) found)
-            (goto-char start)))
-        t))))
-
-(defun magit-section-goto-successor--related (section)
-  (and-let* ((found (magit-section-goto-successor--related-1 section)))
-    (goto-char (if (eq (oref found type) 'button)
-                   (point-min)
-                 (oref found start)))))
-
-(defun magit-section-goto-successor--related-1 (section)
-  (or (and-let* ((alt (pcase (oref section type)
-                        ('staged 'unstaged)
-                        ('unstaged 'staged)
-                        ('unpushed 'unpulled)
-                        ('unpulled 'unpushed))))
-        (magit-get-section `((,alt) (status))))
-      (and-let* ((next (car (magit-section-siblings section 'next))))
-        (magit-get-section (magit-section-ident next)))
-      (and-let* ((prev (car (magit-section-siblings section 'prev))))
-        (magit-get-section (magit-section-ident prev)))
-      (and-let* ((parent (oref section parent)))
-        (or (magit-get-section (magit-section-ident parent))
-            (magit-section-goto-successor--related-1 parent)))))
-
-;;; Region
-
-(defvar-local magit-section--region-overlays nil)
-
-(defun magit-section--delete-region-overlays ()
-  (mapc #'delete-overlay magit-section--region-overlays)
-  (setq magit-section--region-overlays nil))
-
-(defun magit-section--highlight-region (start end window rol)
-  (magit-section--delete-region-overlays)
-  (if (and (not magit-section-keep-region-overlay)
-           (or (magit-region-sections)
-               (run-hook-with-args-until-success 'magit-region-highlight-hook
-                                                 (magit-current-section)))
-           (not (= (line-number-at-pos start)
-                   (line-number-at-pos end)))
-           ;; (not (eq (car-safe last-command-event) 'mouse-movement))
-           )
-      (funcall (default-value 'redisplay-unhighlight-region-function) rol)
-    (funcall (default-value 'redisplay-highlight-region-function)
-             start end window rol)))
-
-(defun magit-section--unhighlight-region (rol)
-  (magit-section--delete-region-overlays)
-  (funcall (default-value 'redisplay-unhighlight-region-function) rol))
-
-;;; Visibility
-
-(defvar-local magit-section-visibility-cache nil)
-(put 'magit-section-visibility-cache 'permanent-local t)
-
-(defun magit-section-cached-visibility (section)
-  "Set SECTION's visibility to the cached value.
-When `magit-section-preserve-visibility' is nil, do nothing."
-  (and magit-section-preserve-visibility
-       (cdr (assoc (magit-section-ident section)
-                   magit-section-visibility-cache))))
-
-(cl-defun magit-section-cache-visibility
-    (&optional (section magit-insert-section--current))
-  (setf (compat-call alist-get
-                     (magit-section-ident section)
-                     magit-section-visibility-cache
-                     nil nil #'equal)
-        (if (oref section hidden) 'hide 'show)))
-
-(cl-defun magit-section-maybe-cache-visibility
-    (&optional (section magit-insert-section--current))
-  (when (or (eq magit-section-cache-visibility t)
-            (memq (oref section type)
-                  magit-section-cache-visibility))
-    (magit-section-cache-visibility section)))
-
-(defun magit-section-maybe-update-visibility-indicator (section)
-  (when (and magit-section-visibility-indicator
-             (magit-section-content-p section))
-    (let* ((beg (oref section start))
-           (eoh (save-excursion
-                  (goto-char beg)
-                  (line-end-position))))
-      (cond
-       ((symbolp (car-safe magit-section-visibility-indicator))
-        (let ((ov (magit--overlay-at beg 'magit-vis-indicator 'fringe)))
-          (unless ov
-            (setq ov (make-overlay beg eoh nil t))
-            (overlay-put ov 'evaporate t)
-            (overlay-put ov 'magit-vis-indicator 'fringe))
-          (overlay-put
-           ov 'before-string
-           (propertize "fringe" 'display
-                       (list 'left-fringe
-                             (if (oref section hidden)
-                                 (car magit-section-visibility-indicator)
-                               (cdr magit-section-visibility-indicator))
-                             'fringe)))))
-       ((stringp (car-safe magit-section-visibility-indicator))
-        (let ((ov (magit--overlay-at (1- eoh) 'magit-vis-indicator 'eoh)))
-          (cond ((oref section hidden)
-                 (unless ov
-                   (setq ov (make-overlay (1- eoh) eoh))
-                   (overlay-put ov 'evaporate t)
-                   (overlay-put ov 'magit-vis-indicator 'eoh))
-                 (overlay-put ov 'after-string
-                              (car magit-section-visibility-indicator)))
-                (ov
-                 (delete-overlay ov)))))))))
-
-(defvar-local magit--ellipses-sections nil)
-
-(defun magit-section-maybe-paint-visibility-ellipses ()
-  ;; This is needed because we hide the body instead of "the body
-  ;; except the final newline and additionally the newline before
-  ;; the body"; otherwise we could use `buffer-invisibility-spec'.
-  (when (stringp (car-safe magit-section-visibility-indicator))
-    (let* ((sections (append magit--ellipses-sections
-                             (setq magit--ellipses-sections
-                                   (or (magit-region-sections)
-                                       (list (magit-current-section))))))
-           (beg (--map (oref it start) sections))
-           (end (--map (oref it end)   sections)))
-      (when (region-active-p)
-        ;; This ensures that the region face is removed from ellipses
-        ;; when the region becomes inactive, but fails to ensure that
-        ;; all ellipses within the active region use the region face,
-        ;; because the respective overlay has not yet been updated at
-        ;; this time.  The magit-selection face is always applied.
-        (push (region-beginning) beg)
-        (push (region-end)       end))
-      (setq beg (apply #'min beg))
-      (setq end (apply #'max end))
-      (dolist (ov (overlays-in beg end))
-        (when (eq (overlay-get ov 'magit-vis-indicator) 'eoh)
-          (overlay-put
-           ov 'after-string
-           (propertize
-            (car magit-section-visibility-indicator) 'font-lock-face
-            (let ((pos (overlay-start ov)))
-              (delq nil (nconc (--map (overlay-get it 'font-lock-face)
-                                      (overlays-at pos))
-                               (list (get-char-property
-                                      pos 'font-lock-face))))))))))))
-
-(defun magit-section-maybe-remove-visibility-indicator (section)
-  (when (and magit-section-visibility-indicator
-             (= (oref section content)
-                (oref section end)))
-    (dolist (o (overlays-in (oref section start)
-                            (save-excursion
-                              (goto-char (oref section start))
-                              (1+ (line-end-position)))))
-      (when (overlay-get o 'magit-vis-indicator)
-        (delete-overlay o)))))
-
-(defvar-local magit-section--opened-sections nil)
-
-(defun magit-section--open-temporarily (beg end)
-  (save-excursion
-    (goto-char beg)
-    (let ((section (magit-current-section)))
-      (while section
-        (let ((content (oref section content)))
-          (if (and (magit-section-invisible-p section)
-                   (<= (or content (oref section start))
-                       beg
-                       (oref section end)))
-              (progn
-                (when content
-                  (magit-section-show section)
-                  (push section magit-section--opened-sections))
-                (setq section (oref section parent)))
-            (setq section nil))))))
-  (or (eq search-invisible t)
-      (not (isearch-range-invisible beg end))))
-
-(define-advice isearch-clean-overlays (:around (fn) magit-mode)
-  (if (derived-mode-p 'magit-mode)
-      (let ((pos (point)))
-        (dolist (section magit-section--opened-sections)
-          (unless (<= (oref section content) pos (oref section end))
-            (magit-section-hide section)))
-        (setq magit-section--opened-sections nil))
-    (funcall fn)))
-
-;;; Utilities
-
-(cl-defun magit-section-selected-p (section &optional (selection nil sselection))
-  (and (not (eq section magit-root-section))
-       (or  (eq section (magit-current-section))
-            (memq section (if sselection
-                              selection
-                            (setq selection (magit-region-sections))))
-            (and-let* ((parent (oref section parent)))
-              (magit-section-selected-p parent selection)))))
-
-(defun magit-section-parent-value (section)
-  (and-let* ((parent (oref section parent)))
-    (oref parent value)))
-
-(defun magit-section-siblings (section &optional direction)
-  "Return a list of the sibling sections of SECTION.
-
-If optional DIRECTION is `prev', then return siblings that come
-before SECTION.  If it is `next', then return siblings that come
-after SECTION.  For all other values, return all siblings
-excluding SECTION itself."
-  (and-let* ((parent (oref section parent))
-             (siblings (oref parent children)))
-    (pcase direction
-      ('prev  (cdr (member section (reverse siblings))))
-      ('next  (cdr (member section siblings)))
-      (_      (remq section siblings)))))
-
-(defun magit-region-values (&optional condition multiple)
-  "Return a list of the values of the selected sections.
-
-Return the values that themselves would be returned by
-`magit-region-sections' (which see)."
-  (--map (oref it value)
-         (magit-region-sections condition multiple)))
-
-(defun magit-region-sections (&optional condition multiple)
-  "Return a list of the selected sections.
-
-When the region is active and constitutes a valid section
-selection, then return a list of all selected sections.  This is
-the case when the region begins in the heading of a section and
-ends in the heading of the same section or in that of a sibling
-section.  If optional MULTIPLE is non-nil, then the region cannot
-begin and end in the same section.
-
-When the selection is not valid, then return nil.  In this case,
-most commands that can act on the selected sections will instead
-act on the section at point.
-
-When the region looks like it would in any other buffer then
-the selection is invalid.  When the selection is valid then the
-region uses the `magit-section-highlight' face.  This does not
-apply to diffs where things get a bit more complicated, but even
-here if the region looks like it usually does, then that's not
-a valid selection as far as this function is concerned.
-
-If optional CONDITION is non-nil, then the selection not only
-has to be valid; all selected sections additionally have to match
-CONDITION, or nil is returned.  See `magit-section-match' for the
-forms CONDITION can take."
-  (and (region-active-p)
-       (let* ((rbeg (region-beginning))
-              (rend (region-end))
-              (sbeg (magit-section-at rbeg))
-              (send (magit-section-at rend)))
-         (and send
-              (not (eq send magit-root-section))
-              (not (and multiple (eq send sbeg)))
-              (let ((siblings (cons sbeg (magit-section-siblings sbeg 'next)))
-                    (sections ()))
-                (and (memq send siblings)
-                     (magit-section-position-in-heading-p sbeg rbeg)
-                     (magit-section-position-in-heading-p send rend)
-                     (progn
-                       (while siblings
-                         (push (car siblings) sections)
-                         (when (eq (pop siblings) send)
-                           (setq siblings nil)))
-                       (setq sections (nreverse sections))
-                       (and (or (not condition)
-                                (--all-p (magit-section-match condition it)
-                                         sections))
-                            sections))))))))
-
-(defun magit-map-sections (function &optional section)
-  "Apply FUNCTION to all sections for side effects only, depth first.
-If optional SECTION is non-nil, only map over that section and
-its descendants, otherwise map over all sections in the current
-buffer, ending with `magit-root-section'."
-  (let ((section (or section magit-root-section)))
-    (mapc (lambda (child) (magit-map-sections function child))
-          (oref section children))
-    (funcall function section)))
-
-(defun magit-section-position-in-heading-p (&optional section pos)
-  "Return t if POSITION is inside the heading of SECTION.
-POSITION defaults to point and SECTION defaults to the
-current section."
-  (unless section
-    (setq section (magit-current-section)))
-  (unless pos
-    (setq pos (point)))
-  (ignore-errors ; Allow navigating broken sections.
-    (and section
-         (>= pos (oref section start))
-         (<  pos (or (oref section content)
-                     (oref section end)))
-         t)))
-
-(defun magit-section-internal-region-p (&optional section)
-  "Return t if the region is active and inside SECTION's body.
-If optional SECTION is nil, use the current section."
-  (and (region-active-p)
-       (or section (setq section (magit-current-section)))
-       (let ((beg (magit-section-at (region-beginning))))
-         (and (eq beg (magit-section-at (region-end)))
-              (eq beg section)))
-       (not (or (magit-section-position-in-heading-p section (region-beginning))
-                (magit-section-position-in-heading-p section (region-end))))
-       t))
-
-(defun magit-wash-sequence (function)
-  "Repeatedly call FUNCTION until it returns nil or eob is reached.
-FUNCTION has to move point forward or return nil."
-  (while (and (not (eobp)) (funcall function))))
-
-;;;###autoload
-(defun magit-add-section-hook (hook function &optional at append local)
-  "Add to the value of section hook HOOK the function FUNCTION.
-
-Add FUNCTION at the beginning of the hook list unless optional
-APPEND is non-nil, in which case FUNCTION is added at the end.
-If FUNCTION already is a member, then move it to the new location.
-
-If optional AT is non-nil and a member of the hook list, then
-add FUNCTION next to that instead.  Add before or after AT, or
-replace AT with FUNCTION depending on APPEND.  If APPEND is the
-symbol `replace', then replace AT with FUNCTION.  For any other
-non-nil value place FUNCTION right after AT.  If nil, then place
-FUNCTION right before AT.  If FUNCTION already is a member of the
-list but AT is not, then leave FUNCTION where ever it already is.
-
-If optional LOCAL is non-nil, then modify the hook's buffer-local
-value rather than its global value.  This makes the hook local by
-copying the default value.  That copy is then modified.
-
-HOOK should be a symbol.  If HOOK is void, it is first set to nil.
-HOOK's value must not be a single hook function.  FUNCTION should
-be a function that takes no arguments and inserts one or multiple
-sections at point, moving point forward.  FUNCTION may choose not
-to insert its section(s), when doing so would not make sense.  It
-should not be abused for other side-effects.  To remove FUNCTION
-again use `remove-hook'."
-  (unless (boundp hook)
-    (error "Cannot add function to undefined hook variable %s" hook))
-  (unless (default-boundp hook)
-    (set-default hook nil))
-  (let ((value (if local
-                   (if (local-variable-p hook)
-                       (symbol-value hook)
-                     (unless (local-variable-if-set-p hook)
-                       (make-local-variable hook))
-                     (copy-sequence (default-value hook)))
-                 (default-value hook))))
-    (if at
-        (when (setq at (member at value))
-          (setq value (delq function value))
-          (cond ((eq append 'replace)
-                 (setcar at function))
-                (append
-                 (push function (cdr at)))
-                (t
-                 (push (car at) (cdr at))
-                 (setcar at function))))
-      (setq value (delq function value)))
-    (unless (member function value)
-      (setq value (if append
-                      (append value (list function))
-                    (cons function value))))
-    (when (eq append 'replace)
-      (setq value (delq at value)))
-    (if local
-        (set hook value)
-      (set-default hook value))))
-
-(defvar-local magit-disabled-section-inserters nil)
-
-(defun magit-disable-section-inserter (fn)
-  "Disable the section inserter FN in the current repository.
-It is only intended for use in \".dir-locals.el\" and
-\".dir-locals-2.el\".  Also see info node `(magit)Per-Repository
-Configuration'."
-  (cl-pushnew fn magit-disabled-section-inserters))
-
-(put 'magit-disable-section-inserter 'safe-local-eval-function t)
-
-(defun magit-run-section-hook (hook &rest args)
-  "Run HOOK with ARGS, warning about invalid entries."
-  (let ((entries (symbol-value hook)))
-    (unless (listp entries)
-      (setq entries (list entries)))
-    (when-let ((invalid (seq-remove #'functionp entries)))
-      (message "`%s' contains entries that are no longer valid.
-%s\nUsing standard value instead.  Please re-configure hook variable."
-               hook
-               (mapconcat (lambda (sym) (format "  `%s'" sym)) invalid "\n"))
-      (sit-for 5)
-      (setq entries (eval (car (get hook 'standard-value)))))
-    (dolist (entry entries)
-      (let ((magit--current-section-hook (cons (list hook entry)
-                                               magit--current-section-hook)))
-        (unless (memq entry magit-disabled-section-inserters)
-          (if (bound-and-true-p magit-refresh-verbose)
-              (let ((time (benchmark-elapse (apply entry args))))
-                (message "  %-50s %f %s" entry time
-                         (cond ((> time 0.03) "!!")
-                               ((> time 0.01) "!")
-                               (t ""))))
-            (apply entry args)))))))
-
-(cl-defun magit--overlay-at (pos prop &optional (val nil sval) testfn)
-  (cl-find-if (lambda (o)
-                (let ((p (overlay-properties o)))
-                  (and (plist-member p prop)
-                       (or (not sval)
-                           (funcall (or testfn #'eql)
-                                    (plist-get p prop)
-                                    val)))))
-              (overlays-at pos t)))
-
-(defun magit-face-property-all (face string)
-  "Return non-nil if FACE is present in all of STRING."
-  (catch 'missing
-    (let ((pos 0))
-      (while (setq pos (next-single-property-change pos 'font-lock-face string))
-        (let ((val (get-text-property pos 'font-lock-face string)))
-          (unless (if (consp val)
-                      (memq face val)
-                    (eq face val))
-            (throw 'missing nil))))
-      (not pos))))
-
-(defun magit--add-face-text-property (beg end face &optional append object)
-  "Like `add-face-text-property' but for `font-lock-face'."
-  (while (< beg end)
-    (let* ((pos (next-single-property-change beg 'font-lock-face object end))
-           (val (get-text-property beg 'font-lock-face object))
-           (val (ensure-list val)))
-      (put-text-property beg pos 'font-lock-face
-                         (if append
-                             (append val (list face))
-                           (cons face val))
-                         object)
-      (setq beg pos))))
-
-(defun magit--propertize-face (string face)
-  (propertize string 'face face 'font-lock-face face))
-
-(defun magit--put-face (beg end face string)
-  (put-text-property beg end 'face face string)
-  (put-text-property beg end 'font-lock-face face string))
-
-;;; Imenu Support
-
-(defvar-local magit--imenu-group-types nil)
-(defvar-local magit--imenu-item-types nil)
-
-(defun magit--imenu-create-index ()
-  ;; If `which-function-mode' is active, then the create-index
-  ;; function is called at the time the major-mode is being enabled.
-  ;; Modes that derive from `magit-mode' have not populated the buffer
-  ;; at that time yet, so we have to abort.
-  (and magit-root-section
-       (or magit--imenu-group-types
-           magit--imenu-item-types)
-       (let ((index
-              (cl-mapcan
-               (lambda (section)
-                 (cond
-                  (magit--imenu-group-types
-                   (and (if (eq (car-safe magit--imenu-group-types) 'not)
-                            (not (magit-section-match
-                                  (cdr magit--imenu-group-types)
-                                  section))
-                          (magit-section-match magit--imenu-group-types section))
-                        (and-let* ((children (oref section children)))
-                          `((,(magit--imenu-index-name section)
-                             ,@(mapcar (lambda (s)
-                                         (cons (magit--imenu-index-name s)
-                                               (oref s start)))
-                                       children))))))
-                  (magit--imenu-item-types
-                   (and (magit-section-match magit--imenu-item-types section)
-                        `((,(magit--imenu-index-name section)
-                           . ,(oref section start)))))))
-               (oref magit-root-section children))))
-         (if (and magit--imenu-group-types (symbolp magit--imenu-group-types))
-             (cdar index)
-           index))))
-
-(defun magit--imenu-index-name (section)
-  (let ((heading (buffer-substring-no-properties
-                  (oref section start)
-                  (1- (or (oref section content)
-                          (oref section end))))))
-    (save-match-data
-      (cond
-       ((and (magit-section-match [commit logbuf] section)
-             (string-match "[^ ]+\\([ *|]*\\).+" heading))
-        (replace-match " " t t heading 1))
-       ((magit-section-match
-         '([branch local branchbuf] [tag tags branchbuf]) section)
-        (oref section value))
-       ((magit-section-match [branch remote branchbuf] section)
-        (concat (oref (oref section parent) value) "/"
-                (oref section value)))
-       ((string-match " ([0-9]+)\\'" heading)
-        (substring heading 0 (match-beginning 0)))
-       (t heading)))))
-
-(defun magit--imenu-goto-function (_name position &rest _rest)
-  "Go to the section at POSITION.
-Make sure it is visible, by showing its ancestors where
-necessary.  For use as `imenu-default-goto-function' in
-`magit-mode' buffers."
-  (goto-char position)
-  (let ((section (magit-current-section)))
-    (while (setq section (oref section parent))
-      (when (oref section hidden)
-        (magit-section-show section)))))
-
-;;; Bookmark support
-
-(declare-function bookmark-get-filename "bookmark" (bookmark-name-or-record))
-(declare-function bookmark-make-record-default "bookmark"
-                  (&optional no-file no-context posn))
-(declare-function bookmark-prop-get "bookmark" (bookmark-name-or-record prop))
-(declare-function bookmark-prop-set "bookmark" (bookmark-name-or-record prop val))
-
-(cl-defgeneric magit-bookmark-get-filename ()
-  (or (buffer-file-name) (buffer-name)))
-
-(cl-defgeneric magit-bookmark--get-child-value (section)
-  (oref section value))
-
-(cl-defgeneric magit-bookmark-get-buffer-create (bookmark mode))
-
-(defun magit--make-bookmark ()
-  "Create a bookmark for the current Magit buffer.
-Input values are the major-mode's `magit-bookmark-name' method,
-and the buffer-local values of the variables referenced in its
-`magit-bookmark-variables' property."
-  (require 'bookmark)
-  (if (plist-member (symbol-plist major-mode) 'magit-bookmark-variables)
-      ;; `bookmark-make-record-default's return value does not match
-      ;; (NAME . ALIST), even though it is used as the default value
-      ;; of `bookmark-make-record-function', which states that such
-      ;; functions must do that.  See #4356.
-      (let ((bookmark (cons nil (bookmark-make-record-default 'no-file))))
-        (bookmark-prop-set bookmark 'handler  #'magit--handle-bookmark)
-        (bookmark-prop-set bookmark 'mode     major-mode)
-        (bookmark-prop-set bookmark 'filename (magit-bookmark-get-filename))
-        (bookmark-prop-set bookmark 'defaults (list (magit-bookmark-name)))
-        (dolist (var (get major-mode 'magit-bookmark-variables))
-          (bookmark-prop-set bookmark var (symbol-value var)))
-        (bookmark-prop-set
-         bookmark 'magit-hidden-sections
-         (--keep (and (oref it hidden)
-                      (cons (oref it type)
-                            (magit-bookmark--get-child-value it)))
-                 (oref magit-root-section children)))
-        bookmark)
-    (user-error "Bookmarking is not implemented for %s buffers" major-mode)))
-
-;;;###autoload
-(defun magit--handle-bookmark (bookmark)
-  "Open a bookmark created by `magit--make-bookmark'.
-
-Call the generic function `magit-bookmark-get-buffer-create' to get
-the appropriate buffer without displaying it.
-
-Then call the `magit-*-setup-buffer' function of the the major-mode
-with the variables' values as arguments, which were recorded by
-`magit--make-bookmark'."
-  (require (quote magit-bookmark) nil t)
-  (let ((buffer (magit-bookmark-get-buffer-create
-                 bookmark
-                 (bookmark-prop-get bookmark 'mode))))
-    (set-buffer buffer) ; That is the interface we have to adhere to.
-    (when-let ((hidden (bookmark-prop-get bookmark 'magit-hidden-sections)))
-      (with-current-buffer buffer
-        (dolist (child (oref magit-root-section children))
-          (if (member (cons (oref child type)
-                            (oref child value))
-                      hidden)
-              (magit-section-hide child)
-            (magit-section-show child)))))
-    ;; Compatibility with `bookmark+' package.  See #4356.
-    (when (bound-and-true-p bmkp-jump-display-function)
-      (funcall bmkp-jump-display-function (current-buffer)))
-    nil))
-
-(put 'magit--handle-bookmark 'bookmark-handler-type "Magit")
-
-(cl-defgeneric magit-bookmark-name ()
-  "Return name for bookmark to current buffer."
-  (format "%s%s"
-          (substring (symbol-name major-mode) 0 -5)
-          (if-let ((vars (get major-mode 'magit-bookmark-variables)))
-              (cl-mapcan (lambda (var)
-                           (let ((val (symbol-value var)))
-                             (if (and val (atom val))
-                                 (list val)
-                               val)))
-                         vars)
-            "")))
-
-;;; Bitmaps
-
-(when (fboundp 'define-fringe-bitmap) ;for Emacs 26
-  (define-fringe-bitmap 'magit-fringe-bitmap+
-    [#b00000000
-     #b00011000
-     #b00011000
-     #b01111110
-     #b01111110
-     #b00011000
-     #b00011000
-     #b00000000])
-
-  (define-fringe-bitmap 'magit-fringe-bitmap-
-    [#b00000000
-     #b00000000
-     #b00000000
-     #b01111110
-     #b01111110
-     #b00000000
-     #b00000000
-     #b00000000])
-
-  (define-fringe-bitmap 'magit-fringe-bitmap>
-    [#b01100000
-     #b00110000
-     #b00011000
-     #b00001100
-     #b00011000
-     #b00110000
-     #b01100000
-     #b00000000])
-
-  (define-fringe-bitmap 'magit-fringe-bitmapv
-    [#b00000000
-     #b10000010
-     #b11000110
-     #b01101100
-     #b00111000
-     #b00010000
-     #b00000000
-     #b00000000])
-
-  (define-fringe-bitmap 'magit-fringe-bitmap-bold>
-    [#b11100000
-     #b01110000
-     #b00111000
-     #b00011100
-     #b00011100
-     #b00111000
-     #b01110000
-     #b11100000])
-
-  (define-fringe-bitmap 'magit-fringe-bitmap-boldv
-    [#b10000001
-     #b11000011
-     #b11100111
-     #b01111110
-     #b00111100
-     #b00011000
-     #b00000000
-     #b00000000])
-  )
-
-;;; _
-(provide 'magit-section)
-;;; magit-section.el ends here
diff --git a/emacs/elpa/magit-section-20240913.1455/magit-section.elc b/emacs/elpa/magit-section-20240913.1455/magit-section.elc
Binary files differ.
diff --git a/emacs/elpa/magit-section-20240913.1455/magit-section.info b/emacs/elpa/magit-section-20240913.1455/magit-section.info
@@ -1,317 +0,0 @@
-This is magit-section.info, produced by makeinfo version 6.8 from
-magit-section.texi.
-
-     Copyright (C) 2015-2024 Jonas Bernoulli
-     <emacs.magit@jonas.bernoulli.dev>
-
-     You can redistribute this document and/or modify it under the terms
-     of the GNU General Public License as published by the Free Software
-     Foundation, either version 3 of the License, or (at your option)
-     any later version.
-
-     This document is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     General Public License for more details.
-
-INFO-DIR-SECTION Emacs
-START-INFO-DIR-ENTRY
-* Magit-Section: (magit-section). Use Magit sections in your own packages.
-END-INFO-DIR-ENTRY
-
-
-File: magit-section.info,  Node: Top,  Next: Introduction,  Up: (dir)
-
-Magit-Section Developer Manual
-******************************
-
-This package implements the main user interface of Magit — the
-collapsible sections that make up its buffers.  This package used to be
-distributed as part of Magit but how it can also be used by other
-packages that have nothing to do with Magit or Git.
-
-   To learn more about the section abstraction and available commands
-and user options see *note (magit)Sections::.  This manual documents how
-you can use sections in your own packages.
-
-This manual is for Magit-Section version 4.1.0.
-
-     Copyright (C) 2015-2024 Jonas Bernoulli
-     <emacs.magit@jonas.bernoulli.dev>
-
-     You can redistribute this document and/or modify it under the terms
-     of the GNU General Public License as published by the Free Software
-     Foundation, either version 3 of the License, or (at your option)
-     any later version.
-
-     This document is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     General Public License for more details.
-
-* Menu:
-
-* Introduction::
-* Creating Sections::
-* Core Functions::
-* Matching Functions::
-
-
-File: magit-section.info,  Node: Introduction,  Next: Creating Sections,  Prev: Top,  Up: Top
-
-1 Introduction
-**************
-
-This package implements the main user interface of Magit — the
-collapsible sections that make up its buffers.  This package used to be
-distributed as part of Magit but how it can also be used by other
-packages that have nothing to do with Magit or Git.
-
-   To learn more about the section abstraction and available commands
-and user options see *note (magit)Sections::.  This manual documents how
-you can use sections in your own packages.
-
-   When the documentation leaves something unaddressed, then please
-consider that Magit uses this library extensively and search its source
-for suitable examples before asking me for help.  Thanks!
-
-
-File: magit-section.info,  Node: Creating Sections,  Next: Core Functions,  Prev: Introduction,  Up: Top
-
-2 Creating Sections
-*******************
-
- -- Macro: magit-insert-section [name] (type &optional value hide) &rest
-          body
-     Create a section object of type CLASS, storing VALUE in its ‘value’
-     slot, and insert the section at point.  CLASS is a subclass of
-     ‘magit-section’ or has the form ‘(eval FORM)’, in which case FORM
-     is evaluated at runtime and should return a subclass.  In other
-     places a sections class is often referred to as its "type".
-
-     Many commands behave differently depending on the class of the
-     current section and sections of a certain class can have their own
-     keymap, which is specified using the ‘keymap’ class slot.  The
-     value of that slot should be a variable whose value is a keymap.
-
-     For historic reasons Magit and Forge in most cases use symbols as
-     CLASS that don’t actually identify a class and that lack the
-     appropriate package prefix.  This works due to some undocumented
-     kludges, which are not available to other packages.
-
-     When optional HIDE is non-nil collapse the section body by default,
-     i.e., when first creating the section, but not when refreshing the
-     buffer.  Else expand it by default.  This can be overwritten using
-     ‘magit-section-set-visibility-hook’.  When a section is recreated
-     during a refresh, then the visibility of predecessor is inherited
-     and HIDE is ignored (but the hook is still honored).
-
-     BODY is any number of forms that actually insert the section’s
-     heading and body.  Optional NAME, if specified, has to be a symbol,
-     which is then bound to the object of the section being inserted.
-
-     Before BODY is evaluated the ‘start’ of the section object is set
-     to the value of ‘point’ and after BODY was evaluated its ‘end’ is
-     set to the new value of ‘point’; BODY is responsible for moving
-     ‘point’ forward.
-
-     If it turns out inside BODY that the section is empty, then
-     ‘magit-cancel-section’ can be used to abort and remove all traces
-     of the partially inserted section.  This can happen when creating a
-     section by washing Git’s output and Git didn’t actually output
-     anything this time around.
-
- -- Function: magit-insert-heading [child-count] &rest args
-     Insert the heading for the section currently being inserted.
-
-     This function should only be used inside ‘magit-insert-section’.
-
-     When called without any arguments, then just set the ‘content’ slot
-     of the object representing the section being inserted to a marker
-     at ‘point’.  The section should only contain a single line when
-     this function is used like this.
-
-     When called with arguments ARGS, which have to be strings, or nil,
-     then insert those strings at point.  The section should not contain
-     any text before this happens and afterwards it should again only
-     contain a single line.  If the ‘face’ property is set anywhere
-     inside any of these strings, then insert all of them unchanged.
-     Otherwise use the ‘magit-section-heading’ face for all inserted
-     text.
-
-     The ‘content’ property of the section object is the end of the
-     heading (which lasts from ‘start’ to ‘content’) and the beginning
-     of the the body (which lasts from ‘content’ to ‘end’).  If the
-     value of ‘content’ is nil, then the section has no heading and its
-     body cannot be collapsed.  If a section does have a heading, then
-     its height must be exactly one line, including a trailing newline
-     character.  This isn’t enforced, you are responsible for getting it
-     right.  The only exception is that this function does insert a
-     newline character if necessary.
-
-     If provided, optional CHILD-COUNT must evaluate to an integer or
-     boolean.  If t, then the count is determined once the children have
-     been inserted, using ‘magit-insert-child-count’ (which see).  For
-     historic reasons, if the heading ends with ":", the count is
-     substituted for that, at this time as well.  If
-     ‘magit-section-show-child-count’ is nil, no counts are inserted
-
- -- Macro: magit-insert-section-body &rest body
-     Use BODY to insert the section body, once the section is expanded.
-     If the section is expanded when it is created, then this is like
-     ‘progn’.  Otherwise BODY isn’t evaluated until the section is
-     explicitly expanded.
-
- -- Function: magit-cancel-section
-     Cancel inserting the section that is currently being inserted.
-     Remove all traces of that section.
-
- -- Function: magit-wash-sequence function
-     Repeatedly call FUNCTION until it returns ‘nil’ or the end of the
-     buffer is reached.  FUNCTION has to move point forward or return
-     ‘nil’.
-
-
-File: magit-section.info,  Node: Core Functions,  Next: Matching Functions,  Prev: Creating Sections,  Up: Top
-
-3 Core Functions
-****************
-
- -- Function: magit-current-section
-     Return the section at point or where the context menu was invoked.
-     When using the context menu, return the section that the user
-     clicked on, provided the current buffer is the buffer in which the
-     click occurred.  Otherwise return the section at point.
-
-Function magit-section-at &optional position
-     Return the section at POSITION, defaulting to point.  Default to
-     point even when the context menu is used.
-
- -- Function: magit-section-ident section
-     Return an unique identifier for SECTION.  The return value has the
-     form ‘((TYPE . VALUE)...)’.
-
- -- Function: magit-section-ident-value value
-     Return a constant representation of VALUE.
-
-     VALUE is the value of a ‘magit-section’ object.  If that is an
-     object itself, then that is not suitable to be used to identify the
-     section because two objects may represent the same thing but not be
-     equal.  If possible a method should be added for such objects,
-     which returns a value that is equal.  Otherwise the catch-all
-     method is used, which just returns the argument itself.
-
- -- Function: magit-get-section ident &optional root
-     Return the section identified by IDENT.  IDENT has to be a list as
-     returned by ‘magit-section-ident’.  If optional ROOT is non-nil,
-     then search in that section tree instead of in the one whose root
-     ‘magit-root-section’ is.
-
- -- Function: magit-section-lineage section &optional raw
-     Return the lineage of SECTION.  If optional RAW is non-nil, return
-     a list of section objects, beginning with SECTION, otherwise return
-     a list of section types.
-
- -- Function: magit-section-content-p section
-     Return non-nil if SECTION has content or an unused washer function.
-
-   The next two functions are replacements for the Emacs functions that
-have the same name except for the ‘magit-’ prefix.  Like
-‘magit-current-section’ they do not act on point, the cursors position,
-but on the position where the user clicked to invoke the context menu.
-
-   If your package provides a context menu and some of its commands act
-on the "thing at point", even if just as a default, then use the
-prefixed functions to teach them to instead use the click location when
-appropriate.
-
-Function magit-point
-     Return point or the position where the context menu was invoked.
-     When using the context menu, return the position the user clicked
-     on, provided the current buffer is the buffer in which the click
-     occurred.  Otherwise return the same value as ‘point’.
-
-Function magit-thing-at-point thing &optional no-properties
-     Return the THING at point or where the context menu was invoked.
-     When using the context menu, return the thing the user clicked on,
-     provided the current buffer is the buffer in which the click
-     occurred.  Otherwise return the same value as ‘thing-at-point’.
-     For the meaning of THING and NO-PROPERTIES see that function.
-
-
-File: magit-section.info,  Node: Matching Functions,  Prev: Core Functions,  Up: Top
-
-4 Matching Functions
-********************
-
- -- Function: magit-section-match condition &optional (section
-          (magit-current-section))
-     Return t if SECTION matches CONDITION.
-
-     SECTION defaults to the section at point.  If SECTION is not
-     specified and there also is no section at point, then return nil.
-
-     CONDITION can take the following forms:
-
-        • ‘(CONDITION...)’ matches if any of the CONDITIONs matches.
-        • ‘[CLASS...]’ matches if the section’s class is the same as the
-          first CLASS or a subclass of that; the section’s parent class
-          matches the second CLASS; and so on.
-
-        • ‘[* CLASS...]’ matches sections that match [CLASS...] and also
-          recursively all their child sections.
-        • ‘CLASS’ matches if the section’s class is the same as CLASS or
-          a subclass of that; regardless of the classes of the parent
-          sections.
-
-     Each CLASS should be a class symbol, identifying a class that
-     derives from ‘magit-section’.  For backward compatibility CLASS can
-     also be a "type symbol".  A section matches such a symbol if the
-     value of its ‘type’ slot is ‘eq’.  If a type symbol has an entry in
-     ‘magit--section-type-alist’, then a section also matches that type
-     if its class is a subclass of the class that corresponds to the
-     type as per that alist.
-
-     Note that it is not necessary to specify the complete section
-     lineage as printed by ‘magit-describe-section-briefly’, unless of
-     course you want to be that precise.
-
- -- Function: magit-section-value-if condition &optional section
-     If the section at point matches CONDITION, then return its value.
-
-     If optional SECTION is non-nil then test whether that matches
-     instead.  If there is no section at point and SECTION is nil, then
-     return nil.  If the section does not match, then return nil.
-
-     See ‘magit-section-match’ for the forms CONDITION can take.
-
- -- Macro: magit-section-case &rest clauses
-     Choose among clauses on the type of the section at point.
-
-     Each clause looks like ‘(CONDITION BODY...)’.  The type of the
-     section is compared against each CONDITION; the BODY forms of the
-     first match are evaluated sequentially and the value of the last
-     form is returned.  Inside BODY the symbol ‘it’ is bound to the
-     section at point.  If no clause succeeds or if there is no section
-     at point, return nil.
-
-     See ‘magit-section-match’ for the forms CONDITION can take.
-     Additionally a CONDITION of t is allowed in the final clause, and
-     matches if no other CONDITION match, even if there is no section at
-     point.
-
-
-
-Tag Table:
-Node: Top808
-Node: Introduction2109
-Node: Creating Sections2879
-Node: Core Functions7812
-Node: Matching Functions10964
-
-End Tag Table
-
-
-Local Variables:
-coding: utf-8
-End:
diff --git a/emacs/elpa/magit-section-20240913.1455/dir b/emacs/elpa/magit-section-20241001.2052/dir
diff --git a/emacs/elpa/magit-section-20240913.1455/magit-section-autoloads.el b/emacs/elpa/magit-section-20241001.2052/magit-section-autoloads.el
diff --git a/emacs/elpa/magit-section-20241001.2052/magit-section-pkg.el b/emacs/elpa/magit-section-20241001.2052/magit-section-pkg.el
@@ -0,0 +1,13 @@
+;; -*- no-byte-compile: t; lexical-binding: nil -*-
+(define-package "magit-section" "20241001.2052"
+  "Sections for read-only buffers."
+  '((emacs  "26.1")
+    (compat "30.0.0.0")
+    (dash   "2.19.1")
+    (seq    "2.24"))
+  :url "https://github.com/magit/magit"
+  :commit "93e86ceca7bf5b0ff9023d7f138e5f06990fc276"
+  :revdesc "93e86ceca7bf"
+  :keywords '("tools")
+  :authors '(("Jonas Bernoulli" . "emacs.magit@jonas.bernoulli.dev"))
+  :maintainers '(("Jonas Bernoulli" . "emacs.magit@jonas.bernoulli.dev")))
diff --git a/emacs/elpa/magit-section-20241001.2052/magit-section.el b/emacs/elpa/magit-section-20241001.2052/magit-section.el
@@ -0,0 +1,2514 @@
+;;; magit-section.el --- Sections for read-only buffers  -*- lexical-binding:t; coding:utf-8 -*-
+
+;; Copyright (C) 2008-2024 The Magit Project Contributors
+
+;; Author: Jonas Bernoulli <emacs.magit@jonas.bernoulli.dev>
+;; Maintainer: Jonas Bernoulli <emacs.magit@jonas.bernoulli.dev>
+
+;; Homepage: https://github.com/magit/magit
+;; Keywords: tools
+
+;; Package-Version: 20241001.2052
+;; Package-Revision: 93e86ceca7bf
+;; Package-Requires: (
+;;     (emacs "26.1")
+;;     (compat "30.0.0.0")
+;;     (dash "2.19.1")
+;;     (seq "2.24"))
+
+;; SPDX-License-Identifier: GPL-3.0-or-later
+
+;; Magit is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published
+;; by the Free Software Foundation, either version 3 of the License,
+;; or (at your option) any later version.
+;;
+;; Magit is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with Magit.  If not, see <https://www.gnu.org/licenses/>.
+
+;; You should have received a copy of the AUTHORS.md file, which
+;; lists all contributors.  If not, see https://magit.vc/authors.
+
+;;; Commentary:
+
+;; This package implements the main user interface of Magit — the
+;; collapsible sections that make up its buffers.  This package used
+;; to be distributed as part of Magit but now it can also be used by
+;; other packages that have nothing to do with Magit or Git.
+
+;;; Code:
+
+(require 'cl-lib)
+(require 'compat)
+(require 'dash)
+(require 'eieio)
+(require 'subr-x)
+
+;; For older Emacs releases we depend on an updated `seq' release from GNU
+;; ELPA, for `seq-keep'.  Unfortunately something else may require `seq'
+;; before `package' had a chance to put this version on the `load-path'.
+(when (and (featurep 'seq)
+           (not (fboundp 'seq-keep)))
+  (unload-feature 'seq 'force))
+(require 'seq)
+;; Furthermore, by default `package' just silently refuses to upgrade.
+(defconst magit--core-upgrade-instructions "\
+Magit requires `%s' >= %s,
+but due to bad defaults, Emacs' package manager, refuses to
+upgrade this and other built-in packages to higher releases
+from GNU Elpa.
+
+To fix this, you have to add this to your init file:
+
+  (setq package-install-upgrade-built-in t)
+
+Then evaluate that expression by placing the cursor after it
+and typing \\[eval-last-sexp].
+
+Once you have done that, you have to explicitly upgrade `%s':
+
+  \\[package-install] %s \\`RET'
+
+Then you also must make sure the updated version is loaded,
+by evaluating this form:
+
+  (progn (unload-feature \\='%s t) (require \\='%s))
+
+If this does not work, then try uninstalling Magit and all of its
+dependencies.  After that exit and restart Emacs, and only then
+reinstalling Magit.
+
+If you don't use the `package' package manager but still get
+this warning, then your chosen package manager likely has a
+similar defect.")
+(unless (fboundp 'seq-keep)
+  (display-warning 'magit (substitute-command-keys
+                           (format magit--core-upgrade-instructions
+                                   'seq "2.24" 'seq 'seq 'seq 'seq))
+                   :emergency))
+
+(require 'cursor-sensor)
+(require 'format-spec)
+
+(eval-when-compile (require 'benchmark))
+
+;; For `magit-section-get-relative-position'
+(declare-function magit-hunk-section-p "magit-diff" (section) t)
+
+;;; Hooks
+
+(defvar magit-section-movement-hook nil
+  "Hook run by `magit-section-goto'.
+That function in turn is used by all section movement commands.")
+
+(defvar magit-section-highlight-hook
+  '(magit-section-highlight
+    magit-section-highlight-selection)
+  "Functions used to highlight the current section.
+Each function is run with the current section as only argument
+until one of them returns non-nil.")
+
+(defvar magit-section-unhighlight-hook nil
+  "Functions used to unhighlight the previously current section.
+Each function is run with the current section as only argument
+until one of them returns non-nil.  Most sections are properly
+unhighlighted without requiring a specialized unhighlighter,
+diff-related sections being the only exception.")
+
+(defvar magit-section-set-visibility-hook
+  '(magit-section-cached-visibility)
+  "Hook used to set the initial visibility of a section.
+Stop at the first function that returns non-nil.  The returned
+value should be `show', `hide' or nil.  If no function returns
+non-nil, determine the visibility as usual, i.e., use the
+hardcoded section specific default (see `magit-insert-section').")
+
+;;; Options
+
+(defgroup magit-section nil
+  "Expandable sections."
+  :link '(info-link "(magit)Sections")
+  :group 'extensions)
+
+(defcustom magit-section-show-child-count t
+  "Whether to append the number of children to section headings.
+This only applies to sections for which doing so makes sense."
+  :package-version '(magit-section . "2.1.0")
+  :group 'magit-section
+  :type 'boolean)
+
+(defcustom magit-section-cache-visibility t
+  "Whether to cache visibility of sections.
+
+Sections always retain their visibility state when they are being
+recreated during a refresh.  But if a section disappears and then
+later reappears again, then this option controls whether this is
+the case.
+
+If t, then cache the visibility of all sections.  If a list of
+section types, then only do so for matching sections.  If nil,
+then don't do so for any sections."
+  :package-version '(magit-section . "2.12.0")
+  :group 'magit-section
+  :type '(choice (const  :tag "Don't cache visibility" nil)
+                 (const  :tag "Cache visibility of all sections" t)
+                 (repeat :tag "Cache visibility for section types" symbol)))
+
+(defcustom magit-section-initial-visibility-alist
+  '((stashes . hide))
+  "Alist controlling the initial visibility of sections.
+
+Each element maps a section type or lineage to the initial
+visibility state for such sections.  The state has to be one of
+`show' or `hide', or a function that returns one of these symbols.
+A function is called with the section as the only argument.
+
+Use the command `magit-describe-section' to determine a section's
+lineage or type.  The vector in the output is the section lineage
+and the type is the first element of that vector.  Wildcards can
+be used, see `magit-section-match'.
+
+Currently this option is only used to override hardcoded defaults,
+but in the future it will also be used set the defaults.
+
+An entry whose key is `magit-status-initial-section' specifies
+the visibility of the section `magit-status-goto-initial-section'
+jumps to.  This does not only override defaults, but also other
+entries of this alist."
+  :package-version '(magit-section . "2.12.0")
+  :group 'magit-section
+  :type '(alist :key-type (sexp :tag "Section type/lineage")
+                :value-type (choice (const hide)
+                                    (const show)
+                                    function)))
+
+(defcustom magit-section-visibility-indicator
+  (if (window-system)
+      '(magit-fringe-bitmap> . magit-fringe-bitmapv)
+    (cons (if (char-displayable-p ?…) "…" "...")
+          t))
+  "Whether and how to indicate that a section can be expanded/collapsed.
+
+If nil, then don't show any indicators.
+Otherwise the value has to have one of these two forms:
+
+\(EXPANDABLE-BITMAP . COLLAPSIBLE-BITMAP)
+
+  Both values have to be variables whose values are fringe
+  bitmaps.  In this case every section that can be expanded or
+  collapsed gets an indicator in the left fringe.
+
+  To provide extra padding around the indicator, set
+  `left-fringe-width' in `magit-mode-hook'.
+
+\(STRING . BOOLEAN)
+
+  In this case STRING (usually an ellipsis) is shown at the end
+  of the heading of every collapsed section.  Expanded sections
+  get no indicator.  The cdr controls whether the appearance of
+  these ellipsis take section highlighting into account.  Doing
+  so might potentially have an impact on performance, while not
+  doing so is kinda ugly."
+  :package-version '(magit-section . "3.0.0")
+  :group 'magit-section
+  :type '(choice (const :tag "No indicators" nil)
+                 (cons  :tag "Use +- fringe indicators"
+                        (const magit-fringe-bitmap+)
+                        (const magit-fringe-bitmap-))
+                 (cons  :tag "Use >v fringe indicators"
+                        (const magit-fringe-bitmap>)
+                        (const magit-fringe-bitmapv))
+                 (cons  :tag "Use bold >v fringe indicators)"
+                        (const magit-fringe-bitmap-bold>)
+                        (const magit-fringe-bitmap-boldv))
+                 (cons  :tag "Use custom fringe indicators"
+                        (variable :tag "Expandable bitmap variable")
+                        (variable :tag "Collapsible bitmap variable"))
+                 (cons  :tag "Use ellipses at end of headings"
+                        (string :tag "Ellipsis" "…")
+                        (choice :tag "Use face kludge"
+                                (const :tag "Yes (potentially slow)" t)
+                                (const :tag "No (kinda ugly)" nil)))))
+
+(define-obsolete-variable-alias 'magit-keep-region-overlay
+  'magit-section-keep-region-overlay "Magit-Section 4.0.0")
+
+(defcustom magit-section-keep-region-overlay nil
+  "Whether to keep the region overlay when there is a valid selection.
+
+By default Magit removes the regular region overlay if, and only
+if, that region constitutes a valid selection as understood by
+Magit commands.  Otherwise it does not remove that overlay, and
+the region looks like it would in other buffers.
+
+There are two types of such valid selections: hunk-internal
+regions and regions that select two or more sibling sections.
+In such cases Magit removes the region overlay and instead
+highlights a slightly larger range.  All text (for hunk-internal
+regions) or the headings of all sections (for sibling selections)
+that are inside that range (not just inside the region) are acted
+on by commands such as the staging command.  This buffer range
+begins at the beginning of the line on which the region begins
+and ends at the end of the line on which the region ends.
+
+Because Magit acts on this larger range and not the region, it is
+actually quite important to visualize that larger range.  If we
+don't do that, then one might think that these commands act on
+the region instead.  If you want to *also* visualize the region,
+then set this option to t.  But please note that when the region
+does *not* constitute a valid selection, then the region is
+*always* visualized as usual, and that it is usually under such
+circumstances that you want to use a non-magit command to act on
+the region.
+
+Besides keeping the region overlay, setting this option to t also
+causes all face properties, except for `:foreground', to be
+ignored for the faces used to highlight headings of selected
+sections.  This avoids the worst conflicts that result from
+displaying the region and the selection overlays at the same
+time.  We are not interested in dealing with other conflicts.
+In fact we *already* provide a way to avoid all of these
+conflicts: *not* changing the value of this option.
+
+It should be clear by now that we consider it a mistake to set
+this to display the region when the Magit selection is also
+visualized, but since it has been requested a few times and
+because it doesn't cost much to offer this option we do so.
+However that might change.  If the existence of this option
+starts complicating other things, then it will be removed."
+  :package-version '(magit-section . "2.3.0")
+  :group 'magit-section
+  :type 'boolean)
+
+(defcustom magit-section-disable-line-numbers t
+  "In Magit buffers, whether to disable modes that display line numbers.
+
+Some users who turn on `global-display-line-numbers-mode' (or
+`global-nlinum-mode' or `global-linum-mode') expect line numbers
+to be displayed everywhere except in Magit buffers.  Other users
+do not expect Magit buffers to be treated differently.  At least
+in theory users in the first group should not use the global mode,
+but that ship has sailed, thus this option."
+  :package-version '(magit-section . "3.0.0")
+  :group 'magit-section
+  :type 'boolean)
+
+(defcustom magit-section-show-context-menu-for-emacs<28 nil
+  "Whether `mouse-3' shows a context menu for Emacs < 28.
+
+This has to be set before loading `magit-section' or it has
+no effect.  This also has no effect for Emacs >= 28, where
+`context-menu-mode' should be enabled instead."
+  :package-version '(magit-section . "4.0.0")
+  :group 'magit-section
+  :type 'boolean)
+
+;;; Variables
+
+(defvar-local magit-section-preserve-visibility t)
+
+(defvar-local magit-section-pre-command-region-p nil)
+(defvar-local magit-section-pre-command-section nil)
+(defvar-local magit-section-highlight-force-update nil)
+(defvar-local magit-section-highlight-overlays nil)
+(defvar-local magit-section-highlighted-sections nil)
+(defvar-local magit-section-unhighlight-sections nil)
+
+(defvar-local magit-section-inhibit-markers nil)
+(defvar-local magit-section-insert-in-reverse nil)
+
+;;; Faces
+
+(defgroup magit-section-faces nil
+  "Faces used by Magit-Section."
+  :group 'magit-section
+  :group 'faces)
+
+(defface magit-section-highlight
+  `((((class color) (background light))
+     ,@(and (>= emacs-major-version 27) '(:extend t))
+     :background "grey95")
+    (((class color) (background  dark))
+     ,@(and (>= emacs-major-version 27) '(:extend t))
+     :background "grey20"))
+  "Face for highlighting the current section."
+  :group 'magit-section-faces)
+
+(defface magit-section-heading
+  `((((class color) (background light))
+     ,@(and (>= emacs-major-version 27) '(:extend t))
+     :foreground "DarkGoldenrod4"
+     :weight bold)
+    (((class color) (background  dark))
+     ,@(and (>= emacs-major-version 27) '(:extend t))
+     :foreground "LightGoldenrod2"
+     :weight bold))
+  "Face for section headings."
+  :group 'magit-section-faces)
+
+(defface magit-section-secondary-heading
+  `((t ,@(and (>= emacs-major-version 27) '(:extend t))
+       :weight bold))
+  "Face for section headings of some secondary headings."
+  :group 'magit-section-faces)
+
+(defface magit-section-heading-selection
+  `((((class color) (background light))
+     ,@(and (>= emacs-major-version 27) '(:extend t))
+     :foreground "salmon4")
+    (((class color) (background  dark))
+     ,@(and (>= emacs-major-version 27) '(:extend t))
+     :foreground "LightSalmon3"))
+  "Face for selected section headings."
+  :group 'magit-section-faces)
+
+(defface magit-section-child-count '((t nil))
+  "Face used for child counts at the end of some section headings."
+  :group 'magit-section-faces)
+
+;;; Classes
+
+(defvar magit--current-section-hook nil
+  "Internal variable used for `magit-describe-section'.")
+
+(defvar magit--section-type-alist nil)
+
+(defclass magit-section ()
+  ((type     :initform nil :initarg :type)
+   (keymap   :initform nil)
+   (value    :initform nil)
+   (start    :initform nil)
+   (content  :initform nil)
+   (end      :initform nil)
+   (hidden)
+   (washer   :initform nil :initarg :washer)
+   (inserter :initform (symbol-value 'magit--current-section-hook))
+   (heading-highlight-face :initform nil :initarg :heading-highlight-face)
+   (parent   :initform nil)
+   (children :initform nil)))
+
+;;; Mode
+
+(defvar symbol-overlay-inhibit-map)
+
+(defvar-keymap magit-section-heading-map
+  :doc "Keymap used in the heading line of all expandable sections.
+This keymap is used in addition to the section-specific keymap,
+if any."
+  "<double-down-mouse-1>" #'ignore
+  "<double-mouse-1>" #'magit-mouse-toggle-section
+  "<double-mouse-2>" #'magit-mouse-toggle-section)
+
+(defvar magit-section-mode-map
+  (let ((map (make-keymap)))
+    (suppress-keymap map t)
+    (when (and magit-section-show-context-menu-for-emacs<28
+               (< emacs-major-version 28))
+      (keymap-set map "<mouse-3>" nil)
+      (keymap-set
+       map "<down-mouse-3>"
+       `( menu-item "" ,(make-sparse-keymap)
+          :filter ,(lambda (_)
+                     (let ((menu (make-sparse-keymap)))
+                       (if (fboundp 'context-menu-local)
+                           (context-menu-local menu last-input-event)
+                         (magit--context-menu-local menu last-input-event))
+                       (magit-section-context-menu menu last-input-event)
+                       menu)))))
+    (keymap-set map "<left-fringe> <mouse-1>" #'magit-mouse-toggle-section)
+    (keymap-set map "<left-fringe> <mouse-2>" #'magit-mouse-toggle-section)
+    (keymap-set map "TAB"       #'magit-section-toggle)
+    (keymap-set map "C-c TAB"   #'magit-section-cycle)
+    (keymap-set map "C-<tab>"   #'magit-section-cycle)
+    (keymap-set map "M-<tab>"   #'magit-section-cycle)
+    ;; <backtab> is the most portable binding for Shift+Tab.
+    (keymap-set map "<backtab>" #'magit-section-cycle-global)
+    (keymap-set map   "^" #'magit-section-up)
+    (keymap-set map   "p" #'magit-section-backward)
+    (keymap-set map   "n" #'magit-section-forward)
+    (keymap-set map "M-p" #'magit-section-backward-sibling)
+    (keymap-set map "M-n" #'magit-section-forward-sibling)
+    (keymap-set map   "1" #'magit-section-show-level-1)
+    (keymap-set map   "2" #'magit-section-show-level-2)
+    (keymap-set map   "3" #'magit-section-show-level-3)
+    (keymap-set map   "4" #'magit-section-show-level-4)
+    (keymap-set map "M-1" #'magit-section-show-level-1-all)
+    (keymap-set map "M-2" #'magit-section-show-level-2-all)
+    (keymap-set map "M-3" #'magit-section-show-level-3-all)
+    (keymap-set map "M-4" #'magit-section-show-level-4-all)
+    map)
+  "Parent keymap for all keymaps of modes derived from `magit-section-mode'.")
+
+(define-derived-mode magit-section-mode special-mode "Magit-Sections"
+  "Parent major mode from which major modes with Magit-like sections inherit.
+
+Magit-Section is documented in info node `(magit-section)'."
+  :interactive nil
+  :group 'magit-section
+  (buffer-disable-undo)
+  (setq truncate-lines t)
+  (setq buffer-read-only t)
+  (setq-local line-move-visual t) ; see #1771
+  ;; Turn off syntactic font locking, but not by setting
+  ;; `font-lock-defaults' because that would enable font locking, and
+  ;; not all magit plugins may be ready for that (see #3950).
+  (setq-local font-lock-syntactic-face-function #'ignore)
+  (setq show-trailing-whitespace nil)
+  (setq-local symbol-overlay-inhibit-map t)
+  (setq list-buffers-directory (abbreviate-file-name default-directory))
+  (make-local-variable 'text-property-default-nonsticky)
+  (push (cons 'keymap t) text-property-default-nonsticky)
+  (add-hook 'pre-command-hook #'magit-section-pre-command-hook nil t)
+  (add-hook 'post-command-hook #'magit-section-post-command-hook t t)
+  (add-hook 'deactivate-mark-hook #'magit-section-deactivate-mark t t)
+  (setq-local redisplay-highlight-region-function
+              #'magit-section--highlight-region)
+  (setq-local redisplay-unhighlight-region-function
+              #'magit-section--unhighlight-region)
+  (add-function :filter-return (local 'filter-buffer-substring-function)
+                #'magit-section--remove-text-properties)
+  (when (fboundp 'magit-section-context-menu)
+    (add-hook 'context-menu-functions #'magit-section-context-menu 10 t))
+  (when magit-section-disable-line-numbers
+    (when (and (fboundp 'linum-mode)
+               (bound-and-true-p global-linum-mode))
+      (linum-mode -1))
+    (when (and (fboundp 'nlinum-mode)
+               (bound-and-true-p global-nlinum-mode))
+      (nlinum-mode -1))
+    (when (and (fboundp 'display-line-numbers-mode)
+               (bound-and-true-p global-display-line-numbers-mode))
+      (display-line-numbers-mode -1)))
+  (when (fboundp 'magit-preserve-section-visibility-cache)
+    (add-hook 'kill-buffer-hook #'magit-preserve-section-visibility-cache)))
+
+(defun magit-section--remove-text-properties (string)
+  "Remove all text-properties from STRING.
+Most importantly `magit-section'."
+  (set-text-properties 0 (length string) nil string)
+  string)
+
+;;; Core
+
+(defvar-local magit-root-section nil
+  "The root section in the current buffer.
+All other sections are descendants of this section.  The value
+of this variable is set by `magit-insert-section' and you should
+never modify it.")
+(put 'magit-root-section 'permanent-local t)
+
+(defvar-local magit--context-menu-section nil "For internal use only.")
+
+(defvar magit--context-menu-buffer nil "For internal use only.")
+
+(defun magit-point ()
+  "Return point or the position where the context menu was invoked.
+When using the context menu, return the position the user clicked
+on, provided the current buffer is the buffer in which the click
+occurred.  Otherwise return the same value as `point'."
+  (if magit--context-menu-section
+      (magit-menu-position)
+    (point)))
+
+(defun magit-thing-at-point (thing &optional no-properties)
+  "Return the THING at point or where the context menu was invoked.
+When using the context menu, return the thing the user clicked
+on, provided the current buffer is the buffer in which the click
+occurred.  Otherwise return the same value as `thing-at-point'.
+For the meaning of THING and NO-PROPERTIES see that function."
+  (if-let ((pos (magit-menu-position)))
+      (save-excursion
+        (goto-char pos)
+        (thing-at-point thing no-properties))
+    (thing-at-point thing no-properties)))
+
+(defun magit-current-section ()
+  "Return the section at point or where the context menu was invoked.
+When using the context menu, return the section that the user
+clicked on, provided the current buffer is the buffer in which
+the click occurred.  Otherwise return the section at point."
+  (or magit--context-menu-section
+      (magit-section-at)
+      magit-root-section))
+
+(defun magit-section-at (&optional position)
+  "Return the section at POSITION, defaulting to point."
+  (get-text-property (or position (point)) 'magit-section))
+
+(defun magit-section-ident (section)
+  "Return an unique identifier for SECTION.
+The return value has the form ((TYPE . VALUE)...)."
+  (cons (cons (oref section type)
+              (magit-section-ident-value section))
+        (and-let* ((parent (oref section parent)))
+          (magit-section-ident parent))))
+
+(cl-defgeneric magit-section-ident-value (object)
+  "Return OBJECT's value, making it constant and unique if necessary.
+
+This is used to correlate different incarnations of the same
+section, see `magit-section-ident' and `magit-get-section'.
+
+Sections whose values that are not constant and/or unique should
+implement a method that return a value that can be used for this
+purpose.")
+
+(cl-defmethod magit-section-ident-value ((section magit-section))
+  "Return the value unless it is an object.
+
+Different object incarnations representing the same value tend to not be
+equal, so call this generic function on the object itself to determine a
+constant value."
+  (let ((value (oref section value)))
+    (if (eieio-object-p value)
+        (magit-section-ident-value value)
+      value)))
+
+(cl-defmethod magit-section-ident-value ((object eieio-default-superclass))
+  "Simply return the object itself.  That likely isn't
+good enough, so you need to implement your own method."
+  object)
+
+(defun magit-get-section (ident &optional root)
+  "Return the section identified by IDENT.
+IDENT has to be a list as returned by `magit-section-ident'.
+If optional ROOT is non-nil, then search in that section tree
+instead of in the one whose root `magit-root-section' is."
+  (setq ident (reverse ident))
+  (let ((section (or root magit-root-section)))
+    (when (eq (car (pop ident))
+              (oref section type))
+      (while (and ident
+                  (pcase-let ((`(,type . ,value) (car ident)))
+                    (setq section
+                          (cl-find-if
+                           (lambda (section)
+                             (and (eq (oref section type) type)
+                                  (equal (magit-section-ident-value section)
+                                         value)))
+                           (oref section children)))))
+        (pop ident))
+      section)))
+
+(defun magit-section-lineage (section &optional raw)
+  "Return the lineage of SECTION.
+If optional RAW is non-nil, return a list of section objects, beginning
+with SECTION, otherwise return a list of section types."
+  (cons (if raw section (oref section type))
+        (and-let* ((parent (oref section parent)))
+          (magit-section-lineage parent raw))))
+
+(defvar magit-insert-section--current nil "For internal use only.")
+(defvar magit-insert-section--parent  nil "For internal use only.")
+(defvar magit-insert-section--oldroot nil "For internal use only.")
+
+;;; Menu
+
+(defvar magit-menu-common-value nil "See function `magit-menu-common-value'.")
+(defvar magit-menu--desc-values nil "For internal use only.")
+
+(defun magit-section-context-menu (menu click)
+  "Populate MENU with Magit-Section commands at CLICK."
+  (when-let ((section (save-excursion
+                        (unless (region-active-p)
+                          (mouse-set-point click))
+                        (magit-section-at))))
+    (unless (region-active-p)
+      (setq magit--context-menu-buffer (current-buffer))
+      (if-let ((alt (save-excursion
+                      (mouse-set-point click)
+                      (run-hook-with-args-until-success
+                       'magit-menu-alternative-section-hook section))))
+          (setq magit--context-menu-section (setq section alt))
+        (setq magit--context-menu-section section)
+        (magit-section-update-highlight t)))
+    (when (magit-section-content-p section)
+      (keymap-set-after menu "<magit-section-toggle>"
+        `(menu-item
+          ,(if (oref section hidden) "Expand section" "Collapse section")
+          magit-section-toggle))
+      (unless (oref section hidden)
+        (when-let ((children (oref section children)))
+          (when (seq-some #'magit-section-content-p children)
+            (when (seq-some (lambda (c) (oref c hidden)) children)
+              (keymap-set-after menu "<magit-section-show-children>"
+                `(menu-item "Expand children"
+                            magit-section-show-children)))
+            (when (seq-some (lambda (c) (not (oref c hidden))) children)
+              (keymap-set-after menu "<magit-section-hide-children>"
+                `(menu-item "Collapse children"
+                            magit-section-hide-children))))))
+      (keymap-set-after menu "<separator-magit-1>" menu-bar-separator))
+    (keymap-set-after menu "<magit-describe-section>"
+      `(menu-item "Describe section" magit-describe-section))
+    (when-let ((map (oref section keymap)))
+      (keymap-set-after menu "<separator-magit-2>" menu-bar-separator)
+      (when (symbolp map)
+        (setq map (symbol-value map)))
+      (setq magit-menu-common-value (magit-menu-common-value section))
+      (setq magit-menu--desc-values (magit-menu--desc-values section))
+      (map-keymap (lambda (key binding)
+                    (when (consp binding)
+                      (define-key-after menu (vector key)
+                        (copy-sequence binding))))
+                  (if (fboundp 'menu-bar-keymap)
+                      (menu-bar-keymap map)
+                    (magit--menu-bar-keymap map)))))
+  menu)
+
+(defun magit-menu-item (desc def &optional props)
+  "Return a menu item named DESC binding DEF and using PROPS.
+
+If DESC contains a supported %-spec, substitute the
+expression (magit-menu-format-desc DESC) for that.
+See `magit-menu-format-desc'."
+  `(menu-item
+    ,(if (and (stringp desc) (string-match-p "%[tTvsmMx]" desc))
+         (list 'magit-menu-format-desc desc)
+       desc)
+    ,def
+    ;; Without this, the keys for point would be shown instead
+    ;; of the relevant ones from where the click occurred.
+    :keys ,(apply-partially #'magit--menu-position-keys def)
+    ,@props))
+
+(defun magit--menu-position-keys (def)
+  (or (ignore-errors
+        (save-excursion
+          (goto-char (magit-menu-position))
+          (and-let* ((key (cl-find-if-not
+                           (lambda (key)
+                             (string-match-p "\\`<[0-9]+>\\'"
+                                             (key-description key)))
+                           (where-is-internal def))))
+            (key-description key))))
+      ""))
+
+(defun magit-menu-position ()
+  "Return the position where the context-menu was invoked.
+If the current command wasn't invoked using the context-menu,
+then return nil."
+  (and magit--context-menu-section
+       (ignore-errors
+         (posn-point (event-start (aref (this-command-keys-vector) 0))))))
+
+(defun magit-menu-highlight-point-section ()
+  (setq magit-section-highlight-force-update t)
+  (if (eq (current-buffer) magit--context-menu-buffer)
+      (setq magit--context-menu-section nil)
+    (if-let ((window (get-buffer-window magit--context-menu-buffer)))
+        (with-selected-window window
+          (setq magit--context-menu-section nil)
+          (magit-section-update-highlight))
+      (with-current-buffer magit--context-menu-buffer
+        (setq magit--context-menu-section nil))))
+  (setq magit--context-menu-buffer nil))
+
+(defvar magit--plural-append-es '(branch))
+
+(cl-defgeneric magit-menu-common-value (_section)
+  "Return some value to be used by multiple menu items.
+This function is called by `magit-section-context-menu', which
+stores the value in `magit-menu-common-value'.  Individual menu
+items can use it, e.g., in the expression used to set their
+description."
+  nil)
+
+(defun magit-menu--desc-values (section)
+  (let ((type (oref section type))
+        (value (oref section value))
+        (multiple (magit-region-sections nil t)))
+    (list type
+          value
+          (format "%s %s" type value)
+          (and multiple (length multiple))
+          (if (memq type magit--plural-append-es) "es" "s"))))
+
+(defun magit-menu-format-desc (format)
+  "Format a string based on FORMAT and menu section or selection.
+The following %-specs are allowed:
+%t means \"TYPE\".
+%T means \"TYPE\", or \"TYPEs\" if multiple sections are selected.
+%v means \"VALUE\".
+%s means \"TYPE VALUE\".
+%m means \"TYPE VALUE\", or \"COUNT TYPEs\" if multiple sections
+   are selected.
+%M means \"VALUE\", or \"COUNT TYPEs\" if multiple sections are
+   selected.
+%x means the value of `magit-menu-common-value'."
+  (pcase-let* ((`(,type ,value ,single ,count ,suffix) magit-menu--desc-values)
+               (multiple (and count (format "%s %s%s" count type suffix))))
+    (format-spec format
+                 `((?t . ,type)
+                   (?T . ,(format "%s%s" type (if count suffix "")))
+                   (?v . ,value)
+                   (?s . ,single)
+                   (?m . ,(or multiple single))
+                   (?M . ,(or multiple value))
+                   (?x . ,(format "%s" magit-menu-common-value))))))
+
+(defun magit--menu-bar-keymap (keymap)
+  "Backport of `menu-bar-keymap' for Emacs < 28.
+Slight trimmed down."
+  (let ((menu-bar nil))
+    (map-keymap (lambda (key binding)
+                  (push (cons key binding) menu-bar))
+                keymap)
+    (cons 'keymap (nreverse menu-bar))))
+
+(defun magit--context-menu-local (menu _click)
+  "Backport of `context-menu-local' for Emacs < 28."
+  (run-hooks 'activate-menubar-hook 'menu-bar-update-hook)
+  (keymap-set-after menu "<separator-local>" menu-bar-separator)
+  (let ((keymap (local-key-binding [menu-bar])))
+    (when keymap
+      (map-keymap (lambda (key binding)
+                    (when (consp binding)
+                      (define-key-after menu (vector key)
+                        (copy-sequence binding))))
+                  (magit--menu-bar-keymap keymap))))
+  menu)
+
+(define-advice context-menu-region (:around (fn menu click) magit-section-mode)
+  "Disable in `magit-section-mode' buffers."
+  (if (derived-mode-p 'magit-section-mode)
+      menu
+    (funcall fn menu click)))
+
+;;; Commands
+;;;; Movement
+
+(defun magit-section-forward ()
+  "Move to the beginning of the next visible section."
+  (interactive)
+  (if (eobp)
+      (user-error "No next section")
+    (let ((section (magit-current-section)))
+      (if (oref section parent)
+          (let ((next (and (not (oref section hidden))
+                           (not (= (oref section end)
+                                   (1+ (point))))
+                           (car (oref section children)))))
+            (while (and section (not next))
+              (unless (setq next (car (magit-section-siblings section 'next)))
+                (setq section (oref section parent))))
+            (if next
+                (magit-section-goto next)
+              (user-error "No next section")))
+        (magit-section-goto 1)))))
+
+(defun magit-section-backward ()
+  "Move to the beginning of the current or the previous visible section.
+When point is at the beginning of a section then move to the
+beginning of the previous visible section.  Otherwise move to
+the beginning of the current section."
+  (interactive)
+  (if (bobp)
+      (user-error "No previous section")
+    (let ((section (magit-current-section)) children)
+      (cond
+       ((and (= (point)
+                (1- (oref section end)))
+             (setq children (oref section children)))
+        (magit-section-goto (car (last children))))
+       ((and (oref section parent)
+             (not (= (point)
+                     (oref section start))))
+        (magit-section-goto section))
+       (t
+        (let ((prev (car (magit-section-siblings section 'prev))))
+          (if prev
+              (while (and (not (oref prev hidden))
+                          (setq children (oref prev children)))
+                (setq prev (car (last children))))
+            (setq prev (oref section parent)))
+          (cond (prev
+                 (magit-section-goto prev))
+                ((oref section parent)
+                 (user-error "No previous section"))
+                ;; Eob special cases.
+                ((not (get-text-property (1- (point)) 'invisible))
+                 (magit-section-goto -1))
+                (t
+                 (goto-char (previous-single-property-change
+                             (1- (point)) 'invisible))
+                 (forward-line -1)
+                 (magit-section-goto (magit-current-section))))))))))
+
+(defun magit-section-up ()
+  "Move to the beginning of the parent section."
+  (interactive)
+  (if-let ((parent (oref (magit-current-section) parent)))
+      (magit-section-goto parent)
+    (user-error "No parent section")))
+
+(defun magit-section-forward-sibling ()
+  "Move to the beginning of the next sibling section.
+If there is no next sibling section, then move to the parent."
+  (interactive)
+  (let ((current (magit-current-section)))
+    (if (oref current parent)
+        (if-let ((next (car (magit-section-siblings current 'next))))
+            (magit-section-goto next)
+          (magit-section-forward))
+      (magit-section-goto 1))))
+
+(defun magit-section-backward-sibling ()
+  "Move to the beginning of the previous sibling section.
+If there is no previous sibling section, then move to the parent."
+  (interactive)
+  (let ((current (magit-current-section)))
+    (if (oref current parent)
+        (if-let ((previous (car (magit-section-siblings current 'prev))))
+            (magit-section-goto previous)
+          (magit-section-backward))
+      (magit-section-goto -1))))
+
+(defun magit-section-goto (arg)
+  (if (integerp arg)
+      (progn (forward-line arg)
+             (setq arg (magit-current-section)))
+    (goto-char (oref arg start)))
+  (run-hook-with-args 'magit-section-movement-hook arg))
+
+(defun magit-section-set-window-start (section)
+  "Ensure the beginning of SECTION is visible."
+  (unless (pos-visible-in-window-p (oref section end))
+    (set-window-start (selected-window) (oref section start))))
+
+(defmacro magit-define-section-jumper
+    (name heading type &optional value inserter &rest properties)
+  "Define an interactive function to go some section.
+Together TYPE and VALUE identify the section.
+HEADING is the displayed heading of the section."
+  (declare (indent defun))
+  `(transient-define-suffix ,name (&optional expand)
+     ,(format "Jump to the section \"%s\".
+With a prefix argument also expand it." heading)
+     ,@properties
+     ,@(and (not (plist-member properties :description))
+            (list :description heading))
+     ,@(and inserter
+            `(:if (lambda () (memq ',inserter
+                              (bound-and-true-p magit-status-sections-hook)))))
+     :inapt-if-not (lambda () (magit-get-section
+                          (cons (cons ',type ,value)
+                                (magit-section-ident magit-root-section))))
+     (interactive "P")
+     (if-let ((section (magit-get-section
+                        (cons (cons ',type ,value)
+                              (magit-section-ident magit-root-section)))))
+         (progn (goto-char (oref section start))
+                (when expand
+                  (with-local-quit (magit-section-show section))
+                  (recenter 0)))
+       (message ,(format "Section \"%s\" wasn't found" heading)))))
+
+;;;; Visibility
+
+(defun magit-section-show (section)
+  "Show the body of the current section."
+  (interactive (list (magit-current-section)))
+  (oset section hidden nil)
+  (magit-section--maybe-wash section)
+  (when-let ((beg (oref section content)))
+    (remove-overlays beg (oref section end) 'invisible t))
+  (magit-section-maybe-update-visibility-indicator section)
+  (magit-section-maybe-cache-visibility section)
+  (dolist (child (oref section children))
+    (if (oref child hidden)
+        (magit-section-hide child)
+      (magit-section-show child))))
+
+(defun magit-section--maybe-wash (section)
+  (when-let ((washer (oref section washer)))
+    (oset section washer nil)
+    (let ((inhibit-read-only t)
+          (magit-insert-section--parent section)
+          (magit-insert-section--current section)
+          (content (oref section content)))
+      (save-excursion
+        (if (and content (< content (oref section end)))
+            (funcall washer section) ; already partially washed (hunk)
+          (goto-char (oref section end))
+          (oset section content (point-marker))
+          (funcall washer)
+          (oset section end (point-marker)))))
+    (setq magit-section-highlight-force-update t)))
+
+(defun magit-section-hide (section)
+  "Hide the body of the current section."
+  (interactive (list (magit-current-section)))
+  (if (eq section magit-root-section)
+      (user-error "Cannot hide root section")
+    (oset section hidden t)
+    (when-let ((beg (oref section content)))
+      (let ((end (oref section end)))
+        (when (< beg (point) end)
+          (goto-char (oref section start)))
+        (remove-overlays beg end 'invisible t)
+        (let ((o (make-overlay beg end)))
+          (overlay-put o 'evaporate t)
+          (overlay-put o 'invisible t)
+          (overlay-put o 'cursor-intangible t))))
+    (magit-section-maybe-update-visibility-indicator section)
+    (magit-section-maybe-cache-visibility section)))
+
+(defun magit-section-toggle (section)
+  "Toggle visibility of the body of the current section."
+  (interactive (list (magit-current-section)))
+  (cond ((eq section magit-root-section)
+         (user-error "Cannot hide root section"))
+        ((oref section hidden)
+         (magit-section-show section))
+        ((magit-section-hide section))))
+
+(defun magit-section-toggle-children (section)
+  "Toggle visibility of bodies of children of the current section."
+  (interactive (list (magit-current-section)))
+  (let* ((children (oref section children))
+         (show (--any-p (oref it hidden) children)))
+    (dolist (c children)
+      (oset c hidden show)))
+  (magit-section-show section))
+
+(defun magit-section-show-children (section &optional depth)
+  "Recursively show the bodies of children of the current section.
+With a prefix argument show children that deep and hide deeper
+children."
+  (interactive (list (magit-current-section)))
+  (magit-section-show-children-1 section depth)
+  (magit-section-show section))
+
+(defun magit-section-show-children-1 (section &optional depth)
+  (dolist (child (oref section children))
+    (oset child hidden nil)
+    (if depth
+        (if (> depth 0)
+            (magit-section-show-children-1 child (1- depth))
+          (magit-section-hide child))
+      (magit-section-show-children-1 child))))
+
+(defun magit-section-hide-children (section)
+  "Recursively hide the bodies of children of the current section."
+  (interactive (list (magit-current-section)))
+  (mapc #'magit-section-hide (oref section children)))
+
+(defun magit-section-show-headings (section)
+  "Recursively show headings of children of the current section.
+Only show the headings, previously shown text-only bodies are
+hidden."
+  (interactive (list (magit-current-section)))
+  (magit-section-show-headings-1 section)
+  (magit-section-show section))
+
+(defun magit-section-show-headings-1 (section)
+  (dolist (child (oref section children))
+    (oset child hidden nil)
+    (when (or (oref child children)
+              (not (oref child content)))
+      (magit-section-show-headings-1 child))))
+
+(defun magit-section-cycle (section)
+  "Cycle visibility of current section and its children.
+
+If this command is invoked using \\`C-<tab>' and that is globally bound
+to `tab-next', then this command pivots to behave like that command, and
+you must instead use \\`C-c TAB' to cycle section visibility.
+
+If you would like to keep using \\`C-<tab>' to cycle section visibility
+but also want to use `tab-bar-mode', then you have to prevent that mode
+from using this key and instead bind another key to `tab-next'.  Because
+`tab-bar-mode' does not use a mode map but instead manipulates the
+global map, this involves advising `tab-bar--define-keys'."
+  (interactive (list (magit-current-section)))
+  (cond
+   ((and (equal (this-command-keys) [C-tab])
+         (eq (global-key-binding [C-tab]) 'tab-next)
+         (fboundp 'tab-bar-switch-to-next-tab))
+    (tab-bar-switch-to-next-tab current-prefix-arg))
+   ((oref section hidden)
+    (magit-section-show section)
+    (magit-section-hide-children section))
+   ((let ((children (oref section children)))
+      (cond ((and (--any-p (oref it hidden)   children)
+                  (--any-p (oref it children) children))
+             (magit-section-show-headings section))
+            ((seq-some #'magit-section-hidden-body children)
+             (magit-section-show-children section))
+            ((magit-section-hide section)))))))
+
+(defun magit-section-cycle-global ()
+  "Cycle visibility of all sections in the current buffer."
+  (interactive)
+  (let ((children (oref magit-root-section children)))
+    (cond ((and (--any-p (oref it hidden)   children)
+                (--any-p (oref it children) children))
+           (magit-section-show-headings magit-root-section))
+          ((seq-some #'magit-section-hidden-body children)
+           (magit-section-show-children magit-root-section))
+          (t
+           (mapc #'magit-section-hide children)))))
+
+(defun magit-section-hidden-body (section &optional pred)
+  (if-let ((children (oref section children)))
+      (funcall (or pred #'-any-p) #'magit-section-hidden-body children)
+    (and (oref section content)
+         (oref section hidden))))
+
+(defun magit-section-content-p (section)
+  "Return non-nil if SECTION has content or an unused washer function."
+  (with-slots (content end washer) section
+    (and content (or (not (= content end)) washer))))
+
+(defun magit-section-invisible-p (section)
+  "Return t if the SECTION's body is invisible.
+When the body of an ancestor of SECTION is collapsed then
+SECTION's body (and heading) obviously cannot be visible."
+  (or (oref section hidden)
+      (and-let* ((parent (oref section parent)))
+        (magit-section-invisible-p parent))))
+
+(defun magit-section-show-level (level)
+  "Show surrounding sections up to LEVEL.
+If LEVEL is negative, show up to the absolute value.
+Sections at higher levels are hidden."
+  (if (< level 0)
+      (let ((s (magit-current-section)))
+        (setq level (- level))
+        (while (> (1- (length (magit-section-ident s))) level)
+          (setq s (oref s parent))
+          (goto-char (oref s start)))
+        (magit-section-show-children magit-root-section (1- level)))
+    (cl-do* ((s (magit-current-section)
+                (oref s parent))
+             (i (1- (length (magit-section-ident s)))
+                (cl-decf i)))
+        ((cond ((< i level) (magit-section-show-children s (- level i 1)) t)
+               ((= i level) (magit-section-hide s) t))
+         (magit-section-goto s)))))
+
+(defun magit-section-show-level-1 ()
+  "Show surrounding sections on first level."
+  (interactive)
+  (magit-section-show-level 1))
+
+(defun magit-section-show-level-1-all ()
+  "Show all sections on first level."
+  (interactive)
+  (magit-section-show-level -1))
+
+(defun magit-section-show-level-2 ()
+  "Show surrounding sections up to second level."
+  (interactive)
+  (magit-section-show-level 2))
+
+(defun magit-section-show-level-2-all ()
+  "Show all sections up to second level."
+  (interactive)
+  (magit-section-show-level -2))
+
+(defun magit-section-show-level-3 ()
+  "Show surrounding sections up to third level."
+  (interactive)
+  (magit-section-show-level 3))
+
+(defun magit-section-show-level-3-all ()
+  "Show all sections up to third level."
+  (interactive)
+  (magit-section-show-level -3))
+
+(defun magit-section-show-level-4 ()
+  "Show surrounding sections up to fourth level."
+  (interactive)
+  (magit-section-show-level 4))
+
+(defun magit-section-show-level-4-all ()
+  "Show all sections up to fourth level."
+  (interactive)
+  (magit-section-show-level -4))
+
+(defun magit-mouse-toggle-section (event)
+  "Toggle visibility of the clicked section.
+Clicks outside either the section heading or the left fringe are
+silently ignored."
+  (interactive "e")
+  (let* ((pos (event-start event))
+         (section (magit-section-at (posn-point pos))))
+    (if (eq (posn-area pos) 'left-fringe)
+        (when section
+          (while (not (magit-section-content-p section))
+            (setq section (oref section parent)))
+          (unless (eq section magit-root-section)
+            (goto-char (oref section start))
+            (magit-section-toggle section)))
+      (magit-section-toggle section))))
+
+;;;; Auxiliary
+
+(defun magit-describe-section-briefly (section &optional ident interactive)
+  "Show information about the section at point.
+With a prefix argument show the section identity instead of the
+section lineage.  This command is intended for debugging purposes.
+\n(fn SECTION &optional IDENT)"
+  (interactive (list (magit-current-section) current-prefix-arg t))
+  (let ((str (format "#<%s %S %S %s-%s%s>"
+                     (eieio-object-class section)
+                     (let ((val (oref section value)))
+                       (cond ((stringp val)
+                              (substring-no-properties val))
+                             ((and (eieio-object-p val)
+                                   (fboundp 'cl-prin1-to-string))
+                              (cl-prin1-to-string val))
+                             (t
+                              val)))
+                     (if ident
+                         (magit-section-ident section)
+                       (apply #'vector (magit-section-lineage section)))
+                     (and-let* ((m (oref section start)))
+                       (if (markerp m) (marker-position m) m))
+                     (if-let ((m (oref section content)))
+                         (format "[%s-]"
+                                 (if (markerp m) (marker-position m) m))
+                       "")
+                     (and-let* ((m (oref section end)))
+                       (if (markerp m) (marker-position m) m)))))
+    (when interactive
+      (message "%s" str))
+    str))
+
+(cl-defmethod cl-print-object ((section magit-section) stream)
+  "Print `magit-describe-section' result of SECTION."
+  ;; Used by debug and edebug as of Emacs 26.
+  (princ (magit-describe-section-briefly section) stream))
+
+(defun magit-describe-section (section &optional interactive-p)
+  "Show information about the section at point."
+  (interactive (list (magit-current-section) t))
+  (let ((inserter-section section))
+    (while (and inserter-section (not (oref inserter-section inserter)))
+      (setq inserter-section (oref inserter-section parent)))
+    (when (and inserter-section (oref inserter-section inserter))
+      (setq section inserter-section)))
+  (pcase (oref section inserter)
+    (`((,hook ,fun) . ,src-src)
+     (help-setup-xref `(magit-describe-section ,section) interactive-p)
+     (with-help-window (help-buffer)
+       (with-current-buffer standard-output
+         (insert (format-message
+                  "%s\n  is inserted by `%s'\n  from `%s'"
+                  (magit-describe-section-briefly section)
+                  (make-text-button (symbol-name fun) nil
+                                    :type 'help-function
+                                    'help-args (list fun))
+                  (make-text-button (symbol-name hook) nil
+                                    :type 'help-variable
+                                    'help-args (list hook))))
+         (pcase-dolist (`(,hook ,fun) src-src)
+           (insert (format-message
+                    ",\n  called by `%s'\n  from `%s'"
+                    (make-text-button (symbol-name fun) nil
+                                      :type 'help-function
+                                      'help-args (list fun))
+                    (make-text-button (symbol-name hook) nil
+                                      :type 'help-variable
+                                      'help-args (list hook)))))
+         (insert ".\n\n")
+         (insert
+          (format-message
+           "`%s' is "
+           (make-text-button (symbol-name fun) nil
+                             :type 'help-function 'help-args (list fun))))
+         (describe-function-1 fun))))
+    (_ (message "%s, inserter unknown"
+                (magit-describe-section-briefly section)))))
+
+;;; Match
+
+(cl-defun magit-section-match
+    (condition &optional (section (magit-current-section)))
+  "Return t if SECTION matches CONDITION.
+
+SECTION defaults to the section at point.  If SECTION is not
+specified and there also is no section at point, then return
+nil.
+
+CONDITION can take the following forms:
+  (CONDITION...)  matches if any of the CONDITIONs matches.
+  [CLASS...]      matches if the section's class is the same
+                  as the first CLASS or a subclass of that;
+                  the section's parent class matches the
+                  second CLASS; and so on.
+  [* CLASS...]    matches sections that match [CLASS...] and
+                  also recursively all their child sections.
+  CLASS           matches if the section's class is the same
+                  as CLASS or a subclass of that; regardless
+                  of the classes of the parent sections.
+
+Each CLASS should be a class symbol, identifying a class that
+derives from `magit-section'.  For backward compatibility CLASS
+can also be a \"type symbol\".  A section matches such a symbol
+if the value of its `type' slot is `eq'.  If a type symbol has
+an entry in `magit--section-type-alist', then a section also
+matches that type if its class is a subclass of the class that
+corresponds to the type as per that alist.
+
+Note that it is not necessary to specify the complete section
+lineage as printed by `magit-describe-section-briefly', unless
+of course you want to be that precise."
+  (and section (magit-section-match-1 condition section)))
+
+(defun magit-section-match-1 (condition section)
+  (cl-assert condition)
+  (and section
+       (if (listp condition)
+           (--first (magit-section-match-1 it section) condition)
+         (magit-section-match-2 (if (symbolp condition)
+                                    (list condition)
+                                  (cl-coerce condition 'list))
+                                section))))
+
+(defun magit-section-match-2 (condition section)
+  (if (eq (car condition) '*)
+      (or (magit-section-match-2 (cdr condition) section)
+          (and-let* ((parent (oref section parent)))
+            (magit-section-match-2 condition parent)))
+    (and (let ((c (car condition)))
+           (if (class-p c)
+               (cl-typep section c)
+             (if-let ((class (cdr (assq c magit--section-type-alist))))
+                 (cl-typep section class)
+               (eq (oref section type) c))))
+         (or (not (setq condition (cdr condition)))
+             (and-let* ((parent (oref section parent)))
+               (magit-section-match-2 condition parent))))))
+
+(defun magit-section-value-if (condition &optional section)
+  "If the section at point matches CONDITION, then return its value.
+
+If optional SECTION is non-nil then test whether that matches
+instead.  If there is no section at point and SECTION is nil,
+then return nil.  If the section does not match, then return
+nil.
+
+See `magit-section-match' for the forms CONDITION can take."
+  (and-let* ((section (or section (magit-current-section))))
+    (and (magit-section-match condition section)
+         (oref section value))))
+
+(defmacro magit-section-case (&rest clauses)
+  "Choose among clauses on the type of the section at point.
+
+Each clause looks like (CONDITION BODY...).  The type of the
+section is compared against each CONDITION; the BODY forms of the
+first match are evaluated sequentially and the value of the last
+form is returned.  Inside BODY the symbol `it' is bound to the
+section at point.  If no clause succeeds or if there is no
+section at point, return nil.
+
+See `magit-section-match' for the forms CONDITION can take.
+Additionally a CONDITION of t is allowed in the final clause, and
+matches if no other CONDITION match, even if there is no section
+at point."
+  (declare (indent 0)
+           (debug (&rest (sexp body))))
+  `(let* ((it (magit-current-section)))
+     (cond ,@(mapcar (lambda (clause)
+                       `(,(or (eq (car clause) t)
+                              `(and it
+                                    (magit-section-match-1 ',(car clause) it)))
+                         ,@(cdr clause)))
+                     clauses))))
+
+(defun magit-section-match-assoc (section alist)
+  "Return the value associated with SECTION's type or lineage in ALIST."
+  (seq-some (pcase-lambda (`(,key . ,val))
+              (and (magit-section-match-1 key section) val))
+            alist))
+
+;;; Create
+
+(defvar magit-insert-section-hook nil
+  "Hook run after `magit-insert-section's BODY.
+Avoid using this hook and only ever do so if you know
+what you are doing and are sure there is no other way.")
+
+(defmacro magit-insert-section (&rest args)
+  "Insert a section at point.
+
+Create a section object of type CLASS, storing VALUE in its
+`value' slot, and insert the section at point.  CLASS is a
+subclass of `magit-section' or has the form `(eval FORM)', in
+which case FORM is evaluated at runtime and should return a
+subclass.  In other places a sections class is often referred
+to as its \"type\".
+
+Many commands behave differently depending on the class of the
+current section and sections of a certain class can have their
+own keymap, which is specified using the `keymap' class slot.
+The value of that slot should be a variable whose value is a
+keymap.
+
+For historic reasons Magit and Forge in most cases use symbols
+as CLASS that don't actually identify a class and that lack the
+appropriate package prefix.  This works due to some undocumented
+kludges, which are not available to other packages.
+
+When optional HIDE is non-nil collapse the section body by
+default, i.e., when first creating the section, but not when
+refreshing the buffer.  Else expand it by default.  This can be
+overwritten using `magit-section-set-visibility-hook'.  When a
+section is recreated during a refresh, then the visibility of
+predecessor is inherited and HIDE is ignored (but the hook is
+still honored).
+
+BODY is any number of forms that actually insert the section's
+heading and body.  Optional NAME, if specified, has to be a
+symbol, which is then bound to the object of the section being
+inserted.
+
+Before BODY is evaluated the `start' of the section object is set
+to the value of `point' and after BODY was evaluated its `end' is
+set to the new value of `point'; BODY is responsible for moving
+`point' forward.
+
+If it turns out inside BODY that the section is empty, then
+`magit-cancel-section' can be used to abort and remove all traces
+of the partially inserted section.  This can happen when creating
+a section by washing Git's output and Git didn't actually output
+anything this time around.
+
+\(fn [NAME] (CLASS &optional VALUE HIDE) &rest BODY)"
+  (declare (indent 1)
+           (debug ([&optional symbolp]
+                   (&or [("eval" form) &optional form form &rest form]
+                        [symbolp &optional form form &rest form])
+                   body)))
+  (pcase-let* ((bind (and (symbolp (car args))
+                          (pop args)))
+               (`((,class ,value ,hide . ,args) . ,body) args)
+               (obj (cl-gensym "section")))
+    `(let* ((,obj (magit-insert-section--create
+                   ,(if (eq (car-safe class) 'eval) (cadr class) `',class)
+                   ,value ,hide ,@args))
+            (magit-insert-section--current ,obj)
+            (magit-insert-section--oldroot
+             (or magit-insert-section--oldroot
+                 (and (not magit-insert-section--parent)
+                      (prog1 magit-root-section
+                        (setq magit-root-section ,obj)))))
+            (magit-insert-section--parent ,obj))
+       (catch 'cancel-section
+         ,@(if bind `((let ((,bind ,obj)) ,@body)) body)
+         (magit-insert-section--finish ,obj))
+       ,obj)))
+
+(defun magit-insert-section--create (class value hide &rest args)
+  (let (type)
+    (if (class-p class)
+        (setq type (or (car (rassq class magit--section-type-alist))
+                       class))
+      (setq type class)
+      (setq class (or (cdr (assq class magit--section-type-alist))
+                      'magit-section)))
+    (let ((obj (apply class :type type args)))
+      (oset obj value value)
+      (oset obj parent magit-insert-section--parent)
+      (oset obj start (if magit-section-inhibit-markers (point) (point-marker)))
+      (unless (slot-boundp obj 'hidden)
+        (oset obj hidden
+              (let (set old)
+                (cond
+                 ((setq set (run-hook-with-args-until-success
+                             'magit-section-set-visibility-hook obj))
+                  (eq set 'hide))
+                 ((setq old (and (not magit-section-preserve-visibility)
+                                 magit-insert-section--oldroot
+                                 (magit-get-section
+                                  (magit-section-ident obj)
+                                  magit-insert-section--oldroot)))
+                  (oref old hidden))
+                 ((setq set (magit-section-match-assoc
+                             obj magit-section-initial-visibility-alist))
+                  (eq (if (functionp set) (funcall set obj) set) 'hide))
+                 (hide)))))
+      (unless (oref obj keymap)
+        (let ((type (oref obj type)))
+          (oset obj keymap
+                (or (let ((sym (intern (format "magit-%s-section-map" type))))
+                      (and (boundp sym) sym))
+                    (let ((sym (intern (format "forge-%s-section-map" type))))
+                      (and (boundp sym) sym))))))
+      obj)))
+
+(defun magit-insert-section--finish (obj)
+  (run-hooks 'magit-insert-section-hook)
+  (let ((beg (oref obj start))
+        (end (oset obj end
+                   (if magit-section-inhibit-markers
+                       (point)
+                     (point-marker))))
+        (props `( magit-section ,obj
+                  ,@(and-let* ((map (symbol-value (oref obj keymap))))
+                      (list 'keymap map)))))
+    (unless magit-section-inhibit-markers
+      (set-marker-insertion-type beg t))
+    (cond ((eq obj magit-root-section))
+          ((oref obj children)
+           (magit-insert-child-count obj)
+           (magit-section-maybe-add-heading-map obj)
+           (save-excursion
+             (goto-char beg)
+             (while (< (point) end)
+               (let ((next (or (next-single-property-change
+                                (point) 'magit-section)
+                               end)))
+                 (unless (magit-section-at)
+                   (add-text-properties (point) next props))
+                 (goto-char next)))))
+          ((add-text-properties beg end props)))
+    (cond ((eq obj magit-root-section)
+           (when (eq magit-section-inhibit-markers 'delay)
+             (setq magit-section-inhibit-markers nil)
+             (magit-map-sections
+              (lambda (section)
+                (oset section start (copy-marker (oref section start) t))
+                (oset section end   (copy-marker (oref section end)   t)))))
+           (let ((magit-section-cache-visibility nil))
+             (magit-section-show obj)))
+          (magit-section-insert-in-reverse
+           (push obj (oref (oref obj parent) children)))
+          ((let ((parent (oref obj parent)))
+             (oset parent children
+                   (nconc (oref parent children)
+                          (list obj))))))
+    (when magit-section-insert-in-reverse
+      (oset obj children (nreverse (oref obj children))))))
+
+(defun magit-cancel-section (&optional if-empty)
+  "Cancel inserting the section that is currently being inserted.
+
+Canceling returns from the inner most use of `magit-insert-section' and
+removes all text that was inserted by that.
+
+If optional IF-EMPTY is non-nil, then only cancel the section, if it is
+empty.  If a section is split into a heading and a body (i.e., when its
+`content' slot is non-nil), then only check if the body is empty."
+  (when (and magit-insert-section--current
+             (or (not if-empty)
+                 (= (point) (or (oref magit-insert-section--current content)
+                                (oref magit-insert-section--current start)))))
+    (if (eq magit-insert-section--current magit-root-section)
+        (insert "(empty)\n")
+      (delete-region (oref magit-insert-section--current start)
+                     (point))
+      (setq magit-insert-section--current nil)
+      (throw 'cancel-section nil))))
+
+(defun magit-insert-heading (&rest args)
+  "Insert the heading for the section currently being inserted.
+
+This function should only be used inside `magit-insert-section'.
+
+When called without any arguments, then just set the `content'
+slot of the object representing the section being inserted to
+a marker at `point'.  The section should only contain a single
+line when this function is used like this.
+
+When called with arguments ARGS, which have to be strings, or
+nil, then insert those strings at point.  The section should not
+contain any text before this happens and afterwards it should
+again only contain a single line.  If the `face' property is set
+anywhere inside any of these strings, then insert all of them
+unchanged.  Otherwise use the `magit-section-heading' face for
+all inserted text.
+
+The `content' property of the section object is the end of the
+heading (which lasts from `start' to `content') and the beginning
+of the the body (which lasts from `content' to `end').  If the
+value of `content' is nil, then the section has no heading and
+its body cannot be collapsed.  If a section does have a heading,
+then its height must be exactly one line, including a trailing
+newline character.  This isn't enforced, you are responsible for
+getting it right.  The only exception is that this function does
+insert a newline character if necessary
+
+If provided, optional CHILD-COUNT must evaluate to an integer or
+boolean.  If t, then the count is determined once the children have been
+inserted, using `magit-insert-child-count' (which see).  For historic
+reasons, if the heading ends with \":\", the count is substituted for
+that, at this time as well.  If `magit-section-show-child-count' is nil,
+no counts are inserted
+
+\n(fn [CHILD-COUNT] &rest STRINGS)"
+  (declare (indent defun))
+  (when args
+    (let ((count (and (or (integerp (car args))
+                          (booleanp (car args)))
+                      (pop args)))
+          (heading (apply #'concat args)))
+      (insert (if (or (text-property-not-all 0 (length heading)
+                                             'font-lock-face nil heading)
+                      (text-property-not-all 0 (length heading)
+                                             'face nil heading))
+                  heading
+                (propertize heading 'font-lock-face 'magit-section-heading)))
+      (when (and count magit-section-show-child-count)
+        (insert (propertize (format " (%s)" count)
+                            'font-lock-face 'magit-section-child-count)))))
+  (unless (bolp)
+    (insert ?\n))
+  (when (fboundp 'magit-maybe-make-margin-overlay)
+    (magit-maybe-make-margin-overlay))
+  (oset magit-insert-section--current content
+        (if magit-section-inhibit-markers (point) (point-marker))))
+
+(defmacro magit-insert-section-body (&rest body)
+  "Use BODY to insert the section body, once the section is expanded.
+If the section is expanded when it is created, then this is
+like `progn'.  Otherwise BODY isn't evaluated until the section
+is explicitly expanded."
+  (declare (indent 0))
+  (let ((f (cl-gensym))
+        (s (cl-gensym))
+        (l (cl-gensym)))
+    `(let ((,f (lambda () ,@body)))
+       (if (oref magit-insert-section--current hidden)
+           (oset magit-insert-section--current washer
+                 (let ((,s magit-insert-section--current))
+                   (lambda ()
+                     (let ((,l (magit-section-lineage ,s t)))
+                       (dolist (s ,l)
+                         (set-marker-insertion-type (oref s end) t))
+                       (funcall ,f)
+                       (dolist (s ,l)
+                         (set-marker-insertion-type (oref s end) nil))
+                       (magit-section-maybe-remove-heading-map ,s)
+                       (magit-section-maybe-remove-visibility-indicator ,s)))))
+         (funcall ,f)))))
+
+(defun magit-insert-headers (hook)
+  (let* ((header-sections nil)
+         (magit-insert-section-hook
+          (cons (lambda ()
+                  (push magit-insert-section--current
+                        header-sections))
+                (ensure-list magit-insert-section-hook))))
+    (magit-run-section-hook hook)
+    (when header-sections
+      (insert "\n")
+      ;; Make the first header into the parent of the rest.
+      (when (cdr header-sections)
+        (cl-callf nreverse header-sections)
+        (let* ((1st-header (pop header-sections))
+               (header-parent (oref 1st-header parent)))
+          (oset header-parent children (list 1st-header))
+          (oset 1st-header children header-sections)
+          (oset 1st-header content (oref (car header-sections) start))
+          (oset 1st-header end (oref (car (last header-sections)) end))
+          (dolist (sub-header header-sections)
+            (oset sub-header parent 1st-header))
+          (magit-section-maybe-add-heading-map 1st-header))))))
+
+(defun magit-section-maybe-add-heading-map (section)
+  (when (magit-section-content-p section)
+    (let ((start (oref section start))
+          (map (oref section keymap)))
+      (when (symbolp map)
+        (setq map (symbol-value map)))
+      (put-text-property
+       start
+       (save-excursion
+         (goto-char start)
+         (line-end-position))
+       'keymap (if map
+                   (make-composed-keymap
+                    (list map magit-section-heading-map))
+                 magit-section-heading-map)))))
+
+(defun magit-section-maybe-remove-heading-map (section)
+  (with-slots (start content end keymap) section
+    (when (= content end)
+      (put-text-property start end 'keymap
+                         (if (symbolp keymap) (symbol-value keymap) keymap)))))
+
+(defun magit-insert-child-count (section)
+  "Modify SECTION's heading to contain number of child sections.
+
+If `magit-section-show-child-count' is non-nil and the SECTION
+has children and its heading ends with \":\", then replace that
+with \" (N)\", where N is the number of child sections.
+
+This function is called by `magit-insert-section' after that has
+evaluated its BODY.  Admittedly that's a bit of a hack."
+  (let (content count)
+    (cond
+     ((not (and magit-section-show-child-count
+                (setq content (oref section content))
+                (setq count (length (oref section children)))
+                (> count 0))))
+     ((eq (char-before (- content 1)) ?:)
+      (save-excursion
+        (goto-char (- content 2))
+        (insert (magit--propertize-face (format " (%s)" count)
+                                        'magit-section-child-count))
+        (delete-char 1)))
+     ((and (eq (char-before (- content 4)) ?\s)
+           (eq (char-before (- content 3)) ?\()
+           (eq (char-before (- content 2)) ?t )
+           (eq (char-before (- content 1)) ?\)))
+      (save-excursion
+        (goto-char (- content 3))
+        (delete-char 1)
+        (insert (format "%s" count)))))))
+
+;;; Highlight
+
+(defun magit-section-pre-command-hook ()
+  (when (and (or magit--context-menu-buffer
+                 magit--context-menu-section)
+             (not (eq (ignore-errors
+                        (event-basic-type (aref (this-command-keys) 0)))
+                      'mouse-3)))
+    ;; This is the earliest opportunity to clean up after an aborted
+    ;; context-menu because that neither causes the command that created
+    ;; the menu to abort nor some abortion hook to be run.  It is not
+    ;; possible to update highlighting before the first command invoked
+    ;; after the menu is aborted.  Here we can only make sure it is
+    ;; updated afterwards.
+    (magit-menu-highlight-point-section))
+  (setq magit-section-pre-command-region-p (region-active-p))
+  (setq magit-section-pre-command-section (magit-current-section)))
+
+(defun magit-section-post-command-hook ()
+  (let ((window (selected-window)))
+    ;; The command may have used `set-window-buffer' to change
+    ;; the window's buffer without changing the current buffer.
+    (when (eq (current-buffer) (window-buffer window))
+      (cursor-sensor-move-to-tangible window)
+      (when (or magit--context-menu-buffer
+                magit--context-menu-section)
+        (magit-menu-highlight-point-section))))
+  (unless (memq this-command '(magit-refresh magit-refresh-all))
+    (magit-section-update-highlight)))
+
+(defun magit-section-deactivate-mark ()
+  (setq magit-section-highlight-force-update t))
+
+(defun magit-section-update-highlight (&optional force)
+  (let ((section (magit-current-section)))
+    (when (or force
+              magit-section-highlight-force-update
+              (xor magit-section-pre-command-region-p (region-active-p))
+              (not (eq magit-section-pre-command-section section)))
+      (let ((inhibit-read-only t)
+            (deactivate-mark nil)
+            (selection (magit-region-sections)))
+        (mapc #'delete-overlay magit-section-highlight-overlays)
+        (setq magit-section-highlight-overlays nil)
+        (setq magit-section-unhighlight-sections
+              magit-section-highlighted-sections)
+        (setq magit-section-highlighted-sections nil)
+        (if (and (fboundp 'long-line-optimizations-p)
+                 (long-line-optimizations-p))
+            (magit-section--enable-long-lines-shortcuts)
+          (unless (eq section magit-root-section)
+            (run-hook-with-args-until-success
+             'magit-section-highlight-hook section selection))
+          (dolist (s magit-section-unhighlight-sections)
+            (run-hook-with-args-until-success
+             'magit-section-unhighlight-hook s selection)))
+        (restore-buffer-modified-p nil)))
+    (setq magit-section-highlight-force-update nil)
+    (magit-section-maybe-paint-visibility-ellipses)))
+
+(defun magit-section-highlight (section selection)
+  "Highlight SECTION and if non-nil all sections in SELECTION.
+This function works for any section but produces undesirable
+effects for diff related sections, which by default are
+highlighted using `magit-diff-highlight'.  Return t."
+  (when-let ((face (oref section heading-highlight-face)))
+    (dolist (section (or selection (list section)))
+      (magit-section-make-overlay
+       (oref section start)
+       (or (oref section content)
+           (oref section end))
+       face)))
+  (cond (selection
+         (magit-section-make-overlay (oref (car selection) start)
+                                     (oref (car (last selection)) end)
+                                     'magit-section-highlight)
+         (magit-section-highlight-selection nil selection))
+        (t
+         (magit-section-make-overlay (oref section start)
+                                     (oref section end)
+                                     'magit-section-highlight)))
+  t)
+
+(defun magit-section-highlight-selection (_ selection)
+  "Highlight the section-selection region.
+If SELECTION is non-nil, then it is a list of sections selected by
+the region.  The headings of these sections are then highlighted.
+
+This is a fallback for people who don't want to highlight the
+current section and therefore removed `magit-section-highlight'
+from `magit-section-highlight-hook'.
+
+This function is necessary to ensure that a representation of
+such a region is visible.  If neither of these functions were
+part of the hook variable, then such a region would be
+invisible."
+  (when (and selection
+             (not (and (eq this-command 'mouse-drag-region))))
+    (dolist (section selection)
+      (magit-section-make-overlay (oref section start)
+                                  (or (oref section content)
+                                      (oref section end))
+                                  'magit-section-heading-selection))
+    t))
+
+(defun magit-section-make-overlay (start end face)
+  ;; Yes, this doesn't belong here.  But the alternative of
+  ;; spreading this hack across the code base is even worse.
+  (when (and magit-section-keep-region-overlay
+             (memq face '(magit-section-heading-selection
+                          magit-diff-file-heading-selection
+                          magit-diff-hunk-heading-selection)))
+    (setq face (list :foreground (face-foreground face))))
+  (let ((ov (make-overlay start end nil t)))
+    (overlay-put ov 'font-lock-face face)
+    (overlay-put ov 'evaporate t)
+    (push ov magit-section-highlight-overlays)
+    ov))
+
+(defvar magit-show-long-lines-warning t)
+
+(defun magit-section--enable-long-lines-shortcuts ()
+  (message "Enabling long lines shortcuts in %S" (current-buffer))
+  (kill-local-variable 'redisplay-highlight-region-function)
+  (kill-local-variable 'redisplay-unhighlight-region-function)
+  (when magit-show-long-lines-warning
+    (setq magit-show-long-lines-warning nil)
+    (display-warning 'magit (format "\
+Emacs has enabled redisplay shortcuts
+in this buffer because there are lines whose length go beyond
+`long-line-threshold' \(%s characters).  As a result, section
+highlighting and the special appearance of the region has been
+disabled.  Some existing highlighting might remain in effect.
+
+These shortcuts remain enabled, even once there no longer are
+any long lines in this buffer.  To disable them again, kill
+and recreate the buffer.
+
+This message won't be shown for this session again.  To disable
+it for all future sessions, set `magit-show-long-lines-warning'
+to nil." (bound-and-true-p long-line-threshold)) :warning)))
+
+(cl-defgeneric magit-section-get-relative-position (section))
+
+(cl-defmethod magit-section-get-relative-position ((section magit-section))
+  (let ((start (oref section start))
+        (point (magit-point)))
+    (list (- (line-number-at-pos point)
+             (line-number-at-pos start))
+          (- point (line-beginning-position)))))
+
+(cl-defgeneric magit-section-goto-successor ())
+
+(cl-defmethod magit-section-goto-successor ((section magit-section)
+                                            line char &optional _arg)
+  (or (magit-section-goto-successor--same section line char)
+      (magit-section-goto-successor--related section)))
+
+(defun magit-section-goto-successor--same (section line char)
+  (let ((ident (magit-section-ident section)))
+    (and-let* ((found (magit-get-section ident)))
+      (let ((start (oref found start)))
+        (goto-char start)
+        (unless (eq found magit-root-section)
+          (ignore-errors
+            (forward-line line)
+            (forward-char char))
+          (unless (eq (magit-current-section) found)
+            (goto-char start)))
+        t))))
+
+(defun magit-section-goto-successor--related (section)
+  (and-let* ((found (magit-section-goto-successor--related-1 section)))
+    (goto-char (if (eq (oref found type) 'button)
+                   (point-min)
+                 (oref found start)))))
+
+(defun magit-section-goto-successor--related-1 (section)
+  (or (and-let* ((alt (pcase (oref section type)
+                        ('staged 'unstaged)
+                        ('unstaged 'staged)
+                        ('unpushed 'unpulled)
+                        ('unpulled 'unpushed))))
+        (magit-get-section `((,alt) (status))))
+      (and-let* ((next (car (magit-section-siblings section 'next))))
+        (magit-get-section (magit-section-ident next)))
+      (and-let* ((prev (car (magit-section-siblings section 'prev))))
+        (magit-get-section (magit-section-ident prev)))
+      (and-let* ((parent (oref section parent)))
+        (or (magit-get-section (magit-section-ident parent))
+            (magit-section-goto-successor--related-1 parent)))))
+
+;;; Region
+
+(defvar-local magit-section--region-overlays nil)
+
+(defun magit-section--delete-region-overlays ()
+  (mapc #'delete-overlay magit-section--region-overlays)
+  (setq magit-section--region-overlays nil))
+
+(defun magit-section--highlight-region (start end window rol)
+  (magit-section--delete-region-overlays)
+  (if (and (not magit-section-keep-region-overlay)
+           (or (magit-region-sections)
+               (run-hook-with-args-until-success 'magit-region-highlight-hook
+                                                 (magit-current-section)))
+           (not (= (line-number-at-pos start)
+                   (line-number-at-pos end)))
+           ;; (not (eq (car-safe last-command-event) 'mouse-movement))
+           )
+      (funcall (default-value 'redisplay-unhighlight-region-function) rol)
+    (funcall (default-value 'redisplay-highlight-region-function)
+             start end window rol)))
+
+(defun magit-section--unhighlight-region (rol)
+  (magit-section--delete-region-overlays)
+  (funcall (default-value 'redisplay-unhighlight-region-function) rol))
+
+;;; Visibility
+
+(defvar-local magit-section-visibility-cache nil)
+(put 'magit-section-visibility-cache 'permanent-local t)
+
+(defun magit-section-cached-visibility (section)
+  "Set SECTION's visibility to the cached value.
+When `magit-section-preserve-visibility' is nil, do nothing."
+  (and magit-section-preserve-visibility
+       (cdr (assoc (magit-section-ident section)
+                   magit-section-visibility-cache))))
+
+(cl-defun magit-section-cache-visibility
+    (&optional (section magit-insert-section--current))
+  (setf (compat-call alist-get
+                     (magit-section-ident section)
+                     magit-section-visibility-cache
+                     nil nil #'equal)
+        (if (oref section hidden) 'hide 'show)))
+
+(cl-defun magit-section-maybe-cache-visibility
+    (&optional (section magit-insert-section--current))
+  (when (or (eq magit-section-cache-visibility t)
+            (memq (oref section type)
+                  magit-section-cache-visibility))
+    (magit-section-cache-visibility section)))
+
+(defun magit-section-maybe-update-visibility-indicator (section)
+  (when (and magit-section-visibility-indicator
+             (magit-section-content-p section))
+    (let* ((beg (oref section start))
+           (eoh (save-excursion
+                  (goto-char beg)
+                  (line-end-position))))
+      (cond
+       ((symbolp (car-safe magit-section-visibility-indicator))
+        (let ((ov (magit--overlay-at beg 'magit-vis-indicator 'fringe)))
+          (unless ov
+            (setq ov (make-overlay beg eoh nil t))
+            (overlay-put ov 'evaporate t)
+            (overlay-put ov 'magit-vis-indicator 'fringe))
+          (overlay-put
+           ov 'before-string
+           (propertize "fringe" 'display
+                       (list 'left-fringe
+                             (if (oref section hidden)
+                                 (car magit-section-visibility-indicator)
+                               (cdr magit-section-visibility-indicator))
+                             'fringe)))))
+       ((stringp (car-safe magit-section-visibility-indicator))
+        (let ((ov (magit--overlay-at (1- eoh) 'magit-vis-indicator 'eoh)))
+          (cond ((oref section hidden)
+                 (unless ov
+                   (setq ov (make-overlay (1- eoh) eoh))
+                   (overlay-put ov 'evaporate t)
+                   (overlay-put ov 'magit-vis-indicator 'eoh))
+                 (overlay-put ov 'after-string
+                              (car magit-section-visibility-indicator)))
+                (ov
+                 (delete-overlay ov)))))))))
+
+(defvar-local magit--ellipses-sections nil)
+
+(defun magit-section-maybe-paint-visibility-ellipses ()
+  ;; This is needed because we hide the body instead of "the body
+  ;; except the final newline and additionally the newline before
+  ;; the body"; otherwise we could use `buffer-invisibility-spec'.
+  (when (stringp (car-safe magit-section-visibility-indicator))
+    (let* ((sections (append magit--ellipses-sections
+                             (setq magit--ellipses-sections
+                                   (or (magit-region-sections)
+                                       (list (magit-current-section))))))
+           (beg (--map (oref it start) sections))
+           (end (--map (oref it end)   sections)))
+      (when (region-active-p)
+        ;; This ensures that the region face is removed from ellipses
+        ;; when the region becomes inactive, but fails to ensure that
+        ;; all ellipses within the active region use the region face,
+        ;; because the respective overlay has not yet been updated at
+        ;; this time.  The magit-selection face is always applied.
+        (push (region-beginning) beg)
+        (push (region-end)       end))
+      (setq beg (apply #'min beg))
+      (setq end (apply #'max end))
+      (dolist (ov (overlays-in beg end))
+        (when (eq (overlay-get ov 'magit-vis-indicator) 'eoh)
+          (overlay-put
+           ov 'after-string
+           (propertize
+            (car magit-section-visibility-indicator) 'font-lock-face
+            (let ((pos (overlay-start ov)))
+              (delq nil (nconc (--map (overlay-get it 'font-lock-face)
+                                      (overlays-at pos))
+                               (list (get-char-property
+                                      pos 'font-lock-face))))))))))))
+
+(defun magit-section-maybe-remove-visibility-indicator (section)
+  (when (and magit-section-visibility-indicator
+             (= (oref section content)
+                (oref section end)))
+    (dolist (o (overlays-in (oref section start)
+                            (save-excursion
+                              (goto-char (oref section start))
+                              (1+ (line-end-position)))))
+      (when (overlay-get o 'magit-vis-indicator)
+        (delete-overlay o)))))
+
+(defvar-local magit-section--opened-sections nil)
+
+(defun magit-section--open-temporarily (beg end)
+  (save-excursion
+    (goto-char beg)
+    (let ((section (magit-current-section)))
+      (while section
+        (let ((content (oref section content)))
+          (if (and (magit-section-invisible-p section)
+                   (<= (or content (oref section start))
+                       beg
+                       (oref section end)))
+              (progn
+                (when content
+                  (magit-section-show section)
+                  (push section magit-section--opened-sections))
+                (setq section (oref section parent)))
+            (setq section nil))))))
+  (or (eq search-invisible t)
+      (not (isearch-range-invisible beg end))))
+
+(define-advice isearch-clean-overlays (:around (fn) magit-mode)
+  (if (derived-mode-p 'magit-mode)
+      (let ((pos (point)))
+        (dolist (section magit-section--opened-sections)
+          (unless (<= (oref section content) pos (oref section end))
+            (magit-section-hide section)))
+        (setq magit-section--opened-sections nil))
+    (funcall fn)))
+
+;;; Utilities
+
+(cl-defun magit-section-selected-p (section &optional (selection nil sselection))
+  (and (not (eq section magit-root-section))
+       (or  (eq section (magit-current-section))
+            (memq section (if sselection
+                              selection
+                            (setq selection (magit-region-sections))))
+            (and-let* ((parent (oref section parent)))
+              (magit-section-selected-p parent selection)))))
+
+(defun magit-section-parent-value (section)
+  (and-let* ((parent (oref section parent)))
+    (oref parent value)))
+
+(defun magit-section-siblings (section &optional direction)
+  "Return a list of the sibling sections of SECTION.
+
+If optional DIRECTION is `prev', then return siblings that come
+before SECTION.  If it is `next', then return siblings that come
+after SECTION.  For all other values, return all siblings
+excluding SECTION itself."
+  (and-let* ((parent (oref section parent))
+             (siblings (oref parent children)))
+    (pcase direction
+      ('prev  (cdr (member section (reverse siblings))))
+      ('next  (cdr (member section siblings)))
+      (_      (remq section siblings)))))
+
+(defun magit-region-values (&optional condition multiple)
+  "Return a list of the values of the selected sections.
+
+Return the values that themselves would be returned by
+`magit-region-sections' (which see)."
+  (--map (oref it value)
+         (magit-region-sections condition multiple)))
+
+(defun magit-region-sections (&optional condition multiple)
+  "Return a list of the selected sections.
+
+When the region is active and constitutes a valid section
+selection, then return a list of all selected sections.  This is
+the case when the region begins in the heading of a section and
+ends in the heading of the same section or in that of a sibling
+section.  If optional MULTIPLE is non-nil, then the region cannot
+begin and end in the same section.
+
+When the selection is not valid, then return nil.  In this case,
+most commands that can act on the selected sections will instead
+act on the section at point.
+
+When the region looks like it would in any other buffer then
+the selection is invalid.  When the selection is valid then the
+region uses the `magit-section-highlight' face.  This does not
+apply to diffs where things get a bit more complicated, but even
+here if the region looks like it usually does, then that's not
+a valid selection as far as this function is concerned.
+
+If optional CONDITION is non-nil, then the selection not only
+has to be valid; all selected sections additionally have to match
+CONDITION, or nil is returned.  See `magit-section-match' for the
+forms CONDITION can take."
+  (and (region-active-p)
+       (let* ((rbeg (region-beginning))
+              (rend (region-end))
+              (sbeg (magit-section-at rbeg))
+              (send (magit-section-at rend)))
+         (and send
+              (not (eq send magit-root-section))
+              (not (and multiple (eq send sbeg)))
+              (let ((siblings (cons sbeg (magit-section-siblings sbeg 'next)))
+                    (sections ()))
+                (and (memq send siblings)
+                     (magit-section-position-in-heading-p sbeg rbeg)
+                     (magit-section-position-in-heading-p send rend)
+                     (progn
+                       (while siblings
+                         (push (car siblings) sections)
+                         (when (eq (pop siblings) send)
+                           (setq siblings nil)))
+                       (setq sections (nreverse sections))
+                       (and (or (not condition)
+                                (--all-p (magit-section-match condition it)
+                                         sections))
+                            sections))))))))
+
+(defun magit-map-sections (function &optional section)
+  "Apply FUNCTION to all sections for side effects only, depth first.
+If optional SECTION is non-nil, only map over that section and
+its descendants, otherwise map over all sections in the current
+buffer, ending with `magit-root-section'."
+  (let ((section (or section magit-root-section)))
+    (mapc (lambda (child) (magit-map-sections function child))
+          (oref section children))
+    (funcall function section)))
+
+(defun magit-section-position-in-heading-p (&optional section pos)
+  "Return t if POSITION is inside the heading of SECTION.
+POSITION defaults to point and SECTION defaults to the
+current section."
+  (unless section
+    (setq section (magit-current-section)))
+  (unless pos
+    (setq pos (point)))
+  (ignore-errors ; Allow navigating broken sections.
+    (and section
+         (>= pos (oref section start))
+         (<  pos (or (oref section content)
+                     (oref section end)))
+         t)))
+
+(defun magit-section-internal-region-p (&optional section)
+  "Return t if the region is active and inside SECTION's body.
+If optional SECTION is nil, use the current section."
+  (and (region-active-p)
+       (or section (setq section (magit-current-section)))
+       (let ((beg (magit-section-at (region-beginning))))
+         (and (eq beg (magit-section-at (region-end)))
+              (eq beg section)))
+       (not (or (magit-section-position-in-heading-p section (region-beginning))
+                (magit-section-position-in-heading-p section (region-end))))
+       t))
+
+(defun magit-wash-sequence (function)
+  "Repeatedly call FUNCTION until it returns nil or eob is reached.
+FUNCTION has to move point forward or return nil."
+  (while (and (not (eobp)) (funcall function))))
+
+;;;###autoload
+(defun magit-add-section-hook (hook function &optional at append local)
+  "Add to the value of section hook HOOK the function FUNCTION.
+
+Add FUNCTION at the beginning of the hook list unless optional
+APPEND is non-nil, in which case FUNCTION is added at the end.
+If FUNCTION already is a member, then move it to the new location.
+
+If optional AT is non-nil and a member of the hook list, then
+add FUNCTION next to that instead.  Add before or after AT, or
+replace AT with FUNCTION depending on APPEND.  If APPEND is the
+symbol `replace', then replace AT with FUNCTION.  For any other
+non-nil value place FUNCTION right after AT.  If nil, then place
+FUNCTION right before AT.  If FUNCTION already is a member of the
+list but AT is not, then leave FUNCTION where ever it already is.
+
+If optional LOCAL is non-nil, then modify the hook's buffer-local
+value rather than its global value.  This makes the hook local by
+copying the default value.  That copy is then modified.
+
+HOOK should be a symbol.  If HOOK is void, it is first set to nil.
+HOOK's value must not be a single hook function.  FUNCTION should
+be a function that takes no arguments and inserts one or multiple
+sections at point, moving point forward.  FUNCTION may choose not
+to insert its section(s), when doing so would not make sense.  It
+should not be abused for other side-effects.  To remove FUNCTION
+again use `remove-hook'."
+  (unless (boundp hook)
+    (error "Cannot add function to undefined hook variable %s" hook))
+  (unless (default-boundp hook)
+    (set-default hook nil))
+  (let ((value (if local
+                   (if (local-variable-p hook)
+                       (symbol-value hook)
+                     (unless (local-variable-if-set-p hook)
+                       (make-local-variable hook))
+                     (copy-sequence (default-value hook)))
+                 (default-value hook))))
+    (if at
+        (when (setq at (member at value))
+          (setq value (delq function value))
+          (cond ((eq append 'replace)
+                 (setcar at function))
+                (append
+                 (push function (cdr at)))
+                (t
+                 (push (car at) (cdr at))
+                 (setcar at function))))
+      (setq value (delq function value)))
+    (unless (member function value)
+      (setq value (if append
+                      (append value (list function))
+                    (cons function value))))
+    (when (eq append 'replace)
+      (setq value (delq at value)))
+    (if local
+        (set hook value)
+      (set-default hook value))))
+
+(defvar-local magit-disabled-section-inserters nil)
+
+(defun magit-disable-section-inserter (fn)
+  "Disable the section inserter FN in the current repository.
+It is only intended for use in \".dir-locals.el\" and
+\".dir-locals-2.el\".  Also see info node `(magit)Per-Repository
+Configuration'."
+  (cl-pushnew fn magit-disabled-section-inserters))
+
+(put 'magit-disable-section-inserter 'safe-local-eval-function t)
+
+(defun magit-run-section-hook (hook &rest args)
+  "Run HOOK with ARGS, warning about invalid entries."
+  (let ((entries (symbol-value hook)))
+    (unless (listp entries)
+      (setq entries (list entries)))
+    (when-let ((invalid (seq-remove #'functionp entries)))
+      (message "`%s' contains entries that are no longer valid.
+%s\nUsing standard value instead.  Please re-configure hook variable."
+               hook
+               (mapconcat (lambda (sym) (format "  `%s'" sym)) invalid "\n"))
+      (sit-for 5)
+      (setq entries (eval (car (get hook 'standard-value)))))
+    (dolist (entry entries)
+      (let ((magit--current-section-hook (cons (list hook entry)
+                                               magit--current-section-hook)))
+        (unless (memq entry magit-disabled-section-inserters)
+          (if (bound-and-true-p magit-refresh-verbose)
+              (let ((time (benchmark-elapse (apply entry args))))
+                (message "  %-50s %f %s" entry time
+                         (cond ((> time 0.03) "!!")
+                               ((> time 0.01) "!")
+                               (t ""))))
+            (apply entry args)))))))
+
+(cl-defun magit--overlay-at (pos prop &optional (val nil sval) testfn)
+  (cl-find-if (lambda (o)
+                (let ((p (overlay-properties o)))
+                  (and (plist-member p prop)
+                       (or (not sval)
+                           (funcall (or testfn #'eql)
+                                    (plist-get p prop)
+                                    val)))))
+              (overlays-at pos t)))
+
+(defun magit-face-property-all (face string)
+  "Return non-nil if FACE is present in all of STRING."
+  (catch 'missing
+    (let ((pos 0))
+      (while (setq pos (next-single-property-change pos 'font-lock-face string))
+        (let ((val (get-text-property pos 'font-lock-face string)))
+          (unless (if (consp val)
+                      (memq face val)
+                    (eq face val))
+            (throw 'missing nil))))
+      (not pos))))
+
+(defun magit--add-face-text-property (beg end face &optional append object)
+  "Like `add-face-text-property' but for `font-lock-face'."
+  (when (stringp object)
+    (unless beg (setq beg 0))
+    (unless end (setq end (length object))))
+  (while (< beg end)
+    (let* ((pos (next-single-property-change beg 'font-lock-face object end))
+           (val (get-text-property beg 'font-lock-face object))
+           (val (ensure-list val)))
+      (put-text-property beg pos 'font-lock-face
+                         (if append
+                             (append val (list face))
+                           (cons face val))
+                         object)
+      (setq beg pos)))
+  object)
+
+(defun magit--propertize-face (string face)
+  (propertize string 'face face 'font-lock-face face))
+
+(defun magit--put-face (beg end face string)
+  (put-text-property beg end 'face face string)
+  (put-text-property beg end 'font-lock-face face string))
+
+;;; Imenu Support
+
+(defvar-local magit--imenu-group-types nil)
+(defvar-local magit--imenu-item-types nil)
+
+(defun magit--imenu-create-index ()
+  ;; If `which-function-mode' is active, then the create-index
+  ;; function is called at the time the major-mode is being enabled.
+  ;; Modes that derive from `magit-mode' have not populated the buffer
+  ;; at that time yet, so we have to abort.
+  (and magit-root-section
+       (or magit--imenu-group-types
+           magit--imenu-item-types)
+       (let ((index
+              (cl-mapcan
+               (lambda (section)
+                 (cond
+                  (magit--imenu-group-types
+                   (and (if (eq (car-safe magit--imenu-group-types) 'not)
+                            (not (magit-section-match
+                                  (cdr magit--imenu-group-types)
+                                  section))
+                          (magit-section-match magit--imenu-group-types section))
+                        (and-let* ((children (oref section children)))
+                          `((,(magit--imenu-index-name section)
+                             ,@(mapcar (lambda (s)
+                                         (cons (magit--imenu-index-name s)
+                                               (oref s start)))
+                                       children))))))
+                  (magit--imenu-item-types
+                   (and (magit-section-match magit--imenu-item-types section)
+                        `((,(magit--imenu-index-name section)
+                           . ,(oref section start)))))))
+               (oref magit-root-section children))))
+         (if (and magit--imenu-group-types (symbolp magit--imenu-group-types))
+             (cdar index)
+           index))))
+
+(defun magit--imenu-index-name (section)
+  (let ((heading (buffer-substring-no-properties
+                  (oref section start)
+                  (1- (or (oref section content)
+                          (oref section end))))))
+    (save-match-data
+      (cond
+       ((and (magit-section-match [commit logbuf] section)
+             (string-match "[^ ]+\\([ *|]*\\).+" heading))
+        (replace-match " " t t heading 1))
+       ((magit-section-match
+         '([branch local branchbuf] [tag tags branchbuf]) section)
+        (oref section value))
+       ((magit-section-match [branch remote branchbuf] section)
+        (concat (oref (oref section parent) value) "/"
+                (oref section value)))
+       ((string-match " ([0-9]+)\\'" heading)
+        (substring heading 0 (match-beginning 0)))
+       (t heading)))))
+
+(defun magit--imenu-goto-function (_name position &rest _rest)
+  "Go to the section at POSITION.
+Make sure it is visible, by showing its ancestors where
+necessary.  For use as `imenu-default-goto-function' in
+`magit-mode' buffers."
+  (goto-char position)
+  (let ((section (magit-current-section)))
+    (while (setq section (oref section parent))
+      (when (oref section hidden)
+        (magit-section-show section)))))
+
+;;; Bookmark support
+
+(declare-function bookmark-get-filename "bookmark" (bookmark-name-or-record))
+(declare-function bookmark-make-record-default "bookmark"
+                  (&optional no-file no-context posn))
+(declare-function bookmark-prop-get "bookmark" (bookmark-name-or-record prop))
+(declare-function bookmark-prop-set "bookmark" (bookmark-name-or-record prop val))
+
+(cl-defgeneric magit-bookmark-get-filename ()
+  (or (buffer-file-name) (buffer-name)))
+
+(cl-defgeneric magit-bookmark--get-child-value (section)
+  (oref section value))
+
+(cl-defgeneric magit-bookmark-get-buffer-create (bookmark mode))
+
+(defun magit--make-bookmark ()
+  "Create a bookmark for the current Magit buffer.
+Input values are the major-mode's `magit-bookmark-name' method,
+and the buffer-local values of the variables referenced in its
+`magit-bookmark-variables' property."
+  (require 'bookmark)
+  (if (plist-member (symbol-plist major-mode) 'magit-bookmark-variables)
+      ;; `bookmark-make-record-default's return value does not match
+      ;; (NAME . ALIST), even though it is used as the default value
+      ;; of `bookmark-make-record-function', which states that such
+      ;; functions must do that.  See #4356.
+      (let ((bookmark (cons nil (bookmark-make-record-default 'no-file))))
+        (bookmark-prop-set bookmark 'handler  #'magit--handle-bookmark)
+        (bookmark-prop-set bookmark 'mode     major-mode)
+        (bookmark-prop-set bookmark 'filename (magit-bookmark-get-filename))
+        (bookmark-prop-set bookmark 'defaults (list (magit-bookmark-name)))
+        (dolist (var (get major-mode 'magit-bookmark-variables))
+          (bookmark-prop-set bookmark var (symbol-value var)))
+        (bookmark-prop-set
+         bookmark 'magit-hidden-sections
+         (--keep (and (oref it hidden)
+                      (cons (oref it type)
+                            (magit-bookmark--get-child-value it)))
+                 (oref magit-root-section children)))
+        bookmark)
+    (user-error "Bookmarking is not implemented for %s buffers" major-mode)))
+
+;;;###autoload
+(defun magit--handle-bookmark (bookmark)
+  "Open a bookmark created by `magit--make-bookmark'.
+
+Call the generic function `magit-bookmark-get-buffer-create' to get
+the appropriate buffer without displaying it.
+
+Then call the `magit-*-setup-buffer' function of the the major-mode
+with the variables' values as arguments, which were recorded by
+`magit--make-bookmark'."
+  (require (quote magit-bookmark) nil t)
+  (let ((buffer (magit-bookmark-get-buffer-create
+                 bookmark
+                 (bookmark-prop-get bookmark 'mode))))
+    (set-buffer buffer) ; That is the interface we have to adhere to.
+    (when-let ((hidden (bookmark-prop-get bookmark 'magit-hidden-sections)))
+      (with-current-buffer buffer
+        (dolist (child (oref magit-root-section children))
+          (if (member (cons (oref child type)
+                            (oref child value))
+                      hidden)
+              (magit-section-hide child)
+            (magit-section-show child)))))
+    ;; Compatibility with `bookmark+' package.  See #4356.
+    (when (bound-and-true-p bmkp-jump-display-function)
+      (funcall bmkp-jump-display-function (current-buffer)))
+    nil))
+
+(put 'magit--handle-bookmark 'bookmark-handler-type "Magit")
+
+(cl-defgeneric magit-bookmark-name ()
+  "Return name for bookmark to current buffer."
+  (format "%s%s"
+          (substring (symbol-name major-mode) 0 -5)
+          (if-let ((vars (get major-mode 'magit-bookmark-variables)))
+              (cl-mapcan (lambda (var)
+                           (let ((val (symbol-value var)))
+                             (if (and val (atom val))
+                                 (list val)
+                               val)))
+                         vars)
+            "")))
+
+;;; Bitmaps
+
+(when (fboundp 'define-fringe-bitmap) ;for Emacs 26
+  (define-fringe-bitmap 'magit-fringe-bitmap+
+    [#b00000000
+     #b00011000
+     #b00011000
+     #b01111110
+     #b01111110
+     #b00011000
+     #b00011000
+     #b00000000])
+
+  (define-fringe-bitmap 'magit-fringe-bitmap-
+    [#b00000000
+     #b00000000
+     #b00000000
+     #b01111110
+     #b01111110
+     #b00000000
+     #b00000000
+     #b00000000])
+
+  (define-fringe-bitmap 'magit-fringe-bitmap>
+    [#b01100000
+     #b00110000
+     #b00011000
+     #b00001100
+     #b00011000
+     #b00110000
+     #b01100000
+     #b00000000])
+
+  (define-fringe-bitmap 'magit-fringe-bitmapv
+    [#b00000000
+     #b10000010
+     #b11000110
+     #b01101100
+     #b00111000
+     #b00010000
+     #b00000000
+     #b00000000])
+
+  (define-fringe-bitmap 'magit-fringe-bitmap-bold>
+    [#b11100000
+     #b01110000
+     #b00111000
+     #b00011100
+     #b00011100
+     #b00111000
+     #b01110000
+     #b11100000])
+
+  (define-fringe-bitmap 'magit-fringe-bitmap-boldv
+    [#b10000001
+     #b11000011
+     #b11100111
+     #b01111110
+     #b00111100
+     #b00011000
+     #b00000000
+     #b00000000])
+  )
+
+;;; _
+(provide 'magit-section)
+;;; magit-section.el ends here
diff --git a/emacs/elpa/magit-section-20241001.2052/magit-section.elc b/emacs/elpa/magit-section-20241001.2052/magit-section.elc
Binary files differ.
diff --git a/emacs/elpa/magit-section-20241001.2052/magit-section.info b/emacs/elpa/magit-section-20241001.2052/magit-section.info
@@ -0,0 +1,317 @@
+This is magit-section.info, produced by makeinfo version 6.8 from
+magit-section.texi.
+
+     Copyright (C) 2015-2024 Jonas Bernoulli
+     <emacs.magit@jonas.bernoulli.dev>
+
+     You can redistribute this document and/or modify it under the terms
+     of the GNU General Public License as published by the Free Software
+     Foundation, either version 3 of the License, or (at your option)
+     any later version.
+
+     This document is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+
+INFO-DIR-SECTION Emacs
+START-INFO-DIR-ENTRY
+* Magit-Section: (magit-section). Use Magit sections in your own packages.
+END-INFO-DIR-ENTRY
+
+
+File: magit-section.info,  Node: Top,  Next: Introduction,  Up: (dir)
+
+Magit-Section Developer Manual
+******************************
+
+This package implements the main user interface of Magit — the
+collapsible sections that make up its buffers.  This package used to be
+distributed as part of Magit but how it can also be used by other
+packages that have nothing to do with Magit or Git.
+
+   To learn more about the section abstraction and available commands
+and user options see *note (magit)Sections::.  This manual documents how
+you can use sections in your own packages.
+
+This manual is for Magit-Section version 4.1.1.
+
+     Copyright (C) 2015-2024 Jonas Bernoulli
+     <emacs.magit@jonas.bernoulli.dev>
+
+     You can redistribute this document and/or modify it under the terms
+     of the GNU General Public License as published by the Free Software
+     Foundation, either version 3 of the License, or (at your option)
+     any later version.
+
+     This document is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+
+* Menu:
+
+* Introduction::
+* Creating Sections::
+* Core Functions::
+* Matching Functions::
+
+
+File: magit-section.info,  Node: Introduction,  Next: Creating Sections,  Prev: Top,  Up: Top
+
+1 Introduction
+**************
+
+This package implements the main user interface of Magit — the
+collapsible sections that make up its buffers.  This package used to be
+distributed as part of Magit but how it can also be used by other
+packages that have nothing to do with Magit or Git.
+
+   To learn more about the section abstraction and available commands
+and user options see *note (magit)Sections::.  This manual documents how
+you can use sections in your own packages.
+
+   When the documentation leaves something unaddressed, then please
+consider that Magit uses this library extensively and search its source
+for suitable examples before asking me for help.  Thanks!
+
+
+File: magit-section.info,  Node: Creating Sections,  Next: Core Functions,  Prev: Introduction,  Up: Top
+
+2 Creating Sections
+*******************
+
+ -- Macro: magit-insert-section [name] (type &optional value hide) &rest
+          body
+     Create a section object of type CLASS, storing VALUE in its ‘value’
+     slot, and insert the section at point.  CLASS is a subclass of
+     ‘magit-section’ or has the form ‘(eval FORM)’, in which case FORM
+     is evaluated at runtime and should return a subclass.  In other
+     places a sections class is often referred to as its "type".
+
+     Many commands behave differently depending on the class of the
+     current section and sections of a certain class can have their own
+     keymap, which is specified using the ‘keymap’ class slot.  The
+     value of that slot should be a variable whose value is a keymap.
+
+     For historic reasons Magit and Forge in most cases use symbols as
+     CLASS that don’t actually identify a class and that lack the
+     appropriate package prefix.  This works due to some undocumented
+     kludges, which are not available to other packages.
+
+     When optional HIDE is non-nil collapse the section body by default,
+     i.e., when first creating the section, but not when refreshing the
+     buffer.  Else expand it by default.  This can be overwritten using
+     ‘magit-section-set-visibility-hook’.  When a section is recreated
+     during a refresh, then the visibility of predecessor is inherited
+     and HIDE is ignored (but the hook is still honored).
+
+     BODY is any number of forms that actually insert the section’s
+     heading and body.  Optional NAME, if specified, has to be a symbol,
+     which is then bound to the object of the section being inserted.
+
+     Before BODY is evaluated the ‘start’ of the section object is set
+     to the value of ‘point’ and after BODY was evaluated its ‘end’ is
+     set to the new value of ‘point’; BODY is responsible for moving
+     ‘point’ forward.
+
+     If it turns out inside BODY that the section is empty, then
+     ‘magit-cancel-section’ can be used to abort and remove all traces
+     of the partially inserted section.  This can happen when creating a
+     section by washing Git’s output and Git didn’t actually output
+     anything this time around.
+
+ -- Function: magit-insert-heading [child-count] &rest args
+     Insert the heading for the section currently being inserted.
+
+     This function should only be used inside ‘magit-insert-section’.
+
+     When called without any arguments, then just set the ‘content’ slot
+     of the object representing the section being inserted to a marker
+     at ‘point’.  The section should only contain a single line when
+     this function is used like this.
+
+     When called with arguments ARGS, which have to be strings, or nil,
+     then insert those strings at point.  The section should not contain
+     any text before this happens and afterwards it should again only
+     contain a single line.  If the ‘face’ property is set anywhere
+     inside any of these strings, then insert all of them unchanged.
+     Otherwise use the ‘magit-section-heading’ face for all inserted
+     text.
+
+     The ‘content’ property of the section object is the end of the
+     heading (which lasts from ‘start’ to ‘content’) and the beginning
+     of the the body (which lasts from ‘content’ to ‘end’).  If the
+     value of ‘content’ is nil, then the section has no heading and its
+     body cannot be collapsed.  If a section does have a heading, then
+     its height must be exactly one line, including a trailing newline
+     character.  This isn’t enforced, you are responsible for getting it
+     right.  The only exception is that this function does insert a
+     newline character if necessary.
+
+     If provided, optional CHILD-COUNT must evaluate to an integer or
+     boolean.  If t, then the count is determined once the children have
+     been inserted, using ‘magit-insert-child-count’ (which see).  For
+     historic reasons, if the heading ends with ":", the count is
+     substituted for that, at this time as well.  If
+     ‘magit-section-show-child-count’ is nil, no counts are inserted
+
+ -- Macro: magit-insert-section-body &rest body
+     Use BODY to insert the section body, once the section is expanded.
+     If the section is expanded when it is created, then this is like
+     ‘progn’.  Otherwise BODY isn’t evaluated until the section is
+     explicitly expanded.
+
+ -- Function: magit-cancel-section
+     Cancel inserting the section that is currently being inserted.
+     Remove all traces of that section.
+
+ -- Function: magit-wash-sequence function
+     Repeatedly call FUNCTION until it returns ‘nil’ or the end of the
+     buffer is reached.  FUNCTION has to move point forward or return
+     ‘nil’.
+
+
+File: magit-section.info,  Node: Core Functions,  Next: Matching Functions,  Prev: Creating Sections,  Up: Top
+
+3 Core Functions
+****************
+
+ -- Function: magit-current-section
+     Return the section at point or where the context menu was invoked.
+     When using the context menu, return the section that the user
+     clicked on, provided the current buffer is the buffer in which the
+     click occurred.  Otherwise return the section at point.
+
+Function magit-section-at &optional position
+     Return the section at POSITION, defaulting to point.  Default to
+     point even when the context menu is used.
+
+ -- Function: magit-section-ident section
+     Return an unique identifier for SECTION.  The return value has the
+     form ‘((TYPE . VALUE)...)’.
+
+ -- Function: magit-section-ident-value value
+     Return a constant representation of VALUE.
+
+     VALUE is the value of a ‘magit-section’ object.  If that is an
+     object itself, then that is not suitable to be used to identify the
+     section because two objects may represent the same thing but not be
+     equal.  If possible a method should be added for such objects,
+     which returns a value that is equal.  Otherwise the catch-all
+     method is used, which just returns the argument itself.
+
+ -- Function: magit-get-section ident &optional root
+     Return the section identified by IDENT.  IDENT has to be a list as
+     returned by ‘magit-section-ident’.  If optional ROOT is non-nil,
+     then search in that section tree instead of in the one whose root
+     ‘magit-root-section’ is.
+
+ -- Function: magit-section-lineage section &optional raw
+     Return the lineage of SECTION.  If optional RAW is non-nil, return
+     a list of section objects, beginning with SECTION, otherwise return
+     a list of section types.
+
+ -- Function: magit-section-content-p section
+     Return non-nil if SECTION has content or an unused washer function.
+
+   The next two functions are replacements for the Emacs functions that
+have the same name except for the ‘magit-’ prefix.  Like
+‘magit-current-section’ they do not act on point, the cursors position,
+but on the position where the user clicked to invoke the context menu.
+
+   If your package provides a context menu and some of its commands act
+on the "thing at point", even if just as a default, then use the
+prefixed functions to teach them to instead use the click location when
+appropriate.
+
+Function magit-point
+     Return point or the position where the context menu was invoked.
+     When using the context menu, return the position the user clicked
+     on, provided the current buffer is the buffer in which the click
+     occurred.  Otherwise return the same value as ‘point’.
+
+Function magit-thing-at-point thing &optional no-properties
+     Return the THING at point or where the context menu was invoked.
+     When using the context menu, return the thing the user clicked on,
+     provided the current buffer is the buffer in which the click
+     occurred.  Otherwise return the same value as ‘thing-at-point’.
+     For the meaning of THING and NO-PROPERTIES see that function.
+
+
+File: magit-section.info,  Node: Matching Functions,  Prev: Core Functions,  Up: Top
+
+4 Matching Functions
+********************
+
+ -- Function: magit-section-match condition &optional (section
+          (magit-current-section))
+     Return t if SECTION matches CONDITION.
+
+     SECTION defaults to the section at point.  If SECTION is not
+     specified and there also is no section at point, then return nil.
+
+     CONDITION can take the following forms:
+
+        • ‘(CONDITION...)’ matches if any of the CONDITIONs matches.
+        • ‘[CLASS...]’ matches if the section’s class is the same as the
+          first CLASS or a subclass of that; the section’s parent class
+          matches the second CLASS; and so on.
+
+        • ‘[* CLASS...]’ matches sections that match [CLASS...] and also
+          recursively all their child sections.
+        • ‘CLASS’ matches if the section’s class is the same as CLASS or
+          a subclass of that; regardless of the classes of the parent
+          sections.
+
+     Each CLASS should be a class symbol, identifying a class that
+     derives from ‘magit-section’.  For backward compatibility CLASS can
+     also be a "type symbol".  A section matches such a symbol if the
+     value of its ‘type’ slot is ‘eq’.  If a type symbol has an entry in
+     ‘magit--section-type-alist’, then a section also matches that type
+     if its class is a subclass of the class that corresponds to the
+     type as per that alist.
+
+     Note that it is not necessary to specify the complete section
+     lineage as printed by ‘magit-describe-section-briefly’, unless of
+     course you want to be that precise.
+
+ -- Function: magit-section-value-if condition &optional section
+     If the section at point matches CONDITION, then return its value.
+
+     If optional SECTION is non-nil then test whether that matches
+     instead.  If there is no section at point and SECTION is nil, then
+     return nil.  If the section does not match, then return nil.
+
+     See ‘magit-section-match’ for the forms CONDITION can take.
+
+ -- Macro: magit-section-case &rest clauses
+     Choose among clauses on the type of the section at point.
+
+     Each clause looks like ‘(CONDITION BODY...)’.  The type of the
+     section is compared against each CONDITION; the BODY forms of the
+     first match are evaluated sequentially and the value of the last
+     form is returned.  Inside BODY the symbol ‘it’ is bound to the
+     section at point.  If no clause succeeds or if there is no section
+     at point, return nil.
+
+     See ‘magit-section-match’ for the forms CONDITION can take.
+     Additionally a CONDITION of t is allowed in the final clause, and
+     matches if no other CONDITION match, even if there is no section at
+     point.
+
+
+
+Tag Table:
+Node: Top808
+Node: Introduction2109
+Node: Creating Sections2879
+Node: Core Functions7812
+Node: Matching Functions10964
+
+End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
diff --git a/emacs/elpa/transient-20240929.1847/transient-pkg.el b/emacs/elpa/transient-20240929.1847/transient-pkg.el
@@ -1,12 +0,0 @@
-;; -*- no-byte-compile: t; lexical-binding: nil -*-
-(define-package "transient" "20240929.1847"
-  "Transient commands."
-  '((emacs  "26.1")
-    (compat "30.0.0.0")
-    (seq    "2.24"))
-  :url "https://github.com/magit/transient"
-  :commit "5fcd713873001724c8b21d3689c77cb7a6dc9cd7"
-  :revdesc "5fcd71387300"
-  :keywords '("extensions")
-  :authors '(("Jonas Bernoulli" . "emacs.transient@jonas.bernoulli.dev"))
-  :maintainers '(("Jonas Bernoulli" . "emacs.transient@jonas.bernoulli.dev")))
diff --git a/emacs/elpa/transient-20240929.1847/transient.el b/emacs/elpa/transient-20240929.1847/transient.el
@@ -1,4599 +0,0 @@
-;;; transient.el --- Transient commands  -*- lexical-binding:t -*-
-
-;; Copyright (C) 2018-2024 Free Software Foundation, Inc.
-
-;; Author: Jonas Bernoulli <emacs.transient@jonas.bernoulli.dev>
-;; Homepage: https://github.com/magit/transient
-;; Keywords: extensions
-
-;; Package-Version: 20240929.1847
-;; Package-Revision: 5fcd71387300
-;; Package-Requires: ((emacs "26.1") (compat "30.0.0.0") (seq "2.24"))
-
-;; SPDX-License-Identifier: GPL-3.0-or-later
-
-;; This file is part of GNU Emacs.
-
-;; GNU Emacs is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published
-;; by the Free Software Foundation, either version 3 of the License,
-;; or (at your option) any later version.
-;;
-;; GNU Emacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-;;
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; Transient is the library used to implement the keyboard-driven menus
-;; in Magit.  It is distributed as a separate package, so that it can be
-;; used to implement similar menus in other packages.
-
-;;; Code:
-
-(require 'cl-lib)
-(require 'compat)
-(require 'eieio)
-(require 'edmacro)
-(require 'format-spec)
-
-(eval-and-compile
-  (when (and (featurep 'seq)
-             (not (fboundp 'seq-keep)))
-    (unload-feature 'seq 'force)))
-(require 'seq)
-(unless (fboundp 'seq-keep)
-  (display-warning 'transient (substitute-command-keys "\
-Transient requires `seq' >= 2.24,
-but due to bad defaults, Emacs's package manager, refuses to
-upgrade this and other built-in packages to higher releases
-from GNU Elpa, when a package specifies that this is needed.
-
-To fix this, you have to add this to your init file:
-
-  (setq package-install-upgrade-built-in t)
-
-Then evaluate that expression by placing the cursor after it
-and typing \\[eval-last-sexp].
-
-Once you have done that, you have to explicitly upgrade `seq':
-
-  \\[package-upgrade] seq \\`RET'
-
-Then you also must make sure the updated version is loaded,
-by evaluating this form:
-
-  (progn (unload-feature 'seq t) (require 'seq))
-
-Until you do this, you will get random errors about `seq-keep'
-being undefined while using Transient.
-
-If you don't use the `package' package manager but still get
-this warning, then your chosen package manager likely has a
-similar defect.") :emergency))
-
-(eval-when-compile (require 'subr-x))
-
-(declare-function info "info" (&optional file-or-node buffer))
-(declare-function Man-find-section "man" (section))
-(declare-function Man-next-section "man" (n))
-(declare-function Man-getpage-in-background "man" (topic))
-
-(defvar Man-notify-method)
-(defvar pp-default-function) ; since Emacs 29.1
-
-(defmacro transient--with-emergency-exit (id &rest body)
-  (declare (indent defun))
-  (unless (keywordp id)
-    (setq body (cons id body))
-    (setq id nil))
-  `(condition-case err
-       (let ((debugger #'transient--exit-and-debug))
-         ,(macroexp-progn body))
-     ((debug error)
-      (transient--emergency-exit ,id)
-      (signal (car err) (cdr err)))))
-
-(defun transient--exit-and-debug (&rest args)
-  (transient--emergency-exit :debugger)
-  (apply #'debug args))
-
-;;; Options
-
-(defgroup transient nil
-  "Transient commands."
-  :group 'extensions)
-
-(defcustom transient-show-popup t
-  "Whether to show the current transient in a popup buffer.
-\\<transient-map>
-- If t, then show the popup as soon as a transient prefix command
-  is invoked.
-
-- If nil, then do not show the popup unless the user explicitly
-  requests it, by pressing \\[transient-show] or a prefix key.
-
-- If a number, then delay displaying the popup and instead show
-  a brief one-line summary.  If zero or negative, then suppress
-  even showing that summary and display the pressed key only.
-
-  Show the popup when the user explicitly requests it by pressing
-  \\[transient-show] or a prefix key.  Unless zero, then also show the popup
-  after that many seconds of inactivity (using the absolute value)."
-  :package-version '(transient . "0.1.0")
-  :group 'transient
-  :type '(choice (const  :tag "instantly" t)
-                 (const  :tag "on demand" nil)
-                 (const  :tag "on demand (no summary)" 0)
-                 (number :tag "after delay" 1)))
-
-(defcustom transient-enable-popup-navigation t
-  "Whether navigation commands are enabled in the transient popup.
-
-While a transient is active the transient popup buffer is not the
-current buffer, making it necessary to use dedicated commands to
-act on that buffer itself.  If this is non-nil, then the following
-bindings are available:
-
-\\<transient-popup-navigation-map>\
-- \\[transient-backward-button] moves the cursor to the previous suffix.
-- \\[transient-forward-button] moves the cursor to the next suffix.
-- \\[transient-push-button] invokes the suffix the cursor is on.
-\\<transient-button-map>\
-- \\`<mouse-1>' and \\`<mouse-2>' invoke the clicked on suffix.
-\\<transient-popup-navigation-map>\
-- \\[transient-isearch-backward]\
- and \\[transient-isearch-forward] start isearch in the popup buffer.
-
-\\`<mouse-1>' and \\`<mouse-2>' are bound in `transient-push-button'.
-All other bindings are in `transient-popup-navigation-map'.
-
-By default \\`M-RET' is bound to `transient-push-button', instead of
-\\`RET', because if a transient allows the invocation of non-suffixes
-then it is likely that you would want \\`RET' to do what it would do
-if no transient were active."
-  :package-version '(transient . "0.4.0")
-  :group 'transient
-  :type 'boolean)
-
-(defcustom transient-display-buffer-action
-  '(display-buffer-in-side-window
-    (side . bottom)
-    (dedicated . t)
-    (inhibit-same-window . t))
-  "The action used to display the transient popup buffer.
-
-The transient popup buffer is displayed in a window using
-
-  (display-buffer BUFFER transient-display-buffer-action)
-
-The value of this option has the form (FUNCTION . ALIST),
-where FUNCTION is a function or a list of functions.  Each such
-function should accept two arguments: a buffer to display and an
-alist of the same form as ALIST.  See info node `(elisp)Choosing
-Window' for details.
-
-The default is:
-
-  (display-buffer-in-side-window
-    (side . bottom)
-    (dedicated . t)
-    (inhibit-same-window . t))
-
-This displays the window at the bottom of the selected frame.
-Another useful FUNCTION is `display-buffer-below-selected', which
-is what `magit-popup' used by default.  For more alternatives see
-info node `(elisp)Display Action Functions' and info node
-`(elisp)Buffer Display Action Alists'.
-
-Note that the buffer that was current before the transient buffer
-is shown should remain the current buffer.  Many suffix commands
-act on the thing at point, if appropriate, and if the transient
-buffer became the current buffer, then that would change what is
-at point.  To that effect `inhibit-same-window' ensures that the
-selected window is not used to show the transient buffer.
-
-It may be possible to display the window in another frame, but
-whether that works in practice depends on the window-manager.
-If the window manager selects the new window (Emacs frame),
-then that unfortunately changes which buffer is current.
-
-If you change the value of this option, then you might also
-want to change the value of `transient-mode-line-format'."
-  :package-version '(transient . "0.7.5")
-  :group 'transient
-  :type '(cons (choice function (repeat :tag "Functions" function))
-               alist))
-
-(defcustom transient-mode-line-format 'line
-  "The mode-line format for the transient popup buffer.
-
-If nil, then the buffer has no mode-line.  If the buffer is not
-displayed right above the echo area, then this probably is not
-a good value.
-
-If `line' (the default) or a natural number, then the buffer
-has no mode-line, but a line is drawn is drawn in its place.
-If a number is used, that specifies the thickness of the line.
-On termcap frames we cannot draw lines, so there `line' and
-numbers are synonyms for nil.
-
-The color of the line is used to indicate if non-suffixes are
-allowed and whether they exit the transient.  The foreground
-color of `transient-key-noop' (if non-suffix are disallowed),
-`transient-key-stay' (if allowed and transient stays active), or
-`transient-key-exit' (if allowed and they exit the transient) is
-used to draw the line.
-
-Otherwise this can be any mode-line format.
-See `mode-line-format' for details."
-  :package-version '(transient . "0.2.0")
-  :group 'transient
-  :type '(choice (const  :tag "hide mode-line" nil)
-                 (const  :tag "substitute thin line" line)
-                 (number :tag "substitute line with thickness")
-                 (const  :tag "name of prefix command"
-                         ("%e" mode-line-front-space
-                          mode-line-buffer-identification))
-                 (sexp   :tag "custom mode-line format")))
-
-(defcustom transient-show-common-commands nil
-  "Whether to show common transient suffixes in the popup buffer.
-
-These commands are always shown after typing the prefix key
-\"C-x\" when a transient command is active.  To toggle the value
-of this variable use \"C-x t\" when a transient is active."
-  :package-version '(transient . "0.1.0")
-  :group 'transient
-  :type 'boolean)
-
-(defcustom transient-read-with-initial-input nil
-  "Whether to use the last history element as initial minibuffer input."
-  :package-version '(transient . "0.2.0")
-  :group 'transient
-  :type 'boolean)
-
-(defcustom transient-highlight-mismatched-keys nil
-  "Whether to highlight keys that do not match their argument.
-
-This only affects infix arguments that represent command-line
-arguments.  When this option is non-nil, then the key binding
-for infix argument are highlighted when only a long argument
-\(e.g., \"--verbose\") is specified but no shorthand (e.g., \"-v\").
-In the rare case that a short-hand is specified but does not
-match the key binding, then it is highlighted differently.
-
-The highlighting is done using `transient-mismatched-key'
-and `transient-nonstandard-key'."
-  :package-version '(transient . "0.1.0")
-  :group 'transient
-  :type 'boolean)
-
-(defcustom transient-highlight-higher-levels nil
-  "Whether to highlight suffixes on higher levels.
-
-This is primarily intended for package authors.
-
-When non-nil then highlight the description of suffixes whose
-level is above 4, the default of `transient-default-level'.
-Assuming you have set that variable to 7, this highlights all
-suffixes that won't be available to users without them making
-the same customization."
-  :package-version '(transient . "0.3.6")
-  :group 'transient
-  :type 'boolean)
-
-(defcustom transient-substitute-key-function nil
-  "Function used to modify key bindings.
-
-This function is called with one argument, the prefix object,
-and must return a key binding description, either the existing
-key description it finds in the `key' slot, or a substitution.
-
-This is intended to let users replace certain prefix keys.  It
-could also be used to make other substitutions, but that is
-discouraged.
-
-For example, \"=\" is hard to reach using my custom keyboard
-layout, so I substitute \"(\" for that, which is easy to reach
-using a layout optimized for Lisp.
-
-  (setq transient-substitute-key-function
-        (lambda (obj)
-          (let ((key (oref obj key)))
-            (if (string-match \"\\\\`\\\\(=\\\\)[a-zA-Z]\" key)
-                (replace-match \"(\" t t key 1)
-              key)))))"
-  :package-version '(transient . "0.1.0")
-  :group 'transient
-  :type '(choice (const :tag "Transform no keys (nil)" nil) function))
-
-(defcustom transient-semantic-coloring t
-  "Whether to use colors to indicate transient behavior.
-
-If non-nil, then the key binding of each suffix is colorized to
-indicate whether it exits the transient state or not, and the
-line that is drawn below the transient popup buffer is used to
-indicate the behavior of non-suffix commands."
-  :package-version '(transient . "0.5.0")
-  :group 'transient
-  :type 'boolean)
-
-(defcustom transient-detect-key-conflicts nil
-  "Whether to detect key binding conflicts.
-
-Conflicts are detected when a transient prefix command is invoked
-and results in an error, which prevents the transient from being
-used."
-  :package-version '(transient . "0.1.0")
-  :group 'transient
-  :type 'boolean)
-
-(defcustom transient-align-variable-pitch nil
-  "Whether to align columns pixel-wise in the popup buffer.
-
-If this is non-nil, then columns are aligned pixel-wise to
-support variable-pitch fonts.  Keys are not aligned, so you
-should use a fixed-pitch font for the `transient-key' face.
-Other key faces inherit from that face unless a theme is
-used that breaks that relationship.
-
-This option is intended for users who use a variable-pitch
-font for the `default' face.
-
-Also see `transient-force-fixed-pitch'."
-  :package-version '(transient . "0.4.0")
-  :group 'transient
-  :type 'boolean)
-
-(defcustom transient-force-fixed-pitch nil
-  "Whether to force use of monospaced font in the popup buffer.
-
-Even if you use a proportional font for the `default' face,
-you might still want to use a monospaced font in transient's
-popup buffer.  Setting this option to t causes `default' to
-be remapped to `fixed-pitch' in that buffer.
-
-Also see `transient-align-variable-pitch'."
-  :package-version '(transient . "0.2.0")
-  :group 'transient
-  :type 'boolean)
-
-(defcustom transient-force-single-column nil
-  "Whether to force use of a single column to display suffixes.
-
-This might be useful for users with low vision who use large
-text and might otherwise have to scroll in two dimensions."
-  :package-version '(transient . "0.3.6")
-  :group 'transient
-  :type 'boolean)
-
-(defcustom transient-hide-during-minibuffer-read nil
-  "Whether to hide the transient buffer while reading in the minibuffer."
-  :package-version '(transient . "0.4.0")
-  :group 'transient
-  :type 'boolean)
-
-(defconst transient--max-level 7)
-(defconst transient--default-child-level 1)
-(defconst transient--default-prefix-level 4)
-
-(defcustom transient-default-level transient--default-prefix-level
-  "Control what suffix levels are made available by default.
-
-Each suffix command is placed on a level and each prefix command
-has a level, which controls which suffix commands are available.
-Integers between 1 and 7 (inclusive) are valid levels.
-
-The levels of individual transients and/or their individual
-suffixes can be changed individually, by invoking the prefix and
-then pressing \"C-x l\".
-
-The default level for both transients and their suffixes is 4.
-This option only controls the default for transients.  The default
-suffix level is always 4.  The author of a transient should place
-certain suffixes on a higher level if they expect that it won't be
-of use to most users, and they should place very important suffixes
-on a lower level so that they remain available even if the user
-lowers the transient level.
-
-\(Magit currently places nearly all suffixes on level 4 and lower
-levels are not used at all yet.  So for the time being you should
-not set a lower level here and using a higher level might not
-give you as many additional suffixes as you hoped.)"
-  :package-version '(transient . "0.1.0")
-  :group 'transient
-  :type '(choice (const :tag "1 - fewest suffixes" 1)
-                 (const 2)
-                 (const 3)
-                 (const :tag "4 - default" 4)
-                 (const 5)
-                 (const 6)
-                 (const :tag "7 - most suffixes" 7)))
-
-(defcustom transient-levels-file
-  (locate-user-emacs-file "transient/levels.el")
-  "File used to save levels of transients and their suffixes."
-  :package-version '(transient . "0.1.0")
-  :group 'transient
-  :type 'file)
-
-(defcustom transient-values-file
-  (locate-user-emacs-file "transient/values.el")
-  "File used to save values of transients."
-  :package-version '(transient . "0.1.0")
-  :group 'transient
-  :type 'file)
-
-(defcustom transient-history-file
-  (locate-user-emacs-file "transient/history.el")
-  "File used to save history of transients and their infixes."
-  :package-version '(transient . "0.1.0")
-  :group 'transient
-  :type 'file)
-
-(defcustom transient-history-limit 10
-  "Number of history elements to keep when saving to file."
-  :package-version '(transient . "0.1.0")
-  :group 'transient
-  :type 'integer)
-
-(defcustom transient-save-history t
-  "Whether to save history of transient commands when exiting Emacs."
-  :package-version '(transient . "0.1.0")
-  :group 'transient
-  :type 'boolean)
-
-;;; Faces
-
-(defgroup transient-faces nil
-  "Faces used by Transient."
-  :group 'transient)
-
-(defface transient-heading '((t :inherit font-lock-keyword-face))
-  "Face used for headings."
-  :group 'transient-faces)
-
-(defface transient-argument '((t :inherit font-lock-string-face :weight bold))
-  "Face used for enabled arguments."
-  :group 'transient-faces)
-
-(defface transient-inactive-argument '((t :inherit shadow))
-  "Face used for inactive arguments."
-  :group 'transient-faces)
-
-(defface transient-value '((t :inherit font-lock-string-face :weight bold))
-  "Face used for values."
-  :group 'transient-faces)
-
-(defface transient-inactive-value '((t :inherit shadow))
-  "Face used for inactive values."
-  :group 'transient-faces)
-
-(defface transient-unreachable '((t :inherit shadow))
-  "Face used for suffixes unreachable from the current prefix sequence."
-  :group 'transient-faces)
-
-(defface transient-inapt-suffix '((t :inherit shadow :italic t))
-  "Face used for suffixes that are inapt at this time."
-  :group 'transient-faces)
-
-(defface transient-active-infix '((t :inherit highlight))
-  "Face used for the infix for which the value is being read."
-  :group 'transient-faces)
-
-(defface transient-enabled-suffix
-  '((t :background "green" :foreground "black" :weight bold))
-  "Face used for enabled levels while editing suffix levels.
-See info node `(transient)Enabling and Disabling Suffixes'."
-  :group 'transient-faces)
-
-(defface transient-disabled-suffix
-  '((t :background "red" :foreground "black" :weight bold))
-  "Face used for disabled levels while editing suffix levels.
-See info node `(transient)Enabling and Disabling Suffixes'."
-  :group 'transient-faces)
-
-(defface transient-higher-level
-  `((t :box ( :line-width ,(if (>= emacs-major-version 28) (cons -1 -1) -1)
-              :color ,(let ((color (face-attribute 'shadow :foreground nil t)))
-                        (or (and (not (eq color 'unspecified)) color)
-                            "grey60")))))
-  "Face optionally used to highlight suffixes on higher levels.
-Also see option `transient-highlight-higher-levels'."
-  :group 'transient-faces)
-
-(defface transient-delimiter '((t :inherit shadow))
-  "Face used for delimiters and separators.
-This includes the parentheses around values and the pipe
-character used to separate possible values from each other."
-  :group 'transient-faces)
-
-(defface transient-key '((t :inherit font-lock-builtin-face))
-  "Face used for keys."
-  :group 'transient-faces)
-
-(defface transient-key-stay
-  `((((class color) (background light))
-     :inherit transient-key
-     :foreground "#22aa22")
-    (((class color) (background dark))
-     :inherit transient-key
-     :foreground "#ddffdd"))
-  "Face used for keys of suffixes that don't exit transient state."
-  :group 'transient-faces)
-
-(defface transient-key-noop
-  `((((class color) (background light))
-     :inherit transient-key
-     :foreground "grey80")
-    (((class color) (background dark))
-     :inherit transient-key
-     :foreground "grey30"))
-  "Face used for keys of suffixes that currently cannot be invoked."
-  :group 'transient-faces)
-
-(defface transient-key-return
-  `((((class color) (background light))
-     :inherit transient-key
-     :foreground "#aaaa11")
-    (((class color) (background dark))
-     :inherit transient-key
-     :foreground "#ffffcc"))
-  "Face used for keys of suffixes that return to the parent transient."
-  :group 'transient-faces)
-
-(defface transient-key-exit
-  `((((class color) (background light))
-     :inherit transient-key
-     :foreground "#aa2222")
-    (((class color) (background dark))
-     :inherit transient-key
-     :foreground "#ffdddd"))
-  "Face used for keys of suffixes that exit transient state."
-  :group 'transient-faces)
-
-(defface transient-unreachable-key
-  '((t :inherit (shadow transient-key) :weight normal))
-  "Face used for keys unreachable from the current prefix sequence."
-  :group 'transient-faces)
-
-(defface transient-nonstandard-key
-  `((t :box ( :line-width ,(if (>= emacs-major-version 28) (cons -1 -1) -1)
-              :color "cyan")))
-  "Face optionally used to highlight keys conflicting with short-argument.
-Also see option `transient-highlight-mismatched-keys'."
-  :group 'transient-faces)
-
-(defface transient-mismatched-key
-  `((t :box ( :line-width ,(if (>= emacs-major-version 28) (cons -1 -1) -1)
-              :color "magenta")))
-  "Face optionally used to highlight keys without a short-argument.
-Also see option `transient-highlight-mismatched-keys'."
-  :group 'transient-faces)
-
-;;; Persistence
-
-(defun transient--read-file-contents (file)
-  (with-demoted-errors "Transient error: %S"
-    (and (file-exists-p file)
-         (with-temp-buffer
-           (insert-file-contents file)
-           (read (current-buffer))))))
-
-(defun transient--pp-to-file (list file)
-  (make-directory (file-name-directory file) t)
-  (setq list (cl-sort (copy-sequence list) #'string< :key #'car))
-  (with-temp-file file
-    (let ((print-level nil)
-          (print-length nil)
-          (pp-default-function 'pp-28)
-          (fill-column 999))
-      (pp list (current-buffer)))))
-
-(defvar transient-values
-  (transient--read-file-contents transient-values-file)
-  "Values of transient commands.
-The value of this variable persists between Emacs sessions
-and you usually should not change it manually.")
-
-(defun transient-save-values ()
-  (transient--pp-to-file transient-values transient-values-file))
-
-(defvar transient-levels
-  (transient--read-file-contents transient-levels-file)
-  "Levels of transient commands.
-The value of this variable persists between Emacs sessions
-and you usually should not change it manually.")
-
-(defun transient-save-levels ()
-  (transient--pp-to-file transient-levels transient-levels-file))
-
-(defvar transient-history
-  (transient--read-file-contents transient-history-file)
-  "History of transient commands and infix arguments.
-The value of this variable persists between Emacs sessions
-\(unless `transient-save-history' is nil) and you usually
-should not change it manually.")
-
-(defun transient-save-history ()
-  (setq transient-history
-        (cl-sort (mapcar (pcase-lambda (`(,key . ,val))
-                           (cons key (seq-take (delete-dups val)
-                                               transient-history-limit)))
-                         transient-history)
-                 #'string< :key #'car))
-  (transient--pp-to-file transient-history transient-history-file))
-
-(defun transient-maybe-save-history ()
-  "Save the value of `transient-history'.
-If `transient-save-history' is nil, then do nothing."
-  (when transient-save-history
-    (transient-save-history)))
-
-(unless noninteractive
-  (add-hook 'kill-emacs-hook #'transient-maybe-save-history))
-
-;;; Classes
-;;;; Prefix
-
-(defclass transient-prefix ()
-  ((prototype   :initarg :prototype)
-   (command     :initarg :command)
-   (level       :initarg :level)
-   (variable    :initarg :variable    :initform nil)
-   (init-value  :initarg :init-value)
-   (value) (default-value :initarg :value)
-   (scope       :initarg :scope       :initform nil)
-   (history     :initarg :history     :initform nil)
-   (history-pos :initarg :history-pos :initform 0)
-   (history-key :initarg :history-key :initform nil)
-   (show-help   :initarg :show-help   :initform nil)
-   (info-manual :initarg :info-manual :initform nil)
-   (man-page    :initarg :man-page    :initform nil)
-   (transient-suffix     :initarg :transient-suffix     :initform nil)
-   (transient-non-suffix :initarg :transient-non-suffix :initform nil)
-   (transient-switch-frame :initarg :transient-switch-frame)
-   (refresh-suffixes     :initarg :refresh-suffixes     :initform nil)
-   (incompatible         :initarg :incompatible         :initform nil)
-   (suffix-description   :initarg :suffix-description)
-   (variable-pitch       :initarg :variable-pitch       :initform nil)
-   (column-widths        :initarg :column-widths        :initform nil)
-   (unwind-suffix        :documentation "Internal use." :initform nil))
-  "Transient prefix command.
-
-Each transient prefix command consists of a command, which is
-stored in a symbol's function slot and an object, which is
-stored in the `transient--prefix' property of the same symbol.
-
-When a transient prefix command is invoked, then a clone of that
-object is stored in the global variable `transient--prefix' and
-the prototype is stored in the clone's `prototype' slot.")
-
-;;;; Suffix
-
-(defclass transient-child ()
-  ((level
-    :initarg :level
-    :initform (symbol-value 'transient--default-child-level)
-    :documentation "Enable if level of prefix is equal or greater.")
-   (if
-    :initarg :if
-    :initform nil
-    :documentation "Enable if predicate returns non-nil.")
-   (if-not
-    :initarg :if-not
-    :initform nil
-    :documentation "Enable if predicate returns nil.")
-   (if-non-nil
-    :initarg :if-non-nil
-    :initform nil
-    :documentation "Enable if variable's value is non-nil.")
-   (if-nil
-    :initarg :if-nil
-    :initform nil
-    :documentation "Enable if variable's value is nil.")
-   (if-mode
-    :initarg :if-mode
-    :initform nil
-    :documentation "Enable if major-mode matches value.")
-   (if-not-mode
-    :initarg :if-not-mode
-    :initform nil
-    :documentation "Enable if major-mode does not match value.")
-   (if-derived
-    :initarg :if-derived
-    :initform nil
-    :documentation "Enable if major-mode derives from value.")
-   (if-not-derived
-    :initarg :if-not-derived
-    :initform nil
-    :documentation "Enable if major-mode does not derive from value.")
-   (inapt
-    :initform nil)
-   (inapt-face
-    :initarg :inapt-face
-    :initform 'transient-inapt-suffix)
-   (inapt-if
-    :initarg :inapt-if
-    :initform nil
-    :documentation "Inapt if predicate returns non-nil.")
-   (inapt-if-not
-    :initarg :inapt-if-not
-    :initform nil
-    :documentation "Inapt if predicate returns nil.")
-   (inapt-if-non-nil
-    :initarg :inapt-if-non-nil
-    :initform nil
-    :documentation "Inapt if variable's value is non-nil.")
-   (inapt-if-nil
-    :initarg :inapt-if-nil
-    :initform nil
-    :documentation "Inapt if variable's value is nil.")
-   (inapt-if-mode
-    :initarg :inapt-if-mode
-    :initform nil
-    :documentation "Inapt if major-mode matches value.")
-   (inapt-if-not-mode
-    :initarg :inapt-if-not-mode
-    :initform nil
-    :documentation "Inapt if major-mode does not match value.")
-   (inapt-if-derived
-    :initarg :inapt-if-derived
-    :initform nil
-    :documentation "Inapt if major-mode derives from value.")
-   (inapt-if-not-derived
-    :initarg :inapt-if-not-derived
-    :initform nil
-    :documentation "Inapt if major-mode does not derive from value."))
-  "Abstract superclass for group and suffix classes.
-
-It is undefined what happens if more than one `if*' predicate
-slot is non-nil."
-  :abstract t)
-
-(defclass transient-suffix (transient-child)
-  ((definition  :allocation :class    :initform nil)
-   (key         :initarg :key)
-   (command     :initarg :command)
-   (transient   :initarg :transient)
-   (format      :initarg :format      :initform " %k %d")
-   (description :initarg :description :initform nil)
-   (face        :initarg :face        :initform nil)
-   (show-help   :initarg :show-help   :initform nil))
-  "Superclass for suffix command.")
-
-(defclass transient-information (transient-suffix)
-  ((format :initform " %k %d")
-   (key    :initform " "))
-  "Display-only information, aligned with suffix keys.
-Technically a suffix object with no associated command.")
-
-(defclass transient-information* (transient-information)
-  ((format :initform " %d"))
-  "Display-only information, aligned with suffix descriptions.
-Technically a suffix object with no associated command.")
-
-(defclass transient-infix (transient-suffix)
-  ((transient                         :initform t)
-   (argument    :initarg :argument)
-   (shortarg    :initarg :shortarg)
-   (value                             :initform nil)
-   (init-value  :initarg :init-value)
-   (unsavable   :initarg :unsavable   :initform nil)
-   (multi-value :initarg :multi-value :initform nil)
-   (always-read :initarg :always-read :initform nil)
-   (allow-empty :initarg :allow-empty :initform nil)
-   (history-key :initarg :history-key :initform nil)
-   (reader      :initarg :reader      :initform nil)
-   (prompt      :initarg :prompt      :initform nil)
-   (choices     :initarg :choices     :initform nil)
-   (format                            :initform " %k %d (%v)"))
-  "Transient infix command."
-  :abstract t)
-
-(defclass transient-argument (transient-infix) ()
-  "Abstract superclass for infix arguments."
-  :abstract t)
-
-(defclass transient-switch (transient-argument) ()
-  "Class used for command-line argument that can be turned on and off.")
-
-(defclass transient-option (transient-argument) ()
-  "Class used for command-line argument that can take a value.")
-
-(defclass transient-variable (transient-infix)
-  ((variable    :initarg :variable)
-   (format                            :initform " %k %d %v"))
-  "Abstract superclass for infix commands that set a variable."
-  :abstract t)
-
-(defclass transient-switches (transient-argument)
-  ((argument-format  :initarg :argument-format)
-   (argument-regexp  :initarg :argument-regexp))
-  "Class used for sets of mutually exclusive command-line switches.")
-
-(defclass transient-files (transient-option) ()
-  ((key         :initform "--")
-   (argument    :initform "--")
-   (multi-value :initform rest)
-   (reader      :initform transient-read-files))
-  "Class used for the \"--\" argument or similar.
-All remaining arguments are treated as files.
-They become the value of this argument.")
-
-(defclass transient-value-preset (transient-suffix)
-  ((transient :initform t)
-   (set :initarg := :initform nil))
-  "Class used by the `transient-preset' suffix command.")
-
-;;;; Group
-
-(defclass transient-group (transient-child)
-  ((suffixes       :initarg :suffixes       :initform nil)
-   (hide           :initarg :hide           :initform nil)
-   (description    :initarg :description    :initform nil)
-   (pad-keys       :initarg :pad-keys       :initform nil)
-   (info-format    :initarg :info-format    :initform nil)
-   (setup-children :initarg :setup-children))
-  "Abstract superclass of all group classes."
-  :abstract t)
-
-(defclass transient-column (transient-group) ()
-  "Group class that displays each element on a separate line.")
-
-(defclass transient-row (transient-group) ()
-  "Group class that displays all elements on a single line.")
-
-(defclass transient-columns (transient-group) ()
-  "Group class that displays elements organized in columns.
-Direct elements have to be groups whose elements have to be
-commands or strings.  Each subgroup represents a column.
-This class takes care of inserting the subgroups' elements.")
-
-(defclass transient-subgroups (transient-group) ()
-  "Group class that wraps other groups.
-
-Direct elements have to be groups whose elements have to be
-commands or strings.  This group inserts an empty line between
-subgroups.  The subgroups are responsible for displaying their
-elements themselves.")
-
-;;; Define
-
-(defmacro transient-define-prefix (name arglist &rest args)
-  "Define NAME as a transient prefix command.
-
-ARGLIST are the arguments that command takes.
-DOCSTRING is the documentation string and is optional.
-
-These arguments can optionally be followed by key-value pairs.
-Each key has to be a keyword symbol, either `:class' or a keyword
-argument supported by the constructor of that class.  The
-`transient-prefix' class is used if the class is not specified
-explicitly.
-
-GROUPs add key bindings for infix and suffix commands and specify
-how these bindings are presented in the popup buffer.  At least
-one GROUP has to be specified.  See info node `(transient)Binding
-Suffix and Infix Commands'.
-
-The BODY is optional.  If it is omitted, then ARGLIST is also
-ignored and the function definition becomes:
-
-  (lambda ()
-    (interactive)
-    (transient-setup \\='NAME))
-
-If BODY is specified, then it must begin with an `interactive'
-form that matches ARGLIST, and it must call `transient-setup'.
-It may however call that function only when some condition is
-satisfied; that is one of the reason why you might want to use
-an explicit BODY.
-
-All transients have a (possibly nil) value, which is exported
-when suffix commands are called, so that they can consume that
-value.  For some transients it might be necessary to have a sort
-of secondary value, called a scope.  Such a scope would usually
-be set in the commands `interactive' form and has to be passed
-to the setup function:
-
-  (transient-setup \\='NAME nil nil :scope SCOPE)
-
-\(fn NAME ARGLIST [DOCSTRING] [KEYWORD VALUE]... GROUP... [BODY...])"
-  (declare (debug ( &define name lambda-list
-                    [&optional lambda-doc]
-                    [&rest keywordp sexp]
-                    [&rest vectorp]
-                    [&optional ("interactive" interactive) def-body]))
-           (indent defun)
-           (doc-string 3))
-  (pcase-let
-      ((`(,class ,slots ,suffixes ,docstr ,body ,interactive-only)
-        (transient--expand-define-args args arglist 'transient-define-prefix)))
-    `(progn
-       (defalias ',name
-         ,(if body
-              `(lambda ,arglist ,@body)
-            `(lambda ()
-               (interactive)
-               (transient-setup ',name))))
-       (put ',name 'interactive-only ,interactive-only)
-       (put ',name 'function-documentation ,docstr)
-       (put ',name 'transient--prefix
-            (,(or class 'transient-prefix) :command ',name ,@slots))
-       (put ',name 'transient--layout
-            (list ,@(cl-mapcan (lambda (s) (transient--parse-child name s))
-                               suffixes))))))
-
-(defmacro transient-define-suffix (name arglist &rest args)
-  "Define NAME as a transient suffix command.
-
-ARGLIST are the arguments that the command takes.
-DOCSTRING is the documentation string and is optional.
-
-These arguments can optionally be followed by key-value pairs.
-Each key has to be a keyword symbol, either `:class' or a
-keyword argument supported by the constructor of that class.
-The `transient-suffix' class is used if the class is not
-specified explicitly.
-
-The BODY must begin with an `interactive' form that matches
-ARGLIST.  The infix arguments are usually accessed by using
-`transient-args' inside `interactive'.
-
-\(fn NAME ARGLIST [DOCSTRING] [KEYWORD VALUE]... [BODY...])"
-  (declare (debug ( &define name lambda-list
-                    [&optional lambda-doc]
-                    [&rest keywordp sexp]
-                    [&optional ("interactive" interactive) def-body]))
-           (indent defun)
-           (doc-string 3))
-  (pcase-let
-      ((`(,class ,slots ,_ ,docstr ,body ,interactive-only)
-        (transient--expand-define-args args arglist 'transient-define-suffix)))
-    `(progn
-       (defalias ',name
-         ,(if (and (not body) class (oref-default class definition))
-              `(oref-default ',class definition)
-            `(lambda ,arglist ,@body)))
-       (put ',name 'interactive-only ,interactive-only)
-       (put ',name 'function-documentation ,docstr)
-       (put ',name 'transient--suffix
-            (,(or class 'transient-suffix) :command ',name ,@slots)))))
-
-(defmacro transient-augment-suffix (name &rest args)
-  "Augment existing command NAME with a new transient suffix object.
-Similar to `transient-define-suffix' but define a suffix object only.
-\n\(fn NAME [KEYWORD VALUE]...)"
-  (declare (debug (&define name [&rest keywordp sexp]))
-           (indent defun))
-  (pcase-let
-      ((`(,class ,slots)
-        (transient--expand-define-args args nil 'transient-augment-suffix t)))
-    `(put ',name 'transient--suffix
-          (,(or class 'transient-suffix) :command ',name ,@slots))))
-
-(defmacro transient-define-infix (name arglist &rest args)
-  "Define NAME as a transient infix command.
-
-ARGLIST is always ignored and reserved for future use.
-DOCSTRING is the documentation string and is optional.
-
-At least one key-value pair is required.  All transient infix
-commands are equal to each other (but not eq).  It is meaning-
-less to define an infix command, without providing at least one
-keyword argument (usually `:argument' or `:variable', depending
-on the class).  The suffix class defaults to `transient-switch'
-and can be set using the `:class' keyword.
-
-The function definitions is always:
-
-  (lambda ()
-    (interactive)
-    (let ((obj (transient-suffix-object)))
-      (transient-infix-set obj (transient-infix-read obj)))
-    (transient--show))
-
-`transient-infix-read' and `transient-infix-set' are generic
-functions.  Different infix commands behave differently because
-the concrete methods are different for different infix command
-classes.  In rare case the above command function might not be
-suitable, even if you define your own infix command class.  In
-that case you have to use `transient-define-suffix' to define
-the infix command and use t as the value of the `:transient'
-keyword.
-
-\(fn NAME ARGLIST [DOCSTRING] KEYWORD VALUE [KEYWORD VALUE]...)"
-  (declare (debug ( &define name lambda-list
-                    [&optional lambda-doc]
-                    keywordp sexp
-                    [&rest keywordp sexp]))
-           (indent defun)
-           (doc-string 3))
-  (pcase-let
-      ((`(,class ,slots ,_ ,docstr ,_ ,interactive-only)
-        (transient--expand-define-args args arglist 'transient-define-infix t)))
-    `(progn
-       (defalias ',name #'transient--default-infix-command)
-       (put ',name 'interactive-only ,interactive-only)
-       (put ',name 'completion-predicate #'transient--suffix-only)
-       (put ',name 'function-documentation ,docstr)
-       (put ',name 'transient--suffix
-            (,(or class 'transient-switch) :command ',name ,@slots)))))
-
-(defalias 'transient-define-argument #'transient-define-infix
-  "Define NAME as a transient infix command.
-
-Only use this alias to define an infix command that actually
-sets an infix argument.  To define a infix command that, for
-example, sets a variable, use `transient-define-infix' instead.
-
-\(fn NAME ARGLIST [DOCSTRING] [KEYWORD VALUE]...)")
-
-(defun transient--default-infix-command ()
-  ;; Most infix commands are but an alias for this command.
-  "Cannot show any documentation for this transient infix command.
-
-When you request help for an infix command using `transient-help', that
-usually shows the respective man-page and tries to jump to the location
-where the respective argument is being described.
-
-If no man-page is specified for the containing transient menu, then the
-docstring is displayed instead, if any.
-
-If the infix command doesn't have a docstring, as is the case here, then
-this docstring is displayed instead, because technically infix commands
-are aliases for `transient--default-infix-command'.
-
-`describe-function' also shows the docstring of the infix command,
-falling back to that of the same aliased command."
-  (interactive)
-  (let ((obj (transient-suffix-object)))
-    (transient-infix-set obj (transient-infix-read obj)))
-  (transient--show))
-(put 'transient--default-infix-command 'interactive-only t)
-(put 'transient--default-infix-command 'completion-predicate
-     #'transient--suffix-only)
-
-(define-advice find-function-advised-original
-    (:around (fn func) transient-default-infix)
-  "Return nil instead of `transient--default-infix-command'.
-When using `find-function' to jump to the definition of a transient
-infix command/argument, then we want to actually jump to that, not to
-the definition of `transient--default-infix-command', which all infix
-commands are aliases for."
-  (let ((val (funcall fn func)))
-    (and val (not (eq val 'transient--default-infix-command)) val)))
-
-(eval-and-compile ;transient--expand-define-args
-  (defun transient--expand-define-args (args &optional arglist form nobody)
-    ;; ARGLIST and FORM are only optional for backward compatibility.
-    ;; This is necessary because "emoji.el" from Emacs 29 calls this
-    ;; function directly, with just one argument.
-    (unless (listp arglist)
-      (error "Mandatory ARGLIST is missing"))
-    (let (class keys suffixes docstr declare (interactive-only t))
-      (when (stringp (car args))
-        (setq docstr (pop args)))
-      (while (keywordp (car args))
-        (let ((k (pop args))
-              (v (pop args)))
-          (if (eq k :class)
-              (setq class v)
-            (push k keys)
-            (push v keys))))
-      (while (let ((arg (car args)))
-               (or (vectorp arg)
-                   (and arg (symbolp arg))))
-        (push (pop args) suffixes))
-      (when (eq (car-safe (car args)) 'declare)
-        (setq declare (car args))
-        (setq args (cdr args))
-        (when-let ((int (assq 'interactive-only declare)))
-          (setq interactive-only (cadr int))
-          (delq int declare))
-        (unless (cdr declare)
-          (setq declare nil)))
-      (cond
-       ((not args))
-       (nobody
-        (error "%s: No function body allowed" form))
-       ((not (eq (car-safe (nth (if declare 1 0) args)) 'interactive))
-        (error "%s: Interactive form missing" form)))
-      (list (if (eq (car-safe class) 'quote)
-                (cadr class)
-              class)
-            (nreverse keys)
-            (nreverse suffixes)
-            docstr
-            (if declare (cons declare args) args)
-            interactive-only))))
-
-(defun transient--parse-child (prefix spec)
-  (cl-typecase spec
-    (null    (error "Invalid transient--parse-child spec: %s" spec))
-    (symbol  (let ((value (symbol-value spec)))
-               (if (and (listp value)
-                        (or (listp (car value))
-                            (vectorp (car value))))
-                   (cl-mapcan (lambda (s) (transient--parse-child prefix s)) value)
-                 (transient--parse-child prefix value))))
-    (vector  (and-let* ((c (transient--parse-group  prefix spec))) (list c)))
-    (list    (and-let* ((c (transient--parse-suffix prefix spec))) (list c)))
-    (string  (list spec))
-    (t       (error "Invalid transient--parse-child spec: %s" spec))))
-
-(defun transient--parse-group (prefix spec)
-  (setq spec (append spec nil))
-  (cl-symbol-macrolet
-      ((car (car spec))
-       (pop (pop spec)))
-    (let (level class args)
-      (when (integerp car)
-        (setq level pop))
-      (when (stringp car)
-        (setq args (plist-put args :description pop)))
-      (while (keywordp car)
-        (let ((key pop)
-              (val pop))
-          (cond ((eq key :class)
-                 (setq class (macroexp-quote val)))
-                ((or (symbolp val)
-                     (and (listp val) (not (eq (car val) 'lambda))))
-                 (setq args (plist-put args key (macroexp-quote val))))
-                ((setq args (plist-put args key val))))))
-      (unless (or spec class (not (plist-get args :setup-children)))
-        (message "WARNING: %s: When %s is used, %s must also be specified"
-                 'transient-define-prefix :setup-children :class))
-      (list 'vector
-            (or level transient--default-child-level)
-            (cond (class)
-                  ((or (vectorp car)
-                       (and car (symbolp car)))
-                   (quote 'transient-columns))
-                  ((quote 'transient-column)))
-            (and args (cons 'list args))
-            (cons 'list
-                  (cl-mapcan (lambda (s) (transient--parse-child prefix s))
-                             spec))))))
-
-(defun transient--parse-suffix (prefix spec)
-  (let (level class args)
-    (cl-symbol-macrolet
-        ((car (car spec))
-         (pop (pop spec)))
-      (when (integerp car)
-        (setq level pop))
-      (when (or (stringp car)
-                (vectorp car))
-        (setq args (plist-put args :key pop)))
-      (cond
-       ((or (stringp car)
-            (and (eq (car-safe car) 'lambda)
-                 (not (commandp car))))
-        (setq args (plist-put args :description pop)))
-       ((and (symbolp car)
-             (not (keywordp car))
-             (not (commandp car))
-             (commandp (cadr spec)))
-        (setq args (plist-put args :description (macroexp-quote pop)))))
-      (cond
-       ((memq car '(:info :info*)))
-       ((keywordp car)
-        (error "Need command, argument, `:info' or `:info*'; got `%s'" car))
-       ((symbolp car)
-        (setq args (plist-put args :command (macroexp-quote pop))))
-       ((and (commandp car)
-             (eq (car-safe car) 'lambda))
-        (let ((cmd pop)
-              (sym (intern
-                    (format
-                     "transient:%s:%s:%d" prefix
-                     (replace-regexp-in-string (plist-get args :key) " " "")
-                     (prog1 gensym-counter (cl-incf gensym-counter))))))
-          (setq args (plist-put
-                      args :command
-                      `(prog1 ',sym
-                         (put ',sym 'interactive-only t)
-                         (put ',sym 'completion-predicate #'transient--suffix-only)
-                         (defalias ',sym ,cmd))))))
-       ((or (stringp car)
-            (and car (listp car)))
-        (let ((arg pop)
-              (sym nil))
-          (cl-typecase arg
-            (list
-             (setq args (plist-put args :shortarg (car  arg)))
-             (setq args (plist-put args :argument (cadr arg)))
-             (setq arg  (cadr arg)))
-            (string
-             (when-let ((shortarg (transient--derive-shortarg arg)))
-               (setq args (plist-put args :shortarg shortarg)))
-             (setq args (plist-put args :argument arg))))
-          (setq sym (intern (format "transient:%s:%s" prefix arg)))
-          (setq args (plist-put
-                      args :command
-                      `(prog1 ',sym
-                         (put ',sym 'interactive-only t)
-                         (put ',sym 'completion-predicate #'transient--suffix-only)
-                         (defalias ',sym #'transient--default-infix-command))))
-          (cond ((and car (not (keywordp car)))
-                 (setq class 'transient-option)
-                 (setq args (plist-put args :reader (macroexp-quote pop))))
-                ((not (string-suffix-p "=" arg))
-                 (setq class 'transient-switch))
-                ((setq class 'transient-option)))))
-       ((error "Need command, argument, `:info' or `:info*'; got %s" car)))
-      (while (keywordp car)
-        (let ((key pop)
-              (val pop))
-          (cond ((eq key :class) (setq class val))
-                ((eq key :level) (setq level val))
-                ((eq key :info)
-                 (setq class 'transient-information)
-                 (setq args (plist-put args :description val)))
-                ((eq key :info*)
-                 (setq class 'transient-information*)
-                 (setq args (plist-put args :description val)))
-                ((eq (car-safe val) '\,)
-                 (setq args (plist-put args key (cadr val))))
-                ((or (symbolp val)
-                     (and (listp val) (not (eq (car val) 'lambda))))
-                 (setq args (plist-put args key (macroexp-quote val))))
-                ((setq args (plist-put args key val)))))))
-    (when-let* (((not (plist-get args :key)))
-                (shortarg (plist-get args :shortarg)))
-      (setq args (plist-put args :key shortarg)))
-    (list 'list
-          (or level transient--default-child-level)
-          (macroexp-quote (or class 'transient-suffix))
-          (cons 'list args))))
-
-(defun transient--derive-shortarg (arg)
-  (save-match-data
-    (and (string-match "\\`\\(-[a-zA-Z]\\)\\(\\'\\|=\\)" arg)
-         (match-string 1 arg))))
-
-(defun transient-command-completion-not-suffix-only-p (symbol _buffer)
-  "Say whether SYMBOL should be offered as a completion.
-If the value of SYMBOL's `completion-predicate' property is
-`transient--suffix-only', then return nil, otherwise return t.
-This is the case when a command should only ever be used as a
-suffix of a transient prefix command (as opposed to bindings
-in regular keymaps or by using `execute-extended-command')."
-  (not (eq (get symbol 'completion-predicate) 'transient--suffix-only)))
-
-(defalias 'transient--suffix-only #'ignore
-  "Ignore ARGUMENTS, do nothing, and return nil.
-Also see `transient-command-completion-not-suffix-only-p'.
-Only use this alias as the value of the `completion-predicate'
-symbol property.")
-
-(when (and (boundp 'read-extended-command-predicate) ; since Emacs 28.1
-           (not read-extended-command-predicate))
-  (setq read-extended-command-predicate
-        #'transient-command-completion-not-suffix-only-p))
-
-(defun transient-parse-suffix (prefix suffix)
-  "Parse SUFFIX, to be added to PREFIX.
-PREFIX is a prefix command, a symbol.
-SUFFIX is a suffix command or a group specification (of
-  the same forms as expected by `transient-define-prefix').
-Intended for use in a group's `:setup-children' function."
-  (cl-assert (and prefix (symbolp prefix)))
-  (eval (car (transient--parse-child prefix suffix)) t))
-
-(defun transient-parse-suffixes (prefix suffixes)
-  "Parse SUFFIXES, to be added to PREFIX.
-PREFIX is a prefix command, a symbol.
-SUFFIXES is a list of suffix command or a group specification
-  (of the same forms as expected by `transient-define-prefix').
-Intended for use in a group's `:setup-children' function."
-  (cl-assert (and prefix (symbolp prefix)))
-  (mapcar (apply-partially #'transient-parse-suffix prefix) suffixes))
-
-;;; Edit
-
-(defun transient--insert-suffix (prefix loc suffix action &optional keep-other)
-  (let* ((suf (cl-etypecase suffix
-                (vector (transient--parse-group  prefix suffix))
-                (list   (transient--parse-suffix prefix suffix))
-                (string suffix)))
-         (mem (transient--layout-member loc prefix))
-         (elt (car mem)))
-    (setq suf (eval suf t))
-    (cond
-     ((not mem)
-      (message "Cannot insert %S into %s; %s not found"
-               suffix prefix loc))
-     ((or (and (vectorp suffix) (not (vectorp elt)))
-          (and (listp   suffix) (vectorp elt))
-          (and (stringp suffix) (vectorp elt)))
-      (message "Cannot place %S into %s at %s; %s"
-               suffix prefix loc
-               "suffixes and groups cannot be siblings"))
-     (t
-      (when-let* ((bindingp (listp suf))
-                  (key (transient--spec-key suf))
-                  (conflict (car (transient--layout-member key prefix)))
-                  (conflictp
-                   (and (not (and (eq action 'replace)
-                                  (eq conflict elt)))
-                        (or (not keep-other)
-                            (eq (plist-get (nth 2 suf) :command)
-                                (plist-get (nth 2 conflict) :command)))
-                        (equal (transient--suffix-predicate suf)
-                               (transient--suffix-predicate conflict)))))
-        (transient-remove-suffix prefix key))
-      (pcase-exhaustive action
-        ('insert  (setcdr mem (cons elt (cdr mem)))
-                  (setcar mem suf))
-        ('append  (setcdr mem (cons suf (cdr mem))))
-        ('replace (setcar mem suf)))))))
-
-;;;###autoload
-(defun transient-insert-suffix (prefix loc suffix &optional keep-other)
-  "Insert a SUFFIX into PREFIX before LOC.
-PREFIX is a prefix command, a symbol.
-SUFFIX is a suffix command or a group specification (of
-  the same forms as expected by `transient-define-prefix').
-LOC is a command, a key vector, a key description (a string
-  as returned by `key-description'), or a coordination list
-  (whose last element may also be a command or key).
-Remove a conflicting binding unless optional KEEP-OTHER is
-  non-nil.
-See info node `(transient)Modifying Existing Transients'."
-  (declare (indent defun))
-  (transient--insert-suffix prefix loc suffix 'insert keep-other))
-
-;;;###autoload
-(defun transient-append-suffix (prefix loc suffix &optional keep-other)
-  "Insert a SUFFIX into PREFIX after LOC.
-PREFIX is a prefix command, a symbol.
-SUFFIX is a suffix command or a group specification (of
-  the same forms as expected by `transient-define-prefix').
-LOC is a command, a key vector, a key description (a string
-  as returned by `key-description'), or a coordination list
-  (whose last element may also be a command or key).
-Remove a conflicting binding unless optional KEEP-OTHER is
-  non-nil.
-See info node `(transient)Modifying Existing Transients'."
-  (declare (indent defun))
-  (transient--insert-suffix prefix loc suffix 'append keep-other))
-
-;;;###autoload
-(defun transient-replace-suffix (prefix loc suffix)
-  "Replace the suffix at LOC in PREFIX with SUFFIX.
-PREFIX is a prefix command, a symbol.
-SUFFIX is a suffix command or a group specification (of
-  the same forms as expected by `transient-define-prefix').
-LOC is a command, a key vector, a key description (a string
-  as returned by `key-description'), or a coordination list
-  (whose last element may also be a command or key).
-See info node `(transient)Modifying Existing Transients'."
-  (declare (indent defun))
-  (transient--insert-suffix prefix loc suffix 'replace))
-
-;;;###autoload
-(defun transient-remove-suffix (prefix loc)
-  "Remove the suffix or group at LOC in PREFIX.
-PREFIX is a prefix command, a symbol.
-LOC is a command, a key vector, a key description (a string
-  as returned by `key-description'), or a coordination list
-  (whose last element may also be a command or key).
-See info node `(transient)Modifying Existing Transients'."
-  (declare (indent defun))
-  (transient--layout-member loc prefix 'remove))
-
-(defun transient-get-suffix (prefix loc)
-  "Return the suffix or group at LOC in PREFIX.
-PREFIX is a prefix command, a symbol.
-LOC is a command, a key vector, a key description (a string
-  as returned by `key-description'), or a coordination list
-  (whose last element may also be a command or key).
-See info node `(transient)Modifying Existing Transients'."
-  (if-let ((mem (transient--layout-member loc prefix)))
-      (car mem)
-    (error "%s not found in %s" loc prefix)))
-
-(defun transient-suffix-put (prefix loc prop value)
-  "Edit the suffix at LOC in PREFIX, setting PROP to VALUE.
-PREFIX is a prefix command, a symbol.
-SUFFIX is a suffix command or a group specification (of
-  the same forms as expected by `transient-define-prefix').
-LOC is a command, a key vector, a key description (a string
-  as returned by `key-description'), or a coordination list
-  (whose last element may also be a command or key).
-See info node `(transient)Modifying Existing Transients'."
-  (let ((suf (transient-get-suffix prefix loc)))
-    (setf (elt suf 2)
-          (plist-put (elt suf 2) prop value))))
-
-(defun transient--layout-member (loc prefix &optional remove)
-  (let ((val (or (get prefix 'transient--layout)
-                 (error "%s is not a transient command" prefix))))
-    (when (listp loc)
-      (while (integerp (car loc))
-        (let* ((children (if (vectorp val) (aref val 3) val))
-               (mem (transient--nthcdr (pop loc) children)))
-          (if (and remove (not loc))
-              (let ((rest (delq (car mem) children)))
-                (if (vectorp val)
-                    (aset val 3 rest)
-                  (put prefix 'transient--layout rest))
-                (setq val nil))
-            (setq val (if loc (car mem) mem)))))
-      (setq loc (car loc)))
-    (if loc
-        (transient--layout-member-1 (transient--kbd loc) val remove)
-      val)))
-
-(defun transient--layout-member-1 (loc layout remove)
-  (cond ((listp layout)
-         (seq-some (lambda (elt) (transient--layout-member-1 loc elt remove))
-                   layout))
-        ((vectorp (car (aref layout 3)))
-         (seq-some (lambda (elt) (transient--layout-member-1 loc elt remove))
-                   (aref layout 3)))
-        (remove
-         (aset layout 3
-               (delq (car (transient--group-member loc layout))
-                     (aref layout 3)))
-         nil)
-        ((transient--group-member loc layout))))
-
-(defun transient--group-member (loc group)
-  (cl-member-if (lambda (suffix)
-                  (and (listp suffix)
-                       (let* ((def (nth 2 suffix))
-                              (cmd (plist-get def :command)))
-                         (if (symbolp loc)
-                             (eq cmd loc)
-                           (equal (transient--kbd
-                                   (or (plist-get def :key)
-                                       (transient--command-key cmd)))
-                                  loc)))))
-                (aref group 3)))
-
-(defun transient--kbd (keys)
-  (when (vectorp keys)
-    (setq keys (key-description keys)))
-  (when (stringp keys)
-    (setq keys (kbd keys)))
-  keys)
-
-(defun transient--spec-key (spec)
-  (let ((plist (nth 2 spec)))
-    (or (plist-get plist :key)
-        (transient--command-key
-         (plist-get plist :command)))))
-
-(defun transient--command-key (cmd)
-  (and-let* ((obj (transient--suffix-prototype cmd)))
-    (cond ((slot-boundp obj 'key)
-           (oref obj key))
-          ((slot-exists-p obj 'shortarg)
-           (if (slot-boundp obj 'shortarg)
-               (oref obj shortarg)
-             (transient--derive-shortarg (oref obj argument)))))))
-
-(defun transient--nthcdr (n list)
-  (nthcdr (if (< n 0) (- (length list) (abs n)) n) list))
-
-;;; Variables
-
-(defvar transient-current-prefix nil
-  "The transient from which this suffix command was invoked.
-This is an object representing that transient, use
-`transient-current-command' to get the respective command.")
-
-(defvar transient-current-command nil
-  "The transient from which this suffix command was invoked.
-This is a symbol representing that transient, use
-`transient-current-prefix' to get the respective object.")
-
-(defvar transient-current-suffixes nil
-  "The suffixes of the transient from which this suffix command was invoked.
-This is a list of objects.  Usually it is sufficient to instead
-use the function `transient-args', which returns a list of
-values.  In complex cases it might be necessary to use this
-variable instead.")
-
-(defvar transient-exit-hook nil
-  "Hook run after exiting a transient.")
-
-(defvar transient-setup-buffer-hook nil
-  "Hook run when setting up the transient buffer.
-That buffer is current and empty when this hook runs.")
-
-(defvar transient--prefix nil)
-(defvar transient--layout nil)
-(defvar transient--suffixes nil)
-
-(defconst transient--stay t   "Do not exit the transient.")
-(defconst transient--exit nil "Do exit the transient.")
-
-(defvar transient--exitp nil "Whether to exit the transient.")
-(defvar transient--showp nil "Whether to show the transient popup buffer.")
-(defvar transient--helpp nil "Whether help-mode is active.")
-(defvar transient--editp nil "Whether edit-mode is active.")
-
-(defvar transient--refreshp nil
-  "Whether to refresh the transient completely.")
-
-(defvar transient--all-levels-p nil
-  "Whether temporary display of suffixes on all levels is active.")
-
-(defvar transient--timer nil)
-
-(defvar transient--stack nil)
-
-(defvar transient--minibuffer-depth 0)
-
-(defvar transient--buffer-name " *transient*"
-  "Name of the transient buffer.")
-
-(defvar transient--buffer nil
-  "The transient menu buffer.")
-
-(defvar transient--window nil
-  "The window used to display the transient popup buffer.")
-
-(defvar transient--original-window nil
-  "The window that was selected before the transient was invoked.
-Usually it remains selected while the transient is active.")
-
-(defvar transient--original-buffer nil
-  "The buffer that was current before the transient was invoked.
-Usually it remains current while the transient is active.")
-
-(defvar transient--restore-winconf nil
-  "Window configuration to restore after exiting help.")
-
-(defvar transient--shadowed-buffer nil
-  "The buffer that is temporarily shadowed by the transient buffer.
-This is bound while the suffix predicate is being evaluated and while
-drawing in the transient buffer.")
-
-(defvar transient--pending-suffix nil
-  "The suffix that is currently being processed.
-This is bound while the suffix predicate is being evaluated,
-and while functions that return faces are being evaluated.")
-
-(defvar transient--pending-group nil
-  "The group that is currently being processed.
-This is bound while the suffixes are drawn in the transient buffer.")
-
-(defvar transient--debug nil
-  "Whether to put debug information into *Messages*.")
-
-(defvar transient--history nil)
-
-(defvar transient--scroll-commands
-  '(transient-scroll-up
-    transient-scroll-down
-    mwheel-scroll
-    scroll-bar-toolkit-scroll))
-
-;;; Identities
-
-(defun transient-active-prefix (&optional prefixes)
-  "Return the active transient object.
-
-Return nil if there is no active transient, if the transient buffer
-isn't shown, and while the active transient is suspended (e.g., while
-the minibuffer is in use).
-
-Unlike `transient-current-prefix', which is only ever non-nil in code
-that is run directly by a command that is invoked while a transient
-is current, this function is also suitable for use in asynchronous
-code, such as timers and callbacks (this function's main use-case).
-
-If optional PREFIXES is non-nil, it must be a prefix command symbol
-or a list of symbols, in which case the active transient object is
-only returned if it matches one of PREFIXES."
-  (and transient--showp
-       transient--prefix
-       (or (not prefixes)
-           (memq (oref transient--prefix command) (ensure-list prefixes)))
-       (or (memq 'transient--pre-command pre-command-hook)
-           (and (memq t pre-command-hook)
-                (memq 'transient--pre-command
-                      (default-value 'pre-command-hook))))
-       transient--prefix))
-
-(defun transient-prefix-object ()
-  "Return the current prefix as an object.
-
-While a transient is being setup or refreshed (which involves
-preparing its suffixes) the variable `transient--prefix' can be
-used to access the prefix object.  Thus this is what has to be
-used in suffix methods such as `transient-format-description',
-and in object-specific functions that are stored in suffix slots
-such as `description'.
-
-When a suffix command is invoked (i.e., in its `interactive' form
-and function body) then the variable `transient-current-prefix'
-has to be used instead.
-
-Two distinct variables are needed, because any prefix may itself
-be used as a suffix of another prefix, and such sub-prefixes have
-to be able to tell themselves apart from the prefix they were
-invoked from.
-
-Regular suffix commands, which are not prefixes, do not have to
-concern themselves with this distinction, so they can use this
-function instead.  In the context of a plain suffix, it always
-returns the value of the appropriate variable."
-  (or transient--prefix transient-current-prefix))
-
-(defun transient-suffix-object (&optional command)
-  "Return the object associated with the current suffix command.
-
-Each suffix commands is associated with an object, which holds
-additional information about the suffix, such as its value (in
-the case of an infix command, which is a kind of suffix command).
-
-This function is intended to be called by infix commands, which
-are usually aliases of `transient--default-infix-command', which
-is defined like this:
-
-  (defun transient--default-infix-command ()
-    (interactive)
-    (let ((obj (transient-suffix-object)))
-      (transient-infix-set obj (transient-infix-read obj)))
-    (transient--show))
-
-\(User input is read outside of `interactive' to prevent the
-command from being added to `command-history'.  See #23.)
-
-Such commands need to be able to access their associated object
-to guide how `transient-infix-read' reads the new value and to
-store the read value.  Other suffix commands (including non-infix
-commands) may also need the object to guide their behavior.
-
-This function attempts to return the object associated with the
-current suffix command even if the suffix command was not invoked
-from a transient.  (For some suffix command that is a valid thing
-to do, for others it is not.)  In that case nil may be returned,
-if the command was not defined using one of the macros intended
-to define such commands.
-
-The optional argument COMMAND is intended for internal use.  If
-you are contemplating using it in your own code, then you should
-probably use this instead:
-
-  (get COMMAND \\='transient--suffix)"
-  (when command
-    (cl-check-type command command))
-  (cond
-   (transient--pending-suffix)
-   ((or transient--prefix
-        transient-current-prefix)
-    (let ((suffixes
-           (cl-remove-if-not
-            (lambda (obj)
-              (eq (oref obj command)
-                  (or command
-                      (if (eq this-command 'transient-set-level)
-                          ;; This is how it can look up for which
-                          ;; command it is setting the level.
-                          this-original-command
-                        this-command))))
-            (or transient--suffixes
-                transient-current-suffixes))))
-      (or (and (cdr suffixes)
-               (cl-find-if
-                (lambda (obj)
-                  (equal (listify-key-sequence (transient--kbd (oref obj key)))
-                         (listify-key-sequence (this-command-keys))))
-                suffixes))
-          (car suffixes))))
-   ((and-let* ((obj (transient--suffix-prototype (or command this-command)))
-               (obj (clone obj)))
-      (progn ; work around debbugs#31840
-        (transient-init-scope obj)
-        (transient-init-value obj)
-        obj)))))
-
-(defun transient--suffix-prototype (command)
-  (or (get command 'transient--suffix)
-      (seq-some (lambda (cmd) (get cmd 'transient--suffix))
-                (function-alias-p command))))
-
-;;; Keymaps
-
-(defvar-keymap transient-base-map
-  :doc "Parent of other keymaps used by Transient.
-
-This is the parent keymap of all the keymaps that are used in
-all transients: `transient-map' (which in turn is the parent
-of the transient-specific keymaps), `transient-edit-map' and
-`transient-sticky-map'.
-
-If you change a binding here, then you might also have to edit
-`transient-sticky-map' and `transient-common-commands'.  While
-the latter isn't a proper transient prefix command, it can be
-edited using the same functions as used for transients.
-
-If you add a new command here, then you must also add a binding
-to `transient-predicate-map'."
-  "ESC ESC ESC" #'transient-quit-all
-  "C-g"     #'transient-quit-one
-  "C-q"     #'transient-quit-all
-  "C-z"     #'transient-suspend
-  "C-v"     #'transient-scroll-up
-  "C-M-v"   #'transient-scroll-down
-  "<next>"  #'transient-scroll-up
-  "<prior>" #'transient-scroll-down)
-
-(defvar transient-map
-  (let ((map (make-sparse-keymap)))
-    (set-keymap-parent map transient-base-map)
-    (keymap-set map "C-u"   #'universal-argument)
-    (keymap-set map "C--"   #'negative-argument)
-    (keymap-set map "C-t"   #'transient-show)
-    (keymap-set map "?"     #'transient-help)
-    (keymap-set map "C-h"   #'transient-help)
-    ;; Also bound to "C-x p" and "C-x n" in transient-common-commands.
-    (keymap-set map "C-M-p" #'transient-history-prev)
-    (keymap-set map "C-M-n" #'transient-history-next)
-    (when (fboundp 'other-frame-prefix) ;Emacs >= 28.1
-      (keymap-set map "C-x 5 5" 'other-frame-prefix)
-      (keymap-set map "C-x 4 4" 'other-window-prefix))
-    map)
-  "Top-level keymap used by all transients.
-
-If you add a new command here, then you must also add a binding
-to `transient-predicate-map'.  Also see `transient-base-map'.")
-
-(defvar-keymap transient-edit-map
-  :doc "Keymap that is active while a transient in is in \"edit mode\"."
-  :parent transient-base-map
-  "?"     #'transient-help
-  "C-h"   #'transient-help
-  "C-x l" #'transient-set-level)
-
-(defvar-keymap transient-sticky-map
-  :doc "Keymap that is active while an incomplete key sequence is active."
-  :parent transient-base-map
-  "C-g" #'transient-quit-seq)
-
-(defvar transient--common-command-prefixes '(?\C-x))
-
-(put 'transient-common-commands
-     'transient--layout
-     (list
-      (eval
-       (car (transient--parse-child
-             'transient-common-commands
-             (vector
-              :hide
-              (lambda ()
-                (and (not (memq
-                           (car (bound-and-true-p transient--redisplay-key))
-                           transient--common-command-prefixes))
-                     (not transient-show-common-commands)))
-              (vector
-               "Value commands"
-               (list "C-x s  " "Set"            #'transient-set)
-               (list "C-x C-s" "Save"           #'transient-save)
-               (list "C-x C-k" "Reset"          #'transient-reset)
-               (list "C-x p  " "Previous value" #'transient-history-prev)
-               (list "C-x n  " "Next value"     #'transient-history-next))
-              (vector
-               "Sticky commands"
-               ;; Like `transient-sticky-map' except that
-               ;; "C-g" has to be bound to a different command.
-               (list "C-g" "Quit prefix or transient" #'transient-quit-one)
-               (list "C-q" "Quit transient stack"     #'transient-quit-all)
-               (list "C-z" "Suspend transient stack"  #'transient-suspend))
-              (vector
-               "Customize"
-               (list "C-x t" 'transient-toggle-common :description
-                     (lambda ()
-                       (if transient-show-common-commands
-                           "Hide common commands"
-                         "Show common permanently")))
-               (list "C-x l" "Show/hide suffixes" #'transient-set-level)
-               (list "C-x a" #'transient-toggle-level-limit)))))
-       t)))
-
-(defvar-keymap transient-popup-navigation-map
-  :doc "One of the keymaps used when popup navigation is enabled.
-See `transient-enable-popup-navigation'."
-  "<down-mouse-1>" #'transient-noop
-  "<up>"   #'transient-backward-button
-  "<down>" #'transient-forward-button
-  "C-r"    #'transient-isearch-backward
-  "C-s"    #'transient-isearch-forward
-  "M-RET"  #'transient-push-button)
-
-(defvar-keymap transient-button-map
-  :doc "One of the keymaps used when popup navigation is enabled.
-See `transient-enable-popup-navigation'."
-  "<mouse-1>" #'transient-push-button
-  "<mouse-2>" #'transient-push-button)
-
-(defvar-keymap transient-resume-mode-map
-  :doc "Keymap for `transient-resume-mode'.
-
-This keymap remaps every command that would usually just quit the
-documentation buffer to `transient-resume', which additionally
-resumes the suspended transient."
-  "<remap> <Man-quit>"    #'transient-resume
-  "<remap> <Info-exit>"   #'transient-resume
-  "<remap> <quit-window>" #'transient-resume)
-
-(defvar-keymap transient-predicate-map
-  :doc "Base keymap used to map common commands to their transient behavior.
-
-The \"transient behavior\" of a command controls, among other
-things, whether invoking the command causes the transient to be
-exited or not, and whether infix arguments are exported before
-doing so.
-
-Each \"key\" is a command that is common to all transients and
-that is bound in `transient-map', `transient-edit-map',
-`transient-sticky-map' and/or `transient-common-command'.
-
-Each binding is a \"pre-command\", a function that controls the
-transient behavior of the respective command.
-
-For transient commands that are bound in individual transients,
-the transient behavior is specified using the `:transient' slot
-of the corresponding object."
-  "<transient-suspend>"           #'transient--do-suspend
-  "<transient-help>"              #'transient--do-stay
-  "<transient-set-level>"         #'transient--do-stay
-  "<transient-history-prev>"      #'transient--do-stay
-  "<transient-history-next>"      #'transient--do-stay
-  "<universal-argument>"          #'transient--do-stay
-  "<universal-argument-more>"     #'transient--do-stay
-  "<negative-argument>"           #'transient--do-minus
-  "<digit-argument>"              #'transient--do-stay
-  "<other-frame-prefix>"          #'transient--do-stay
-  "<other-window-prefix>"         #'transient--do-stay
-  "<top-level>"                   #'transient--do-quit-all
-  "<transient-quit-all>"          #'transient--do-quit-all
-  "<transient-quit-one>"          #'transient--do-quit-one
-  "<transient-quit-seq>"          #'transient--do-stay
-  "<transient-show>"              #'transient--do-stay
-  "<transient-update>"            #'transient--do-stay
-  "<transient-toggle-common>"     #'transient--do-stay
-  "<transient-set>"               #'transient--do-call
-  "<transient-set-and-exit>"      #'transient--do-exit
-  "<transient-save>"              #'transient--do-call
-  "<transient-save-and-exit>"     #'transient--do-exit
-  "<transient-reset>"             #'transient--do-call
-  "<describe-key-briefly>"        #'transient--do-stay
-  "<describe-key>"                #'transient--do-stay
-  "<transient-scroll-up>"         #'transient--do-stay
-  "<transient-scroll-down>"       #'transient--do-stay
-  "<mwheel-scroll>"               #'transient--do-stay
-  "<scroll-bar-toolkit-scroll>"   #'transient--do-stay
-  "<transient-noop>"              #'transient--do-noop
-  "<transient-mouse-push-button>" #'transient--do-move
-  "<transient-push-button>"       #'transient--do-push-button
-  "<transient-backward-button>"   #'transient--do-move
-  "<transient-forward-button>"    #'transient--do-move
-  "<transient-isearch-backward>"  #'transient--do-move
-  "<transient-isearch-forward>"   #'transient--do-move
-  ;; If a valid but incomplete prefix sequence is followed by
-  ;; an unbound key, then Emacs calls the `undefined' command
-  ;; but does not set `this-command', `this-original-command'
-  ;; or `real-this-command' accordingly.  Instead they are nil.
-  "<nil>"                         #'transient--do-warn
-  ;; Bound to the `mouse-movement' event, this command is similar
-  ;; to `ignore'.
-  "<ignore-preserving-kill-region>" #'transient--do-noop)
-
-(defvar transient--transient-map nil)
-(defvar transient--predicate-map nil)
-(defvar transient--redisplay-map nil)
-(defvar transient--redisplay-key nil)
-
-(defun transient--push-keymap (var)
-  (let ((map (symbol-value var)))
-    (transient--debug "     push %s%s" var (if map "" " VOID"))
-    (when map
-      (with-demoted-errors "transient--push-keymap: %S"
-        (internal-push-keymap map 'overriding-terminal-local-map)))))
-
-(defun transient--pop-keymap (var)
-  (let ((map (symbol-value var)))
-    (when map
-      (transient--debug "     pop  %s" var)
-      (with-demoted-errors "transient--pop-keymap: %S"
-        (internal-pop-keymap map 'overriding-terminal-local-map)))))
-
-(defun transient--make-transient-map ()
-  (let ((map (make-sparse-keymap)))
-    (set-keymap-parent map (if transient--editp
-                               transient-edit-map
-                             transient-map))
-    (dolist (obj transient--suffixes)
-      (let ((key (oref obj key)))
-        (when (vectorp key)
-          (setq key (key-description key))
-          (oset obj key key))
-        (when transient-substitute-key-function
-          (setq key (save-match-data
-                      (funcall transient-substitute-key-function obj)))
-          (oset obj key key))
-        (let* ((kbd (kbd key))
-               (cmd (oref obj command))
-               (alt (transient--lookup-key map kbd)))
-          (cond ((not alt)
-                 (define-key map kbd cmd))
-                ((eq alt cmd))
-                ((transient--inapt-suffix-p obj))
-                ((and-let* ((obj (transient-suffix-object alt)))
-                   (transient--inapt-suffix-p obj))
-                 (define-key map kbd cmd))
-                (transient-detect-key-conflicts
-                 (error "Cannot bind %S to %s and also %s"
-                        (string-trim key) cmd alt))
-                ((define-key map kbd cmd))))))
-    (when-let ((b (keymap-lookup map "-"))) (keymap-set map "<kp-subtract>" b))
-    (when-let ((b (keymap-lookup map "="))) (keymap-set map "<kp-equal>" b))
-    (when-let ((b (keymap-lookup map "+"))) (keymap-set map "<kp-add>" b))
-    (when transient-enable-popup-navigation
-      ;; `transient--make-redisplay-map' maps only over bindings that are
-      ;; directly in the base keymap, so that cannot be a composed keymap.
-      (set-keymap-parent
-       map (make-composed-keymap
-            (keymap-parent map)
-            transient-popup-navigation-map)))
-    map))
-
-(defun transient--make-predicate-map ()
-  (let* ((default (transient--resolve-pre-command
-                   (oref transient--prefix transient-suffix)))
-         (return (and transient--stack (eq default t)))
-         (map (make-sparse-keymap)))
-    (set-keymap-parent map transient-predicate-map)
-    (when (or (and (slot-boundp transient--prefix 'transient-switch-frame)
-                   (transient--resolve-pre-command
-                    (not (oref transient--prefix transient-switch-frame))))
-              (memq (transient--resolve-pre-command
-                     (oref transient--prefix transient-non-suffix))
-                    '(nil transient--do-warn transient--do-noop)))
-      (define-key map [handle-switch-frame] #'transient--do-suspend))
-    (dolist (obj transient--suffixes)
-      (let* ((cmd (oref obj command))
-             (kind (cond ((get cmd 'transient--prefix)    'prefix)
-                         ((cl-typep obj 'transient-infix) 'infix)
-                         (t                               'suffix))))
-        (cond
-         ((oref obj inapt)
-          (define-key map (vector cmd) #'transient--do-warn-inapt))
-         ((slot-boundp obj 'transient)
-          (define-key map (vector cmd)
-            (pcase (list kind
-                         (transient--resolve-pre-command (oref obj transient))
-                         return)
-              (`(prefix   t ,_) #'transient--do-recurse)
-              (`(prefix nil ,_) #'transient--do-stack)
-              (`(infix    t ,_) #'transient--do-stay)
-              (`(suffix   t ,_) #'transient--do-call)
-              ('(suffix nil  t) #'transient--do-return)
-              (`(,_     nil ,_) #'transient--do-exit)
-              (`(,_     ,do ,_) do))))
-         ((not (lookup-key transient-predicate-map (vector cmd)))
-          (define-key map (vector cmd)
-            (pcase (list kind default return)
-              (`(prefix ,(or 'transient--do-stay 'transient--do-call) ,_)
-               #'transient--do-recurse)
-              (`(prefix   t ,_) #'transient--do-recurse)
-              (`(prefix  ,_ ,_) #'transient--do-stack)
-              (`(infix   ,_ ,_) #'transient--do-stay)
-              (`(suffix   t ,_) #'transient--do-call)
-              ('(suffix nil  t) #'transient--do-return)
-              (`(suffix nil ,_) #'transient--do-exit)
-              (`(suffix ,do ,_) do)))))))
-    map))
-
-(defun transient--make-redisplay-map ()
-  (setq transient--redisplay-key
-        (pcase this-command
-          ('transient-update
-           (setq transient--showp t)
-           (setq unread-command-events
-                 (listify-key-sequence (this-single-command-raw-keys))))
-          ('transient-quit-seq
-           (setq unread-command-events
-                 (butlast (listify-key-sequence
-                           (this-single-command-raw-keys))
-                          2))
-           (butlast transient--redisplay-key))
-          (_ nil)))
-  (let ((topmap (make-sparse-keymap))
-        (submap (make-sparse-keymap)))
-    (when transient--redisplay-key
-      (define-key topmap (vconcat transient--redisplay-key) submap)
-      (set-keymap-parent submap transient-sticky-map))
-    (map-keymap-internal
-     (lambda (key def)
-       (when (and (not (eq key ?\e))
-                  (listp def)
-                  (keymapp def))
-         (define-key topmap (vconcat transient--redisplay-key (list key))
-           #'transient-update)))
-     (if transient--redisplay-key
-         (let ((key (vconcat transient--redisplay-key)))
-           (or (lookup-key transient--transient-map key)
-               (and-let* ((regular (lookup-key local-function-key-map key)))
-                 (lookup-key transient--transient-map (vconcat regular)))))
-       transient--transient-map))
-    topmap))
-
-;;; Setup
-
-(defun transient-setup (&optional name layout edit &rest params)
-  "Setup the transient specified by NAME.
-
-This function is called by transient prefix commands to setup the
-transient.  In that case NAME is mandatory, LAYOUT and EDIT must
-be nil and PARAMS may be (but usually is not) used to set, e.g.,
-the \"scope\" of the transient (see `transient-define-prefix').
-
-This function is also called internally, in which case LAYOUT and
-EDIT may be non-nil."
-  (transient--debug 'setup)
-  (transient--with-emergency-exit :setup
-    (cond
-     ((not name)
-      ;; Switching between regular and edit mode.
-      (transient--pop-keymap 'transient--transient-map)
-      (transient--pop-keymap 'transient--redisplay-map)
-      (setq name (oref transient--prefix command))
-      (setq params (list :scope (oref transient--prefix scope))))
-     (transient--prefix
-      ;; Invoked as a ":transient-non-suffix 'transient--do-{stay,call}"
-      ;; of an outer prefix.  Unlike the usual `transient--do-stack',
-      ;; these predicates fail to clean up after the outer prefix.
-      (transient--pop-keymap 'transient--transient-map)
-      (transient--pop-keymap 'transient--redisplay-map))
-     ((not (or layout                      ; resuming parent/suspended prefix
-               transient-current-command)) ; entering child prefix
-      (transient--stack-zap))              ; replace suspended prefix, if any
-     (edit
-      ;; Returning from help to edit.
-      (setq transient--editp t)))
-    (transient--init-objects name layout params)
-    (transient--init-keymaps)
-    (transient--history-init transient--prefix)
-    (setq transient--original-window (selected-window))
-    (setq transient--original-buffer (current-buffer))
-    (setq transient--minibuffer-depth (minibuffer-depth))
-    (transient--redisplay)
-    (transient--init-transient)
-    (transient--suspend-which-key-mode)))
-
-(cl-defgeneric transient-setup-children (group children)
-  "Setup the CHILDREN of GROUP.
-If the value of the `setup-children' slot is non-nil, then call
-that function with CHILDREN as the only argument and return the
-value.  Otherwise return CHILDREN as is."
-  (if (slot-boundp group 'setup-children)
-      (funcall (oref group setup-children) children)
-    children))
-
-(defun transient--init-keymaps ()
-  (setq transient--predicate-map (transient--make-predicate-map))
-  (setq transient--transient-map (transient--make-transient-map))
-  (setq transient--redisplay-map (transient--make-redisplay-map)))
-
-(defun transient--init-objects (&optional name layout params)
-  (if name
-      (setq transient--prefix (transient--init-prefix name params))
-    (setq name (oref transient--prefix command)))
-  (setq transient--refreshp (oref transient--prefix refresh-suffixes))
-  (setq transient--layout (or layout (transient--init-suffixes name)))
-  (setq transient--suffixes (transient--flatten-suffixes transient--layout)))
-
-(defun transient--init-prefix (name &optional params)
-  (let ((obj (let ((proto (get name 'transient--prefix)))
-               (apply #'clone proto
-                      :prototype proto
-                      :level (or (alist-get t (alist-get name transient-levels))
-                                 transient-default-level)
-                      params))))
-    (transient--setup-recursion obj)
-    (transient-init-value obj)
-    obj))
-
-(defun transient--init-suffixes (name)
-  (let ((levels (alist-get name transient-levels)))
-    (cl-mapcan (lambda (c) (transient--init-child levels c nil))
-               (append (get name 'transient--layout)
-                       (and (not transient--editp)
-                            (get 'transient-common-commands
-                                 'transient--layout))))))
-
-(defun transient--flatten-suffixes (layout)
-  (cl-labels ((s (def)
-                (cond
-                 ((stringp def) nil)
-                 ((cl-typep def 'transient-information) nil)
-                 ((listp def) (cl-mapcan #'s def))
-                 ((cl-typep def 'transient-group)
-                  (cl-mapcan #'s (oref def suffixes)))
-                 ((cl-typep def 'transient-suffix)
-                  (list def)))))
-    (cl-mapcan #'s layout)))
-
-(defun transient--init-child (levels spec parent)
-  (cl-etypecase spec
-    (vector  (transient--init-group  levels spec parent))
-    (list    (transient--init-suffix levels spec parent))
-    (string  (list spec))))
-
-(defun transient--init-group (levels spec parent)
-  (pcase-let ((`(,level ,class ,args ,children) (append spec nil)))
-    (and-let* (((transient--use-level-p level))
-               (obj (apply class :level level args))
-               ((transient--use-suffix-p obj))
-               ((prog1 t
-                  (when (or (and parent (oref parent inapt))
-                            (transient--inapt-suffix-p obj))
-                    (oset obj inapt t))))
-               (suffixes (cl-mapcan
-                          (lambda (c) (transient--init-child levels c obj))
-                          (transient-setup-children obj children))))
-      (progn ; work around debbugs#31840
-        (oset obj suffixes suffixes)
-        (list obj)))))
-
-(defun transient--init-suffix (levels spec parent)
-  (pcase-let* ((`(,level ,class ,args) spec)
-               (cmd (plist-get args :command))
-               (key (transient--kbd (plist-get args :key)))
-               (level (or (alist-get (cons cmd key) levels nil nil #'equal)
-                          (alist-get cmd levels)
-                          level)))
-    (let ((fn (and (symbolp cmd)
-                   (symbol-function cmd))))
-      (when (autoloadp fn)
-        (transient--debug "   autoload %s" cmd)
-        (autoload-do-load fn)))
-    (when (transient--use-level-p level)
-      (let ((obj (if (child-of-class-p class 'transient-information)
-                     (apply class :level level args)
-                   (unless (and cmd (symbolp cmd))
-                     (error "BUG: Non-symbolic suffix command: %s" cmd))
-                   (if-let ((proto (and cmd (transient--suffix-prototype cmd))))
-                       (apply #'clone proto :level level args)
-                     (apply class :command cmd :level level args)))))
-        (cond ((not cmd))
-              ((commandp cmd))
-              ((or (cl-typep obj 'transient-switch)
-                   (cl-typep obj 'transient-option))
-               ;; As a temporary special case, if the package was compiled
-               ;; with an older version of Transient, then we must define
-               ;; "anonymous" switch and option commands here.
-               (defalias cmd #'transient--default-infix-command))
-              ((transient--use-suffix-p obj)
-               (error "Suffix command %s is not defined or autoloaded" cmd)))
-        (unless (cl-typep obj 'transient-information)
-          (transient--init-suffix-key obj))
-        (when (transient--use-suffix-p obj)
-          (if (or (and parent (oref parent inapt))
-                  (transient--inapt-suffix-p obj))
-              (oset obj inapt t)
-            (transient-init-scope obj)
-            (transient-init-value obj))
-          (list obj))))))
-
-(cl-defmethod transient--init-suffix-key ((obj transient-suffix))
-  (unless (slot-boundp obj 'key)
-    (error "No key for %s" (oref obj command))))
-
-(cl-defmethod transient--init-suffix-key ((obj transient-argument))
-  (if (transient-switches--eieio-childp obj)
-      (cl-call-next-method obj)
-    (when-let* (((not (slot-boundp obj 'shortarg)))
-                (shortarg (transient--derive-shortarg (oref obj argument))))
-      (oset obj shortarg shortarg))
-    (unless (slot-boundp obj 'key)
-      (if (slot-boundp obj 'shortarg)
-          (oset obj key (oref obj shortarg))
-        (error "No key for %s" (oref obj command))))))
-
-(defun transient--use-level-p (level &optional edit)
-  (or transient--all-levels-p
-      (and transient--editp (not edit))
-      (and (>= level 1)
-           (<= level (oref transient--prefix level)))))
-
-(defun transient--use-suffix-p (obj)
-  (let ((transient--shadowed-buffer (current-buffer))
-        (transient--pending-suffix obj))
-    (transient--do-suffix-p
-     (oref obj if)
-     (oref obj if-not)
-     (oref obj if-nil)
-     (oref obj if-non-nil)
-     (oref obj if-mode)
-     (oref obj if-not-mode)
-     (oref obj if-derived)
-     (oref obj if-not-derived)
-     t)))
-
-(defun transient--inapt-suffix-p (obj)
-  (let ((transient--shadowed-buffer (current-buffer))
-        (transient--pending-suffix obj))
-    (transient--do-suffix-p
-     (oref obj inapt-if)
-     (oref obj inapt-if-not)
-     (oref obj inapt-if-nil)
-     (oref obj inapt-if-non-nil)
-     (oref obj inapt-if-mode)
-     (oref obj inapt-if-not-mode)
-     (oref obj inapt-if-derived)
-     (oref obj inapt-if-not-derived)
-     nil)))
-
-(defun transient--do-suffix-p
-    (if if-not if-nil if-non-nil if-mode if-not-mode if-derived if-not-derived
-        default)
-  (cond
-   (if                  (funcall if))
-   (if-not         (not (funcall if-not)))
-   (if-non-nil          (symbol-value if-non-nil))
-   (if-nil         (not (symbol-value if-nil)))
-   (if-mode             (if (atom if-mode)
-                            (eq major-mode if-mode)
-                          (memq major-mode if-mode)))
-   (if-not-mode    (not (if (atom if-not-mode)
-                            (eq major-mode if-not-mode)
-                          (memq major-mode if-not-mode))))
-   (if-derived          (if (or (atom if-derived)
-                                (>= emacs-major-version 30))
-                            (derived-mode-p if-derived)
-                          (apply #'derived-mode-p if-derived)))
-   (if-not-derived (not (if (or (atom if-not-derived)
-                                (>= emacs-major-version 30))
-                            (derived-mode-p if-not-derived)
-                          (apply #'derived-mode-p if-not-derived))))
-   (default)))
-
-(defun transient--suffix-predicate (spec)
-  (let ((plist (nth 2 spec)))
-    (seq-some (lambda (prop)
-                (and-let* ((pred (plist-get plist prop)))
-                  (list prop pred)))
-              '( :if :if-not
-                 :if-nil :if-non-nil
-                 :if-mode :if-not-mode
-                 :if-derived :if-not-derived
-                 :inapt-if :inapt-if-not
-                 :inapt-if-nil :inapt-if-non-nil
-                 :inapt-if-mode :inapt-if-not-mode
-                 :inapt-if-derived :inapt-if-not-derived))))
-
-;;; Flow-Control
-
-(defun transient--init-transient ()
-  (transient--debug 'init-transient)
-  (transient--push-keymap 'transient--transient-map)
-  (transient--push-keymap 'transient--redisplay-map)
-  (add-hook 'pre-command-hook  #'transient--pre-command)
-  (add-hook 'post-command-hook #'transient--post-command)
-  (advice-add 'recursive-edit :around #'transient--recursive-edit)
-  (when transient--exitp
-    ;; This prefix command was invoked as the suffix of another.
-    ;; Prevent `transient--post-command' from removing the hooks
-    ;; that we just added.
-    (setq transient--exitp 'replace)))
-
-(defun transient--refresh-transient ()
-  (transient--debug 'refresh-transient)
-  (transient--pop-keymap 'transient--predicate-map)
-  (transient--pop-keymap 'transient--transient-map)
-  (transient--pop-keymap 'transient--redisplay-map)
-  (if (eq transient--refreshp 'updated-value)
-      ;; Preserve the prefix value this once, because the
-      ;; invoked suffix indicates that it has updated that.
-      (setq transient--refreshp (oref transient--prefix refresh-suffixes))
-    ;; Otherwise update the prefix value from suffix values.
-    (oset transient--prefix value (transient-get-value)))
-  (transient--init-objects)
-  (transient--init-keymaps)
-  (transient--push-keymap 'transient--transient-map)
-  (transient--push-keymap 'transient--redisplay-map)
-  (transient--redisplay))
-
-(defun transient--pre-command ()
-  (transient--debug 'pre-command)
-  (transient--with-emergency-exit :pre-command
-    ;; The use of `overriding-terminal-local-map' does not prevent the
-    ;; lookup of command remappings in the overridden maps, which can
-    ;; lead to a suffix being remapped to a non-suffix.  We have to undo
-    ;; the remapping in that case.  However, remapping a non-suffix to
-    ;; another should remain possible.
-    (when (and (transient--get-pre-command this-original-command 'suffix)
-               (not (transient--get-pre-command this-command 'suffix)))
-      (setq this-command this-original-command))
-    (cond
-     ((memq this-command '(transient-update transient-quit-seq))
-      (transient--pop-keymap 'transient--redisplay-map))
-     ((and transient--helpp
-           (not (memq this-command '(transient-quit-one
-                                     transient-quit-all))))
-      (cond
-       ((transient-help)
-        (transient--do-suspend)
-        (setq this-command 'transient-suspend)
-        (transient--pre-exit))
-       ((not (transient--edebug-command-p))
-        (setq this-command 'transient-undefined))))
-     ((and transient--editp
-           (transient-suffix-object)
-           (not (memq this-command '(transient-quit-one
-                                     transient-quit-all
-                                     transient-help))))
-      (setq this-command 'transient-set-level)
-      (transient--wrap-command))
-     (t
-      (setq transient--exitp nil)
-      (let ((exitp (eq (transient--call-pre-command) transient--exit)))
-        (transient--wrap-command)
-        (when exitp
-          (transient--pre-exit)))))))
-
-(defun transient--pre-exit ()
-  (transient--debug 'pre-exit)
-  (transient--delete-window)
-  (transient--timer-cancel)
-  (transient--pop-keymap 'transient--transient-map)
-  (transient--pop-keymap 'transient--redisplay-map)
-  (unless transient--showp
-    (let ((message-log-max nil))
-      (message "")))
-  (setq transient--transient-map nil)
-  (setq transient--predicate-map nil)
-  (setq transient--redisplay-map nil)
-  (setq transient--redisplay-key nil)
-  (setq transient--helpp nil)
-  (setq transient--editp nil)
-  (setq transient--prefix nil)
-  (setq transient--layout nil)
-  (setq transient--suffixes nil)
-  (setq transient--original-window nil)
-  (setq transient--original-buffer nil)
-  (setq transient--window nil))
-
-(defun transient--delete-window ()
-  (when (window-live-p transient--window)
-    (let ((win transient--window)
-          (remain-in-minibuffer-window
-           (and (minibuffer-selected-window)
-                (selected-window))))
-      (cond
-       ((eq (car (window-parameter win 'quit-restore)) 'other)
-        ;; Window used to display another buffer.
-        (set-window-parameter win 'no-other-window
-                              (window-parameter win 'prev--no-other-window))
-        (set-window-parameter win 'prev--no-other-window nil))
-       ((with-demoted-errors "Error while exiting transient: %S"
-          (delete-window win))))
-      (when (buffer-live-p transient--buffer)
-        (kill-buffer transient--buffer))
-      (setq transient--buffer nil)
-      (when remain-in-minibuffer-window
-        (select-window remain-in-minibuffer-window)))))
-
-(defun transient--export ()
-  (setq transient-current-prefix transient--prefix)
-  (setq transient-current-command (oref transient--prefix command))
-  (setq transient-current-suffixes transient--suffixes)
-  (transient--history-push transient--prefix))
-
-(defun transient--suspend-override (&optional nohide)
-  (transient--debug 'suspend-override)
-  (transient--timer-cancel)
-  (cond ((and (not nohide) transient-hide-during-minibuffer-read)
-         (transient--delete-window))
-        ((and transient--prefix transient--redisplay-key)
-         (setq transient--redisplay-key nil)
-         (when transient--showp
-           (if-let ((win (minibuffer-selected-window)))
-               (with-selected-window win
-                 (transient--show))
-             (transient--show)))))
-  (transient--pop-keymap 'transient--transient-map)
-  (transient--pop-keymap 'transient--redisplay-map)
-  (remove-hook 'pre-command-hook  #'transient--pre-command)
-  (remove-hook 'post-command-hook #'transient--post-command))
-
-(defun transient--resume-override (&optional _ignore)
-  (transient--debug 'resume-override)
-  (when (and transient--showp transient-hide-during-minibuffer-read)
-    (transient--show))
-  (transient--push-keymap 'transient--transient-map)
-  (transient--push-keymap 'transient--redisplay-map)
-  (add-hook 'pre-command-hook  #'transient--pre-command)
-  (add-hook 'post-command-hook #'transient--post-command))
-
-(defun transient--recursive-edit (fn)
-  (transient--debug 'recursive-edit)
-  (if (not transient--prefix)
-      (funcall fn)
-    (transient--suspend-override (bound-and-true-p edebug-active))
-    (funcall fn) ; Already unwind protected.
-    (cond ((memq this-command '(top-level abort-recursive-edit))
-           (setq transient--exitp t)
-           (transient--post-exit)
-           (transient--delete-window))
-          (transient--prefix
-           (transient--resume-override)))))
-
-(defmacro transient--with-suspended-override (&rest body)
-  (let ((depth (make-symbol "depth"))
-        (setup (make-symbol "setup"))
-        (exit  (make-symbol "exit")))
-    `(if (and transient--transient-map
-              (memq transient--transient-map
-                    overriding-terminal-local-map))
-         (let ((,depth (1+ (minibuffer-depth))) ,setup ,exit)
-           (setq ,setup
-                 (lambda () "@transient--with-suspended-override"
-                   (transient--debug 'minibuffer-setup)
-                   (remove-hook 'minibuffer-setup-hook ,setup)
-                   (transient--suspend-override)))
-           (setq ,exit
-                 (lambda () "@transient--with-suspended-override"
-                   (transient--debug 'minibuffer-exit)
-                   (when (= (minibuffer-depth) ,depth)
-                     (transient--resume-override))))
-           (unwind-protect
-               (progn
-                 (add-hook 'minibuffer-setup-hook ,setup)
-                 (add-hook 'minibuffer-exit-hook ,exit)
-                 ,@body)
-             (remove-hook 'minibuffer-setup-hook ,setup)
-             (remove-hook 'minibuffer-exit-hook ,exit)))
-       ,@body)))
-
-(defun transient--wrap-command ()
-  (static-if (>= emacs-major-version 30)
-      (letrec
-          ((prefix transient--prefix)
-           (suffix this-command)
-           (advice
-            (lambda (fn &rest args)
-              (interactive
-               (lambda (spec)
-                 (let ((abort t))
-                   (unwind-protect
-                       (prog1 (let ((debugger #'transient--exit-and-debug))
-                                (advice-eval-interactive-spec spec))
-                         (setq abort nil))
-                     (when abort
-                       (when-let ((unwind (oref prefix unwind-suffix)))
-                         (transient--debug 'unwind-interactive)
-                         (funcall unwind suffix))
-                       (advice-remove suffix advice)
-                       (oset prefix unwind-suffix nil))))))
-              (unwind-protect
-                  (let ((debugger #'transient--exit-and-debug))
-                    (apply fn args))
-                (when-let ((unwind (oref prefix unwind-suffix)))
-                  (transient--debug 'unwind-command)
-                  (funcall unwind suffix))
-                (advice-remove suffix advice)
-                (oset prefix unwind-suffix nil)))))
-        (when (symbolp this-command)
-          (advice-add suffix :around advice '((depth . -99))))
-        (cl-assert
-         (>= emacs-major-version 30) nil
-         "Emacs was downgraded, making it necessary to recompile Transient"))
-    ;; (< emacs-major-version 30)
-    (let* ((prefix transient--prefix)
-           (suffix this-command)
-           (advice nil)
-           (advice-interactive
-            (lambda (spec)
-              (let ((abort t))
-                (unwind-protect
-                    (prog1 (let ((debugger #'transient--exit-and-debug))
-                             (advice-eval-interactive-spec spec))
-                      (setq abort nil))
-                  (when abort
-                    (when-let ((unwind (oref prefix unwind-suffix)))
-                      (transient--debug 'unwind-interactive)
-                      (funcall unwind suffix))
-                    (advice-remove suffix advice)
-                    (oset prefix unwind-suffix nil))))))
-           (advice-body
-            (lambda (fn &rest args)
-              (unwind-protect
-                  (let ((debugger #'transient--exit-and-debug))
-                    (apply fn args))
-                (when-let ((unwind (oref prefix unwind-suffix)))
-                  (transient--debug 'unwind-command)
-                  (funcall unwind suffix))
-                (advice-remove suffix advice)
-                (oset prefix unwind-suffix nil)))))
-      (setq advice `(lambda (fn &rest args)
-                      (interactive ,advice-interactive)
-                      (apply ',advice-body fn args)))
-      (when (symbolp this-command)
-        (advice-add suffix :around advice '((depth . -99)))))))
-
-(defun transient--premature-post-command ()
-  (and (equal (this-command-keys-vector) [])
-       (= (minibuffer-depth)
-          (1+ transient--minibuffer-depth))
-       (progn
-         (transient--debug 'premature-post-command)
-         (transient--suspend-override)
-         (oset (or transient--prefix transient-current-prefix)
-               unwind-suffix
-               (if transient--exitp
-                   #'transient--post-exit
-                 #'transient--resume-override))
-         t)))
-
-(defun transient--post-command ()
-  (unless (transient--premature-post-command)
-    (transient--debug 'post-command)
-    (transient--with-emergency-exit :post-command
-      (cond (transient--exitp (transient--post-exit))
-            ;; If `this-command' is the current transient prefix, then we
-            ;; have already taken care of updating the transient buffer...
-            ((and (eq this-command (oref transient--prefix command))
-                  ;; ... but if `prefix-arg' is non-nil, then the values
-                  ;; of `this-command' and `real-this-command' are untrue
-                  ;; because `prefix-command-preserve-state' changes them.
-                  ;; We cannot use `current-prefix-arg' because it is set
-                  ;; too late (in `command-execute'), and if it were set
-                  ;; earlier, then we likely still would not be able to
-                  ;; rely on it, and `prefix-command-preserve-state-hook'
-                  ;; would have to be used to record that a universal
-                  ;; argument is in effect.
-                  (not prefix-arg)))
-            (transient--refreshp
-             (transient--refresh-transient))
-            ((let ((old transient--redisplay-map)
-                   (new (transient--make-redisplay-map)))
-               (unless (equal old new)
-                 (transient--pop-keymap 'transient--redisplay-map)
-                 (setq transient--redisplay-map new)
-                 (transient--push-keymap 'transient--redisplay-map))
-               (transient--redisplay)))))
-    (setq transient-current-prefix nil)
-    (setq transient-current-command nil)
-    (setq transient-current-suffixes nil)))
-
-(defun transient--post-exit (&optional command)
-  (transient--debug 'post-exit)
-  (unless (and (eq transient--exitp 'replace)
-               (or transient--prefix
-                   ;; The current command could act as a prefix,
-                   ;; but decided not to call `transient-setup',
-                   ;; or it is prevented from doing so because it
-                   ;; uses the minibuffer and the user aborted
-                   ;; that.
-                   (prog1 nil
-                     (if (let ((obj (transient-suffix-object command)))
-                           (and (slot-boundp obj 'transient)
-                                (oref obj transient)))
-                         ;; This sub-prefix is a transient suffix;
-                         ;; go back to outer prefix, by calling
-                         ;; `transient--stack-pop' further down.
-                         (setq transient--exitp nil)
-                       (transient--stack-zap)))))
-    (remove-hook 'pre-command-hook  #'transient--pre-command)
-    (remove-hook 'post-command-hook #'transient--post-command)
-    (advice-remove 'recursive-edit #'transient--recursive-edit))
-  (let ((resume (and transient--stack
-                     (not (memq transient--exitp '(replace suspend))))))
-    (unless (or resume (eq transient--exitp 'replace))
-      (setq transient--showp nil))
-    (setq transient--exitp nil)
-    (setq transient--helpp nil)
-    (setq transient--editp nil)
-    (setq transient--all-levels-p nil)
-    (setq transient--minibuffer-depth 0)
-    (run-hooks 'transient-exit-hook)
-    (when resume
-      (transient--stack-pop))))
-
-(defun transient--stack-push ()
-  (transient--debug 'stack-push)
-  (push (list (oref transient--prefix command)
-              transient--layout
-              transient--editp
-              :transient-suffix (oref transient--prefix transient-suffix)
-              :scope (oref transient--prefix scope))
-        transient--stack))
-
-(defun transient--stack-pop ()
-  (transient--debug 'stack-pop)
-  (and transient--stack
-       (prog1 t (apply #'transient-setup (pop transient--stack)))))
-
-(defun transient--stack-zap ()
-  (transient--debug 'stack-zap)
-  (setq transient--stack nil))
-
-(defun transient--redisplay ()
-  (if (or (eq transient-show-popup t)
-          transient--showp)
-      (unless
-          (or (memq this-command transient--scroll-commands)
-              (and (or (memq this-command '(mouse-drag-region
-                                            mouse-set-region))
-                       (equal (key-description (this-command-keys-vector))
-                              "<mouse-movement>"))
-                   (and (eq (current-buffer) transient--buffer))))
-        (transient--show))
-    (when (and (numberp transient-show-popup)
-               (not (zerop transient-show-popup))
-               (not transient--timer))
-      (transient--timer-start))
-    (transient--show-brief)))
-
-(defun transient--timer-start ()
-  (setq transient--timer
-        (run-at-time (abs transient-show-popup) nil
-                     (lambda ()
-                       (transient--timer-cancel)
-                       (transient--show)
-                       (let ((message-log-max nil))
-                         (message ""))))))
-
-(defun transient--timer-cancel ()
-  (when transient--timer
-    (cancel-timer transient--timer)
-    (setq transient--timer nil)))
-
-(defun transient--debug (arg &rest args)
-  (when transient--debug
-    (let ((inhibit-message (not (eq transient--debug 'message))))
-      (if (symbolp arg)
-          (message "-- %-22s (cmd: %s, event: %S, exit: %s%s)"
-                   arg
-                   (cond ((and (symbolp this-command) this-command))
-                         ((fboundp 'help-fns-function-name)
-                          (help-fns-function-name this-command))
-                         ((byte-code-function-p this-command)
-                          "#[...]")
-                         (this-command))
-                   (key-description (this-command-keys-vector))
-                   transient--exitp
-                   (cond ((keywordp (car args))
-                          (format ", from: %s"
-                                  (substring (symbol-name (car args)) 1)))
-                         ((stringp (car args))
-                          (concat ", " (apply #'format args)))
-                         ((functionp (car args))
-                          (concat ", " (apply (car args) (cdr args))))
-                         ("")))
-        (apply #'message arg args)))))
-
-(defun transient--emergency-exit (&optional id)
-  "Exit the current transient command after an error occurred.
-When no transient is active (i.e., when `transient--prefix' is
-nil) then do nothing.  Optional ID is a keyword identifying the
-exit."
-  (transient--debug 'emergency-exit id)
-  (when transient--prefix
-    (setq transient--stack nil)
-    (setq transient--exitp t)
-    (transient--pre-exit)
-    (transient--post-exit)))
-
-;;; Pre-Commands
-
-(defun transient--call-pre-command ()
-  (if-let ((fn (transient--get-pre-command this-command)))
-      (let ((action (funcall fn)))
-        (when (eq action transient--exit)
-          (setq transient--exitp (or transient--exitp t)))
-        action)
-    (if (let ((keys (this-command-keys-vector)))
-          (eq (aref keys (1- (length keys))) ?\C-g))
-        (setq this-command 'transient-noop)
-      (unless (transient--edebug-command-p)
-        (setq this-command 'transient-undefined)))
-    transient--stay))
-
-(defun transient--get-pre-command (&optional cmd enforce-type)
-  (or (and (not (eq enforce-type 'non-suffix))
-           (symbolp cmd)
-           (lookup-key transient--predicate-map (vector cmd)))
-      (and (not (eq enforce-type 'suffix))
-           (transient--resolve-pre-command
-            (oref transient--prefix transient-non-suffix)
-            t))))
-
-(defun transient--resolve-pre-command (pre &optional resolve-boolean)
-  (cond ((booleanp pre)
-         (if resolve-boolean
-             (if pre #'transient--do-stay #'transient--do-warn)
-           pre))
-        ((string-match-p "--do-" (symbol-name pre)) pre)
-        ((let ((sym (intern (format "transient--do-%s" pre))))
-           (if (functionp sym) sym pre)))))
-
-(defun transient--do-stay ()
-  "Call the command without exporting variables and stay transient."
-  transient--stay)
-
-(defun transient--do-noop ()
-  "Call `transient-noop' and stay transient."
-  (setq this-command 'transient-noop)
-  transient--stay)
-
-(defun transient--do-warn ()
-  "Call `transient-undefined' and stay transient."
-  (setq this-command 'transient-undefined)
-  transient--stay)
-
-(defun transient--do-warn-inapt ()
-  "Call `transient-inapt' and stay transient."
-  (setq this-command 'transient-inapt)
-  transient--stay)
-
-(defun transient--do-call ()
-  "Call the command after exporting variables and stay transient."
-  (transient--export)
-  transient--stay)
-
-(defun transient--do-return ()
-  "Call the command after exporting variables and return to parent prefix.
-If there is no parent prefix, then behave like `transient--do-exit'."
-  (if (not transient--stack)
-      (transient--do-exit)
-    (transient--export)
-    transient--exit))
-
-(defun transient--do-exit ()
-  "Call the command after exporting variables and exit the transient."
-  (transient--export)
-  (transient--stack-zap)
-  transient--exit)
-
-(defun transient--do-leave ()
-  "Call the command without exporting variables and exit the transient."
-  (transient--stack-zap)
-  transient--exit)
-
-(defun transient--do-push-button ()
-  "Call the command represented by the activated button.
-Use that command's pre-command to determine transient behavior."
-  (if (and (mouse-event-p last-command-event)
-           (not (eq (posn-window (event-start last-command-event))
-                    transient--window)))
-      transient--stay
-    (setq this-command
-          (with-selected-window transient--window
-            (get-text-property (if (mouse-event-p last-command-event)
-                                   (posn-point (event-start last-command-event))
-                                 (point))
-                               'command)))
-    (transient--call-pre-command)))
-
-(defun transient--do-recurse ()
-  "Call the transient prefix command, preparing for return to active transient.
-If there is no parent prefix, then just call the command."
-  (transient--do-stack))
-
-(defun transient--setup-recursion (prefix-obj)
-  (when transient--stack
-    (let ((command (oref prefix-obj command)))
-      (when-let ((suffix-obj (transient-suffix-object command)))
-        (when (memq (if (slot-boundp suffix-obj 'transient)
-                        (oref suffix-obj transient)
-                      (oref transient-current-prefix transient-suffix))
-                    (list t #'transient--do-recurse))
-          (oset prefix-obj transient-suffix t))))))
-
-(defun transient--do-stack ()
-  "Call the transient prefix command, stacking the active transient.
-Push the active transient to the transient stack."
-  (transient--export)
-  (transient--stack-push)
-  (setq transient--exitp 'replace)
-  transient--exit)
-
-(defun transient--do-replace ()
-  "Call the transient prefix command, replacing the active transient.
-Do not push the active transient to the transient stack."
-  (transient--export)
-  (setq transient--exitp 'replace)
-  transient--exit)
-
-(defun transient--do-suspend ()
-  "Suspend the active transient, saving the transient stack."
-  (transient--stack-push)
-  (setq transient--exitp 'suspend)
-  transient--exit)
-
-(defun transient--do-quit-one ()
-  "If active, quit help or edit mode, else exit the active transient."
-  (cond (transient--helpp
-         (setq transient--helpp nil)
-         transient--stay)
-        (transient--editp
-         (setq transient--editp nil)
-         (transient-setup)
-         transient--stay)
-        (prefix-arg
-         transient--stay)
-        (transient--exit)))
-
-(defun transient--do-quit-all ()
-  "Exit all transients without saving the transient stack."
-  (transient--stack-zap)
-  transient--exit)
-
-(defun transient--do-move ()
-  "Call the command if `transient-enable-popup-navigation' is non-nil.
-In that case behave like `transient--do-stay', otherwise similar
-to `transient--do-warn'."
-  (unless transient-enable-popup-navigation
-    (setq this-command 'transient-inhibit-move))
-  transient--stay)
-
-(defun transient--do-minus ()
-  "Call `negative-argument' or pivot to `transient-update'.
-If `negative-argument' is invoked using \"-\" then preserve the
-prefix argument and pivot to `transient-update'."
-  (when (equal (this-command-keys) "-")
-    (setq this-command 'transient-update))
-  transient--stay)
-
-(put 'transient--do-stay       'transient-face 'transient-key-stay)
-(put 'transient--do-noop       'transient-face 'transient-key-noop)
-(put 'transient--do-warn       'transient-face 'transient-key-noop)
-(put 'transient--do-warn-inapt 'transient-face 'transient-key-noop)
-(put 'transient--do-call       'transient-face 'transient-key-stay)
-(put 'transient--do-return     'transient-face 'transient-key-return)
-(put 'transient--do-exit       'transient-face 'transient-key-exit)
-(put 'transient--do-leave      'transient-face 'transient-key-exit)
-
-(put 'transient--do-recurse    'transient-face 'transient-key-stay)
-(put 'transient--do-stack      'transient-face 'transient-key-stay)
-(put 'transient--do-replace    'transient-face 'transient-key-exit)
-(put 'transient--do-suspend    'transient-face 'transient-key-exit)
-
-(put 'transient--do-quit-one   'transient-face 'transient-key-return)
-(put 'transient--do-quit-all   'transient-face 'transient-key-exit)
-(put 'transient--do-move       'transient-face 'transient-key-stay)
-(put 'transient--do-minus      'transient-face 'transient-key-stay)
-
-;;; Commands
-;;;; Noop
-
-(defun transient-noop ()
-  "Do nothing at all."
-  (interactive))
-
-(defun transient-undefined ()
-  "Warn the user that the pressed key is not bound to any suffix."
-  (interactive)
-  (transient--invalid "Unbound suffix"))
-
-(defun transient-inapt ()
-  "Warn the user that the invoked command is inapt."
-  (interactive)
-  (transient--invalid "Inapt command"))
-
-(defun transient--invalid (msg)
-  (ding)
-  (message "%s: `%s' (Use `%s' to abort, `%s' for help)%s"
-           msg
-           (propertize (key-description (this-single-command-keys))
-                       'face 'font-lock-warning-face)
-           (propertize "C-g" 'face 'transient-key)
-           (propertize "?"   'face 'transient-key)
-           ;; `this-command' is `transient-undefined' or `transient-inapt'.
-           ;; Show the command (`this-original-command') the user actually
-           ;; tried to invoke.
-           (if-let ((cmd (or (ignore-errors (symbol-name this-original-command))
-                             (ignore-errors (symbol-name this-command)))))
-               (format " [%s]" (propertize cmd 'face 'font-lock-warning-face))
-             ""))
-  (unless (and transient--transient-map
-               (memq transient--transient-map overriding-terminal-local-map))
-    (let ((transient--prefix (or transient--prefix 'sic)))
-      (transient--emergency-exit))
-    (view-lossage)
-    (other-window 1)
-    (display-warning 'transient "Inconsistent transient state detected.
-This should never happen.
-Please open an issue and post the shown command log." :error)))
-
-(defun transient-inhibit-move ()
-  "Warn the user that popup navigation is disabled."
-  (interactive)
-  (message "To enable use of `%s', please customize `%s'"
-           this-original-command
-           'transient-enable-popup-navigation))
-
-;;;; Core
-
-(defun transient-quit-all ()
-  "Exit all transients without saving the transient stack."
-  (interactive))
-
-(defun transient-quit-one ()
-  "Exit the current transients, returning to outer transient, if any."
-  (interactive))
-
-(defun transient-quit-seq ()
-  "Abort the current incomplete key sequence."
-  (interactive))
-
-(defun transient-update ()
-  "Redraw the transient's state in the popup buffer."
-  (interactive)
-  (setq prefix-arg current-prefix-arg))
-
-(defun transient-show ()
-  "Show the transient's state in the popup buffer."
-  (interactive)
-  (setq transient--showp t))
-
-(defun transient-push-button ()
-  "Invoke the suffix command represented by this button."
-  (interactive))
-
-;;;; Suspend
-
-(defun transient-suspend ()
-  "Suspend the current transient.
-It can later be resumed using `transient-resume', while no other
-transient is active."
-  (interactive))
-
-(define-minor-mode transient-resume-mode
-  "Auxiliary minor-mode used to resume a transient after viewing help.")
-
-(defun transient-resume ()
-  "Resume a previously suspended stack of transients."
-  (interactive)
-  (cond (transient--stack
-         (let ((winconf transient--restore-winconf))
-           (kill-local-variable 'transient--restore-winconf)
-           (when transient-resume-mode
-             (transient-resume-mode -1)
-             (quit-window))
-           (when winconf
-             (set-window-configuration winconf)))
-         (transient--stack-pop))
-        (transient-resume-mode
-         (kill-local-variable 'transient--restore-winconf)
-         (transient-resume-mode -1)
-         (quit-window))
-        (t
-         (message "No suspended transient command"))))
-
-;;;; Help
-
-(defun transient-help (&optional interactive)
-  "Show help for the active transient or one of its suffixes.\n\n(fn)"
-  (interactive (list t))
-  (if interactive
-      (setq transient--helpp t)
-    (with-demoted-errors "transient-help: %S"
-      (when (lookup-key transient--transient-map
-                        (this-single-command-raw-keys))
-        (setq transient--helpp nil)
-        (let ((winconf (current-window-configuration)))
-          (transient-show-help
-           (if (eq this-original-command 'transient-help)
-               transient--prefix
-             (or (transient-suffix-object)
-                 this-original-command)))
-          (setq-local transient--restore-winconf winconf))
-        (fit-window-to-buffer nil (frame-height) (window-height))
-        (transient-resume-mode)
-        (message (substitute-command-keys
-                  "Type \\`q' to resume transient command."))
-        t))))
-
-;;;; Level
-
-(defun transient-set-level (&optional command level)
-  "Set the level of the transient or one of its suffix commands."
-  (interactive
-   (let ((command this-original-command)
-         (prefix (oref transient--prefix command)))
-     (and (or (not (eq command 'transient-set-level))
-              (and transient--editp
-                   (setq command prefix)))
-          (list command
-                (let ((keys (this-single-command-raw-keys)))
-                  (and (lookup-key transient--transient-map keys)
-                       (progn
-                         (transient--show)
-                         (string-to-number
-                          (transient--read-number-N
-                           (format "Set level for `%s': " command)
-                           nil nil (not (eq command prefix)))))))))))
-  (cond
-   ((not command)
-    (setq transient--editp t)
-    (transient-setup))
-   (level
-    (let* ((prefix (oref transient--prefix command))
-           (alist (alist-get prefix transient-levels))
-           (akey command))
-      (cond ((eq command prefix)
-             (oset transient--prefix level level)
-             (setq akey t))
-            (t
-             (oset (transient-suffix-object command) level level)
-             (when (cdr (cl-remove-if-not (lambda (obj)
-                                            (eq (oref obj command) command))
-                                          transient--suffixes))
-               (setq akey (cons command (this-command-keys))))))
-      (setf (alist-get akey alist) level)
-      (setf (alist-get prefix transient-levels) alist))
-    (transient-save-levels)
-    (transient--show))
-   (t
-    (transient-undefined))))
-
-(transient-define-suffix transient-toggle-level-limit ()
-  "Toggle whether to temporarily displayed suffixes on all levels."
-  :description
-  (lambda ()
-    (cond
-     ((= transient-default-level transient--max-level)
-      "Always displaying all levels")
-     (transient--all-levels-p
-      (format "Hide suffix %s"
-              (propertize
-               (format "levels > %s" (oref (transient-prefix-object) level))
-               'face 'transient-higher-level)))
-     ("Show all suffix levels")))
-  :inapt-if (lambda () (= transient-default-level transient--max-level))
-  :transient t
-  (interactive)
-  (setq transient--all-levels-p (not transient--all-levels-p))
-  (setq transient--refreshp t))
-
-;;;; Value
-
-(defun transient-set ()
-  "Set active transient's value for this Emacs session."
-  (interactive)
-  (transient-set-value (transient-prefix-object)))
-
-(defalias 'transient-set-and-exit #'transient-set
-  "Set active transient's value for this Emacs session and exit.")
-
-(defun transient-save ()
-  "Save active transient's value for this and future Emacs sessions."
-  (interactive)
-  (transient-save-value (transient-prefix-object)))
-
-(defalias 'transient-save-and-exit #'transient-save
-  "Save active transient's value for this and future Emacs sessions and exit.")
-
-(defun transient-reset ()
-  "Clear the set and saved values of the active transient."
-  (interactive)
-  (transient-reset-value (transient-prefix-object)))
-
-(defun transient-history-next ()
-  "Switch to the next value used for the active transient."
-  (interactive)
-  (let* ((obj transient--prefix)
-         (pos (1- (oref obj history-pos)))
-         (hst (oref obj history)))
-    (if (< pos 0)
-        (user-error "End of history")
-      (oset obj history-pos pos)
-      (oset obj value (nth pos hst))
-      (mapc #'transient-init-value transient--suffixes))))
-
-(defun transient-history-prev ()
-  "Switch to the previous value used for the active transient."
-  (interactive)
-  (let* ((obj transient--prefix)
-         (pos (1+ (oref obj history-pos)))
-         (hst (oref obj history))
-         (len (length hst)))
-    (if (> pos (1- len))
-        (user-error "End of history")
-      (oset obj history-pos pos)
-      (oset obj value (nth pos hst))
-      (mapc #'transient-init-value transient--suffixes))))
-
-(transient-define-suffix transient-preset ()
-  "Put this preset into action."
-  :class transient-value-preset
-  (interactive)
-  (transient-prefix-set (oref (transient-suffix-object) set)))
-
-;;;; Auxiliary
-
-(defun transient-toggle-common ()
-  "Toggle whether common commands are permanently shown."
-  (interactive)
-  (setq transient-show-common-commands (not transient-show-common-commands)))
-
-(defun transient-toggle-debug ()
-  "Toggle debugging statements for transient commands."
-  (interactive)
-  (setq transient--debug (not transient--debug))
-  (message "Debugging transient %s"
-           (if transient--debug "enabled" "disabled")))
-
-(transient-define-suffix transient-echo-arguments (arguments)
-  "Show the transient's active ARGUMENTS in the echo area.
-Intended for use in prefixes used for demonstration purposes,
-such as when suggesting a new feature or reporting an issue."
-  :transient t
-  :description "Echo arguments"
-  :key "x"
-  (interactive (list (transient-args transient-current-command)))
-  (message "%s: %s"
-           (key-description (this-command-keys))
-           (mapconcat (lambda (arg)
-                        (propertize (if (string-match-p " " arg)
-                                        (format "%S" arg)
-                                      arg)
-                                    'face 'transient-argument))
-                      arguments " ")))
-
-;;; Value
-;;;; Init
-
-(cl-defgeneric transient-init-scope (obj)
-  "Set the scope of the suffix object OBJ.
-
-The scope is actually a property of the transient prefix, not of
-individual suffixes.  However it is possible to invoke a suffix
-command directly instead of from a transient.  In that case, if
-the suffix expects a scope, then it has to determine that itself
-and store it in its `scope' slot.
-
-This function is called for all suffix commands, but unless a
-concrete method is implemented this falls through to the default
-implementation, which is a noop.")
-
-(cl-defmethod transient-init-scope ((_   transient-suffix))
-  "Noop." nil)
-
-(cl-defgeneric transient-init-value (_)
-  "Set the initial value of the object OBJ.
-
-This function is called for all prefix and suffix commands.
-
-For suffix commands (including infix argument commands) the
-default implementation is a noop.  Classes derived from the
-abstract `transient-infix' class must implement this function.
-Non-infix suffix commands usually don't have a value."
-  nil)
-
-(cl-defmethod transient-init-value :around ((obj transient-prefix))
-  "If bound, then call OBJ's `init-value' function.
-Otherwise call the primary method according to object's class."
-  (if (slot-boundp obj 'init-value)
-      (funcall (oref obj init-value) obj)
-    (cl-call-next-method obj)))
-
-(cl-defmethod transient-init-value :around ((obj transient-infix))
-  "If bound, then call OBJ's `init-value' function.
-Otherwise call the primary method according to object's class."
-  (if (slot-boundp obj 'init-value)
-      (funcall (oref obj init-value) obj)
-    (cl-call-next-method obj)))
-
-(cl-defmethod transient-init-value ((obj transient-prefix))
-  (if (slot-boundp obj 'value)
-      (oref obj value)
-    (oset obj value
-          (if-let ((saved (assq (oref obj command) transient-values)))
-              (cdr saved)
-            (transient-default-value obj)))))
-
-(cl-defmethod transient-init-value ((obj transient-argument))
-  (oset obj value
-        (let ((value (oref transient--prefix value))
-              (argument (and (slot-boundp obj 'argument)
-                             (oref obj argument)))
-              (multi-value (oref obj multi-value))
-              (case-fold-search nil)
-              (regexp (if (slot-exists-p obj 'argument-regexp)
-                          (oref obj argument-regexp)
-                        (format "\\`%s\\(.*\\)" (oref obj argument)))))
-          (if (memq multi-value '(t rest))
-              (cdr (assoc argument value))
-            (let ((match (lambda (v)
-                           (and (stringp v)
-                                (string-match regexp v)
-                                (match-string 1 v)))))
-              (if multi-value
-                  (delq nil (mapcar match value))
-                (cl-some match value)))))))
-
-(cl-defmethod transient-init-value ((obj transient-switch))
-  (oset obj value
-        (car (member (oref obj argument)
-                     (oref transient--prefix value)))))
-
-;;;; Default
-
-(cl-defgeneric transient-default-value (_)
-  "Return the default value."
-  nil)
-
-(cl-defmethod transient-default-value ((obj transient-prefix))
-  (if-let ((default (and (slot-boundp obj 'default-value)
-                         (oref obj default-value))))
-      (if (functionp default)
-          (funcall default)
-        default)
-    nil))
-
-;;;; Read
-
-(cl-defgeneric transient-infix-read (obj)
-  "Determine the new value of the infix object OBJ.
-
-This function merely determines the value; `transient-infix-set'
-is used to actually store the new value in the object.
-
-For most infix classes this is done by reading a value from the
-user using the reader specified by the `reader' slot (using the
-`transient-infix' method described below).
-
-For some infix classes the value is changed without reading
-anything in the minibuffer, i.e., the mere act of invoking the
-infix command determines what the new value should be, based
-on the previous value.")
-
-(cl-defmethod transient-infix-read :around ((obj transient-infix))
-  "Refresh the transient buffer and call the next method.
-
-Also wrap `cl-call-next-method' with two macros:
-- `transient--with-suspended-override' allows use of minibuffer.
-- `transient--with-emergency-exit' arranges for the transient to
-  be exited in case of an error."
-  (transient--show)
-  (transient--with-emergency-exit :infix-read
-    (transient--with-suspended-override
-     (cl-call-next-method obj))))
-
-(cl-defmethod transient-infix-read ((obj transient-infix))
-  "Read a value while taking care of history.
-
-This method is suitable for a wide variety of infix commands,
-including but not limited to inline arguments and variables.
-
-If you do not use this method for your own infix class, then
-you should likely replicate a lot of the behavior of this
-method.  If you fail to do so, then users might not appreciate
-the lack of history, for example.
-
-Only for very simple classes that toggle or cycle through a very
-limited number of possible values should you replace this with a
-simple method that does not handle history.  (E.g., for a command
-line switch the only possible values are \"use it\" and \"don't use
-it\", in which case it is pointless to preserve history.)"
-  (with-slots (value multi-value always-read allow-empty choices) obj
-    (if (and value
-             (not multi-value)
-             (not always-read)
-             transient--prefix)
-        (oset obj value nil)
-      (let* ((enable-recursive-minibuffers t)
-             (reader (oref obj reader))
-             (choices (if (functionp choices) (funcall choices) choices))
-             (prompt (transient-prompt obj))
-             (value (if multi-value (string-join value ",") value))
-             (history-key (or (oref obj history-key)
-                              (oref obj command)))
-             (transient--history (alist-get history-key transient-history))
-             (transient--history (if (or (null value)
-                                         (eq value (car transient--history)))
-                                     transient--history
-                                   (cons value transient--history)))
-             (initial-input (and transient-read-with-initial-input
-                                 (car transient--history)))
-             (history (if initial-input
-                          (cons 'transient--history 1)
-                        'transient--history))
-             (value
-              (cond
-               (reader (funcall reader prompt initial-input history))
-               (multi-value
-                (completing-read-multiple prompt choices nil nil
-                                          initial-input history))
-               (choices
-                (completing-read prompt choices nil t initial-input history))
-               ((read-string prompt initial-input history)))))
-        (cond ((and (equal value "") (not allow-empty))
-               (setq value nil))
-              ((and (equal value "\"\"") allow-empty)
-               (setq value "")))
-        (when value
-          (when (and (bound-and-true-p ivy-mode)
-                     (stringp (car transient--history)))
-            (set-text-properties 0 (length (car transient--history)) nil
-                                 (car transient--history)))
-          (setf (alist-get history-key transient-history)
-                (delete-dups transient--history)))
-        value))))
-
-(cl-defmethod transient-infix-read ((obj transient-switch))
-  "Toggle the switch on or off."
-  (if (oref obj value) nil (oref obj argument)))
-
-(cl-defmethod transient-infix-read ((obj transient-switches))
-  "Cycle through the mutually exclusive switches.
-The last value is \"don't use any of these switches\"."
-  (let ((choices (mapcar (apply-partially #'format (oref obj argument-format))
-                         (oref obj choices))))
-    (if-let ((value (oref obj value)))
-        (cadr (member value choices))
-      (car choices))))
-
-(cl-defmethod transient-infix-read ((command symbol))
-  "Elsewhere use the reader of the infix command COMMAND.
-Use this if you want to share an infix's history with a regular
-stand-alone command."
-  (if-let ((obj (transient--suffix-prototype command)))
-      (cl-letf (((symbol-function #'transient--show) #'ignore))
-        (transient-infix-read obj))
-    (error "Not a suffix command: `%s'" command)))
-
-;;;; Readers
-
-(defun transient-read-file (prompt _initial-input _history)
-  "Read a file."
-  (file-local-name (expand-file-name (read-file-name prompt))))
-
-(defun transient-read-existing-file (prompt _initial-input _history)
-  "Read an existing file."
-  (file-local-name (expand-file-name (read-file-name prompt nil nil t))))
-
-(defun transient-read-directory (prompt _initial-input _history)
-  "Read a directory."
-  (file-local-name (expand-file-name (read-directory-name prompt))))
-
-(defun transient-read-existing-directory (prompt _initial-input _history)
-  "Read an existing directory."
-  (file-local-name (expand-file-name (read-directory-name prompt nil nil t))))
-
-(defun transient-read-number-N0 (prompt initial-input history)
-  "Read a natural number (including zero) and return it as a string."
-  (transient--read-number-N prompt initial-input history t))
-
-(defun transient-read-number-N+ (prompt initial-input history)
-  "Read a natural number (excluding zero) and return it as a string."
-  (transient--read-number-N prompt initial-input history nil))
-
-(defun transient--read-number-N (prompt initial-input history include-zero)
-  (save-match-data
-    (cl-block nil
-      (while t
-        (let ((str (read-from-minibuffer prompt initial-input nil nil history)))
-          (when (or (string-equal str "")
-                    (string-match-p (if include-zero
-                                        "\\`\\(0\\|[1-9][0-9]*\\)\\'"
-                                      "\\`[1-9][0-9]*\\'")
-                                    str))
-            (cl-return str)))
-        (message "Please enter a natural number (%s zero)."
-                 (if include-zero "including" "excluding"))
-        (sit-for 1)))))
-
-(defun transient-read-date (prompt default-time _history)
-  "Read a date using `org-read-date' (which see)."
-  (require 'org)
-  (when (fboundp 'org-read-date)
-    (org-read-date 'with-time nil nil prompt default-time)))
-
-;;;; Prompt
-
-(cl-defgeneric transient-prompt (obj)
-  "Return the prompt to be used to read infix object OBJ's value.")
-
-(cl-defmethod transient-prompt ((obj transient-infix))
-  "Return the prompt to be used to read infix object OBJ's value.
-
-This implementation should be suitable for almost all infix
-commands.
-
-If the value of OBJ's `prompt' slot is non-nil, then it must be
-a string or a function.  If it is a string, then use that.  If
-it is a function, then call that with OBJ as the only argument.
-That function must return a string, which is then used as the
-prompt.
-
-Otherwise, if the value of either the `argument' or `variable'
-slot of OBJ is a string, then base the prompt on that (preferring
-the former), appending either \"=\" (if it appears to be a
-command-line option) or \": \".
-
-Finally fall through to using \"(BUG: no prompt): \" as the
-prompt."
-  (if-let ((prompt (oref obj prompt)))
-      (let ((prompt (if (functionp prompt)
-                        (funcall prompt obj)
-                      prompt)))
-        (if (stringp prompt)
-            prompt
-          "(BUG: no prompt): "))
-    (or (and-let* ((arg (and (slot-boundp obj 'argument) (oref obj argument))))
-          (if (and (stringp arg) (string-suffix-p "=" arg))
-              arg
-            (concat arg ": ")))
-        (and-let* ((var (and (slot-boundp obj 'variable) (oref obj variable))))
-          (and (stringp var)
-               (concat var ": ")))
-        "(BUG: no prompt): ")))
-
-;;;; Set
-
-(cl-defgeneric transient-infix-set (obj value)
-  "Set the value of infix object OBJ to VALUE.")
-
-(cl-defmethod transient-infix-set ((obj transient-infix) value)
-  "Set the value of infix object OBJ to VALUE."
-  (oset obj value value))
-
-(cl-defmethod transient-infix-set :after ((obj transient-argument) value)
-  "Unset incompatible infix arguments."
-  (when-let* ((value)
-              (val (transient-infix-value obj))
-              (arg (if (slot-boundp obj 'argument)
-                       (oref obj argument)
-                     (oref obj argument-format)))
-              (spec (oref transient--prefix incompatible))
-              (filter (lambda (x rule)
-                        (and (member x rule)
-                             (remove x rule))))
-              (incomp (nconc
-                       (cl-mapcan (apply-partially filter arg) spec)
-                       (and (not (equal val arg))
-                            (cl-mapcan (apply-partially filter val) spec)))))
-    (dolist (obj transient--suffixes)
-      (when-let* (((cl-typep obj 'transient-argument))
-                  (val (transient-infix-value obj))
-                  (arg (if (slot-boundp obj 'argument)
-                           (oref obj argument)
-                         (oref obj argument-format)))
-                  ((if (equal val arg)
-                       (member arg incomp)
-                     (or (member val incomp)
-                         (member arg incomp)))))
-        (transient-infix-set obj nil)))))
-
-(defun transient-prefix-set (value)
-  "Set the value of the active transient prefix to VALUE.
-Intended for use by transient suffix commands."
-  (oset transient--prefix value value)
-  (setq transient--refreshp 'updated-value))
-
-(cl-defgeneric transient-set-value (obj)
-  "Persist the value of the transient prefix OBJ.
-Only intended for use by `transient-set'.
-Also see `transient-prefix-set'.")
-
-(cl-defmethod transient-set-value ((obj transient-prefix))
-  (oset (oref obj prototype) value (transient-get-value))
-  (transient--history-push obj))
-
-;;;; Save
-
-(cl-defgeneric transient-save-value (obj)
-  "Save the value of the transient prefix OBJ.")
-
-(cl-defmethod transient-save-value ((obj transient-prefix))
-  (let ((value (transient-get-value)))
-    (oset (oref obj prototype) value value)
-    (setf (alist-get (oref obj command) transient-values) value)
-    (transient-save-values))
-  (transient--history-push obj))
-
-;;;; Reset
-
-(cl-defgeneric transient-reset-value (obj)
-  "Clear the set and saved values of the transient prefix OBJ.")
-
-(cl-defmethod transient-reset-value ((obj transient-prefix))
-  (let ((value (transient-default-value obj)))
-    (oset obj value value)
-    (oset (oref obj prototype) value value)
-    (setf (alist-get (oref obj command) transient-values nil 'remove) nil)
-    (transient-save-values))
-  (transient--history-push obj)
-  (mapc #'transient-init-value transient--suffixes))
-
-;;;; Get
-
-(defun transient-args (prefix)
-  "Return the value of the transient prefix command PREFIX.
-If the current command was invoked from the transient prefix
-command PREFIX, then return the active infix arguments.  If
-the current command was not invoked from PREFIX, then return
-the set, saved or default value for PREFIX."
-  (cl-mapcan #'transient--get-wrapped-value (transient-suffixes prefix)))
-
-(defun transient-suffixes (prefix)
-  "Return the suffix objects of the transient prefix command PREFIX."
-  (if (eq transient-current-command prefix)
-      transient-current-suffixes
-    (let ((transient--prefix (transient--init-prefix prefix)))
-      (transient--flatten-suffixes
-       (transient--init-suffixes prefix)))))
-
-(defun transient-get-value ()
-  (transient--with-emergency-exit :get-value
-    (cl-mapcan (lambda (obj)
-                 (and (or (not (slot-exists-p obj 'unsavable))
-                          (not (oref obj unsavable)))
-                      (transient--get-wrapped-value obj)))
-               (or transient--suffixes transient-current-suffixes))))
-
-(defun transient--get-wrapped-value (obj)
-  (and-let* ((value (transient-infix-value obj)))
-    (pcase-exhaustive (and (slot-exists-p obj 'multi-value)
-                           (oref obj multi-value))
-      ('nil          (list value))
-      ((or 't 'rest) (list value))
-      ('repeat       value))))
-
-(cl-defgeneric transient-infix-value (obj)
-  "Return the value of the suffix object OBJ.
-
-This function is called by `transient-args' (which see), meaning
-this function is how the value of a transient is determined so
-that the invoked suffix command can use it.
-
-Currently most values are strings, but that is not set in stone.
-Nil is not a value, it means \"no value\".
-
-Usually only infixes have a value, but see the method for
-`transient-suffix'.")
-
-(cl-defmethod transient-infix-value ((_   transient-suffix))
-  "Return nil, which means \"no value\".
-
-Infix arguments contribute the transient's value while suffix
-commands consume it.  This function is called for suffixes anyway
-because a command that both contributes to the transient's value
-and also consumes it is not completely unconceivable.
-
-If you define such a command, then you must define a derived
-class and implement this function because this default method
-does nothing." nil)
-
-(cl-defmethod transient-infix-value ((obj transient-infix))
-  "Return the value of OBJ's `value' slot."
-  (oref obj value))
-
-(cl-defmethod transient-infix-value ((obj transient-option))
-  "Return ARGUMENT and VALUE as a unit or nil if the latter is nil."
-  (and-let* ((value (oref obj value)))
-    (let ((arg (oref obj argument)))
-      (pcase-exhaustive (oref obj multi-value)
-        ('nil          (concat arg value))
-        ((or 't 'rest) (cons arg value))
-        ('repeat       (mapcar (lambda (v) (concat arg v)) value))))))
-
-(cl-defmethod transient-infix-value ((_   transient-variable))
-  "Return nil, which means \"no value\".
-
-Setting the value of a variable is done by, well, setting the
-value of the variable.  I.e., this is a side-effect and does
-not contribute to the value of the transient."
-  nil)
-
-;;;; Utilities
-
-(defun transient-arg-value (arg args)
-  "Return the value of ARG as it appears in ARGS.
-
-For a switch return a boolean.  For an option return the value as
-a string, using the empty string for the empty value, or nil if
-the option does not appear in ARGS."
-  (if (string-suffix-p "=" arg)
-      (save-match-data
-        (and-let* ((match (let ((case-fold-search nil)
-                                (re (format "\\`%s\\(?:=\\(.+\\)\\)?\\'"
-                                            (substring arg 0 -1))))
-                            (cl-find-if (lambda (a)
-                                          (and (stringp a)
-                                               (string-match re a)))
-                                        args))))
-          (or (match-string 1 match) "")))
-    (and (member arg args) t)))
-
-(defun transient-scope ()
-  "Return the value of the `scope' slot of the current prefix."
-  (oref (transient-prefix-object) scope))
-
-;;; History
-
-(cl-defgeneric transient--history-key (obj)
-  "Return OBJ's history key.
-If the value of the `history-key' slot is non-nil, then return
-that.  Otherwise return the value of the `command' slot."
-  (or (oref obj history-key)
-      (oref obj command)))
-
-(cl-defgeneric transient--history-push (obj)
-  "Push the current value of OBJ to its entry in `transient-history'."
-  (let ((key (transient--history-key obj)))
-    (setf (alist-get key transient-history)
-          (let ((args (transient-get-value)))
-            (cons args (delete args (alist-get key transient-history)))))))
-
-(cl-defgeneric transient--history-init (obj)
-  "Initialize OBJ's `history' slot.
-This is the transient-wide history; many individual infixes also
-have a history of their own.")
-
-(cl-defmethod transient--history-init ((obj transient-prefix))
-  "Initialize OBJ's `history' slot from the variable `transient-history'."
-  (let ((val (oref obj value)))
-    (oset obj history
-          (cons val (delete val (alist-get (transient--history-key obj)
-                                           transient-history))))))
-
-;;; Draw
-
-(defun transient--show-brief ()
-  (let ((message-log-max nil))
-    (if (and transient-show-popup (<= transient-show-popup 0))
-        (message "%s-" (key-description (this-command-keys)))
-      (message
-       "%s- [%s] %s"
-       (key-description (this-command-keys))
-       (oref transient--prefix command)
-       (mapconcat
-        #'identity
-        (sort
-         (cl-mapcan
-          (lambda (suffix)
-            (let ((key (kbd (oref suffix key))))
-              ;; Don't list any common commands.
-              (and (not (memq (oref suffix command)
-                              `(,(lookup-key transient-map key)
-                                ,(lookup-key transient-sticky-map key)
-                                ;; From transient-common-commands:
-                                transient-set
-                                transient-save
-                                transient-history-prev
-                                transient-history-next
-                                transient-quit-one
-                                transient-toggle-common
-                                transient-set-level)))
-                   (list (propertize (oref suffix key) 'face 'transient-key)))))
-          transient--suffixes)
-         #'string<)
-        (propertize "|" 'face 'transient-delimiter))))))
-
-(defun transient--show ()
-  (transient--timer-cancel)
-  (setq transient--showp t)
-  (let ((transient--shadowed-buffer (current-buffer))
-        (focus nil))
-    (setq transient--buffer (get-buffer-create transient--buffer-name))
-    (with-current-buffer transient--buffer
-      (when transient-enable-popup-navigation
-        (setq focus (or (button-get (point) 'command)
-                        (and (not (bobp))
-                             (button-get (1- (point)) 'command))
-                        (transient--heading-at-point))))
-      (erase-buffer)
-      (run-hooks 'transient-setup-buffer-hook)
-      (when transient-force-fixed-pitch
-        (transient--force-fixed-pitch))
-      (setq window-size-fixed t)
-      (when (bound-and-true-p tab-line-format)
-        (setq tab-line-format nil))
-      (setq header-line-format nil)
-      (setq mode-line-format
-            (if (or (natnump transient-mode-line-format)
-                    (eq transient-mode-line-format 'line))
-                nil
-              transient-mode-line-format))
-      (setq mode-line-buffer-identification
-            (symbol-name (oref transient--prefix command)))
-      (if transient-enable-popup-navigation
-          (setq-local cursor-in-non-selected-windows 'box)
-        (setq cursor-type nil))
-      (setq display-line-numbers nil)
-      (setq show-trailing-whitespace nil)
-      (transient--insert-groups)
-      (when (or transient--helpp transient--editp)
-        (transient--insert-help))
-      (when-let ((line (transient--separator-line)))
-        (insert line)))
-    (unless (window-live-p transient--window)
-      (setq transient--window
-            (display-buffer transient--buffer
-                            transient-display-buffer-action)))
-    (when (window-live-p transient--window)
-      (with-selected-window transient--window
-        (set-window-parameter nil 'prev--no-other-window
-                              (window-parameter nil 'no-other-window))
-        (set-window-parameter nil 'no-other-window t)
-        (goto-char (point-min))
-        (when transient-enable-popup-navigation
-          (transient--goto-button focus))
-        (transient--fit-window-to-buffer transient--window)))))
-
-(defun transient--fit-window-to-buffer (window)
-  (let ((window-resize-pixelwise t)
-        (window-size-fixed nil))
-    (if (eq (car (window-parameter window 'quit-restore)) 'other)
-        ;; Grow but never shrink window that previously displayed
-        ;; another buffer and is going to display that again.
-        (fit-window-to-buffer window nil (window-height window))
-      (fit-window-to-buffer window nil 1))))
-
-(defun transient--separator-line ()
-  (and-let* ((height (cond ((not window-system) nil)
-                           ((natnump transient-mode-line-format)
-                            transient-mode-line-format)
-                           ((eq transient-mode-line-format 'line) 1)))
-             (face `(,@(and (>= emacs-major-version 27) '(:extend t))
-                     :background
-                     ,(or (face-foreground (transient--key-face nil 'non-suffix)
-                                           nil t)
-                          "#gray60"))))
-    (concat (propertize "__" 'face face 'display `(space :height (,height)))
-            (propertize "\n" 'face face 'line-height t))))
-
-(defmacro transient-with-shadowed-buffer (&rest body)
-  "While in the transient buffer, temporarily make the shadowed buffer current."
-  (declare (indent 0) (debug t))
-  `(with-current-buffer (or transient--shadowed-buffer (current-buffer))
-     ,@body))
-
-(defun transient--insert-groups ()
-  (let ((groups (cl-mapcan (lambda (group)
-                             (let ((hide (oref group hide)))
-                               (and (not (and (functionp hide)
-                                              (transient-with-shadowed-buffer
-                                                (funcall hide))))
-                                    (list group))))
-                           transient--layout)))
-    (while-let ((group (pop groups)))
-      (transient--insert-group group)
-      (when groups
-        (insert ?\n)))))
-
-(defvar transient--max-group-level 1)
-
-(cl-defgeneric transient--insert-group (group)
-  "Format GROUP and its elements and insert the result.")
-
-(cl-defmethod transient--insert-group :around ((group transient-group))
-  "Insert GROUP's description, if any."
-  (when-let ((desc (transient-with-shadowed-buffer
-                     (transient-format-description group))))
-    (insert desc ?\n))
-  (let ((transient--max-group-level
-         (max (oref group level) transient--max-group-level))
-        (transient--pending-group group))
-    (cl-call-next-method group)))
-
-(cl-defmethod transient--insert-group ((group transient-row))
-  (transient--maybe-pad-keys group)
-  (dolist (suffix (oref group suffixes))
-    (insert (transient-with-shadowed-buffer (transient-format suffix)))
-    (insert "   "))
-  (insert ?\n))
-
-(cl-defmethod transient--insert-group ((group transient-column)
-                                       &optional skip-empty)
-  (transient--maybe-pad-keys group)
-  (dolist (suffix (oref group suffixes))
-    (let ((str (transient-with-shadowed-buffer (transient-format suffix))))
-      (unless (and (not skip-empty) (equal str ""))
-        (insert str)
-        (unless (string-match-p ".\n\\'" str)
-          (insert ?\n))))))
-
-(cl-defmethod transient--insert-group ((group transient-columns))
-  (if transient-force-single-column
-      (dolist (group (oref group suffixes))
-        (transient--insert-group group t))
-    (let* ((columns
-            (mapcar
-             (lambda (column)
-               (transient--maybe-pad-keys column group)
-               (transient-with-shadowed-buffer
-                 `(,@(and-let* ((desc (transient-format-description column)))
-                       (list desc))
-                   ,@(let ((transient--pending-group column))
-                       (mapcar #'transient-format (oref column suffixes))))))
-             (oref group suffixes)))
-           (stops (transient--column-stops columns)))
-      (dolist (row (apply #'transient--mapn #'list columns))
-        (let ((stops stops))
-          (dolist (cell row)
-            (let ((stop (pop stops)))
-              (when cell
-                (transient--align-to stop)
-                (insert cell)))))
-        (insert ?\n)))))
-
-(cl-defmethod transient--insert-group ((group transient-subgroups))
-  (let ((subgroups (oref group suffixes)))
-    (while-let ((subgroup (pop subgroups)))
-      (transient--maybe-pad-keys subgroup group)
-      (transient--insert-group subgroup)
-      (when subgroups
-        (insert ?\n)))))
-
-(cl-defgeneric transient-format (obj)
-  "Format and return OBJ for display.
-
-When this function is called, then the current buffer is some
-temporary buffer.  If you need the buffer from which the prefix
-command was invoked to be current, then do so by temporarily
-making `transient--original-buffer' current.")
-
-(cl-defmethod transient-format ((arg string))
-  "Return the string ARG after applying the `transient-heading' face."
-  (propertize arg 'face 'transient-heading))
-
-(cl-defmethod transient-format ((_   null))
-  "Return a string containing just the newline character."
-  "\n")
-
-(cl-defmethod transient-format ((arg integer))
-  "Return a string containing just the ARG character."
-  (char-to-string arg))
-
-(cl-defmethod transient-format :around ((obj transient-suffix))
-  "Add additional formatting if appropriate.
-When reading user input for this infix, then highlight it.
-When edit-mode is enabled, then prepend the level information.
-When `transient-enable-popup-navigation' is non-nil then format
-as a button."
-  (let ((str (cl-call-next-method obj)))
-    (when (and (cl-typep obj 'transient-infix)
-               (eq (oref obj command) this-original-command)
-               (active-minibuffer-window))
-      (setq str (transient--add-face str 'transient-active-infix)))
-    (when transient--editp
-      (setq str (concat (let ((level (oref obj level)))
-                          (propertize (format " %s " level)
-                                      'face (if (transient--use-level-p level t)
-                                                'transient-enabled-suffix
-                                              'transient-disabled-suffix)))
-                        str)))
-    (when (and transient-enable-popup-navigation
-               (slot-boundp obj 'command))
-      (setq str (make-text-button str nil
-                                  'type 'transient
-                                  'command (oref obj command))))
-    str))
-
-(cl-defmethod transient-format ((obj transient-infix))
-  "Return a string generated using OBJ's `format'.
-%k is formatted using `transient-format-key'.
-%d is formatted using `transient-format-description'.
-%v is formatted using `transient-format-value'."
-  (format-spec (oref obj format)
-               `((?k . ,(transient-format-key obj))
-                 (?d . ,(transient-format-description obj))
-                 (?v . ,(transient-format-value obj)))))
-
-(cl-defmethod transient-format ((obj transient-suffix))
-  "Return a string generated using OBJ's `format'.
-%k is formatted using `transient-format-key'.
-%d is formatted using `transient-format-description'."
-  (format-spec (oref obj format)
-               `((?k . ,(transient-format-key obj))
-                 (?d . ,(transient-format-description obj)))))
-
-(cl-defgeneric transient-format-key (obj)
-  "Format OBJ's `key' for display and return the result.")
-
-(cl-defmethod transient-format-key :around ((obj transient-suffix))
-  "Add `transient-inapt-suffix' face if suffix is inapt."
-  (let ((str (cl-call-next-method)))
-    (if (oref obj inapt)
-        (transient--add-face str 'transient-inapt-suffix)
-      str)))
-
-(cl-defmethod transient-format-key ((obj transient-suffix))
-  "Format OBJ's `key' for display and return the result."
-  (let ((key (if (slot-boundp obj 'key) (oref obj key) ""))
-        (cmd (and (slot-boundp obj 'command) (oref obj command))))
-    (when-let ((width (oref transient--pending-group pad-keys)))
-      (setq key (truncate-string-to-width key width nil ?\s)))
-    (if transient--redisplay-key
-        (let ((len (length transient--redisplay-key))
-              (seq (cl-coerce (edmacro-parse-keys key t) 'list)))
-          (cond
-           ((member (seq-take seq len)
-                    (list transient--redisplay-key
-                          (thread-last transient--redisplay-key
-                            (cl-substitute ?- 'kp-subtract)
-                            (cl-substitute ?= 'kp-equal)
-                            (cl-substitute ?+ 'kp-add))))
-            (let ((pre (key-description (vconcat (seq-take seq len))))
-                  (suf (key-description (vconcat (seq-drop seq len)))))
-              (setq pre (string-replace "RET" "C-m" pre))
-              (setq pre (string-replace "TAB" "C-i" pre))
-              (setq suf (string-replace "RET" "C-m" suf))
-              (setq suf (string-replace "TAB" "C-i" suf))
-              ;; We use e.g., "-k" instead of the more correct "- k",
-              ;; because the former is prettier.  If we did that in
-              ;; the definition, then we want to drop the space that
-              ;; is reinserted above.  False-positives are possible
-              ;; for silly bindings like "-C-c C-c".
-              (unless (string-search " " key)
-                (setq pre (string-replace " " "" pre))
-                (setq suf (string-replace " " "" suf)))
-              (concat (propertize pre 'face 'transient-unreachable-key)
-                      (and (string-prefix-p (concat pre " ") key) " ")
-                      (propertize suf 'face (transient--key-face cmd))
-                      (save-excursion
-                        (and (string-match " +\\'" key)
-                             (propertize (match-string 0 key)
-                                         'face 'fixed-pitch))))))
-           ((transient--lookup-key transient-sticky-map (kbd key))
-            (propertize key 'face (transient--key-face cmd)))
-           (t
-            (propertize key 'face 'transient-unreachable-key))))
-      (propertize key 'face (transient--key-face cmd)))))
-
-(cl-defmethod transient-format-key :around ((obj transient-argument))
-  "Handle `transient-highlight-mismatched-keys'."
-  (let ((key (cl-call-next-method obj)))
-    (cond
-     ((not transient-highlight-mismatched-keys) key)
-     ((not (slot-boundp obj 'shortarg))
-      (transient--add-face key 'transient-nonstandard-key))
-     ((not (string-equal key (oref obj shortarg)))
-      (transient--add-face key 'transient-mismatched-key))
-     (key))))
-
-(cl-defgeneric transient-format-description (obj)
-  "Format OBJ's `description' for display and return the result.")
-
-(cl-defmethod transient-format-description ((obj transient-suffix))
-  "The `description' slot may be a function, in which case that is
-called inside the correct buffer (see `transient--insert-group')
-and its value is returned to the caller."
-  (transient--get-description obj))
-
-(cl-defmethod transient-format-description ((obj transient-value-preset))
-  (pcase-let* (((eieio description key set) obj)
-               ((eieio value) transient--prefix)
-               (active (seq-set-equal-p set value)))
-    (format
-     "%s %s"
-     (propertize (or description (format "Preset %s" key))
-                 'face (and active 'transient-argument))
-     (format (propertize "(%s)" 'face 'transient-delimiter)
-             (mapconcat (lambda (arg)
-                          (propertize
-                           arg 'face (cond (active 'transient-argument)
-                                           ((member arg value)
-                                            '((:weight demibold)
-                                              transient-inactive-argument))
-                                           ('transient-inactive-argument))))
-                        set " ")))))
-
-(cl-defmethod transient-format-description ((obj transient-group))
-  "Format the description by calling the next method.
-If the result doesn't use the `face' property at all, then apply the
-face `transient-heading' to the complete string."
-  (and-let* ((desc (transient--get-description obj)))
-    (cond ((oref obj inapt)
-           (propertize desc 'face 'transient-inapt-suffix))
-          ((text-property-not-all 0 (length desc) 'face nil desc)
-           desc)
-          ((propertize desc 'face 'transient-heading)))))
-
-(cl-defmethod transient-format-description :around ((obj transient-suffix))
-  "Format the description by calling the next method.
-If the result is nil, then use \"(BUG: no description)\" as the
-description.  If the OBJ's `key' is currently unreachable, then
-apply the face `transient-unreachable' to the complete string."
-  (let ((desc (or (cl-call-next-method obj)
-                  (and (slot-boundp transient--prefix 'suffix-description)
-                       (funcall (oref transient--prefix suffix-description)
-                                obj)))))
-    (if desc
-        (when-let ((face (transient--get-face obj 'face)))
-          (setq desc (transient--add-face desc face t)))
-      (setq desc (propertize "(BUG: no description)" 'face 'error)))
-    (when (if transient--all-levels-p
-              (> (oref obj level) transient--default-prefix-level)
-            (and transient-highlight-higher-levels
-                 (> (max (oref obj level) transient--max-group-level)
-                    transient--default-prefix-level)))
-      (setq desc (transient--add-face desc 'transient-higher-level)))
-    (when-let ((inapt-face (and (oref obj inapt)
-                                (transient--get-face obj 'inapt-face))))
-      (setq desc (transient--add-face desc inapt-face)))
-    (when (and (slot-boundp obj 'key)
-               (transient--key-unreachable-p obj))
-      (setq desc (transient--add-face desc 'transient-unreachable)))
-    desc))
-
-(cl-defgeneric transient-format-value (obj)
-  "Format OBJ's value for display and return the result.")
-
-(cl-defmethod transient-format-value ((obj transient-suffix))
-  (propertize (oref obj argument)
-              'face (if (oref obj value)
-                        'transient-argument
-                      'transient-inactive-argument)))
-
-(cl-defmethod transient-format-value ((obj transient-option))
-  (let ((argument (oref obj argument)))
-    (if-let ((value (oref obj value)))
-        (pcase-exhaustive (oref obj multi-value)
-          ('nil
-           (concat (propertize argument 'face 'transient-argument)
-                   (propertize value    'face 'transient-value)))
-          ((or 't 'rest)
-           (concat (propertize (if (string-suffix-p " " argument)
-                                   argument
-                                 (concat argument " "))
-                               'face 'transient-argument)
-                   (propertize (mapconcat #'prin1-to-string value " ")
-                               'face 'transient-value)))
-          ('repeat
-           (mapconcat (lambda (value)
-                        (concat (propertize argument 'face 'transient-argument)
-                                (propertize value    'face 'transient-value)))
-                      value " ")))
-      (propertize argument 'face 'transient-inactive-argument))))
-
-(cl-defmethod transient-format-value ((obj transient-switches))
-  (with-slots (value argument-format choices) obj
-    (format (propertize argument-format
-                        'face (if value
-                                  'transient-argument
-                                'transient-inactive-argument))
-            (format
-             (propertize "[%s]" 'face 'transient-delimiter)
-             (mapconcat
-              (lambda (choice)
-                (propertize choice 'face
-                            (if (equal (format argument-format choice) value)
-                                'transient-value
-                              'transient-inactive-value)))
-              choices
-              (propertize "|" 'face 'transient-delimiter))))))
-
-(cl-defmethod transient--get-description ((obj transient-child))
-  (and-let* ((desc (oref obj description)))
-    (if (functionp desc)
-        (if (= (car (transient--func-arity desc)) 1)
-            (funcall desc obj)
-          (funcall desc))
-      desc)))
-
-(cl-defmethod transient--get-face ((obj transient-suffix) slot)
-  (and-let* (((slot-boundp obj slot))
-             (face (slot-value obj slot)))
-    (if (and (not (facep face))
-             (functionp face))
-        (let ((transient--pending-suffix obj))
-          (if (= (car (transient--func-arity face)) 1)
-              (funcall face obj)
-            (funcall face)))
-      face)))
-
-(defun transient--add-face (string face &optional append beg end)
-  (let ((str (copy-sequence string)))
-    (add-face-text-property (or beg 0) (or end (length str)) face append str)
-    str))
-
-(defun transient--key-face (&optional cmd enforce-type)
-  (or (and transient-semantic-coloring
-           (not transient--helpp)
-           (not transient--editp)
-           (or (and cmd (get cmd 'transient-face))
-               (get (transient--get-pre-command cmd enforce-type)
-                    'transient-face)))
-      (if cmd 'transient-key 'transient-key-noop)))
-
-(defun transient--key-unreachable-p (obj)
-  (and transient--redisplay-key
-       (let ((key (oref obj key)))
-         (not (or (equal (seq-take (cl-coerce (edmacro-parse-keys key t) 'list)
-                                   (length transient--redisplay-key))
-                         transient--redisplay-key)
-                  (transient--lookup-key transient-sticky-map (kbd key)))))))
-
-(defun transient--lookup-key (keymap key)
-  (let ((val (lookup-key keymap key)))
-    (and val (not (integerp val)) val)))
-
-(defun transient--maybe-pad-keys (group &optional parent)
-  (when-let ((pad (or (oref group pad-keys)
-                      (and parent (oref parent pad-keys)))))
-    (oset group pad-keys
-          (apply #'max
-                 (if (integerp pad) pad 0)
-                 (seq-keep (lambda (suffix)
-                             (and (eieio-object-p suffix)
-                                  (slot-boundp suffix 'key)
-                                  (length (oref suffix key))))
-                           (oref group suffixes))))))
-
-(defun transient--pixel-width (string)
-  (save-window-excursion
-    (with-temp-buffer
-      (insert string)
-      (set-window-dedicated-p nil nil)
-      (set-window-buffer nil (current-buffer))
-      (car (window-text-pixel-size
-            nil (line-beginning-position) (point))))))
-
-(defun transient--column-stops (columns)
-  (let* ((var-pitch (or transient-align-variable-pitch
-                        (oref transient--prefix variable-pitch)))
-         (char-width (and var-pitch (transient--pixel-width " "))))
-    (transient--seq-reductions-from
-     (apply-partially #'+ (* 2 (if var-pitch char-width 1)))
-     (transient--mapn
-      (lambda (cells min)
-        (apply #'max
-               (if min (if var-pitch (* min char-width) min) 0)
-               (mapcar (if var-pitch #'transient--pixel-width #'length) cells)))
-      columns
-      (oref transient--prefix column-widths))
-     0)))
-
-(defun transient--align-to (stop)
-  (unless (zerop stop)
-    (insert (if (or transient-align-variable-pitch
-                    (oref transient--prefix variable-pitch))
-                (propertize " " 'display `(space :align-to (,stop)))
-              (make-string (max 0 (- stop (current-column))) ?\s)))))
-
-(defun transient-command-summary-or-name (obj)
-  "Return the summary or name of the command represented by OBJ.
-
-If the command has a doc-string, then return the first line of
-that, else its name.
-
-Intended to be temporarily used as the `:suffix-description' of
-a prefix command, while porting a regular keymap to a transient."
-  (let ((command (oref obj command)))
-    (if-let ((doc (documentation command)))
-        (propertize (car (split-string doc "\n")) 'face 'font-lock-doc-face)
-      (propertize (symbol-name command) 'face 'font-lock-function-name-face))))
-
-;;; Help
-
-(cl-defgeneric transient-show-help (obj)
-  "Show documentation for the command represented by OBJ.")
-
-(cl-defmethod transient-show-help ((obj transient-prefix))
-  "Call `show-help' if non-nil, else show `info-manual',
-if non-nil, else show the `man-page' if non-nil, else use
-`describe-function'."
-  (with-slots (show-help info-manual man-page command) obj
-    (cond (show-help (funcall show-help obj))
-          (info-manual (transient--show-manual info-manual))
-          (man-page (transient--show-manpage man-page))
-          ((transient--describe-function command)))))
-
-(cl-defmethod transient-show-help ((obj transient-suffix))
-  "Call `show-help' if non-nil, else use `describe-function'.
-Also used to dispatch showing documentation for the current
-prefix.  If the suffix is a sub-prefix, then also call the
-prefix method."
-  (cond
-   ((eq this-command 'transient-help)
-    (transient-show-help transient--prefix))
-   ((let ((prefix (get (oref obj command)
-                       'transient--prefix)))
-      (and prefix (not (eq (oref transient--prefix command) this-command))
-           (prog1 t (transient-show-help prefix)))))
-   ((if-let ((show-help (oref obj show-help)))
-        (funcall show-help obj)
-      (transient--describe-function this-command)))))
-
-(cl-defmethod transient-show-help ((obj transient-infix))
-  "Call `show-help' if non-nil, else show the `man-page'
-if non-nil, else use `describe-function'.  When showing the
-manpage, then try to jump to the correct location."
-  (if-let ((show-help (oref obj show-help)))
-      (funcall show-help obj)
-    (if-let ((man-page (oref transient--prefix man-page))
-             (argument (and (slot-boundp obj 'argument)
-                            (oref obj argument))))
-        (transient--show-manpage man-page argument)
-      (transient--describe-function this-command))))
-
-;; `cl-generic-generalizers' doesn't support `command' et al.
-(cl-defmethod transient-show-help (cmd)
-  "Show the command doc-string."
-  (transient--describe-function cmd))
-
-(defmacro transient-with-help-window (&rest body)
-  "Evaluate BODY, send output to *Help* buffer, and display it in a window.
-Select the help window, and make the help buffer current and return it."
-  (declare (indent 0))
-  `(let ((buffer nil)
-         (help-window-select t))
-     (with-help-window (help-buffer)
-       ,@body
-       (setq buffer (current-buffer)))
-     (set-buffer buffer)))
-
-(defun transient--describe-function (fn)
-  (let* ((buffer nil)
-         (help-window-select t)
-         (temp-buffer-window-setup-hook
-          (cons (lambda () (setq buffer (current-buffer)))
-                temp-buffer-window-setup-hook)))
-    (describe-function fn)
-    (set-buffer buffer)))
-
-(defun transient--show-manual (manual)
-  (info manual))
-
-(defun transient--show-manpage (manpage &optional argument)
-  (require 'man)
-  (let* ((Man-notify-method 'meek)
-         (buf (Man-getpage-in-background manpage))
-         (proc (get-buffer-process buf)))
-    (while (and proc (eq (process-status proc) 'run))
-      (accept-process-output proc))
-    (switch-to-buffer buf)
-    (when argument
-      (transient--goto-argument-description argument))))
-
-(defun transient--goto-argument-description (arg)
-  (goto-char (point-min))
-  (let ((case-fold-search nil)
-        ;; This matches preceding/proceeding options.  Options
-        ;; such as "-a", "-S[<keyid>]", and "--grep=<pattern>"
-        ;; are matched by this regex without the shy group.
-        ;; The ". " in the shy group is for options such as
-        ;; "-m parent-number", and the "-[^[:space:]]+ " is
-        ;; for options such as "--mainline parent-number"
-        (others "-\\(?:. \\|-[^[:space:]]+ \\)?[^[:space:]]+"))
-    (when (re-search-forward
-           (if (equal arg "--")
-               ;; Special case.
-               "^[\t\s]+\\(--\\(?: \\|$\\)\\|\\[--\\]\\)"
-             ;; Should start with whitespace and may have
-             ;; any number of options before and/or after.
-             (format
-              "^[\t\s]+\\(?:%s, \\)*?\\(?1:%s\\)%s\\(?:, %s\\)*$"
-              others
-              ;; Options don't necessarily end in an "="
-              ;; (e.g., "--gpg-sign[=<keyid>]")
-              (string-remove-suffix "=" arg)
-              ;; Simple options don't end in an "=".  Splitting this
-              ;; into 2 cases should make getting false positives
-              ;; less likely.
-              (if (string-suffix-p "=" arg)
-                  ;; "[^[:space:]]*[^.[:space:]]" matches the option
-                  ;; value, which is usually after the option name
-                  ;; and either '=' or '[='.  The value can't end in
-                  ;; a period, as that means it's being used at the
-                  ;; end of a sentence.  The space is for options
-                  ;; such as '--mainline parent-number'.
-                  "\\(?: \\|\\[?=\\)[^[:space:]]*[^.[:space:]]"
-                ;; Either this doesn't match anything (e.g., "-a"),
-                ;; or the option is followed by a value delimited
-                ;; by a "[", "<", or ":".  A space might appear
-                ;; before this value, as in "-f <file>".  The
-                ;; space alternative is for options such as
-                ;; "-m parent-number".
-                "\\(?:\\(?: \\| ?[\\[<:]\\)[^[:space:]]*[^.[:space:]]\\)?")
-              others))
-           nil t)
-      (goto-char (match-beginning 1)))))
-
-(defun transient--insert-help ()
-  (unless (looking-back "\n\n" 2)
-    (insert "\n"))
-  (when transient--helpp
-    (insert
-     (format (propertize "\
-Type a %s to show help for that suffix command, or %s to show manual.
-Type %s to exit help.\n"
-                         'face 'transient-heading)
-             (propertize "<KEY>" 'face 'transient-key)
-             (propertize "?"     'face 'transient-key)
-             (propertize "C-g"   'face 'transient-key))))
-  (when transient--editp
-    (unless transient--helpp
-      (insert
-       (format (propertize "\
-Type a %s to set level for that suffix command.
-Type %s to set what levels are available for this prefix command.\n"
-                           'face 'transient-heading)
-               (propertize "<KEY>" 'face 'transient-key)
-               (propertize "C-x l" 'face 'transient-key))))
-    (with-slots (level) transient--prefix
-      (insert
-       (format (propertize "
-Suffixes on levels %s are available.
-Suffixes on levels %s and %s are unavailable.\n"
-                           'face 'transient-heading)
-               (propertize (format "1-%s" level)
-                           'face 'transient-enabled-suffix)
-               (propertize " 0 "
-                           'face 'transient-disabled-suffix)
-               (propertize (format ">=%s" (1+ level))
-                           'face 'transient-disabled-suffix))))))
-
-;;; Popup Navigation
-
-(defun transient-scroll-up (&optional arg)
-  "Scroll text of transient popup window upward ARG lines.
-If ARG is nil scroll near full screen.  This is a wrapper
-around `scroll-up-command' (which see)."
-  (interactive "^P")
-  (with-selected-window transient--window
-    (scroll-up-command arg)))
-
-(defun transient-scroll-down (&optional arg)
-  "Scroll text of transient popup window down ARG lines.
-If ARG is nil scroll near full screen.  This is a wrapper
-around `scroll-down-command' (which see)."
-  (interactive "^P")
-  (with-selected-window transient--window
-    (scroll-down-command arg)))
-
-(defun transient-backward-button (n)
-  "Move to the previous button in the transient popup buffer.
-See `backward-button' for information about N."
-  (interactive "p")
-  (with-selected-window transient--window
-    (backward-button n t)))
-
-(defun transient-forward-button (n)
-  "Move to the next button in the transient popup buffer.
-See `forward-button' for information about N."
-  (interactive "p")
-  (with-selected-window transient--window
-    (forward-button n t)))
-
-(define-button-type 'transient
-  'face nil
-  'keymap transient-button-map)
-
-(defun transient--goto-button (command)
-  (cond
-   ((stringp command)
-    (when (re-search-forward (concat "^" (regexp-quote command)) nil t)
-      (goto-char (match-beginning 0))))
-   (command
-    (while (and (ignore-errors (forward-button 1))
-                (not (eq (button-get (button-at (point)) 'command) command))))
-    (unless (eq (button-get (button-at (point)) 'command) command)
-      (goto-char (point-min))
-      (forward-button 1)))))
-
-(defun transient--heading-at-point ()
-  (and (eq (get-text-property (point) 'face) 'transient-heading)
-       (let ((beg (line-beginning-position)))
-         (buffer-substring-no-properties
-          beg (next-single-property-change
-               beg 'face nil (line-end-position))))))
-
-;;; Compatibility
-;;;; Popup Isearch
-
-(defvar-keymap transient--isearch-mode-map
-  :parent isearch-mode-map
-  "<remap> <isearch-exit>"   #'transient-isearch-exit
-  "<remap> <isearch-cancel>" #'transient-isearch-cancel
-  "<remap> <isearch-abort>"  #'transient-isearch-abort)
-
-(defun transient-isearch-backward (&optional regexp-p)
-  "Do incremental search backward.
-With a prefix argument, do an incremental regular expression
-search instead."
-  (interactive "P")
-  (transient--isearch-setup)
-  (let ((isearch-mode-map transient--isearch-mode-map))
-    (isearch-mode nil regexp-p)))
-
-(defun transient-isearch-forward (&optional regexp-p)
-  "Do incremental search forward.
-With a prefix argument, do an incremental regular expression
-search instead."
-  (interactive "P")
-  (transient--isearch-setup)
-  (let ((isearch-mode-map transient--isearch-mode-map))
-    (isearch-mode t regexp-p)))
-
-(defun transient-isearch-exit ()
-  "Like `isearch-exit' but adapted for `transient'."
-  (interactive)
-  (isearch-exit)
-  (transient--isearch-exit))
-
-(defun transient-isearch-cancel ()
-  "Like `isearch-cancel' but adapted for `transient'."
-  (interactive)
-  (condition-case nil (isearch-cancel) (quit))
-  (transient--isearch-exit))
-
-(defun transient-isearch-abort ()
-  "Like `isearch-abort' but adapted for `transient'."
-  (interactive)
-  (let ((around (lambda (fn)
-                  (condition-case nil (funcall fn) (quit))
-                  (transient--isearch-exit))))
-    (advice-add 'isearch-cancel :around around)
-    (unwind-protect
-        (isearch-abort)
-      (advice-remove 'isearch-cancel around))))
-
-(defun transient--isearch-setup ()
-  (select-window transient--window)
-  (transient--suspend-override t))
-
-(defun transient--isearch-exit ()
-  (select-window transient--original-window)
-  (transient--resume-override))
-
-;;;; Edebug
-
-(defun transient--edebug-command-p ()
-  (and (bound-and-true-p edebug-active)
-       (or (memq this-command '(top-level abort-recursive-edit))
-           (string-prefix-p "edebug" (symbol-name this-command)))))
-
-;;;; Miscellaneous
-
-(cl-pushnew (list nil (concat "^\\s-*("
-                              (eval-when-compile
-                                (regexp-opt
-                                 '("transient-define-prefix"
-                                   "transient-define-suffix"
-                                   "transient-define-infix"
-                                   "transient-define-argument")
-                                 t))
-                              "\\s-+\\(" lisp-mode-symbol-regexp "\\)")
-                  2)
-            lisp-imenu-generic-expression :test #'equal)
-
-(declare-function which-key-mode "which-key" (&optional arg))
-
-(defun transient--suspend-which-key-mode ()
-  (when (bound-and-true-p which-key-mode)
-    (which-key-mode -1)
-    (add-hook 'transient-exit-hook #'transient--resume-which-key-mode)))
-
-(defun transient--resume-which-key-mode ()
-  (unless transient--prefix
-    (which-key-mode 1)
-    (remove-hook 'transient-exit-hook #'transient--resume-which-key-mode)))
-
-(defun transient-bind-q-to-quit ()
-  "Modify some keymaps to bind \"q\" to the appropriate quit command.
-
-\"C-g\" is the default binding for such commands now, but Transient's
-predecessor Magit-Popup used \"q\" instead.  If you would like to get
-that binding back, then call this function in your init file like so:
-
-  (with-eval-after-load \\='transient
-    (transient-bind-q-to-quit))
-
-Individual transients may already bind \"q\" to something else
-and such a binding would shadow the quit binding.  If that is the
-case then \"Q\" is bound to whatever \"q\" would have been bound
-to by setting `transient-substitute-key-function' to a function
-that does that.  Of course \"Q\" may already be bound to something
-else, so that function binds \"M-q\" to that command instead.
-Of course \"M-q\" may already be bound to something else, but
-we stop there."
-  (keymap-set transient-base-map   "q" #'transient-quit-one)
-  (keymap-set transient-sticky-map "q" #'transient-quit-seq)
-  (setq transient-substitute-key-function
-        #'transient-rebind-quit-commands))
-
-(defun transient-rebind-quit-commands (obj)
-  "See `transient-bind-q-to-quit'."
-  (let ((key (oref obj key)))
-    (cond ((string-equal key "q") "Q")
-          ((string-equal key "Q") "M-q")
-          (key))))
-
-(defun transient--force-fixed-pitch ()
-  (require 'face-remap)
-  (face-remap-reset-base 'default)
-  (face-remap-add-relative 'default 'fixed-pitch))
-
-(defun transient--func-arity (fn)
-  (func-arity (advice--cd*r (if (symbolp fn) (symbol-function fn) fn))))
-
-(defun transient--seq-reductions-from (function sequence initial-value)
-  (let ((acc (list initial-value)))
-    (seq-doseq (elt sequence)
-      (push (funcall function (car acc) elt) acc))
-    (nreverse acc)))
-
-(defun transient--mapn (function &rest lists)
-  "Apply FUNCTION to elements of LISTS.
-Like `cl-mapcar' but while that stops when the shortest list
-is exhausted, continue until the longest list is, using nil
-as stand-in for elements of exhausted lists."
-  (let (result)
-    (while (catch 'more (mapc (lambda (l) (and l (throw 'more t))) lists) nil)
-      (push (apply function (mapcar #'car-safe lists)) result)
-      (setq lists (mapcar #'cdr lists)))
-    (nreverse result)))
-
-;;; Font-Lock
-
-(defconst transient-font-lock-keywords
-  (eval-when-compile
-    `((,(concat "("
-                (regexp-opt (list "transient-define-prefix"
-                                  "transient-define-infix"
-                                  "transient-define-argument"
-                                  "transient-define-suffix")
-                            t)
-                "\\_>[ \t'(]*"
-                "\\(\\(?:\\sw\\|\\s_\\)+\\)?")
-       (1 'font-lock-keyword-face)
-       (2 'font-lock-function-name-face nil t)))))
-
-(font-lock-add-keywords 'emacs-lisp-mode transient-font-lock-keywords)
-
-;;; Auxiliary Classes
-;;;; `transient-lisp-variable'
-
-(defclass transient-lisp-variable (transient-variable)
-  ((reader :initform #'transient-lisp-variable--reader)
-   (always-read :initform t)
-   (set-value :initarg :set-value :initform #'set))
-  "[Experimental] Class used for Lisp variables.")
-
-(cl-defmethod transient-init-value ((obj transient-lisp-variable))
-  (oset obj value (symbol-value (oref obj variable))))
-
-(cl-defmethod transient-infix-set ((obj transient-lisp-variable) value)
-  (funcall (oref obj set-value)
-           (oref obj variable)
-           (oset obj value value)))
-
-(cl-defmethod transient-format-description ((obj transient-lisp-variable))
-  (or (cl-call-next-method obj)
-      (symbol-name (oref obj variable))))
-
-(cl-defmethod transient-format-value ((obj transient-lisp-variable))
-  (propertize (prin1-to-string (oref obj value))
-              'face 'transient-value))
-
-(cl-defmethod transient-prompt ((obj transient-lisp-variable))
-  (if (and (slot-boundp obj 'prompt)
-           (oref obj prompt))
-      (cl-call-next-method obj)
-    (format "Set %s: " (oref obj variable))))
-
-(defun transient-lisp-variable--reader (prompt initial-input _history)
-  (read--expression prompt initial-input))
-
-;;; _
-(provide 'transient)
-;; Local Variables:
-;; indent-tabs-mode: nil
-;; checkdoc-symbol-words: ("command-line" "edit-mode" "help-mode")
-;; End:
-;;; transient.el ends here
diff --git a/emacs/elpa/transient-20240929.1847/transient.elc b/emacs/elpa/transient-20240929.1847/transient.elc
Binary files differ.
diff --git a/emacs/elpa/transient-20240929.1847/transient.info b/emacs/elpa/transient-20240929.1847/transient.info
@@ -1,3331 +0,0 @@
-This is transient.info, produced by makeinfo version 6.8 from
-transient.texi.
-
-     Copyright (C) 2018–2024 Free Software Foundation, Inc.
-
-     You can redistribute this document and/or modify it under the terms
-     of the GNU General Public License as published by the Free Software
-     Foundation, either version 3 of the License, or (at your option)
-     any later version.
-
-     This document is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     General Public License for more details.
-
-INFO-DIR-SECTION Emacs misc features
-START-INFO-DIR-ENTRY
-* Transient: (transient). Transient Commands.
-END-INFO-DIR-ENTRY
-
-
-File: transient.info,  Node: Top,  Next: Introduction,  Up: (dir)
-
-Transient User and Developer Manual
-***********************************
-
-Transient is the library used to implement the keyboard-driven “menus”
-in Magit.  It is distributed as a separate package, so that it can be
-used to implement similar menus in other packages.
-
-   This manual can be bit hard to digest when getting started.  A useful
-resource to get over that hurdle is Psionic K’s interactive tutorial,
-available at <https://github.com/positron-solutions/transient-showcase>.
-
-This manual is for Transient version 0.7.5.
-
-     Copyright (C) 2018–2024 Free Software Foundation, Inc.
-
-     You can redistribute this document and/or modify it under the terms
-     of the GNU General Public License as published by the Free Software
-     Foundation, either version 3 of the License, or (at your option)
-     any later version.
-
-     This document is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     General Public License for more details.
-
-* Menu:
-
-* Introduction::
-* Usage::
-* Modifying Existing Transients::
-* Defining New Commands::
-* Classes and Methods::
-* FAQ::
-* Keystroke Index::
-* Command and Function Index::
-* Variable Index::
-* Concept Index::
-* GNU General Public License::
-
-— The Detailed Node Listing —
-
-Usage
-
-* Invoking Transients::
-* Aborting and Resuming Transients::
-* Common Suffix Commands::
-* Saving Values::
-* Using History::
-* Getting Help for Suffix Commands::
-* Enabling and Disabling Suffixes::
-* Other Commands::
-* Configuration::
-
-Defining New Commands
-
-* Technical Introduction::
-* Defining Transients::
-* Binding Suffix and Infix Commands::
-* Defining Suffix and Infix Commands::
-* Using Infix Arguments::
-* Transient State::
-
-Binding Suffix and Infix Commands
-
-* Group Specifications::
-* Suffix Specifications::
-
-
-Classes and Methods
-
-* Group Classes::
-* Group Methods::
-* Prefix Classes::
-* Suffix Classes::
-* Suffix Methods::
-* Prefix Slots::
-* Suffix Slots::
-* Predicate Slots::
-
-Suffix Methods
-
-* Suffix Value Methods::
-* Suffix Format Methods::
-
-
-
-
-File: transient.info,  Node: Introduction,  Next: Usage,  Prev: Top,  Up: Top
-
-1 Introduction
-**************
-
-Transient is the library used to implement the keyboard-driven “menus”
-in Magit.  It is distributed as a separate package, so that it can be
-used to implement similar menus in other packages.
-
-   This manual can be bit hard to digest when getting started.  A useful
-resource to get over that hurdle is Psionic K’s interactive tutorial,
-available at <https://github.com/positron-solutions/transient-showcase>.
-
-Some things that Transient can do
-=================================
-
-   • Display current state of arguments
-   • Display and manage lifecycle of modal bindings
-   • Contextual user interface
-   • Flow control for wizard-like composition of interactive forms
-   • History & persistence
-   • Rendering arguments for controlling CLI programs
-
-Complexity in CLI programs
-==========================
-
-Complexity tends to grow with time.  How do you manage the complexity of
-commands?  Consider the humble shell command ‘ls’.  It now has over
-_fifty_ command line options.  Some of these are boolean flags (‘ls
--l’).  Some take arguments (‘ls --sort=s’).  Some have no effect unless
-paired with other flags (‘ls -lh’).  Some are mutually exclusive.  Some
-shell commands even have so many options that they introduce
-_subcommands_ (‘git branch’, ‘git commit’), each with their own rich set
-of options (‘git branch -f’).
-
-Using Transient for composing interactive commands
-==================================================
-
-What about Emacs commands used interactively?  How do these handle
-options?  One solution is to make many versions of the same command, so
-you don’t need to!  Consider: ‘delete-other-windows’ vs.
-‘delete-other-windows-vertically’ (among many similar examples).
-
-   Some Emacs commands will simply prompt you for the next "argument"
-(‘M-x switch-to-buffer’).  Another common solution is to use prefix
-arguments which usually start with ‘C-u’.  Sometimes these are sensibly
-numerical in nature (‘C-u 4 M-x forward-paragraph’ to move forward 4
-paragraphs).  But sometimes they function instead as boolean "switches"
-(‘C-u C-SPACE’ to jump to the last mark instead of just setting it, ‘C-u
-C-u C-SPACE’ to unconditionally set the mark).  Since there aren’t many
-standards for the use of prefix options, you have to read the command’s
-documentation to find out what the possibilities are.
-
-   But when an Emacs command grows to have a truly large set of options
-and arguments, with dependencies between them, lots of option values,
-etc., these simple approaches just don’t scale.  Transient is designed
-to solve this issue.  Think of it as the humble prefix argument ‘C-u’,
-_raised to the power of 10_.  Like ‘C-u’, it is key driven.  Like the
-shell, it supports boolean "flag" options, options that take arguments,
-and even "sub-commands", with their own options.  But instead of
-searching through a man page or command documentation, well-designed
-transients _guide_ their users to the relevant set of options (and even
-their possible values!)  directly, taking into account any important
-pre-existing Emacs settings.  And while for shell commands like ‘ls’,
-there is only one way to "execute" (hit ‘Return’!), transients can
-"execute" using multiple different keys tied to one of many
-self-documenting _actions_ (imagine having 5 different colored return
-keys on your keyboard!).  Transients make navigating and setting large,
-complex groups of command options and arguments easy.  Fun even.  Once
-you’ve tried it, it’s hard to go back to the ‘C-u what can I do here
-again?’ way.
-
-
-File: transient.info,  Node: Usage,  Next: Modifying Existing Transients,  Prev: Introduction,  Up: Top
-
-2 Usage
-*******
-
-* Menu:
-
-* Invoking Transients::
-* Aborting and Resuming Transients::
-* Common Suffix Commands::
-* Saving Values::
-* Using History::
-* Getting Help for Suffix Commands::
-* Enabling and Disabling Suffixes::
-* Other Commands::
-* Configuration::
-
-
-File: transient.info,  Node: Invoking Transients,  Next: Aborting and Resuming Transients,  Up: Usage
-
-2.1 Invoking Transients
-=======================
-
-A transient prefix command is invoked like any other command by pressing
-the key that is bound to that command.  The main difference to other
-commands is that a transient prefix command activates a transient
-keymap, which temporarily binds the transient’s infix and suffix
-commands.  Bindings from other keymaps may, or may not, be disabled
-while the transient state is in effect.
-
-   There are two kinds of commands that are available after invoking a
-transient prefix command; infix and suffix commands.  Infix commands set
-some value (which is then shown in a popup buffer), without leaving the
-transient.  Suffix commands, on the other hand, usually quit the
-transient and they may use the values set by the infix commands, i.e.,
-the infix *arguments*.
-
-   Instead of setting arguments to be used by a suffix command, infix
-commands may also set some value by side-effect, e.g., by setting the
-value of some variable.
-
-
-File: transient.info,  Node: Aborting and Resuming Transients,  Next: Common Suffix Commands,  Prev: Invoking Transients,  Up: Usage
-
-2.2 Aborting and Resuming Transients
-====================================
-
-To quit the transient without invoking a suffix command press ‘C-g’.
-
-   Key bindings in transient keymaps may be longer than a single event.
-After pressing a valid prefix key, all commands whose bindings do not
-begin with that prefix key are temporarily unavailable and grayed out.
-To abort the prefix key press ‘C-g’ (which in this case only quits the
-prefix key, but not the complete transient).
-
-   A transient prefix command can be bound as a suffix of another
-transient.  Invoking such a suffix replaces the current transient state
-with a new transient state, i.e., the available bindings change and the
-information displayed in the popup buffer is updated accordingly.
-Pressing ‘C-g’ while a nested transient is active only quits the
-innermost transient, causing a return to the previous transient.
-
-   ‘C-q’ or ‘C-z’ on the other hand always exits all transients.  If you
-use the latter, then you can later resume the stack of transients using
-‘M-x transient-resume’.
-
-‘C-g’ (‘transient-quit-seq’)
-‘C-g’ (‘transient-quit-one’)
-     This key quits the currently active incomplete key sequence, if
-     any, or else the current transient.  When quitting the current
-     transient, it returns to the previous transient, if any.
-
-   Transient’s predecessor bound ‘q’ instead of ‘C-g’ to the quit
-command.  To learn how to get that binding back see
-‘transient-bind-q-to-quit’’s documentation string.
-
-‘C-q’ (‘transient-quit-all’)
-     This command quits the currently active incomplete key sequence, if
-     any, and all transients, including the active transient and all
-     suspended transients, if any.
-
-‘C-z’ (‘transient-suspend’)
-     Like ‘transient-quit-all’, this command quits an incomplete key
-     sequence, if any, and all transients.  Additionally, it saves the
-     stack of transients so that it can easily be resumed (which is
-     particularly useful if you quickly need to do “something else” and
-     the stack is deeper than a single transient, and/or you have
-     already changed the values of some infix arguments).
-
-     Note that only a single stack of transients can be saved at a time.
-     If another stack is already saved, then saving a new stack discards
-     the previous stack.
-
-‘M-x transient-resume’
-     This command resumes the previously suspended stack of transients,
-     if any.
-
-
-File: transient.info,  Node: Common Suffix Commands,  Next: Saving Values,  Prev: Aborting and Resuming Transients,  Up: Usage
-
-2.3 Common Suffix Commands
-==========================
-
-A few shared suffix commands are available in all transients.  These
-suffix commands are not shown in the popup buffer by default.
-
-   This includes the aborting commands mentioned in the previous
-section, as well as some other commands that are all bound to ‘C-x KEY’.
-After ‘C-x’ is pressed, a section featuring all these common commands is
-temporarily shown in the popup buffer.  After invoking one of them, the
-section disappears again.  Note, however, that one of these commands is
-described as “Show common permanently”; invoke that if you want the
-common commands to always be shown for all transients.
-
-‘C-x t’ (‘transient-toggle-common’)
-     This command toggles whether the generic commands that are common
-     to all transients are always displayed or only after typing the
-     incomplete prefix key sequence ‘C-x’.  This only affects the
-     current Emacs session.
-
- -- User Option: transient-show-common-commands
-     This option controls whether shared suffix commands are shown
-     alongside the transient-specific infix and suffix commands.  By
-     default, the shared commands are not shown to avoid overwhelming
-     the user with too many options.
-
-     While a transient is active, pressing ‘C-x’ always shows the common
-     commands.  The value of this option can be changed for the current
-     Emacs session by typing ‘C-x t’ while a transient is active.
-
-   The other common commands are described in either the previous or in
-one of the following sections.
-
-   Some of Transient’s key bindings differ from the respective bindings
-of Magit-Popup; see *note FAQ:: for more information.
-
-
-File: transient.info,  Node: Saving Values,  Next: Using History,  Prev: Common Suffix Commands,  Up: Usage
-
-2.4 Saving Values
-=================
-
-After setting the infix arguments in a transient, the user can save
-those arguments for future invocations.
-
-   Most transients will start out with the saved arguments when they are
-invoked.  There are a few exceptions, though.  Some transients are
-designed so that the value that they use is stored externally as the
-buffer-local value of some variable.  Invoking such a transient again
-uses the buffer-local value.  (1)
-
-   If the user does not save the value and just exits using a regular
-suffix command, then the value is merely saved to the transient’s
-history.  That value won’t be used when the transient is next invoked,
-but it is easily accessible (see *note Using History::).
-
-‘C-x s’ (‘transient-set’)
-     This command saves the value of the active transient for this Emacs
-     session.
-
-‘C-x C-s’ (‘transient-save’)
-     Save the value of the active transient persistently across Emacs
-     sessions.
-
-‘C-x C-k’ (‘transient-reset’)
-     Clear the set and saved values of the active transient.
-
- -- User Option: transient-values-file
-     This option names the file that is used to persist the values of
-     transients between Emacs sessions.
-
-   ---------- Footnotes ----------
-
-   (1) ‘magit-diff’ and ‘magit-log’ are two prominent examples, and
-their handling of buffer-local values is actually a bit more complicated
-than outlined above and even customizable.
-
-
-File: transient.info,  Node: Using History,  Next: Getting Help for Suffix Commands,  Prev: Saving Values,  Up: Usage
-
-2.5 Using History
-=================
-
-Every time the user invokes a suffix command the transient’s current
-value is saved to its history.  These values can be cycled through the
-same way one can cycle through the history of commands that read
-user-input in the minibuffer.
-
-‘C-M-p’ (‘transient-history-prev’)
-‘C-x p’
-     This command switches to the previous value used for the active
-     transient.
-
-‘C-M-n’ (‘transient-history-next’)
-‘C-x n’
-     This command switches to the next value used for the active
-     transient.
-
-   In addition to the transient-wide history, Transient of course
-supports per-infix history.  When an infix reads user-input using the
-minibuffer, the user can use the regular minibuffer history commands to
-cycle through previously used values.  Usually the same keys as those
-mentioned above are bound to those commands.
-
-   Authors of transients should arrange for different infix commands
-that read the same kind of value to also use the same history key (see
-*note Suffix Slots::).
-
-   Both kinds of history are saved to a file when Emacs is exited.
-
- -- User Option: transient-history-file
-     This option names the file that is used to persist the history of
-     transients and their infixes between Emacs sessions.
-
- -- User Option: transient-history-limit
-     This option controls how many history elements are kept at the time
-     the history is saved in ‘transient-history-file’.
-
-
-File: transient.info,  Node: Getting Help for Suffix Commands,  Next: Enabling and Disabling Suffixes,  Prev: Using History,  Up: Usage
-
-2.6 Getting Help for Suffix Commands
-====================================
-
-Transients can have many suffixes and infixes that the user might not be
-familiar with.  To make it trivial to get help for these, Transient
-provides access to the documentation directly from the active transient.
-
-‘C-h’ (‘transient-help’)
-     This command enters help mode.  When help mode is active, typing a
-     key shows information about the suffix command that the key
-     normally is bound to (instead of invoking it).  Pressing ‘C-h’ a
-     second time shows information about the _prefix_ command.
-
-     After typing a key, the stack of transient states is suspended and
-     information about the suffix command is shown instead.  Typing ‘q’
-     in the help buffer buries that buffer and resumes the transient
-     state.
-
-   What sort of documentation is shown depends on how the transient was
-defined.  For infix commands that represent command-line arguments this
-ideally shows the appropriate manpage.  ‘transient-help’ then tries to
-jump to the correct location within that.  Info manuals are also
-supported.  The fallback is to show the command’s documentation string,
-for non-infix suffixes this is usually appropriate.
-
-
-File: transient.info,  Node: Enabling and Disabling Suffixes,  Next: Other Commands,  Prev: Getting Help for Suffix Commands,  Up: Usage
-
-2.7 Enabling and Disabling Suffixes
-===================================
-
-The user base of a package that uses transients can be very diverse.
-This is certainly the case for Magit; some users have been using it and
-Git for a decade, while others are just getting started now.
-
-   For that reason a mechanism is needed that authors can use to
-classify a transient’s infixes and suffixes along the
-essentials...everything spectrum.  We use the term “levels” to describe
-that mechanism.
-
-   Each suffix command is placed on a level and each transient has a
-level (called “transient-level”), which controls which suffix commands
-are available.  Integers between 1 and 7 (inclusive) are valid levels.
-For suffixes, 0 is also valid; it means that the suffix is not displayed
-at any level.
-
-   The levels of individual transients and/or their individual suffixes
-can be changed interactively, by invoking the transient and then
-pressing ‘C-x l’ to enter the “edit” mode, see below.
-
-   The default level for both transients and their suffixes is 4.  The
-‘transient-default-level’ option only controls the default for
-transients.  The default suffix level is always 4.  The authors of
-transients should place certain suffixes on a higher level, if they
-expect that it won’t be of use to most users, and they should place very
-important suffixes on a lower level, so that they remain available even
-if the user lowers the transient level.
-
- -- User Option: transient-default-level
-     This option controls which suffix levels are made available by
-     default.  It sets the transient-level for transients for which the
-     user has not set that individually.
-
- -- User Option: transient-levels-file
-     This option names the file that is used to persist the levels of
-     transients and their suffixes between Emacs sessions.
-
-‘C-x l’ (‘transient-set-level’)
-     This command enters edit mode.  When edit mode is active, then all
-     infixes and suffixes that are currently usable are displayed along
-     with their levels.  The colors of the levels indicate whether they
-     are enabled or not.  The level of the transient is also displayed
-     along with some usage information.
-
-     In edit mode, pressing the key that would usually invoke a certain
-     suffix instead prompts the user for the level that suffix should be
-     placed on.
-
-     Help mode is available in edit mode.
-
-     To change the transient level press ‘C-x l’ again.
-
-     To exit edit mode press ‘C-g’.
-
-     Note that edit mode does not display any suffixes that are not
-     currently usable.  ‘magit-rebase’, for example, shows different
-     suffixes depending on whether a rebase is already in progress or
-     not.  The predicates also apply in edit mode.
-
-     Therefore, to control which suffixes are available given a certain
-     state, you have to make sure that that state is currently active.
-
-‘C-x a’ (‘transient-toggle-level-limit’)
-     This command toggle whether suffixes that are on levels higher than
-     the level specified by ‘transient-default-level’ are temporarily
-     available anyway.
-
-
-File: transient.info,  Node: Other Commands,  Next: Configuration,  Prev: Enabling and Disabling Suffixes,  Up: Usage
-
-2.8 Other Commands
-==================
-
-When invoking a transient in a small frame, the transient window may not
-show the complete buffer, making it necessary to scroll, using the
-following commands.  These commands are never shown in the transient
-window, and the key bindings are the same as for ‘scroll-up-command’ and
-‘scroll-down-command’ in other buffers.
-
- -- Command: transient-scroll-up arg
-     This command scrolls text of transient popup window upward ARG
-     lines.  If ARG is ‘nil’, then it scrolls near full screen.  This is
-     a wrapper around ‘scroll-up-command’ (which see).
-
- -- Command: transient-scroll-down arg
-     This command scrolls text of transient popup window down ARG lines.
-     If ARG is ‘nil’, then it scrolls near full screen.  This is a
-     wrapper around ‘scroll-down-command’ (which see).
-
-
-File: transient.info,  Node: Configuration,  Prev: Other Commands,  Up: Usage
-
-2.9 Configuration
-=================
-
-More options are described in *note Common Suffix Commands::, in *note
-Saving Values::, in *note Using History:: and in *note Enabling and
-Disabling Suffixes::.
-
-Essential Options
------------------
-
-Also see *note Common Suffix Commands::.
-
- -- User Option: transient-show-popup
-     This option controls whether the current transient’s infix and
-     suffix commands are shown in the popup buffer.
-
-        • If ‘t’ (the default) then the popup buffer is shown as soon as
-          a transient prefix command is invoked.
-
-        • If ‘nil’, then the popup buffer is not shown unless the user
-          explicitly requests it, by pressing an incomplete prefix key
-          sequence.
-
-        • If a number, then the a brief one-line summary is shown
-          instead of the popup buffer.  If zero or negative, then not
-          even that summary is shown; only the pressed key itself is
-          shown.
-
-          The popup is shown when the user explicitly requests it by
-          pressing an incomplete prefix key sequence.  Unless this is
-          zero, the popup is shown after that many seconds of inactivity
-          (using the absolute value).
-
- -- User Option: transient-enable-popup-navigation
-     This option controls whether navigation commands are enabled in the
-     transient popup buffer.
-
-     While a transient is active the transient popup buffer is not the
-     current buffer, making it necessary to use dedicated commands to
-     act on that buffer itself.  This is disabled by default.  If this
-     option is non-‘nil’, then the following features are available:
-
-        • ‘<UP>’ moves the cursor to the previous suffix.
-        • ‘<DOWN>’ moves the cursor to the next suffix.
-        • ‘<RET>’ invokes the suffix the cursor is on.
-        • ‘mouse-1’ invokes the clicked on suffix.
-        • ‘C-s’ and ‘C-r’ start isearch in the popup buffer.
-
- -- User Option: transient-display-buffer-action
-     This option specifies the action used to display the transient
-     popup buffer.  The transient popup buffer is displayed in a window
-     using ‘(display-buffer BUFFER transient-display-buffer-action)’.
-
-     The value of this option has the form ‘(FUNCTION . ALIST)’, where
-     FUNCTION is a function or a list of functions.  Each such function
-     should accept two arguments: a buffer to display and an alist of
-     the same form as ALIST.  See *note (elisp)Choosing Window::, for
-     details.
-
-     The default is:
-
-          (display-buffer-in-side-window
-            (side . bottom)
-            (inhibit-same-window . t)
-            (window-parameters (no-other-window . t)))
-
-     This displays the window at the bottom of the selected frame.
-     Another useful FUNCTION is ‘display-buffer-below-selected’, which
-     is what ‘magit-popup’ used by default.  For more alternatives see
-     *note (elisp)Buffer Display Action Functions::, and *note
-     (elisp)Buffer Display Action Alists::.
-
-     Note that the buffer that was current before the transient buffer
-     is shown should remain the current buffer.  Many suffix commands
-     act on the thing at point, if appropriate, and if the transient
-     buffer became the current buffer, then that would change what is at
-     point.  To that effect ‘inhibit-same-window’ ensures that the
-     selected window is not used to show the transient buffer.
-
-     It may be possible to display the window in another frame, but
-     whether that works in practice depends on the window-manager.  If
-     the window manager selects the new window (Emacs frame), then that
-     unfortunately changes which buffer is current.
-
-     If you change the value of this option, then you might also want to
-     change the value of ‘transient-mode-line-format’.
-
-Accessibility Options
----------------------
-
- -- User Option: transient-force-single-column
-     This option controls whether the use of a single column to display
-     suffixes is enforced.  This might be useful for users with low
-     vision who use large text and might otherwise have to scroll in two
-     dimensions.
-
-Auxiliary Options
------------------
-
- -- User Option: transient-mode-line-format
-     This option controls whether the transient popup buffer has a
-     mode-line, separator line, or neither.
-
-     If ‘nil’, then the buffer has no mode-line.  If the buffer is not
-     displayed right above the echo area, then this probably is not a
-     good value.
-
-     If ‘line’ (the default) or a natural number, then the buffer has no
-     mode-line, but a line is drawn is drawn in its place.  If a number
-     is used, that specifies the thickness of the line.  On termcap
-     frames we cannot draw lines, so there ‘line’ and numbers are
-     synonyms for ‘nil’.
-
-     The color of the line is used to indicate if non-suffixes are
-     allowed and whether they exit the transient.  The foreground color
-     of ‘transient-key-noop’ (if non-suffix are disallowed),
-     ‘transient-key-stay’ (if allowed and transient stays active), or
-     ‘transient-key-exit’ (if allowed and they exit the transient) is
-     used to draw the line.
-
-     Otherwise this can be any mode-line format.  See *note (elisp)Mode
-     Line Format::, for details.
-
- -- User Option: transient-semantic-coloring
-     This option controls whether colors are used to indicate the
-     transient behavior of commands.
-
-     If non-‘nil’, then the key binding of each suffix is colorized to
-     indicate whether it exits the transient state or not.  The color of
-     the prefix is indicated using the line that is drawn when the value
-     of ‘transient-mode-line-format’ is ‘line’.
-
- -- User Option: transient-highlight-mismatched-keys
-     This option controls whether key bindings of infix commands that do
-     not match the respective command-line argument should be
-     highlighted.  For other infix commands this option has no effect.
-
-     When this option is non-‘nil’, the key binding for an infix
-     argument is highlighted when only a long argument (e.g.,
-     ‘--verbose’) is specified but no shorthand (e.g., ‘-v’).  In the
-     rare case that a shorthand is specified but the key binding does
-     not match, then it is highlighted differently.
-
-     Highlighting mismatched key bindings is useful when learning the
-     arguments of the underlying command-line tool; you wouldn’t want to
-     learn any short-hands that do not actually exist.
-
-     The highlighting is done using one of the faces
-     ‘transient-mismatched-key’ and ‘transient-nonstandard-key’.
-
- -- User Option: transient-substitute-key-function
-     This function is used to modify key bindings.  If the value of this
-     option is ‘nil’ (the default), then no substitution is performed.
-
-     This function is called with one argument, the prefix object, and
-     must return a key binding description, either the existing key
-     description it finds in the ‘key’ slot, or the key description that
-     replaces the prefix key.  It could be used to make other
-     substitutions, but that is discouraged.
-
-     For example, ‘=’ is hard to reach using my custom keyboard layout,
-     so I substitute ‘(’ for that, which is easy to reach using a layout
-     optimized for lisp.
-
-          (setq transient-substitute-key-function
-                (lambda (obj)
-                  (let ((key (oref obj key)))
-                    (if (string-match "\\`\\(=\\)[a-zA-Z]" key)
-                        (replace-match "(" t t key 1)
-                      key))))
-
- -- User Option: transient-read-with-initial-input
-     This option controls whether the last history element is used as
-     the initial minibuffer input when reading the value of an infix
-     argument from the user.  If ‘nil’, there is no initial input and
-     the first element has to be accessed the same way as the older
-     elements.
-
- -- User Option: transient-hide-during-minibuffer-read
-     This option controls whether the transient buffer is hidden while
-     user input is being read in the minibuffer.
-
- -- User Option: transient-align-variable-pitch
-     This option controls whether columns are aligned pixel-wise in the
-     popup buffer.
-
-     If this is non-‘nil’, then columns are aligned pixel-wise to
-     support variable-pitch fonts.  Keys are not aligned, so you should
-     use a fixed-pitch font for the ‘transient-key’ face.  Other key
-     faces inherit from that face unless a theme is used that breaks
-     that relationship.
-
-     This option is intended for users who use a variable-pitch font for
-     the ‘default’ face.
-
- -- User Option: transient-force-fixed-pitch
-     This option controls whether to force the use of a monospaced font
-     in popup buffer.  Even if you use a proportional font for the
-     ‘default’ face, you might still want to use a monospaced font in
-     transient’s popup buffer.  Setting this option to ‘t’ causes
-     ‘default’ to be remapped to ‘fixed-pitch’ in that buffer.
-
-Developer Options
------------------
-
-These options are mainly intended for developers.
-
- -- User Option: transient-detect-key-conflicts
-     This option controls whether key binding conflicts should be
-     detected at the time the transient is invoked.  If so, this results
-     in an error, which prevents the transient from being used.  Because
-     of that, conflicts are ignored by default.
-
-     Conflicts cannot be determined earlier, i.e., when the transient is
-     being defined and when new suffixes are being added, because at
-     that time there can be false-positives.  It is actually valid for
-     multiple suffixes to share a common key binding, provided the
-     predicates of those suffixes prevent that more than one of them is
-     enabled at a time.
-
- -- User Option: transient-highlight-higher-levels
-     This option controls whether suffixes that would not be available
-     by default are highlighted.
-
-     When non-‘nil’ then the descriptions of suffixes are highlighted if
-     their level is above 4, the default of ‘transient-default-level’.
-     Assuming you have set that variable to 7, this highlights all
-     suffixes that won’t be available to users without them making the
-     same customization.
-
-
-File: transient.info,  Node: Modifying Existing Transients,  Next: Defining New Commands,  Prev: Usage,  Up: Top
-
-3 Modifying Existing Transients
-*******************************
-
-To an extent, transients can be customized interactively, see *note
-Enabling and Disabling Suffixes::.  This section explains how existing
-transients can be further modified non-interactively.  Let’s begin with
-an example:
-
-     (transient-append-suffix 'magit-patch-apply "-3"
-       '("-R" "Apply in reverse" "--reverse"))
-
-   This inserts a new infix argument to toggle the ‘--reverse’ argument
-after the infix argument that toggles ‘-3’ in ‘magit-patch-apply’.
-
-   The following functions share a few arguments:
-
-   • PREFIX is a transient prefix command, a symbol.
-
-   • SUFFIX is a transient infix or suffix specification in the same
-     form as expected by ‘transient-define-prefix’.  Note that an infix
-     is a special kind of suffix.  Depending on context “suffixes” means
-     “suffixes (including infixes)” or “non-infix suffixes”.  Here it
-     means the former.  See *note Suffix Specifications::.
-
-     SUFFIX may also be a group in the same form as expected by
-     ‘transient-define-prefix’.  See *note Group Specifications::.
-
-   • LOC is a command, a key vector, a key description (a string as
-     returned by ‘key-description’), or a list specifying coordinates
-     (the last element may also be a command or key).  For example ‘(1 0
-     -1)’ identifies the last suffix (‘-1’) of the first subgroup (‘0’)
-     of the second group (‘1’).
-
-     If LOC is a list of coordinates, then it can be used to identify a
-     group, not just an individual suffix command.
-
-     The function ‘transient-get-suffix’ can be useful to determine
-     whether a certain coordination list identifies the suffix or group
-     that you expect it to identify.  In hairy cases it may be necessary
-     to look at the definition of the transient prefix command.
-
-   These functions operate on the information stored in the
-‘transient--layout’ property of the PREFIX symbol.  Suffix entries in
-that tree are not objects but have the form ‘(LEVEL CLASS PLIST)’, where
-PLIST should set at least ‘:key’, ‘:description’ and ‘:command’.
-
- -- Function: transient-insert-suffix prefix loc suffix &optional
-          keep-other
- -- Function: transient-append-suffix prefix loc suffix &optional
-          keep-other
-     These functions insert the suffix or group SUFFIX into PREFIX
-     before or after LOC.
-
-     Conceptually adding a binding to a transient prefix is similar to
-     adding a binding to a keymap, but this is complicated by the fact
-     that multiple suffix commands can be bound to the same key,
-     provided they are never active at the same time, see *note
-     Predicate Slots::.
-
-     Unfortunately both false-positives and false-negatives are
-     possible.  To deal with the former use non-‘nil’ KEEP-OTHER.  To
-     deal with the latter remove the conflicting binding explicitly.
-
- -- Function: transient-replace-suffix prefix loc suffix
-     This function replaces the suffix or group at LOC in PREFIX with
-     suffix or group SUFFIX.
-
- -- Function: transient-remove-suffix prefix loc
-     This function removes the suffix or group at LOC in PREFIX.
-
- -- Function: transient-get-suffix prefix loc
-     This function returns the suffix or group at LOC in PREFIX.  The
-     returned value has the form mentioned above.
-
- -- Function: transient-suffix-put prefix loc prop value
-     This function edits the suffix or group at LOC in PREFIX, by
-     setting the PROP of its plist to VALUE.
-
-   Most of these functions do not signal an error if they cannot perform
-the requested modification.  The functions that insert new suffixes show
-a warning if LOC cannot be found in PREFIX without signaling an error.
-The reason for doing it like this is that establishing a key binding
-(and that is what we essentially are trying to do here) should not
-prevent the rest of the configuration from loading.  Among these
-functions only ‘transient-get-suffix’ and ‘transient-suffix-put’ may
-signal an error.
-
-
-File: transient.info,  Node: Defining New Commands,  Next: Classes and Methods,  Prev: Modifying Existing Transients,  Up: Top
-
-4 Defining New Commands
-***********************
-
-* Menu:
-
-* Technical Introduction::
-* Defining Transients::
-* Binding Suffix and Infix Commands::
-* Defining Suffix and Infix Commands::
-* Using Infix Arguments::
-* Transient State::
-
-
-File: transient.info,  Node: Technical Introduction,  Next: Defining Transients,  Up: Defining New Commands
-
-4.1 Technical Introduction
-==========================
-
-Taking inspiration from prefix keys and prefix arguments, Transient
-implements a similar abstraction involving a prefix command, infix
-arguments and suffix commands.
-
-   When the user calls a transient prefix command, a transient
-(temporary) keymap is activated, which binds the transient’s infix and
-suffix commands, and functions that control the transient state are
-added to ‘pre-command-hook’ and ‘post-command-hook’.  The available
-suffix and infix commands and their state are shown in a popup buffer
-until the transient state is exited by invoking a suffix command.
-
-   Calling an infix command causes its value to be changed.  How that is
-done depends on the type of the infix command.  The simplest case is an
-infix command that represents a command-line argument that does not take
-a value.  Invoking such an infix command causes the switch to be toggled
-on or off.  More complex infix commands may read a value from the user,
-using the minibuffer.
-
-   Calling a suffix command usually causes the transient to be exited;
-the transient keymaps and hook functions are removed, the popup buffer
-no longer shows information about the (no longer bound) suffix commands,
-the values of some public global variables are set, while some internal
-global variables are unset, and finally the command is actually called.
-Suffix commands can also be configured to not exit the transient.
-
-   A suffix command can, but does not have to, use the infix arguments
-in much the same way any command can choose to use or ignore the prefix
-arguments.  For a suffix command that was invoked from a transient, the
-variable ‘transient-current-suffixes’ and the function ‘transient-args’
-serve about the same purpose as the variables ‘prefix-arg’ and
-‘current-prefix-arg’ do for any command that was called after the prefix
-arguments have been set using a command such as ‘universal-argument’.
-
-   Transient can be used to implement simple “command dispatchers”.  The
-main benefit then is that the user can see all the available commands in
-a popup buffer, which can be thought of as a “menus”.  That is useful by
-itself because it frees the user from having to remember all the keys
-that are valid after a certain prefix key or command.  Magit’s
-‘magit-dispatch’ (on ‘C-x M-g’) command is an example of using Transient
-to merely implement a command dispatcher.
-
-   In addition to that, Transient also allows users to interactively
-pass arguments to commands.  These arguments can be much more complex
-than what is reasonable when using prefix arguments.  There is a limit
-to how many aspects of a command can be controlled using prefix
-arguments.  Furthermore, what a certain prefix argument means for
-different commands can be completely different, and users have to read
-documentation to learn and then commit to memory what a certain prefix
-argument means to a certain command.
-
-   Transient suffix commands, on the other hand, can accept dozens of
-different arguments without the user having to remember anything.  When
-using Transient, one can call a command with arguments that are just as
-complex as when calling the same function non-interactively from Lisp.
-
-   Invoking a transient suffix command with arguments is similar to
-invoking a command in a shell with command-line completion and history
-enabled.  One benefit of the Transient interface is that it remembers
-history not only on a global level (“this command was invoked using
-these arguments, and previously it was invoked using those other
-arguments”), but also remembers the values of individual arguments
-independently.  See *note Using History::.
-
-   After a transient prefix command is invoked, ‘C-h KEY’ can be used to
-show the documentation for the infix or suffix command that ‘KEY’ is
-bound to (see *note Getting Help for Suffix Commands::), and infixes and
-suffixes can be removed from the transient using ‘C-x l KEY’.  Infixes
-and suffixes that are disabled by default can be enabled the same way.
-See *note Enabling and Disabling Suffixes::.
-
-   Transient ships with support for a few different types of specialized
-infix commands.  A command that sets a command line option, for example,
-has different needs than a command that merely toggles a boolean flag.
-Additionally, Transient provides abstractions for defining new types,
-which the author of Transient did not anticipate (or didn’t get around
-to implementing yet).
-
-   Note that suffix commands also support regular prefix arguments.  A
-suffix command may even be called with both infix and prefix arguments
-at the same time.  If you invoke a command as a suffix of a transient
-prefix command, but also want to pass prefix arguments to it, then first
-invoke the prefix command, and only after doing that invoke the prefix
-arguments, before finally invoking the suffix command.  If you instead
-began by providing the prefix arguments, then those would apply to the
-prefix command, not the suffix command.  Likewise, if you want to change
-infix arguments before invoking a suffix command with prefix arguments,
-then change the infix arguments before invoking the prefix arguments.
-In other words, regular prefix arguments always apply to the next
-command, and since transient prefix, infix and suffix commands are just
-regular commands, the same applies to them.  (Regular prefix keys behave
-differently because they are not commands at all, instead they are just
-incomplete key sequences, and those cannot be interrupted with prefix
-commands.)
-
-
-File: transient.info,  Node: Defining Transients,  Next: Binding Suffix and Infix Commands,  Prev: Technical Introduction,  Up: Defining New Commands
-
-4.2 Defining Transients
-=======================
-
-A transient consists of a prefix command and at least one suffix
-command, though usually a transient has several infix and suffix
-commands.  The below macro defines the transient prefix command *and*
-binds the transient’s infix and suffix commands.  In other words, it
-defines the complete transient, not just the transient prefix command
-that is used to invoke that transient.
-
- -- Macro: transient-define-prefix name arglist [docstring] [keyword
-          value]... group... [body...]
-     This macro defines NAME as a transient prefix command and binds the
-     transient’s infix and suffix commands.
-
-     ARGLIST are the arguments that the prefix command takes.  DOCSTRING
-     is the documentation string and is optional.
-
-     These arguments can optionally be followed by keyword-value pairs.
-     Each key has to be a keyword symbol, either ‘:class’ or a keyword
-     argument supported by the constructor of that class.  The
-     ‘transient-prefix’ class is used if the class is not specified
-     explicitly.
-
-     GROUPs add key bindings for infix and suffix commands and specify
-     how these bindings are presented in the popup buffer.  At least one
-     GROUP has to be specified.  See *note Binding Suffix and Infix
-     Commands::.
-
-     The BODY is optional.  If it is omitted, then ARGLIST is ignored
-     and the function definition becomes:
-
-          (lambda ()
-            (interactive)
-            (transient-setup 'NAME))
-
-     If BODY is specified, then it must begin with an ‘interactive’ form
-     that matches ARGLIST, and it must call ‘transient-setup’.  It may,
-     however, call that function only when some condition is satisfied.
-
-     All transients have a (possibly ‘nil’) value, which is exported
-     when suffix commands are called, so that they can consume that
-     value.  For some transients it might be necessary to have a sort of
-     secondary value, called a “scope”.  Such a scope would usually be
-     set in the command’s ‘interactive’ form and has to be passed to the
-     setup function:
-
-          (transient-setup 'NAME nil nil :scope SCOPE)
-
-     For example, the scope of the ‘magit-branch-configure’ transient is
-     the branch whose variables are being configured.
-
-
-File: transient.info,  Node: Binding Suffix and Infix Commands,  Next: Defining Suffix and Infix Commands,  Prev: Defining Transients,  Up: Defining New Commands
-
-4.3 Binding Suffix and Infix Commands
-=====================================
-
-The macro ‘transient-define-prefix’ is used to define a transient.  This
-defines the actual transient prefix command (see *note Defining
-Transients::) and adds the transient’s infix and suffix bindings, as
-described below.
-
-   Users and third-party packages can add additional bindings using
-functions such as ‘transient-insert-suffix’ (see *note Modifying
-Existing Transients::).  These functions take a “suffix specification”
-as one of their arguments, which has the same form as the specifications
-used in ‘transient-define-prefix’.
-
-* Menu:
-
-* Group Specifications::
-* Suffix Specifications::
-
-
-File: transient.info,  Node: Group Specifications,  Next: Suffix Specifications,  Up: Binding Suffix and Infix Commands
-
-4.3.1 Group Specifications
---------------------------
-
-The suffix and infix commands of a transient are organized in groups.
-The grouping controls how the descriptions of the suffixes are outlined
-visually but also makes it possible to set certain properties for a set
-of suffixes.
-
-   Several group classes exist, some of which organize suffixes in
-subgroups.  In most cases the class does not have to be specified
-explicitly, but see *note Group Classes::.
-
-   Groups are specified in the call to ‘transient-define-prefix’, using
-vectors.  Because groups are represented using vectors, we cannot use
-square brackets to indicate an optional element and instead use curly
-brackets to do the latter.
-
-   Group specifications then have this form:
-
-     [{LEVEL} {DESCRIPTION} {KEYWORD VALUE}... ELEMENT...]
-
-   The LEVEL is optional and defaults to 4.  See *note Enabling and
-Disabling Suffixes::.
-
-   The DESCRIPTION is optional.  If present, it is used as the heading
-of the group.
-
-   The KEYWORD-VALUE pairs are optional.  Each keyword has to be a
-keyword symbol, either ‘:class’ or a keyword argument supported by the
-constructor of that class.
-
-   • One of these keywords, ‘:description’, is equivalent to specifying
-     DESCRIPTION at the very beginning of the vector.  The
-     recommendation is to use ‘:description’ if some other keyword is
-     also used, for consistency, or DESCRIPTION otherwise, because it
-     looks better.
-
-   • Likewise ‘:level’ is equivalent to LEVEL.
-
-   • Other important keywords include the ‘:if...’ keywords.  These
-     keywords control whether the group is available in a certain
-     situation.
-
-     For example, one group of the ‘magit-rebase’ transient uses ‘:if
-     magit-rebase-in-progress-p’, which contains the suffixes that are
-     useful while rebase is already in progress; and another that uses
-     ‘:if-not magit-rebase-in-progress-p’, which contains the suffixes
-     that initiate a rebase.
-
-     These predicates can also be used on individual suffixes and are
-     only documented once, see *note Predicate Slots::.
-
-   • The value of ‘:hide’, if non-‘nil’, is a predicate that controls
-     whether the group is hidden by default.  The key bindings for
-     suffixes of a hidden group should all use the same prefix key.
-     Pressing that prefix key should temporarily show the group and its
-     suffixes, which assumes that a predicate like this is used:
-
-          (lambda ()
-            (eq (car transient--redisplay-key)
-                ?\C-c)) ; the prefix key shared by all bindings
-
-   • The value of ‘:setup-children’, if non-‘nil’, is a function that
-     takes one argument, a potentially list of children, and must return
-     a list of children or an empty list.  This can either be used to
-     somehow transform the group’s children that were defined the normal
-     way, or to dynamically create the children from scratch.
-
-     The returned children must have the same form as stored in the
-     prefix’s ‘transient--layout’ property, but it is often more
-     convenient to use the same form as understood by
-     ‘transient-define-prefix’, described below.  If you use the latter
-     approach, you can use the ‘transient-parse-suffixes’ and
-     ‘transient-parse-suffix’ functions to transform them from the
-     convenient to the expected form.  Depending on the used group
-     class, ‘transient-parse-suffixes’’s SUFFIXES must be a list of
-     group vectors (for ‘transient-columns’) or a list of suffix lists
-     (for all other group classes).
-
-     If you explicitly specify children and then transform them using
-     ‘:setup-children’, then the class of the group is determined as
-     usual, based on explicitly specified children.
-
-     If you do not explicitly specify children and thus rely solely on
-     ‘:setup-children’, then you must specify the class using ‘:class’.
-     For backward compatibility, if you fail to do so,
-     ‘transient-column’ is used and a warning is displayed.  This
-     warning will eventually be replaced with an error.
-
-          (transient-define-prefix my-finder-by-keyword ()
-            "Select a keyword and list matching packages."
-            ;; The real `finder-by-keyword' is more convenient
-            ;; of course, but that is not the point here.
-            [:class transient-columns
-             :setup-children
-             (lambda (_)
-               (transient-parse-suffixes
-                'my-finder-by-keyword
-                (let ((char (1- ?A)))
-                  (mapcar                  ; a list ...
-                   (lambda (partition)
-                     (vconcat              ; of group vectors ...
-                      (mapcar (lambda (elt)
-                                (let ((keyword (symbol-name (car elt))))
-                                           ; ... where each suffix is a list
-                                  (list (format "%c" (cl-incf char))
-                                        keyword
-                                        (lambda ()
-                                          (interactive)
-                                          (finder-list-matches keyword)))))
-                              partition)))
-                   (seq-partition finder-known-keywords 7)))))])
-
-   • The boolean ‘:pad-keys’ argument controls whether keys of all
-     suffixes contained in a group are right padded, effectively
-     aligning the descriptions.
-
-   The ELEMENTs are either all subgroups, or all suffixes and strings.
-(At least currently no group type exists that would allow mixing
-subgroups with commands at the same level, though in principle there is
-nothing that prevents that.)
-
-   If the ELEMENTs are not subgroups, then they can be a mixture of
-lists, which specify commands, and strings.  Strings are inserted
-verbatim into the buffer.  The empty string can be used to insert gaps
-between suffixes, which is particularly useful if the suffixes are
-outlined as a table.
-
-   Inside group specifications, including inside contained suffix
-specifications, nothing has to be quoted and quoting anyway is invalid.
-The value following a keyword, can be explicitly unquoted using ‘,’.
-This feature is experimental and should be avoided.
-
-   The form of suffix specifications is documented in the next node.
-
-
-File: transient.info,  Node: Suffix Specifications,  Prev: Group Specifications,  Up: Binding Suffix and Infix Commands
-
-4.3.2 Suffix Specifications
----------------------------
-
-A transient’s suffix and infix commands are bound when the transient
-prefix command is defined using ‘transient-define-prefix’, see *note
-Defining Transients::.  The commands are organized into groups, see
-*note Group Specifications::.  Here we describe the form used to bind an
-individual suffix command.
-
-   The same form is also used when later binding additional commands
-using functions such as ‘transient-insert-suffix’, see *note Modifying
-Existing Transients::.
-
-   Note that an infix is a special kind of suffix.  Depending on context
-“suffixes” means “suffixes (including infixes)” or “non-infix suffixes”.
-Here it means the former.
-
-   Suffix specifications have this form:
-
-     ([LEVEL] [KEY [DESCRIPTION]] COMMAND|ARGUMENT [KEYWORD VALUE]...)
-
-   LEVEL, KEY and DESCRIPTION can also be specified using the KEYWORDs
-‘:level’, ‘:key’ and ‘:description’.  If the object that is associated
-with COMMAND sets these properties, then they do not have to be
-specified here.  You can however specify them here anyway, possibly
-overriding the object’s values just for the binding inside this
-transient.
-
-   • LEVEL is the suffix level, an integer between 1 and 7.  See *note
-     Enabling and Disabling Suffixes::.
-
-   • KEY is the key binding, either a vector or key description string.
-
-   • DESCRIPTION is the description, either a string or a function that
-     takes zero or one arguments (the suffix object) and returns a
-     string.  The function should be a lambda expression to avoid
-     ambiguity.  In some cases a symbol that is bound as a function
-     would also work but to be safe you should use ‘:description’ in
-     that case.
-
-   The next element is either a command or an argument.  This is the
-only argument that is mandatory in all cases.
-
-   • COMMAND should be a symbol that is bound as a function, which has
-     to be defined or at least autoloaded as a command by the time the
-     containing prefix command is invoked.
-
-     Any command will do; it does not need to have an object associated
-     with it (as would be the case if ‘transient-define-suffix’ or
-     ‘transient-define-infix’ were used to define it).
-
-     COMMAND can also be a ‘lambda’ expression.
-
-     As mentioned above, the object that is associated with a command
-     can be used to set the default for certain values that otherwise
-     have to be set in the suffix specification.  Therefore if there is
-     no object, then you have to make sure to specify the KEY and the
-     DESCRIPTION.
-
-     As a special case, if you want to add a command that might be
-     neither defined nor autoloaded, you can use a workaround like:
-
-          (transient-insert-suffix 'some-prefix "k"
-            '("!" "Ceci n'est pas une commande" no-command
-              :if (lambda () (featurep 'no-library))))
-
-     Instead of ‘featurep’ you could also use ‘require’ with a non-‘nil’
-     value for NOERROR.
-
-   • The mandatory argument can also be a command-line argument, a
-     string.  In that case an anonymous command is defined and bound.
-
-     Instead of a string, this can also be a list of two strings, in
-     which case the first string is used as the short argument (which
-     can also be specified using ‘:shortarg’) and the second as the long
-     argument (which can also be specified using ‘:argument’).
-
-     Only the long argument is displayed in the popup buffer.  See
-     ‘transient-detect-key-conflicts’ for how the short argument may be
-     used.
-
-     Unless the class is specified explicitly, the appropriate class is
-     guessed based on the long argument.  If the argument ends with ‘=’
-     (e.g., ‘--format=’) then ‘transient-option’ is used, otherwise
-     ‘transient-switch’.
-
-   Finally, details can be specified using optional KEYWORD-VALUE pairs.
-Each keyword has to be a keyword symbol, either ‘:class’ or a keyword
-argument supported by the constructor of that class.  See *note Suffix
-Slots::.
-
-
-File: transient.info,  Node: Defining Suffix and Infix Commands,  Next: Using Infix Arguments,  Prev: Binding Suffix and Infix Commands,  Up: Defining New Commands
-
-4.4 Defining Suffix and Infix Commands
-======================================
-
-Note that an infix is a special kind of suffix.  Depending on context
-“suffixes” means “suffixes (including infixes)” or “non-infix suffixes”.
-
- -- Macro: transient-define-suffix name arglist [docstring] [keyword
-          value]... body...
-     This macro defines NAME as a transient suffix command.
-
-     ARGLIST are the arguments that the command takes.  DOCSTRING is the
-     documentation string and is optional.
-
-     These arguments can optionally be followed by keyword-value pairs.
-     Each keyword has to be a keyword symbol, either ‘:class’ or a
-     keyword argument supported by the constructor of that class.  The
-     ‘transient-suffix’ class is used if the class is not specified
-     explicitly.
-
-     The BODY must begin with an ‘interactive’ form that matches
-     ARGLIST.  The infix arguments are usually accessed by using
-     ‘transient-args’ inside ‘interactive’.
-
- -- Macro: transient-define-infix name arglist [docstring] [keyword
-          value]...
-     This macro defines NAME as a transient infix command.
-
-     ARGLIST is always ignored (but mandatory never-the-less) and
-     reserved for future use.  DOCSTRING is the documentation string and
-     is optional.
-
-     At least one key-value pair is required.  All transient infix
-     commands are ‘equal’ to each other (but not ‘eq’).  It is
-     meaningless to define an infix command, without providing at least
-     one keyword argument (usually ‘:argument’ or ‘:variable’, depending
-     on the class).  The suffix class defaults to ‘transient-switch’ and
-     can be set using the ‘:class’ keyword.
-
-     The function definition is always:
-
-          (lambda ()
-            (interactive)
-            (let ((obj (transient-suffix-object)))
-              (transient-infix-set obj (transient-infix-read obj)))
-            (transient--show))
-
-     ‘transient-infix-read’ and ‘transient-infix-set’ are generic
-     functions.  Different infix commands behave differently because the
-     concrete methods are different for different infix command classes.
-     In rare cases the above command function might not be suitable,
-     even if you define your own infix command class.  In that case you
-     have to use ‘transient-define-suffix’ to define the infix command
-     and use ‘t’ as the value of the ‘:transient’ keyword.
-
- -- Macro: transient-define-argument name arglist [docstring] [keyword
-          value]...
-     This macro defines NAME as a transient infix command.
-
-     This is an alias for ‘transient-define-infix’.  Only use this alias
-     to define an infix command that actually sets an infix argument.
-     To define an infix command that, for example, sets a variable, use
-     ‘transient-define-infix’ instead.
-
-
-File: transient.info,  Node: Using Infix Arguments,  Next: Transient State,  Prev: Defining Suffix and Infix Commands,  Up: Defining New Commands
-
-4.5 Using Infix Arguments
-=========================
-
-The functions and the variables described below allow suffix commands to
-access the value of the transient from which they were invoked; which is
-the value of its infix arguments.  These variables are set when the user
-invokes a suffix command that exits the transient, but before actually
-calling the command.
-
-   When returning to the command-loop after calling the suffix command,
-the arguments are reset to ‘nil’ (which causes the function to return
-‘nil’ too).
-
-   Like for Emacs’s prefix arguments, it is advisable, but not
-mandatory, to access the infix arguments inside the command’s
-‘interactive’ form.  The preferred way of doing that is to call the
-‘transient-args’ function, which for infix arguments serves about the
-same purpose as ‘prefix-arg’ serves for prefix arguments.
-
- -- Function: transient-args prefix
-     This function returns the value of the transient prefix command
-     PREFIX.
-
-     If the current command was invoked from the transient prefix
-     command PREFIX, then it returns the active infix arguments.  If the
-     current command was not invoked from PREFIX, then it returns the
-     set, saved or default value for PREFIX.
-
- -- Function: transient-arg-value arg args
-     This function return the value of ARG as it appears in ARGS.
-
-     For a switch a boolean is returned.  For an option the value is
-     returned as a string, using the empty string for the empty value,
-     or ‘nil’ if the option does not appear in ARGS.
-
- -- Function: transient-suffixes prefix
-     This function returns the suffixes of the transient prefix command
-     PREFIX.  This is a list of objects.  This function should only be
-     used if you need the objects (as opposed to just their values) and
-     if the current command is not being invoked from PREFIX.
-
- -- Variable: transient-current-suffixes
-     The suffixes of the transient from which this suffix command was
-     invoked.  This is a list of objects.  Usually it is sufficient to
-     instead use the function ‘transient-args’, which returns a list of
-     values.  In complex cases it might be necessary to use this
-     variable instead, i.e., if you need access to information beside
-     the value.
-
- -- Variable: transient-current-command
-     The transient from which this suffix command was invoked.  The
-     returned value is a symbol, the transient prefix command.
-
- -- Variable: transient-current-prefix
-     The transient from which this suffix command was invoked.  The
-     returned value is a ‘transient-prefix’ object, which holds
-     information associated with the transient prefix command.
-
- -- Function: transient-active-prefix
-     This function returns the active transient object.  Return ‘nil’ if
-     there is no active transient, if the transient buffer isn’t shown,
-     and while the active transient is suspended (e.g., while the
-     minibuffer is in use).
-
-     Unlike ‘transient-current-prefix’, which is only ever non-‘nil’ in
-     code that is run directly by a command that is invoked while a
-     transient is current, this function is also suitable for use in
-     asynchronous code, such as timers and callbacks (this function’s
-     main use-case).
-
-     If optional PREFIXES is non-‘nil’, it must be a prefix command
-     symbol or a list of symbols, in which case the active transient
-     object is only returned if it matches one of the PREFIXES.
-
-
-File: transient.info,  Node: Transient State,  Prev: Using Infix Arguments,  Up: Defining New Commands
-
-4.6 Transient State
-===================
-
-Invoking a transient prefix command “activates” the respective
-transient, i.e., it puts a transient keymap into effect, which binds the
-transient’s infix and suffix commands.
-
-   The default behavior while a transient is active is as follows:
-
-   • Invoking an infix command does not affect the transient state; the
-     transient remains active.
-
-   • Invoking a (non-infix) suffix command “deactivates” the transient
-     state by removing the transient keymap and performing some
-     additional cleanup.
-
-   • Invoking a command that is bound in a keymap other than the
-     transient keymap is disallowed and trying to do so results in a
-     warning.  This does not “deactivate” the transient.
-
-   The behavior can be changed for all suffixes of a particular prefix
-and/or for individual suffixes.  The values should nearly always be
-booleans, but certain functions, called “pre-commands”, can also be
-used.  These functions are named ‘transient--do-VERB’, and the symbol
-‘VERB’ can be used as a shorthand.
-
-   A boolean is interpreted as answering the question "does the
-transient stay active, when this command is invoked?"  ‘t’ means that
-the transient stays active, while ‘nil’ means that invoking the command
-exits the transient.
-
-   Note that when the suffix is a “sub-prefix”, invoking that command
-always activates that sub-prefix, causing the outer prefix to no longer
-be active and displayed.  Here ‘t’ means that when you exit the inner
-prefix, then the outer prefix becomes active again, while ‘nil’ means
-that all outer prefixes are exited at once.
-
-   • The behavior for non-suffixes can be set for a particular prefix,
-     by the prefix’s ‘transient-non-suffix’ slot to a boolean, a
-     suitable pre-command function, or a shorthand for such a function.
-     See *note Pre-commands for Non-Suffixes::.
-
-   • The common behavior for the suffixes of a particular prefix can be
-     set using the prefix’s ‘transient-suffixes’ slot.
-
-     The value specified in this slot does *not* affect infixes.
-     Because it affects both regular suffixes as well as sub-prefixes,
-     which have different needs, it is best to avoid explicitly
-     specifying a function.
-
-   • The behavior of an individual suffix can be changed using its
-     ‘transient’ slot.  While it is usually best to use a boolean, for
-     this slot it can occasionally make sense to specify a function
-     explicitly.
-
-     Note that this slot can be set when defining a suffix command using
-     ‘transient-define-suffix’ and/or in the definition of the prefix.
-     If set in both places, then the latter takes precedence, as usual.
-
-   The available pre-command functions are documented in the following
-sub-sections.  They are called by ‘transient--pre-command’, a function
-on ‘pre-command-hook’, and the value that they return determines whether
-the transient is exited.  To do so the value of one of the constants
-‘transient--exit’ or ‘transient--stay’ is used (that way we don’t have
-to remember if ‘t’ means “exit” or “stay”).
-
-   Additionally, these functions may change the value of ‘this-command’
-(which explains why they have to be called using ‘pre-command-hook’),
-call ‘transient-export’, ‘transient--stack-zap’ or
-‘transient--stack-push’; and set the values of ‘transient--exitp’,
-‘transient--helpp’ or ‘transient--editp’.
-
-   For completeness sake, some notes about complications:
-
-   • The transient-ness of certain built-in suffix commands is specified
-     using ‘transient-predicate-map’.  This is a special keymap, which
-     binds commands to pre-commands (as opposed to keys to commands) and
-     takes precedence over the prefix’s ‘transient-suffix’ slot, but not
-     the suffix’s ‘transient’ slot.
-
-   • While a sub-prefix is active we nearly always want ‘C-g’ to take
-     the user back to the “super-prefix”, even when the other suffixes
-     don’t do that.  However, in rare cases this may not be desirable,
-     and that makes the following complication necessary:
-
-     For ‘transient-suffix’ objects the ‘transient’ slot is unbound.  We
-     can ignore that for the most part because ‘nil’ and the slot being
-     unbound are treated as equivalent, and mean “do exit”.  That isn’t
-     actually true for suffixes that are sub-prefixes though.  For such
-     suffixes unbound means “do exit but allow going back”, which is the
-     default, while ‘nil’ means “do exit permanently”, which requires
-     that slot to be explicitly set to that value.
-
-Pre-commands for Infixes
-------------------------
-
-The default for infixes is ‘transient--do-stay’.  This is also the only
-function that makes sense for infixes, which is why this predicate is
-used even if the value of the prefix’s ‘transient-suffix’ slot is ‘t’.
-In extremely rare cases, one might want to use something else, which can
-be done by setting the infix’s ‘transient’ slot directly.
-
- -- Function: transient--do-stay
-     Call the command without exporting variables and stay transient.
-
-Pre-commands for Suffixes
--------------------------
-
-By default, invoking a suffix causes the transient to be exited.
-
-   The behavior for an individual suffix command can be changed by
-setting its ‘transient’ slot to a boolean (which is highly recommended),
-or to one of the following pre-commands.
-
- -- Function: transient--do-exit
-     Call the command after exporting variables and exit the transient.
-
- -- Function: transient--do-return
-     Call the command after exporting variables and return to the parent
-     prefix.  If there is no parent prefix, then call
-     ‘transient--do-exit’.
-
- -- Function: transient--do-call
-     Call the command after exporting variables and stay transient.
-
-   The following pre-commands are only suitable for sub-prefixes.  It is
-not necessary to explicitly use these predicates because the correct
-predicate is automatically picked based on the value of the ‘transient’
-slot for the sub-prefix itself.
-
- -- Function: transient--do-recurse
-     Call the transient prefix command, preparing for return to active
-     transient.
-
-     Whether we actually return to the parent transient is ultimately
-     under the control of each invoked suffix.  The difference between
-     this pre-command and ‘transient--do-stack’ is that it changes the
-     value of the ‘transient-suffix’ slot to ‘t’.
-
-     If there is no parent transient, then only call this command and
-     skip the second step.
-
- -- Function: transient--do-stack
-     Call the transient prefix command, stacking the active transient.
-     Push the active transient to the transient stack.
-
-     Unless ‘transient--do-recurse’ is explicitly used, this pre-command
-     is automatically used for suffixes that are prefixes themselves,
-     i.e., for sub-prefixes.
-
- -- Function: transient--do-replace
-     Call the transient prefix command, replacing the active transient.
-     Do not push the active transient to the transient stack.
-
-     Unless ‘transient--do-recurse’ is explicitly used, this pre-command
-     is automatically used for suffixes that are prefixes themselves,
-     i.e., for sub-prefixes.
-
- -- Function: transient--do-suspend
-     Suspend the active transient, saving the transient stack.
-
-     This is used by the command ‘transient-suspend’ and optionally also
-     by “external events” such as ‘handle-switch-frame’.  Such bindings
-     should be added to ‘transient-predicate-map’.
-
-Pre-commands for Non-Suffixes
------------------------------
-
-By default, non-suffixes (commands that are bound in other keymaps
-beside the transient keymap) cannot be invoked.  Trying to invoke such a
-command results in a warning and the transient stays active.
-
-   If you want a different behavior, then set the ‘transient-non-suffix’
-slot of the transient prefix command.  The value should be a boolean,
-answering the question, "is it allowed to invoke non-suffix commands?, a
-pre-command function, or a shorthand for such a function.
-
-   If the value is ‘t’, then non-suffixes can be invoked, when it is
-‘nil’ (the default) then they cannot be invoked.
-
-   The only other recommended value is ‘leave’.  If that is used, then
-non-suffixes can be invoked, but if one is invoked, then that exits the
-transient.
-
- -- Function: transient--do-warn
-     Call ‘transient-undefined’ and stay transient.
-
- -- Function: transient--do-stay
-     Call the command without exporting variables and stay transient.
-
- -- Function: transient--do-leave
-     Call the command without exporting variables and exit the
-     transient.
-
-Special Pre-Commands
---------------------
-
- -- Function: transient--do-quit-one
-     If active, quit help or edit mode, else exit the active transient.
-
-     This is used when the user pressed ‘C-g’.
-
- -- Function: transient--do-quit-all
-     Exit all transients without saving the transient stack.
-
-     This is used when the user pressed ‘C-q’.
-
- -- Function: transient--do-suspend
-     Suspend the active transient, saving the transient stack.
-
-     This is used when the user pressed ‘C-z’.
-
-
-File: transient.info,  Node: Classes and Methods,  Next: FAQ,  Prev: Defining New Commands,  Up: Top
-
-5 Classes and Methods
-*********************
-
-Transient uses classes and generic functions to make it possible to
-define new types of suffix commands that are similar to existing types,
-but behave differently in some aspects.  It does the same for groups and
-prefix commands, though at least for prefix commands that *currently*
-appears to be less important.
-
-   Every prefix, infix and suffix command is associated with an object,
-which holds information that controls certain aspects of its behavior.
-This happens in two ways.
-
-   • Associating a command with a certain class gives the command a
-     type.  This makes it possible to use generic functions to do
-     certain things that have to be done differently depending on what
-     type of command it acts on.
-
-     That in turn makes it possible for third-parties to add new types
-     without having to convince the maintainer of Transient that that
-     new type is important enough to justify adding a special case to a
-     dozen or so functions.
-
-   • Associating a command with an object makes it possible to easily
-     store information that is specific to that particular command.
-
-     Two commands may have the same type, but obviously their key
-     bindings and descriptions still have to be different, for example.
-
-     The values of some slots are functions.  The ‘reader’ slot for
-     example holds a function that is used to read a new value for an
-     infix command.  The values of such slots are regular functions.
-
-     Generic functions are used when a function should do something
-     different based on the type of the command, i.e., when all commands
-     of a certain type should behave the same way but different from the
-     behavior for other types.  Object slots that hold a regular
-     function as value are used when the task that they perform is
-     likely to differ even between different commands of the same type.
-
-* Menu:
-
-* Group Classes::
-* Group Methods::
-* Prefix Classes::
-* Suffix Classes::
-* Suffix Methods::
-* Prefix Slots::
-* Suffix Slots::
-* Predicate Slots::
-
-
-File: transient.info,  Node: Group Classes,  Next: Group Methods,  Up: Classes and Methods
-
-5.1 Group Classes
-=================
-
-The type of a group can be specified using the ‘:class’ property at the
-beginning of the class specification, e.g., ‘[:class transient-columns
-...]’ in a call to ‘transient-define-prefix’.
-
-   • The abstract ‘transient-child’ class is the base class of both
-     ‘transient-group’ (and therefore all groups) as well as of
-     ‘transient-suffix’ (and therefore all suffix and infix commands).
-
-     This class exists because the elements (or “children”) of certain
-     groups can be other groups instead of suffix and infix commands.
-
-   • The abstract ‘transient-group’ class is the superclass of all other
-     group classes.
-
-   • The ‘transient-column’ class is the simplest group.
-
-     This is the default “flat” group.  If the class is not specified
-     explicitly and the first element is not a vector (i.e., not a
-     group), then this class is used.
-
-     This class displays each element on a separate line.
-
-   • The ‘transient-row’ class displays all elements on a single line.
-
-   • The ‘transient-columns’ class displays commands organized in
-     columns.
-
-     Direct elements have to be groups whose elements have to be
-     commands or strings.  Each subgroup represents a column.  This
-     class takes care of inserting the subgroups’ elements.
-
-     This is the default “nested” group.  If the class is not specified
-     explicitly and the first element is a vector (i.e., a group), then
-     this class is used.
-
-   • The ‘transient-subgroups’ class wraps other groups.
-
-     Direct elements have to be groups whose elements have to be
-     commands or strings.  This group inserts an empty line between
-     subgroups.  The subgroups themselves are responsible for displaying
-     their elements.
-
-
-File: transient.info,  Node: Group Methods,  Next: Prefix Classes,  Prev: Group Classes,  Up: Classes and Methods
-
-5.2 Group Methods
-=================
-
- -- Function: transient-setup-children group children
-     This generic function can be used to setup the children or a group.
-
-     The default implementation usually just returns the children
-     unchanged, but if the ‘setup-children’ slot of GROUP is non-‘nil’,
-     then it calls that function with CHILDREN as the only argument and
-     returns the value.
-
-     The children are given as a (potentially empty) list consisting of
-     either group or suffix specifications.  These functions can make
-     arbitrary changes to the children including constructing new
-     children from scratch.
-
- -- Function: transient--insert-group group
-     This generic function formats the group and its elements and
-     inserts the result into the current buffer, which is a temporary
-     buffer.  The contents of that buffer are later inserted into the
-     popup buffer.
-
-     Functions that are called by this function may need to operate in
-     the buffer from which the transient was called.  To do so they can
-     temporarily make the ‘transient--source-buffer’ the current buffer.
-
-
-File: transient.info,  Node: Prefix Classes,  Next: Suffix Classes,  Prev: Group Methods,  Up: Classes and Methods
-
-5.3 Prefix Classes
-==================
-
-Currently the ‘transient-prefix’ class is being used for all prefix
-commands and there is only a single generic function that can be
-specialized based on the class of a prefix command.
-
- -- Function: transient--history-init obj
-     This generic function is called while setting up the transient and
-     is responsible for initializing the ‘history’ slot.  This is the
-     transient-wide history; many individual infixes also have a history
-     of their own.
-
-     The default (and currently only) method extracts the value from the
-     global variable ‘transient-history’.
-
-   A transient prefix command’s object is stored in the
-‘transient--prefix’ property of the command symbol.  While a transient
-is active, a clone of that object is stored in the variable
-‘transient--prefix’.  A clone is used because some changes that are made
-to the active transient’s object should not affect later invocations.
-
-
-File: transient.info,  Node: Suffix Classes,  Next: Suffix Methods,  Prev: Prefix Classes,  Up: Classes and Methods
-
-5.4 Suffix Classes
-==================
-
-   • All suffix and infix classes derive from ‘transient-suffix’, which
-     in turn derives from ‘transient-child’, from which
-     ‘transient-group’ also derives (see *note Group Classes::).
-
-   • All infix classes derive from the abstract ‘transient-infix’ class,
-     which in turn derives from the ‘transient-suffix’ class.
-
-     Infixes are a special type of suffixes.  The primary difference is
-     that infixes always use the ‘transient--do-stay’ pre-command, while
-     non-infix suffixes use a variety of pre-commands (see *note
-     Transient State::).  Doing that is most easily achieved by using
-     this class, though theoretically it would be possible to define an
-     infix class that does not do so.  If you do that then you get to
-     implement many methods.
-
-     Also, infixes and non-infix suffixes are usually defined using
-     different macros (see *note Defining Suffix and Infix Commands::).
-
-   • Classes used for infix commands that represent arguments should be
-     derived from the abstract ‘transient-argument’ class.
-
-   • The ‘transient-switch’ class (or a derived class) is used for infix
-     arguments that represent command-line switches (arguments that do
-     not take a value).
-
-   • The ‘transient-option’ class (or a derived class) is used for infix
-     arguments that represent command-line options (arguments that do
-     take a value).
-
-   • The ‘transient-switches’ class can be used for a set of mutually
-     exclusive command-line switches.
-
-   • The ‘transient-files’ class can be used for a ‘--’ argument that
-     indicates that all remaining arguments are files.
-
-   • Classes used for infix commands that represent variables should
-     derived from the abstract ‘transient-variable’ class.
-
-   • The ‘transient-information’ class is special in that suffixes that
-     use this class are not associated with a command and thus also not
-     with any key binding.  Such suffixes are only used to display
-     arbitrary information, and that anywhere a suffix can appear.
-     Display-only suffix specifications take this form:
-
-          ([LEVEL] :info DESCRIPTION [KEYWORD VALUE]...)
-
-     The ‘:info’ keyword argument replaces the ‘:description’ keyword
-     used for other suffix classes.  Other keyword arguments that you
-     might want to set, include ‘:face’, predicate keywords (such as
-     ‘:if’), and ‘:format’.  By default the value of ‘:format’ includes
-     ‘%k’, which for this class is replaced with the empty string or
-     spaces, if keys are being padded in the containing group.
-
-   Magit defines additional classes, which can serve as examples for the
-fancy things you can do without modifying Transient.  Some of these
-classes will likely get generalized and added to Transient.  For now
-they are very much subject to change and not documented.
-
-
-File: transient.info,  Node: Suffix Methods,  Next: Prefix Slots,  Prev: Suffix Classes,  Up: Classes and Methods
-
-5.5 Suffix Methods
-==================
-
-To get information about the methods implementing these generic
-functions use ‘describe-function’.
-
-* Menu:
-
-* Suffix Value Methods::
-* Suffix Format Methods::
-
-
-File: transient.info,  Node: Suffix Value Methods,  Next: Suffix Format Methods,  Up: Suffix Methods
-
-5.5.1 Suffix Value Methods
---------------------------
-
- -- Function: transient-init-value obj
-     This generic function sets the initial value of the object OBJ.
-
-     This function is called for all suffix commands, but unless a
-     concrete method is implemented this falls through to the default
-     implementation, which is a noop.  In other words this usually only
-     does something for infix commands, but note that this is not
-     implemented for the abstract class ‘transient-infix’, so if your
-     class derives from that directly, then you must implement a method.
-
- -- Function: transient-infix-read obj
-     This generic function determines the new value of the infix object
-     OBJ.
-
-     This function merely determines the value; ‘transient-infix-set’ is
-     used to actually store the new value in the object.
-
-     For most infix classes this is done by reading a value from the
-     user using the reader specified by the ‘reader’ slot (using the
-     ‘transient-infix-value’ method described below).
-
-     For some infix classes the value is changed without reading
-     anything in the minibuffer, i.e., the mere act of invoking the
-     infix command determines what the new value should be, based on the
-     previous value.
-
- -- Function: transient-prompt obj
-     This generic function returns the prompt to be used to read infix
-     object OBJ’s value.
-
- -- Function: transient-infix-set obj value
-     This generic function sets the value of infix object OBJ to VALUE.
-
- -- Function: transient-infix-value obj
-     This generic function returns the value of the suffix object OBJ.
-
-     This function is called by ‘transient-args’ (which see), meaning
-     this function is how the value of a transient is determined so that
-     the invoked suffix command can use it.
-
-     Currently most values are strings, but that is not set in stone.
-     ‘nil’ is not a value, it means “no value”.
-
-     Usually only infixes have a value, but see the method for
-     ‘transient-suffix’.
-
- -- Function: transient-init-scope obj
-     This generic function sets the scope of the suffix object OBJ.
-
-     The scope is actually a property of the transient prefix, not of
-     individual suffixes.  However it is possible to invoke a suffix
-     command directly instead of from a transient.  In that case, if the
-     suffix expects a scope, then it has to determine that itself and
-     store it in its ‘scope’ slot.
-
-     This function is called for all suffix commands, but unless a
-     concrete method is implemented this falls through to the default
-     implementation, which is a noop.
-
-
-File: transient.info,  Node: Suffix Format Methods,  Prev: Suffix Value Methods,  Up: Suffix Methods
-
-5.5.2 Suffix Format Methods
----------------------------
-
- -- Function: transient-format obj
-     This generic function formats and returns OBJ for display.
-
-     When this function is called, then the current buffer is some
-     temporary buffer.  If you need the buffer from which the prefix
-     command was invoked to be current, then do so by temporarily making
-     ‘transient--source-buffer’ current.
-
- -- Function: transient-format-key obj
-     This generic function formats OBJ’s ‘key’ for display and returns
-     the result.
-
- -- Function: transient-format-description obj
-     This generic function formats OBJ’s ‘description’ for display and
-     returns the result.
-
- -- Function: transient-format-value obj
-     This generic function formats OBJ’s value for display and returns
-     the result.
-
- -- Function: transient-show-help obj
-     Show help for the prefix, infix or suffix command represented by
-     OBJ.
-
-     Regardless of OBJ’s type, if its ‘show-help’ slot is non-nil, that
-     must be a function, which takes OBJ is its only argument.  It must
-     prepare, display and return a buffer, and select the window used to
-     display it.  The ‘transient-show-help-window’ macro is intended for
-     use in such functions.
-
-     For prefixes, show the info manual, if that is specified using the
-     ‘info-manual’ slot.  Otherwise, show the manpage if that is
-     specified using the ‘man-page’ slot.  Otherwise, show the command’s
-     documentation string.
-
-     For suffixes, show the command’s documentation string.
-
-     For infixes, show the manpage if that is specified.  Otherwise show
-     the command’s documentation string.
-
- -- Macro: transient-with-help-window &rest body
-     Evaluate BODY, send output to ‘*Help*’ buffer, and display it in a
-     window.  Select the help window, and make the help buffer current
-     and return it.
-
-
-File: transient.info,  Node: Prefix Slots,  Next: Suffix Slots,  Prev: Suffix Methods,  Up: Classes and Methods
-
-5.6 Prefix Slots
-================
-
-   • ‘show-help’, ‘man-page’ or ‘info-manual’ can be used to specify the
-     documentation for the prefix and its suffixes.  The command
-     ‘transient-help’ uses the function ‘transient-show-help’ (which
-     see) to lookup and use these values.
-
-   • ‘history-key’ If multiple prefix commands should share a single
-     value, then this slot has to be set to the same value for all of
-     them.  You probably don’t want that.
-
-   • ‘transient-suffix’ and ‘transient-non-suffix’ play a part when
-     determining whether the currently active transient prefix command
-     remains active/transient when a suffix or arbitrary non-suffix
-     command is invoked.  See *note Transient State::.
-
-   • ‘refresh-suffixes’ Normally suffix objects and keymaps are only
-     setup once, when the prefix is invoked.  Setting this to ‘t’,
-     causes them to be recreated after every command.  This is useful
-     when using ‘:if...’ predicates, and those need to be rerun for some
-     reason.  Doing this is somewhat costly, and there is a risk of
-     losing state, so this is disabled by default and still considered
-     experimental.
-
-   • ‘incompatible’ A list of lists.  Each sub-list specifies a set of
-     mutually exclusive arguments.  Enabling one of these arguments
-     causes the others to be disabled.  An argument may appear in
-     multiple sub-lists.  Arguments must me given in the same form as
-     used in the ‘argument’ or ‘argument-format’ slot of the respective
-     suffix objects, usually something like ‘--switch’ or ‘--option=%s’.
-     For options and ‘transient-switches’ suffixes it is also possible
-     to match against a specific value, as returned by
-     ‘transient-infix-value’, for example, ‘--option=one’.
-
-   • ‘scope’ For some transients it might be necessary to have a sort of
-     secondary value, called a “scope”.  See ‘transient-define-prefix’.
-
-Internal Prefix Slots
----------------------
-
-These slots are mostly intended for internal use.  They should not be
-set in calls to ‘transient-define-prefix’.
-
-   • ‘prototype’ When a transient prefix command is invoked, then a
-     clone of that object is stored in the global variable
-     ‘transient--prefix’ and the prototype is stored in the clone’s
-     ‘prototype’ slot.
-
-   • ‘command’ The command, a symbol.  Each transient prefix command
-     consists of a command, which is stored in a symbol’s function slot
-     and an object, which is stored in the ‘transient--prefix’ property
-     of the same symbol.
-
-   • ‘level’ The level of the prefix commands.  The suffix commands
-     whose layer is equal or lower are displayed.  See *note Enabling
-     and Disabling Suffixes::.
-
-   • ‘value’ The likely outdated value of the prefix.  Instead of
-     accessing this slot directly you should use the function
-     ‘transient-get-value’, which is guaranteed to return the up-to-date
-     value.
-
-   • ‘history’ and ‘history-pos’ are used to keep track of historic
-     values.  Unless you implement your own ‘transient-infix-read’
-     method you should not have to deal with these slots.
-
-
-File: transient.info,  Node: Suffix Slots,  Next: Predicate Slots,  Prev: Prefix Slots,  Up: Classes and Methods
-
-5.7 Suffix Slots
-================
-
-Here we document most of the slots that are only available for suffix
-objects.  Some slots are shared by suffix and group objects, they are
-documented in *note Predicate Slots::.
-
-   Also see *note Suffix Classes::.
-
-Slots of ‘transient-suffix’
----------------------------
-
-   • ‘key’ The key, a key vector or a key description string.
-
-   • ‘command’ The command, a symbol.
-
-   • ‘transient’ Whether to stay transient.  See *note Transient
-     State::.
-
-   • ‘format’ The format used to display the suffix in the popup buffer.
-     It must contain the following %-placeholders:
-
-        • ‘%k’ For the key.
-        • ‘%d’ For the description.
-        • ‘%v’ For the infix value.  Non-infix suffixes don’t have a
-          value.
-
-   • ‘description’ The description, either a string or a function, which
-     is called with zero or one argument (the suffix object), and
-     returns a string.
-
-   • ‘face’ Face used for the description.  In simple cases it is easier
-     to use this instead of using a function as ‘description’ and adding
-     the styling there.  ‘face’ is appended using
-     ‘add-face-text-property’.
-
-   • ‘show-help’ A function used to display help for the suffix.  If
-     unspecified, the prefix controls how help is displayed for its
-     suffixes.  See also function ‘transient-show-help’.
-
-Slots of ‘transient-infix’
---------------------------
-
-Some of these slots are only meaningful for some of the subclasses.
-They are defined here anyway to allow sharing certain methods.
-
-   • ‘argument’ The long argument, e.g., ‘--verbose’.
-
-   • ‘shortarg’ The short argument, e.g., ‘-v’.
-
-   • ‘value’ The value.  Should not be accessed directly.
-
-   • ‘init-value’ Function that is responsible for setting the object’s
-     value.  If bound, then this is called with the object as the only
-     argument.  Usually this is not bound, in which case the object’s
-     primary ‘transient-init-value’ method is called instead.
-
-   • ‘unsavable’ Whether the value of the suffix is not saved as part of
-     the prefixes.
-
-   • ‘multi-value’ For options, whether the option can have multiple
-     values.  If this is non-‘nil’, then the values are read using
-     ‘completing-read-multiple’ by default and if you specify your own
-     reader, then it should read the values using that function or
-     similar.
-
-     Supported non-‘nil’ values are:
-
-        • Use ‘rest’ for an option that can have multiple values.  This
-          is useful e.g., for an ‘--’ argument that indicates that all
-          remaining arguments are files (such as ‘git log -- file1
-          file2’).
-
-          In the list returned by ‘transient-args’ such an option and
-          its values are represented by a single list of the form
-          ‘(ARGUMENT . VALUES)’.
-
-        • Use ‘repeat’ for an option that can be specified multiple
-          times.
-
-          In the list returned by ‘transient-args’ each instance of the
-          option and its value appears separately in the usual from, for
-          example: ‘("--another-argument" "--option=first"
-          "--option=second")’.
-
-     In both cases the option’s values have to be specified in the
-     default value of a prefix using the same format as returned by
-     ‘transient-args’, e.g., ‘("--other" "--o=1" "--o=2" ("--" "f1"
-     "f2"))’.
-
-   • ‘always-read’ For options, whether to read a value on every
-     invocation.  If this is ‘nil’, then options that have a value are
-     simply unset and have to be invoked a second time to set a new
-     value.
-
-   • ‘allow-empty’ For options, whether the empty string is a valid
-     value.
-
-   • ‘history-key’ The key used to store the history.  This defaults to
-     the command name.  This is useful when multiple infixes should
-     share the same history because their values are of the same kind.
-
-   • ‘reader’ The function used to read the value of an infix.  Not used
-     for switches.  The function takes three arguments, PROMPT,
-     INITIAL-INPUT and HISTORY, and must return a string.
-
-   • ‘prompt’ The prompt used when reading the value, either a string or
-     a function that takes the object as the only argument and which
-     returns a prompt string.
-
-   • ‘choices’ A list of valid values, or a function that returns such a
-     list.  The latter is not implemented for ‘transient-switches’,
-     because I couldn’t think of a use-case.  How exactly the choices
-     are used varies depending on the class of the suffix.
-
-Slots of ‘transient-variable’
------------------------------
-
-   • ‘variable’ The variable.
-
-Slots of ‘transient-switches’
------------------------------
-
-   • ‘argument-format’ The display format.  Must contain ‘%s’, one of
-     the ‘choices’ is substituted for that.  E.g., ‘--%s-order’.
-
-   • ‘argument-regexp’ The regexp used to match any one of the switches.
-     E.g., ‘\\(--\\(topo\\|author-date\\|date\\)-order\\)’.
-
-
-File: transient.info,  Node: Predicate Slots,  Prev: Suffix Slots,  Up: Classes and Methods
-
-5.8 Predicate Slots
-===================
-
-Suffix and group objects share some predicate slots that control whether
-a group or suffix should be available depending on some state.  Only one
-of these slots can be used at the same time.  It is undefined what
-happens if you use more than one.
-
-   • ‘if’ Enable if predicate returns non-‘nil’.
-   • ‘if-not’ Enable if predicate returns ‘nil’.
-   • ‘if-non-nil’ Enable if variable’s value is non-‘nil’.
-   • ‘if-nil’ Enable if variable’s value is ‘nil’.
-   • ‘if-mode’ Enable if major-mode matches value.
-   • ‘if-not-mode’ Enable if major-mode does not match value.
-   • ‘if-derived’ Enable if major-mode derives from value.
-   • ‘if-not-derived’ Enable if major-mode does not derive from value.
-
-   By default these predicates run when the prefix command is invoked,
-but this can be changes, using the ‘refresh-suffixes’ prefix slot.  See
-*note Prefix Slots::.
-
-   One more slot is shared between group and suffix classes, ‘level’.
-Like the slots documented above, it is a predicate, but it is used for a
-different purpose.  The value has to be an integer between 1 and 7.
-‘level’ controls whether a suffix or a group should be available
-depending on user preference.  See *note Enabling and Disabling
-Suffixes::.
-
-
-File: transient.info,  Node: FAQ,  Next: Keystroke Index,  Prev: Classes and Methods,  Up: Top
-
-Appendix A FAQ
-**************
-
-A.1 Can I control how the popup buffer is displayed?
-====================================================
-
-Yes, see ‘transient-display-buffer-action’ in *note Configuration::.
-
-A.2 How can I copy text from the popup buffer?
-==============================================
-
-To be able to mark text in Transient’s popup buffer using the mouse, you
-have to add the below binding.  Note that for technical reasons, the
-region won’t be visualized, while doing so.  After you have quit the
-transient popup, you will be able to yank it in another buffer.
-
-     (keymap-set transient-predicate-map
-                 "<mouse-set-region>"
-                 #'transient--do-stay)
-
-A.3 How can I autoload prefix and suffix commands?
-==================================================
-
-If your package only supports Emacs 30, just prefix the definition with
-‘;;;###autoload’.  If your package supports released versions of Emacs,
-you unfortunately have to use a long form autoload comment as described
-in *note (elisp)Autoload::.
-
-     ;;;###autoload (autoload 'magit-dispatch "magit" nil t)
-     (transient-define-prefix magit-dispatch ()
-       ...)
-
-A.4 How does Transient compare to prefix keys and universal arguments?
-======================================================================
-
-See
-<https://github.com/magit/transient/wiki/Comparison-with-prefix-keys-and-universal-arguments>.
-
-A.5 How does Transient compare to Magit-Popup and Hydra?
-========================================================
-
-See
-<https://github.com/magit/transient/wiki/Comparison-with-other-packages>.
-
-A.6 Why did some of the key bindings change?
-============================================
-
-You may have noticed that the bindings for some of the common commands
-do *not* have the prefix ‘C-x’ and that furthermore some of these
-commands are grayed out while others are not.  That unfortunately is a
-bit confusing if the section of common commands is not shown
-permanently, making the following explanation necessary.
-
-   The purpose of usually hiding that section but showing it after the
-user pressed the respective prefix key is to conserve space and not
-overwhelm users with too much noise, while allowing the user to quickly
-list common bindings on demand.
-
-   That however should not keep us from using the best possible key
-bindings.  The bindings that do use a prefix do so to avoid wasting too
-many non-prefix bindings, keeping them available for use in individual
-transients.  The bindings that do not use a prefix and that are *not*
-grayed out are very important bindings that are *always* available, even
-when invoking the “common command key prefix” or *any other*
-transient-specific prefix.  The non-prefix keys that *are* grayed out
-however, are not available when any incomplete prefix key sequence is
-active.  They do not use the “common command key prefix” because it is
-likely that users want to invoke them several times in a row and e.g.,
-‘M-p M-p M-p’ is much more convenient than ‘C-x M-p C-x M-p C-x M-p’.
-
-   You may also have noticed that the “Set” command is bound to ‘C-x s’,
-while Magit-Popup used to bind ‘C-c C-c’ instead.  I have seen several
-users praise the latter binding (sic), so I did not change it
-willy-nilly.  The reason that I changed it is that using different
-prefix keys for different common commands, would have made the temporary
-display of the common commands even more confusing, i.e., after pressing
-‘C-c’ all the bindings that begin with the ‘C-x’ prefix would be grayed
-out.
-
-   Using a single prefix for common commands key means that all other
-potential prefix keys can be used for transient-specific commands
-*without* the section of common commands also popping up.  ‘C-c’ in
-particular is a prefix that I want to (and already do) use for Magit,
-and also using that for a common command would prevent me from doing so.
-
-   (Also see the next question.)
-
-A.7 Why does ‘q’ not quit popups anymore?
-=========================================
-
-I agree that ‘q’ is a good binding for commands that quit something.
-This includes quitting whatever transient is currently active, but it
-also includes quitting whatever it is that some specific transient is
-controlling.  The transient ‘magit-blame’ for example binds ‘q’ to the
-command that turns ‘magit-blame-mode’ off.
-
-   So I had to decide if ‘q’ should quit the active transient (like
-Magit-Popup used to) or whether ‘C-g’ should do that instead, so that
-‘q’ could be bound in individual transient to whatever commands make
-sense for them.  Because all other letters are already reserved for use
-by individual transients, I have decided to no longer make an exception
-for ‘q’.
-
-   If you want to get ‘q’’s old binding back then you can do so.  Doing
-that is a bit more complicated than changing a single key binding, so I
-have implemented a function, ‘transient-bind-q-to-quit’ that makes the
-necessary changes.  See its documentation string for more information.
-
-
-File: transient.info,  Node: Keystroke Index,  Next: Command and Function Index,  Prev: FAQ,  Up: Top
-
-Appendix B Keystroke Index
-**************************
-
-
-* Menu:
-
-* C-g:                                   Aborting and Resuming Transients.
-                                                               (line 27)
-* C-g <1>:                               Aborting and Resuming Transients.
-                                                               (line 27)
-* C-h:                                   Getting Help for Suffix Commands.
-                                                               (line 11)
-* C-M-n:                                 Using History.        (line 18)
-* C-M-p:                                 Using History.        (line 13)
-* C-q:                                   Aborting and Resuming Transients.
-                                                               (line 36)
-* C-x a:                                 Enabling and Disabling Suffixes.
-                                                               (line 68)
-* C-x C-k:                               Saving Values.        (line 29)
-* C-x C-s:                               Saving Values.        (line 25)
-* C-x l:                                 Enabling and Disabling Suffixes.
-                                                               (line 43)
-* C-x n:                                 Using History.        (line 18)
-* C-x p:                                 Using History.        (line 13)
-* C-x s:                                 Saving Values.        (line 21)
-* C-x t:                                 Common Suffix Commands.
-                                                               (line 18)
-* C-z:                                   Aborting and Resuming Transients.
-                                                               (line 41)
-
-
-File: transient.info,  Node: Command and Function Index,  Next: Variable Index,  Prev: Keystroke Index,  Up: Top
-
-Appendix C Command and Function Index
-*************************************
-
-
-* Menu:
-
-* transient--do-call:                    Transient State.     (line 125)
-* transient--do-exit:                    Transient State.     (line 117)
-* transient--do-leave:                   Transient State.     (line 193)
-* transient--do-quit-all:                Transient State.     (line 205)
-* transient--do-quit-one:                Transient State.     (line 200)
-* transient--do-recurse:                 Transient State.     (line 133)
-* transient--do-replace:                 Transient State.     (line 153)
-* transient--do-return:                  Transient State.     (line 120)
-* transient--do-stack:                   Transient State.     (line 145)
-* transient--do-stay:                    Transient State.     (line 105)
-* transient--do-stay <1>:                Transient State.     (line 190)
-* transient--do-suspend:                 Transient State.     (line 161)
-* transient--do-suspend <1>:             Transient State.     (line 210)
-* transient--do-warn:                    Transient State.     (line 187)
-* transient--history-init:               Prefix Classes.      (line  10)
-* transient--insert-group:               Group Methods.       (line  19)
-* transient-active-prefix:               Using Infix Arguments.
-                                                              (line  61)
-* transient-append-suffix:               Modifying Existing Transients.
-                                                              (line  51)
-* transient-arg-value:                   Using Infix Arguments.
-                                                              (line  31)
-* transient-args:                        Using Infix Arguments.
-                                                              (line  22)
-* transient-define-argument:             Defining Suffix and Infix Commands.
-                                                              (line  57)
-* transient-define-infix:                Defining Suffix and Infix Commands.
-                                                              (line  26)
-* transient-define-prefix:               Defining Transients. (line  13)
-* transient-define-suffix:               Defining Suffix and Infix Commands.
-                                                              (line   9)
-* transient-format:                      Suffix Format Methods.
-                                                              (line   6)
-* transient-format-description:          Suffix Format Methods.
-                                                              (line  18)
-* transient-format-key:                  Suffix Format Methods.
-                                                              (line  14)
-* transient-format-value:                Suffix Format Methods.
-                                                              (line  22)
-* transient-get-suffix:                  Modifying Existing Transients.
-                                                              (line  73)
-* transient-help:                        Getting Help for Suffix Commands.
-                                                              (line  11)
-* transient-history-next:                Using History.       (line  18)
-* transient-history-prev:                Using History.       (line  13)
-* transient-infix-read:                  Suffix Value Methods.
-                                                              (line  16)
-* transient-infix-set:                   Suffix Value Methods.
-                                                              (line  36)
-* transient-infix-value:                 Suffix Value Methods.
-                                                              (line  39)
-* transient-init-scope:                  Suffix Value Methods.
-                                                              (line  52)
-* transient-init-value:                  Suffix Value Methods.
-                                                              (line   6)
-* transient-insert-suffix:               Modifying Existing Transients.
-                                                              (line  49)
-* transient-prompt:                      Suffix Value Methods.
-                                                              (line  32)
-* transient-quit-all:                    Aborting and Resuming Transients.
-                                                              (line  36)
-* transient-quit-one:                    Aborting and Resuming Transients.
-                                                              (line  27)
-* transient-quit-seq:                    Aborting and Resuming Transients.
-                                                              (line  27)
-* transient-remove-suffix:               Modifying Existing Transients.
-                                                              (line  70)
-* transient-replace-suffix:              Modifying Existing Transients.
-                                                              (line  66)
-* transient-reset:                       Saving Values.       (line  29)
-* transient-resume:                      Aborting and Resuming Transients.
-                                                              (line  53)
-* transient-save:                        Saving Values.       (line  25)
-* transient-scroll-down:                 Other Commands.      (line  17)
-* transient-scroll-up:                   Other Commands.      (line  12)
-* transient-set:                         Saving Values.       (line  21)
-* transient-set-level:                   Enabling and Disabling Suffixes.
-                                                              (line  43)
-* transient-setup-children:              Group Methods.       (line   6)
-* transient-show-help:                   Suffix Format Methods.
-                                                              (line  26)
-* transient-suffix-put:                  Modifying Existing Transients.
-                                                              (line  77)
-* transient-suffixes:                    Using Infix Arguments.
-                                                              (line  38)
-* transient-suspend:                     Aborting and Resuming Transients.
-                                                              (line  41)
-* transient-toggle-common:               Common Suffix Commands.
-                                                              (line  18)
-* transient-toggle-level-limit:          Enabling and Disabling Suffixes.
-                                                              (line  68)
-* transient-with-help-window:            Suffix Format Methods.
-                                                              (line  46)
-
-
-File: transient.info,  Node: Variable Index,  Next: Concept Index,  Prev: Command and Function Index,  Up: Top
-
-Appendix D Variable Index
-*************************
-
-
-* Menu:
-
-* transient-align-variable-pitch:        Configuration.       (line 185)
-* transient-current-command:             Using Infix Arguments.
-                                                              (line  52)
-* transient-current-prefix:              Using Infix Arguments.
-                                                              (line  56)
-* transient-current-suffixes:            Using Infix Arguments.
-                                                              (line  44)
-* transient-default-level:               Enabling and Disabling Suffixes.
-                                                              (line  33)
-* transient-detect-key-conflicts:        Configuration.       (line 210)
-* transient-display-buffer-action:       Configuration.       (line  51)
-* transient-enable-popup-navigation:     Configuration.       (line  36)
-* transient-force-fixed-pitch:           Configuration.       (line 198)
-* transient-force-single-column:         Configuration.       (line  93)
-* transient-hide-during-minibuffer-read: Configuration.       (line 181)
-* transient-highlight-higher-levels:     Configuration.       (line 223)
-* transient-highlight-mismatched-keys:   Configuration.       (line 135)
-* transient-history-file:                Using History.       (line  33)
-* transient-history-limit:               Using History.       (line  37)
-* transient-levels-file:                 Enabling and Disabling Suffixes.
-                                                              (line  38)
-* transient-mode-line-format:            Configuration.       (line 102)
-* transient-read-with-initial-input:     Configuration.       (line 174)
-* transient-semantic-coloring:           Configuration.       (line 126)
-* transient-show-common-commands:        Common Suffix Commands.
-                                                              (line  23)
-* transient-show-popup:                  Configuration.       (line  15)
-* transient-substitute-key-function:     Configuration.       (line 153)
-* transient-values-file:                 Saving Values.       (line  31)
-
-
-File: transient.info,  Node: Concept Index,  Next: GNU General Public License,  Prev: Variable Index,  Up: Top
-
-Appendix E Concept Index
-************************
-
-
-* Menu:
-
-* aborting transients:                   Aborting and Resuming Transients.
-                                                               (line  6)
-* classes and methods:                   Classes and Methods.  (line  6)
-* command dispatchers:                   Technical Introduction.
-                                                               (line 39)
-* common suffix commands:                Common Suffix Commands.
-                                                               (line  6)
-* defining infix commands:               Defining Suffix and Infix Commands.
-                                                               (line  6)
-* defining suffix commands:              Defining Suffix and Infix Commands.
-                                                               (line  6)
-* disabling suffixes:                    Enabling and Disabling Suffixes.
-                                                               (line  6)
-* enabling suffixes:                     Enabling and Disabling Suffixes.
-                                                               (line  6)
-* getting help:                          Getting Help for Suffix Commands.
-                                                               (line  6)
-* group specifications:                  Group Specifications. (line  6)
-* invoking transients:                   Invoking Transients.  (line  6)
-* levels:                                Enabling and Disabling Suffixes.
-                                                               (line 10)
-* modifying existing transients:         Modifying Existing Transients.
-                                                               (line  6)
-* quit transient:                        Aborting and Resuming Transients.
-                                                               (line  6)
-* resuming transients:                   Aborting and Resuming Transients.
-                                                               (line  6)
-* saving values of arguments:            Saving Values.        (line  6)
-* scope of a transient:                  Defining Transients.  (line 43)
-* suffix specifications:                 Suffix Specifications.
-                                                               (line  6)
-* transient state:                       Transient State.      (line  6)
-* transient-level:                       Enabling and Disabling Suffixes.
-                                                               (line 15)
-* value history:                         Using History.        (line  6)
-
-
-File: transient.info,  Node: GNU General Public License,  Prev: Concept Index,  Up: Top
-
-Appendix F GNU General Public License
-*************************************
-
-                        Version 3, 29 June 2007
-
-     Copyright © 2007 Free Software Foundation, Inc. <https://fsf.org/>
-
-     Everyone is permitted to copy and distribute verbatim copies of this
-     license document, but changing it is not allowed.
-
-Preamble
-========
-
-The GNU General Public License is a free, copyleft license for software
-and other kinds of works.
-
-   The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program—to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-   When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-   To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-   For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-   Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-   For the developers’ and authors’ protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users’ and
-authors’ sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-   Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users’ freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-   Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-   The precise terms and conditions for copying, distribution and
-modification follow.
-
-TERMS AND CONDITIONS
-====================
-
-  0. Definitions.
-
-     “This License” refers to version 3 of the GNU General Public
-     License.
-
-     “Copyright” also means copyright-like laws that apply to other
-     kinds of works, such as semiconductor masks.
-
-     “The Program” refers to any copyrightable work licensed under this
-     License.  Each licensee is addressed as “you”.  “Licensees” and
-     “recipients” may be individuals or organizations.
-
-     To “modify” a work means to copy from or adapt all or part of the
-     work in a fashion requiring copyright permission, other than the
-     making of an exact copy.  The resulting work is called a “modified
-     version” of the earlier work or a work “based on” the earlier work.
-
-     A “covered work” means either the unmodified Program or a work
-     based on the Program.
-
-     To “propagate” a work means to do anything with it that, without
-     permission, would make you directly or secondarily liable for
-     infringement under applicable copyright law, except executing it on
-     a computer or modifying a private copy.  Propagation includes
-     copying, distribution (with or without modification), making
-     available to the public, and in some countries other activities as
-     well.
-
-     To “convey” a work means any kind of propagation that enables other
-     parties to make or receive copies.  Mere interaction with a user
-     through a computer network, with no transfer of a copy, is not
-     conveying.
-
-     An interactive user interface displays “Appropriate Legal Notices”
-     to the extent that it includes a convenient and prominently visible
-     feature that (1) displays an appropriate copyright notice, and (2)
-     tells the user that there is no warranty for the work (except to
-     the extent that warranties are provided), that licensees may convey
-     the work under this License, and how to view a copy of this
-     License.  If the interface presents a list of user commands or
-     options, such as a menu, a prominent item in the list meets this
-     criterion.
-
-  1. Source Code.
-
-     The “source code” for a work means the preferred form of the work
-     for making modifications to it.  “Object code” means any non-source
-     form of a work.
-
-     A “Standard Interface” means an interface that either is an
-     official standard defined by a recognized standards body, or, in
-     the case of interfaces specified for a particular programming
-     language, one that is widely used among developers working in that
-     language.
-
-     The “System Libraries” of an executable work include anything,
-     other than the work as a whole, that (a) is included in the normal
-     form of packaging a Major Component, but which is not part of that
-     Major Component, and (b) serves only to enable use of the work with
-     that Major Component, or to implement a Standard Interface for
-     which an implementation is available to the public in source code
-     form.  A “Major Component”, in this context, means a major
-     essential component (kernel, window system, and so on) of the
-     specific operating system (if any) on which the executable work
-     runs, or a compiler used to produce the work, or an object code
-     interpreter used to run it.
-
-     The “Corresponding Source” for a work in object code form means all
-     the source code needed to generate, install, and (for an executable
-     work) run the object code and to modify the work, including scripts
-     to control those activities.  However, it does not include the
-     work’s System Libraries, or general-purpose tools or generally
-     available free programs which are used unmodified in performing
-     those activities but which are not part of the work.  For example,
-     Corresponding Source includes interface definition files associated
-     with source files for the work, and the source code for shared
-     libraries and dynamically linked subprograms that the work is
-     specifically designed to require, such as by intimate data
-     communication or control flow between those subprograms and other
-     parts of the work.
-
-     The Corresponding Source need not include anything that users can
-     regenerate automatically from other parts of the Corresponding
-     Source.
-
-     The Corresponding Source for a work in source code form is that
-     same work.
-
-  2. Basic Permissions.
-
-     All rights granted under this License are granted for the term of
-     copyright on the Program, and are irrevocable provided the stated
-     conditions are met.  This License explicitly affirms your unlimited
-     permission to run the unmodified Program.  The output from running
-     a covered work is covered by this License only if the output, given
-     its content, constitutes a covered work.  This License acknowledges
-     your rights of fair use or other equivalent, as provided by
-     copyright law.
-
-     You may make, run and propagate covered works that you do not
-     convey, without conditions so long as your license otherwise
-     remains in force.  You may convey covered works to others for the
-     sole purpose of having them make modifications exclusively for you,
-     or provide you with facilities for running those works, provided
-     that you comply with the terms of this License in conveying all
-     material for which you do not control copyright.  Those thus making
-     or running the covered works for you must do so exclusively on your
-     behalf, under your direction and control, on terms that prohibit
-     them from making any copies of your copyrighted material outside
-     their relationship with you.
-
-     Conveying under any other circumstances is permitted solely under
-     the conditions stated below.  Sublicensing is not allowed; section
-     10 makes it unnecessary.
-
-  3. Protecting Users’ Legal Rights From Anti-Circumvention Law.
-
-     No covered work shall be deemed part of an effective technological
-     measure under any applicable law fulfilling obligations under
-     article 11 of the WIPO copyright treaty adopted on 20 December
-     1996, or similar laws prohibiting or restricting circumvention of
-     such measures.
-
-     When you convey a covered work, you waive any legal power to forbid
-     circumvention of technological measures to the extent such
-     circumvention is effected by exercising rights under this License
-     with respect to the covered work, and you disclaim any intention to
-     limit operation or modification of the work as a means of
-     enforcing, against the work’s users, your or third parties’ legal
-     rights to forbid circumvention of technological measures.
-
-  4. Conveying Verbatim Copies.
-
-     You may convey verbatim copies of the Program’s source code as you
-     receive it, in any medium, provided that you conspicuously and
-     appropriately publish on each copy an appropriate copyright notice;
-     keep intact all notices stating that this License and any
-     non-permissive terms added in accord with section 7 apply to the
-     code; keep intact all notices of the absence of any warranty; and
-     give all recipients a copy of this License along with the Program.
-
-     You may charge any price or no price for each copy that you convey,
-     and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-     You may convey a work based on the Program, or the modifications to
-     produce it from the Program, in the form of source code under the
-     terms of section 4, provided that you also meet all of these
-     conditions:
-
-       a. The work must carry prominent notices stating that you
-          modified it, and giving a relevant date.
-
-       b. The work must carry prominent notices stating that it is
-          released under this License and any conditions added under
-          section 7.  This requirement modifies the requirement in
-          section 4 to “keep intact all notices”.
-
-       c. You must license the entire work, as a whole, under this
-          License to anyone who comes into possession of a copy.  This
-          License will therefore apply, along with any applicable
-          section 7 additional terms, to the whole of the work, and all
-          its parts, regardless of how they are packaged.  This License
-          gives no permission to license the work in any other way, but
-          it does not invalidate such permission if you have separately
-          received it.
-
-       d. If the work has interactive user interfaces, each must display
-          Appropriate Legal Notices; however, if the Program has
-          interactive interfaces that do not display Appropriate Legal
-          Notices, your work need not make them do so.
-
-     A compilation of a covered work with other separate and independent
-     works, which are not by their nature extensions of the covered
-     work, and which are not combined with it such as to form a larger
-     program, in or on a volume of a storage or distribution medium, is
-     called an “aggregate” if the compilation and its resulting
-     copyright are not used to limit the access or legal rights of the
-     compilation’s users beyond what the individual works permit.
-     Inclusion of a covered work in an aggregate does not cause this
-     License to apply to the other parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-     You may convey a covered work in object code form under the terms
-     of sections 4 and 5, provided that you also convey the
-     machine-readable Corresponding Source under the terms of this
-     License, in one of these ways:
-
-       a. Convey the object code in, or embodied in, a physical product
-          (including a physical distribution medium), accompanied by the
-          Corresponding Source fixed on a durable physical medium
-          customarily used for software interchange.
-
-       b. Convey the object code in, or embodied in, a physical product
-          (including a physical distribution medium), accompanied by a
-          written offer, valid for at least three years and valid for as
-          long as you offer spare parts or customer support for that
-          product model, to give anyone who possesses the object code
-          either (1) a copy of the Corresponding Source for all the
-          software in the product that is covered by this License, on a
-          durable physical medium customarily used for software
-          interchange, for a price no more than your reasonable cost of
-          physically performing this conveying of source, or (2) access
-          to copy the Corresponding Source from a network server at no
-          charge.
-
-       c. Convey individual copies of the object code with a copy of the
-          written offer to provide the Corresponding Source.  This
-          alternative is allowed only occasionally and noncommercially,
-          and only if you received the object code with such an offer,
-          in accord with subsection 6b.
-
-       d. Convey the object code by offering access from a designated
-          place (gratis or for a charge), and offer equivalent access to
-          the Corresponding Source in the same way through the same
-          place at no further charge.  You need not require recipients
-          to copy the Corresponding Source along with the object code.
-          If the place to copy the object code is a network server, the
-          Corresponding Source may be on a different server (operated by
-          you or a third party) that supports equivalent copying
-          facilities, provided you maintain clear directions next to the
-          object code saying where to find the Corresponding Source.
-          Regardless of what server hosts the Corresponding Source, you
-          remain obligated to ensure that it is available for as long as
-          needed to satisfy these requirements.
-
-       e. Convey the object code using peer-to-peer transmission,
-          provided you inform other peers where the object code and
-          Corresponding Source of the work are being offered to the
-          general public at no charge under subsection 6d.
-
-     A separable portion of the object code, whose source code is
-     excluded from the Corresponding Source as a System Library, need
-     not be included in conveying the object code work.
-
-     A “User Product” is either (1) a “consumer product”, which means
-     any tangible personal property which is normally used for personal,
-     family, or household purposes, or (2) anything designed or sold for
-     incorporation into a dwelling.  In determining whether a product is
-     a consumer product, doubtful cases shall be resolved in favor of
-     coverage.  For a particular product received by a particular user,
-     “normally used” refers to a typical or common use of that class of
-     product, regardless of the status of the particular user or of the
-     way in which the particular user actually uses, or expects or is
-     expected to use, the product.  A product is a consumer product
-     regardless of whether the product has substantial commercial,
-     industrial or non-consumer uses, unless such uses represent the
-     only significant mode of use of the product.
-
-     “Installation Information” for a User Product means any methods,
-     procedures, authorization keys, or other information required to
-     install and execute modified versions of a covered work in that
-     User Product from a modified version of its Corresponding Source.
-     The information must suffice to ensure that the continued
-     functioning of the modified object code is in no case prevented or
-     interfered with solely because modification has been made.
-
-     If you convey an object code work under this section in, or with,
-     or specifically for use in, a User Product, and the conveying
-     occurs as part of a transaction in which the right of possession
-     and use of the User Product is transferred to the recipient in
-     perpetuity or for a fixed term (regardless of how the transaction
-     is characterized), the Corresponding Source conveyed under this
-     section must be accompanied by the Installation Information.  But
-     this requirement does not apply if neither you nor any third party
-     retains the ability to install modified object code on the User
-     Product (for example, the work has been installed in ROM).
-
-     The requirement to provide Installation Information does not
-     include a requirement to continue to provide support service,
-     warranty, or updates for a work that has been modified or installed
-     by the recipient, or for the User Product in which it has been
-     modified or installed.  Access to a network may be denied when the
-     modification itself materially and adversely affects the operation
-     of the network or violates the rules and protocols for
-     communication across the network.
-
-     Corresponding Source conveyed, and Installation Information
-     provided, in accord with this section must be in a format that is
-     publicly documented (and with an implementation available to the
-     public in source code form), and must require no special password
-     or key for unpacking, reading or copying.
-
-  7. Additional Terms.
-
-     “Additional permissions” are terms that supplement the terms of
-     this License by making exceptions from one or more of its
-     conditions.  Additional permissions that are applicable to the
-     entire Program shall be treated as though they were included in
-     this License, to the extent that they are valid under applicable
-     law.  If additional permissions apply only to part of the Program,
-     that part may be used separately under those permissions, but the
-     entire Program remains governed by this License without regard to
-     the additional permissions.
-
-     When you convey a copy of a covered work, you may at your option
-     remove any additional permissions from that copy, or from any part
-     of it.  (Additional permissions may be written to require their own
-     removal in certain cases when you modify the work.)  You may place
-     additional permissions on material, added by you to a covered work,
-     for which you have or can give appropriate copyright permission.
-
-     Notwithstanding any other provision of this License, for material
-     you add to a covered work, you may (if authorized by the copyright
-     holders of that material) supplement the terms of this License with
-     terms:
-
-       a. Disclaiming warranty or limiting liability differently from
-          the terms of sections 15 and 16 of this License; or
-
-       b. Requiring preservation of specified reasonable legal notices
-          or author attributions in that material or in the Appropriate
-          Legal Notices displayed by works containing it; or
-
-       c. Prohibiting misrepresentation of the origin of that material,
-          or requiring that modified versions of such material be marked
-          in reasonable ways as different from the original version; or
-
-       d. Limiting the use for publicity purposes of names of licensors
-          or authors of the material; or
-
-       e. Declining to grant rights under trademark law for use of some
-          trade names, trademarks, or service marks; or
-
-       f. Requiring indemnification of licensors and authors of that
-          material by anyone who conveys the material (or modified
-          versions of it) with contractual assumptions of liability to
-          the recipient, for any liability that these contractual
-          assumptions directly impose on those licensors and authors.
-
-     All other non-permissive additional terms are considered “further
-     restrictions” within the meaning of section 10.  If the Program as
-     you received it, or any part of it, contains a notice stating that
-     it is governed by this License along with a term that is a further
-     restriction, you may remove that term.  If a license document
-     contains a further restriction but permits relicensing or conveying
-     under this License, you may add to a covered work material governed
-     by the terms of that license document, provided that the further
-     restriction does not survive such relicensing or conveying.
-
-     If you add terms to a covered work in accord with this section, you
-     must place, in the relevant source files, a statement of the
-     additional terms that apply to those files, or a notice indicating
-     where to find the applicable terms.
-
-     Additional terms, permissive or non-permissive, may be stated in
-     the form of a separately written license, or stated as exceptions;
-     the above requirements apply either way.
-
-  8. Termination.
-
-     You may not propagate or modify a covered work except as expressly
-     provided under this License.  Any attempt otherwise to propagate or
-     modify it is void, and will automatically terminate your rights
-     under this License (including any patent licenses granted under the
-     third paragraph of section 11).
-
-     However, if you cease all violation of this License, then your
-     license from a particular copyright holder is reinstated (a)
-     provisionally, unless and until the copyright holder explicitly and
-     finally terminates your license, and (b) permanently, if the
-     copyright holder fails to notify you of the violation by some
-     reasonable means prior to 60 days after the cessation.
-
-     Moreover, your license from a particular copyright holder is
-     reinstated permanently if the copyright holder notifies you of the
-     violation by some reasonable means, this is the first time you have
-     received notice of violation of this License (for any work) from
-     that copyright holder, and you cure the violation prior to 30 days
-     after your receipt of the notice.
-
-     Termination of your rights under this section does not terminate
-     the licenses of parties who have received copies or rights from you
-     under this License.  If your rights have been terminated and not
-     permanently reinstated, you do not qualify to receive new licenses
-     for the same material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-     You are not required to accept this License in order to receive or
-     run a copy of the Program.  Ancillary propagation of a covered work
-     occurring solely as a consequence of using peer-to-peer
-     transmission to receive a copy likewise does not require
-     acceptance.  However, nothing other than this License grants you
-     permission to propagate or modify any covered work.  These actions
-     infringe copyright if you do not accept this License.  Therefore,
-     by modifying or propagating a covered work, you indicate your
-     acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-     Each time you convey a covered work, the recipient automatically
-     receives a license from the original licensors, to run, modify and
-     propagate that work, subject to this License.  You are not
-     responsible for enforcing compliance by third parties with this
-     License.
-
-     An “entity transaction” is a transaction transferring control of an
-     organization, or substantially all assets of one, or subdividing an
-     organization, or merging organizations.  If propagation of a
-     covered work results from an entity transaction, each party to that
-     transaction who receives a copy of the work also receives whatever
-     licenses to the work the party’s predecessor in interest had or
-     could give under the previous paragraph, plus a right to possession
-     of the Corresponding Source of the work from the predecessor in
-     interest, if the predecessor has it or can get it with reasonable
-     efforts.
-
-     You may not impose any further restrictions on the exercise of the
-     rights granted or affirmed under this License.  For example, you
-     may not impose a license fee, royalty, or other charge for exercise
-     of rights granted under this License, and you may not initiate
-     litigation (including a cross-claim or counterclaim in a lawsuit)
-     alleging that any patent claim is infringed by making, using,
-     selling, offering for sale, or importing the Program or any portion
-     of it.
-
-  11. Patents.
-
-     A “contributor” is a copyright holder who authorizes use under this
-     License of the Program or a work on which the Program is based.
-     The work thus licensed is called the contributor’s “contributor
-     version”.
-
-     A contributor’s “essential patent claims” are all patent claims
-     owned or controlled by the contributor, whether already acquired or
-     hereafter acquired, that would be infringed by some manner,
-     permitted by this License, of making, using, or selling its
-     contributor version, but do not include claims that would be
-     infringed only as a consequence of further modification of the
-     contributor version.  For purposes of this definition, “control”
-     includes the right to grant patent sublicenses in a manner
-     consistent with the requirements of this License.
-
-     Each contributor grants you a non-exclusive, worldwide,
-     royalty-free patent license under the contributor’s essential
-     patent claims, to make, use, sell, offer for sale, import and
-     otherwise run, modify and propagate the contents of its contributor
-     version.
-
-     In the following three paragraphs, a “patent license” is any
-     express agreement or commitment, however denominated, not to
-     enforce a patent (such as an express permission to practice a
-     patent or covenant not to sue for patent infringement).  To “grant”
-     such a patent license to a party means to make such an agreement or
-     commitment not to enforce a patent against the party.
-
-     If you convey a covered work, knowingly relying on a patent
-     license, and the Corresponding Source of the work is not available
-     for anyone to copy, free of charge and under the terms of this
-     License, through a publicly available network server or other
-     readily accessible means, then you must either (1) cause the
-     Corresponding Source to be so available, or (2) arrange to deprive
-     yourself of the benefit of the patent license for this particular
-     work, or (3) arrange, in a manner consistent with the requirements
-     of this License, to extend the patent license to downstream
-     recipients.  “Knowingly relying” means you have actual knowledge
-     that, but for the patent license, your conveying the covered work
-     in a country, or your recipient’s use of the covered work in a
-     country, would infringe one or more identifiable patents in that
-     country that you have reason to believe are valid.
-
-     If, pursuant to or in connection with a single transaction or
-     arrangement, you convey, or propagate by procuring conveyance of, a
-     covered work, and grant a patent license to some of the parties
-     receiving the covered work authorizing them to use, propagate,
-     modify or convey a specific copy of the covered work, then the
-     patent license you grant is automatically extended to all
-     recipients of the covered work and works based on it.
-
-     A patent license is “discriminatory” if it does not include within
-     the scope of its coverage, prohibits the exercise of, or is
-     conditioned on the non-exercise of one or more of the rights that
-     are specifically granted under this License.  You may not convey a
-     covered work if you are a party to an arrangement with a third
-     party that is in the business of distributing software, under which
-     you make payment to the third party based on the extent of your
-     activity of conveying the work, and under which the third party
-     grants, to any of the parties who would receive the covered work
-     from you, a discriminatory patent license (a) in connection with
-     copies of the covered work conveyed by you (or copies made from
-     those copies), or (b) primarily for and in connection with specific
-     products or compilations that contain the covered work, unless you
-     entered into that arrangement, or that patent license was granted,
-     prior to 28 March 2007.
-
-     Nothing in this License shall be construed as excluding or limiting
-     any implied license or other defenses to infringement that may
-     otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others’ Freedom.
-
-     If conditions are imposed on you (whether by court order, agreement
-     or otherwise) that contradict the conditions of this License, they
-     do not excuse you from the conditions of this License.  If you
-     cannot convey a covered work so as to satisfy simultaneously your
-     obligations under this License and any other pertinent obligations,
-     then as a consequence you may not convey it at all.  For example,
-     if you agree to terms that obligate you to collect a royalty for
-     further conveying from those to whom you convey the Program, the
-     only way you could satisfy both those terms and this License would
-     be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-     Notwithstanding any other provision of this License, you have
-     permission to link or combine any covered work with a work licensed
-     under version 3 of the GNU Affero General Public License into a
-     single combined work, and to convey the resulting work.  The terms
-     of this License will continue to apply to the part which is the
-     covered work, but the special requirements of the GNU Affero
-     General Public License, section 13, concerning interaction through
-     a network will apply to the combination as such.
-
-  14. Revised Versions of this License.
-
-     The Free Software Foundation may publish revised and/or new
-     versions of the GNU General Public License from time to time.  Such
-     new versions will be similar in spirit to the present version, but
-     may differ in detail to address new problems or concerns.
-
-     Each version is given a distinguishing version number.  If the
-     Program specifies that a certain numbered version of the GNU
-     General Public License “or any later version” applies to it, you
-     have the option of following the terms and conditions either of
-     that numbered version or of any later version published by the Free
-     Software Foundation.  If the Program does not specify a version
-     number of the GNU General Public License, you may choose any
-     version ever published by the Free Software Foundation.
-
-     If the Program specifies that a proxy can decide which future
-     versions of the GNU General Public License can be used, that
-     proxy’s public statement of acceptance of a version permanently
-     authorizes you to choose that version for the Program.
-
-     Later license versions may give you additional or different
-     permissions.  However, no additional obligations are imposed on any
-     author or copyright holder as a result of your choosing to follow a
-     later version.
-
-  15. Disclaimer of Warranty.
-
-     THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-     APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE
-     COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS”
-     WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
-     INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-     MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE
-     RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.
-     SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL
-     NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-     IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-     WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES
-     AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR
-     DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-     CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE
-     THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA
-     BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-     PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-     PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF
-     THE POSSIBILITY OF SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-     If the disclaimer of warranty and limitation of liability provided
-     above cannot be given local legal effect according to their terms,
-     reviewing courts shall apply local law that most closely
-     approximates an absolute waiver of all civil liability in
-     connection with the Program, unless a warranty or assumption of
-     liability accompanies a copy of the Program in return for a fee.
-
-END OF TERMS AND CONDITIONS
-===========================
-
-How to Apply These Terms to Your New Programs
-=============================================
-
-If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these
-terms.
-
-   To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least the
-“copyright” line and a pointer to where the full notice is found.
-
-     ONE LINE TO GIVE THE PROGRAM'S NAME AND A BRIEF IDEA OF WHAT IT DOES.
-     Copyright (C) YEAR NAME OF AUTHOR
-
-     This program is free software: you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published by
-     the Free Software Foundation, either version 3 of the License, or (at
-     your option) any later version.
-
-     This program is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     General Public License for more details.
-
-     You should have received a copy of the GNU General Public License
-     along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-   Also add information on how to contact you by electronic and paper
-mail.
-
-   If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-     PROGRAM Copyright (C) YEAR NAME OF AUTHOR
-     This program comes with ABSOLUTELY NO WARRANTY; for details type ‘show w’.
-     This is free software, and you are welcome to redistribute it
-     under certain conditions; type ‘show c’ for details.
-
-   The hypothetical commands ‘show w’ and ‘show c’ should show the
-appropriate parts of the General Public License.  Of course, your
-program’s commands might be different; for a GUI interface, you would
-use an “about box”.
-
-   You should also get your employer (if you work as a programmer) or
-school, if any, to sign a “copyright disclaimer” for the program, if
-necessary.  For more information on this, and how to apply and follow
-the GNU GPL, see <https://www.gnu.org/licenses/>.
-
-   The GNU General Public License does not permit incorporating your
-program into proprietary programs.  If your program is a subroutine
-library, you may consider it more useful to permit linking proprietary
-applications with the library.  If this is what you want to do, use the
-GNU Lesser General Public License instead of this License.  But first,
-please read <https://www.gnu.org/licenses/why-not-lgpl.html>.
-
-
-
-Tag Table:
-Node: Top763
-Node: Introduction2976
-Ref: Some things that Transient can do3504
-Ref: Complexity in CLI programs3857
-Ref: Using Transient for composing interactive commands4458
-Node: Usage6700
-Node: Invoking Transients7068
-Node: Aborting and Resuming Transients8147
-Node: Common Suffix Commands10768
-Node: Saving Values12604
-Ref: Saving Values-Footnote-113975
-Node: Using History14168
-Node: Getting Help for Suffix Commands15742
-Node: Enabling and Disabling Suffixes17120
-Node: Other Commands20408
-Node: Configuration21384
-Ref: Essential Options21664
-Ref: Accessibility Options25325
-Ref: Auxiliary Options25648
-Ref: Developer Options30611
-Node: Modifying Existing Transients31859
-Node: Defining New Commands36051
-Node: Technical Introduction36414
-Node: Defining Transients42115
-Node: Binding Suffix and Infix Commands44582
-Node: Group Specifications45440
-Node: Suffix Specifications51968
-Node: Defining Suffix and Infix Commands56181
-Node: Using Infix Arguments59229
-Node: Transient State62866
-Ref: Pre-commands for Infixes67681
-Ref: Pre-commands for Suffixes68201
-Ref: Pre-commands for Non-Suffixes70655
-Ref: Special Pre-Commands71791
-Node: Classes and Methods72299
-Node: Group Classes74483
-Node: Group Methods76410
-Node: Prefix Classes77663
-Node: Suffix Classes78754
-Node: Suffix Methods81841
-Node: Suffix Value Methods82162
-Node: Suffix Format Methods84920
-Node: Prefix Slots86945
-Ref: Internal Prefix Slots89082
-Node: Suffix Slots90339
-Ref: Slots of transient-suffix90707
-Ref: Slots of transient-infix91890
-Ref: Slots of transient-variable95186
-Ref: Slots of transient-switches95288
-Node: Predicate Slots95651
-Node: FAQ97086
-Ref: Can I control how the popup buffer is displayed?97215
-Ref: How can I copy text from the popup buffer?97396
-Ref: How can I autoload prefix and suffix commands?97890
-Ref: How does Transient compare to prefix keys and universal arguments?98364
-Ref: How does Transient compare to Magit-Popup and Hydra?98607
-Ref: Why did some of the key bindings change?98801
-Ref: Why does q not quit popups anymore?101154
-Node: Keystroke Index102257
-Node: Command and Function Index104122
-Node: Variable Index110988
-Node: Concept Index113261
-Node: GNU General Public License115997
-
-End Tag Table
-
-
-Local Variables:
-coding: utf-8
-End:
diff --git a/emacs/elpa/transient-20240929.1847/dir b/emacs/elpa/transient-20241001.1031/dir
diff --git a/emacs/elpa/transient-20240929.1847/gpl.info b/emacs/elpa/transient-20241001.1031/gpl.info
diff --git a/emacs/elpa/transient-20240929.1847/transient-autoloads.el b/emacs/elpa/transient-20241001.1031/transient-autoloads.el
diff --git a/emacs/elpa/transient-20241001.1031/transient-pkg.el b/emacs/elpa/transient-20241001.1031/transient-pkg.el
@@ -0,0 +1,12 @@
+;; -*- no-byte-compile: t; lexical-binding: nil -*-
+(define-package "transient" "20241001.1031"
+  "Transient commands."
+  '((emacs  "26.1")
+    (compat "30.0.0.0")
+    (seq    "2.24"))
+  :url "https://github.com/magit/transient"
+  :commit "c06015cd6750f8625081f4184c68c94350eb0217"
+  :revdesc "c06015cd6750"
+  :keywords '("extensions")
+  :authors '(("Jonas Bernoulli" . "emacs.transient@jonas.bernoulli.dev"))
+  :maintainers '(("Jonas Bernoulli" . "emacs.transient@jonas.bernoulli.dev")))
diff --git a/emacs/elpa/transient-20241001.1031/transient.el b/emacs/elpa/transient-20241001.1031/transient.el
@@ -0,0 +1,4599 @@
+;;; transient.el --- Transient commands  -*- lexical-binding:t -*-
+
+;; Copyright (C) 2018-2024 Free Software Foundation, Inc.
+
+;; Author: Jonas Bernoulli <emacs.transient@jonas.bernoulli.dev>
+;; Homepage: https://github.com/magit/transient
+;; Keywords: extensions
+
+;; Package-Version: 20241001.1031
+;; Package-Revision: c06015cd6750
+;; Package-Requires: ((emacs "26.1") (compat "30.0.0.0") (seq "2.24"))
+
+;; SPDX-License-Identifier: GPL-3.0-or-later
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published
+;; by the Free Software Foundation, either version 3 of the License,
+;; or (at your option) any later version.
+;;
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; Transient is the library used to implement the keyboard-driven menus
+;; in Magit.  It is distributed as a separate package, so that it can be
+;; used to implement similar menus in other packages.
+
+;;; Code:
+
+(require 'cl-lib)
+(require 'compat)
+(require 'eieio)
+(require 'edmacro)
+(require 'format-spec)
+
+(eval-and-compile
+  (when (and (featurep 'seq)
+             (not (fboundp 'seq-keep)))
+    (unload-feature 'seq 'force)))
+(require 'seq)
+(unless (fboundp 'seq-keep)
+  (display-warning 'transient (substitute-command-keys "\
+Transient requires `seq' >= 2.24,
+but due to bad defaults, Emacs's package manager, refuses to
+upgrade this and other built-in packages to higher releases
+from GNU Elpa, when a package specifies that this is needed.
+
+To fix this, you have to add this to your init file:
+
+  (setq package-install-upgrade-built-in t)
+
+Then evaluate that expression by placing the cursor after it
+and typing \\[eval-last-sexp].
+
+Once you have done that, you have to explicitly upgrade `seq':
+
+  \\[package-upgrade] seq \\`RET'
+
+Then you also must make sure the updated version is loaded,
+by evaluating this form:
+
+  (progn (unload-feature 'seq t) (require 'seq))
+
+Until you do this, you will get random errors about `seq-keep'
+being undefined while using Transient.
+
+If you don't use the `package' package manager but still get
+this warning, then your chosen package manager likely has a
+similar defect.") :emergency))
+
+(eval-when-compile (require 'subr-x))
+
+(declare-function info "info" (&optional file-or-node buffer))
+(declare-function Man-find-section "man" (section))
+(declare-function Man-next-section "man" (n))
+(declare-function Man-getpage-in-background "man" (topic))
+
+(defvar Man-notify-method)
+(defvar pp-default-function) ; since Emacs 29.1
+
+(defmacro transient--with-emergency-exit (id &rest body)
+  (declare (indent defun))
+  (unless (keywordp id)
+    (setq body (cons id body))
+    (setq id nil))
+  `(condition-case err
+       (let ((debugger #'transient--exit-and-debug))
+         ,(macroexp-progn body))
+     ((debug error)
+      (transient--emergency-exit ,id)
+      (signal (car err) (cdr err)))))
+
+(defun transient--exit-and-debug (&rest args)
+  (transient--emergency-exit :debugger)
+  (apply #'debug args))
+
+;;; Options
+
+(defgroup transient nil
+  "Transient commands."
+  :group 'extensions)
+
+(defcustom transient-show-popup t
+  "Whether to show the current transient in a popup buffer.
+\\<transient-map>
+- If t, then show the popup as soon as a transient prefix command
+  is invoked.
+
+- If nil, then do not show the popup unless the user explicitly
+  requests it, by pressing \\[transient-show] or a prefix key.
+
+- If a number, then delay displaying the popup and instead show
+  a brief one-line summary.  If zero or negative, then suppress
+  even showing that summary and display the pressed key only.
+
+  Show the popup when the user explicitly requests it by pressing
+  \\[transient-show] or a prefix key.  Unless zero, then also show the popup
+  after that many seconds of inactivity (using the absolute value)."
+  :package-version '(transient . "0.1.0")
+  :group 'transient
+  :type '(choice (const  :tag "instantly" t)
+                 (const  :tag "on demand" nil)
+                 (const  :tag "on demand (no summary)" 0)
+                 (number :tag "after delay" 1)))
+
+(defcustom transient-enable-popup-navigation t
+  "Whether navigation commands are enabled in the transient popup.
+
+While a transient is active the transient popup buffer is not the
+current buffer, making it necessary to use dedicated commands to
+act on that buffer itself.  If this is non-nil, then the following
+bindings are available:
+
+\\<transient-popup-navigation-map>\
+- \\[transient-backward-button] moves the cursor to the previous suffix.
+- \\[transient-forward-button] moves the cursor to the next suffix.
+- \\[transient-push-button] invokes the suffix the cursor is on.
+\\<transient-button-map>\
+- \\`<mouse-1>' and \\`<mouse-2>' invoke the clicked on suffix.
+\\<transient-popup-navigation-map>\
+- \\[transient-isearch-backward]\
+ and \\[transient-isearch-forward] start isearch in the popup buffer.
+
+\\`<mouse-1>' and \\`<mouse-2>' are bound in `transient-push-button'.
+All other bindings are in `transient-popup-navigation-map'.
+
+By default \\`M-RET' is bound to `transient-push-button', instead of
+\\`RET', because if a transient allows the invocation of non-suffixes
+then it is likely that you would want \\`RET' to do what it would do
+if no transient were active."
+  :package-version '(transient . "0.4.0")
+  :group 'transient
+  :type 'boolean)
+
+(defcustom transient-display-buffer-action
+  '(display-buffer-in-side-window
+    (side . bottom)
+    (dedicated . t)
+    (inhibit-same-window . t))
+  "The action used to display the transient popup buffer.
+
+The transient popup buffer is displayed in a window using
+
+  (display-buffer BUFFER transient-display-buffer-action)
+
+The value of this option has the form (FUNCTION . ALIST),
+where FUNCTION is a function or a list of functions.  Each such
+function should accept two arguments: a buffer to display and an
+alist of the same form as ALIST.  See info node `(elisp)Choosing
+Window' for details.
+
+The default is:
+
+  (display-buffer-in-side-window
+    (side . bottom)
+    (dedicated . t)
+    (inhibit-same-window . t))
+
+This displays the window at the bottom of the selected frame.
+Another useful FUNCTION is `display-buffer-below-selected', which
+is what `magit-popup' used by default.  For more alternatives see
+info node `(elisp)Display Action Functions' and info node
+`(elisp)Buffer Display Action Alists'.
+
+Note that the buffer that was current before the transient buffer
+is shown should remain the current buffer.  Many suffix commands
+act on the thing at point, if appropriate, and if the transient
+buffer became the current buffer, then that would change what is
+at point.  To that effect `inhibit-same-window' ensures that the
+selected window is not used to show the transient buffer.
+
+It may be possible to display the window in another frame, but
+whether that works in practice depends on the window-manager.
+If the window manager selects the new window (Emacs frame),
+then that unfortunately changes which buffer is current.
+
+If you change the value of this option, then you might also
+want to change the value of `transient-mode-line-format'."
+  :package-version '(transient . "0.7.5")
+  :group 'transient
+  :type '(cons (choice function (repeat :tag "Functions" function))
+               alist))
+
+(defcustom transient-mode-line-format 'line
+  "The mode-line format for the transient popup buffer.
+
+If nil, then the buffer has no mode-line.  If the buffer is not
+displayed right above the echo area, then this probably is not
+a good value.
+
+If `line' (the default) or a natural number, then the buffer
+has no mode-line, but a line is drawn is drawn in its place.
+If a number is used, that specifies the thickness of the line.
+On termcap frames we cannot draw lines, so there `line' and
+numbers are synonyms for nil.
+
+The color of the line is used to indicate if non-suffixes are
+allowed and whether they exit the transient.  The foreground
+color of `transient-key-noop' (if non-suffix are disallowed),
+`transient-key-stay' (if allowed and transient stays active), or
+`transient-key-exit' (if allowed and they exit the transient) is
+used to draw the line.
+
+Otherwise this can be any mode-line format.
+See `mode-line-format' for details."
+  :package-version '(transient . "0.2.0")
+  :group 'transient
+  :type '(choice (const  :tag "hide mode-line" nil)
+                 (const  :tag "substitute thin line" line)
+                 (number :tag "substitute line with thickness")
+                 (const  :tag "name of prefix command"
+                         ("%e" mode-line-front-space
+                          mode-line-buffer-identification))
+                 (sexp   :tag "custom mode-line format")))
+
+(defcustom transient-show-common-commands nil
+  "Whether to show common transient suffixes in the popup buffer.
+
+These commands are always shown after typing the prefix key
+\"C-x\" when a transient command is active.  To toggle the value
+of this variable use \"C-x t\" when a transient is active."
+  :package-version '(transient . "0.1.0")
+  :group 'transient
+  :type 'boolean)
+
+(defcustom transient-read-with-initial-input nil
+  "Whether to use the last history element as initial minibuffer input."
+  :package-version '(transient . "0.2.0")
+  :group 'transient
+  :type 'boolean)
+
+(defcustom transient-highlight-mismatched-keys nil
+  "Whether to highlight keys that do not match their argument.
+
+This only affects infix arguments that represent command-line
+arguments.  When this option is non-nil, then the key binding
+for infix argument are highlighted when only a long argument
+\(e.g., \"--verbose\") is specified but no shorthand (e.g., \"-v\").
+In the rare case that a short-hand is specified but does not
+match the key binding, then it is highlighted differently.
+
+The highlighting is done using `transient-mismatched-key'
+and `transient-nonstandard-key'."
+  :package-version '(transient . "0.1.0")
+  :group 'transient
+  :type 'boolean)
+
+(defcustom transient-highlight-higher-levels nil
+  "Whether to highlight suffixes on higher levels.
+
+This is primarily intended for package authors.
+
+When non-nil then highlight the description of suffixes whose
+level is above 4, the default of `transient-default-level'.
+Assuming you have set that variable to 7, this highlights all
+suffixes that won't be available to users without them making
+the same customization."
+  :package-version '(transient . "0.3.6")
+  :group 'transient
+  :type 'boolean)
+
+(defcustom transient-substitute-key-function nil
+  "Function used to modify key bindings.
+
+This function is called with one argument, the prefix object,
+and must return a key binding description, either the existing
+key description it finds in the `key' slot, or a substitution.
+
+This is intended to let users replace certain prefix keys.  It
+could also be used to make other substitutions, but that is
+discouraged.
+
+For example, \"=\" is hard to reach using my custom keyboard
+layout, so I substitute \"(\" for that, which is easy to reach
+using a layout optimized for Lisp.
+
+  (setq transient-substitute-key-function
+        (lambda (obj)
+          (let ((key (oref obj key)))
+            (if (string-match \"\\\\`\\\\(=\\\\)[a-zA-Z]\" key)
+                (replace-match \"(\" t t key 1)
+              key)))))"
+  :package-version '(transient . "0.1.0")
+  :group 'transient
+  :type '(choice (const :tag "Transform no keys (nil)" nil) function))
+
+(defcustom transient-semantic-coloring t
+  "Whether to use colors to indicate transient behavior.
+
+If non-nil, then the key binding of each suffix is colorized to
+indicate whether it exits the transient state or not, and the
+line that is drawn below the transient popup buffer is used to
+indicate the behavior of non-suffix commands."
+  :package-version '(transient . "0.5.0")
+  :group 'transient
+  :type 'boolean)
+
+(defcustom transient-detect-key-conflicts nil
+  "Whether to detect key binding conflicts.
+
+Conflicts are detected when a transient prefix command is invoked
+and results in an error, which prevents the transient from being
+used."
+  :package-version '(transient . "0.1.0")
+  :group 'transient
+  :type 'boolean)
+
+(defcustom transient-align-variable-pitch nil
+  "Whether to align columns pixel-wise in the popup buffer.
+
+If this is non-nil, then columns are aligned pixel-wise to
+support variable-pitch fonts.  Keys are not aligned, so you
+should use a fixed-pitch font for the `transient-key' face.
+Other key faces inherit from that face unless a theme is
+used that breaks that relationship.
+
+This option is intended for users who use a variable-pitch
+font for the `default' face.
+
+Also see `transient-force-fixed-pitch'."
+  :package-version '(transient . "0.4.0")
+  :group 'transient
+  :type 'boolean)
+
+(defcustom transient-force-fixed-pitch nil
+  "Whether to force use of monospaced font in the popup buffer.
+
+Even if you use a proportional font for the `default' face,
+you might still want to use a monospaced font in transient's
+popup buffer.  Setting this option to t causes `default' to
+be remapped to `fixed-pitch' in that buffer.
+
+Also see `transient-align-variable-pitch'."
+  :package-version '(transient . "0.2.0")
+  :group 'transient
+  :type 'boolean)
+
+(defcustom transient-force-single-column nil
+  "Whether to force use of a single column to display suffixes.
+
+This might be useful for users with low vision who use large
+text and might otherwise have to scroll in two dimensions."
+  :package-version '(transient . "0.3.6")
+  :group 'transient
+  :type 'boolean)
+
+(defcustom transient-hide-during-minibuffer-read nil
+  "Whether to hide the transient buffer while reading in the minibuffer."
+  :package-version '(transient . "0.4.0")
+  :group 'transient
+  :type 'boolean)
+
+(defconst transient--max-level 7)
+(defconst transient--default-child-level 1)
+(defconst transient--default-prefix-level 4)
+
+(defcustom transient-default-level transient--default-prefix-level
+  "Control what suffix levels are made available by default.
+
+Each suffix command is placed on a level and each prefix command
+has a level, which controls which suffix commands are available.
+Integers between 1 and 7 (inclusive) are valid levels.
+
+The levels of individual transients and/or their individual
+suffixes can be changed individually, by invoking the prefix and
+then pressing \"C-x l\".
+
+The default level for both transients and their suffixes is 4.
+This option only controls the default for transients.  The default
+suffix level is always 4.  The author of a transient should place
+certain suffixes on a higher level if they expect that it won't be
+of use to most users, and they should place very important suffixes
+on a lower level so that they remain available even if the user
+lowers the transient level.
+
+\(Magit currently places nearly all suffixes on level 4 and lower
+levels are not used at all yet.  So for the time being you should
+not set a lower level here and using a higher level might not
+give you as many additional suffixes as you hoped.)"
+  :package-version '(transient . "0.1.0")
+  :group 'transient
+  :type '(choice (const :tag "1 - fewest suffixes" 1)
+                 (const 2)
+                 (const 3)
+                 (const :tag "4 - default" 4)
+                 (const 5)
+                 (const 6)
+                 (const :tag "7 - most suffixes" 7)))
+
+(defcustom transient-levels-file
+  (locate-user-emacs-file "transient/levels.el")
+  "File used to save levels of transients and their suffixes."
+  :package-version '(transient . "0.1.0")
+  :group 'transient
+  :type 'file)
+
+(defcustom transient-values-file
+  (locate-user-emacs-file "transient/values.el")
+  "File used to save values of transients."
+  :package-version '(transient . "0.1.0")
+  :group 'transient
+  :type 'file)
+
+(defcustom transient-history-file
+  (locate-user-emacs-file "transient/history.el")
+  "File used to save history of transients and their infixes."
+  :package-version '(transient . "0.1.0")
+  :group 'transient
+  :type 'file)
+
+(defcustom transient-history-limit 10
+  "Number of history elements to keep when saving to file."
+  :package-version '(transient . "0.1.0")
+  :group 'transient
+  :type 'integer)
+
+(defcustom transient-save-history t
+  "Whether to save history of transient commands when exiting Emacs."
+  :package-version '(transient . "0.1.0")
+  :group 'transient
+  :type 'boolean)
+
+;;; Faces
+
+(defgroup transient-faces nil
+  "Faces used by Transient."
+  :group 'transient)
+
+(defface transient-heading '((t :inherit font-lock-keyword-face))
+  "Face used for headings."
+  :group 'transient-faces)
+
+(defface transient-argument '((t :inherit font-lock-string-face :weight bold))
+  "Face used for enabled arguments."
+  :group 'transient-faces)
+
+(defface transient-inactive-argument '((t :inherit shadow))
+  "Face used for inactive arguments."
+  :group 'transient-faces)
+
+(defface transient-value '((t :inherit font-lock-string-face :weight bold))
+  "Face used for values."
+  :group 'transient-faces)
+
+(defface transient-inactive-value '((t :inherit shadow))
+  "Face used for inactive values."
+  :group 'transient-faces)
+
+(defface transient-unreachable '((t :inherit shadow))
+  "Face used for suffixes unreachable from the current prefix sequence."
+  :group 'transient-faces)
+
+(defface transient-inapt-suffix '((t :inherit shadow :italic t))
+  "Face used for suffixes that are inapt at this time."
+  :group 'transient-faces)
+
+(defface transient-active-infix '((t :inherit highlight))
+  "Face used for the infix for which the value is being read."
+  :group 'transient-faces)
+
+(defface transient-enabled-suffix
+  '((t :background "green" :foreground "black" :weight bold))
+  "Face used for enabled levels while editing suffix levels.
+See info node `(transient)Enabling and Disabling Suffixes'."
+  :group 'transient-faces)
+
+(defface transient-disabled-suffix
+  '((t :background "red" :foreground "black" :weight bold))
+  "Face used for disabled levels while editing suffix levels.
+See info node `(transient)Enabling and Disabling Suffixes'."
+  :group 'transient-faces)
+
+(defface transient-higher-level
+  `((t :box ( :line-width ,(if (>= emacs-major-version 28) (cons -1 -1) -1)
+              :color ,(let ((color (face-attribute 'shadow :foreground nil t)))
+                        (or (and (not (eq color 'unspecified)) color)
+                            "grey60")))))
+  "Face optionally used to highlight suffixes on higher levels.
+Also see option `transient-highlight-higher-levels'."
+  :group 'transient-faces)
+
+(defface transient-delimiter '((t :inherit shadow))
+  "Face used for delimiters and separators.
+This includes the parentheses around values and the pipe
+character used to separate possible values from each other."
+  :group 'transient-faces)
+
+(defface transient-key '((t :inherit font-lock-builtin-face))
+  "Face used for keys."
+  :group 'transient-faces)
+
+(defface transient-key-stay
+  `((((class color) (background light))
+     :inherit transient-key
+     :foreground "#22aa22")
+    (((class color) (background dark))
+     :inherit transient-key
+     :foreground "#ddffdd"))
+  "Face used for keys of suffixes that don't exit transient state."
+  :group 'transient-faces)
+
+(defface transient-key-noop
+  `((((class color) (background light))
+     :inherit transient-key
+     :foreground "grey80")
+    (((class color) (background dark))
+     :inherit transient-key
+     :foreground "grey30"))
+  "Face used for keys of suffixes that currently cannot be invoked."
+  :group 'transient-faces)
+
+(defface transient-key-return
+  `((((class color) (background light))
+     :inherit transient-key
+     :foreground "#aaaa11")
+    (((class color) (background dark))
+     :inherit transient-key
+     :foreground "#ffffcc"))
+  "Face used for keys of suffixes that return to the parent transient."
+  :group 'transient-faces)
+
+(defface transient-key-exit
+  `((((class color) (background light))
+     :inherit transient-key
+     :foreground "#aa2222")
+    (((class color) (background dark))
+     :inherit transient-key
+     :foreground "#ffdddd"))
+  "Face used for keys of suffixes that exit transient state."
+  :group 'transient-faces)
+
+(defface transient-unreachable-key
+  '((t :inherit (shadow transient-key) :weight normal))
+  "Face used for keys unreachable from the current prefix sequence."
+  :group 'transient-faces)
+
+(defface transient-nonstandard-key
+  `((t :box ( :line-width ,(if (>= emacs-major-version 28) (cons -1 -1) -1)
+              :color "cyan")))
+  "Face optionally used to highlight keys conflicting with short-argument.
+Also see option `transient-highlight-mismatched-keys'."
+  :group 'transient-faces)
+
+(defface transient-mismatched-key
+  `((t :box ( :line-width ,(if (>= emacs-major-version 28) (cons -1 -1) -1)
+              :color "magenta")))
+  "Face optionally used to highlight keys without a short-argument.
+Also see option `transient-highlight-mismatched-keys'."
+  :group 'transient-faces)
+
+;;; Persistence
+
+(defun transient--read-file-contents (file)
+  (with-demoted-errors "Transient error: %S"
+    (and (file-exists-p file)
+         (with-temp-buffer
+           (insert-file-contents file)
+           (read (current-buffer))))))
+
+(defun transient--pp-to-file (list file)
+  (make-directory (file-name-directory file) t)
+  (setq list (cl-sort (copy-sequence list) #'string< :key #'car))
+  (with-temp-file file
+    (let ((print-level nil)
+          (print-length nil)
+          (pp-default-function 'pp-28)
+          (fill-column 999))
+      (pp list (current-buffer)))))
+
+(defvar transient-values
+  (transient--read-file-contents transient-values-file)
+  "Values of transient commands.
+The value of this variable persists between Emacs sessions
+and you usually should not change it manually.")
+
+(defun transient-save-values ()
+  (transient--pp-to-file transient-values transient-values-file))
+
+(defvar transient-levels
+  (transient--read-file-contents transient-levels-file)
+  "Levels of transient commands.
+The value of this variable persists between Emacs sessions
+and you usually should not change it manually.")
+
+(defun transient-save-levels ()
+  (transient--pp-to-file transient-levels transient-levels-file))
+
+(defvar transient-history
+  (transient--read-file-contents transient-history-file)
+  "History of transient commands and infix arguments.
+The value of this variable persists between Emacs sessions
+\(unless `transient-save-history' is nil) and you usually
+should not change it manually.")
+
+(defun transient-save-history ()
+  (setq transient-history
+        (cl-sort (mapcar (pcase-lambda (`(,key . ,val))
+                           (cons key (seq-take (delete-dups val)
+                                               transient-history-limit)))
+                         transient-history)
+                 #'string< :key #'car))
+  (transient--pp-to-file transient-history transient-history-file))
+
+(defun transient-maybe-save-history ()
+  "Save the value of `transient-history'.
+If `transient-save-history' is nil, then do nothing."
+  (when transient-save-history
+    (transient-save-history)))
+
+(unless noninteractive
+  (add-hook 'kill-emacs-hook #'transient-maybe-save-history))
+
+;;; Classes
+;;;; Prefix
+
+(defclass transient-prefix ()
+  ((prototype   :initarg :prototype)
+   (command     :initarg :command)
+   (level       :initarg :level)
+   (variable    :initarg :variable    :initform nil)
+   (init-value  :initarg :init-value)
+   (value) (default-value :initarg :value)
+   (scope       :initarg :scope       :initform nil)
+   (history     :initarg :history     :initform nil)
+   (history-pos :initarg :history-pos :initform 0)
+   (history-key :initarg :history-key :initform nil)
+   (show-help   :initarg :show-help   :initform nil)
+   (info-manual :initarg :info-manual :initform nil)
+   (man-page    :initarg :man-page    :initform nil)
+   (transient-suffix     :initarg :transient-suffix     :initform nil)
+   (transient-non-suffix :initarg :transient-non-suffix :initform nil)
+   (transient-switch-frame :initarg :transient-switch-frame)
+   (refresh-suffixes     :initarg :refresh-suffixes     :initform nil)
+   (incompatible         :initarg :incompatible         :initform nil)
+   (suffix-description   :initarg :suffix-description)
+   (variable-pitch       :initarg :variable-pitch       :initform nil)
+   (column-widths        :initarg :column-widths        :initform nil)
+   (unwind-suffix        :documentation "Internal use." :initform nil))
+  "Transient prefix command.
+
+Each transient prefix command consists of a command, which is
+stored in a symbol's function slot and an object, which is
+stored in the `transient--prefix' property of the same symbol.
+
+When a transient prefix command is invoked, then a clone of that
+object is stored in the global variable `transient--prefix' and
+the prototype is stored in the clone's `prototype' slot.")
+
+;;;; Suffix
+
+(defclass transient-child ()
+  ((level
+    :initarg :level
+    :initform (symbol-value 'transient--default-child-level)
+    :documentation "Enable if level of prefix is equal or greater.")
+   (if
+    :initarg :if
+    :initform nil
+    :documentation "Enable if predicate returns non-nil.")
+   (if-not
+    :initarg :if-not
+    :initform nil
+    :documentation "Enable if predicate returns nil.")
+   (if-non-nil
+    :initarg :if-non-nil
+    :initform nil
+    :documentation "Enable if variable's value is non-nil.")
+   (if-nil
+    :initarg :if-nil
+    :initform nil
+    :documentation "Enable if variable's value is nil.")
+   (if-mode
+    :initarg :if-mode
+    :initform nil
+    :documentation "Enable if major-mode matches value.")
+   (if-not-mode
+    :initarg :if-not-mode
+    :initform nil
+    :documentation "Enable if major-mode does not match value.")
+   (if-derived
+    :initarg :if-derived
+    :initform nil
+    :documentation "Enable if major-mode derives from value.")
+   (if-not-derived
+    :initarg :if-not-derived
+    :initform nil
+    :documentation "Enable if major-mode does not derive from value.")
+   (inapt
+    :initform nil)
+   (inapt-face
+    :initarg :inapt-face
+    :initform 'transient-inapt-suffix)
+   (inapt-if
+    :initarg :inapt-if
+    :initform nil
+    :documentation "Inapt if predicate returns non-nil.")
+   (inapt-if-not
+    :initarg :inapt-if-not
+    :initform nil
+    :documentation "Inapt if predicate returns nil.")
+   (inapt-if-non-nil
+    :initarg :inapt-if-non-nil
+    :initform nil
+    :documentation "Inapt if variable's value is non-nil.")
+   (inapt-if-nil
+    :initarg :inapt-if-nil
+    :initform nil
+    :documentation "Inapt if variable's value is nil.")
+   (inapt-if-mode
+    :initarg :inapt-if-mode
+    :initform nil
+    :documentation "Inapt if major-mode matches value.")
+   (inapt-if-not-mode
+    :initarg :inapt-if-not-mode
+    :initform nil
+    :documentation "Inapt if major-mode does not match value.")
+   (inapt-if-derived
+    :initarg :inapt-if-derived
+    :initform nil
+    :documentation "Inapt if major-mode derives from value.")
+   (inapt-if-not-derived
+    :initarg :inapt-if-not-derived
+    :initform nil
+    :documentation "Inapt if major-mode does not derive from value."))
+  "Abstract superclass for group and suffix classes.
+
+It is undefined what happens if more than one `if*' predicate
+slot is non-nil."
+  :abstract t)
+
+(defclass transient-suffix (transient-child)
+  ((definition  :allocation :class    :initform nil)
+   (key         :initarg :key)
+   (command     :initarg :command)
+   (transient   :initarg :transient)
+   (format      :initarg :format      :initform " %k %d")
+   (description :initarg :description :initform nil)
+   (face        :initarg :face        :initform nil)
+   (show-help   :initarg :show-help   :initform nil))
+  "Superclass for suffix command.")
+
+(defclass transient-information (transient-suffix)
+  ((format :initform " %k %d")
+   (key    :initform " "))
+  "Display-only information, aligned with suffix keys.
+Technically a suffix object with no associated command.")
+
+(defclass transient-information* (transient-information)
+  ((format :initform " %d"))
+  "Display-only information, aligned with suffix descriptions.
+Technically a suffix object with no associated command.")
+
+(defclass transient-infix (transient-suffix)
+  ((transient                         :initform t)
+   (argument    :initarg :argument)
+   (shortarg    :initarg :shortarg)
+   (value                             :initform nil)
+   (init-value  :initarg :init-value)
+   (unsavable   :initarg :unsavable   :initform nil)
+   (multi-value :initarg :multi-value :initform nil)
+   (always-read :initarg :always-read :initform nil)
+   (allow-empty :initarg :allow-empty :initform nil)
+   (history-key :initarg :history-key :initform nil)
+   (reader      :initarg :reader      :initform nil)
+   (prompt      :initarg :prompt      :initform nil)
+   (choices     :initarg :choices     :initform nil)
+   (format                            :initform " %k %d (%v)"))
+  "Transient infix command."
+  :abstract t)
+
+(defclass transient-argument (transient-infix) ()
+  "Abstract superclass for infix arguments."
+  :abstract t)
+
+(defclass transient-switch (transient-argument) ()
+  "Class used for command-line argument that can be turned on and off.")
+
+(defclass transient-option (transient-argument) ()
+  "Class used for command-line argument that can take a value.")
+
+(defclass transient-variable (transient-infix)
+  ((variable    :initarg :variable)
+   (format                            :initform " %k %d %v"))
+  "Abstract superclass for infix commands that set a variable."
+  :abstract t)
+
+(defclass transient-switches (transient-argument)
+  ((argument-format  :initarg :argument-format)
+   (argument-regexp  :initarg :argument-regexp))
+  "Class used for sets of mutually exclusive command-line switches.")
+
+(defclass transient-files (transient-option) ()
+  ((key         :initform "--")
+   (argument    :initform "--")
+   (multi-value :initform rest)
+   (reader      :initform transient-read-files))
+  "Class used for the \"--\" argument or similar.
+All remaining arguments are treated as files.
+They become the value of this argument.")
+
+(defclass transient-value-preset (transient-suffix)
+  ((transient :initform t)
+   (set :initarg := :initform nil))
+  "Class used by the `transient-preset' suffix command.")
+
+;;;; Group
+
+(defclass transient-group (transient-child)
+  ((suffixes       :initarg :suffixes       :initform nil)
+   (hide           :initarg :hide           :initform nil)
+   (description    :initarg :description    :initform nil)
+   (pad-keys       :initarg :pad-keys       :initform nil)
+   (info-format    :initarg :info-format    :initform nil)
+   (setup-children :initarg :setup-children))
+  "Abstract superclass of all group classes."
+  :abstract t)
+
+(defclass transient-column (transient-group) ()
+  "Group class that displays each element on a separate line.")
+
+(defclass transient-row (transient-group) ()
+  "Group class that displays all elements on a single line.")
+
+(defclass transient-columns (transient-group) ()
+  "Group class that displays elements organized in columns.
+Direct elements have to be groups whose elements have to be
+commands or strings.  Each subgroup represents a column.
+This class takes care of inserting the subgroups' elements.")
+
+(defclass transient-subgroups (transient-group) ()
+  "Group class that wraps other groups.
+
+Direct elements have to be groups whose elements have to be
+commands or strings.  This group inserts an empty line between
+subgroups.  The subgroups are responsible for displaying their
+elements themselves.")
+
+;;; Define
+
+(defmacro transient-define-prefix (name arglist &rest args)
+  "Define NAME as a transient prefix command.
+
+ARGLIST are the arguments that command takes.
+DOCSTRING is the documentation string and is optional.
+
+These arguments can optionally be followed by key-value pairs.
+Each key has to be a keyword symbol, either `:class' or a keyword
+argument supported by the constructor of that class.  The
+`transient-prefix' class is used if the class is not specified
+explicitly.
+
+GROUPs add key bindings for infix and suffix commands and specify
+how these bindings are presented in the popup buffer.  At least
+one GROUP has to be specified.  See info node `(transient)Binding
+Suffix and Infix Commands'.
+
+The BODY is optional.  If it is omitted, then ARGLIST is also
+ignored and the function definition becomes:
+
+  (lambda ()
+    (interactive)
+    (transient-setup \\='NAME))
+
+If BODY is specified, then it must begin with an `interactive'
+form that matches ARGLIST, and it must call `transient-setup'.
+It may however call that function only when some condition is
+satisfied; that is one of the reason why you might want to use
+an explicit BODY.
+
+All transients have a (possibly nil) value, which is exported
+when suffix commands are called, so that they can consume that
+value.  For some transients it might be necessary to have a sort
+of secondary value, called a scope.  Such a scope would usually
+be set in the commands `interactive' form and has to be passed
+to the setup function:
+
+  (transient-setup \\='NAME nil nil :scope SCOPE)
+
+\(fn NAME ARGLIST [DOCSTRING] [KEYWORD VALUE]... GROUP... [BODY...])"
+  (declare (debug ( &define name lambda-list
+                    [&optional lambda-doc]
+                    [&rest keywordp sexp]
+                    [&rest vectorp]
+                    [&optional ("interactive" interactive) def-body]))
+           (indent defun)
+           (doc-string 3))
+  (pcase-let
+      ((`(,class ,slots ,suffixes ,docstr ,body ,interactive-only)
+        (transient--expand-define-args args arglist 'transient-define-prefix)))
+    `(progn
+       (defalias ',name
+         ,(if body
+              `(lambda ,arglist ,@body)
+            `(lambda ()
+               (interactive)
+               (transient-setup ',name))))
+       (put ',name 'interactive-only ,interactive-only)
+       (put ',name 'function-documentation ,docstr)
+       (put ',name 'transient--prefix
+            (,(or class 'transient-prefix) :command ',name ,@slots))
+       (put ',name 'transient--layout
+            (list ,@(cl-mapcan (lambda (s) (transient--parse-child name s))
+                               suffixes))))))
+
+(defmacro transient-define-suffix (name arglist &rest args)
+  "Define NAME as a transient suffix command.
+
+ARGLIST are the arguments that the command takes.
+DOCSTRING is the documentation string and is optional.
+
+These arguments can optionally be followed by key-value pairs.
+Each key has to be a keyword symbol, either `:class' or a
+keyword argument supported by the constructor of that class.
+The `transient-suffix' class is used if the class is not
+specified explicitly.
+
+The BODY must begin with an `interactive' form that matches
+ARGLIST.  The infix arguments are usually accessed by using
+`transient-args' inside `interactive'.
+
+\(fn NAME ARGLIST [DOCSTRING] [KEYWORD VALUE]... [BODY...])"
+  (declare (debug ( &define name lambda-list
+                    [&optional lambda-doc]
+                    [&rest keywordp sexp]
+                    [&optional ("interactive" interactive) def-body]))
+           (indent defun)
+           (doc-string 3))
+  (pcase-let
+      ((`(,class ,slots ,_ ,docstr ,body ,interactive-only)
+        (transient--expand-define-args args arglist 'transient-define-suffix)))
+    `(progn
+       (defalias ',name
+         ,(if (and (not body) class (oref-default class definition))
+              `(oref-default ',class definition)
+            `(lambda ,arglist ,@body)))
+       (put ',name 'interactive-only ,interactive-only)
+       (put ',name 'function-documentation ,docstr)
+       (put ',name 'transient--suffix
+            (,(or class 'transient-suffix) :command ',name ,@slots)))))
+
+(defmacro transient-augment-suffix (name &rest args)
+  "Augment existing command NAME with a new transient suffix object.
+Similar to `transient-define-suffix' but define a suffix object only.
+\n\(fn NAME [KEYWORD VALUE]...)"
+  (declare (debug (&define name [&rest keywordp sexp]))
+           (indent defun))
+  (pcase-let
+      ((`(,class ,slots)
+        (transient--expand-define-args args nil 'transient-augment-suffix t)))
+    `(put ',name 'transient--suffix
+          (,(or class 'transient-suffix) :command ',name ,@slots))))
+
+(defmacro transient-define-infix (name arglist &rest args)
+  "Define NAME as a transient infix command.
+
+ARGLIST is always ignored and reserved for future use.
+DOCSTRING is the documentation string and is optional.
+
+At least one key-value pair is required.  All transient infix
+commands are equal to each other (but not eq).  It is meaning-
+less to define an infix command, without providing at least one
+keyword argument (usually `:argument' or `:variable', depending
+on the class).  The suffix class defaults to `transient-switch'
+and can be set using the `:class' keyword.
+
+The function definitions is always:
+
+  (lambda ()
+    (interactive)
+    (let ((obj (transient-suffix-object)))
+      (transient-infix-set obj (transient-infix-read obj)))
+    (transient--show))
+
+`transient-infix-read' and `transient-infix-set' are generic
+functions.  Different infix commands behave differently because
+the concrete methods are different for different infix command
+classes.  In rare case the above command function might not be
+suitable, even if you define your own infix command class.  In
+that case you have to use `transient-define-suffix' to define
+the infix command and use t as the value of the `:transient'
+keyword.
+
+\(fn NAME ARGLIST [DOCSTRING] KEYWORD VALUE [KEYWORD VALUE]...)"
+  (declare (debug ( &define name lambda-list
+                    [&optional lambda-doc]
+                    keywordp sexp
+                    [&rest keywordp sexp]))
+           (indent defun)
+           (doc-string 3))
+  (pcase-let
+      ((`(,class ,slots ,_ ,docstr ,_ ,interactive-only)
+        (transient--expand-define-args args arglist 'transient-define-infix t)))
+    `(progn
+       (defalias ',name #'transient--default-infix-command)
+       (put ',name 'interactive-only ,interactive-only)
+       (put ',name 'completion-predicate #'transient--suffix-only)
+       (put ',name 'function-documentation ,docstr)
+       (put ',name 'transient--suffix
+            (,(or class 'transient-switch) :command ',name ,@slots)))))
+
+(defalias 'transient-define-argument #'transient-define-infix
+  "Define NAME as a transient infix command.
+
+Only use this alias to define an infix command that actually
+sets an infix argument.  To define a infix command that, for
+example, sets a variable, use `transient-define-infix' instead.
+
+\(fn NAME ARGLIST [DOCSTRING] [KEYWORD VALUE]...)")
+
+(defun transient--default-infix-command ()
+  ;; Most infix commands are but an alias for this command.
+  "Cannot show any documentation for this transient infix command.
+
+When you request help for an infix command using `transient-help', that
+usually shows the respective man-page and tries to jump to the location
+where the respective argument is being described.
+
+If no man-page is specified for the containing transient menu, then the
+docstring is displayed instead, if any.
+
+If the infix command doesn't have a docstring, as is the case here, then
+this docstring is displayed instead, because technically infix commands
+are aliases for `transient--default-infix-command'.
+
+`describe-function' also shows the docstring of the infix command,
+falling back to that of the same aliased command."
+  (interactive)
+  (let ((obj (transient-suffix-object)))
+    (transient-infix-set obj (transient-infix-read obj)))
+  (transient--show))
+(put 'transient--default-infix-command 'interactive-only t)
+(put 'transient--default-infix-command 'completion-predicate
+     #'transient--suffix-only)
+
+(define-advice find-function-advised-original
+    (:around (fn func) transient-default-infix)
+  "Return nil instead of `transient--default-infix-command'.
+When using `find-function' to jump to the definition of a transient
+infix command/argument, then we want to actually jump to that, not to
+the definition of `transient--default-infix-command', which all infix
+commands are aliases for."
+  (let ((val (funcall fn func)))
+    (and val (not (eq val 'transient--default-infix-command)) val)))
+
+(eval-and-compile ;transient--expand-define-args
+  (defun transient--expand-define-args (args &optional arglist form nobody)
+    ;; ARGLIST and FORM are only optional for backward compatibility.
+    ;; This is necessary because "emoji.el" from Emacs 29 calls this
+    ;; function directly, with just one argument.
+    (unless (listp arglist)
+      (error "Mandatory ARGLIST is missing"))
+    (let (class keys suffixes docstr declare (interactive-only t))
+      (when (stringp (car args))
+        (setq docstr (pop args)))
+      (while (keywordp (car args))
+        (let ((k (pop args))
+              (v (pop args)))
+          (if (eq k :class)
+              (setq class v)
+            (push k keys)
+            (push v keys))))
+      (while (let ((arg (car args)))
+               (or (vectorp arg)
+                   (and arg (symbolp arg))))
+        (push (pop args) suffixes))
+      (when (eq (car-safe (car args)) 'declare)
+        (setq declare (car args))
+        (setq args (cdr args))
+        (when-let ((int (assq 'interactive-only declare)))
+          (setq interactive-only (cadr int))
+          (delq int declare))
+        (unless (cdr declare)
+          (setq declare nil)))
+      (cond
+       ((not args))
+       (nobody
+        (error "%s: No function body allowed" form))
+       ((not (eq (car-safe (nth (if declare 1 0) args)) 'interactive))
+        (error "%s: Interactive form missing" form)))
+      (list (if (eq (car-safe class) 'quote)
+                (cadr class)
+              class)
+            (nreverse keys)
+            (nreverse suffixes)
+            docstr
+            (if declare (cons declare args) args)
+            interactive-only))))
+
+(defun transient--parse-child (prefix spec)
+  (cl-typecase spec
+    (null    (error "Invalid transient--parse-child spec: %s" spec))
+    (symbol  (let ((value (symbol-value spec)))
+               (if (and (listp value)
+                        (or (listp (car value))
+                            (vectorp (car value))))
+                   (cl-mapcan (lambda (s) (transient--parse-child prefix s)) value)
+                 (transient--parse-child prefix value))))
+    (vector  (and-let* ((c (transient--parse-group  prefix spec))) (list c)))
+    (list    (and-let* ((c (transient--parse-suffix prefix spec))) (list c)))
+    (string  (list spec))
+    (t       (error "Invalid transient--parse-child spec: %s" spec))))
+
+(defun transient--parse-group (prefix spec)
+  (setq spec (append spec nil))
+  (cl-symbol-macrolet
+      ((car (car spec))
+       (pop (pop spec)))
+    (let (level class args)
+      (when (integerp car)
+        (setq level pop))
+      (when (stringp car)
+        (setq args (plist-put args :description pop)))
+      (while (keywordp car)
+        (let ((key pop)
+              (val pop))
+          (cond ((eq key :class)
+                 (setq class (macroexp-quote val)))
+                ((or (symbolp val)
+                     (and (listp val) (not (eq (car val) 'lambda))))
+                 (setq args (plist-put args key (macroexp-quote val))))
+                ((setq args (plist-put args key val))))))
+      (unless (or spec class (not (plist-get args :setup-children)))
+        (message "WARNING: %s: When %s is used, %s must also be specified"
+                 'transient-define-prefix :setup-children :class))
+      (list 'vector
+            (or level transient--default-child-level)
+            (cond (class)
+                  ((or (vectorp car)
+                       (and car (symbolp car)))
+                   (quote 'transient-columns))
+                  ((quote 'transient-column)))
+            (and args (cons 'list args))
+            (cons 'list
+                  (cl-mapcan (lambda (s) (transient--parse-child prefix s))
+                             spec))))))
+
+(defun transient--parse-suffix (prefix spec)
+  (let (level class args)
+    (cl-symbol-macrolet
+        ((car (car spec))
+         (pop (pop spec)))
+      (when (integerp car)
+        (setq level pop))
+      (when (or (stringp car)
+                (vectorp car))
+        (setq args (plist-put args :key pop)))
+      (cond
+       ((or (stringp car)
+            (and (eq (car-safe car) 'lambda)
+                 (not (commandp car))))
+        (setq args (plist-put args :description pop)))
+       ((and (symbolp car)
+             (not (keywordp car))
+             (not (commandp car))
+             (commandp (cadr spec)))
+        (setq args (plist-put args :description (macroexp-quote pop)))))
+      (cond
+       ((memq car '(:info :info*)))
+       ((keywordp car)
+        (error "Need command, argument, `:info' or `:info*'; got `%s'" car))
+       ((symbolp car)
+        (setq args (plist-put args :command (macroexp-quote pop))))
+       ((and (commandp car)
+             (eq (car-safe car) 'lambda))
+        (let ((cmd pop)
+              (sym (intern
+                    (format
+                     "transient:%s:%s:%d" prefix
+                     (replace-regexp-in-string (plist-get args :key) " " "")
+                     (prog1 gensym-counter (cl-incf gensym-counter))))))
+          (setq args (plist-put
+                      args :command
+                      `(prog1 ',sym
+                         (put ',sym 'interactive-only t)
+                         (put ',sym 'completion-predicate #'transient--suffix-only)
+                         (defalias ',sym ,cmd))))))
+       ((or (stringp car)
+            (and car (listp car)))
+        (let ((arg pop)
+              (sym nil))
+          (cl-typecase arg
+            (list
+             (setq args (plist-put args :shortarg (car  arg)))
+             (setq args (plist-put args :argument (cadr arg)))
+             (setq arg  (cadr arg)))
+            (string
+             (when-let ((shortarg (transient--derive-shortarg arg)))
+               (setq args (plist-put args :shortarg shortarg)))
+             (setq args (plist-put args :argument arg))))
+          (setq sym (intern (format "transient:%s:%s" prefix arg)))
+          (setq args (plist-put
+                      args :command
+                      `(prog1 ',sym
+                         (put ',sym 'interactive-only t)
+                         (put ',sym 'completion-predicate #'transient--suffix-only)
+                         (defalias ',sym #'transient--default-infix-command))))
+          (cond ((and car (not (keywordp car)))
+                 (setq class 'transient-option)
+                 (setq args (plist-put args :reader (macroexp-quote pop))))
+                ((not (string-suffix-p "=" arg))
+                 (setq class 'transient-switch))
+                ((setq class 'transient-option)))))
+       ((error "Need command, argument, `:info' or `:info*'; got %s" car)))
+      (while (keywordp car)
+        (let ((key pop)
+              (val pop))
+          (cond ((eq key :class) (setq class val))
+                ((eq key :level) (setq level val))
+                ((eq key :info)
+                 (setq class 'transient-information)
+                 (setq args (plist-put args :description val)))
+                ((eq key :info*)
+                 (setq class 'transient-information*)
+                 (setq args (plist-put args :description val)))
+                ((eq (car-safe val) '\,)
+                 (setq args (plist-put args key (cadr val))))
+                ((or (symbolp val)
+                     (and (listp val) (not (eq (car val) 'lambda))))
+                 (setq args (plist-put args key (macroexp-quote val))))
+                ((setq args (plist-put args key val)))))))
+    (when-let* (((not (plist-get args :key)))
+                (shortarg (plist-get args :shortarg)))
+      (setq args (plist-put args :key shortarg)))
+    (list 'list
+          (or level transient--default-child-level)
+          (macroexp-quote (or class 'transient-suffix))
+          (cons 'list args))))
+
+(defun transient--derive-shortarg (arg)
+  (save-match-data
+    (and (string-match "\\`\\(-[a-zA-Z]\\)\\(\\'\\|=\\)" arg)
+         (match-string 1 arg))))
+
+(defun transient-command-completion-not-suffix-only-p (symbol _buffer)
+  "Say whether SYMBOL should be offered as a completion.
+If the value of SYMBOL's `completion-predicate' property is
+`transient--suffix-only', then return nil, otherwise return t.
+This is the case when a command should only ever be used as a
+suffix of a transient prefix command (as opposed to bindings
+in regular keymaps or by using `execute-extended-command')."
+  (not (eq (get symbol 'completion-predicate) 'transient--suffix-only)))
+
+(defalias 'transient--suffix-only #'ignore
+  "Ignore ARGUMENTS, do nothing, and return nil.
+Also see `transient-command-completion-not-suffix-only-p'.
+Only use this alias as the value of the `completion-predicate'
+symbol property.")
+
+(when (and (boundp 'read-extended-command-predicate) ; since Emacs 28.1
+           (not read-extended-command-predicate))
+  (setq read-extended-command-predicate
+        #'transient-command-completion-not-suffix-only-p))
+
+(defun transient-parse-suffix (prefix suffix)
+  "Parse SUFFIX, to be added to PREFIX.
+PREFIX is a prefix command, a symbol.
+SUFFIX is a suffix command or a group specification (of
+  the same forms as expected by `transient-define-prefix').
+Intended for use in a group's `:setup-children' function."
+  (cl-assert (and prefix (symbolp prefix)))
+  (eval (car (transient--parse-child prefix suffix)) t))
+
+(defun transient-parse-suffixes (prefix suffixes)
+  "Parse SUFFIXES, to be added to PREFIX.
+PREFIX is a prefix command, a symbol.
+SUFFIXES is a list of suffix command or a group specification
+  (of the same forms as expected by `transient-define-prefix').
+Intended for use in a group's `:setup-children' function."
+  (cl-assert (and prefix (symbolp prefix)))
+  (mapcar (apply-partially #'transient-parse-suffix prefix) suffixes))
+
+;;; Edit
+
+(defun transient--insert-suffix (prefix loc suffix action &optional keep-other)
+  (let* ((suf (cl-etypecase suffix
+                (vector (transient--parse-group  prefix suffix))
+                (list   (transient--parse-suffix prefix suffix))
+                (string suffix)))
+         (mem (transient--layout-member loc prefix))
+         (elt (car mem)))
+    (setq suf (eval suf t))
+    (cond
+     ((not mem)
+      (message "Cannot insert %S into %s; %s not found"
+               suffix prefix loc))
+     ((or (and (vectorp suffix) (not (vectorp elt)))
+          (and (listp   suffix) (vectorp elt))
+          (and (stringp suffix) (vectorp elt)))
+      (message "Cannot place %S into %s at %s; %s"
+               suffix prefix loc
+               "suffixes and groups cannot be siblings"))
+     (t
+      (when-let* ((bindingp (listp suf))
+                  (key (transient--spec-key suf))
+                  (conflict (car (transient--layout-member key prefix)))
+                  (conflictp
+                   (and (not (and (eq action 'replace)
+                                  (eq conflict elt)))
+                        (or (not keep-other)
+                            (eq (plist-get (nth 2 suf) :command)
+                                (plist-get (nth 2 conflict) :command)))
+                        (equal (transient--suffix-predicate suf)
+                               (transient--suffix-predicate conflict)))))
+        (transient-remove-suffix prefix key))
+      (pcase-exhaustive action
+        ('insert  (setcdr mem (cons elt (cdr mem)))
+                  (setcar mem suf))
+        ('append  (setcdr mem (cons suf (cdr mem))))
+        ('replace (setcar mem suf)))))))
+
+;;;###autoload
+(defun transient-insert-suffix (prefix loc suffix &optional keep-other)
+  "Insert a SUFFIX into PREFIX before LOC.
+PREFIX is a prefix command, a symbol.
+SUFFIX is a suffix command or a group specification (of
+  the same forms as expected by `transient-define-prefix').
+LOC is a command, a key vector, a key description (a string
+  as returned by `key-description'), or a coordination list
+  (whose last element may also be a command or key).
+Remove a conflicting binding unless optional KEEP-OTHER is
+  non-nil.
+See info node `(transient)Modifying Existing Transients'."
+  (declare (indent defun))
+  (transient--insert-suffix prefix loc suffix 'insert keep-other))
+
+;;;###autoload
+(defun transient-append-suffix (prefix loc suffix &optional keep-other)
+  "Insert a SUFFIX into PREFIX after LOC.
+PREFIX is a prefix command, a symbol.
+SUFFIX is a suffix command or a group specification (of
+  the same forms as expected by `transient-define-prefix').
+LOC is a command, a key vector, a key description (a string
+  as returned by `key-description'), or a coordination list
+  (whose last element may also be a command or key).
+Remove a conflicting binding unless optional KEEP-OTHER is
+  non-nil.
+See info node `(transient)Modifying Existing Transients'."
+  (declare (indent defun))
+  (transient--insert-suffix prefix loc suffix 'append keep-other))
+
+;;;###autoload
+(defun transient-replace-suffix (prefix loc suffix)
+  "Replace the suffix at LOC in PREFIX with SUFFIX.
+PREFIX is a prefix command, a symbol.
+SUFFIX is a suffix command or a group specification (of
+  the same forms as expected by `transient-define-prefix').
+LOC is a command, a key vector, a key description (a string
+  as returned by `key-description'), or a coordination list
+  (whose last element may also be a command or key).
+See info node `(transient)Modifying Existing Transients'."
+  (declare (indent defun))
+  (transient--insert-suffix prefix loc suffix 'replace))
+
+;;;###autoload
+(defun transient-remove-suffix (prefix loc)
+  "Remove the suffix or group at LOC in PREFIX.
+PREFIX is a prefix command, a symbol.
+LOC is a command, a key vector, a key description (a string
+  as returned by `key-description'), or a coordination list
+  (whose last element may also be a command or key).
+See info node `(transient)Modifying Existing Transients'."
+  (declare (indent defun))
+  (transient--layout-member loc prefix 'remove))
+
+(defun transient-get-suffix (prefix loc)
+  "Return the suffix or group at LOC in PREFIX.
+PREFIX is a prefix command, a symbol.
+LOC is a command, a key vector, a key description (a string
+  as returned by `key-description'), or a coordination list
+  (whose last element may also be a command or key).
+See info node `(transient)Modifying Existing Transients'."
+  (if-let ((mem (transient--layout-member loc prefix)))
+      (car mem)
+    (error "%s not found in %s" loc prefix)))
+
+(defun transient-suffix-put (prefix loc prop value)
+  "Edit the suffix at LOC in PREFIX, setting PROP to VALUE.
+PREFIX is a prefix command, a symbol.
+SUFFIX is a suffix command or a group specification (of
+  the same forms as expected by `transient-define-prefix').
+LOC is a command, a key vector, a key description (a string
+  as returned by `key-description'), or a coordination list
+  (whose last element may also be a command or key).
+See info node `(transient)Modifying Existing Transients'."
+  (let ((suf (transient-get-suffix prefix loc)))
+    (setf (elt suf 2)
+          (plist-put (elt suf 2) prop value))))
+
+(defun transient--layout-member (loc prefix &optional remove)
+  (let ((val (or (get prefix 'transient--layout)
+                 (error "%s is not a transient command" prefix))))
+    (when (listp loc)
+      (while (integerp (car loc))
+        (let* ((children (if (vectorp val) (aref val 3) val))
+               (mem (transient--nthcdr (pop loc) children)))
+          (if (and remove (not loc))
+              (let ((rest (delq (car mem) children)))
+                (if (vectorp val)
+                    (aset val 3 rest)
+                  (put prefix 'transient--layout rest))
+                (setq val nil))
+            (setq val (if loc (car mem) mem)))))
+      (setq loc (car loc)))
+    (if loc
+        (transient--layout-member-1 (transient--kbd loc) val remove)
+      val)))
+
+(defun transient--layout-member-1 (loc layout remove)
+  (cond ((listp layout)
+         (seq-some (lambda (elt) (transient--layout-member-1 loc elt remove))
+                   layout))
+        ((vectorp (car (aref layout 3)))
+         (seq-some (lambda (elt) (transient--layout-member-1 loc elt remove))
+                   (aref layout 3)))
+        (remove
+         (aset layout 3
+               (delq (car (transient--group-member loc layout))
+                     (aref layout 3)))
+         nil)
+        ((transient--group-member loc layout))))
+
+(defun transient--group-member (loc group)
+  (cl-member-if (lambda (suffix)
+                  (and (listp suffix)
+                       (let* ((def (nth 2 suffix))
+                              (cmd (plist-get def :command)))
+                         (if (symbolp loc)
+                             (eq cmd loc)
+                           (equal (transient--kbd
+                                   (or (plist-get def :key)
+                                       (transient--command-key cmd)))
+                                  loc)))))
+                (aref group 3)))
+
+(defun transient--kbd (keys)
+  (when (vectorp keys)
+    (setq keys (key-description keys)))
+  (when (stringp keys)
+    (setq keys (kbd keys)))
+  keys)
+
+(defun transient--spec-key (spec)
+  (let ((plist (nth 2 spec)))
+    (or (plist-get plist :key)
+        (transient--command-key
+         (plist-get plist :command)))))
+
+(defun transient--command-key (cmd)
+  (and-let* ((obj (transient--suffix-prototype cmd)))
+    (cond ((slot-boundp obj 'key)
+           (oref obj key))
+          ((slot-exists-p obj 'shortarg)
+           (if (slot-boundp obj 'shortarg)
+               (oref obj shortarg)
+             (transient--derive-shortarg (oref obj argument)))))))
+
+(defun transient--nthcdr (n list)
+  (nthcdr (if (< n 0) (- (length list) (abs n)) n) list))
+
+;;; Variables
+
+(defvar transient-current-prefix nil
+  "The transient from which this suffix command was invoked.
+This is an object representing that transient, use
+`transient-current-command' to get the respective command.")
+
+(defvar transient-current-command nil
+  "The transient from which this suffix command was invoked.
+This is a symbol representing that transient, use
+`transient-current-prefix' to get the respective object.")
+
+(defvar transient-current-suffixes nil
+  "The suffixes of the transient from which this suffix command was invoked.
+This is a list of objects.  Usually it is sufficient to instead
+use the function `transient-args', which returns a list of
+values.  In complex cases it might be necessary to use this
+variable instead.")
+
+(defvar transient-exit-hook nil
+  "Hook run after exiting a transient.")
+
+(defvar transient-setup-buffer-hook nil
+  "Hook run when setting up the transient buffer.
+That buffer is current and empty when this hook runs.")
+
+(defvar transient--prefix nil)
+(defvar transient--layout nil)
+(defvar transient--suffixes nil)
+
+(defconst transient--stay t   "Do not exit the transient.")
+(defconst transient--exit nil "Do exit the transient.")
+
+(defvar transient--exitp nil "Whether to exit the transient.")
+(defvar transient--showp nil "Whether to show the transient popup buffer.")
+(defvar transient--helpp nil "Whether help-mode is active.")
+(defvar transient--editp nil "Whether edit-mode is active.")
+
+(defvar transient--refreshp nil
+  "Whether to refresh the transient completely.")
+
+(defvar transient--all-levels-p nil
+  "Whether temporary display of suffixes on all levels is active.")
+
+(defvar transient--timer nil)
+
+(defvar transient--stack nil)
+
+(defvar transient--minibuffer-depth 0)
+
+(defvar transient--buffer-name " *transient*"
+  "Name of the transient buffer.")
+
+(defvar transient--buffer nil
+  "The transient menu buffer.")
+
+(defvar transient--window nil
+  "The window used to display the transient popup buffer.")
+
+(defvar transient--original-window nil
+  "The window that was selected before the transient was invoked.
+Usually it remains selected while the transient is active.")
+
+(defvar transient--original-buffer nil
+  "The buffer that was current before the transient was invoked.
+Usually it remains current while the transient is active.")
+
+(defvar transient--restore-winconf nil
+  "Window configuration to restore after exiting help.")
+
+(defvar transient--shadowed-buffer nil
+  "The buffer that is temporarily shadowed by the transient buffer.
+This is bound while the suffix predicate is being evaluated and while
+drawing in the transient buffer.")
+
+(defvar transient--pending-suffix nil
+  "The suffix that is currently being processed.
+This is bound while the suffix predicate is being evaluated,
+and while functions that return faces are being evaluated.")
+
+(defvar transient--pending-group nil
+  "The group that is currently being processed.
+This is bound while the suffixes are drawn in the transient buffer.")
+
+(defvar transient--debug nil
+  "Whether to put debug information into *Messages*.")
+
+(defvar transient--history nil)
+
+(defvar transient--scroll-commands
+  '(transient-scroll-up
+    transient-scroll-down
+    mwheel-scroll
+    scroll-bar-toolkit-scroll))
+
+;;; Identities
+
+(defun transient-active-prefix (&optional prefixes)
+  "Return the active transient object.
+
+Return nil if there is no active transient, if the transient buffer
+isn't shown, and while the active transient is suspended (e.g., while
+the minibuffer is in use).
+
+Unlike `transient-current-prefix', which is only ever non-nil in code
+that is run directly by a command that is invoked while a transient
+is current, this function is also suitable for use in asynchronous
+code, such as timers and callbacks (this function's main use-case).
+
+If optional PREFIXES is non-nil, it must be a prefix command symbol
+or a list of symbols, in which case the active transient object is
+only returned if it matches one of PREFIXES."
+  (and transient--showp
+       transient--prefix
+       (or (not prefixes)
+           (memq (oref transient--prefix command) (ensure-list prefixes)))
+       (or (memq 'transient--pre-command pre-command-hook)
+           (and (memq t pre-command-hook)
+                (memq 'transient--pre-command
+                      (default-value 'pre-command-hook))))
+       transient--prefix))
+
+(defun transient-prefix-object ()
+  "Return the current prefix as an object.
+
+While a transient is being setup or refreshed (which involves
+preparing its suffixes) the variable `transient--prefix' can be
+used to access the prefix object.  Thus this is what has to be
+used in suffix methods such as `transient-format-description',
+and in object-specific functions that are stored in suffix slots
+such as `description'.
+
+When a suffix command is invoked (i.e., in its `interactive' form
+and function body) then the variable `transient-current-prefix'
+has to be used instead.
+
+Two distinct variables are needed, because any prefix may itself
+be used as a suffix of another prefix, and such sub-prefixes have
+to be able to tell themselves apart from the prefix they were
+invoked from.
+
+Regular suffix commands, which are not prefixes, do not have to
+concern themselves with this distinction, so they can use this
+function instead.  In the context of a plain suffix, it always
+returns the value of the appropriate variable."
+  (or transient--prefix transient-current-prefix))
+
+(defun transient-suffix-object (&optional command)
+  "Return the object associated with the current suffix command.
+
+Each suffix commands is associated with an object, which holds
+additional information about the suffix, such as its value (in
+the case of an infix command, which is a kind of suffix command).
+
+This function is intended to be called by infix commands, which
+are usually aliases of `transient--default-infix-command', which
+is defined like this:
+
+  (defun transient--default-infix-command ()
+    (interactive)
+    (let ((obj (transient-suffix-object)))
+      (transient-infix-set obj (transient-infix-read obj)))
+    (transient--show))
+
+\(User input is read outside of `interactive' to prevent the
+command from being added to `command-history'.  See #23.)
+
+Such commands need to be able to access their associated object
+to guide how `transient-infix-read' reads the new value and to
+store the read value.  Other suffix commands (including non-infix
+commands) may also need the object to guide their behavior.
+
+This function attempts to return the object associated with the
+current suffix command even if the suffix command was not invoked
+from a transient.  (For some suffix command that is a valid thing
+to do, for others it is not.)  In that case nil may be returned,
+if the command was not defined using one of the macros intended
+to define such commands.
+
+The optional argument COMMAND is intended for internal use.  If
+you are contemplating using it in your own code, then you should
+probably use this instead:
+
+  (get COMMAND \\='transient--suffix)"
+  (when command
+    (cl-check-type command command))
+  (cond
+   (transient--pending-suffix)
+   ((or transient--prefix
+        transient-current-prefix)
+    (let ((suffixes
+           (cl-remove-if-not
+            (lambda (obj)
+              (eq (oref obj command)
+                  (or command
+                      (if (eq this-command 'transient-set-level)
+                          ;; This is how it can look up for which
+                          ;; command it is setting the level.
+                          this-original-command
+                        this-command))))
+            (or transient--suffixes
+                transient-current-suffixes))))
+      (or (and (cdr suffixes)
+               (cl-find-if
+                (lambda (obj)
+                  (equal (listify-key-sequence (transient--kbd (oref obj key)))
+                         (listify-key-sequence (this-command-keys))))
+                suffixes))
+          (car suffixes))))
+   ((and-let* ((obj (transient--suffix-prototype (or command this-command)))
+               (obj (clone obj)))
+      (progn ; work around debbugs#31840
+        (transient-init-scope obj)
+        (transient-init-value obj)
+        obj)))))
+
+(defun transient--suffix-prototype (command)
+  (or (get command 'transient--suffix)
+      (seq-some (lambda (cmd) (get cmd 'transient--suffix))
+                (function-alias-p command))))
+
+;;; Keymaps
+
+(defvar-keymap transient-base-map
+  :doc "Parent of other keymaps used by Transient.
+
+This is the parent keymap of all the keymaps that are used in
+all transients: `transient-map' (which in turn is the parent
+of the transient-specific keymaps), `transient-edit-map' and
+`transient-sticky-map'.
+
+If you change a binding here, then you might also have to edit
+`transient-sticky-map' and `transient-common-commands'.  While
+the latter isn't a proper transient prefix command, it can be
+edited using the same functions as used for transients.
+
+If you add a new command here, then you must also add a binding
+to `transient-predicate-map'."
+  "ESC ESC ESC" #'transient-quit-all
+  "C-g"     #'transient-quit-one
+  "C-q"     #'transient-quit-all
+  "C-z"     #'transient-suspend
+  "C-v"     #'transient-scroll-up
+  "C-M-v"   #'transient-scroll-down
+  "<next>"  #'transient-scroll-up
+  "<prior>" #'transient-scroll-down)
+
+(defvar transient-map
+  (let ((map (make-sparse-keymap)))
+    (set-keymap-parent map transient-base-map)
+    (keymap-set map "C-u"   #'universal-argument)
+    (keymap-set map "C--"   #'negative-argument)
+    (keymap-set map "C-t"   #'transient-show)
+    (keymap-set map "?"     #'transient-help)
+    (keymap-set map "C-h"   #'transient-help)
+    ;; Also bound to "C-x p" and "C-x n" in transient-common-commands.
+    (keymap-set map "C-M-p" #'transient-history-prev)
+    (keymap-set map "C-M-n" #'transient-history-next)
+    (when (fboundp 'other-frame-prefix) ;Emacs >= 28.1
+      (keymap-set map "C-x 5 5" 'other-frame-prefix)
+      (keymap-set map "C-x 4 4" 'other-window-prefix))
+    map)
+  "Top-level keymap used by all transients.
+
+If you add a new command here, then you must also add a binding
+to `transient-predicate-map'.  Also see `transient-base-map'.")
+
+(defvar-keymap transient-edit-map
+  :doc "Keymap that is active while a transient in is in \"edit mode\"."
+  :parent transient-base-map
+  "?"     #'transient-help
+  "C-h"   #'transient-help
+  "C-x l" #'transient-set-level)
+
+(defvar-keymap transient-sticky-map
+  :doc "Keymap that is active while an incomplete key sequence is active."
+  :parent transient-base-map
+  "C-g" #'transient-quit-seq)
+
+(defvar transient--common-command-prefixes '(?\C-x))
+
+(put 'transient-common-commands
+     'transient--layout
+     (list
+      (eval
+       (car (transient--parse-child
+             'transient-common-commands
+             (vector
+              :hide
+              (lambda ()
+                (and (not (memq
+                           (car (bound-and-true-p transient--redisplay-key))
+                           transient--common-command-prefixes))
+                     (not transient-show-common-commands)))
+              (vector
+               "Value commands"
+               (list "C-x s  " "Set"            #'transient-set)
+               (list "C-x C-s" "Save"           #'transient-save)
+               (list "C-x C-k" "Reset"          #'transient-reset)
+               (list "C-x p  " "Previous value" #'transient-history-prev)
+               (list "C-x n  " "Next value"     #'transient-history-next))
+              (vector
+               "Sticky commands"
+               ;; Like `transient-sticky-map' except that
+               ;; "C-g" has to be bound to a different command.
+               (list "C-g" "Quit prefix or transient" #'transient-quit-one)
+               (list "C-q" "Quit transient stack"     #'transient-quit-all)
+               (list "C-z" "Suspend transient stack"  #'transient-suspend))
+              (vector
+               "Customize"
+               (list "C-x t" 'transient-toggle-common :description
+                     (lambda ()
+                       (if transient-show-common-commands
+                           "Hide common commands"
+                         "Show common permanently")))
+               (list "C-x l" "Show/hide suffixes" #'transient-set-level)
+               (list "C-x a" #'transient-toggle-level-limit)))))
+       t)))
+
+(defvar-keymap transient-popup-navigation-map
+  :doc "One of the keymaps used when popup navigation is enabled.
+See `transient-enable-popup-navigation'."
+  "<down-mouse-1>" #'transient-noop
+  "<up>"   #'transient-backward-button
+  "<down>" #'transient-forward-button
+  "C-r"    #'transient-isearch-backward
+  "C-s"    #'transient-isearch-forward
+  "M-RET"  #'transient-push-button)
+
+(defvar-keymap transient-button-map
+  :doc "One of the keymaps used when popup navigation is enabled.
+See `transient-enable-popup-navigation'."
+  "<mouse-1>" #'transient-push-button
+  "<mouse-2>" #'transient-push-button)
+
+(defvar-keymap transient-resume-mode-map
+  :doc "Keymap for `transient-resume-mode'.
+
+This keymap remaps every command that would usually just quit the
+documentation buffer to `transient-resume', which additionally
+resumes the suspended transient."
+  "<remap> <Man-quit>"    #'transient-resume
+  "<remap> <Info-exit>"   #'transient-resume
+  "<remap> <quit-window>" #'transient-resume)
+
+(defvar-keymap transient-predicate-map
+  :doc "Base keymap used to map common commands to their transient behavior.
+
+The \"transient behavior\" of a command controls, among other
+things, whether invoking the command causes the transient to be
+exited or not, and whether infix arguments are exported before
+doing so.
+
+Each \"key\" is a command that is common to all transients and
+that is bound in `transient-map', `transient-edit-map',
+`transient-sticky-map' and/or `transient-common-command'.
+
+Each binding is a \"pre-command\", a function that controls the
+transient behavior of the respective command.
+
+For transient commands that are bound in individual transients,
+the transient behavior is specified using the `:transient' slot
+of the corresponding object."
+  "<transient-suspend>"           #'transient--do-suspend
+  "<transient-help>"              #'transient--do-stay
+  "<transient-set-level>"         #'transient--do-stay
+  "<transient-history-prev>"      #'transient--do-stay
+  "<transient-history-next>"      #'transient--do-stay
+  "<universal-argument>"          #'transient--do-stay
+  "<universal-argument-more>"     #'transient--do-stay
+  "<negative-argument>"           #'transient--do-minus
+  "<digit-argument>"              #'transient--do-stay
+  "<other-frame-prefix>"          #'transient--do-stay
+  "<other-window-prefix>"         #'transient--do-stay
+  "<top-level>"                   #'transient--do-quit-all
+  "<transient-quit-all>"          #'transient--do-quit-all
+  "<transient-quit-one>"          #'transient--do-quit-one
+  "<transient-quit-seq>"          #'transient--do-stay
+  "<transient-show>"              #'transient--do-stay
+  "<transient-update>"            #'transient--do-stay
+  "<transient-toggle-common>"     #'transient--do-stay
+  "<transient-set>"               #'transient--do-call
+  "<transient-set-and-exit>"      #'transient--do-exit
+  "<transient-save>"              #'transient--do-call
+  "<transient-save-and-exit>"     #'transient--do-exit
+  "<transient-reset>"             #'transient--do-call
+  "<describe-key-briefly>"        #'transient--do-stay
+  "<describe-key>"                #'transient--do-stay
+  "<transient-scroll-up>"         #'transient--do-stay
+  "<transient-scroll-down>"       #'transient--do-stay
+  "<mwheel-scroll>"               #'transient--do-stay
+  "<scroll-bar-toolkit-scroll>"   #'transient--do-stay
+  "<transient-noop>"              #'transient--do-noop
+  "<transient-mouse-push-button>" #'transient--do-move
+  "<transient-push-button>"       #'transient--do-push-button
+  "<transient-backward-button>"   #'transient--do-move
+  "<transient-forward-button>"    #'transient--do-move
+  "<transient-isearch-backward>"  #'transient--do-move
+  "<transient-isearch-forward>"   #'transient--do-move
+  ;; If a valid but incomplete prefix sequence is followed by
+  ;; an unbound key, then Emacs calls the `undefined' command
+  ;; but does not set `this-command', `this-original-command'
+  ;; or `real-this-command' accordingly.  Instead they are nil.
+  "<nil>"                         #'transient--do-warn
+  ;; Bound to the `mouse-movement' event, this command is similar
+  ;; to `ignore'.
+  "<ignore-preserving-kill-region>" #'transient--do-noop)
+
+(defvar transient--transient-map nil)
+(defvar transient--predicate-map nil)
+(defvar transient--redisplay-map nil)
+(defvar transient--redisplay-key nil)
+
+(defun transient--push-keymap (var)
+  (let ((map (symbol-value var)))
+    (transient--debug "     push %s%s" var (if map "" " VOID"))
+    (when map
+      (with-demoted-errors "transient--push-keymap: %S"
+        (internal-push-keymap map 'overriding-terminal-local-map)))))
+
+(defun transient--pop-keymap (var)
+  (let ((map (symbol-value var)))
+    (when map
+      (transient--debug "     pop  %s" var)
+      (with-demoted-errors "transient--pop-keymap: %S"
+        (internal-pop-keymap map 'overriding-terminal-local-map)))))
+
+(defun transient--make-transient-map ()
+  (let ((map (make-sparse-keymap)))
+    (set-keymap-parent map (if transient--editp
+                               transient-edit-map
+                             transient-map))
+    (dolist (obj transient--suffixes)
+      (let ((key (oref obj key)))
+        (when (vectorp key)
+          (setq key (key-description key))
+          (oset obj key key))
+        (when transient-substitute-key-function
+          (setq key (save-match-data
+                      (funcall transient-substitute-key-function obj)))
+          (oset obj key key))
+        (let* ((kbd (kbd key))
+               (cmd (oref obj command))
+               (alt (transient--lookup-key map kbd)))
+          (cond ((not alt)
+                 (define-key map kbd cmd))
+                ((eq alt cmd))
+                ((transient--inapt-suffix-p obj))
+                ((and-let* ((obj (transient-suffix-object alt)))
+                   (transient--inapt-suffix-p obj))
+                 (define-key map kbd cmd))
+                (transient-detect-key-conflicts
+                 (error "Cannot bind %S to %s and also %s"
+                        (string-trim key) cmd alt))
+                ((define-key map kbd cmd))))))
+    (when-let ((b (keymap-lookup map "-"))) (keymap-set map "<kp-subtract>" b))
+    (when-let ((b (keymap-lookup map "="))) (keymap-set map "<kp-equal>" b))
+    (when-let ((b (keymap-lookup map "+"))) (keymap-set map "<kp-add>" b))
+    (when transient-enable-popup-navigation
+      ;; `transient--make-redisplay-map' maps only over bindings that are
+      ;; directly in the base keymap, so that cannot be a composed keymap.
+      (set-keymap-parent
+       map (make-composed-keymap
+            (keymap-parent map)
+            transient-popup-navigation-map)))
+    map))
+
+(defun transient--make-predicate-map ()
+  (let* ((default (transient--resolve-pre-command
+                   (oref transient--prefix transient-suffix)))
+         (return (and transient--stack (eq default t)))
+         (map (make-sparse-keymap)))
+    (set-keymap-parent map transient-predicate-map)
+    (when (or (and (slot-boundp transient--prefix 'transient-switch-frame)
+                   (transient--resolve-pre-command
+                    (not (oref transient--prefix transient-switch-frame))))
+              (memq (transient--resolve-pre-command
+                     (oref transient--prefix transient-non-suffix))
+                    '(nil transient--do-warn transient--do-noop)))
+      (define-key map [handle-switch-frame] #'transient--do-suspend))
+    (dolist (obj transient--suffixes)
+      (let* ((cmd (oref obj command))
+             (kind (cond ((get cmd 'transient--prefix)    'prefix)
+                         ((cl-typep obj 'transient-infix) 'infix)
+                         (t                               'suffix))))
+        (cond
+         ((oref obj inapt)
+          (define-key map (vector cmd) #'transient--do-warn-inapt))
+         ((slot-boundp obj 'transient)
+          (define-key map (vector cmd)
+            (pcase (list kind
+                         (transient--resolve-pre-command (oref obj transient))
+                         return)
+              (`(prefix   t ,_) #'transient--do-recurse)
+              (`(prefix nil ,_) #'transient--do-stack)
+              (`(infix    t ,_) #'transient--do-stay)
+              (`(suffix   t ,_) #'transient--do-call)
+              ('(suffix nil  t) #'transient--do-return)
+              (`(,_     nil ,_) #'transient--do-exit)
+              (`(,_     ,do ,_) do))))
+         ((not (lookup-key transient-predicate-map (vector cmd)))
+          (define-key map (vector cmd)
+            (pcase (list kind default return)
+              (`(prefix ,(or 'transient--do-stay 'transient--do-call) ,_)
+               #'transient--do-recurse)
+              (`(prefix   t ,_) #'transient--do-recurse)
+              (`(prefix  ,_ ,_) #'transient--do-stack)
+              (`(infix   ,_ ,_) #'transient--do-stay)
+              (`(suffix   t ,_) #'transient--do-call)
+              ('(suffix nil  t) #'transient--do-return)
+              (`(suffix nil ,_) #'transient--do-exit)
+              (`(suffix ,do ,_) do)))))))
+    map))
+
+(defun transient--make-redisplay-map ()
+  (setq transient--redisplay-key
+        (pcase this-command
+          ('transient-update
+           (setq transient--showp t)
+           (setq unread-command-events
+                 (listify-key-sequence (this-single-command-raw-keys))))
+          ('transient-quit-seq
+           (setq unread-command-events
+                 (butlast (listify-key-sequence
+                           (this-single-command-raw-keys))
+                          2))
+           (butlast transient--redisplay-key))
+          (_ nil)))
+  (let ((topmap (make-sparse-keymap))
+        (submap (make-sparse-keymap)))
+    (when transient--redisplay-key
+      (define-key topmap (vconcat transient--redisplay-key) submap)
+      (set-keymap-parent submap transient-sticky-map))
+    (map-keymap-internal
+     (lambda (key def)
+       (when (and (not (eq key ?\e))
+                  (listp def)
+                  (keymapp def))
+         (define-key topmap (vconcat transient--redisplay-key (list key))
+           #'transient-update)))
+     (if transient--redisplay-key
+         (let ((key (vconcat transient--redisplay-key)))
+           (or (lookup-key transient--transient-map key)
+               (and-let* ((regular (lookup-key local-function-key-map key)))
+                 (lookup-key transient--transient-map (vconcat regular)))))
+       transient--transient-map))
+    topmap))
+
+;;; Setup
+
+(defun transient-setup (&optional name layout edit &rest params)
+  "Setup the transient specified by NAME.
+
+This function is called by transient prefix commands to setup the
+transient.  In that case NAME is mandatory, LAYOUT and EDIT must
+be nil and PARAMS may be (but usually is not) used to set, e.g.,
+the \"scope\" of the transient (see `transient-define-prefix').
+
+This function is also called internally, in which case LAYOUT and
+EDIT may be non-nil."
+  (transient--debug 'setup)
+  (transient--with-emergency-exit :setup
+    (cond
+     ((not name)
+      ;; Switching between regular and edit mode.
+      (transient--pop-keymap 'transient--transient-map)
+      (transient--pop-keymap 'transient--redisplay-map)
+      (setq name (oref transient--prefix command))
+      (setq params (list :scope (oref transient--prefix scope))))
+     (transient--prefix
+      ;; Invoked as a ":transient-non-suffix 'transient--do-{stay,call}"
+      ;; of an outer prefix.  Unlike the usual `transient--do-stack',
+      ;; these predicates fail to clean up after the outer prefix.
+      (transient--pop-keymap 'transient--transient-map)
+      (transient--pop-keymap 'transient--redisplay-map))
+     ((not (or layout                      ; resuming parent/suspended prefix
+               transient-current-command)) ; entering child prefix
+      (transient--stack-zap))              ; replace suspended prefix, if any
+     (edit
+      ;; Returning from help to edit.
+      (setq transient--editp t)))
+    (transient--init-objects name layout params)
+    (transient--init-keymaps)
+    (transient--history-init transient--prefix)
+    (setq transient--original-window (selected-window))
+    (setq transient--original-buffer (current-buffer))
+    (setq transient--minibuffer-depth (minibuffer-depth))
+    (transient--redisplay)
+    (transient--init-transient)
+    (transient--suspend-which-key-mode)))
+
+(cl-defgeneric transient-setup-children (group children)
+  "Setup the CHILDREN of GROUP.
+If the value of the `setup-children' slot is non-nil, then call
+that function with CHILDREN as the only argument and return the
+value.  Otherwise return CHILDREN as is."
+  (if (slot-boundp group 'setup-children)
+      (funcall (oref group setup-children) children)
+    children))
+
+(defun transient--init-keymaps ()
+  (setq transient--predicate-map (transient--make-predicate-map))
+  (setq transient--transient-map (transient--make-transient-map))
+  (setq transient--redisplay-map (transient--make-redisplay-map)))
+
+(defun transient--init-objects (&optional name layout params)
+  (if name
+      (setq transient--prefix (transient--init-prefix name params))
+    (setq name (oref transient--prefix command)))
+  (setq transient--refreshp (oref transient--prefix refresh-suffixes))
+  (setq transient--layout (or layout (transient--init-suffixes name)))
+  (setq transient--suffixes (transient--flatten-suffixes transient--layout)))
+
+(defun transient--init-prefix (name &optional params)
+  (let ((obj (let ((proto (get name 'transient--prefix)))
+               (apply #'clone proto
+                      :prototype proto
+                      :level (or (alist-get t (alist-get name transient-levels))
+                                 transient-default-level)
+                      params))))
+    (transient--setup-recursion obj)
+    (transient-init-value obj)
+    obj))
+
+(defun transient--init-suffixes (name)
+  (let ((levels (alist-get name transient-levels)))
+    (cl-mapcan (lambda (c) (transient--init-child levels c nil))
+               (append (get name 'transient--layout)
+                       (and (not transient--editp)
+                            (get 'transient-common-commands
+                                 'transient--layout))))))
+
+(defun transient--flatten-suffixes (layout)
+  (cl-labels ((s (def)
+                (cond
+                 ((stringp def) nil)
+                 ((cl-typep def 'transient-information) nil)
+                 ((listp def) (cl-mapcan #'s def))
+                 ((cl-typep def 'transient-group)
+                  (cl-mapcan #'s (oref def suffixes)))
+                 ((cl-typep def 'transient-suffix)
+                  (list def)))))
+    (cl-mapcan #'s layout)))
+
+(defun transient--init-child (levels spec parent)
+  (cl-etypecase spec
+    (vector  (transient--init-group  levels spec parent))
+    (list    (transient--init-suffix levels spec parent))
+    (string  (list spec))))
+
+(defun transient--init-group (levels spec parent)
+  (pcase-let ((`(,level ,class ,args ,children) (append spec nil)))
+    (and-let* (((transient--use-level-p level))
+               (obj (apply class :level level args))
+               ((transient--use-suffix-p obj))
+               ((prog1 t
+                  (when (or (and parent (oref parent inapt))
+                            (transient--inapt-suffix-p obj))
+                    (oset obj inapt t))))
+               (suffixes (cl-mapcan
+                          (lambda (c) (transient--init-child levels c obj))
+                          (transient-setup-children obj children))))
+      (progn ; work around debbugs#31840
+        (oset obj suffixes suffixes)
+        (list obj)))))
+
+(defun transient--init-suffix (levels spec parent)
+  (pcase-let* ((`(,level ,class ,args) spec)
+               (cmd (plist-get args :command))
+               (key (transient--kbd (plist-get args :key)))
+               (level (or (alist-get (cons cmd key) levels nil nil #'equal)
+                          (alist-get cmd levels)
+                          level)))
+    (let ((fn (and (symbolp cmd)
+                   (symbol-function cmd))))
+      (when (autoloadp fn)
+        (transient--debug "   autoload %s" cmd)
+        (autoload-do-load fn)))
+    (when (transient--use-level-p level)
+      (let ((obj (if (child-of-class-p class 'transient-information)
+                     (apply class :level level args)
+                   (unless (and cmd (symbolp cmd))
+                     (error "BUG: Non-symbolic suffix command: %s" cmd))
+                   (if-let ((proto (and cmd (transient--suffix-prototype cmd))))
+                       (apply #'clone proto :level level args)
+                     (apply class :command cmd :level level args)))))
+        (cond ((not cmd))
+              ((commandp cmd))
+              ((or (cl-typep obj 'transient-switch)
+                   (cl-typep obj 'transient-option))
+               ;; As a temporary special case, if the package was compiled
+               ;; with an older version of Transient, then we must define
+               ;; "anonymous" switch and option commands here.
+               (defalias cmd #'transient--default-infix-command))
+              ((transient--use-suffix-p obj)
+               (error "Suffix command %s is not defined or autoloaded" cmd)))
+        (unless (cl-typep obj 'transient-information)
+          (transient--init-suffix-key obj))
+        (when (transient--use-suffix-p obj)
+          (if (or (and parent (oref parent inapt))
+                  (transient--inapt-suffix-p obj))
+              (oset obj inapt t)
+            (transient-init-scope obj)
+            (transient-init-value obj))
+          (list obj))))))
+
+(cl-defmethod transient--init-suffix-key ((obj transient-suffix))
+  (unless (slot-boundp obj 'key)
+    (error "No key for %s" (oref obj command))))
+
+(cl-defmethod transient--init-suffix-key ((obj transient-argument))
+  (if (transient-switches--eieio-childp obj)
+      (cl-call-next-method obj)
+    (when-let* (((not (slot-boundp obj 'shortarg)))
+                (shortarg (transient--derive-shortarg (oref obj argument))))
+      (oset obj shortarg shortarg))
+    (unless (slot-boundp obj 'key)
+      (if (slot-boundp obj 'shortarg)
+          (oset obj key (oref obj shortarg))
+        (error "No key for %s" (oref obj command))))))
+
+(defun transient--use-level-p (level &optional edit)
+  (or transient--all-levels-p
+      (and transient--editp (not edit))
+      (and (>= level 1)
+           (<= level (oref transient--prefix level)))))
+
+(defun transient--use-suffix-p (obj)
+  (let ((transient--shadowed-buffer (current-buffer))
+        (transient--pending-suffix obj))
+    (transient--do-suffix-p
+     (oref obj if)
+     (oref obj if-not)
+     (oref obj if-nil)
+     (oref obj if-non-nil)
+     (oref obj if-mode)
+     (oref obj if-not-mode)
+     (oref obj if-derived)
+     (oref obj if-not-derived)
+     t)))
+
+(defun transient--inapt-suffix-p (obj)
+  (let ((transient--shadowed-buffer (current-buffer))
+        (transient--pending-suffix obj))
+    (transient--do-suffix-p
+     (oref obj inapt-if)
+     (oref obj inapt-if-not)
+     (oref obj inapt-if-nil)
+     (oref obj inapt-if-non-nil)
+     (oref obj inapt-if-mode)
+     (oref obj inapt-if-not-mode)
+     (oref obj inapt-if-derived)
+     (oref obj inapt-if-not-derived)
+     nil)))
+
+(defun transient--do-suffix-p
+    (if if-not if-nil if-non-nil if-mode if-not-mode if-derived if-not-derived
+        default)
+  (cond
+   (if                  (funcall if))
+   (if-not         (not (funcall if-not)))
+   (if-non-nil          (symbol-value if-non-nil))
+   (if-nil         (not (symbol-value if-nil)))
+   (if-mode             (if (atom if-mode)
+                            (eq major-mode if-mode)
+                          (memq major-mode if-mode)))
+   (if-not-mode    (not (if (atom if-not-mode)
+                            (eq major-mode if-not-mode)
+                          (memq major-mode if-not-mode))))
+   (if-derived          (if (or (atom if-derived)
+                                (>= emacs-major-version 30))
+                            (derived-mode-p if-derived)
+                          (apply #'derived-mode-p if-derived)))
+   (if-not-derived (not (if (or (atom if-not-derived)
+                                (>= emacs-major-version 30))
+                            (derived-mode-p if-not-derived)
+                          (apply #'derived-mode-p if-not-derived))))
+   (default)))
+
+(defun transient--suffix-predicate (spec)
+  (let ((plist (nth 2 spec)))
+    (seq-some (lambda (prop)
+                (and-let* ((pred (plist-get plist prop)))
+                  (list prop pred)))
+              '( :if :if-not
+                 :if-nil :if-non-nil
+                 :if-mode :if-not-mode
+                 :if-derived :if-not-derived
+                 :inapt-if :inapt-if-not
+                 :inapt-if-nil :inapt-if-non-nil
+                 :inapt-if-mode :inapt-if-not-mode
+                 :inapt-if-derived :inapt-if-not-derived))))
+
+;;; Flow-Control
+
+(defun transient--init-transient ()
+  (transient--debug 'init-transient)
+  (transient--push-keymap 'transient--transient-map)
+  (transient--push-keymap 'transient--redisplay-map)
+  (add-hook 'pre-command-hook  #'transient--pre-command)
+  (add-hook 'post-command-hook #'transient--post-command)
+  (advice-add 'recursive-edit :around #'transient--recursive-edit)
+  (when transient--exitp
+    ;; This prefix command was invoked as the suffix of another.
+    ;; Prevent `transient--post-command' from removing the hooks
+    ;; that we just added.
+    (setq transient--exitp 'replace)))
+
+(defun transient--refresh-transient ()
+  (transient--debug 'refresh-transient)
+  (transient--pop-keymap 'transient--predicate-map)
+  (transient--pop-keymap 'transient--transient-map)
+  (transient--pop-keymap 'transient--redisplay-map)
+  (if (eq transient--refreshp 'updated-value)
+      ;; Preserve the prefix value this once, because the
+      ;; invoked suffix indicates that it has updated that.
+      (setq transient--refreshp (oref transient--prefix refresh-suffixes))
+    ;; Otherwise update the prefix value from suffix values.
+    (oset transient--prefix value (transient-get-value)))
+  (transient--init-objects)
+  (transient--init-keymaps)
+  (transient--push-keymap 'transient--transient-map)
+  (transient--push-keymap 'transient--redisplay-map)
+  (transient--redisplay))
+
+(defun transient--pre-command ()
+  (transient--debug 'pre-command)
+  (transient--with-emergency-exit :pre-command
+    ;; The use of `overriding-terminal-local-map' does not prevent the
+    ;; lookup of command remappings in the overridden maps, which can
+    ;; lead to a suffix being remapped to a non-suffix.  We have to undo
+    ;; the remapping in that case.  However, remapping a non-suffix to
+    ;; another should remain possible.
+    (when (and (transient--get-pre-command this-original-command 'suffix)
+               (not (transient--get-pre-command this-command 'suffix)))
+      (setq this-command this-original-command))
+    (cond
+     ((memq this-command '(transient-update transient-quit-seq))
+      (transient--pop-keymap 'transient--redisplay-map))
+     ((and transient--helpp
+           (not (memq this-command '(transient-quit-one
+                                     transient-quit-all))))
+      (cond
+       ((transient-help)
+        (transient--do-suspend)
+        (setq this-command 'transient-suspend)
+        (transient--pre-exit))
+       ((not (transient--edebug-command-p))
+        (setq this-command 'transient-undefined))))
+     ((and transient--editp
+           (transient-suffix-object)
+           (not (memq this-command '(transient-quit-one
+                                     transient-quit-all
+                                     transient-help))))
+      (setq this-command 'transient-set-level)
+      (transient--wrap-command))
+     (t
+      (setq transient--exitp nil)
+      (let ((exitp (eq (transient--call-pre-command) transient--exit)))
+        (transient--wrap-command)
+        (when exitp
+          (transient--pre-exit)))))))
+
+(defun transient--pre-exit ()
+  (transient--debug 'pre-exit)
+  (transient--delete-window)
+  (transient--timer-cancel)
+  (transient--pop-keymap 'transient--transient-map)
+  (transient--pop-keymap 'transient--redisplay-map)
+  (unless transient--showp
+    (let ((message-log-max nil))
+      (message "")))
+  (setq transient--transient-map nil)
+  (setq transient--predicate-map nil)
+  (setq transient--redisplay-map nil)
+  (setq transient--redisplay-key nil)
+  (setq transient--helpp nil)
+  (setq transient--editp nil)
+  (setq transient--prefix nil)
+  (setq transient--layout nil)
+  (setq transient--suffixes nil)
+  (setq transient--original-window nil)
+  (setq transient--original-buffer nil)
+  (setq transient--window nil))
+
+(defun transient--delete-window ()
+  (when (window-live-p transient--window)
+    (let ((win transient--window)
+          (remain-in-minibuffer-window
+           (and (minibuffer-selected-window)
+                (selected-window))))
+      (cond
+       ((eq (car (window-parameter win 'quit-restore)) 'other)
+        ;; Window used to display another buffer.
+        (set-window-parameter win 'no-other-window
+                              (window-parameter win 'prev--no-other-window))
+        (set-window-parameter win 'prev--no-other-window nil))
+       ((with-demoted-errors "Error while exiting transient: %S"
+          (delete-window win))))
+      (when (buffer-live-p transient--buffer)
+        (kill-buffer transient--buffer))
+      (setq transient--buffer nil)
+      (when remain-in-minibuffer-window
+        (select-window remain-in-minibuffer-window)))))
+
+(defun transient--export ()
+  (setq transient-current-prefix transient--prefix)
+  (setq transient-current-command (oref transient--prefix command))
+  (setq transient-current-suffixes transient--suffixes)
+  (transient--history-push transient--prefix))
+
+(defun transient--suspend-override (&optional nohide)
+  (transient--debug 'suspend-override)
+  (transient--timer-cancel)
+  (cond ((and (not nohide) transient-hide-during-minibuffer-read)
+         (transient--delete-window))
+        ((and transient--prefix transient--redisplay-key)
+         (setq transient--redisplay-key nil)
+         (when transient--showp
+           (if-let ((win (minibuffer-selected-window)))
+               (with-selected-window win
+                 (transient--show))
+             (transient--show)))))
+  (transient--pop-keymap 'transient--transient-map)
+  (transient--pop-keymap 'transient--redisplay-map)
+  (remove-hook 'pre-command-hook  #'transient--pre-command)
+  (remove-hook 'post-command-hook #'transient--post-command))
+
+(defun transient--resume-override (&optional _ignore)
+  (transient--debug 'resume-override)
+  (when (and transient--showp transient-hide-during-minibuffer-read)
+    (transient--show))
+  (transient--push-keymap 'transient--transient-map)
+  (transient--push-keymap 'transient--redisplay-map)
+  (add-hook 'pre-command-hook  #'transient--pre-command)
+  (add-hook 'post-command-hook #'transient--post-command))
+
+(defun transient--recursive-edit (fn)
+  (transient--debug 'recursive-edit)
+  (if (not transient--prefix)
+      (funcall fn)
+    (transient--suspend-override (bound-and-true-p edebug-active))
+    (funcall fn) ; Already unwind protected.
+    (cond ((memq this-command '(top-level abort-recursive-edit))
+           (setq transient--exitp t)
+           (transient--post-exit)
+           (transient--delete-window))
+          (transient--prefix
+           (transient--resume-override)))))
+
+(defmacro transient--with-suspended-override (&rest body)
+  (let ((depth (make-symbol "depth"))
+        (setup (make-symbol "setup"))
+        (exit  (make-symbol "exit")))
+    `(if (and transient--transient-map
+              (memq transient--transient-map
+                    overriding-terminal-local-map))
+         (let ((,depth (1+ (minibuffer-depth))) ,setup ,exit)
+           (setq ,setup
+                 (lambda () "@transient--with-suspended-override"
+                   (transient--debug 'minibuffer-setup)
+                   (remove-hook 'minibuffer-setup-hook ,setup)
+                   (transient--suspend-override)))
+           (setq ,exit
+                 (lambda () "@transient--with-suspended-override"
+                   (transient--debug 'minibuffer-exit)
+                   (when (= (minibuffer-depth) ,depth)
+                     (transient--resume-override))))
+           (unwind-protect
+               (progn
+                 (add-hook 'minibuffer-setup-hook ,setup)
+                 (add-hook 'minibuffer-exit-hook ,exit)
+                 ,@body)
+             (remove-hook 'minibuffer-setup-hook ,setup)
+             (remove-hook 'minibuffer-exit-hook ,exit)))
+       ,@body)))
+
+(defun transient--wrap-command ()
+  (static-if (>= emacs-major-version 30)
+      (letrec
+          ((prefix transient--prefix)
+           (suffix this-command)
+           (advice
+            (lambda (fn &rest args)
+              (interactive
+               (lambda (spec)
+                 (let ((abort t))
+                   (unwind-protect
+                       (prog1 (let ((debugger #'transient--exit-and-debug))
+                                (advice-eval-interactive-spec spec))
+                         (setq abort nil))
+                     (when abort
+                       (when-let ((unwind (oref prefix unwind-suffix)))
+                         (transient--debug 'unwind-interactive)
+                         (funcall unwind suffix))
+                       (advice-remove suffix advice)
+                       (oset prefix unwind-suffix nil))))))
+              (unwind-protect
+                  (let ((debugger #'transient--exit-and-debug))
+                    (apply fn args))
+                (when-let ((unwind (oref prefix unwind-suffix)))
+                  (transient--debug 'unwind-command)
+                  (funcall unwind suffix))
+                (advice-remove suffix advice)
+                (oset prefix unwind-suffix nil)))))
+        (when (symbolp this-command)
+          (advice-add suffix :around advice '((depth . -99))))
+        (cl-assert
+         (>= emacs-major-version 30) nil
+         "Emacs was downgraded, making it necessary to recompile Transient"))
+    ;; (< emacs-major-version 30)
+    (let* ((prefix transient--prefix)
+           (suffix this-command)
+           (advice nil)
+           (advice-interactive
+            (lambda (spec)
+              (let ((abort t))
+                (unwind-protect
+                    (prog1 (let ((debugger #'transient--exit-and-debug))
+                             (advice-eval-interactive-spec spec))
+                      (setq abort nil))
+                  (when abort
+                    (when-let ((unwind (oref prefix unwind-suffix)))
+                      (transient--debug 'unwind-interactive)
+                      (funcall unwind suffix))
+                    (advice-remove suffix advice)
+                    (oset prefix unwind-suffix nil))))))
+           (advice-body
+            (lambda (fn &rest args)
+              (unwind-protect
+                  (let ((debugger #'transient--exit-and-debug))
+                    (apply fn args))
+                (when-let ((unwind (oref prefix unwind-suffix)))
+                  (transient--debug 'unwind-command)
+                  (funcall unwind suffix))
+                (advice-remove suffix advice)
+                (oset prefix unwind-suffix nil)))))
+      (setq advice `(lambda (fn &rest args)
+                      (interactive ,advice-interactive)
+                      (apply ',advice-body fn args)))
+      (when (symbolp this-command)
+        (advice-add suffix :around advice '((depth . -99)))))))
+
+(defun transient--premature-post-command ()
+  (and (equal (this-command-keys-vector) [])
+       (= (minibuffer-depth)
+          (1+ transient--minibuffer-depth))
+       (progn
+         (transient--debug 'premature-post-command)
+         (transient--suspend-override)
+         (oset (or transient--prefix transient-current-prefix)
+               unwind-suffix
+               (if transient--exitp
+                   #'transient--post-exit
+                 #'transient--resume-override))
+         t)))
+
+(defun transient--post-command ()
+  (unless (transient--premature-post-command)
+    (transient--debug 'post-command)
+    (transient--with-emergency-exit :post-command
+      (cond (transient--exitp (transient--post-exit))
+            ;; If `this-command' is the current transient prefix, then we
+            ;; have already taken care of updating the transient buffer...
+            ((and (eq this-command (oref transient--prefix command))
+                  ;; ... but if `prefix-arg' is non-nil, then the values
+                  ;; of `this-command' and `real-this-command' are untrue
+                  ;; because `prefix-command-preserve-state' changes them.
+                  ;; We cannot use `current-prefix-arg' because it is set
+                  ;; too late (in `command-execute'), and if it were set
+                  ;; earlier, then we likely still would not be able to
+                  ;; rely on it, and `prefix-command-preserve-state-hook'
+                  ;; would have to be used to record that a universal
+                  ;; argument is in effect.
+                  (not prefix-arg)))
+            (transient--refreshp
+             (transient--refresh-transient))
+            ((let ((old transient--redisplay-map)
+                   (new (transient--make-redisplay-map)))
+               (unless (equal old new)
+                 (transient--pop-keymap 'transient--redisplay-map)
+                 (setq transient--redisplay-map new)
+                 (transient--push-keymap 'transient--redisplay-map))
+               (transient--redisplay)))))
+    (setq transient-current-prefix nil)
+    (setq transient-current-command nil)
+    (setq transient-current-suffixes nil)))
+
+(defun transient--post-exit (&optional command)
+  (transient--debug 'post-exit)
+  (unless (and (eq transient--exitp 'replace)
+               (or transient--prefix
+                   ;; The current command could act as a prefix,
+                   ;; but decided not to call `transient-setup',
+                   ;; or it is prevented from doing so because it
+                   ;; uses the minibuffer and the user aborted
+                   ;; that.
+                   (prog1 nil
+                     (if (let ((obj (transient-suffix-object command)))
+                           (and (slot-boundp obj 'transient)
+                                (oref obj transient)))
+                         ;; This sub-prefix is a transient suffix;
+                         ;; go back to outer prefix, by calling
+                         ;; `transient--stack-pop' further down.
+                         (setq transient--exitp nil)
+                       (transient--stack-zap)))))
+    (remove-hook 'pre-command-hook  #'transient--pre-command)
+    (remove-hook 'post-command-hook #'transient--post-command)
+    (advice-remove 'recursive-edit #'transient--recursive-edit))
+  (let ((resume (and transient--stack
+                     (not (memq transient--exitp '(replace suspend))))))
+    (unless (or resume (eq transient--exitp 'replace))
+      (setq transient--showp nil))
+    (setq transient--exitp nil)
+    (setq transient--helpp nil)
+    (setq transient--editp nil)
+    (setq transient--all-levels-p nil)
+    (setq transient--minibuffer-depth 0)
+    (run-hooks 'transient-exit-hook)
+    (when resume
+      (transient--stack-pop))))
+
+(defun transient--stack-push ()
+  (transient--debug 'stack-push)
+  (push (list (oref transient--prefix command)
+              transient--layout
+              transient--editp
+              :transient-suffix (oref transient--prefix transient-suffix)
+              :scope (oref transient--prefix scope))
+        transient--stack))
+
+(defun transient--stack-pop ()
+  (transient--debug 'stack-pop)
+  (and transient--stack
+       (prog1 t (apply #'transient-setup (pop transient--stack)))))
+
+(defun transient--stack-zap ()
+  (transient--debug 'stack-zap)
+  (setq transient--stack nil))
+
+(defun transient--redisplay ()
+  (if (or (eq transient-show-popup t)
+          transient--showp)
+      (unless
+          (or (memq this-command transient--scroll-commands)
+              (and (or (memq this-command '(mouse-drag-region
+                                            mouse-set-region))
+                       (equal (key-description (this-command-keys-vector))
+                              "<mouse-movement>"))
+                   (and (eq (current-buffer) transient--buffer))))
+        (transient--show))
+    (when (and (numberp transient-show-popup)
+               (not (zerop transient-show-popup))
+               (not transient--timer))
+      (transient--timer-start))
+    (transient--show-brief)))
+
+(defun transient--timer-start ()
+  (setq transient--timer
+        (run-at-time (abs transient-show-popup) nil
+                     (lambda ()
+                       (transient--timer-cancel)
+                       (transient--show)
+                       (let ((message-log-max nil))
+                         (message ""))))))
+
+(defun transient--timer-cancel ()
+  (when transient--timer
+    (cancel-timer transient--timer)
+    (setq transient--timer nil)))
+
+(defun transient--debug (arg &rest args)
+  (when transient--debug
+    (let ((inhibit-message (not (eq transient--debug 'message))))
+      (if (symbolp arg)
+          (message "-- %-22s (cmd: %s, event: %S, exit: %s%s)"
+                   arg
+                   (cond ((and (symbolp this-command) this-command))
+                         ((fboundp 'help-fns-function-name)
+                          (help-fns-function-name this-command))
+                         ((byte-code-function-p this-command)
+                          "#[...]")
+                         (this-command))
+                   (key-description (this-command-keys-vector))
+                   transient--exitp
+                   (cond ((keywordp (car args))
+                          (format ", from: %s"
+                                  (substring (symbol-name (car args)) 1)))
+                         ((stringp (car args))
+                          (concat ", " (apply #'format args)))
+                         ((functionp (car args))
+                          (concat ", " (apply (car args) (cdr args))))
+                         ("")))
+        (apply #'message arg args)))))
+
+(defun transient--emergency-exit (&optional id)
+  "Exit the current transient command after an error occurred.
+When no transient is active (i.e., when `transient--prefix' is
+nil) then do nothing.  Optional ID is a keyword identifying the
+exit."
+  (transient--debug 'emergency-exit id)
+  (when transient--prefix
+    (setq transient--stack nil)
+    (setq transient--exitp t)
+    (transient--pre-exit)
+    (transient--post-exit)))
+
+;;; Pre-Commands
+
+(defun transient--call-pre-command ()
+  (if-let ((fn (transient--get-pre-command this-command)))
+      (let ((action (funcall fn)))
+        (when (eq action transient--exit)
+          (setq transient--exitp (or transient--exitp t)))
+        action)
+    (if (let ((keys (this-command-keys-vector)))
+          (eq (aref keys (1- (length keys))) ?\C-g))
+        (setq this-command 'transient-noop)
+      (unless (transient--edebug-command-p)
+        (setq this-command 'transient-undefined)))
+    transient--stay))
+
+(defun transient--get-pre-command (&optional cmd enforce-type)
+  (or (and (not (eq enforce-type 'non-suffix))
+           (symbolp cmd)
+           (lookup-key transient--predicate-map (vector cmd)))
+      (and (not (eq enforce-type 'suffix))
+           (transient--resolve-pre-command
+            (oref transient--prefix transient-non-suffix)
+            t))))
+
+(defun transient--resolve-pre-command (pre &optional resolve-boolean)
+  (cond ((booleanp pre)
+         (if resolve-boolean
+             (if pre #'transient--do-stay #'transient--do-warn)
+           pre))
+        ((string-match-p "--do-" (symbol-name pre)) pre)
+        ((let ((sym (intern (format "transient--do-%s" pre))))
+           (if (functionp sym) sym pre)))))
+
+(defun transient--do-stay ()
+  "Call the command without exporting variables and stay transient."
+  transient--stay)
+
+(defun transient--do-noop ()
+  "Call `transient-noop' and stay transient."
+  (setq this-command 'transient-noop)
+  transient--stay)
+
+(defun transient--do-warn ()
+  "Call `transient-undefined' and stay transient."
+  (setq this-command 'transient-undefined)
+  transient--stay)
+
+(defun transient--do-warn-inapt ()
+  "Call `transient-inapt' and stay transient."
+  (setq this-command 'transient-inapt)
+  transient--stay)
+
+(defun transient--do-call ()
+  "Call the command after exporting variables and stay transient."
+  (transient--export)
+  transient--stay)
+
+(defun transient--do-return ()
+  "Call the command after exporting variables and return to parent prefix.
+If there is no parent prefix, then behave like `transient--do-exit'."
+  (if (not transient--stack)
+      (transient--do-exit)
+    (transient--export)
+    transient--exit))
+
+(defun transient--do-exit ()
+  "Call the command after exporting variables and exit the transient."
+  (transient--export)
+  (transient--stack-zap)
+  transient--exit)
+
+(defun transient--do-leave ()
+  "Call the command without exporting variables and exit the transient."
+  (transient--stack-zap)
+  transient--exit)
+
+(defun transient--do-push-button ()
+  "Call the command represented by the activated button.
+Use that command's pre-command to determine transient behavior."
+  (if (and (mouse-event-p last-command-event)
+           (not (eq (posn-window (event-start last-command-event))
+                    transient--window)))
+      transient--stay
+    (setq this-command
+          (with-selected-window transient--window
+            (get-text-property (if (mouse-event-p last-command-event)
+                                   (posn-point (event-start last-command-event))
+                                 (point))
+                               'command)))
+    (transient--call-pre-command)))
+
+(defun transient--do-recurse ()
+  "Call the transient prefix command, preparing for return to active transient.
+If there is no parent prefix, then just call the command."
+  (transient--do-stack))
+
+(defun transient--setup-recursion (prefix-obj)
+  (when transient--stack
+    (let ((command (oref prefix-obj command)))
+      (when-let ((suffix-obj (transient-suffix-object command)))
+        (when (memq (if (slot-boundp suffix-obj 'transient)
+                        (oref suffix-obj transient)
+                      (oref transient-current-prefix transient-suffix))
+                    (list t #'transient--do-recurse))
+          (oset prefix-obj transient-suffix t))))))
+
+(defun transient--do-stack ()
+  "Call the transient prefix command, stacking the active transient.
+Push the active transient to the transient stack."
+  (transient--export)
+  (transient--stack-push)
+  (setq transient--exitp 'replace)
+  transient--exit)
+
+(defun transient--do-replace ()
+  "Call the transient prefix command, replacing the active transient.
+Do not push the active transient to the transient stack."
+  (transient--export)
+  (setq transient--exitp 'replace)
+  transient--exit)
+
+(defun transient--do-suspend ()
+  "Suspend the active transient, saving the transient stack."
+  (transient--stack-push)
+  (setq transient--exitp 'suspend)
+  transient--exit)
+
+(defun transient--do-quit-one ()
+  "If active, quit help or edit mode, else exit the active transient."
+  (cond (transient--helpp
+         (setq transient--helpp nil)
+         transient--stay)
+        (transient--editp
+         (setq transient--editp nil)
+         (transient-setup)
+         transient--stay)
+        (prefix-arg
+         transient--stay)
+        (transient--exit)))
+
+(defun transient--do-quit-all ()
+  "Exit all transients without saving the transient stack."
+  (transient--stack-zap)
+  transient--exit)
+
+(defun transient--do-move ()
+  "Call the command if `transient-enable-popup-navigation' is non-nil.
+In that case behave like `transient--do-stay', otherwise similar
+to `transient--do-warn'."
+  (unless transient-enable-popup-navigation
+    (setq this-command 'transient-inhibit-move))
+  transient--stay)
+
+(defun transient--do-minus ()
+  "Call `negative-argument' or pivot to `transient-update'.
+If `negative-argument' is invoked using \"-\" then preserve the
+prefix argument and pivot to `transient-update'."
+  (when (equal (this-command-keys) "-")
+    (setq this-command 'transient-update))
+  transient--stay)
+
+(put 'transient--do-stay       'transient-face 'transient-key-stay)
+(put 'transient--do-noop       'transient-face 'transient-key-noop)
+(put 'transient--do-warn       'transient-face 'transient-key-noop)
+(put 'transient--do-warn-inapt 'transient-face 'transient-key-noop)
+(put 'transient--do-call       'transient-face 'transient-key-stay)
+(put 'transient--do-return     'transient-face 'transient-key-return)
+(put 'transient--do-exit       'transient-face 'transient-key-exit)
+(put 'transient--do-leave      'transient-face 'transient-key-exit)
+
+(put 'transient--do-recurse    'transient-face 'transient-key-stay)
+(put 'transient--do-stack      'transient-face 'transient-key-stay)
+(put 'transient--do-replace    'transient-face 'transient-key-exit)
+(put 'transient--do-suspend    'transient-face 'transient-key-exit)
+
+(put 'transient--do-quit-one   'transient-face 'transient-key-return)
+(put 'transient--do-quit-all   'transient-face 'transient-key-exit)
+(put 'transient--do-move       'transient-face 'transient-key-stay)
+(put 'transient--do-minus      'transient-face 'transient-key-stay)
+
+;;; Commands
+;;;; Noop
+
+(defun transient-noop ()
+  "Do nothing at all."
+  (interactive))
+
+(defun transient-undefined ()
+  "Warn the user that the pressed key is not bound to any suffix."
+  (interactive)
+  (transient--invalid "Unbound suffix"))
+
+(defun transient-inapt ()
+  "Warn the user that the invoked command is inapt."
+  (interactive)
+  (transient--invalid "Inapt command"))
+
+(defun transient--invalid (msg)
+  (ding)
+  (message "%s: `%s' (Use `%s' to abort, `%s' for help)%s"
+           msg
+           (propertize (key-description (this-single-command-keys))
+                       'face 'font-lock-warning-face)
+           (propertize "C-g" 'face 'transient-key)
+           (propertize "?"   'face 'transient-key)
+           ;; `this-command' is `transient-undefined' or `transient-inapt'.
+           ;; Show the command (`this-original-command') the user actually
+           ;; tried to invoke.
+           (if-let ((cmd (or (ignore-errors (symbol-name this-original-command))
+                             (ignore-errors (symbol-name this-command)))))
+               (format " [%s]" (propertize cmd 'face 'font-lock-warning-face))
+             ""))
+  (unless (and transient--transient-map
+               (memq transient--transient-map overriding-terminal-local-map))
+    (let ((transient--prefix (or transient--prefix 'sic)))
+      (transient--emergency-exit))
+    (view-lossage)
+    (other-window 1)
+    (display-warning 'transient "Inconsistent transient state detected.
+This should never happen.
+Please open an issue and post the shown command log." :error)))
+
+(defun transient-inhibit-move ()
+  "Warn the user that popup navigation is disabled."
+  (interactive)
+  (message "To enable use of `%s', please customize `%s'"
+           this-original-command
+           'transient-enable-popup-navigation))
+
+;;;; Core
+
+(defun transient-quit-all ()
+  "Exit all transients without saving the transient stack."
+  (interactive))
+
+(defun transient-quit-one ()
+  "Exit the current transients, returning to outer transient, if any."
+  (interactive))
+
+(defun transient-quit-seq ()
+  "Abort the current incomplete key sequence."
+  (interactive))
+
+(defun transient-update ()
+  "Redraw the transient's state in the popup buffer."
+  (interactive)
+  (setq prefix-arg current-prefix-arg))
+
+(defun transient-show ()
+  "Show the transient's state in the popup buffer."
+  (interactive)
+  (setq transient--showp t))
+
+(defun transient-push-button ()
+  "Invoke the suffix command represented by this button."
+  (interactive))
+
+;;;; Suspend
+
+(defun transient-suspend ()
+  "Suspend the current transient.
+It can later be resumed using `transient-resume', while no other
+transient is active."
+  (interactive))
+
+(define-minor-mode transient-resume-mode
+  "Auxiliary minor-mode used to resume a transient after viewing help.")
+
+(defun transient-resume ()
+  "Resume a previously suspended stack of transients."
+  (interactive)
+  (cond (transient--stack
+         (let ((winconf transient--restore-winconf))
+           (kill-local-variable 'transient--restore-winconf)
+           (when transient-resume-mode
+             (transient-resume-mode -1)
+             (quit-window))
+           (when winconf
+             (set-window-configuration winconf)))
+         (transient--stack-pop))
+        (transient-resume-mode
+         (kill-local-variable 'transient--restore-winconf)
+         (transient-resume-mode -1)
+         (quit-window))
+        (t
+         (message "No suspended transient command"))))
+
+;;;; Help
+
+(defun transient-help (&optional interactive)
+  "Show help for the active transient or one of its suffixes.\n\n(fn)"
+  (interactive (list t))
+  (if interactive
+      (setq transient--helpp t)
+    (with-demoted-errors "transient-help: %S"
+      (when (lookup-key transient--transient-map
+                        (this-single-command-raw-keys))
+        (setq transient--helpp nil)
+        (let ((winconf (current-window-configuration)))
+          (transient-show-help
+           (if (eq this-original-command 'transient-help)
+               transient--prefix
+             (or (transient-suffix-object)
+                 this-original-command)))
+          (setq-local transient--restore-winconf winconf))
+        (fit-window-to-buffer nil (frame-height) (window-height))
+        (transient-resume-mode)
+        (message (substitute-command-keys
+                  "Type \\`q' to resume transient command."))
+        t))))
+
+;;;; Level
+
+(defun transient-set-level (&optional command level)
+  "Set the level of the transient or one of its suffix commands."
+  (interactive
+   (let ((command this-original-command)
+         (prefix (oref transient--prefix command)))
+     (and (or (not (eq command 'transient-set-level))
+              (and transient--editp
+                   (setq command prefix)))
+          (list command
+                (let ((keys (this-single-command-raw-keys)))
+                  (and (lookup-key transient--transient-map keys)
+                       (progn
+                         (transient--show)
+                         (string-to-number
+                          (transient--read-number-N
+                           (format "Set level for `%s': " command)
+                           nil nil (not (eq command prefix)))))))))))
+  (cond
+   ((not command)
+    (setq transient--editp t)
+    (transient-setup))
+   (level
+    (let* ((prefix (oref transient--prefix command))
+           (alist (alist-get prefix transient-levels))
+           (akey command))
+      (cond ((eq command prefix)
+             (oset transient--prefix level level)
+             (setq akey t))
+            (t
+             (oset (transient-suffix-object command) level level)
+             (when (cdr (cl-remove-if-not (lambda (obj)
+                                            (eq (oref obj command) command))
+                                          transient--suffixes))
+               (setq akey (cons command (this-command-keys))))))
+      (setf (alist-get akey alist) level)
+      (setf (alist-get prefix transient-levels) alist))
+    (transient-save-levels)
+    (transient--show))
+   (t
+    (transient-undefined))))
+
+(transient-define-suffix transient-toggle-level-limit ()
+  "Toggle whether to temporarily displayed suffixes on all levels."
+  :description
+  (lambda ()
+    (cond
+     ((= transient-default-level transient--max-level)
+      "Always displaying all levels")
+     (transient--all-levels-p
+      (format "Hide suffix %s"
+              (propertize
+               (format "levels > %s" (oref (transient-prefix-object) level))
+               'face 'transient-higher-level)))
+     ("Show all suffix levels")))
+  :inapt-if (lambda () (= transient-default-level transient--max-level))
+  :transient t
+  (interactive)
+  (setq transient--all-levels-p (not transient--all-levels-p))
+  (setq transient--refreshp t))
+
+;;;; Value
+
+(defun transient-set ()
+  "Set active transient's value for this Emacs session."
+  (interactive)
+  (transient-set-value (transient-prefix-object)))
+
+(defalias 'transient-set-and-exit #'transient-set
+  "Set active transient's value for this Emacs session and exit.")
+
+(defun transient-save ()
+  "Save active transient's value for this and future Emacs sessions."
+  (interactive)
+  (transient-save-value (transient-prefix-object)))
+
+(defalias 'transient-save-and-exit #'transient-save
+  "Save active transient's value for this and future Emacs sessions and exit.")
+
+(defun transient-reset ()
+  "Clear the set and saved values of the active transient."
+  (interactive)
+  (transient-reset-value (transient-prefix-object)))
+
+(defun transient-history-next ()
+  "Switch to the next value used for the active transient."
+  (interactive)
+  (let* ((obj transient--prefix)
+         (pos (1- (oref obj history-pos)))
+         (hst (oref obj history)))
+    (if (< pos 0)
+        (user-error "End of history")
+      (oset obj history-pos pos)
+      (oset obj value (nth pos hst))
+      (mapc #'transient-init-value transient--suffixes))))
+
+(defun transient-history-prev ()
+  "Switch to the previous value used for the active transient."
+  (interactive)
+  (let* ((obj transient--prefix)
+         (pos (1+ (oref obj history-pos)))
+         (hst (oref obj history))
+         (len (length hst)))
+    (if (> pos (1- len))
+        (user-error "End of history")
+      (oset obj history-pos pos)
+      (oset obj value (nth pos hst))
+      (mapc #'transient-init-value transient--suffixes))))
+
+(transient-define-suffix transient-preset ()
+  "Put this preset into action."
+  :class transient-value-preset
+  (interactive)
+  (transient-prefix-set (oref (transient-suffix-object) set)))
+
+;;;; Auxiliary
+
+(defun transient-toggle-common ()
+  "Toggle whether common commands are permanently shown."
+  (interactive)
+  (setq transient-show-common-commands (not transient-show-common-commands)))
+
+(defun transient-toggle-debug ()
+  "Toggle debugging statements for transient commands."
+  (interactive)
+  (setq transient--debug (not transient--debug))
+  (message "Debugging transient %s"
+           (if transient--debug "enabled" "disabled")))
+
+(transient-define-suffix transient-echo-arguments (arguments)
+  "Show the transient's active ARGUMENTS in the echo area.
+Intended for use in prefixes used for demonstration purposes,
+such as when suggesting a new feature or reporting an issue."
+  :transient t
+  :description "Echo arguments"
+  :key "x"
+  (interactive (list (transient-args transient-current-command)))
+  (message "%s: %s"
+           (key-description (this-command-keys))
+           (mapconcat (lambda (arg)
+                        (propertize (if (string-match-p " " arg)
+                                        (format "%S" arg)
+                                      arg)
+                                    'face 'transient-argument))
+                      arguments " ")))
+
+;;; Value
+;;;; Init
+
+(cl-defgeneric transient-init-scope (obj)
+  "Set the scope of the suffix object OBJ.
+
+The scope is actually a property of the transient prefix, not of
+individual suffixes.  However it is possible to invoke a suffix
+command directly instead of from a transient.  In that case, if
+the suffix expects a scope, then it has to determine that itself
+and store it in its `scope' slot.
+
+This function is called for all suffix commands, but unless a
+concrete method is implemented this falls through to the default
+implementation, which is a noop.")
+
+(cl-defmethod transient-init-scope ((_   transient-suffix))
+  "Noop." nil)
+
+(cl-defgeneric transient-init-value (_)
+  "Set the initial value of the object OBJ.
+
+This function is called for all prefix and suffix commands.
+
+For suffix commands (including infix argument commands) the
+default implementation is a noop.  Classes derived from the
+abstract `transient-infix' class must implement this function.
+Non-infix suffix commands usually don't have a value."
+  nil)
+
+(cl-defmethod transient-init-value :around ((obj transient-prefix))
+  "If bound, then call OBJ's `init-value' function.
+Otherwise call the primary method according to object's class."
+  (if (slot-boundp obj 'init-value)
+      (funcall (oref obj init-value) obj)
+    (cl-call-next-method obj)))
+
+(cl-defmethod transient-init-value :around ((obj transient-infix))
+  "If bound, then call OBJ's `init-value' function.
+Otherwise call the primary method according to object's class."
+  (if (slot-boundp obj 'init-value)
+      (funcall (oref obj init-value) obj)
+    (cl-call-next-method obj)))
+
+(cl-defmethod transient-init-value ((obj transient-prefix))
+  (if (slot-boundp obj 'value)
+      (oref obj value)
+    (oset obj value
+          (if-let ((saved (assq (oref obj command) transient-values)))
+              (cdr saved)
+            (transient-default-value obj)))))
+
+(cl-defmethod transient-init-value ((obj transient-argument))
+  (oset obj value
+        (let ((value (oref transient--prefix value))
+              (argument (and (slot-boundp obj 'argument)
+                             (oref obj argument)))
+              (multi-value (oref obj multi-value))
+              (case-fold-search nil)
+              (regexp (if (slot-exists-p obj 'argument-regexp)
+                          (oref obj argument-regexp)
+                        (format "\\`%s\\(.*\\)" (oref obj argument)))))
+          (if (memq multi-value '(t rest))
+              (cdr (assoc argument value))
+            (let ((match (lambda (v)
+                           (and (stringp v)
+                                (string-match regexp v)
+                                (match-string 1 v)))))
+              (if multi-value
+                  (delq nil (mapcar match value))
+                (cl-some match value)))))))
+
+(cl-defmethod transient-init-value ((obj transient-switch))
+  (oset obj value
+        (car (member (oref obj argument)
+                     (oref transient--prefix value)))))
+
+;;;; Default
+
+(cl-defgeneric transient-default-value (_)
+  "Return the default value."
+  nil)
+
+(cl-defmethod transient-default-value ((obj transient-prefix))
+  (if-let ((default (and (slot-boundp obj 'default-value)
+                         (oref obj default-value))))
+      (if (functionp default)
+          (funcall default)
+        default)
+    nil))
+
+;;;; Read
+
+(cl-defgeneric transient-infix-read (obj)
+  "Determine the new value of the infix object OBJ.
+
+This function merely determines the value; `transient-infix-set'
+is used to actually store the new value in the object.
+
+For most infix classes this is done by reading a value from the
+user using the reader specified by the `reader' slot (using the
+`transient-infix' method described below).
+
+For some infix classes the value is changed without reading
+anything in the minibuffer, i.e., the mere act of invoking the
+infix command determines what the new value should be, based
+on the previous value.")
+
+(cl-defmethod transient-infix-read :around ((obj transient-infix))
+  "Refresh the transient buffer and call the next method.
+
+Also wrap `cl-call-next-method' with two macros:
+- `transient--with-suspended-override' allows use of minibuffer.
+- `transient--with-emergency-exit' arranges for the transient to
+  be exited in case of an error."
+  (transient--show)
+  (transient--with-emergency-exit :infix-read
+    (transient--with-suspended-override
+     (cl-call-next-method obj))))
+
+(cl-defmethod transient-infix-read ((obj transient-infix))
+  "Read a value while taking care of history.
+
+This method is suitable for a wide variety of infix commands,
+including but not limited to inline arguments and variables.
+
+If you do not use this method for your own infix class, then
+you should likely replicate a lot of the behavior of this
+method.  If you fail to do so, then users might not appreciate
+the lack of history, for example.
+
+Only for very simple classes that toggle or cycle through a very
+limited number of possible values should you replace this with a
+simple method that does not handle history.  (E.g., for a command
+line switch the only possible values are \"use it\" and \"don't use
+it\", in which case it is pointless to preserve history.)"
+  (with-slots (value multi-value always-read allow-empty choices) obj
+    (if (and value
+             (not multi-value)
+             (not always-read)
+             transient--prefix)
+        (oset obj value nil)
+      (let* ((enable-recursive-minibuffers t)
+             (reader (oref obj reader))
+             (choices (if (functionp choices) (funcall choices) choices))
+             (prompt (transient-prompt obj))
+             (value (if multi-value (string-join value ",") value))
+             (history-key (or (oref obj history-key)
+                              (oref obj command)))
+             (transient--history (alist-get history-key transient-history))
+             (transient--history (if (or (null value)
+                                         (eq value (car transient--history)))
+                                     transient--history
+                                   (cons value transient--history)))
+             (initial-input (and transient-read-with-initial-input
+                                 (car transient--history)))
+             (history (if initial-input
+                          (cons 'transient--history 1)
+                        'transient--history))
+             (value
+              (cond
+               (reader (funcall reader prompt initial-input history))
+               (multi-value
+                (completing-read-multiple prompt choices nil nil
+                                          initial-input history))
+               (choices
+                (completing-read prompt choices nil t initial-input history))
+               ((read-string prompt initial-input history)))))
+        (cond ((and (equal value "") (not allow-empty))
+               (setq value nil))
+              ((and (equal value "\"\"") allow-empty)
+               (setq value "")))
+        (when value
+          (when (and (bound-and-true-p ivy-mode)
+                     (stringp (car transient--history)))
+            (set-text-properties 0 (length (car transient--history)) nil
+                                 (car transient--history)))
+          (setf (alist-get history-key transient-history)
+                (delete-dups transient--history)))
+        value))))
+
+(cl-defmethod transient-infix-read ((obj transient-switch))
+  "Toggle the switch on or off."
+  (if (oref obj value) nil (oref obj argument)))
+
+(cl-defmethod transient-infix-read ((obj transient-switches))
+  "Cycle through the mutually exclusive switches.
+The last value is \"don't use any of these switches\"."
+  (let ((choices (mapcar (apply-partially #'format (oref obj argument-format))
+                         (oref obj choices))))
+    (if-let ((value (oref obj value)))
+        (cadr (member value choices))
+      (car choices))))
+
+(cl-defmethod transient-infix-read ((command symbol))
+  "Elsewhere use the reader of the infix command COMMAND.
+Use this if you want to share an infix's history with a regular
+stand-alone command."
+  (if-let ((obj (transient--suffix-prototype command)))
+      (cl-letf (((symbol-function #'transient--show) #'ignore))
+        (transient-infix-read obj))
+    (error "Not a suffix command: `%s'" command)))
+
+;;;; Readers
+
+(defun transient-read-file (prompt _initial-input _history)
+  "Read a file."
+  (file-local-name (expand-file-name (read-file-name prompt))))
+
+(defun transient-read-existing-file (prompt _initial-input _history)
+  "Read an existing file."
+  (file-local-name (expand-file-name (read-file-name prompt nil nil t))))
+
+(defun transient-read-directory (prompt _initial-input _history)
+  "Read a directory."
+  (file-local-name (expand-file-name (read-directory-name prompt))))
+
+(defun transient-read-existing-directory (prompt _initial-input _history)
+  "Read an existing directory."
+  (file-local-name (expand-file-name (read-directory-name prompt nil nil t))))
+
+(defun transient-read-number-N0 (prompt initial-input history)
+  "Read a natural number (including zero) and return it as a string."
+  (transient--read-number-N prompt initial-input history t))
+
+(defun transient-read-number-N+ (prompt initial-input history)
+  "Read a natural number (excluding zero) and return it as a string."
+  (transient--read-number-N prompt initial-input history nil))
+
+(defun transient--read-number-N (prompt initial-input history include-zero)
+  (save-match-data
+    (cl-block nil
+      (while t
+        (let ((str (read-from-minibuffer prompt initial-input nil nil history)))
+          (when (or (string-equal str "")
+                    (string-match-p (if include-zero
+                                        "\\`\\(0\\|[1-9][0-9]*\\)\\'"
+                                      "\\`[1-9][0-9]*\\'")
+                                    str))
+            (cl-return str)))
+        (message "Please enter a natural number (%s zero)."
+                 (if include-zero "including" "excluding"))
+        (sit-for 1)))))
+
+(defun transient-read-date (prompt default-time _history)
+  "Read a date using `org-read-date' (which see)."
+  (require 'org)
+  (when (fboundp 'org-read-date)
+    (org-read-date 'with-time nil nil prompt default-time)))
+
+;;;; Prompt
+
+(cl-defgeneric transient-prompt (obj)
+  "Return the prompt to be used to read infix object OBJ's value.")
+
+(cl-defmethod transient-prompt ((obj transient-infix))
+  "Return the prompt to be used to read infix object OBJ's value.
+
+This implementation should be suitable for almost all infix
+commands.
+
+If the value of OBJ's `prompt' slot is non-nil, then it must be
+a string or a function.  If it is a string, then use that.  If
+it is a function, then call that with OBJ as the only argument.
+That function must return a string, which is then used as the
+prompt.
+
+Otherwise, if the value of either the `argument' or `variable'
+slot of OBJ is a string, then base the prompt on that (preferring
+the former), appending either \"=\" (if it appears to be a
+command-line option) or \": \".
+
+Finally fall through to using \"(BUG: no prompt): \" as the
+prompt."
+  (if-let ((prompt (oref obj prompt)))
+      (let ((prompt (if (functionp prompt)
+                        (funcall prompt obj)
+                      prompt)))
+        (if (stringp prompt)
+            prompt
+          "(BUG: no prompt): "))
+    (or (and-let* ((arg (and (slot-boundp obj 'argument) (oref obj argument))))
+          (if (and (stringp arg) (string-suffix-p "=" arg))
+              arg
+            (concat arg ": ")))
+        (and-let* ((var (and (slot-boundp obj 'variable) (oref obj variable))))
+          (and (stringp var)
+               (concat var ": ")))
+        "(BUG: no prompt): ")))
+
+;;;; Set
+
+(cl-defgeneric transient-infix-set (obj value)
+  "Set the value of infix object OBJ to VALUE.")
+
+(cl-defmethod transient-infix-set ((obj transient-infix) value)
+  "Set the value of infix object OBJ to VALUE."
+  (oset obj value value))
+
+(cl-defmethod transient-infix-set :after ((obj transient-argument) value)
+  "Unset incompatible infix arguments."
+  (when-let* ((value)
+              (val (transient-infix-value obj))
+              (arg (if (slot-boundp obj 'argument)
+                       (oref obj argument)
+                     (oref obj argument-format)))
+              (spec (oref transient--prefix incompatible))
+              (filter (lambda (x rule)
+                        (and (member x rule)
+                             (remove x rule))))
+              (incomp (nconc
+                       (cl-mapcan (apply-partially filter arg) spec)
+                       (and (not (equal val arg))
+                            (cl-mapcan (apply-partially filter val) spec)))))
+    (dolist (obj transient--suffixes)
+      (when-let* (((cl-typep obj 'transient-argument))
+                  (val (transient-infix-value obj))
+                  (arg (if (slot-boundp obj 'argument)
+                           (oref obj argument)
+                         (oref obj argument-format)))
+                  ((if (equal val arg)
+                       (member arg incomp)
+                     (or (member val incomp)
+                         (member arg incomp)))))
+        (transient-infix-set obj nil)))))
+
+(defun transient-prefix-set (value)
+  "Set the value of the active transient prefix to VALUE.
+Intended for use by transient suffix commands."
+  (oset transient--prefix value value)
+  (setq transient--refreshp 'updated-value))
+
+(cl-defgeneric transient-set-value (obj)
+  "Persist the value of the transient prefix OBJ.
+Only intended for use by `transient-set'.
+Also see `transient-prefix-set'.")
+
+(cl-defmethod transient-set-value ((obj transient-prefix))
+  (oset (oref obj prototype) value (transient-get-value))
+  (transient--history-push obj))
+
+;;;; Save
+
+(cl-defgeneric transient-save-value (obj)
+  "Save the value of the transient prefix OBJ.")
+
+(cl-defmethod transient-save-value ((obj transient-prefix))
+  (let ((value (transient-get-value)))
+    (oset (oref obj prototype) value value)
+    (setf (alist-get (oref obj command) transient-values) value)
+    (transient-save-values))
+  (transient--history-push obj))
+
+;;;; Reset
+
+(cl-defgeneric transient-reset-value (obj)
+  "Clear the set and saved values of the transient prefix OBJ.")
+
+(cl-defmethod transient-reset-value ((obj transient-prefix))
+  (let ((value (transient-default-value obj)))
+    (oset obj value value)
+    (oset (oref obj prototype) value value)
+    (setf (alist-get (oref obj command) transient-values nil 'remove) nil)
+    (transient-save-values))
+  (transient--history-push obj)
+  (mapc #'transient-init-value transient--suffixes))
+
+;;;; Get
+
+(defun transient-args (prefix)
+  "Return the value of the transient prefix command PREFIX.
+If the current command was invoked from the transient prefix
+command PREFIX, then return the active infix arguments.  If
+the current command was not invoked from PREFIX, then return
+the set, saved or default value for PREFIX."
+  (cl-mapcan #'transient--get-wrapped-value (transient-suffixes prefix)))
+
+(defun transient-suffixes (prefix)
+  "Return the suffix objects of the transient prefix command PREFIX."
+  (if (eq transient-current-command prefix)
+      transient-current-suffixes
+    (let ((transient--prefix (transient--init-prefix prefix)))
+      (transient--flatten-suffixes
+       (transient--init-suffixes prefix)))))
+
+(defun transient-get-value ()
+  (transient--with-emergency-exit :get-value
+    (cl-mapcan (lambda (obj)
+                 (and (or (not (slot-exists-p obj 'unsavable))
+                          (not (oref obj unsavable)))
+                      (transient--get-wrapped-value obj)))
+               (or transient--suffixes transient-current-suffixes))))
+
+(defun transient--get-wrapped-value (obj)
+  (and-let* ((value (transient-infix-value obj)))
+    (pcase-exhaustive (and (slot-exists-p obj 'multi-value)
+                           (oref obj multi-value))
+      ('nil          (list value))
+      ((or 't 'rest) (list value))
+      ('repeat       value))))
+
+(cl-defgeneric transient-infix-value (obj)
+  "Return the value of the suffix object OBJ.
+
+This function is called by `transient-args' (which see), meaning
+this function is how the value of a transient is determined so
+that the invoked suffix command can use it.
+
+Currently most values are strings, but that is not set in stone.
+Nil is not a value, it means \"no value\".
+
+Usually only infixes have a value, but see the method for
+`transient-suffix'.")
+
+(cl-defmethod transient-infix-value ((_   transient-suffix))
+  "Return nil, which means \"no value\".
+
+Infix arguments contribute the transient's value while suffix
+commands consume it.  This function is called for suffixes anyway
+because a command that both contributes to the transient's value
+and also consumes it is not completely unconceivable.
+
+If you define such a command, then you must define a derived
+class and implement this function because this default method
+does nothing." nil)
+
+(cl-defmethod transient-infix-value ((obj transient-infix))
+  "Return the value of OBJ's `value' slot."
+  (oref obj value))
+
+(cl-defmethod transient-infix-value ((obj transient-option))
+  "Return ARGUMENT and VALUE as a unit or nil if the latter is nil."
+  (and-let* ((value (oref obj value)))
+    (let ((arg (oref obj argument)))
+      (pcase-exhaustive (oref obj multi-value)
+        ('nil          (concat arg value))
+        ((or 't 'rest) (cons arg value))
+        ('repeat       (mapcar (lambda (v) (concat arg v)) value))))))
+
+(cl-defmethod transient-infix-value ((_   transient-variable))
+  "Return nil, which means \"no value\".
+
+Setting the value of a variable is done by, well, setting the
+value of the variable.  I.e., this is a side-effect and does
+not contribute to the value of the transient."
+  nil)
+
+;;;; Utilities
+
+(defun transient-arg-value (arg args)
+  "Return the value of ARG as it appears in ARGS.
+
+For a switch return a boolean.  For an option return the value as
+a string, using the empty string for the empty value, or nil if
+the option does not appear in ARGS."
+  (if (string-suffix-p "=" arg)
+      (save-match-data
+        (and-let* ((match (let ((case-fold-search nil)
+                                (re (format "\\`%s\\(?:=\\(.+\\)\\)?\\'"
+                                            (substring arg 0 -1))))
+                            (cl-find-if (lambda (a)
+                                          (and (stringp a)
+                                               (string-match re a)))
+                                        args))))
+          (or (match-string 1 match) "")))
+    (and (member arg args) t)))
+
+(defun transient-scope ()
+  "Return the value of the `scope' slot of the current prefix."
+  (oref (transient-prefix-object) scope))
+
+;;; History
+
+(cl-defgeneric transient--history-key (obj)
+  "Return OBJ's history key.
+If the value of the `history-key' slot is non-nil, then return
+that.  Otherwise return the value of the `command' slot."
+  (or (oref obj history-key)
+      (oref obj command)))
+
+(cl-defgeneric transient--history-push (obj)
+  "Push the current value of OBJ to its entry in `transient-history'."
+  (let ((key (transient--history-key obj)))
+    (setf (alist-get key transient-history)
+          (let ((args (transient-get-value)))
+            (cons args (delete args (alist-get key transient-history)))))))
+
+(cl-defgeneric transient--history-init (obj)
+  "Initialize OBJ's `history' slot.
+This is the transient-wide history; many individual infixes also
+have a history of their own.")
+
+(cl-defmethod transient--history-init ((obj transient-prefix))
+  "Initialize OBJ's `history' slot from the variable `transient-history'."
+  (let ((val (oref obj value)))
+    (oset obj history
+          (cons val (delete val (alist-get (transient--history-key obj)
+                                           transient-history))))))
+
+;;; Draw
+
+(defun transient--show-brief ()
+  (let ((message-log-max nil))
+    (if (and transient-show-popup (<= transient-show-popup 0))
+        (message "%s-" (key-description (this-command-keys)))
+      (message
+       "%s- [%s] %s"
+       (key-description (this-command-keys))
+       (oref transient--prefix command)
+       (mapconcat
+        #'identity
+        (sort
+         (cl-mapcan
+          (lambda (suffix)
+            (let ((key (kbd (oref suffix key))))
+              ;; Don't list any common commands.
+              (and (not (memq (oref suffix command)
+                              `(,(lookup-key transient-map key)
+                                ,(lookup-key transient-sticky-map key)
+                                ;; From transient-common-commands:
+                                transient-set
+                                transient-save
+                                transient-history-prev
+                                transient-history-next
+                                transient-quit-one
+                                transient-toggle-common
+                                transient-set-level)))
+                   (list (propertize (oref suffix key) 'face 'transient-key)))))
+          transient--suffixes)
+         #'string<)
+        (propertize "|" 'face 'transient-delimiter))))))
+
+(defun transient--show ()
+  (transient--timer-cancel)
+  (setq transient--showp t)
+  (let ((transient--shadowed-buffer (current-buffer))
+        (focus nil))
+    (setq transient--buffer (get-buffer-create transient--buffer-name))
+    (with-current-buffer transient--buffer
+      (when transient-enable-popup-navigation
+        (setq focus (or (button-get (point) 'command)
+                        (and (not (bobp))
+                             (button-get (1- (point)) 'command))
+                        (transient--heading-at-point))))
+      (erase-buffer)
+      (run-hooks 'transient-setup-buffer-hook)
+      (when transient-force-fixed-pitch
+        (transient--force-fixed-pitch))
+      (setq window-size-fixed t)
+      (when (bound-and-true-p tab-line-format)
+        (setq tab-line-format nil))
+      (setq header-line-format nil)
+      (setq mode-line-format
+            (if (or (natnump transient-mode-line-format)
+                    (eq transient-mode-line-format 'line))
+                nil
+              transient-mode-line-format))
+      (setq mode-line-buffer-identification
+            (symbol-name (oref transient--prefix command)))
+      (if transient-enable-popup-navigation
+          (setq-local cursor-in-non-selected-windows 'box)
+        (setq cursor-type nil))
+      (setq display-line-numbers nil)
+      (setq show-trailing-whitespace nil)
+      (transient--insert-groups)
+      (when (or transient--helpp transient--editp)
+        (transient--insert-help))
+      (when-let ((line (transient--separator-line)))
+        (insert line)))
+    (unless (window-live-p transient--window)
+      (setq transient--window
+            (display-buffer transient--buffer
+                            transient-display-buffer-action)))
+    (when (window-live-p transient--window)
+      (with-selected-window transient--window
+        (set-window-parameter nil 'prev--no-other-window
+                              (window-parameter nil 'no-other-window))
+        (set-window-parameter nil 'no-other-window t)
+        (goto-char (point-min))
+        (when transient-enable-popup-navigation
+          (transient--goto-button focus))
+        (transient--fit-window-to-buffer transient--window)))))
+
+(defun transient--fit-window-to-buffer (window)
+  (let ((window-resize-pixelwise t)
+        (window-size-fixed nil))
+    (if (eq (car (window-parameter window 'quit-restore)) 'other)
+        ;; Grow but never shrink window that previously displayed
+        ;; another buffer and is going to display that again.
+        (fit-window-to-buffer window nil (window-height window))
+      (fit-window-to-buffer window nil 1))))
+
+(defun transient--separator-line ()
+  (and-let* ((height (cond ((not window-system) nil)
+                           ((natnump transient-mode-line-format)
+                            transient-mode-line-format)
+                           ((eq transient-mode-line-format 'line) 1)))
+             (face `(,@(and (>= emacs-major-version 27) '(:extend t))
+                     :background
+                     ,(or (face-foreground (transient--key-face nil 'non-suffix)
+                                           nil t)
+                          "#gray60"))))
+    (concat (propertize "__" 'face face 'display `(space :height (,height)))
+            (propertize "\n" 'face face 'line-height t))))
+
+(defmacro transient-with-shadowed-buffer (&rest body)
+  "While in the transient buffer, temporarily make the shadowed buffer current."
+  (declare (indent 0) (debug t))
+  `(with-current-buffer (or transient--shadowed-buffer (current-buffer))
+     ,@body))
+
+(defun transient--insert-groups ()
+  (let ((groups (cl-mapcan (lambda (group)
+                             (let ((hide (oref group hide)))
+                               (and (not (and (functionp hide)
+                                              (transient-with-shadowed-buffer
+                                                (funcall hide))))
+                                    (list group))))
+                           transient--layout)))
+    (while-let ((group (pop groups)))
+      (transient--insert-group group)
+      (when groups
+        (insert ?\n)))))
+
+(defvar transient--max-group-level 1)
+
+(cl-defgeneric transient--insert-group (group)
+  "Format GROUP and its elements and insert the result.")
+
+(cl-defmethod transient--insert-group :around ((group transient-group))
+  "Insert GROUP's description, if any."
+  (when-let ((desc (transient-with-shadowed-buffer
+                     (transient-format-description group))))
+    (insert desc ?\n))
+  (let ((transient--max-group-level
+         (max (oref group level) transient--max-group-level))
+        (transient--pending-group group))
+    (cl-call-next-method group)))
+
+(cl-defmethod transient--insert-group ((group transient-row))
+  (transient--maybe-pad-keys group)
+  (dolist (suffix (oref group suffixes))
+    (insert (transient-with-shadowed-buffer (transient-format suffix)))
+    (insert "   "))
+  (insert ?\n))
+
+(cl-defmethod transient--insert-group ((group transient-column)
+                                       &optional skip-empty)
+  (transient--maybe-pad-keys group)
+  (dolist (suffix (oref group suffixes))
+    (let ((str (transient-with-shadowed-buffer (transient-format suffix))))
+      (unless (and (not skip-empty) (equal str ""))
+        (insert str)
+        (unless (string-match-p ".\n\\'" str)
+          (insert ?\n))))))
+
+(cl-defmethod transient--insert-group ((group transient-columns))
+  (if transient-force-single-column
+      (dolist (group (oref group suffixes))
+        (transient--insert-group group t))
+    (let* ((columns
+            (mapcar
+             (lambda (column)
+               (transient--maybe-pad-keys column group)
+               (transient-with-shadowed-buffer
+                 `(,@(and-let* ((desc (transient-format-description column)))
+                       (list desc))
+                   ,@(let ((transient--pending-group column))
+                       (mapcar #'transient-format (oref column suffixes))))))
+             (oref group suffixes)))
+           (stops (transient--column-stops columns)))
+      (dolist (row (apply #'transient--mapn #'list columns))
+        (let ((stops stops))
+          (dolist (cell row)
+            (let ((stop (pop stops)))
+              (when cell
+                (transient--align-to stop)
+                (insert cell)))))
+        (insert ?\n)))))
+
+(cl-defmethod transient--insert-group ((group transient-subgroups))
+  (let ((subgroups (oref group suffixes)))
+    (while-let ((subgroup (pop subgroups)))
+      (transient--maybe-pad-keys subgroup group)
+      (transient--insert-group subgroup)
+      (when subgroups
+        (insert ?\n)))))
+
+(cl-defgeneric transient-format (obj)
+  "Format and return OBJ for display.
+
+When this function is called, then the current buffer is some
+temporary buffer.  If you need the buffer from which the prefix
+command was invoked to be current, then do so by temporarily
+making `transient--original-buffer' current.")
+
+(cl-defmethod transient-format ((arg string))
+  "Return the string ARG after applying the `transient-heading' face."
+  (propertize arg 'face 'transient-heading))
+
+(cl-defmethod transient-format ((_   null))
+  "Return a string containing just the newline character."
+  "\n")
+
+(cl-defmethod transient-format ((arg integer))
+  "Return a string containing just the ARG character."
+  (char-to-string arg))
+
+(cl-defmethod transient-format :around ((obj transient-suffix))
+  "Add additional formatting if appropriate.
+When reading user input for this infix, then highlight it.
+When edit-mode is enabled, then prepend the level information.
+When `transient-enable-popup-navigation' is non-nil then format
+as a button."
+  (let ((str (cl-call-next-method obj)))
+    (when (and (cl-typep obj 'transient-infix)
+               (eq (oref obj command) this-original-command)
+               (active-minibuffer-window))
+      (setq str (transient--add-face str 'transient-active-infix)))
+    (when transient--editp
+      (setq str (concat (let ((level (oref obj level)))
+                          (propertize (format " %s " level)
+                                      'face (if (transient--use-level-p level t)
+                                                'transient-enabled-suffix
+                                              'transient-disabled-suffix)))
+                        str)))
+    (when (and transient-enable-popup-navigation
+               (slot-boundp obj 'command))
+      (setq str (make-text-button str nil
+                                  'type 'transient
+                                  'command (oref obj command))))
+    str))
+
+(cl-defmethod transient-format ((obj transient-infix))
+  "Return a string generated using OBJ's `format'.
+%k is formatted using `transient-format-key'.
+%d is formatted using `transient-format-description'.
+%v is formatted using `transient-format-value'."
+  (format-spec (oref obj format)
+               `((?k . ,(transient-format-key obj))
+                 (?d . ,(transient-format-description obj))
+                 (?v . ,(transient-format-value obj)))))
+
+(cl-defmethod transient-format ((obj transient-suffix))
+  "Return a string generated using OBJ's `format'.
+%k is formatted using `transient-format-key'.
+%d is formatted using `transient-format-description'."
+  (format-spec (oref obj format)
+               `((?k . ,(transient-format-key obj))
+                 (?d . ,(transient-format-description obj)))))
+
+(cl-defgeneric transient-format-key (obj)
+  "Format OBJ's `key' for display and return the result.")
+
+(cl-defmethod transient-format-key :around ((obj transient-suffix))
+  "Add `transient-inapt-suffix' face if suffix is inapt."
+  (let ((str (cl-call-next-method)))
+    (if (oref obj inapt)
+        (transient--add-face str 'transient-inapt-suffix)
+      str)))
+
+(cl-defmethod transient-format-key ((obj transient-suffix))
+  "Format OBJ's `key' for display and return the result."
+  (let ((key (if (slot-boundp obj 'key) (oref obj key) ""))
+        (cmd (and (slot-boundp obj 'command) (oref obj command))))
+    (when-let ((width (oref transient--pending-group pad-keys)))
+      (setq key (truncate-string-to-width key width nil ?\s)))
+    (if transient--redisplay-key
+        (let ((len (length transient--redisplay-key))
+              (seq (cl-coerce (edmacro-parse-keys key t) 'list)))
+          (cond
+           ((member (seq-take seq len)
+                    (list transient--redisplay-key
+                          (thread-last transient--redisplay-key
+                            (cl-substitute ?- 'kp-subtract)
+                            (cl-substitute ?= 'kp-equal)
+                            (cl-substitute ?+ 'kp-add))))
+            (let ((pre (key-description (vconcat (seq-take seq len))))
+                  (suf (key-description (vconcat (seq-drop seq len)))))
+              (setq pre (string-replace "RET" "C-m" pre))
+              (setq pre (string-replace "TAB" "C-i" pre))
+              (setq suf (string-replace "RET" "C-m" suf))
+              (setq suf (string-replace "TAB" "C-i" suf))
+              ;; We use e.g., "-k" instead of the more correct "- k",
+              ;; because the former is prettier.  If we did that in
+              ;; the definition, then we want to drop the space that
+              ;; is reinserted above.  False-positives are possible
+              ;; for silly bindings like "-C-c C-c".
+              (unless (string-search " " key)
+                (setq pre (string-replace " " "" pre))
+                (setq suf (string-replace " " "" suf)))
+              (concat (propertize pre 'face 'transient-unreachable-key)
+                      (and (string-prefix-p (concat pre " ") key) " ")
+                      (propertize suf 'face (transient--key-face cmd))
+                      (save-excursion
+                        (and (string-match " +\\'" key)
+                             (propertize (match-string 0 key)
+                                         'face 'fixed-pitch))))))
+           ((transient--lookup-key transient-sticky-map (kbd key))
+            (propertize key 'face (transient--key-face cmd)))
+           (t
+            (propertize key 'face 'transient-unreachable-key))))
+      (propertize key 'face (transient--key-face cmd)))))
+
+(cl-defmethod transient-format-key :around ((obj transient-argument))
+  "Handle `transient-highlight-mismatched-keys'."
+  (let ((key (cl-call-next-method obj)))
+    (cond
+     ((not transient-highlight-mismatched-keys) key)
+     ((not (slot-boundp obj 'shortarg))
+      (transient--add-face key 'transient-nonstandard-key))
+     ((not (string-equal key (oref obj shortarg)))
+      (transient--add-face key 'transient-mismatched-key))
+     (key))))
+
+(cl-defgeneric transient-format-description (obj)
+  "Format OBJ's `description' for display and return the result.")
+
+(cl-defmethod transient-format-description ((obj transient-suffix))
+  "The `description' slot may be a function, in which case that is
+called inside the correct buffer (see `transient--insert-group')
+and its value is returned to the caller."
+  (transient--get-description obj))
+
+(cl-defmethod transient-format-description ((obj transient-value-preset))
+  (pcase-let* (((eieio description key set) obj)
+               ((eieio value) transient--prefix)
+               (active (seq-set-equal-p set value)))
+    (format
+     "%s %s"
+     (propertize (or description (format "Preset %s" key))
+                 'face (and active 'transient-argument))
+     (format (propertize "(%s)" 'face 'transient-delimiter)
+             (mapconcat (lambda (arg)
+                          (propertize
+                           arg 'face (cond (active 'transient-argument)
+                                           ((member arg value)
+                                            '((:weight demibold)
+                                              transient-inactive-argument))
+                                           ('transient-inactive-argument))))
+                        set " ")))))
+
+(cl-defmethod transient-format-description ((obj transient-group))
+  "Format the description by calling the next method.
+If the result doesn't use the `face' property at all, then apply the
+face `transient-heading' to the complete string."
+  (and-let* ((desc (transient--get-description obj)))
+    (cond ((oref obj inapt)
+           (propertize desc 'face 'transient-inapt-suffix))
+          ((text-property-not-all 0 (length desc) 'face nil desc)
+           desc)
+          ((propertize desc 'face 'transient-heading)))))
+
+(cl-defmethod transient-format-description :around ((obj transient-suffix))
+  "Format the description by calling the next method.
+If the result is nil, then use \"(BUG: no description)\" as the
+description.  If the OBJ's `key' is currently unreachable, then
+apply the face `transient-unreachable' to the complete string."
+  (let ((desc (or (cl-call-next-method obj)
+                  (and (slot-boundp transient--prefix 'suffix-description)
+                       (funcall (oref transient--prefix suffix-description)
+                                obj)))))
+    (if desc
+        (when-let ((face (transient--get-face obj 'face)))
+          (setq desc (transient--add-face desc face t)))
+      (setq desc (propertize "(BUG: no description)" 'face 'error)))
+    (when (if transient--all-levels-p
+              (> (oref obj level) transient--default-prefix-level)
+            (and transient-highlight-higher-levels
+                 (> (max (oref obj level) transient--max-group-level)
+                    transient--default-prefix-level)))
+      (setq desc (transient--add-face desc 'transient-higher-level)))
+    (when-let ((inapt-face (and (oref obj inapt)
+                                (transient--get-face obj 'inapt-face))))
+      (setq desc (transient--add-face desc inapt-face)))
+    (when (and (slot-boundp obj 'key)
+               (transient--key-unreachable-p obj))
+      (setq desc (transient--add-face desc 'transient-unreachable)))
+    desc))
+
+(cl-defgeneric transient-format-value (obj)
+  "Format OBJ's value for display and return the result.")
+
+(cl-defmethod transient-format-value ((obj transient-suffix))
+  (propertize (oref obj argument)
+              'face (if (oref obj value)
+                        'transient-argument
+                      'transient-inactive-argument)))
+
+(cl-defmethod transient-format-value ((obj transient-option))
+  (let ((argument (oref obj argument)))
+    (if-let ((value (oref obj value)))
+        (pcase-exhaustive (oref obj multi-value)
+          ('nil
+           (concat (propertize argument 'face 'transient-argument)
+                   (propertize value    'face 'transient-value)))
+          ((or 't 'rest)
+           (concat (propertize (if (string-suffix-p " " argument)
+                                   argument
+                                 (concat argument " "))
+                               'face 'transient-argument)
+                   (propertize (mapconcat #'prin1-to-string value " ")
+                               'face 'transient-value)))
+          ('repeat
+           (mapconcat (lambda (value)
+                        (concat (propertize argument 'face 'transient-argument)
+                                (propertize value    'face 'transient-value)))
+                      value " ")))
+      (propertize argument 'face 'transient-inactive-argument))))
+
+(cl-defmethod transient-format-value ((obj transient-switches))
+  (with-slots (value argument-format choices) obj
+    (format (propertize argument-format
+                        'face (if value
+                                  'transient-argument
+                                'transient-inactive-argument))
+            (format
+             (propertize "[%s]" 'face 'transient-delimiter)
+             (mapconcat
+              (lambda (choice)
+                (propertize choice 'face
+                            (if (equal (format argument-format choice) value)
+                                'transient-value
+                              'transient-inactive-value)))
+              choices
+              (propertize "|" 'face 'transient-delimiter))))))
+
+(cl-defmethod transient--get-description ((obj transient-child))
+  (and-let* ((desc (oref obj description)))
+    (if (functionp desc)
+        (if (= (car (transient--func-arity desc)) 1)
+            (funcall desc obj)
+          (funcall desc))
+      desc)))
+
+(cl-defmethod transient--get-face ((obj transient-suffix) slot)
+  (and-let* (((slot-boundp obj slot))
+             (face (slot-value obj slot)))
+    (if (and (not (facep face))
+             (functionp face))
+        (let ((transient--pending-suffix obj))
+          (if (= (car (transient--func-arity face)) 1)
+              (funcall face obj)
+            (funcall face)))
+      face)))
+
+(defun transient--add-face (string face &optional append beg end)
+  (let ((str (copy-sequence string)))
+    (add-face-text-property (or beg 0) (or end (length str)) face append str)
+    str))
+
+(defun transient--key-face (&optional cmd enforce-type)
+  (or (and transient-semantic-coloring
+           (not transient--helpp)
+           (not transient--editp)
+           (or (and cmd (get cmd 'transient-face))
+               (get (transient--get-pre-command cmd enforce-type)
+                    'transient-face)))
+      (if cmd 'transient-key 'transient-key-noop)))
+
+(defun transient--key-unreachable-p (obj)
+  (and transient--redisplay-key
+       (let ((key (oref obj key)))
+         (not (or (equal (seq-take (cl-coerce (edmacro-parse-keys key t) 'list)
+                                   (length transient--redisplay-key))
+                         transient--redisplay-key)
+                  (transient--lookup-key transient-sticky-map (kbd key)))))))
+
+(defun transient--lookup-key (keymap key)
+  (let ((val (lookup-key keymap key)))
+    (and val (not (integerp val)) val)))
+
+(defun transient--maybe-pad-keys (group &optional parent)
+  (when-let ((pad (or (oref group pad-keys)
+                      (and parent (oref parent pad-keys)))))
+    (oset group pad-keys
+          (apply #'max
+                 (if (integerp pad) pad 0)
+                 (seq-keep (lambda (suffix)
+                             (and (eieio-object-p suffix)
+                                  (slot-boundp suffix 'key)
+                                  (length (oref suffix key))))
+                           (oref group suffixes))))))
+
+(defun transient--pixel-width (string)
+  (save-window-excursion
+    (with-temp-buffer
+      (insert string)
+      (set-window-dedicated-p nil nil)
+      (set-window-buffer nil (current-buffer))
+      (car (window-text-pixel-size
+            nil (line-beginning-position) (point))))))
+
+(defun transient--column-stops (columns)
+  (let* ((var-pitch (or transient-align-variable-pitch
+                        (oref transient--prefix variable-pitch)))
+         (char-width (and var-pitch (transient--pixel-width " "))))
+    (transient--seq-reductions-from
+     (apply-partially #'+ (* 2 (if var-pitch char-width 1)))
+     (transient--mapn
+      (lambda (cells min)
+        (apply #'max
+               (if min (if var-pitch (* min char-width) min) 0)
+               (mapcar (if var-pitch #'transient--pixel-width #'length) cells)))
+      columns
+      (oref transient--prefix column-widths))
+     0)))
+
+(defun transient--align-to (stop)
+  (unless (zerop stop)
+    (insert (if (or transient-align-variable-pitch
+                    (oref transient--prefix variable-pitch))
+                (propertize " " 'display `(space :align-to (,stop)))
+              (make-string (max 0 (- stop (current-column))) ?\s)))))
+
+(defun transient-command-summary-or-name (obj)
+  "Return the summary or name of the command represented by OBJ.
+
+If the command has a doc-string, then return the first line of
+that, else its name.
+
+Intended to be temporarily used as the `:suffix-description' of
+a prefix command, while porting a regular keymap to a transient."
+  (let ((command (oref obj command)))
+    (if-let ((doc (documentation command)))
+        (propertize (car (split-string doc "\n")) 'face 'font-lock-doc-face)
+      (propertize (symbol-name command) 'face 'font-lock-function-name-face))))
+
+;;; Help
+
+(cl-defgeneric transient-show-help (obj)
+  "Show documentation for the command represented by OBJ.")
+
+(cl-defmethod transient-show-help ((obj transient-prefix))
+  "Call `show-help' if non-nil, else show `info-manual',
+if non-nil, else show the `man-page' if non-nil, else use
+`describe-function'."
+  (with-slots (show-help info-manual man-page command) obj
+    (cond (show-help (funcall show-help obj))
+          (info-manual (transient--show-manual info-manual))
+          (man-page (transient--show-manpage man-page))
+          ((transient--describe-function command)))))
+
+(cl-defmethod transient-show-help ((obj transient-suffix))
+  "Call `show-help' if non-nil, else use `describe-function'.
+Also used to dispatch showing documentation for the current
+prefix.  If the suffix is a sub-prefix, then also call the
+prefix method."
+  (cond
+   ((eq this-command 'transient-help)
+    (transient-show-help transient--prefix))
+   ((let ((prefix (get (oref obj command)
+                       'transient--prefix)))
+      (and prefix (not (eq (oref transient--prefix command) this-command))
+           (prog1 t (transient-show-help prefix)))))
+   ((if-let ((show-help (oref obj show-help)))
+        (funcall show-help obj)
+      (transient--describe-function this-command)))))
+
+(cl-defmethod transient-show-help ((obj transient-infix))
+  "Call `show-help' if non-nil, else show the `man-page'
+if non-nil, else use `describe-function'.  When showing the
+manpage, then try to jump to the correct location."
+  (if-let ((show-help (oref obj show-help)))
+      (funcall show-help obj)
+    (if-let ((man-page (oref transient--prefix man-page))
+             (argument (and (slot-boundp obj 'argument)
+                            (oref obj argument))))
+        (transient--show-manpage man-page argument)
+      (transient--describe-function this-command))))
+
+;; `cl-generic-generalizers' doesn't support `command' et al.
+(cl-defmethod transient-show-help (cmd)
+  "Show the command doc-string."
+  (transient--describe-function cmd))
+
+(defmacro transient-with-help-window (&rest body)
+  "Evaluate BODY, send output to *Help* buffer, and display it in a window.
+Select the help window, and make the help buffer current and return it."
+  (declare (indent 0))
+  `(let ((buffer nil)
+         (help-window-select t))
+     (with-help-window (help-buffer)
+       ,@body
+       (setq buffer (current-buffer)))
+     (set-buffer buffer)))
+
+(defun transient--describe-function (fn)
+  (let* ((buffer nil)
+         (help-window-select t)
+         (temp-buffer-window-setup-hook
+          (cons (lambda () (setq buffer (current-buffer)))
+                temp-buffer-window-setup-hook)))
+    (describe-function fn)
+    (set-buffer buffer)))
+
+(defun transient--show-manual (manual)
+  (info manual))
+
+(defun transient--show-manpage (manpage &optional argument)
+  (require 'man)
+  (let* ((Man-notify-method 'meek)
+         (buf (Man-getpage-in-background manpage))
+         (proc (get-buffer-process buf)))
+    (while (and proc (eq (process-status proc) 'run))
+      (accept-process-output proc))
+    (switch-to-buffer buf)
+    (when argument
+      (transient--goto-argument-description argument))))
+
+(defun transient--goto-argument-description (arg)
+  (goto-char (point-min))
+  (let ((case-fold-search nil)
+        ;; This matches preceding/proceeding options.  Options
+        ;; such as "-a", "-S[<keyid>]", and "--grep=<pattern>"
+        ;; are matched by this regex without the shy group.
+        ;; The ". " in the shy group is for options such as
+        ;; "-m parent-number", and the "-[^[:space:]]+ " is
+        ;; for options such as "--mainline parent-number"
+        (others "-\\(?:. \\|-[^[:space:]]+ \\)?[^[:space:]]+"))
+    (when (re-search-forward
+           (if (equal arg "--")
+               ;; Special case.
+               "^[\t\s]+\\(--\\(?: \\|$\\)\\|\\[--\\]\\)"
+             ;; Should start with whitespace and may have
+             ;; any number of options before and/or after.
+             (format
+              "^[\t\s]+\\(?:%s, \\)*?\\(?1:%s\\)%s\\(?:, %s\\)*$"
+              others
+              ;; Options don't necessarily end in an "="
+              ;; (e.g., "--gpg-sign[=<keyid>]")
+              (string-remove-suffix "=" arg)
+              ;; Simple options don't end in an "=".  Splitting this
+              ;; into 2 cases should make getting false positives
+              ;; less likely.
+              (if (string-suffix-p "=" arg)
+                  ;; "[^[:space:]]*[^.[:space:]]" matches the option
+                  ;; value, which is usually after the option name
+                  ;; and either '=' or '[='.  The value can't end in
+                  ;; a period, as that means it's being used at the
+                  ;; end of a sentence.  The space is for options
+                  ;; such as '--mainline parent-number'.
+                  "\\(?: \\|\\[?=\\)[^[:space:]]*[^.[:space:]]"
+                ;; Either this doesn't match anything (e.g., "-a"),
+                ;; or the option is followed by a value delimited
+                ;; by a "[", "<", or ":".  A space might appear
+                ;; before this value, as in "-f <file>".  The
+                ;; space alternative is for options such as
+                ;; "-m parent-number".
+                "\\(?:\\(?: \\| ?[\\[<:]\\)[^[:space:]]*[^.[:space:]]\\)?")
+              others))
+           nil t)
+      (goto-char (match-beginning 1)))))
+
+(defun transient--insert-help ()
+  (unless (looking-back "\n\n" 2)
+    (insert "\n"))
+  (when transient--helpp
+    (insert
+     (format (propertize "\
+Type a %s to show help for that suffix command, or %s to show manual.
+Type %s to exit help.\n"
+                         'face 'transient-heading)
+             (propertize "<KEY>" 'face 'transient-key)
+             (propertize "?"     'face 'transient-key)
+             (propertize "C-g"   'face 'transient-key))))
+  (when transient--editp
+    (unless transient--helpp
+      (insert
+       (format (propertize "\
+Type a %s to set level for that suffix command.
+Type %s to set what levels are available for this prefix command.\n"
+                           'face 'transient-heading)
+               (propertize "<KEY>" 'face 'transient-key)
+               (propertize "C-x l" 'face 'transient-key))))
+    (with-slots (level) transient--prefix
+      (insert
+       (format (propertize "
+Suffixes on levels %s are available.
+Suffixes on levels %s and %s are unavailable.\n"
+                           'face 'transient-heading)
+               (propertize (format "1-%s" level)
+                           'face 'transient-enabled-suffix)
+               (propertize " 0 "
+                           'face 'transient-disabled-suffix)
+               (propertize (format ">=%s" (1+ level))
+                           'face 'transient-disabled-suffix))))))
+
+;;; Popup Navigation
+
+(defun transient-scroll-up (&optional arg)
+  "Scroll text of transient popup window upward ARG lines.
+If ARG is nil scroll near full screen.  This is a wrapper
+around `scroll-up-command' (which see)."
+  (interactive "^P")
+  (with-selected-window transient--window
+    (scroll-up-command arg)))
+
+(defun transient-scroll-down (&optional arg)
+  "Scroll text of transient popup window down ARG lines.
+If ARG is nil scroll near full screen.  This is a wrapper
+around `scroll-down-command' (which see)."
+  (interactive "^P")
+  (with-selected-window transient--window
+    (scroll-down-command arg)))
+
+(defun transient-backward-button (n)
+  "Move to the previous button in the transient popup buffer.
+See `backward-button' for information about N."
+  (interactive "p")
+  (with-selected-window transient--window
+    (backward-button n t)))
+
+(defun transient-forward-button (n)
+  "Move to the next button in the transient popup buffer.
+See `forward-button' for information about N."
+  (interactive "p")
+  (with-selected-window transient--window
+    (forward-button n t)))
+
+(define-button-type 'transient
+  'face nil
+  'keymap transient-button-map)
+
+(defun transient--goto-button (command)
+  (cond
+   ((stringp command)
+    (when (re-search-forward (concat "^" (regexp-quote command)) nil t)
+      (goto-char (match-beginning 0))))
+   (command
+    (while (and (ignore-errors (forward-button 1))
+                (not (eq (button-get (button-at (point)) 'command) command))))
+    (unless (eq (button-get (button-at (point)) 'command) command)
+      (goto-char (point-min))
+      (forward-button 1)))))
+
+(defun transient--heading-at-point ()
+  (and (eq (get-text-property (point) 'face) 'transient-heading)
+       (let ((beg (line-beginning-position)))
+         (buffer-substring-no-properties
+          beg (next-single-property-change
+               beg 'face nil (line-end-position))))))
+
+;;; Compatibility
+;;;; Popup Isearch
+
+(defvar-keymap transient--isearch-mode-map
+  :parent isearch-mode-map
+  "<remap> <isearch-exit>"   #'transient-isearch-exit
+  "<remap> <isearch-cancel>" #'transient-isearch-cancel
+  "<remap> <isearch-abort>"  #'transient-isearch-abort)
+
+(defun transient-isearch-backward (&optional regexp-p)
+  "Do incremental search backward.
+With a prefix argument, do an incremental regular expression
+search instead."
+  (interactive "P")
+  (transient--isearch-setup)
+  (let ((isearch-mode-map transient--isearch-mode-map))
+    (isearch-mode nil regexp-p)))
+
+(defun transient-isearch-forward (&optional regexp-p)
+  "Do incremental search forward.
+With a prefix argument, do an incremental regular expression
+search instead."
+  (interactive "P")
+  (transient--isearch-setup)
+  (let ((isearch-mode-map transient--isearch-mode-map))
+    (isearch-mode t regexp-p)))
+
+(defun transient-isearch-exit ()
+  "Like `isearch-exit' but adapted for `transient'."
+  (interactive)
+  (isearch-exit)
+  (transient--isearch-exit))
+
+(defun transient-isearch-cancel ()
+  "Like `isearch-cancel' but adapted for `transient'."
+  (interactive)
+  (condition-case nil (isearch-cancel) (quit))
+  (transient--isearch-exit))
+
+(defun transient-isearch-abort ()
+  "Like `isearch-abort' but adapted for `transient'."
+  (interactive)
+  (let ((around (lambda (fn)
+                  (condition-case nil (funcall fn) (quit))
+                  (transient--isearch-exit))))
+    (advice-add 'isearch-cancel :around around)
+    (unwind-protect
+        (isearch-abort)
+      (advice-remove 'isearch-cancel around))))
+
+(defun transient--isearch-setup ()
+  (select-window transient--window)
+  (transient--suspend-override t))
+
+(defun transient--isearch-exit ()
+  (select-window transient--original-window)
+  (transient--resume-override))
+
+;;;; Edebug
+
+(defun transient--edebug-command-p ()
+  (and (bound-and-true-p edebug-active)
+       (or (memq this-command '(top-level abort-recursive-edit))
+           (string-prefix-p "edebug" (symbol-name this-command)))))
+
+;;;; Miscellaneous
+
+(cl-pushnew (list nil (concat "^\\s-*("
+                              (eval-when-compile
+                                (regexp-opt
+                                 '("transient-define-prefix"
+                                   "transient-define-suffix"
+                                   "transient-define-infix"
+                                   "transient-define-argument")
+                                 t))
+                              "\\s-+\\(" lisp-mode-symbol-regexp "\\)")
+                  2)
+            lisp-imenu-generic-expression :test #'equal)
+
+(declare-function which-key-mode "which-key" (&optional arg))
+
+(defun transient--suspend-which-key-mode ()
+  (when (bound-and-true-p which-key-mode)
+    (which-key-mode -1)
+    (add-hook 'transient-exit-hook #'transient--resume-which-key-mode)))
+
+(defun transient--resume-which-key-mode ()
+  (unless transient--prefix
+    (which-key-mode 1)
+    (remove-hook 'transient-exit-hook #'transient--resume-which-key-mode)))
+
+(defun transient-bind-q-to-quit ()
+  "Modify some keymaps to bind \"q\" to the appropriate quit command.
+
+\"C-g\" is the default binding for such commands now, but Transient's
+predecessor Magit-Popup used \"q\" instead.  If you would like to get
+that binding back, then call this function in your init file like so:
+
+  (with-eval-after-load \\='transient
+    (transient-bind-q-to-quit))
+
+Individual transients may already bind \"q\" to something else
+and such a binding would shadow the quit binding.  If that is the
+case then \"Q\" is bound to whatever \"q\" would have been bound
+to by setting `transient-substitute-key-function' to a function
+that does that.  Of course \"Q\" may already be bound to something
+else, so that function binds \"M-q\" to that command instead.
+Of course \"M-q\" may already be bound to something else, but
+we stop there."
+  (keymap-set transient-base-map   "q" #'transient-quit-one)
+  (keymap-set transient-sticky-map "q" #'transient-quit-seq)
+  (setq transient-substitute-key-function
+        #'transient-rebind-quit-commands))
+
+(defun transient-rebind-quit-commands (obj)
+  "See `transient-bind-q-to-quit'."
+  (let ((key (oref obj key)))
+    (cond ((string-equal key "q") "Q")
+          ((string-equal key "Q") "M-q")
+          (key))))
+
+(defun transient--force-fixed-pitch ()
+  (require 'face-remap)
+  (face-remap-reset-base 'default)
+  (face-remap-add-relative 'default 'fixed-pitch))
+
+(defun transient--func-arity (fn)
+  (func-arity (advice--cd*r (if (symbolp fn) (symbol-function fn) fn))))
+
+(defun transient--seq-reductions-from (function sequence initial-value)
+  (let ((acc (list initial-value)))
+    (seq-doseq (elt sequence)
+      (push (funcall function (car acc) elt) acc))
+    (nreverse acc)))
+
+(defun transient--mapn (function &rest lists)
+  "Apply FUNCTION to elements of LISTS.
+Like `cl-mapcar' but while that stops when the shortest list
+is exhausted, continue until the longest list is, using nil
+as stand-in for elements of exhausted lists."
+  (let (result)
+    (while (catch 'more (mapc (lambda (l) (and l (throw 'more t))) lists) nil)
+      (push (apply function (mapcar #'car-safe lists)) result)
+      (setq lists (mapcar #'cdr lists)))
+    (nreverse result)))
+
+;;; Font-Lock
+
+(defconst transient-font-lock-keywords
+  (eval-when-compile
+    `((,(concat "("
+                (regexp-opt (list "transient-define-prefix"
+                                  "transient-define-infix"
+                                  "transient-define-argument"
+                                  "transient-define-suffix")
+                            t)
+                "\\_>[ \t'(]*"
+                "\\(\\(?:\\sw\\|\\s_\\)+\\)?")
+       (1 'font-lock-keyword-face)
+       (2 'font-lock-function-name-face nil t)))))
+
+(font-lock-add-keywords 'emacs-lisp-mode transient-font-lock-keywords)
+
+;;; Auxiliary Classes
+;;;; `transient-lisp-variable'
+
+(defclass transient-lisp-variable (transient-variable)
+  ((reader :initform #'transient-lisp-variable--reader)
+   (always-read :initform t)
+   (set-value :initarg :set-value :initform #'set))
+  "[Experimental] Class used for Lisp variables.")
+
+(cl-defmethod transient-init-value ((obj transient-lisp-variable))
+  (oset obj value (symbol-value (oref obj variable))))
+
+(cl-defmethod transient-infix-set ((obj transient-lisp-variable) value)
+  (funcall (oref obj set-value)
+           (oref obj variable)
+           (oset obj value value)))
+
+(cl-defmethod transient-format-description ((obj transient-lisp-variable))
+  (or (cl-call-next-method obj)
+      (symbol-name (oref obj variable))))
+
+(cl-defmethod transient-format-value ((obj transient-lisp-variable))
+  (propertize (prin1-to-string (oref obj value))
+              'face 'transient-value))
+
+(cl-defmethod transient-prompt ((obj transient-lisp-variable))
+  (if (and (slot-boundp obj 'prompt)
+           (oref obj prompt))
+      (cl-call-next-method obj)
+    (format "Set %s: " (oref obj variable))))
+
+(defun transient-lisp-variable--reader (prompt initial-input _history)
+  (read--expression prompt initial-input))
+
+;;; _
+(provide 'transient)
+;; Local Variables:
+;; indent-tabs-mode: nil
+;; checkdoc-symbol-words: ("command-line" "edit-mode" "help-mode")
+;; End:
+;;; transient.el ends here
diff --git a/emacs/elpa/transient-20241001.1031/transient.elc b/emacs/elpa/transient-20241001.1031/transient.elc
Binary files differ.
diff --git a/emacs/elpa/transient-20241001.1031/transient.info b/emacs/elpa/transient-20241001.1031/transient.info
@@ -0,0 +1,3331 @@
+This is transient.info, produced by makeinfo version 6.8 from
+transient.texi.
+
+     Copyright (C) 2018–2024 Free Software Foundation, Inc.
+
+     You can redistribute this document and/or modify it under the terms
+     of the GNU General Public License as published by the Free Software
+     Foundation, either version 3 of the License, or (at your option)
+     any later version.
+
+     This document is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+
+INFO-DIR-SECTION Emacs misc features
+START-INFO-DIR-ENTRY
+* Transient: (transient). Transient Commands.
+END-INFO-DIR-ENTRY
+
+
+File: transient.info,  Node: Top,  Next: Introduction,  Up: (dir)
+
+Transient User and Developer Manual
+***********************************
+
+Transient is the library used to implement the keyboard-driven “menus”
+in Magit.  It is distributed as a separate package, so that it can be
+used to implement similar menus in other packages.
+
+   This manual can be bit hard to digest when getting started.  A useful
+resource to get over that hurdle is Psionic K’s interactive tutorial,
+available at <https://github.com/positron-solutions/transient-showcase>.
+
+This manual is for Transient version 0.7.6.
+
+     Copyright (C) 2018–2024 Free Software Foundation, Inc.
+
+     You can redistribute this document and/or modify it under the terms
+     of the GNU General Public License as published by the Free Software
+     Foundation, either version 3 of the License, or (at your option)
+     any later version.
+
+     This document is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+
+* Menu:
+
+* Introduction::
+* Usage::
+* Modifying Existing Transients::
+* Defining New Commands::
+* Classes and Methods::
+* FAQ::
+* Keystroke Index::
+* Command and Function Index::
+* Variable Index::
+* Concept Index::
+* GNU General Public License::
+
+— The Detailed Node Listing —
+
+Usage
+
+* Invoking Transients::
+* Aborting and Resuming Transients::
+* Common Suffix Commands::
+* Saving Values::
+* Using History::
+* Getting Help for Suffix Commands::
+* Enabling and Disabling Suffixes::
+* Other Commands::
+* Configuration::
+
+Defining New Commands
+
+* Technical Introduction::
+* Defining Transients::
+* Binding Suffix and Infix Commands::
+* Defining Suffix and Infix Commands::
+* Using Infix Arguments::
+* Transient State::
+
+Binding Suffix and Infix Commands
+
+* Group Specifications::
+* Suffix Specifications::
+
+
+Classes and Methods
+
+* Group Classes::
+* Group Methods::
+* Prefix Classes::
+* Suffix Classes::
+* Suffix Methods::
+* Prefix Slots::
+* Suffix Slots::
+* Predicate Slots::
+
+Suffix Methods
+
+* Suffix Value Methods::
+* Suffix Format Methods::
+
+
+
+
+File: transient.info,  Node: Introduction,  Next: Usage,  Prev: Top,  Up: Top
+
+1 Introduction
+**************
+
+Transient is the library used to implement the keyboard-driven “menus”
+in Magit.  It is distributed as a separate package, so that it can be
+used to implement similar menus in other packages.
+
+   This manual can be bit hard to digest when getting started.  A useful
+resource to get over that hurdle is Psionic K’s interactive tutorial,
+available at <https://github.com/positron-solutions/transient-showcase>.
+
+Some things that Transient can do
+=================================
+
+   • Display current state of arguments
+   • Display and manage lifecycle of modal bindings
+   • Contextual user interface
+   • Flow control for wizard-like composition of interactive forms
+   • History & persistence
+   • Rendering arguments for controlling CLI programs
+
+Complexity in CLI programs
+==========================
+
+Complexity tends to grow with time.  How do you manage the complexity of
+commands?  Consider the humble shell command ‘ls’.  It now has over
+_fifty_ command line options.  Some of these are boolean flags (‘ls
+-l’).  Some take arguments (‘ls --sort=s’).  Some have no effect unless
+paired with other flags (‘ls -lh’).  Some are mutually exclusive.  Some
+shell commands even have so many options that they introduce
+_subcommands_ (‘git branch’, ‘git commit’), each with their own rich set
+of options (‘git branch -f’).
+
+Using Transient for composing interactive commands
+==================================================
+
+What about Emacs commands used interactively?  How do these handle
+options?  One solution is to make many versions of the same command, so
+you don’t need to!  Consider: ‘delete-other-windows’ vs.
+‘delete-other-windows-vertically’ (among many similar examples).
+
+   Some Emacs commands will simply prompt you for the next "argument"
+(‘M-x switch-to-buffer’).  Another common solution is to use prefix
+arguments which usually start with ‘C-u’.  Sometimes these are sensibly
+numerical in nature (‘C-u 4 M-x forward-paragraph’ to move forward 4
+paragraphs).  But sometimes they function instead as boolean "switches"
+(‘C-u C-SPACE’ to jump to the last mark instead of just setting it, ‘C-u
+C-u C-SPACE’ to unconditionally set the mark).  Since there aren’t many
+standards for the use of prefix options, you have to read the command’s
+documentation to find out what the possibilities are.
+
+   But when an Emacs command grows to have a truly large set of options
+and arguments, with dependencies between them, lots of option values,
+etc., these simple approaches just don’t scale.  Transient is designed
+to solve this issue.  Think of it as the humble prefix argument ‘C-u’,
+_raised to the power of 10_.  Like ‘C-u’, it is key driven.  Like the
+shell, it supports boolean "flag" options, options that take arguments,
+and even "sub-commands", with their own options.  But instead of
+searching through a man page or command documentation, well-designed
+transients _guide_ their users to the relevant set of options (and even
+their possible values!)  directly, taking into account any important
+pre-existing Emacs settings.  And while for shell commands like ‘ls’,
+there is only one way to "execute" (hit ‘Return’!), transients can
+"execute" using multiple different keys tied to one of many
+self-documenting _actions_ (imagine having 5 different colored return
+keys on your keyboard!).  Transients make navigating and setting large,
+complex groups of command options and arguments easy.  Fun even.  Once
+you’ve tried it, it’s hard to go back to the ‘C-u what can I do here
+again?’ way.
+
+
+File: transient.info,  Node: Usage,  Next: Modifying Existing Transients,  Prev: Introduction,  Up: Top
+
+2 Usage
+*******
+
+* Menu:
+
+* Invoking Transients::
+* Aborting and Resuming Transients::
+* Common Suffix Commands::
+* Saving Values::
+* Using History::
+* Getting Help for Suffix Commands::
+* Enabling and Disabling Suffixes::
+* Other Commands::
+* Configuration::
+
+
+File: transient.info,  Node: Invoking Transients,  Next: Aborting and Resuming Transients,  Up: Usage
+
+2.1 Invoking Transients
+=======================
+
+A transient prefix command is invoked like any other command by pressing
+the key that is bound to that command.  The main difference to other
+commands is that a transient prefix command activates a transient
+keymap, which temporarily binds the transient’s infix and suffix
+commands.  Bindings from other keymaps may, or may not, be disabled
+while the transient state is in effect.
+
+   There are two kinds of commands that are available after invoking a
+transient prefix command; infix and suffix commands.  Infix commands set
+some value (which is then shown in a popup buffer), without leaving the
+transient.  Suffix commands, on the other hand, usually quit the
+transient and they may use the values set by the infix commands, i.e.,
+the infix *arguments*.
+
+   Instead of setting arguments to be used by a suffix command, infix
+commands may also set some value by side-effect, e.g., by setting the
+value of some variable.
+
+
+File: transient.info,  Node: Aborting and Resuming Transients,  Next: Common Suffix Commands,  Prev: Invoking Transients,  Up: Usage
+
+2.2 Aborting and Resuming Transients
+====================================
+
+To quit the transient without invoking a suffix command press ‘C-g’.
+
+   Key bindings in transient keymaps may be longer than a single event.
+After pressing a valid prefix key, all commands whose bindings do not
+begin with that prefix key are temporarily unavailable and grayed out.
+To abort the prefix key press ‘C-g’ (which in this case only quits the
+prefix key, but not the complete transient).
+
+   A transient prefix command can be bound as a suffix of another
+transient.  Invoking such a suffix replaces the current transient state
+with a new transient state, i.e., the available bindings change and the
+information displayed in the popup buffer is updated accordingly.
+Pressing ‘C-g’ while a nested transient is active only quits the
+innermost transient, causing a return to the previous transient.
+
+   ‘C-q’ or ‘C-z’ on the other hand always exits all transients.  If you
+use the latter, then you can later resume the stack of transients using
+‘M-x transient-resume’.
+
+‘C-g’ (‘transient-quit-seq’)
+‘C-g’ (‘transient-quit-one’)
+     This key quits the currently active incomplete key sequence, if
+     any, or else the current transient.  When quitting the current
+     transient, it returns to the previous transient, if any.
+
+   Transient’s predecessor bound ‘q’ instead of ‘C-g’ to the quit
+command.  To learn how to get that binding back see
+‘transient-bind-q-to-quit’’s documentation string.
+
+‘C-q’ (‘transient-quit-all’)
+     This command quits the currently active incomplete key sequence, if
+     any, and all transients, including the active transient and all
+     suspended transients, if any.
+
+‘C-z’ (‘transient-suspend’)
+     Like ‘transient-quit-all’, this command quits an incomplete key
+     sequence, if any, and all transients.  Additionally, it saves the
+     stack of transients so that it can easily be resumed (which is
+     particularly useful if you quickly need to do “something else” and
+     the stack is deeper than a single transient, and/or you have
+     already changed the values of some infix arguments).
+
+     Note that only a single stack of transients can be saved at a time.
+     If another stack is already saved, then saving a new stack discards
+     the previous stack.
+
+‘M-x transient-resume’
+     This command resumes the previously suspended stack of transients,
+     if any.
+
+
+File: transient.info,  Node: Common Suffix Commands,  Next: Saving Values,  Prev: Aborting and Resuming Transients,  Up: Usage
+
+2.3 Common Suffix Commands
+==========================
+
+A few shared suffix commands are available in all transients.  These
+suffix commands are not shown in the popup buffer by default.
+
+   This includes the aborting commands mentioned in the previous
+section, as well as some other commands that are all bound to ‘C-x KEY’.
+After ‘C-x’ is pressed, a section featuring all these common commands is
+temporarily shown in the popup buffer.  After invoking one of them, the
+section disappears again.  Note, however, that one of these commands is
+described as “Show common permanently”; invoke that if you want the
+common commands to always be shown for all transients.
+
+‘C-x t’ (‘transient-toggle-common’)
+     This command toggles whether the generic commands that are common
+     to all transients are always displayed or only after typing the
+     incomplete prefix key sequence ‘C-x’.  This only affects the
+     current Emacs session.
+
+ -- User Option: transient-show-common-commands
+     This option controls whether shared suffix commands are shown
+     alongside the transient-specific infix and suffix commands.  By
+     default, the shared commands are not shown to avoid overwhelming
+     the user with too many options.
+
+     While a transient is active, pressing ‘C-x’ always shows the common
+     commands.  The value of this option can be changed for the current
+     Emacs session by typing ‘C-x t’ while a transient is active.
+
+   The other common commands are described in either the previous or in
+one of the following sections.
+
+   Some of Transient’s key bindings differ from the respective bindings
+of Magit-Popup; see *note FAQ:: for more information.
+
+
+File: transient.info,  Node: Saving Values,  Next: Using History,  Prev: Common Suffix Commands,  Up: Usage
+
+2.4 Saving Values
+=================
+
+After setting the infix arguments in a transient, the user can save
+those arguments for future invocations.
+
+   Most transients will start out with the saved arguments when they are
+invoked.  There are a few exceptions, though.  Some transients are
+designed so that the value that they use is stored externally as the
+buffer-local value of some variable.  Invoking such a transient again
+uses the buffer-local value.  (1)
+
+   If the user does not save the value and just exits using a regular
+suffix command, then the value is merely saved to the transient’s
+history.  That value won’t be used when the transient is next invoked,
+but it is easily accessible (see *note Using History::).
+
+‘C-x s’ (‘transient-set’)
+     This command saves the value of the active transient for this Emacs
+     session.
+
+‘C-x C-s’ (‘transient-save’)
+     Save the value of the active transient persistently across Emacs
+     sessions.
+
+‘C-x C-k’ (‘transient-reset’)
+     Clear the set and saved values of the active transient.
+
+ -- User Option: transient-values-file
+     This option names the file that is used to persist the values of
+     transients between Emacs sessions.
+
+   ---------- Footnotes ----------
+
+   (1) ‘magit-diff’ and ‘magit-log’ are two prominent examples, and
+their handling of buffer-local values is actually a bit more complicated
+than outlined above and even customizable.
+
+
+File: transient.info,  Node: Using History,  Next: Getting Help for Suffix Commands,  Prev: Saving Values,  Up: Usage
+
+2.5 Using History
+=================
+
+Every time the user invokes a suffix command the transient’s current
+value is saved to its history.  These values can be cycled through the
+same way one can cycle through the history of commands that read
+user-input in the minibuffer.
+
+‘C-M-p’ (‘transient-history-prev’)
+‘C-x p’
+     This command switches to the previous value used for the active
+     transient.
+
+‘C-M-n’ (‘transient-history-next’)
+‘C-x n’
+     This command switches to the next value used for the active
+     transient.
+
+   In addition to the transient-wide history, Transient of course
+supports per-infix history.  When an infix reads user-input using the
+minibuffer, the user can use the regular minibuffer history commands to
+cycle through previously used values.  Usually the same keys as those
+mentioned above are bound to those commands.
+
+   Authors of transients should arrange for different infix commands
+that read the same kind of value to also use the same history key (see
+*note Suffix Slots::).
+
+   Both kinds of history are saved to a file when Emacs is exited.
+
+ -- User Option: transient-history-file
+     This option names the file that is used to persist the history of
+     transients and their infixes between Emacs sessions.
+
+ -- User Option: transient-history-limit
+     This option controls how many history elements are kept at the time
+     the history is saved in ‘transient-history-file’.
+
+
+File: transient.info,  Node: Getting Help for Suffix Commands,  Next: Enabling and Disabling Suffixes,  Prev: Using History,  Up: Usage
+
+2.6 Getting Help for Suffix Commands
+====================================
+
+Transients can have many suffixes and infixes that the user might not be
+familiar with.  To make it trivial to get help for these, Transient
+provides access to the documentation directly from the active transient.
+
+‘C-h’ (‘transient-help’)
+     This command enters help mode.  When help mode is active, typing a
+     key shows information about the suffix command that the key
+     normally is bound to (instead of invoking it).  Pressing ‘C-h’ a
+     second time shows information about the _prefix_ command.
+
+     After typing a key, the stack of transient states is suspended and
+     information about the suffix command is shown instead.  Typing ‘q’
+     in the help buffer buries that buffer and resumes the transient
+     state.
+
+   What sort of documentation is shown depends on how the transient was
+defined.  For infix commands that represent command-line arguments this
+ideally shows the appropriate manpage.  ‘transient-help’ then tries to
+jump to the correct location within that.  Info manuals are also
+supported.  The fallback is to show the command’s documentation string,
+for non-infix suffixes this is usually appropriate.
+
+
+File: transient.info,  Node: Enabling and Disabling Suffixes,  Next: Other Commands,  Prev: Getting Help for Suffix Commands,  Up: Usage
+
+2.7 Enabling and Disabling Suffixes
+===================================
+
+The user base of a package that uses transients can be very diverse.
+This is certainly the case for Magit; some users have been using it and
+Git for a decade, while others are just getting started now.
+
+   For that reason a mechanism is needed that authors can use to
+classify a transient’s infixes and suffixes along the
+essentials...everything spectrum.  We use the term “levels” to describe
+that mechanism.
+
+   Each suffix command is placed on a level and each transient has a
+level (called “transient-level”), which controls which suffix commands
+are available.  Integers between 1 and 7 (inclusive) are valid levels.
+For suffixes, 0 is also valid; it means that the suffix is not displayed
+at any level.
+
+   The levels of individual transients and/or their individual suffixes
+can be changed interactively, by invoking the transient and then
+pressing ‘C-x l’ to enter the “edit” mode, see below.
+
+   The default level for both transients and their suffixes is 4.  The
+‘transient-default-level’ option only controls the default for
+transients.  The default suffix level is always 4.  The authors of
+transients should place certain suffixes on a higher level, if they
+expect that it won’t be of use to most users, and they should place very
+important suffixes on a lower level, so that they remain available even
+if the user lowers the transient level.
+
+ -- User Option: transient-default-level
+     This option controls which suffix levels are made available by
+     default.  It sets the transient-level for transients for which the
+     user has not set that individually.
+
+ -- User Option: transient-levels-file
+     This option names the file that is used to persist the levels of
+     transients and their suffixes between Emacs sessions.
+
+‘C-x l’ (‘transient-set-level’)
+     This command enters edit mode.  When edit mode is active, then all
+     infixes and suffixes that are currently usable are displayed along
+     with their levels.  The colors of the levels indicate whether they
+     are enabled or not.  The level of the transient is also displayed
+     along with some usage information.
+
+     In edit mode, pressing the key that would usually invoke a certain
+     suffix instead prompts the user for the level that suffix should be
+     placed on.
+
+     Help mode is available in edit mode.
+
+     To change the transient level press ‘C-x l’ again.
+
+     To exit edit mode press ‘C-g’.
+
+     Note that edit mode does not display any suffixes that are not
+     currently usable.  ‘magit-rebase’, for example, shows different
+     suffixes depending on whether a rebase is already in progress or
+     not.  The predicates also apply in edit mode.
+
+     Therefore, to control which suffixes are available given a certain
+     state, you have to make sure that that state is currently active.
+
+‘C-x a’ (‘transient-toggle-level-limit’)
+     This command toggle whether suffixes that are on levels higher than
+     the level specified by ‘transient-default-level’ are temporarily
+     available anyway.
+
+
+File: transient.info,  Node: Other Commands,  Next: Configuration,  Prev: Enabling and Disabling Suffixes,  Up: Usage
+
+2.8 Other Commands
+==================
+
+When invoking a transient in a small frame, the transient window may not
+show the complete buffer, making it necessary to scroll, using the
+following commands.  These commands are never shown in the transient
+window, and the key bindings are the same as for ‘scroll-up-command’ and
+‘scroll-down-command’ in other buffers.
+
+ -- Command: transient-scroll-up arg
+     This command scrolls text of transient popup window upward ARG
+     lines.  If ARG is ‘nil’, then it scrolls near full screen.  This is
+     a wrapper around ‘scroll-up-command’ (which see).
+
+ -- Command: transient-scroll-down arg
+     This command scrolls text of transient popup window down ARG lines.
+     If ARG is ‘nil’, then it scrolls near full screen.  This is a
+     wrapper around ‘scroll-down-command’ (which see).
+
+
+File: transient.info,  Node: Configuration,  Prev: Other Commands,  Up: Usage
+
+2.9 Configuration
+=================
+
+More options are described in *note Common Suffix Commands::, in *note
+Saving Values::, in *note Using History:: and in *note Enabling and
+Disabling Suffixes::.
+
+Essential Options
+-----------------
+
+Also see *note Common Suffix Commands::.
+
+ -- User Option: transient-show-popup
+     This option controls whether the current transient’s infix and
+     suffix commands are shown in the popup buffer.
+
+        • If ‘t’ (the default) then the popup buffer is shown as soon as
+          a transient prefix command is invoked.
+
+        • If ‘nil’, then the popup buffer is not shown unless the user
+          explicitly requests it, by pressing an incomplete prefix key
+          sequence.
+
+        • If a number, then the a brief one-line summary is shown
+          instead of the popup buffer.  If zero or negative, then not
+          even that summary is shown; only the pressed key itself is
+          shown.
+
+          The popup is shown when the user explicitly requests it by
+          pressing an incomplete prefix key sequence.  Unless this is
+          zero, the popup is shown after that many seconds of inactivity
+          (using the absolute value).
+
+ -- User Option: transient-enable-popup-navigation
+     This option controls whether navigation commands are enabled in the
+     transient popup buffer.
+
+     While a transient is active the transient popup buffer is not the
+     current buffer, making it necessary to use dedicated commands to
+     act on that buffer itself.  This is disabled by default.  If this
+     option is non-‘nil’, then the following features are available:
+
+        • ‘<UP>’ moves the cursor to the previous suffix.
+        • ‘<DOWN>’ moves the cursor to the next suffix.
+        • ‘<RET>’ invokes the suffix the cursor is on.
+        • ‘mouse-1’ invokes the clicked on suffix.
+        • ‘C-s’ and ‘C-r’ start isearch in the popup buffer.
+
+ -- User Option: transient-display-buffer-action
+     This option specifies the action used to display the transient
+     popup buffer.  The transient popup buffer is displayed in a window
+     using ‘(display-buffer BUFFER transient-display-buffer-action)’.
+
+     The value of this option has the form ‘(FUNCTION . ALIST)’, where
+     FUNCTION is a function or a list of functions.  Each such function
+     should accept two arguments: a buffer to display and an alist of
+     the same form as ALIST.  See *note (elisp)Choosing Window::, for
+     details.
+
+     The default is:
+
+          (display-buffer-in-side-window
+            (side . bottom)
+            (inhibit-same-window . t)
+            (window-parameters (no-other-window . t)))
+
+     This displays the window at the bottom of the selected frame.
+     Another useful FUNCTION is ‘display-buffer-below-selected’, which
+     is what ‘magit-popup’ used by default.  For more alternatives see
+     *note (elisp)Buffer Display Action Functions::, and *note
+     (elisp)Buffer Display Action Alists::.
+
+     Note that the buffer that was current before the transient buffer
+     is shown should remain the current buffer.  Many suffix commands
+     act on the thing at point, if appropriate, and if the transient
+     buffer became the current buffer, then that would change what is at
+     point.  To that effect ‘inhibit-same-window’ ensures that the
+     selected window is not used to show the transient buffer.
+
+     It may be possible to display the window in another frame, but
+     whether that works in practice depends on the window-manager.  If
+     the window manager selects the new window (Emacs frame), then that
+     unfortunately changes which buffer is current.
+
+     If you change the value of this option, then you might also want to
+     change the value of ‘transient-mode-line-format’.
+
+Accessibility Options
+---------------------
+
+ -- User Option: transient-force-single-column
+     This option controls whether the use of a single column to display
+     suffixes is enforced.  This might be useful for users with low
+     vision who use large text and might otherwise have to scroll in two
+     dimensions.
+
+Auxiliary Options
+-----------------
+
+ -- User Option: transient-mode-line-format
+     This option controls whether the transient popup buffer has a
+     mode-line, separator line, or neither.
+
+     If ‘nil’, then the buffer has no mode-line.  If the buffer is not
+     displayed right above the echo area, then this probably is not a
+     good value.
+
+     If ‘line’ (the default) or a natural number, then the buffer has no
+     mode-line, but a line is drawn is drawn in its place.  If a number
+     is used, that specifies the thickness of the line.  On termcap
+     frames we cannot draw lines, so there ‘line’ and numbers are
+     synonyms for ‘nil’.
+
+     The color of the line is used to indicate if non-suffixes are
+     allowed and whether they exit the transient.  The foreground color
+     of ‘transient-key-noop’ (if non-suffix are disallowed),
+     ‘transient-key-stay’ (if allowed and transient stays active), or
+     ‘transient-key-exit’ (if allowed and they exit the transient) is
+     used to draw the line.
+
+     Otherwise this can be any mode-line format.  See *note (elisp)Mode
+     Line Format::, for details.
+
+ -- User Option: transient-semantic-coloring
+     This option controls whether colors are used to indicate the
+     transient behavior of commands.
+
+     If non-‘nil’, then the key binding of each suffix is colorized to
+     indicate whether it exits the transient state or not.  The color of
+     the prefix is indicated using the line that is drawn when the value
+     of ‘transient-mode-line-format’ is ‘line’.
+
+ -- User Option: transient-highlight-mismatched-keys
+     This option controls whether key bindings of infix commands that do
+     not match the respective command-line argument should be
+     highlighted.  For other infix commands this option has no effect.
+
+     When this option is non-‘nil’, the key binding for an infix
+     argument is highlighted when only a long argument (e.g.,
+     ‘--verbose’) is specified but no shorthand (e.g., ‘-v’).  In the
+     rare case that a shorthand is specified but the key binding does
+     not match, then it is highlighted differently.
+
+     Highlighting mismatched key bindings is useful when learning the
+     arguments of the underlying command-line tool; you wouldn’t want to
+     learn any short-hands that do not actually exist.
+
+     The highlighting is done using one of the faces
+     ‘transient-mismatched-key’ and ‘transient-nonstandard-key’.
+
+ -- User Option: transient-substitute-key-function
+     This function is used to modify key bindings.  If the value of this
+     option is ‘nil’ (the default), then no substitution is performed.
+
+     This function is called with one argument, the prefix object, and
+     must return a key binding description, either the existing key
+     description it finds in the ‘key’ slot, or the key description that
+     replaces the prefix key.  It could be used to make other
+     substitutions, but that is discouraged.
+
+     For example, ‘=’ is hard to reach using my custom keyboard layout,
+     so I substitute ‘(’ for that, which is easy to reach using a layout
+     optimized for lisp.
+
+          (setq transient-substitute-key-function
+                (lambda (obj)
+                  (let ((key (oref obj key)))
+                    (if (string-match "\\`\\(=\\)[a-zA-Z]" key)
+                        (replace-match "(" t t key 1)
+                      key))))
+
+ -- User Option: transient-read-with-initial-input
+     This option controls whether the last history element is used as
+     the initial minibuffer input when reading the value of an infix
+     argument from the user.  If ‘nil’, there is no initial input and
+     the first element has to be accessed the same way as the older
+     elements.
+
+ -- User Option: transient-hide-during-minibuffer-read
+     This option controls whether the transient buffer is hidden while
+     user input is being read in the minibuffer.
+
+ -- User Option: transient-align-variable-pitch
+     This option controls whether columns are aligned pixel-wise in the
+     popup buffer.
+
+     If this is non-‘nil’, then columns are aligned pixel-wise to
+     support variable-pitch fonts.  Keys are not aligned, so you should
+     use a fixed-pitch font for the ‘transient-key’ face.  Other key
+     faces inherit from that face unless a theme is used that breaks
+     that relationship.
+
+     This option is intended for users who use a variable-pitch font for
+     the ‘default’ face.
+
+ -- User Option: transient-force-fixed-pitch
+     This option controls whether to force the use of a monospaced font
+     in popup buffer.  Even if you use a proportional font for the
+     ‘default’ face, you might still want to use a monospaced font in
+     transient’s popup buffer.  Setting this option to ‘t’ causes
+     ‘default’ to be remapped to ‘fixed-pitch’ in that buffer.
+
+Developer Options
+-----------------
+
+These options are mainly intended for developers.
+
+ -- User Option: transient-detect-key-conflicts
+     This option controls whether key binding conflicts should be
+     detected at the time the transient is invoked.  If so, this results
+     in an error, which prevents the transient from being used.  Because
+     of that, conflicts are ignored by default.
+
+     Conflicts cannot be determined earlier, i.e., when the transient is
+     being defined and when new suffixes are being added, because at
+     that time there can be false-positives.  It is actually valid for
+     multiple suffixes to share a common key binding, provided the
+     predicates of those suffixes prevent that more than one of them is
+     enabled at a time.
+
+ -- User Option: transient-highlight-higher-levels
+     This option controls whether suffixes that would not be available
+     by default are highlighted.
+
+     When non-‘nil’ then the descriptions of suffixes are highlighted if
+     their level is above 4, the default of ‘transient-default-level’.
+     Assuming you have set that variable to 7, this highlights all
+     suffixes that won’t be available to users without them making the
+     same customization.
+
+
+File: transient.info,  Node: Modifying Existing Transients,  Next: Defining New Commands,  Prev: Usage,  Up: Top
+
+3 Modifying Existing Transients
+*******************************
+
+To an extent, transients can be customized interactively, see *note
+Enabling and Disabling Suffixes::.  This section explains how existing
+transients can be further modified non-interactively.  Let’s begin with
+an example:
+
+     (transient-append-suffix 'magit-patch-apply "-3"
+       '("-R" "Apply in reverse" "--reverse"))
+
+   This inserts a new infix argument to toggle the ‘--reverse’ argument
+after the infix argument that toggles ‘-3’ in ‘magit-patch-apply’.
+
+   The following functions share a few arguments:
+
+   • PREFIX is a transient prefix command, a symbol.
+
+   • SUFFIX is a transient infix or suffix specification in the same
+     form as expected by ‘transient-define-prefix’.  Note that an infix
+     is a special kind of suffix.  Depending on context “suffixes” means
+     “suffixes (including infixes)” or “non-infix suffixes”.  Here it
+     means the former.  See *note Suffix Specifications::.
+
+     SUFFIX may also be a group in the same form as expected by
+     ‘transient-define-prefix’.  See *note Group Specifications::.
+
+   • LOC is a command, a key vector, a key description (a string as
+     returned by ‘key-description’), or a list specifying coordinates
+     (the last element may also be a command or key).  For example ‘(1 0
+     -1)’ identifies the last suffix (‘-1’) of the first subgroup (‘0’)
+     of the second group (‘1’).
+
+     If LOC is a list of coordinates, then it can be used to identify a
+     group, not just an individual suffix command.
+
+     The function ‘transient-get-suffix’ can be useful to determine
+     whether a certain coordination list identifies the suffix or group
+     that you expect it to identify.  In hairy cases it may be necessary
+     to look at the definition of the transient prefix command.
+
+   These functions operate on the information stored in the
+‘transient--layout’ property of the PREFIX symbol.  Suffix entries in
+that tree are not objects but have the form ‘(LEVEL CLASS PLIST)’, where
+PLIST should set at least ‘:key’, ‘:description’ and ‘:command’.
+
+ -- Function: transient-insert-suffix prefix loc suffix &optional
+          keep-other
+ -- Function: transient-append-suffix prefix loc suffix &optional
+          keep-other
+     These functions insert the suffix or group SUFFIX into PREFIX
+     before or after LOC.
+
+     Conceptually adding a binding to a transient prefix is similar to
+     adding a binding to a keymap, but this is complicated by the fact
+     that multiple suffix commands can be bound to the same key,
+     provided they are never active at the same time, see *note
+     Predicate Slots::.
+
+     Unfortunately both false-positives and false-negatives are
+     possible.  To deal with the former use non-‘nil’ KEEP-OTHER.  To
+     deal with the latter remove the conflicting binding explicitly.
+
+ -- Function: transient-replace-suffix prefix loc suffix
+     This function replaces the suffix or group at LOC in PREFIX with
+     suffix or group SUFFIX.
+
+ -- Function: transient-remove-suffix prefix loc
+     This function removes the suffix or group at LOC in PREFIX.
+
+ -- Function: transient-get-suffix prefix loc
+     This function returns the suffix or group at LOC in PREFIX.  The
+     returned value has the form mentioned above.
+
+ -- Function: transient-suffix-put prefix loc prop value
+     This function edits the suffix or group at LOC in PREFIX, by
+     setting the PROP of its plist to VALUE.
+
+   Most of these functions do not signal an error if they cannot perform
+the requested modification.  The functions that insert new suffixes show
+a warning if LOC cannot be found in PREFIX without signaling an error.
+The reason for doing it like this is that establishing a key binding
+(and that is what we essentially are trying to do here) should not
+prevent the rest of the configuration from loading.  Among these
+functions only ‘transient-get-suffix’ and ‘transient-suffix-put’ may
+signal an error.
+
+
+File: transient.info,  Node: Defining New Commands,  Next: Classes and Methods,  Prev: Modifying Existing Transients,  Up: Top
+
+4 Defining New Commands
+***********************
+
+* Menu:
+
+* Technical Introduction::
+* Defining Transients::
+* Binding Suffix and Infix Commands::
+* Defining Suffix and Infix Commands::
+* Using Infix Arguments::
+* Transient State::
+
+
+File: transient.info,  Node: Technical Introduction,  Next: Defining Transients,  Up: Defining New Commands
+
+4.1 Technical Introduction
+==========================
+
+Taking inspiration from prefix keys and prefix arguments, Transient
+implements a similar abstraction involving a prefix command, infix
+arguments and suffix commands.
+
+   When the user calls a transient prefix command, a transient
+(temporary) keymap is activated, which binds the transient’s infix and
+suffix commands, and functions that control the transient state are
+added to ‘pre-command-hook’ and ‘post-command-hook’.  The available
+suffix and infix commands and their state are shown in a popup buffer
+until the transient state is exited by invoking a suffix command.
+
+   Calling an infix command causes its value to be changed.  How that is
+done depends on the type of the infix command.  The simplest case is an
+infix command that represents a command-line argument that does not take
+a value.  Invoking such an infix command causes the switch to be toggled
+on or off.  More complex infix commands may read a value from the user,
+using the minibuffer.
+
+   Calling a suffix command usually causes the transient to be exited;
+the transient keymaps and hook functions are removed, the popup buffer
+no longer shows information about the (no longer bound) suffix commands,
+the values of some public global variables are set, while some internal
+global variables are unset, and finally the command is actually called.
+Suffix commands can also be configured to not exit the transient.
+
+   A suffix command can, but does not have to, use the infix arguments
+in much the same way any command can choose to use or ignore the prefix
+arguments.  For a suffix command that was invoked from a transient, the
+variable ‘transient-current-suffixes’ and the function ‘transient-args’
+serve about the same purpose as the variables ‘prefix-arg’ and
+‘current-prefix-arg’ do for any command that was called after the prefix
+arguments have been set using a command such as ‘universal-argument’.
+
+   Transient can be used to implement simple “command dispatchers”.  The
+main benefit then is that the user can see all the available commands in
+a popup buffer, which can be thought of as a “menus”.  That is useful by
+itself because it frees the user from having to remember all the keys
+that are valid after a certain prefix key or command.  Magit’s
+‘magit-dispatch’ (on ‘C-x M-g’) command is an example of using Transient
+to merely implement a command dispatcher.
+
+   In addition to that, Transient also allows users to interactively
+pass arguments to commands.  These arguments can be much more complex
+than what is reasonable when using prefix arguments.  There is a limit
+to how many aspects of a command can be controlled using prefix
+arguments.  Furthermore, what a certain prefix argument means for
+different commands can be completely different, and users have to read
+documentation to learn and then commit to memory what a certain prefix
+argument means to a certain command.
+
+   Transient suffix commands, on the other hand, can accept dozens of
+different arguments without the user having to remember anything.  When
+using Transient, one can call a command with arguments that are just as
+complex as when calling the same function non-interactively from Lisp.
+
+   Invoking a transient suffix command with arguments is similar to
+invoking a command in a shell with command-line completion and history
+enabled.  One benefit of the Transient interface is that it remembers
+history not only on a global level (“this command was invoked using
+these arguments, and previously it was invoked using those other
+arguments”), but also remembers the values of individual arguments
+independently.  See *note Using History::.
+
+   After a transient prefix command is invoked, ‘C-h KEY’ can be used to
+show the documentation for the infix or suffix command that ‘KEY’ is
+bound to (see *note Getting Help for Suffix Commands::), and infixes and
+suffixes can be removed from the transient using ‘C-x l KEY’.  Infixes
+and suffixes that are disabled by default can be enabled the same way.
+See *note Enabling and Disabling Suffixes::.
+
+   Transient ships with support for a few different types of specialized
+infix commands.  A command that sets a command line option, for example,
+has different needs than a command that merely toggles a boolean flag.
+Additionally, Transient provides abstractions for defining new types,
+which the author of Transient did not anticipate (or didn’t get around
+to implementing yet).
+
+   Note that suffix commands also support regular prefix arguments.  A
+suffix command may even be called with both infix and prefix arguments
+at the same time.  If you invoke a command as a suffix of a transient
+prefix command, but also want to pass prefix arguments to it, then first
+invoke the prefix command, and only after doing that invoke the prefix
+arguments, before finally invoking the suffix command.  If you instead
+began by providing the prefix arguments, then those would apply to the
+prefix command, not the suffix command.  Likewise, if you want to change
+infix arguments before invoking a suffix command with prefix arguments,
+then change the infix arguments before invoking the prefix arguments.
+In other words, regular prefix arguments always apply to the next
+command, and since transient prefix, infix and suffix commands are just
+regular commands, the same applies to them.  (Regular prefix keys behave
+differently because they are not commands at all, instead they are just
+incomplete key sequences, and those cannot be interrupted with prefix
+commands.)
+
+
+File: transient.info,  Node: Defining Transients,  Next: Binding Suffix and Infix Commands,  Prev: Technical Introduction,  Up: Defining New Commands
+
+4.2 Defining Transients
+=======================
+
+A transient consists of a prefix command and at least one suffix
+command, though usually a transient has several infix and suffix
+commands.  The below macro defines the transient prefix command *and*
+binds the transient’s infix and suffix commands.  In other words, it
+defines the complete transient, not just the transient prefix command
+that is used to invoke that transient.
+
+ -- Macro: transient-define-prefix name arglist [docstring] [keyword
+          value]... group... [body...]
+     This macro defines NAME as a transient prefix command and binds the
+     transient’s infix and suffix commands.
+
+     ARGLIST are the arguments that the prefix command takes.  DOCSTRING
+     is the documentation string and is optional.
+
+     These arguments can optionally be followed by keyword-value pairs.
+     Each key has to be a keyword symbol, either ‘:class’ or a keyword
+     argument supported by the constructor of that class.  The
+     ‘transient-prefix’ class is used if the class is not specified
+     explicitly.
+
+     GROUPs add key bindings for infix and suffix commands and specify
+     how these bindings are presented in the popup buffer.  At least one
+     GROUP has to be specified.  See *note Binding Suffix and Infix
+     Commands::.
+
+     The BODY is optional.  If it is omitted, then ARGLIST is ignored
+     and the function definition becomes:
+
+          (lambda ()
+            (interactive)
+            (transient-setup 'NAME))
+
+     If BODY is specified, then it must begin with an ‘interactive’ form
+     that matches ARGLIST, and it must call ‘transient-setup’.  It may,
+     however, call that function only when some condition is satisfied.
+
+     All transients have a (possibly ‘nil’) value, which is exported
+     when suffix commands are called, so that they can consume that
+     value.  For some transients it might be necessary to have a sort of
+     secondary value, called a “scope”.  Such a scope would usually be
+     set in the command’s ‘interactive’ form and has to be passed to the
+     setup function:
+
+          (transient-setup 'NAME nil nil :scope SCOPE)
+
+     For example, the scope of the ‘magit-branch-configure’ transient is
+     the branch whose variables are being configured.
+
+
+File: transient.info,  Node: Binding Suffix and Infix Commands,  Next: Defining Suffix and Infix Commands,  Prev: Defining Transients,  Up: Defining New Commands
+
+4.3 Binding Suffix and Infix Commands
+=====================================
+
+The macro ‘transient-define-prefix’ is used to define a transient.  This
+defines the actual transient prefix command (see *note Defining
+Transients::) and adds the transient’s infix and suffix bindings, as
+described below.
+
+   Users and third-party packages can add additional bindings using
+functions such as ‘transient-insert-suffix’ (see *note Modifying
+Existing Transients::).  These functions take a “suffix specification”
+as one of their arguments, which has the same form as the specifications
+used in ‘transient-define-prefix’.
+
+* Menu:
+
+* Group Specifications::
+* Suffix Specifications::
+
+
+File: transient.info,  Node: Group Specifications,  Next: Suffix Specifications,  Up: Binding Suffix and Infix Commands
+
+4.3.1 Group Specifications
+--------------------------
+
+The suffix and infix commands of a transient are organized in groups.
+The grouping controls how the descriptions of the suffixes are outlined
+visually but also makes it possible to set certain properties for a set
+of suffixes.
+
+   Several group classes exist, some of which organize suffixes in
+subgroups.  In most cases the class does not have to be specified
+explicitly, but see *note Group Classes::.
+
+   Groups are specified in the call to ‘transient-define-prefix’, using
+vectors.  Because groups are represented using vectors, we cannot use
+square brackets to indicate an optional element and instead use curly
+brackets to do the latter.
+
+   Group specifications then have this form:
+
+     [{LEVEL} {DESCRIPTION} {KEYWORD VALUE}... ELEMENT...]
+
+   The LEVEL is optional and defaults to 4.  See *note Enabling and
+Disabling Suffixes::.
+
+   The DESCRIPTION is optional.  If present, it is used as the heading
+of the group.
+
+   The KEYWORD-VALUE pairs are optional.  Each keyword has to be a
+keyword symbol, either ‘:class’ or a keyword argument supported by the
+constructor of that class.
+
+   • One of these keywords, ‘:description’, is equivalent to specifying
+     DESCRIPTION at the very beginning of the vector.  The
+     recommendation is to use ‘:description’ if some other keyword is
+     also used, for consistency, or DESCRIPTION otherwise, because it
+     looks better.
+
+   • Likewise ‘:level’ is equivalent to LEVEL.
+
+   • Other important keywords include the ‘:if...’ keywords.  These
+     keywords control whether the group is available in a certain
+     situation.
+
+     For example, one group of the ‘magit-rebase’ transient uses ‘:if
+     magit-rebase-in-progress-p’, which contains the suffixes that are
+     useful while rebase is already in progress; and another that uses
+     ‘:if-not magit-rebase-in-progress-p’, which contains the suffixes
+     that initiate a rebase.
+
+     These predicates can also be used on individual suffixes and are
+     only documented once, see *note Predicate Slots::.
+
+   • The value of ‘:hide’, if non-‘nil’, is a predicate that controls
+     whether the group is hidden by default.  The key bindings for
+     suffixes of a hidden group should all use the same prefix key.
+     Pressing that prefix key should temporarily show the group and its
+     suffixes, which assumes that a predicate like this is used:
+
+          (lambda ()
+            (eq (car transient--redisplay-key)
+                ?\C-c)) ; the prefix key shared by all bindings
+
+   • The value of ‘:setup-children’, if non-‘nil’, is a function that
+     takes one argument, a potentially list of children, and must return
+     a list of children or an empty list.  This can either be used to
+     somehow transform the group’s children that were defined the normal
+     way, or to dynamically create the children from scratch.
+
+     The returned children must have the same form as stored in the
+     prefix’s ‘transient--layout’ property, but it is often more
+     convenient to use the same form as understood by
+     ‘transient-define-prefix’, described below.  If you use the latter
+     approach, you can use the ‘transient-parse-suffixes’ and
+     ‘transient-parse-suffix’ functions to transform them from the
+     convenient to the expected form.  Depending on the used group
+     class, ‘transient-parse-suffixes’’s SUFFIXES must be a list of
+     group vectors (for ‘transient-columns’) or a list of suffix lists
+     (for all other group classes).
+
+     If you explicitly specify children and then transform them using
+     ‘:setup-children’, then the class of the group is determined as
+     usual, based on explicitly specified children.
+
+     If you do not explicitly specify children and thus rely solely on
+     ‘:setup-children’, then you must specify the class using ‘:class’.
+     For backward compatibility, if you fail to do so,
+     ‘transient-column’ is used and a warning is displayed.  This
+     warning will eventually be replaced with an error.
+
+          (transient-define-prefix my-finder-by-keyword ()
+            "Select a keyword and list matching packages."
+            ;; The real `finder-by-keyword' is more convenient
+            ;; of course, but that is not the point here.
+            [:class transient-columns
+             :setup-children
+             (lambda (_)
+               (transient-parse-suffixes
+                'my-finder-by-keyword
+                (let ((char (1- ?A)))
+                  (mapcar                  ; a list ...
+                   (lambda (partition)
+                     (vconcat              ; of group vectors ...
+                      (mapcar (lambda (elt)
+                                (let ((keyword (symbol-name (car elt))))
+                                           ; ... where each suffix is a list
+                                  (list (format "%c" (cl-incf char))
+                                        keyword
+                                        (lambda ()
+                                          (interactive)
+                                          (finder-list-matches keyword)))))
+                              partition)))
+                   (seq-partition finder-known-keywords 7)))))])
+
+   • The boolean ‘:pad-keys’ argument controls whether keys of all
+     suffixes contained in a group are right padded, effectively
+     aligning the descriptions.
+
+   The ELEMENTs are either all subgroups, or all suffixes and strings.
+(At least currently no group type exists that would allow mixing
+subgroups with commands at the same level, though in principle there is
+nothing that prevents that.)
+
+   If the ELEMENTs are not subgroups, then they can be a mixture of
+lists, which specify commands, and strings.  Strings are inserted
+verbatim into the buffer.  The empty string can be used to insert gaps
+between suffixes, which is particularly useful if the suffixes are
+outlined as a table.
+
+   Inside group specifications, including inside contained suffix
+specifications, nothing has to be quoted and quoting anyway is invalid.
+The value following a keyword, can be explicitly unquoted using ‘,’.
+This feature is experimental and should be avoided.
+
+   The form of suffix specifications is documented in the next node.
+
+
+File: transient.info,  Node: Suffix Specifications,  Prev: Group Specifications,  Up: Binding Suffix and Infix Commands
+
+4.3.2 Suffix Specifications
+---------------------------
+
+A transient’s suffix and infix commands are bound when the transient
+prefix command is defined using ‘transient-define-prefix’, see *note
+Defining Transients::.  The commands are organized into groups, see
+*note Group Specifications::.  Here we describe the form used to bind an
+individual suffix command.
+
+   The same form is also used when later binding additional commands
+using functions such as ‘transient-insert-suffix’, see *note Modifying
+Existing Transients::.
+
+   Note that an infix is a special kind of suffix.  Depending on context
+“suffixes” means “suffixes (including infixes)” or “non-infix suffixes”.
+Here it means the former.
+
+   Suffix specifications have this form:
+
+     ([LEVEL] [KEY [DESCRIPTION]] COMMAND|ARGUMENT [KEYWORD VALUE]...)
+
+   LEVEL, KEY and DESCRIPTION can also be specified using the KEYWORDs
+‘:level’, ‘:key’ and ‘:description’.  If the object that is associated
+with COMMAND sets these properties, then they do not have to be
+specified here.  You can however specify them here anyway, possibly
+overriding the object’s values just for the binding inside this
+transient.
+
+   • LEVEL is the suffix level, an integer between 1 and 7.  See *note
+     Enabling and Disabling Suffixes::.
+
+   • KEY is the key binding, either a vector or key description string.
+
+   • DESCRIPTION is the description, either a string or a function that
+     takes zero or one arguments (the suffix object) and returns a
+     string.  The function should be a lambda expression to avoid
+     ambiguity.  In some cases a symbol that is bound as a function
+     would also work but to be safe you should use ‘:description’ in
+     that case.
+
+   The next element is either a command or an argument.  This is the
+only argument that is mandatory in all cases.
+
+   • COMMAND should be a symbol that is bound as a function, which has
+     to be defined or at least autoloaded as a command by the time the
+     containing prefix command is invoked.
+
+     Any command will do; it does not need to have an object associated
+     with it (as would be the case if ‘transient-define-suffix’ or
+     ‘transient-define-infix’ were used to define it).
+
+     COMMAND can also be a ‘lambda’ expression.
+
+     As mentioned above, the object that is associated with a command
+     can be used to set the default for certain values that otherwise
+     have to be set in the suffix specification.  Therefore if there is
+     no object, then you have to make sure to specify the KEY and the
+     DESCRIPTION.
+
+     As a special case, if you want to add a command that might be
+     neither defined nor autoloaded, you can use a workaround like:
+
+          (transient-insert-suffix 'some-prefix "k"
+            '("!" "Ceci n'est pas une commande" no-command
+              :if (lambda () (featurep 'no-library))))
+
+     Instead of ‘featurep’ you could also use ‘require’ with a non-‘nil’
+     value for NOERROR.
+
+   • The mandatory argument can also be a command-line argument, a
+     string.  In that case an anonymous command is defined and bound.
+
+     Instead of a string, this can also be a list of two strings, in
+     which case the first string is used as the short argument (which
+     can also be specified using ‘:shortarg’) and the second as the long
+     argument (which can also be specified using ‘:argument’).
+
+     Only the long argument is displayed in the popup buffer.  See
+     ‘transient-detect-key-conflicts’ for how the short argument may be
+     used.
+
+     Unless the class is specified explicitly, the appropriate class is
+     guessed based on the long argument.  If the argument ends with ‘=’
+     (e.g., ‘--format=’) then ‘transient-option’ is used, otherwise
+     ‘transient-switch’.
+
+   Finally, details can be specified using optional KEYWORD-VALUE pairs.
+Each keyword has to be a keyword symbol, either ‘:class’ or a keyword
+argument supported by the constructor of that class.  See *note Suffix
+Slots::.
+
+
+File: transient.info,  Node: Defining Suffix and Infix Commands,  Next: Using Infix Arguments,  Prev: Binding Suffix and Infix Commands,  Up: Defining New Commands
+
+4.4 Defining Suffix and Infix Commands
+======================================
+
+Note that an infix is a special kind of suffix.  Depending on context
+“suffixes” means “suffixes (including infixes)” or “non-infix suffixes”.
+
+ -- Macro: transient-define-suffix name arglist [docstring] [keyword
+          value]... body...
+     This macro defines NAME as a transient suffix command.
+
+     ARGLIST are the arguments that the command takes.  DOCSTRING is the
+     documentation string and is optional.
+
+     These arguments can optionally be followed by keyword-value pairs.
+     Each keyword has to be a keyword symbol, either ‘:class’ or a
+     keyword argument supported by the constructor of that class.  The
+     ‘transient-suffix’ class is used if the class is not specified
+     explicitly.
+
+     The BODY must begin with an ‘interactive’ form that matches
+     ARGLIST.  The infix arguments are usually accessed by using
+     ‘transient-args’ inside ‘interactive’.
+
+ -- Macro: transient-define-infix name arglist [docstring] [keyword
+          value]...
+     This macro defines NAME as a transient infix command.
+
+     ARGLIST is always ignored (but mandatory never-the-less) and
+     reserved for future use.  DOCSTRING is the documentation string and
+     is optional.
+
+     At least one key-value pair is required.  All transient infix
+     commands are ‘equal’ to each other (but not ‘eq’).  It is
+     meaningless to define an infix command, without providing at least
+     one keyword argument (usually ‘:argument’ or ‘:variable’, depending
+     on the class).  The suffix class defaults to ‘transient-switch’ and
+     can be set using the ‘:class’ keyword.
+
+     The function definition is always:
+
+          (lambda ()
+            (interactive)
+            (let ((obj (transient-suffix-object)))
+              (transient-infix-set obj (transient-infix-read obj)))
+            (transient--show))
+
+     ‘transient-infix-read’ and ‘transient-infix-set’ are generic
+     functions.  Different infix commands behave differently because the
+     concrete methods are different for different infix command classes.
+     In rare cases the above command function might not be suitable,
+     even if you define your own infix command class.  In that case you
+     have to use ‘transient-define-suffix’ to define the infix command
+     and use ‘t’ as the value of the ‘:transient’ keyword.
+
+ -- Macro: transient-define-argument name arglist [docstring] [keyword
+          value]...
+     This macro defines NAME as a transient infix command.
+
+     This is an alias for ‘transient-define-infix’.  Only use this alias
+     to define an infix command that actually sets an infix argument.
+     To define an infix command that, for example, sets a variable, use
+     ‘transient-define-infix’ instead.
+
+
+File: transient.info,  Node: Using Infix Arguments,  Next: Transient State,  Prev: Defining Suffix and Infix Commands,  Up: Defining New Commands
+
+4.5 Using Infix Arguments
+=========================
+
+The functions and the variables described below allow suffix commands to
+access the value of the transient from which they were invoked; which is
+the value of its infix arguments.  These variables are set when the user
+invokes a suffix command that exits the transient, but before actually
+calling the command.
+
+   When returning to the command-loop after calling the suffix command,
+the arguments are reset to ‘nil’ (which causes the function to return
+‘nil’ too).
+
+   Like for Emacs’s prefix arguments, it is advisable, but not
+mandatory, to access the infix arguments inside the command’s
+‘interactive’ form.  The preferred way of doing that is to call the
+‘transient-args’ function, which for infix arguments serves about the
+same purpose as ‘prefix-arg’ serves for prefix arguments.
+
+ -- Function: transient-args prefix
+     This function returns the value of the transient prefix command
+     PREFIX.
+
+     If the current command was invoked from the transient prefix
+     command PREFIX, then it returns the active infix arguments.  If the
+     current command was not invoked from PREFIX, then it returns the
+     set, saved or default value for PREFIX.
+
+ -- Function: transient-arg-value arg args
+     This function return the value of ARG as it appears in ARGS.
+
+     For a switch a boolean is returned.  For an option the value is
+     returned as a string, using the empty string for the empty value,
+     or ‘nil’ if the option does not appear in ARGS.
+
+ -- Function: transient-suffixes prefix
+     This function returns the suffixes of the transient prefix command
+     PREFIX.  This is a list of objects.  This function should only be
+     used if you need the objects (as opposed to just their values) and
+     if the current command is not being invoked from PREFIX.
+
+ -- Variable: transient-current-suffixes
+     The suffixes of the transient from which this suffix command was
+     invoked.  This is a list of objects.  Usually it is sufficient to
+     instead use the function ‘transient-args’, which returns a list of
+     values.  In complex cases it might be necessary to use this
+     variable instead, i.e., if you need access to information beside
+     the value.
+
+ -- Variable: transient-current-command
+     The transient from which this suffix command was invoked.  The
+     returned value is a symbol, the transient prefix command.
+
+ -- Variable: transient-current-prefix
+     The transient from which this suffix command was invoked.  The
+     returned value is a ‘transient-prefix’ object, which holds
+     information associated with the transient prefix command.
+
+ -- Function: transient-active-prefix
+     This function returns the active transient object.  Return ‘nil’ if
+     there is no active transient, if the transient buffer isn’t shown,
+     and while the active transient is suspended (e.g., while the
+     minibuffer is in use).
+
+     Unlike ‘transient-current-prefix’, which is only ever non-‘nil’ in
+     code that is run directly by a command that is invoked while a
+     transient is current, this function is also suitable for use in
+     asynchronous code, such as timers and callbacks (this function’s
+     main use-case).
+
+     If optional PREFIXES is non-‘nil’, it must be a prefix command
+     symbol or a list of symbols, in which case the active transient
+     object is only returned if it matches one of the PREFIXES.
+
+
+File: transient.info,  Node: Transient State,  Prev: Using Infix Arguments,  Up: Defining New Commands
+
+4.6 Transient State
+===================
+
+Invoking a transient prefix command “activates” the respective
+transient, i.e., it puts a transient keymap into effect, which binds the
+transient’s infix and suffix commands.
+
+   The default behavior while a transient is active is as follows:
+
+   • Invoking an infix command does not affect the transient state; the
+     transient remains active.
+
+   • Invoking a (non-infix) suffix command “deactivates” the transient
+     state by removing the transient keymap and performing some
+     additional cleanup.
+
+   • Invoking a command that is bound in a keymap other than the
+     transient keymap is disallowed and trying to do so results in a
+     warning.  This does not “deactivate” the transient.
+
+   The behavior can be changed for all suffixes of a particular prefix
+and/or for individual suffixes.  The values should nearly always be
+booleans, but certain functions, called “pre-commands”, can also be
+used.  These functions are named ‘transient--do-VERB’, and the symbol
+‘VERB’ can be used as a shorthand.
+
+   A boolean is interpreted as answering the question "does the
+transient stay active, when this command is invoked?"  ‘t’ means that
+the transient stays active, while ‘nil’ means that invoking the command
+exits the transient.
+
+   Note that when the suffix is a “sub-prefix”, invoking that command
+always activates that sub-prefix, causing the outer prefix to no longer
+be active and displayed.  Here ‘t’ means that when you exit the inner
+prefix, then the outer prefix becomes active again, while ‘nil’ means
+that all outer prefixes are exited at once.
+
+   • The behavior for non-suffixes can be set for a particular prefix,
+     by the prefix’s ‘transient-non-suffix’ slot to a boolean, a
+     suitable pre-command function, or a shorthand for such a function.
+     See *note Pre-commands for Non-Suffixes::.
+
+   • The common behavior for the suffixes of a particular prefix can be
+     set using the prefix’s ‘transient-suffixes’ slot.
+
+     The value specified in this slot does *not* affect infixes.
+     Because it affects both regular suffixes as well as sub-prefixes,
+     which have different needs, it is best to avoid explicitly
+     specifying a function.
+
+   • The behavior of an individual suffix can be changed using its
+     ‘transient’ slot.  While it is usually best to use a boolean, for
+     this slot it can occasionally make sense to specify a function
+     explicitly.
+
+     Note that this slot can be set when defining a suffix command using
+     ‘transient-define-suffix’ and/or in the definition of the prefix.
+     If set in both places, then the latter takes precedence, as usual.
+
+   The available pre-command functions are documented in the following
+sub-sections.  They are called by ‘transient--pre-command’, a function
+on ‘pre-command-hook’, and the value that they return determines whether
+the transient is exited.  To do so the value of one of the constants
+‘transient--exit’ or ‘transient--stay’ is used (that way we don’t have
+to remember if ‘t’ means “exit” or “stay”).
+
+   Additionally, these functions may change the value of ‘this-command’
+(which explains why they have to be called using ‘pre-command-hook’),
+call ‘transient-export’, ‘transient--stack-zap’ or
+‘transient--stack-push’; and set the values of ‘transient--exitp’,
+‘transient--helpp’ or ‘transient--editp’.
+
+   For completeness sake, some notes about complications:
+
+   • The transient-ness of certain built-in suffix commands is specified
+     using ‘transient-predicate-map’.  This is a special keymap, which
+     binds commands to pre-commands (as opposed to keys to commands) and
+     takes precedence over the prefix’s ‘transient-suffix’ slot, but not
+     the suffix’s ‘transient’ slot.
+
+   • While a sub-prefix is active we nearly always want ‘C-g’ to take
+     the user back to the “super-prefix”, even when the other suffixes
+     don’t do that.  However, in rare cases this may not be desirable,
+     and that makes the following complication necessary:
+
+     For ‘transient-suffix’ objects the ‘transient’ slot is unbound.  We
+     can ignore that for the most part because ‘nil’ and the slot being
+     unbound are treated as equivalent, and mean “do exit”.  That isn’t
+     actually true for suffixes that are sub-prefixes though.  For such
+     suffixes unbound means “do exit but allow going back”, which is the
+     default, while ‘nil’ means “do exit permanently”, which requires
+     that slot to be explicitly set to that value.
+
+Pre-commands for Infixes
+------------------------
+
+The default for infixes is ‘transient--do-stay’.  This is also the only
+function that makes sense for infixes, which is why this predicate is
+used even if the value of the prefix’s ‘transient-suffix’ slot is ‘t’.
+In extremely rare cases, one might want to use something else, which can
+be done by setting the infix’s ‘transient’ slot directly.
+
+ -- Function: transient--do-stay
+     Call the command without exporting variables and stay transient.
+
+Pre-commands for Suffixes
+-------------------------
+
+By default, invoking a suffix causes the transient to be exited.
+
+   The behavior for an individual suffix command can be changed by
+setting its ‘transient’ slot to a boolean (which is highly recommended),
+or to one of the following pre-commands.
+
+ -- Function: transient--do-exit
+     Call the command after exporting variables and exit the transient.
+
+ -- Function: transient--do-return
+     Call the command after exporting variables and return to the parent
+     prefix.  If there is no parent prefix, then call
+     ‘transient--do-exit’.
+
+ -- Function: transient--do-call
+     Call the command after exporting variables and stay transient.
+
+   The following pre-commands are only suitable for sub-prefixes.  It is
+not necessary to explicitly use these predicates because the correct
+predicate is automatically picked based on the value of the ‘transient’
+slot for the sub-prefix itself.
+
+ -- Function: transient--do-recurse
+     Call the transient prefix command, preparing for return to active
+     transient.
+
+     Whether we actually return to the parent transient is ultimately
+     under the control of each invoked suffix.  The difference between
+     this pre-command and ‘transient--do-stack’ is that it changes the
+     value of the ‘transient-suffix’ slot to ‘t’.
+
+     If there is no parent transient, then only call this command and
+     skip the second step.
+
+ -- Function: transient--do-stack
+     Call the transient prefix command, stacking the active transient.
+     Push the active transient to the transient stack.
+
+     Unless ‘transient--do-recurse’ is explicitly used, this pre-command
+     is automatically used for suffixes that are prefixes themselves,
+     i.e., for sub-prefixes.
+
+ -- Function: transient--do-replace
+     Call the transient prefix command, replacing the active transient.
+     Do not push the active transient to the transient stack.
+
+     Unless ‘transient--do-recurse’ is explicitly used, this pre-command
+     is automatically used for suffixes that are prefixes themselves,
+     i.e., for sub-prefixes.
+
+ -- Function: transient--do-suspend
+     Suspend the active transient, saving the transient stack.
+
+     This is used by the command ‘transient-suspend’ and optionally also
+     by “external events” such as ‘handle-switch-frame’.  Such bindings
+     should be added to ‘transient-predicate-map’.
+
+Pre-commands for Non-Suffixes
+-----------------------------
+
+By default, non-suffixes (commands that are bound in other keymaps
+beside the transient keymap) cannot be invoked.  Trying to invoke such a
+command results in a warning and the transient stays active.
+
+   If you want a different behavior, then set the ‘transient-non-suffix’
+slot of the transient prefix command.  The value should be a boolean,
+answering the question, "is it allowed to invoke non-suffix commands?, a
+pre-command function, or a shorthand for such a function.
+
+   If the value is ‘t’, then non-suffixes can be invoked, when it is
+‘nil’ (the default) then they cannot be invoked.
+
+   The only other recommended value is ‘leave’.  If that is used, then
+non-suffixes can be invoked, but if one is invoked, then that exits the
+transient.
+
+ -- Function: transient--do-warn
+     Call ‘transient-undefined’ and stay transient.
+
+ -- Function: transient--do-stay
+     Call the command without exporting variables and stay transient.
+
+ -- Function: transient--do-leave
+     Call the command without exporting variables and exit the
+     transient.
+
+Special Pre-Commands
+--------------------
+
+ -- Function: transient--do-quit-one
+     If active, quit help or edit mode, else exit the active transient.
+
+     This is used when the user pressed ‘C-g’.
+
+ -- Function: transient--do-quit-all
+     Exit all transients without saving the transient stack.
+
+     This is used when the user pressed ‘C-q’.
+
+ -- Function: transient--do-suspend
+     Suspend the active transient, saving the transient stack.
+
+     This is used when the user pressed ‘C-z’.
+
+
+File: transient.info,  Node: Classes and Methods,  Next: FAQ,  Prev: Defining New Commands,  Up: Top
+
+5 Classes and Methods
+*********************
+
+Transient uses classes and generic functions to make it possible to
+define new types of suffix commands that are similar to existing types,
+but behave differently in some aspects.  It does the same for groups and
+prefix commands, though at least for prefix commands that *currently*
+appears to be less important.
+
+   Every prefix, infix and suffix command is associated with an object,
+which holds information that controls certain aspects of its behavior.
+This happens in two ways.
+
+   • Associating a command with a certain class gives the command a
+     type.  This makes it possible to use generic functions to do
+     certain things that have to be done differently depending on what
+     type of command it acts on.
+
+     That in turn makes it possible for third-parties to add new types
+     without having to convince the maintainer of Transient that that
+     new type is important enough to justify adding a special case to a
+     dozen or so functions.
+
+   • Associating a command with an object makes it possible to easily
+     store information that is specific to that particular command.
+
+     Two commands may have the same type, but obviously their key
+     bindings and descriptions still have to be different, for example.
+
+     The values of some slots are functions.  The ‘reader’ slot for
+     example holds a function that is used to read a new value for an
+     infix command.  The values of such slots are regular functions.
+
+     Generic functions are used when a function should do something
+     different based on the type of the command, i.e., when all commands
+     of a certain type should behave the same way but different from the
+     behavior for other types.  Object slots that hold a regular
+     function as value are used when the task that they perform is
+     likely to differ even between different commands of the same type.
+
+* Menu:
+
+* Group Classes::
+* Group Methods::
+* Prefix Classes::
+* Suffix Classes::
+* Suffix Methods::
+* Prefix Slots::
+* Suffix Slots::
+* Predicate Slots::
+
+
+File: transient.info,  Node: Group Classes,  Next: Group Methods,  Up: Classes and Methods
+
+5.1 Group Classes
+=================
+
+The type of a group can be specified using the ‘:class’ property at the
+beginning of the class specification, e.g., ‘[:class transient-columns
+...]’ in a call to ‘transient-define-prefix’.
+
+   • The abstract ‘transient-child’ class is the base class of both
+     ‘transient-group’ (and therefore all groups) as well as of
+     ‘transient-suffix’ (and therefore all suffix and infix commands).
+
+     This class exists because the elements (or “children”) of certain
+     groups can be other groups instead of suffix and infix commands.
+
+   • The abstract ‘transient-group’ class is the superclass of all other
+     group classes.
+
+   • The ‘transient-column’ class is the simplest group.
+
+     This is the default “flat” group.  If the class is not specified
+     explicitly and the first element is not a vector (i.e., not a
+     group), then this class is used.
+
+     This class displays each element on a separate line.
+
+   • The ‘transient-row’ class displays all elements on a single line.
+
+   • The ‘transient-columns’ class displays commands organized in
+     columns.
+
+     Direct elements have to be groups whose elements have to be
+     commands or strings.  Each subgroup represents a column.  This
+     class takes care of inserting the subgroups’ elements.
+
+     This is the default “nested” group.  If the class is not specified
+     explicitly and the first element is a vector (i.e., a group), then
+     this class is used.
+
+   • The ‘transient-subgroups’ class wraps other groups.
+
+     Direct elements have to be groups whose elements have to be
+     commands or strings.  This group inserts an empty line between
+     subgroups.  The subgroups themselves are responsible for displaying
+     their elements.
+
+
+File: transient.info,  Node: Group Methods,  Next: Prefix Classes,  Prev: Group Classes,  Up: Classes and Methods
+
+5.2 Group Methods
+=================
+
+ -- Function: transient-setup-children group children
+     This generic function can be used to setup the children or a group.
+
+     The default implementation usually just returns the children
+     unchanged, but if the ‘setup-children’ slot of GROUP is non-‘nil’,
+     then it calls that function with CHILDREN as the only argument and
+     returns the value.
+
+     The children are given as a (potentially empty) list consisting of
+     either group or suffix specifications.  These functions can make
+     arbitrary changes to the children including constructing new
+     children from scratch.
+
+ -- Function: transient--insert-group group
+     This generic function formats the group and its elements and
+     inserts the result into the current buffer, which is a temporary
+     buffer.  The contents of that buffer are later inserted into the
+     popup buffer.
+
+     Functions that are called by this function may need to operate in
+     the buffer from which the transient was called.  To do so they can
+     temporarily make the ‘transient--source-buffer’ the current buffer.
+
+
+File: transient.info,  Node: Prefix Classes,  Next: Suffix Classes,  Prev: Group Methods,  Up: Classes and Methods
+
+5.3 Prefix Classes
+==================
+
+Currently the ‘transient-prefix’ class is being used for all prefix
+commands and there is only a single generic function that can be
+specialized based on the class of a prefix command.
+
+ -- Function: transient--history-init obj
+     This generic function is called while setting up the transient and
+     is responsible for initializing the ‘history’ slot.  This is the
+     transient-wide history; many individual infixes also have a history
+     of their own.
+
+     The default (and currently only) method extracts the value from the
+     global variable ‘transient-history’.
+
+   A transient prefix command’s object is stored in the
+‘transient--prefix’ property of the command symbol.  While a transient
+is active, a clone of that object is stored in the variable
+‘transient--prefix’.  A clone is used because some changes that are made
+to the active transient’s object should not affect later invocations.
+
+
+File: transient.info,  Node: Suffix Classes,  Next: Suffix Methods,  Prev: Prefix Classes,  Up: Classes and Methods
+
+5.4 Suffix Classes
+==================
+
+   • All suffix and infix classes derive from ‘transient-suffix’, which
+     in turn derives from ‘transient-child’, from which
+     ‘transient-group’ also derives (see *note Group Classes::).
+
+   • All infix classes derive from the abstract ‘transient-infix’ class,
+     which in turn derives from the ‘transient-suffix’ class.
+
+     Infixes are a special type of suffixes.  The primary difference is
+     that infixes always use the ‘transient--do-stay’ pre-command, while
+     non-infix suffixes use a variety of pre-commands (see *note
+     Transient State::).  Doing that is most easily achieved by using
+     this class, though theoretically it would be possible to define an
+     infix class that does not do so.  If you do that then you get to
+     implement many methods.
+
+     Also, infixes and non-infix suffixes are usually defined using
+     different macros (see *note Defining Suffix and Infix Commands::).
+
+   • Classes used for infix commands that represent arguments should be
+     derived from the abstract ‘transient-argument’ class.
+
+   • The ‘transient-switch’ class (or a derived class) is used for infix
+     arguments that represent command-line switches (arguments that do
+     not take a value).
+
+   • The ‘transient-option’ class (or a derived class) is used for infix
+     arguments that represent command-line options (arguments that do
+     take a value).
+
+   • The ‘transient-switches’ class can be used for a set of mutually
+     exclusive command-line switches.
+
+   • The ‘transient-files’ class can be used for a ‘--’ argument that
+     indicates that all remaining arguments are files.
+
+   • Classes used for infix commands that represent variables should
+     derived from the abstract ‘transient-variable’ class.
+
+   • The ‘transient-information’ class is special in that suffixes that
+     use this class are not associated with a command and thus also not
+     with any key binding.  Such suffixes are only used to display
+     arbitrary information, and that anywhere a suffix can appear.
+     Display-only suffix specifications take this form:
+
+          ([LEVEL] :info DESCRIPTION [KEYWORD VALUE]...)
+
+     The ‘:info’ keyword argument replaces the ‘:description’ keyword
+     used for other suffix classes.  Other keyword arguments that you
+     might want to set, include ‘:face’, predicate keywords (such as
+     ‘:if’), and ‘:format’.  By default the value of ‘:format’ includes
+     ‘%k’, which for this class is replaced with the empty string or
+     spaces, if keys are being padded in the containing group.
+
+   Magit defines additional classes, which can serve as examples for the
+fancy things you can do without modifying Transient.  Some of these
+classes will likely get generalized and added to Transient.  For now
+they are very much subject to change and not documented.
+
+
+File: transient.info,  Node: Suffix Methods,  Next: Prefix Slots,  Prev: Suffix Classes,  Up: Classes and Methods
+
+5.5 Suffix Methods
+==================
+
+To get information about the methods implementing these generic
+functions use ‘describe-function’.
+
+* Menu:
+
+* Suffix Value Methods::
+* Suffix Format Methods::
+
+
+File: transient.info,  Node: Suffix Value Methods,  Next: Suffix Format Methods,  Up: Suffix Methods
+
+5.5.1 Suffix Value Methods
+--------------------------
+
+ -- Function: transient-init-value obj
+     This generic function sets the initial value of the object OBJ.
+
+     This function is called for all suffix commands, but unless a
+     concrete method is implemented this falls through to the default
+     implementation, which is a noop.  In other words this usually only
+     does something for infix commands, but note that this is not
+     implemented for the abstract class ‘transient-infix’, so if your
+     class derives from that directly, then you must implement a method.
+
+ -- Function: transient-infix-read obj
+     This generic function determines the new value of the infix object
+     OBJ.
+
+     This function merely determines the value; ‘transient-infix-set’ is
+     used to actually store the new value in the object.
+
+     For most infix classes this is done by reading a value from the
+     user using the reader specified by the ‘reader’ slot (using the
+     ‘transient-infix-value’ method described below).
+
+     For some infix classes the value is changed without reading
+     anything in the minibuffer, i.e., the mere act of invoking the
+     infix command determines what the new value should be, based on the
+     previous value.
+
+ -- Function: transient-prompt obj
+     This generic function returns the prompt to be used to read infix
+     object OBJ’s value.
+
+ -- Function: transient-infix-set obj value
+     This generic function sets the value of infix object OBJ to VALUE.
+
+ -- Function: transient-infix-value obj
+     This generic function returns the value of the suffix object OBJ.
+
+     This function is called by ‘transient-args’ (which see), meaning
+     this function is how the value of a transient is determined so that
+     the invoked suffix command can use it.
+
+     Currently most values are strings, but that is not set in stone.
+     ‘nil’ is not a value, it means “no value”.
+
+     Usually only infixes have a value, but see the method for
+     ‘transient-suffix’.
+
+ -- Function: transient-init-scope obj
+     This generic function sets the scope of the suffix object OBJ.
+
+     The scope is actually a property of the transient prefix, not of
+     individual suffixes.  However it is possible to invoke a suffix
+     command directly instead of from a transient.  In that case, if the
+     suffix expects a scope, then it has to determine that itself and
+     store it in its ‘scope’ slot.
+
+     This function is called for all suffix commands, but unless a
+     concrete method is implemented this falls through to the default
+     implementation, which is a noop.
+
+
+File: transient.info,  Node: Suffix Format Methods,  Prev: Suffix Value Methods,  Up: Suffix Methods
+
+5.5.2 Suffix Format Methods
+---------------------------
+
+ -- Function: transient-format obj
+     This generic function formats and returns OBJ for display.
+
+     When this function is called, then the current buffer is some
+     temporary buffer.  If you need the buffer from which the prefix
+     command was invoked to be current, then do so by temporarily making
+     ‘transient--source-buffer’ current.
+
+ -- Function: transient-format-key obj
+     This generic function formats OBJ’s ‘key’ for display and returns
+     the result.
+
+ -- Function: transient-format-description obj
+     This generic function formats OBJ’s ‘description’ for display and
+     returns the result.
+
+ -- Function: transient-format-value obj
+     This generic function formats OBJ’s value for display and returns
+     the result.
+
+ -- Function: transient-show-help obj
+     Show help for the prefix, infix or suffix command represented by
+     OBJ.
+
+     Regardless of OBJ’s type, if its ‘show-help’ slot is non-nil, that
+     must be a function, which takes OBJ is its only argument.  It must
+     prepare, display and return a buffer, and select the window used to
+     display it.  The ‘transient-show-help-window’ macro is intended for
+     use in such functions.
+
+     For prefixes, show the info manual, if that is specified using the
+     ‘info-manual’ slot.  Otherwise, show the manpage if that is
+     specified using the ‘man-page’ slot.  Otherwise, show the command’s
+     documentation string.
+
+     For suffixes, show the command’s documentation string.
+
+     For infixes, show the manpage if that is specified.  Otherwise show
+     the command’s documentation string.
+
+ -- Macro: transient-with-help-window &rest body
+     Evaluate BODY, send output to ‘*Help*’ buffer, and display it in a
+     window.  Select the help window, and make the help buffer current
+     and return it.
+
+
+File: transient.info,  Node: Prefix Slots,  Next: Suffix Slots,  Prev: Suffix Methods,  Up: Classes and Methods
+
+5.6 Prefix Slots
+================
+
+   • ‘show-help’, ‘man-page’ or ‘info-manual’ can be used to specify the
+     documentation for the prefix and its suffixes.  The command
+     ‘transient-help’ uses the function ‘transient-show-help’ (which
+     see) to lookup and use these values.
+
+   • ‘history-key’ If multiple prefix commands should share a single
+     value, then this slot has to be set to the same value for all of
+     them.  You probably don’t want that.
+
+   • ‘transient-suffix’ and ‘transient-non-suffix’ play a part when
+     determining whether the currently active transient prefix command
+     remains active/transient when a suffix or arbitrary non-suffix
+     command is invoked.  See *note Transient State::.
+
+   • ‘refresh-suffixes’ Normally suffix objects and keymaps are only
+     setup once, when the prefix is invoked.  Setting this to ‘t’,
+     causes them to be recreated after every command.  This is useful
+     when using ‘:if...’ predicates, and those need to be rerun for some
+     reason.  Doing this is somewhat costly, and there is a risk of
+     losing state, so this is disabled by default and still considered
+     experimental.
+
+   • ‘incompatible’ A list of lists.  Each sub-list specifies a set of
+     mutually exclusive arguments.  Enabling one of these arguments
+     causes the others to be disabled.  An argument may appear in
+     multiple sub-lists.  Arguments must me given in the same form as
+     used in the ‘argument’ or ‘argument-format’ slot of the respective
+     suffix objects, usually something like ‘--switch’ or ‘--option=%s’.
+     For options and ‘transient-switches’ suffixes it is also possible
+     to match against a specific value, as returned by
+     ‘transient-infix-value’, for example, ‘--option=one’.
+
+   • ‘scope’ For some transients it might be necessary to have a sort of
+     secondary value, called a “scope”.  See ‘transient-define-prefix’.
+
+Internal Prefix Slots
+---------------------
+
+These slots are mostly intended for internal use.  They should not be
+set in calls to ‘transient-define-prefix’.
+
+   • ‘prototype’ When a transient prefix command is invoked, then a
+     clone of that object is stored in the global variable
+     ‘transient--prefix’ and the prototype is stored in the clone’s
+     ‘prototype’ slot.
+
+   • ‘command’ The command, a symbol.  Each transient prefix command
+     consists of a command, which is stored in a symbol’s function slot
+     and an object, which is stored in the ‘transient--prefix’ property
+     of the same symbol.
+
+   • ‘level’ The level of the prefix commands.  The suffix commands
+     whose layer is equal or lower are displayed.  See *note Enabling
+     and Disabling Suffixes::.
+
+   • ‘value’ The likely outdated value of the prefix.  Instead of
+     accessing this slot directly you should use the function
+     ‘transient-get-value’, which is guaranteed to return the up-to-date
+     value.
+
+   • ‘history’ and ‘history-pos’ are used to keep track of historic
+     values.  Unless you implement your own ‘transient-infix-read’
+     method you should not have to deal with these slots.
+
+
+File: transient.info,  Node: Suffix Slots,  Next: Predicate Slots,  Prev: Prefix Slots,  Up: Classes and Methods
+
+5.7 Suffix Slots
+================
+
+Here we document most of the slots that are only available for suffix
+objects.  Some slots are shared by suffix and group objects, they are
+documented in *note Predicate Slots::.
+
+   Also see *note Suffix Classes::.
+
+Slots of ‘transient-suffix’
+---------------------------
+
+   • ‘key’ The key, a key vector or a key description string.
+
+   • ‘command’ The command, a symbol.
+
+   • ‘transient’ Whether to stay transient.  See *note Transient
+     State::.
+
+   • ‘format’ The format used to display the suffix in the popup buffer.
+     It must contain the following %-placeholders:
+
+        • ‘%k’ For the key.
+        • ‘%d’ For the description.
+        • ‘%v’ For the infix value.  Non-infix suffixes don’t have a
+          value.
+
+   • ‘description’ The description, either a string or a function, which
+     is called with zero or one argument (the suffix object), and
+     returns a string.
+
+   • ‘face’ Face used for the description.  In simple cases it is easier
+     to use this instead of using a function as ‘description’ and adding
+     the styling there.  ‘face’ is appended using
+     ‘add-face-text-property’.
+
+   • ‘show-help’ A function used to display help for the suffix.  If
+     unspecified, the prefix controls how help is displayed for its
+     suffixes.  See also function ‘transient-show-help’.
+
+Slots of ‘transient-infix’
+--------------------------
+
+Some of these slots are only meaningful for some of the subclasses.
+They are defined here anyway to allow sharing certain methods.
+
+   • ‘argument’ The long argument, e.g., ‘--verbose’.
+
+   • ‘shortarg’ The short argument, e.g., ‘-v’.
+
+   • ‘value’ The value.  Should not be accessed directly.
+
+   • ‘init-value’ Function that is responsible for setting the object’s
+     value.  If bound, then this is called with the object as the only
+     argument.  Usually this is not bound, in which case the object’s
+     primary ‘transient-init-value’ method is called instead.
+
+   • ‘unsavable’ Whether the value of the suffix is not saved as part of
+     the prefixes.
+
+   • ‘multi-value’ For options, whether the option can have multiple
+     values.  If this is non-‘nil’, then the values are read using
+     ‘completing-read-multiple’ by default and if you specify your own
+     reader, then it should read the values using that function or
+     similar.
+
+     Supported non-‘nil’ values are:
+
+        • Use ‘rest’ for an option that can have multiple values.  This
+          is useful e.g., for an ‘--’ argument that indicates that all
+          remaining arguments are files (such as ‘git log -- file1
+          file2’).
+
+          In the list returned by ‘transient-args’ such an option and
+          its values are represented by a single list of the form
+          ‘(ARGUMENT . VALUES)’.
+
+        • Use ‘repeat’ for an option that can be specified multiple
+          times.
+
+          In the list returned by ‘transient-args’ each instance of the
+          option and its value appears separately in the usual from, for
+          example: ‘("--another-argument" "--option=first"
+          "--option=second")’.
+
+     In both cases the option’s values have to be specified in the
+     default value of a prefix using the same format as returned by
+     ‘transient-args’, e.g., ‘("--other" "--o=1" "--o=2" ("--" "f1"
+     "f2"))’.
+
+   • ‘always-read’ For options, whether to read a value on every
+     invocation.  If this is ‘nil’, then options that have a value are
+     simply unset and have to be invoked a second time to set a new
+     value.
+
+   • ‘allow-empty’ For options, whether the empty string is a valid
+     value.
+
+   • ‘history-key’ The key used to store the history.  This defaults to
+     the command name.  This is useful when multiple infixes should
+     share the same history because their values are of the same kind.
+
+   • ‘reader’ The function used to read the value of an infix.  Not used
+     for switches.  The function takes three arguments, PROMPT,
+     INITIAL-INPUT and HISTORY, and must return a string.
+
+   • ‘prompt’ The prompt used when reading the value, either a string or
+     a function that takes the object as the only argument and which
+     returns a prompt string.
+
+   • ‘choices’ A list of valid values, or a function that returns such a
+     list.  The latter is not implemented for ‘transient-switches’,
+     because I couldn’t think of a use-case.  How exactly the choices
+     are used varies depending on the class of the suffix.
+
+Slots of ‘transient-variable’
+-----------------------------
+
+   • ‘variable’ The variable.
+
+Slots of ‘transient-switches’
+-----------------------------
+
+   • ‘argument-format’ The display format.  Must contain ‘%s’, one of
+     the ‘choices’ is substituted for that.  E.g., ‘--%s-order’.
+
+   • ‘argument-regexp’ The regexp used to match any one of the switches.
+     E.g., ‘\\(--\\(topo\\|author-date\\|date\\)-order\\)’.
+
+
+File: transient.info,  Node: Predicate Slots,  Prev: Suffix Slots,  Up: Classes and Methods
+
+5.8 Predicate Slots
+===================
+
+Suffix and group objects share some predicate slots that control whether
+a group or suffix should be available depending on some state.  Only one
+of these slots can be used at the same time.  It is undefined what
+happens if you use more than one.
+
+   • ‘if’ Enable if predicate returns non-‘nil’.
+   • ‘if-not’ Enable if predicate returns ‘nil’.
+   • ‘if-non-nil’ Enable if variable’s value is non-‘nil’.
+   • ‘if-nil’ Enable if variable’s value is ‘nil’.
+   • ‘if-mode’ Enable if major-mode matches value.
+   • ‘if-not-mode’ Enable if major-mode does not match value.
+   • ‘if-derived’ Enable if major-mode derives from value.
+   • ‘if-not-derived’ Enable if major-mode does not derive from value.
+
+   By default these predicates run when the prefix command is invoked,
+but this can be changes, using the ‘refresh-suffixes’ prefix slot.  See
+*note Prefix Slots::.
+
+   One more slot is shared between group and suffix classes, ‘level’.
+Like the slots documented above, it is a predicate, but it is used for a
+different purpose.  The value has to be an integer between 1 and 7.
+‘level’ controls whether a suffix or a group should be available
+depending on user preference.  See *note Enabling and Disabling
+Suffixes::.
+
+
+File: transient.info,  Node: FAQ,  Next: Keystroke Index,  Prev: Classes and Methods,  Up: Top
+
+Appendix A FAQ
+**************
+
+A.1 Can I control how the popup buffer is displayed?
+====================================================
+
+Yes, see ‘transient-display-buffer-action’ in *note Configuration::.
+
+A.2 How can I copy text from the popup buffer?
+==============================================
+
+To be able to mark text in Transient’s popup buffer using the mouse, you
+have to add the below binding.  Note that for technical reasons, the
+region won’t be visualized, while doing so.  After you have quit the
+transient popup, you will be able to yank it in another buffer.
+
+     (keymap-set transient-predicate-map
+                 "<mouse-set-region>"
+                 #'transient--do-stay)
+
+A.3 How can I autoload prefix and suffix commands?
+==================================================
+
+If your package only supports Emacs 30, just prefix the definition with
+‘;;;###autoload’.  If your package supports released versions of Emacs,
+you unfortunately have to use a long form autoload comment as described
+in *note (elisp)Autoload::.
+
+     ;;;###autoload (autoload 'magit-dispatch "magit" nil t)
+     (transient-define-prefix magit-dispatch ()
+       ...)
+
+A.4 How does Transient compare to prefix keys and universal arguments?
+======================================================================
+
+See
+<https://github.com/magit/transient/wiki/Comparison-with-prefix-keys-and-universal-arguments>.
+
+A.5 How does Transient compare to Magit-Popup and Hydra?
+========================================================
+
+See
+<https://github.com/magit/transient/wiki/Comparison-with-other-packages>.
+
+A.6 Why did some of the key bindings change?
+============================================
+
+You may have noticed that the bindings for some of the common commands
+do *not* have the prefix ‘C-x’ and that furthermore some of these
+commands are grayed out while others are not.  That unfortunately is a
+bit confusing if the section of common commands is not shown
+permanently, making the following explanation necessary.
+
+   The purpose of usually hiding that section but showing it after the
+user pressed the respective prefix key is to conserve space and not
+overwhelm users with too much noise, while allowing the user to quickly
+list common bindings on demand.
+
+   That however should not keep us from using the best possible key
+bindings.  The bindings that do use a prefix do so to avoid wasting too
+many non-prefix bindings, keeping them available for use in individual
+transients.  The bindings that do not use a prefix and that are *not*
+grayed out are very important bindings that are *always* available, even
+when invoking the “common command key prefix” or *any other*
+transient-specific prefix.  The non-prefix keys that *are* grayed out
+however, are not available when any incomplete prefix key sequence is
+active.  They do not use the “common command key prefix” because it is
+likely that users want to invoke them several times in a row and e.g.,
+‘M-p M-p M-p’ is much more convenient than ‘C-x M-p C-x M-p C-x M-p’.
+
+   You may also have noticed that the “Set” command is bound to ‘C-x s’,
+while Magit-Popup used to bind ‘C-c C-c’ instead.  I have seen several
+users praise the latter binding (sic), so I did not change it
+willy-nilly.  The reason that I changed it is that using different
+prefix keys for different common commands, would have made the temporary
+display of the common commands even more confusing, i.e., after pressing
+‘C-c’ all the bindings that begin with the ‘C-x’ prefix would be grayed
+out.
+
+   Using a single prefix for common commands key means that all other
+potential prefix keys can be used for transient-specific commands
+*without* the section of common commands also popping up.  ‘C-c’ in
+particular is a prefix that I want to (and already do) use for Magit,
+and also using that for a common command would prevent me from doing so.
+
+   (Also see the next question.)
+
+A.7 Why does ‘q’ not quit popups anymore?
+=========================================
+
+I agree that ‘q’ is a good binding for commands that quit something.
+This includes quitting whatever transient is currently active, but it
+also includes quitting whatever it is that some specific transient is
+controlling.  The transient ‘magit-blame’ for example binds ‘q’ to the
+command that turns ‘magit-blame-mode’ off.
+
+   So I had to decide if ‘q’ should quit the active transient (like
+Magit-Popup used to) or whether ‘C-g’ should do that instead, so that
+‘q’ could be bound in individual transient to whatever commands make
+sense for them.  Because all other letters are already reserved for use
+by individual transients, I have decided to no longer make an exception
+for ‘q’.
+
+   If you want to get ‘q’’s old binding back then you can do so.  Doing
+that is a bit more complicated than changing a single key binding, so I
+have implemented a function, ‘transient-bind-q-to-quit’ that makes the
+necessary changes.  See its documentation string for more information.
+
+
+File: transient.info,  Node: Keystroke Index,  Next: Command and Function Index,  Prev: FAQ,  Up: Top
+
+Appendix B Keystroke Index
+**************************
+
+
+* Menu:
+
+* C-g:                                   Aborting and Resuming Transients.
+                                                               (line 27)
+* C-g <1>:                               Aborting and Resuming Transients.
+                                                               (line 27)
+* C-h:                                   Getting Help for Suffix Commands.
+                                                               (line 11)
+* C-M-n:                                 Using History.        (line 18)
+* C-M-p:                                 Using History.        (line 13)
+* C-q:                                   Aborting and Resuming Transients.
+                                                               (line 36)
+* C-x a:                                 Enabling and Disabling Suffixes.
+                                                               (line 68)
+* C-x C-k:                               Saving Values.        (line 29)
+* C-x C-s:                               Saving Values.        (line 25)
+* C-x l:                                 Enabling and Disabling Suffixes.
+                                                               (line 43)
+* C-x n:                                 Using History.        (line 18)
+* C-x p:                                 Using History.        (line 13)
+* C-x s:                                 Saving Values.        (line 21)
+* C-x t:                                 Common Suffix Commands.
+                                                               (line 18)
+* C-z:                                   Aborting and Resuming Transients.
+                                                               (line 41)
+
+
+File: transient.info,  Node: Command and Function Index,  Next: Variable Index,  Prev: Keystroke Index,  Up: Top
+
+Appendix C Command and Function Index
+*************************************
+
+
+* Menu:
+
+* transient--do-call:                    Transient State.     (line 125)
+* transient--do-exit:                    Transient State.     (line 117)
+* transient--do-leave:                   Transient State.     (line 193)
+* transient--do-quit-all:                Transient State.     (line 205)
+* transient--do-quit-one:                Transient State.     (line 200)
+* transient--do-recurse:                 Transient State.     (line 133)
+* transient--do-replace:                 Transient State.     (line 153)
+* transient--do-return:                  Transient State.     (line 120)
+* transient--do-stack:                   Transient State.     (line 145)
+* transient--do-stay:                    Transient State.     (line 105)
+* transient--do-stay <1>:                Transient State.     (line 190)
+* transient--do-suspend:                 Transient State.     (line 161)
+* transient--do-suspend <1>:             Transient State.     (line 210)
+* transient--do-warn:                    Transient State.     (line 187)
+* transient--history-init:               Prefix Classes.      (line  10)
+* transient--insert-group:               Group Methods.       (line  19)
+* transient-active-prefix:               Using Infix Arguments.
+                                                              (line  61)
+* transient-append-suffix:               Modifying Existing Transients.
+                                                              (line  51)
+* transient-arg-value:                   Using Infix Arguments.
+                                                              (line  31)
+* transient-args:                        Using Infix Arguments.
+                                                              (line  22)
+* transient-define-argument:             Defining Suffix and Infix Commands.
+                                                              (line  57)
+* transient-define-infix:                Defining Suffix and Infix Commands.
+                                                              (line  26)
+* transient-define-prefix:               Defining Transients. (line  13)
+* transient-define-suffix:               Defining Suffix and Infix Commands.
+                                                              (line   9)
+* transient-format:                      Suffix Format Methods.
+                                                              (line   6)
+* transient-format-description:          Suffix Format Methods.
+                                                              (line  18)
+* transient-format-key:                  Suffix Format Methods.
+                                                              (line  14)
+* transient-format-value:                Suffix Format Methods.
+                                                              (line  22)
+* transient-get-suffix:                  Modifying Existing Transients.
+                                                              (line  73)
+* transient-help:                        Getting Help for Suffix Commands.
+                                                              (line  11)
+* transient-history-next:                Using History.       (line  18)
+* transient-history-prev:                Using History.       (line  13)
+* transient-infix-read:                  Suffix Value Methods.
+                                                              (line  16)
+* transient-infix-set:                   Suffix Value Methods.
+                                                              (line  36)
+* transient-infix-value:                 Suffix Value Methods.
+                                                              (line  39)
+* transient-init-scope:                  Suffix Value Methods.
+                                                              (line  52)
+* transient-init-value:                  Suffix Value Methods.
+                                                              (line   6)
+* transient-insert-suffix:               Modifying Existing Transients.
+                                                              (line  49)
+* transient-prompt:                      Suffix Value Methods.
+                                                              (line  32)
+* transient-quit-all:                    Aborting and Resuming Transients.
+                                                              (line  36)
+* transient-quit-one:                    Aborting and Resuming Transients.
+                                                              (line  27)
+* transient-quit-seq:                    Aborting and Resuming Transients.
+                                                              (line  27)
+* transient-remove-suffix:               Modifying Existing Transients.
+                                                              (line  70)
+* transient-replace-suffix:              Modifying Existing Transients.
+                                                              (line  66)
+* transient-reset:                       Saving Values.       (line  29)
+* transient-resume:                      Aborting and Resuming Transients.
+                                                              (line  53)
+* transient-save:                        Saving Values.       (line  25)
+* transient-scroll-down:                 Other Commands.      (line  17)
+* transient-scroll-up:                   Other Commands.      (line  12)
+* transient-set:                         Saving Values.       (line  21)
+* transient-set-level:                   Enabling and Disabling Suffixes.
+                                                              (line  43)
+* transient-setup-children:              Group Methods.       (line   6)
+* transient-show-help:                   Suffix Format Methods.
+                                                              (line  26)
+* transient-suffix-put:                  Modifying Existing Transients.
+                                                              (line  77)
+* transient-suffixes:                    Using Infix Arguments.
+                                                              (line  38)
+* transient-suspend:                     Aborting and Resuming Transients.
+                                                              (line  41)
+* transient-toggle-common:               Common Suffix Commands.
+                                                              (line  18)
+* transient-toggle-level-limit:          Enabling and Disabling Suffixes.
+                                                              (line  68)
+* transient-with-help-window:            Suffix Format Methods.
+                                                              (line  46)
+
+
+File: transient.info,  Node: Variable Index,  Next: Concept Index,  Prev: Command and Function Index,  Up: Top
+
+Appendix D Variable Index
+*************************
+
+
+* Menu:
+
+* transient-align-variable-pitch:        Configuration.       (line 185)
+* transient-current-command:             Using Infix Arguments.
+                                                              (line  52)
+* transient-current-prefix:              Using Infix Arguments.
+                                                              (line  56)
+* transient-current-suffixes:            Using Infix Arguments.
+                                                              (line  44)
+* transient-default-level:               Enabling and Disabling Suffixes.
+                                                              (line  33)
+* transient-detect-key-conflicts:        Configuration.       (line 210)
+* transient-display-buffer-action:       Configuration.       (line  51)
+* transient-enable-popup-navigation:     Configuration.       (line  36)
+* transient-force-fixed-pitch:           Configuration.       (line 198)
+* transient-force-single-column:         Configuration.       (line  93)
+* transient-hide-during-minibuffer-read: Configuration.       (line 181)
+* transient-highlight-higher-levels:     Configuration.       (line 223)
+* transient-highlight-mismatched-keys:   Configuration.       (line 135)
+* transient-history-file:                Using History.       (line  33)
+* transient-history-limit:               Using History.       (line  37)
+* transient-levels-file:                 Enabling and Disabling Suffixes.
+                                                              (line  38)
+* transient-mode-line-format:            Configuration.       (line 102)
+* transient-read-with-initial-input:     Configuration.       (line 174)
+* transient-semantic-coloring:           Configuration.       (line 126)
+* transient-show-common-commands:        Common Suffix Commands.
+                                                              (line  23)
+* transient-show-popup:                  Configuration.       (line  15)
+* transient-substitute-key-function:     Configuration.       (line 153)
+* transient-values-file:                 Saving Values.       (line  31)
+
+
+File: transient.info,  Node: Concept Index,  Next: GNU General Public License,  Prev: Variable Index,  Up: Top
+
+Appendix E Concept Index
+************************
+
+
+* Menu:
+
+* aborting transients:                   Aborting and Resuming Transients.
+                                                               (line  6)
+* classes and methods:                   Classes and Methods.  (line  6)
+* command dispatchers:                   Technical Introduction.
+                                                               (line 39)
+* common suffix commands:                Common Suffix Commands.
+                                                               (line  6)
+* defining infix commands:               Defining Suffix and Infix Commands.
+                                                               (line  6)
+* defining suffix commands:              Defining Suffix and Infix Commands.
+                                                               (line  6)
+* disabling suffixes:                    Enabling and Disabling Suffixes.
+                                                               (line  6)
+* enabling suffixes:                     Enabling and Disabling Suffixes.
+                                                               (line  6)
+* getting help:                          Getting Help for Suffix Commands.
+                                                               (line  6)
+* group specifications:                  Group Specifications. (line  6)
+* invoking transients:                   Invoking Transients.  (line  6)
+* levels:                                Enabling and Disabling Suffixes.
+                                                               (line 10)
+* modifying existing transients:         Modifying Existing Transients.
+                                                               (line  6)
+* quit transient:                        Aborting and Resuming Transients.
+                                                               (line  6)
+* resuming transients:                   Aborting and Resuming Transients.
+                                                               (line  6)
+* saving values of arguments:            Saving Values.        (line  6)
+* scope of a transient:                  Defining Transients.  (line 43)
+* suffix specifications:                 Suffix Specifications.
+                                                               (line  6)
+* transient state:                       Transient State.      (line  6)
+* transient-level:                       Enabling and Disabling Suffixes.
+                                                               (line 15)
+* value history:                         Using History.        (line  6)
+
+
+File: transient.info,  Node: GNU General Public License,  Prev: Concept Index,  Up: Top
+
+Appendix F GNU General Public License
+*************************************
+
+                        Version 3, 29 June 2007
+
+     Copyright © 2007 Free Software Foundation, Inc. <https://fsf.org/>
+
+     Everyone is permitted to copy and distribute verbatim copies of this
+     license document, but changing it is not allowed.
+
+Preamble
+========
+
+The GNU General Public License is a free, copyleft license for software
+and other kinds of works.
+
+   The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program—to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+   When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+   To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+   For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+   Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+   For the developers’ and authors’ protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users’ and
+authors’ sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+   Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users’ freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+   Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+   The precise terms and conditions for copying, distribution and
+modification follow.
+
+TERMS AND CONDITIONS
+====================
+
+  0. Definitions.
+
+     “This License” refers to version 3 of the GNU General Public
+     License.
+
+     “Copyright” also means copyright-like laws that apply to other
+     kinds of works, such as semiconductor masks.
+
+     “The Program” refers to any copyrightable work licensed under this
+     License.  Each licensee is addressed as “you”.  “Licensees” and
+     “recipients” may be individuals or organizations.
+
+     To “modify” a work means to copy from or adapt all or part of the
+     work in a fashion requiring copyright permission, other than the
+     making of an exact copy.  The resulting work is called a “modified
+     version” of the earlier work or a work “based on” the earlier work.
+
+     A “covered work” means either the unmodified Program or a work
+     based on the Program.
+
+     To “propagate” a work means to do anything with it that, without
+     permission, would make you directly or secondarily liable for
+     infringement under applicable copyright law, except executing it on
+     a computer or modifying a private copy.  Propagation includes
+     copying, distribution (with or without modification), making
+     available to the public, and in some countries other activities as
+     well.
+
+     To “convey” a work means any kind of propagation that enables other
+     parties to make or receive copies.  Mere interaction with a user
+     through a computer network, with no transfer of a copy, is not
+     conveying.
+
+     An interactive user interface displays “Appropriate Legal Notices”
+     to the extent that it includes a convenient and prominently visible
+     feature that (1) displays an appropriate copyright notice, and (2)
+     tells the user that there is no warranty for the work (except to
+     the extent that warranties are provided), that licensees may convey
+     the work under this License, and how to view a copy of this
+     License.  If the interface presents a list of user commands or
+     options, such as a menu, a prominent item in the list meets this
+     criterion.
+
+  1. Source Code.
+
+     The “source code” for a work means the preferred form of the work
+     for making modifications to it.  “Object code” means any non-source
+     form of a work.
+
+     A “Standard Interface” means an interface that either is an
+     official standard defined by a recognized standards body, or, in
+     the case of interfaces specified for a particular programming
+     language, one that is widely used among developers working in that
+     language.
+
+     The “System Libraries” of an executable work include anything,
+     other than the work as a whole, that (a) is included in the normal
+     form of packaging a Major Component, but which is not part of that
+     Major Component, and (b) serves only to enable use of the work with
+     that Major Component, or to implement a Standard Interface for
+     which an implementation is available to the public in source code
+     form.  A “Major Component”, in this context, means a major
+     essential component (kernel, window system, and so on) of the
+     specific operating system (if any) on which the executable work
+     runs, or a compiler used to produce the work, or an object code
+     interpreter used to run it.
+
+     The “Corresponding Source” for a work in object code form means all
+     the source code needed to generate, install, and (for an executable
+     work) run the object code and to modify the work, including scripts
+     to control those activities.  However, it does not include the
+     work’s System Libraries, or general-purpose tools or generally
+     available free programs which are used unmodified in performing
+     those activities but which are not part of the work.  For example,
+     Corresponding Source includes interface definition files associated
+     with source files for the work, and the source code for shared
+     libraries and dynamically linked subprograms that the work is
+     specifically designed to require, such as by intimate data
+     communication or control flow between those subprograms and other
+     parts of the work.
+
+     The Corresponding Source need not include anything that users can
+     regenerate automatically from other parts of the Corresponding
+     Source.
+
+     The Corresponding Source for a work in source code form is that
+     same work.
+
+  2. Basic Permissions.
+
+     All rights granted under this License are granted for the term of
+     copyright on the Program, and are irrevocable provided the stated
+     conditions are met.  This License explicitly affirms your unlimited
+     permission to run the unmodified Program.  The output from running
+     a covered work is covered by this License only if the output, given
+     its content, constitutes a covered work.  This License acknowledges
+     your rights of fair use or other equivalent, as provided by
+     copyright law.
+
+     You may make, run and propagate covered works that you do not
+     convey, without conditions so long as your license otherwise
+     remains in force.  You may convey covered works to others for the
+     sole purpose of having them make modifications exclusively for you,
+     or provide you with facilities for running those works, provided
+     that you comply with the terms of this License in conveying all
+     material for which you do not control copyright.  Those thus making
+     or running the covered works for you must do so exclusively on your
+     behalf, under your direction and control, on terms that prohibit
+     them from making any copies of your copyrighted material outside
+     their relationship with you.
+
+     Conveying under any other circumstances is permitted solely under
+     the conditions stated below.  Sublicensing is not allowed; section
+     10 makes it unnecessary.
+
+  3. Protecting Users’ Legal Rights From Anti-Circumvention Law.
+
+     No covered work shall be deemed part of an effective technological
+     measure under any applicable law fulfilling obligations under
+     article 11 of the WIPO copyright treaty adopted on 20 December
+     1996, or similar laws prohibiting or restricting circumvention of
+     such measures.
+
+     When you convey a covered work, you waive any legal power to forbid
+     circumvention of technological measures to the extent such
+     circumvention is effected by exercising rights under this License
+     with respect to the covered work, and you disclaim any intention to
+     limit operation or modification of the work as a means of
+     enforcing, against the work’s users, your or third parties’ legal
+     rights to forbid circumvention of technological measures.
+
+  4. Conveying Verbatim Copies.
+
+     You may convey verbatim copies of the Program’s source code as you
+     receive it, in any medium, provided that you conspicuously and
+     appropriately publish on each copy an appropriate copyright notice;
+     keep intact all notices stating that this License and any
+     non-permissive terms added in accord with section 7 apply to the
+     code; keep intact all notices of the absence of any warranty; and
+     give all recipients a copy of this License along with the Program.
+
+     You may charge any price or no price for each copy that you convey,
+     and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+     You may convey a work based on the Program, or the modifications to
+     produce it from the Program, in the form of source code under the
+     terms of section 4, provided that you also meet all of these
+     conditions:
+
+       a. The work must carry prominent notices stating that you
+          modified it, and giving a relevant date.
+
+       b. The work must carry prominent notices stating that it is
+          released under this License and any conditions added under
+          section 7.  This requirement modifies the requirement in
+          section 4 to “keep intact all notices”.
+
+       c. You must license the entire work, as a whole, under this
+          License to anyone who comes into possession of a copy.  This
+          License will therefore apply, along with any applicable
+          section 7 additional terms, to the whole of the work, and all
+          its parts, regardless of how they are packaged.  This License
+          gives no permission to license the work in any other way, but
+          it does not invalidate such permission if you have separately
+          received it.
+
+       d. If the work has interactive user interfaces, each must display
+          Appropriate Legal Notices; however, if the Program has
+          interactive interfaces that do not display Appropriate Legal
+          Notices, your work need not make them do so.
+
+     A compilation of a covered work with other separate and independent
+     works, which are not by their nature extensions of the covered
+     work, and which are not combined with it such as to form a larger
+     program, in or on a volume of a storage or distribution medium, is
+     called an “aggregate” if the compilation and its resulting
+     copyright are not used to limit the access or legal rights of the
+     compilation’s users beyond what the individual works permit.
+     Inclusion of a covered work in an aggregate does not cause this
+     License to apply to the other parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+     You may convey a covered work in object code form under the terms
+     of sections 4 and 5, provided that you also convey the
+     machine-readable Corresponding Source under the terms of this
+     License, in one of these ways:
+
+       a. Convey the object code in, or embodied in, a physical product
+          (including a physical distribution medium), accompanied by the
+          Corresponding Source fixed on a durable physical medium
+          customarily used for software interchange.
+
+       b. Convey the object code in, or embodied in, a physical product
+          (including a physical distribution medium), accompanied by a
+          written offer, valid for at least three years and valid for as
+          long as you offer spare parts or customer support for that
+          product model, to give anyone who possesses the object code
+          either (1) a copy of the Corresponding Source for all the
+          software in the product that is covered by this License, on a
+          durable physical medium customarily used for software
+          interchange, for a price no more than your reasonable cost of
+          physically performing this conveying of source, or (2) access
+          to copy the Corresponding Source from a network server at no
+          charge.
+
+       c. Convey individual copies of the object code with a copy of the
+          written offer to provide the Corresponding Source.  This
+          alternative is allowed only occasionally and noncommercially,
+          and only if you received the object code with such an offer,
+          in accord with subsection 6b.
+
+       d. Convey the object code by offering access from a designated
+          place (gratis or for a charge), and offer equivalent access to
+          the Corresponding Source in the same way through the same
+          place at no further charge.  You need not require recipients
+          to copy the Corresponding Source along with the object code.
+          If the place to copy the object code is a network server, the
+          Corresponding Source may be on a different server (operated by
+          you or a third party) that supports equivalent copying
+          facilities, provided you maintain clear directions next to the
+          object code saying where to find the Corresponding Source.
+          Regardless of what server hosts the Corresponding Source, you
+          remain obligated to ensure that it is available for as long as
+          needed to satisfy these requirements.
+
+       e. Convey the object code using peer-to-peer transmission,
+          provided you inform other peers where the object code and
+          Corresponding Source of the work are being offered to the
+          general public at no charge under subsection 6d.
+
+     A separable portion of the object code, whose source code is
+     excluded from the Corresponding Source as a System Library, need
+     not be included in conveying the object code work.
+
+     A “User Product” is either (1) a “consumer product”, which means
+     any tangible personal property which is normally used for personal,
+     family, or household purposes, or (2) anything designed or sold for
+     incorporation into a dwelling.  In determining whether a product is
+     a consumer product, doubtful cases shall be resolved in favor of
+     coverage.  For a particular product received by a particular user,
+     “normally used” refers to a typical or common use of that class of
+     product, regardless of the status of the particular user or of the
+     way in which the particular user actually uses, or expects or is
+     expected to use, the product.  A product is a consumer product
+     regardless of whether the product has substantial commercial,
+     industrial or non-consumer uses, unless such uses represent the
+     only significant mode of use of the product.
+
+     “Installation Information” for a User Product means any methods,
+     procedures, authorization keys, or other information required to
+     install and execute modified versions of a covered work in that
+     User Product from a modified version of its Corresponding Source.
+     The information must suffice to ensure that the continued
+     functioning of the modified object code is in no case prevented or
+     interfered with solely because modification has been made.
+
+     If you convey an object code work under this section in, or with,
+     or specifically for use in, a User Product, and the conveying
+     occurs as part of a transaction in which the right of possession
+     and use of the User Product is transferred to the recipient in
+     perpetuity or for a fixed term (regardless of how the transaction
+     is characterized), the Corresponding Source conveyed under this
+     section must be accompanied by the Installation Information.  But
+     this requirement does not apply if neither you nor any third party
+     retains the ability to install modified object code on the User
+     Product (for example, the work has been installed in ROM).
+
+     The requirement to provide Installation Information does not
+     include a requirement to continue to provide support service,
+     warranty, or updates for a work that has been modified or installed
+     by the recipient, or for the User Product in which it has been
+     modified or installed.  Access to a network may be denied when the
+     modification itself materially and adversely affects the operation
+     of the network or violates the rules and protocols for
+     communication across the network.
+
+     Corresponding Source conveyed, and Installation Information
+     provided, in accord with this section must be in a format that is
+     publicly documented (and with an implementation available to the
+     public in source code form), and must require no special password
+     or key for unpacking, reading or copying.
+
+  7. Additional Terms.
+
+     “Additional permissions” are terms that supplement the terms of
+     this License by making exceptions from one or more of its
+     conditions.  Additional permissions that are applicable to the
+     entire Program shall be treated as though they were included in
+     this License, to the extent that they are valid under applicable
+     law.  If additional permissions apply only to part of the Program,
+     that part may be used separately under those permissions, but the
+     entire Program remains governed by this License without regard to
+     the additional permissions.
+
+     When you convey a copy of a covered work, you may at your option
+     remove any additional permissions from that copy, or from any part
+     of it.  (Additional permissions may be written to require their own
+     removal in certain cases when you modify the work.)  You may place
+     additional permissions on material, added by you to a covered work,
+     for which you have or can give appropriate copyright permission.
+
+     Notwithstanding any other provision of this License, for material
+     you add to a covered work, you may (if authorized by the copyright
+     holders of that material) supplement the terms of this License with
+     terms:
+
+       a. Disclaiming warranty or limiting liability differently from
+          the terms of sections 15 and 16 of this License; or
+
+       b. Requiring preservation of specified reasonable legal notices
+          or author attributions in that material or in the Appropriate
+          Legal Notices displayed by works containing it; or
+
+       c. Prohibiting misrepresentation of the origin of that material,
+          or requiring that modified versions of such material be marked
+          in reasonable ways as different from the original version; or
+
+       d. Limiting the use for publicity purposes of names of licensors
+          or authors of the material; or
+
+       e. Declining to grant rights under trademark law for use of some
+          trade names, trademarks, or service marks; or
+
+       f. Requiring indemnification of licensors and authors of that
+          material by anyone who conveys the material (or modified
+          versions of it) with contractual assumptions of liability to
+          the recipient, for any liability that these contractual
+          assumptions directly impose on those licensors and authors.
+
+     All other non-permissive additional terms are considered “further
+     restrictions” within the meaning of section 10.  If the Program as
+     you received it, or any part of it, contains a notice stating that
+     it is governed by this License along with a term that is a further
+     restriction, you may remove that term.  If a license document
+     contains a further restriction but permits relicensing or conveying
+     under this License, you may add to a covered work material governed
+     by the terms of that license document, provided that the further
+     restriction does not survive such relicensing or conveying.
+
+     If you add terms to a covered work in accord with this section, you
+     must place, in the relevant source files, a statement of the
+     additional terms that apply to those files, or a notice indicating
+     where to find the applicable terms.
+
+     Additional terms, permissive or non-permissive, may be stated in
+     the form of a separately written license, or stated as exceptions;
+     the above requirements apply either way.
+
+  8. Termination.
+
+     You may not propagate or modify a covered work except as expressly
+     provided under this License.  Any attempt otherwise to propagate or
+     modify it is void, and will automatically terminate your rights
+     under this License (including any patent licenses granted under the
+     third paragraph of section 11).
+
+     However, if you cease all violation of this License, then your
+     license from a particular copyright holder is reinstated (a)
+     provisionally, unless and until the copyright holder explicitly and
+     finally terminates your license, and (b) permanently, if the
+     copyright holder fails to notify you of the violation by some
+     reasonable means prior to 60 days after the cessation.
+
+     Moreover, your license from a particular copyright holder is
+     reinstated permanently if the copyright holder notifies you of the
+     violation by some reasonable means, this is the first time you have
+     received notice of violation of this License (for any work) from
+     that copyright holder, and you cure the violation prior to 30 days
+     after your receipt of the notice.
+
+     Termination of your rights under this section does not terminate
+     the licenses of parties who have received copies or rights from you
+     under this License.  If your rights have been terminated and not
+     permanently reinstated, you do not qualify to receive new licenses
+     for the same material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+     You are not required to accept this License in order to receive or
+     run a copy of the Program.  Ancillary propagation of a covered work
+     occurring solely as a consequence of using peer-to-peer
+     transmission to receive a copy likewise does not require
+     acceptance.  However, nothing other than this License grants you
+     permission to propagate or modify any covered work.  These actions
+     infringe copyright if you do not accept this License.  Therefore,
+     by modifying or propagating a covered work, you indicate your
+     acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+     Each time you convey a covered work, the recipient automatically
+     receives a license from the original licensors, to run, modify and
+     propagate that work, subject to this License.  You are not
+     responsible for enforcing compliance by third parties with this
+     License.
+
+     An “entity transaction” is a transaction transferring control of an
+     organization, or substantially all assets of one, or subdividing an
+     organization, or merging organizations.  If propagation of a
+     covered work results from an entity transaction, each party to that
+     transaction who receives a copy of the work also receives whatever
+     licenses to the work the party’s predecessor in interest had or
+     could give under the previous paragraph, plus a right to possession
+     of the Corresponding Source of the work from the predecessor in
+     interest, if the predecessor has it or can get it with reasonable
+     efforts.
+
+     You may not impose any further restrictions on the exercise of the
+     rights granted or affirmed under this License.  For example, you
+     may not impose a license fee, royalty, or other charge for exercise
+     of rights granted under this License, and you may not initiate
+     litigation (including a cross-claim or counterclaim in a lawsuit)
+     alleging that any patent claim is infringed by making, using,
+     selling, offering for sale, or importing the Program or any portion
+     of it.
+
+  11. Patents.
+
+     A “contributor” is a copyright holder who authorizes use under this
+     License of the Program or a work on which the Program is based.
+     The work thus licensed is called the contributor’s “contributor
+     version”.
+
+     A contributor’s “essential patent claims” are all patent claims
+     owned or controlled by the contributor, whether already acquired or
+     hereafter acquired, that would be infringed by some manner,
+     permitted by this License, of making, using, or selling its
+     contributor version, but do not include claims that would be
+     infringed only as a consequence of further modification of the
+     contributor version.  For purposes of this definition, “control”
+     includes the right to grant patent sublicenses in a manner
+     consistent with the requirements of this License.
+
+     Each contributor grants you a non-exclusive, worldwide,
+     royalty-free patent license under the contributor’s essential
+     patent claims, to make, use, sell, offer for sale, import and
+     otherwise run, modify and propagate the contents of its contributor
+     version.
+
+     In the following three paragraphs, a “patent license” is any
+     express agreement or commitment, however denominated, not to
+     enforce a patent (such as an express permission to practice a
+     patent or covenant not to sue for patent infringement).  To “grant”
+     such a patent license to a party means to make such an agreement or
+     commitment not to enforce a patent against the party.
+
+     If you convey a covered work, knowingly relying on a patent
+     license, and the Corresponding Source of the work is not available
+     for anyone to copy, free of charge and under the terms of this
+     License, through a publicly available network server or other
+     readily accessible means, then you must either (1) cause the
+     Corresponding Source to be so available, or (2) arrange to deprive
+     yourself of the benefit of the patent license for this particular
+     work, or (3) arrange, in a manner consistent with the requirements
+     of this License, to extend the patent license to downstream
+     recipients.  “Knowingly relying” means you have actual knowledge
+     that, but for the patent license, your conveying the covered work
+     in a country, or your recipient’s use of the covered work in a
+     country, would infringe one or more identifiable patents in that
+     country that you have reason to believe are valid.
+
+     If, pursuant to or in connection with a single transaction or
+     arrangement, you convey, or propagate by procuring conveyance of, a
+     covered work, and grant a patent license to some of the parties
+     receiving the covered work authorizing them to use, propagate,
+     modify or convey a specific copy of the covered work, then the
+     patent license you grant is automatically extended to all
+     recipients of the covered work and works based on it.
+
+     A patent license is “discriminatory” if it does not include within
+     the scope of its coverage, prohibits the exercise of, or is
+     conditioned on the non-exercise of one or more of the rights that
+     are specifically granted under this License.  You may not convey a
+     covered work if you are a party to an arrangement with a third
+     party that is in the business of distributing software, under which
+     you make payment to the third party based on the extent of your
+     activity of conveying the work, and under which the third party
+     grants, to any of the parties who would receive the covered work
+     from you, a discriminatory patent license (a) in connection with
+     copies of the covered work conveyed by you (or copies made from
+     those copies), or (b) primarily for and in connection with specific
+     products or compilations that contain the covered work, unless you
+     entered into that arrangement, or that patent license was granted,
+     prior to 28 March 2007.
+
+     Nothing in this License shall be construed as excluding or limiting
+     any implied license or other defenses to infringement that may
+     otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others’ Freedom.
+
+     If conditions are imposed on you (whether by court order, agreement
+     or otherwise) that contradict the conditions of this License, they
+     do not excuse you from the conditions of this License.  If you
+     cannot convey a covered work so as to satisfy simultaneously your
+     obligations under this License and any other pertinent obligations,
+     then as a consequence you may not convey it at all.  For example,
+     if you agree to terms that obligate you to collect a royalty for
+     further conveying from those to whom you convey the Program, the
+     only way you could satisfy both those terms and this License would
+     be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+     Notwithstanding any other provision of this License, you have
+     permission to link or combine any covered work with a work licensed
+     under version 3 of the GNU Affero General Public License into a
+     single combined work, and to convey the resulting work.  The terms
+     of this License will continue to apply to the part which is the
+     covered work, but the special requirements of the GNU Affero
+     General Public License, section 13, concerning interaction through
+     a network will apply to the combination as such.
+
+  14. Revised Versions of this License.
+
+     The Free Software Foundation may publish revised and/or new
+     versions of the GNU General Public License from time to time.  Such
+     new versions will be similar in spirit to the present version, but
+     may differ in detail to address new problems or concerns.
+
+     Each version is given a distinguishing version number.  If the
+     Program specifies that a certain numbered version of the GNU
+     General Public License “or any later version” applies to it, you
+     have the option of following the terms and conditions either of
+     that numbered version or of any later version published by the Free
+     Software Foundation.  If the Program does not specify a version
+     number of the GNU General Public License, you may choose any
+     version ever published by the Free Software Foundation.
+
+     If the Program specifies that a proxy can decide which future
+     versions of the GNU General Public License can be used, that
+     proxy’s public statement of acceptance of a version permanently
+     authorizes you to choose that version for the Program.
+
+     Later license versions may give you additional or different
+     permissions.  However, no additional obligations are imposed on any
+     author or copyright holder as a result of your choosing to follow a
+     later version.
+
+  15. Disclaimer of Warranty.
+
+     THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+     APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE
+     COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS”
+     WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
+     INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+     MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE
+     RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.
+     SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL
+     NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+     IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+     WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES
+     AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR
+     DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+     CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE
+     THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA
+     BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+     PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+     PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF
+     THE POSSIBILITY OF SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+     If the disclaimer of warranty and limitation of liability provided
+     above cannot be given local legal effect according to their terms,
+     reviewing courts shall apply local law that most closely
+     approximates an absolute waiver of all civil liability in
+     connection with the Program, unless a warranty or assumption of
+     liability accompanies a copy of the Program in return for a fee.
+
+END OF TERMS AND CONDITIONS
+===========================
+
+How to Apply These Terms to Your New Programs
+=============================================
+
+If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these
+terms.
+
+   To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least the
+“copyright” line and a pointer to where the full notice is found.
+
+     ONE LINE TO GIVE THE PROGRAM'S NAME AND A BRIEF IDEA OF WHAT IT DOES.
+     Copyright (C) YEAR NAME OF AUTHOR
+
+     This program is free software: you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published by
+     the Free Software Foundation, either version 3 of the License, or (at
+     your option) any later version.
+
+     This program is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+
+     You should have received a copy of the GNU General Public License
+     along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+   Also add information on how to contact you by electronic and paper
+mail.
+
+   If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+     PROGRAM Copyright (C) YEAR NAME OF AUTHOR
+     This program comes with ABSOLUTELY NO WARRANTY; for details type ‘show w’.
+     This is free software, and you are welcome to redistribute it
+     under certain conditions; type ‘show c’ for details.
+
+   The hypothetical commands ‘show w’ and ‘show c’ should show the
+appropriate parts of the General Public License.  Of course, your
+program’s commands might be different; for a GUI interface, you would
+use an “about box”.
+
+   You should also get your employer (if you work as a programmer) or
+school, if any, to sign a “copyright disclaimer” for the program, if
+necessary.  For more information on this, and how to apply and follow
+the GNU GPL, see <https://www.gnu.org/licenses/>.
+
+   The GNU General Public License does not permit incorporating your
+program into proprietary programs.  If your program is a subroutine
+library, you may consider it more useful to permit linking proprietary
+applications with the library.  If this is what you want to do, use the
+GNU Lesser General Public License instead of this License.  But first,
+please read <https://www.gnu.org/licenses/why-not-lgpl.html>.
+
+
+
+Tag Table:
+Node: Top763
+Node: Introduction2976
+Ref: Some things that Transient can do3504
+Ref: Complexity in CLI programs3857
+Ref: Using Transient for composing interactive commands4458
+Node: Usage6700
+Node: Invoking Transients7068
+Node: Aborting and Resuming Transients8147
+Node: Common Suffix Commands10768
+Node: Saving Values12604
+Ref: Saving Values-Footnote-113975
+Node: Using History14168
+Node: Getting Help for Suffix Commands15742
+Node: Enabling and Disabling Suffixes17120
+Node: Other Commands20408
+Node: Configuration21384
+Ref: Essential Options21664
+Ref: Accessibility Options25325
+Ref: Auxiliary Options25648
+Ref: Developer Options30611
+Node: Modifying Existing Transients31859
+Node: Defining New Commands36051
+Node: Technical Introduction36414
+Node: Defining Transients42115
+Node: Binding Suffix and Infix Commands44582
+Node: Group Specifications45440
+Node: Suffix Specifications51968
+Node: Defining Suffix and Infix Commands56181
+Node: Using Infix Arguments59229
+Node: Transient State62866
+Ref: Pre-commands for Infixes67681
+Ref: Pre-commands for Suffixes68201
+Ref: Pre-commands for Non-Suffixes70655
+Ref: Special Pre-Commands71791
+Node: Classes and Methods72299
+Node: Group Classes74483
+Node: Group Methods76410
+Node: Prefix Classes77663
+Node: Suffix Classes78754
+Node: Suffix Methods81841
+Node: Suffix Value Methods82162
+Node: Suffix Format Methods84920
+Node: Prefix Slots86945
+Ref: Internal Prefix Slots89082
+Node: Suffix Slots90339
+Ref: Slots of transient-suffix90707
+Ref: Slots of transient-infix91890
+Ref: Slots of transient-variable95186
+Ref: Slots of transient-switches95288
+Node: Predicate Slots95651
+Node: FAQ97086
+Ref: Can I control how the popup buffer is displayed?97215
+Ref: How can I copy text from the popup buffer?97396
+Ref: How can I autoload prefix and suffix commands?97890
+Ref: How does Transient compare to prefix keys and universal arguments?98364
+Ref: How does Transient compare to Magit-Popup and Hydra?98607
+Ref: Why did some of the key bindings change?98801
+Ref: Why does q not quit popups anymore?101154
+Node: Keystroke Index102257
+Node: Command and Function Index104122
+Node: Variable Index110988
+Node: Concept Index113261
+Node: GNU General Public License115997
+
+End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
diff --git a/emacs/elpa/yaml-mode-20240317.1602/yaml-mode-pkg.el b/emacs/elpa/yaml-mode-20240317.1602/yaml-mode-pkg.el
@@ -1,15 +0,0 @@
-(define-package "yaml-mode" "20240317.1602" "Major mode for editing YAML files"
-  '((emacs "24.1"))
-  :commit "7b5ce294fb15c2c8926fa476d7218aa415550a2a" :authors
-  '(("Yoshiki Kurihara" . "clouder@gmail.com")
-    ("Marshall T. Vandegrift" . "llasram@gmail.com"))
-  :maintainers
-  '(("Vasilij Schneidermann" . "mail@vasilij.de"))
-  :maintainer
-  '("Vasilij Schneidermann" . "mail@vasilij.de")
-  :keywords
-  '("data" "yaml")
-  :url "https://github.com/yoshiki/yaml-mode")
-;; Local Variables:
-;; no-byte-compile: t
-;; End:
diff --git a/emacs/elpa/yaml-mode-20240317.1602/yaml-mode.el b/emacs/elpa/yaml-mode-20240317.1602/yaml-mode.el
@@ -1,491 +0,0 @@
-;;; yaml-mode.el --- Major mode for editing YAML files -*- lexical-binding: t -*-
-
-;; Copyright (C) 2010-2014 Yoshiki Kurihara
-
-;; Author: Yoshiki Kurihara <clouder@gmail.com>
-;;         Marshall T. Vandegrift <llasram@gmail.com>
-;; Maintainer: Vasilij Schneidermann <mail@vasilij.de>
-;; URL: https://github.com/yoshiki/yaml-mode
-;; Package-Requires: ((emacs "24.1"))
-;; Keywords: data yaml
-;; Version: 0.0.16
-
-;; This file is not part of Emacs
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; This is a major mode for editing files in the YAML data
-;; serialization format.  It was initially developed by Yoshiki
-;; Kurihara and many features were added by Marshall Vandegrift.  As
-;; YAML and Python share the fact that indentation determines
-;; structure, this mode provides indentation and indentation command
-;; behavior very similar to that of python-mode.
-
-;;; Installation:
-
-;; To install, just drop this file into a directory in your
-;; `load-path' and (optionally) byte-compile it.  To automatically
-;; handle files ending in '.yml', add something like:
-;;
-;;    (require 'yaml-mode)
-;;    (add-to-list 'auto-mode-alist '("\\.yml\\'" . yaml-mode))
-;;
-;; to your .emacs file.
-;;
-;; Unlike python-mode, this mode follows the Emacs convention of not
-;; binding the ENTER key to `newline-and-indent'.  To get this
-;; behavior, add the key definition to `yaml-mode-hook':
-;;
-;;    (add-hook 'yaml-mode-hook
-;;     '(lambda ()
-;;        (define-key yaml-mode-map "\C-m" 'newline-and-indent)))
-
-;;; Known Bugs:
-
-;; YAML is easy to write but complex to parse, and this mode doesn't
-;; even really try.  Indentation and highlighting will break on
-;; abnormally complicated structures.
-
-;;; Code:
-
-
-;; User definable variables
-
-;;;###autoload
-(defgroup yaml nil
-  "Support for the YAML serialization format"
-  :group 'languages
-  :prefix "yaml-")
-
-(defcustom yaml-mode-hook nil
-  "*Hook run by `yaml-mode'."
-  :type 'hook
-  :group 'yaml)
-
-(defcustom yaml-indent-offset 2
-  "*Amount of offset per level of indentation."
-  :type 'integer
-  :safe 'natnump
-  :group 'yaml)
-
-(defcustom yaml-backspace-function 'backward-delete-char-untabify
-  "*Function called by `yaml-electric-backspace' when deleting backwards.
-It will receive one argument, the numeric prefix value."
-  :type 'function
-  :group 'yaml)
-
-(defcustom yaml-block-literal-search-lines 100
-  "*Maximum number of lines to search for start of block literals."
-  :type 'integer
-  :group 'yaml)
-
-(defcustom yaml-block-literal-electric-alist
-  '((?| . "") (?> . "-"))
-  "*Characters for which to provide electric behavior.
-The association list key should be a key code and the associated value
-should be a string containing additional characters to insert when
-that key is pressed to begin a block literal."
-  :type 'alist
-  :group 'yaml)
-
-(defface yaml-tab-face
-  '((((class color)) (:background "red" :foreground "red" :bold t))
-    (t (:reverse-video t)))
-  "Face to use for highlighting tabs in YAML files."
-  :group 'faces
-  :group 'yaml)
-
-(defcustom yaml-imenu-generic-expression
-  '((nil  "^\\(:?[a-zA-Z_-]+\\):"          1))
-  "The imenu regex to parse an outline of the yaml file."
-  :type 'string
-  :group 'yaml)
-
-
-;; Constants
-
-(defconst yaml-mode-version "0.0.15" "Version of `yaml-mode'.")
-
-(defconst yaml-blank-line-re "^ *$"
-  "Regexp matching a line containing only (valid) whitespace.")
-
-(defconst yaml-directive-re "^\\(?:--- \\)? *%\\(\\w+\\)"
-  "Regexp matching a line containing a YAML directive.")
-
-(defconst yaml-document-delimiter-re "^\\(?:---\\|[.][.][.]\\)"
-  "Rexexp matching a YAML document delimiter line.")
-
-(defconst yaml-node-anchor-alias-re "[&*][a-zA-Z0-9_-]+"
-  "Regexp matching a YAML node anchor or alias.")
-
-(defconst yaml-tag-re "!!?[^ \n]+"
-  "Rexexp matching a YAML tag.")
-
-(defconst yaml-bare-scalar-re
-  "\\(?:[^-:,#!\n{\\[ ]\\|[^#!\n{\\[ ]\\S-\\)[^#\n]*?"
-  "Rexexp matching a YAML bare scalar.")
-
-(defconst yaml-hash-key-re
-  (concat "\\(?:^\\(?:--- \\)?\\|{\\|\\(?:[-,] +\\)+\\) *"
-          "\\(?:" yaml-tag-re " +\\)?"
-          "\\(" yaml-bare-scalar-re "\\) *:"
-          "\\(?: +\\|$\\)")
-  "Regexp matching a single YAML hash key.")
-
-(defconst yaml-scalar-context-re
-  (concat "\\(?:^\\(?:--- \\)?\\|{\\|\\(?: *[-,] +\\)+\\) *"
-          "\\(?:" yaml-bare-scalar-re " *: \\)?")
-  "Regexp indicating the beginning of a scalar context.")
-
-(defconst yaml-nested-map-re
-  (concat "[^#\n]*: *\\(?:&.*\\|{ *\\|" yaml-tag-re " *\\)?$")
-  "Regexp matching a line beginning a YAML nested structure.")
-
-(defconst yaml-block-literal-base-re " *[>|][-+0-9]* *\\(?:\n\\|\\'\\)"
-  "Regexp matching the substring start of a block literal.")
-
-(defconst yaml-block-literal-re
-  (concat yaml-scalar-context-re
-          "\\(?:" yaml-tag-re "\\)?"
-          yaml-block-literal-base-re)
-  "Regexp matching a line beginning a YAML block literal.")
-
-(defconst yaml-nested-sequence-re
-  (concat "^\\(?:\\(?: *- +\\)+\\|\\(:? *-$\\)\\)"
-          "\\(?:" yaml-bare-scalar-re " *:\\(?: +.*\\)?\\)?$")
-  "Regexp matching a line containing one or more nested YAML sequences.")
-
-(defconst yaml-constant-scalars-re
-  (concat "\\(?:^\\|\\(?::\\|-\\|,\\|{\\|\\[\\) +\\) *"
-          (regexp-opt
-           '("~" "null" "Null" "NULL"
-             ".nan" ".NaN" ".NAN"
-             ".inf" ".Inf" ".INF"
-             "-.inf" "-.Inf" "-.INF"
-             "y" "Y" "yes" "Yes" "YES" "n" "N" "no" "No" "NO"
-             "true" "True" "TRUE" "false" "False" "FALSE"
-             "on" "On" "ON" "off" "Off" "OFF") t)
-          "\\_>")
-  "Regexp matching certain scalar constants in scalar context.")
-
-
-;; Mode setup
-
-(defvar yaml-mode-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map "|" 'yaml-electric-bar-and-angle)
-    (define-key map ">" 'yaml-electric-bar-and-angle)
-    (define-key map "-" 'yaml-electric-dash-and-dot)
-    (define-key map "." 'yaml-electric-dash-and-dot)
-    (define-key map (kbd "DEL") 'yaml-electric-backspace)
-    map)
-  "Keymap used in `yaml-mode' buffers.")
-
-(defvar yaml-mode-syntax-table
-  (let ((syntax-table (make-syntax-table)))
-    (modify-syntax-entry ?\' "\"" syntax-table)
-    (modify-syntax-entry ?\" "\"" syntax-table)
-    (modify-syntax-entry ?# "<" syntax-table)
-    (modify-syntax-entry ?\n ">" syntax-table)
-    (modify-syntax-entry ?\\ "\\" syntax-table)
-    (modify-syntax-entry ?- "_" syntax-table)
-    (modify-syntax-entry ?_ "_" syntax-table)
-    (modify-syntax-entry ?& "." syntax-table)
-    (modify-syntax-entry ?* "." syntax-table)
-    (modify-syntax-entry ?\( "." syntax-table)
-    (modify-syntax-entry ?\) "." syntax-table)
-    (modify-syntax-entry ?\{ "(}" syntax-table)
-    (modify-syntax-entry ?\} "){" syntax-table)
-    (modify-syntax-entry ?\[ "(]" syntax-table)
-    (modify-syntax-entry ?\] ")[" syntax-table)
-    syntax-table)
-  "Syntax table in use in `yaml-mode' buffers.")
-
-;;;###autoload
-(define-derived-mode yaml-mode text-mode "YAML"
-  "Simple mode to edit YAML.
-
-\\{yaml-mode-map}"
-  :syntax-table yaml-mode-syntax-table
-  (set (make-local-variable 'comment-start) "# ")
-  (set (make-local-variable 'comment-start-skip) "#+ *")
-  (set (make-local-variable 'comment-end) "")
-  (set (make-local-variable 'indent-line-function) 'yaml-indent-line)
-  (set (make-local-variable 'indent-tabs-mode) nil)
-  (set (make-local-variable 'fill-paragraph-function) 'yaml-fill-paragraph)
-  (set (make-local-variable 'page-delimiter) "^---\\([ \t].*\\)*\n")
-
-  (set (make-local-variable 'syntax-propertize-function)
-       'yaml-mode-syntax-propertize-function)
-  (setq font-lock-defaults '(yaml-font-lock-keywords)))
-
-
-;; Font-lock support
-
-(defvar yaml-font-lock-keywords
-  `((yaml-font-lock-block-literals 0 font-lock-string-face)
-    (,yaml-constant-scalars-re . (1 font-lock-constant-face))
-    (,yaml-tag-re . (0 font-lock-type-face))
-    (,yaml-node-anchor-alias-re . (0 font-lock-function-name-face))
-    (,yaml-hash-key-re . (1 font-lock-variable-name-face))
-    (,yaml-document-delimiter-re . (0 font-lock-comment-face))
-    (,yaml-directive-re . (1 font-lock-builtin-face))
-    ("^[\t]+" 0 'yaml-tab-face t))
-  "Additional expressions to highlight in YAML mode.")
-
-(defun yaml-mode-syntax-propertize-function (beg end)
-  "Override buffer's syntax table for special syntactic constructs."
-  ;; Unhighlight foo#bar tokens between BEG and END.
-  (save-excursion
-    (goto-char beg)
-    (while (search-forward "#" end t)
-      (save-excursion
-        (forward-char -1)
-        ;; both ^# and [ \t]# are comments
-        (when (and (not (bolp))
-                   (not (memq (preceding-char) '(?\s ?\t))))
-          (put-text-property (point) (1+ (point))
-                             'syntax-table (string-to-syntax "_"))))))
-
-  (save-excursion
-    (goto-char beg)
-    (while (and
-            (> end (point))
-            (re-search-forward "['\"]" end t))
-      (when (get-text-property (point) 'yaml-block-literal)
-        (put-text-property (1- (point)) (point)
-                           'syntax-table (string-to-syntax "w")))
-      (let* ((pt (point))
-             (sps (save-excursion (syntax-ppss (1- pt)))))
-        (when (not (nth 8 sps))
-          (cond
-           ((and (char-equal ?' (char-before (1- pt)))
-                 (char-equal ?' (char-before pt)))
-            (put-text-property (- pt 2) pt
-                               'syntax-table (string-to-syntax "w"))
-            ;; Workaround for https://debbugs.gnu.org/41195.
-            (let ((syntax-propertize--done syntax-propertize--done))
-              ;; Carefully invalidate the last cached ppss.
-              (syntax-ppss-flush-cache (- pt 2))))
-           ;; If quote is detected as a syntactic string start but appeared
-           ;; after a non-whitespace character, then mark it as syntactic word.
-           ((and (char-before (1- pt))
-                 (char-equal ?w (char-syntax (char-before (1- pt)))))
-            (put-text-property (1- pt) pt
-                               'syntax-table (string-to-syntax "w")))
-           (t
-            ;; We're right after a quote that opens a string literal.
-            ;; Skip over it (big speedup for long JSON strings).
-            (goto-char (1- pt))
-            (condition-case nil
-                (forward-sexp)
-              (scan-error
-               (goto-char end))))))))))
-
-(defun yaml-font-lock-block-literals (bound)
-  "Find lines within block literals.
-Find the next line of the first (if any) block literal after point and
-prior to BOUND.  Returns the beginning and end of the block literal
-line in the match data, as consumed by `font-lock-keywords' matcher
-functions.  The function begins by searching backwards to determine
-whether or not the current line is within a block literal.  This could
-be time-consuming in large buffers, so the number of lines searched is
-artificially limited to the value of
-`yaml-block-literal-search-lines'."
-  (if (eolp) (goto-char (1+ (point))))
-  (unless (or (eobp) (>= (point) bound))
-    (let ((begin (point))
-          (end (min (1+ (line-end-position)) bound)))
-      (goto-char (line-beginning-position))
-      (while (and (looking-at yaml-blank-line-re)
-                  (not (bobp)))
-        (forward-line -1))
-      (let ((nlines yaml-block-literal-search-lines)
-            (min-level (current-indentation)))
-        (forward-line -1)
-        (while (and (/= nlines 0)
-                    (/= min-level 0)
-                    (not (looking-at yaml-block-literal-re))
-                    (not (bobp)))
-          (setq nlines (1- nlines))
-          (unless (looking-at yaml-blank-line-re)
-            (setq min-level (min min-level (current-indentation))))
-          (forward-line -1))
-        (when (looking-at-p " *- ")
-          (setq min-level (- min-level 2)))
-        (cond
-         ((and (< (current-indentation) min-level)
-               (looking-at yaml-block-literal-re))
-          (goto-char end)
-          (put-text-property begin end 'yaml-block-literal t)
-          (set-match-data (list begin end))
-          t)
-         ((progn
-            (goto-char begin)
-            (re-search-forward (concat yaml-block-literal-re
-                                       " *\\(.*\\)\n")
-                               bound t))
-          (let ((range (nthcdr 2 (match-data))))
-            (put-text-property (car range) (cadr range) 'yaml-block-literal t)
-            (set-match-data range))
-          t))))))
-
-
-;; Indentation and electric keys
-
-(defun yaml-compute-indentation ()
-  "Calculate the maximum sensible indentation for the current line."
-  (save-excursion
-    (beginning-of-line)
-    (if (looking-at yaml-document-delimiter-re) 0
-      (forward-line -1)
-      (while (and (looking-at yaml-blank-line-re)
-                  (> (point) (point-min)))
-        (forward-line -1))
-      (+ (current-indentation)
-         (if (looking-at yaml-nested-map-re) yaml-indent-offset 0)
-         (if (looking-at yaml-nested-sequence-re) yaml-indent-offset 0)
-         (if (looking-at yaml-block-literal-re) yaml-indent-offset 0)))))
-
-(defun yaml-indent-line ()
-  "Indent the current line.
-The first time this command is used, the line will be indented to the
-maximum sensible indentation.  Each immediately subsequent usage will
-back-dent the line by `yaml-indent-offset' spaces.  On reaching column
-0, it will cycle back to the maximum sensible indentation."
-  (interactive "*")
-  (let ((ci (current-indentation))
-        (need (yaml-compute-indentation)))
-    (save-excursion
-      (if (and (equal last-command this-command) (/= ci 0))
-          (indent-line-to (* (/ (- ci 1) yaml-indent-offset) yaml-indent-offset))
-        (indent-line-to need)))
-    (if (< (current-column) (current-indentation))
-        (forward-to-indentation 0))))
-
-(defun yaml-electric-backspace (arg)
-  "Delete characters or back-dent the current line.
-If invoked following only whitespace on a line, will back-dent to the
-immediately previous multiple of `yaml-indent-offset' spaces."
-  (interactive "*p")
-  (if (or (/= (current-indentation) (current-column)) (bolp))
-      (funcall yaml-backspace-function arg)
-    (let ((ci (current-column)))
-      (beginning-of-line)
-      (delete-horizontal-space)
-      (indent-to (* (/ (- ci (* arg yaml-indent-offset))
-                       yaml-indent-offset)
-                    yaml-indent-offset)))))
-
-(defun yaml-electric-bar-and-angle (arg)
-  "Insert the bound key and possibly begin a block literal.
-Inserts the bound key.  If inserting the bound key causes the current
-line to match the initial line of a block literal, then inserts the
-matching string from `yaml-block-literal-electric-alist', a newline,
-and indents appropriately."
-  (interactive "*P")
-  (self-insert-command (prefix-numeric-value arg))
-  (let ((extra-chars
-         (assoc last-command-event
-                yaml-block-literal-electric-alist)))
-    (cond
-     ((and extra-chars (not arg) (eolp)
-           (save-excursion
-             (beginning-of-line)
-             (looking-at yaml-block-literal-re)))
-      (insert (cdr extra-chars))
-      (newline-and-indent)))))
-
-(defun yaml-electric-dash-and-dot (arg)
-  "Insert the bound key and possibly de-dent line.
-Inserts the bound key.  If inserting the bound key causes the current
-line to match a document delimiter, de-dent the line to the left
-margin."
-  (interactive "*P")
-  (self-insert-command (prefix-numeric-value arg))
-  (save-excursion
-    (beginning-of-line)
-    (when (and (not arg) (looking-at yaml-document-delimiter-re))
-      (delete-horizontal-space))))
-
-(defun yaml-narrow-to-block-literal ()
-  "Narrow the buffer to block literal if the point is in it,
-otherwise do nothing."
-  (interactive)
-  (save-excursion
-    (goto-char (line-beginning-position))
-    (while (and (looking-at-p yaml-blank-line-re) (not (bobp)))
-      (forward-line -1))
-    (let ((nlines yaml-block-literal-search-lines)
-          (min-level (current-indentation))
-          beg)
-      (forward-line -1)
-      (while (and (/= nlines 0)
-                  (/= min-level 0)
-                  (not (looking-at-p yaml-block-literal-re))
-                  (not (bobp)))
-        (setq nlines (1- nlines))
-        (unless (looking-at-p yaml-blank-line-re)
-          (setq min-level (min min-level (current-indentation))))
-        (forward-line -1))
-      (when (and (< (current-indentation) min-level)
-                 (looking-at-p yaml-block-literal-re))
-        (setq min-level (current-indentation))
-        (forward-line)
-        (setq beg (point))
-        (while (and (not (eobp))
-                    (or (looking-at-p yaml-blank-line-re)
-                        (> (current-indentation) min-level)))
-          (forward-line))
-        (narrow-to-region beg (point))))))
-
-(defun yaml-fill-paragraph (&optional justify region)
-  "Fill paragraph.
-Outside of comments, this behaves as `fill-paragraph' except that
-filling does not cross boundaries of block literals.  Inside comments,
-this will do usual adaptive fill behaviors."
-  (interactive "*P")
-  (save-restriction
-    (yaml-narrow-to-block-literal)
-    (let ((fill-paragraph-function nil))
-      (or (fill-comment-paragraph justify)
-          (fill-paragraph justify region)))))
-
-(defun yaml-set-imenu-generic-expression ()
-  (make-local-variable 'imenu-generic-expression)
-  (make-local-variable 'imenu-create-index-function)
-  (setq imenu-create-index-function 'imenu-default-create-index-function)
-  (setq imenu-generic-expression yaml-imenu-generic-expression))
-
-(add-hook 'yaml-mode-hook 'yaml-set-imenu-generic-expression)
-
-
-(defun yaml-mode-version ()
-  "Display version of `yaml-mode'."
-  (interactive)
-  (message "yaml-mode %s" yaml-mode-version)
-  yaml-mode-version)
-
-;;;###autoload
-(add-to-list 'auto-mode-alist '("\\.\\(e?ya?\\|ra\\)ml\\'" . yaml-mode))
-
-;;;###autoload
-(add-to-list 'magic-mode-alist
-             '("^%YAML\\s-+[0-9]+\\.[0-9]+\\(\\s-+#\\|\\s-*$\\)" . yaml-mode))
-
-(provide 'yaml-mode)
-
-;;; yaml-mode.el ends here
diff --git a/emacs/elpa/yaml-mode-20240317.1602/yaml-mode.elc b/emacs/elpa/yaml-mode-20240317.1602/yaml-mode.elc
Binary files differ.
diff --git a/emacs/elpa/yaml-mode-20240317.1602/yaml-mode-autoloads.el b/emacs/elpa/yaml-mode-20241003.153/yaml-mode-autoloads.el
diff --git a/emacs/elpa/yaml-mode-20241003.153/yaml-mode-pkg.el b/emacs/elpa/yaml-mode-20241003.153/yaml-mode-pkg.el
@@ -0,0 +1,11 @@
+;; -*- no-byte-compile: t; lexical-binding: nil -*-
+(define-package "yaml-mode" "20241003.153"
+  "Major mode for editing YAML files."
+  '((emacs "24.1"))
+  :url "https://github.com/yoshiki/yaml-mode"
+  :commit "d91f878729312a6beed77e6637c60497c5786efa"
+  :revdesc "d91f87872931"
+  :keywords '("data" "yaml")
+  :authors '(("Yoshiki Kurihara" . "clouder@gmail.com")
+             ("Marshall T. Vandegrift" . "llasram@gmail.com"))
+  :maintainers '(("Vasilij Schneidermann" . "mail@vasilij.de")))
diff --git a/emacs/elpa/yaml-mode-20241003.153/yaml-mode.el b/emacs/elpa/yaml-mode-20241003.153/yaml-mode.el
@@ -0,0 +1,492 @@
+;;; yaml-mode.el --- Major mode for editing YAML files -*- lexical-binding: t -*-
+
+;; Copyright (C) 2010-2014 Yoshiki Kurihara
+
+;; Author: Yoshiki Kurihara <clouder@gmail.com>
+;;         Marshall T. Vandegrift <llasram@gmail.com>
+;; Maintainer: Vasilij Schneidermann <mail@vasilij.de>
+;; URL: https://github.com/yoshiki/yaml-mode
+;; Package-Requires: ((emacs "24.1"))
+;; Keywords: data yaml
+;; Package-Version: 20241003.153
+;; Package-Revision: d91f87872931
+
+;; This file is not part of Emacs
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; This is a major mode for editing files in the YAML data
+;; serialization format.  It was initially developed by Yoshiki
+;; Kurihara and many features were added by Marshall Vandegrift.  As
+;; YAML and Python share the fact that indentation determines
+;; structure, this mode provides indentation and indentation command
+;; behavior very similar to that of python-mode.
+
+;;; Installation:
+
+;; To install, just drop this file into a directory in your
+;; `load-path' and (optionally) byte-compile it.  To automatically
+;; handle files ending in '.yml', add something like:
+;;
+;;    (require 'yaml-mode)
+;;    (add-to-list 'auto-mode-alist '("\\.yml\\'" . yaml-mode))
+;;
+;; to your .emacs file.
+;;
+;; Unlike python-mode, this mode follows the Emacs convention of not
+;; binding the ENTER key to `newline-and-indent'.  To get this
+;; behavior, add the key definition to `yaml-mode-hook':
+;;
+;;    (add-hook 'yaml-mode-hook
+;;     '(lambda ()
+;;        (define-key yaml-mode-map "\C-m" 'newline-and-indent)))
+
+;;; Known Bugs:
+
+;; YAML is easy to write but complex to parse, and this mode doesn't
+;; even really try.  Indentation and highlighting will break on
+;; abnormally complicated structures.
+
+;;; Code:
+
+
+;; User definable variables
+
+;;;###autoload
+(defgroup yaml nil
+  "Support for the YAML serialization format"
+  :group 'languages
+  :prefix "yaml-")
+
+(defcustom yaml-mode-hook nil
+  "*Hook run by `yaml-mode'."
+  :type 'hook
+  :group 'yaml)
+
+(defcustom yaml-indent-offset 2
+  "*Amount of offset per level of indentation."
+  :type 'integer
+  :safe 'natnump
+  :group 'yaml)
+
+(defcustom yaml-backspace-function 'backward-delete-char-untabify
+  "*Function called by `yaml-electric-backspace' when deleting backwards.
+It will receive one argument, the numeric prefix value."
+  :type 'function
+  :group 'yaml)
+
+(defcustom yaml-block-literal-search-lines 100
+  "*Maximum number of lines to search for start of block literals."
+  :type 'integer
+  :group 'yaml)
+
+(defcustom yaml-block-literal-electric-alist
+  '((?| . "") (?> . "-"))
+  "*Characters for which to provide electric behavior.
+The association list key should be a key code and the associated value
+should be a string containing additional characters to insert when
+that key is pressed to begin a block literal."
+  :type 'alist
+  :group 'yaml)
+
+(defface yaml-tab-face
+  '((((class color)) (:background "red" :foreground "red" :bold t))
+    (t (:inverse-video t)))
+  "Face to use for highlighting tabs in YAML files."
+  :group 'faces
+  :group 'yaml)
+
+(defcustom yaml-imenu-generic-expression
+  '((nil  "^\\(:?[a-zA-Z_-]+\\):"          1))
+  "The imenu regex to parse an outline of the yaml file."
+  :type 'string
+  :group 'yaml)
+
+
+;; Constants
+
+(defconst yaml-mode-version "0.0.15" "Version of `yaml-mode'.")
+
+(defconst yaml-blank-line-re "^ *$"
+  "Regexp matching a line containing only (valid) whitespace.")
+
+(defconst yaml-directive-re "^\\(?:--- \\)? *%\\(\\w+\\)"
+  "Regexp matching a line containing a YAML directive.")
+
+(defconst yaml-document-delimiter-re "^\\(?:---\\|[.][.][.]\\)"
+  "Rexexp matching a YAML document delimiter line.")
+
+(defconst yaml-node-anchor-alias-re "[&*][a-zA-Z0-9_-]+"
+  "Regexp matching a YAML node anchor or alias.")
+
+(defconst yaml-tag-re "!!?[^ \n]+"
+  "Rexexp matching a YAML tag.")
+
+(defconst yaml-bare-scalar-re
+  "\\(?:[^-:,#!\n{\\[ ]\\|[^#!\n{\\[ ]\\S-\\)[^#\n]*?"
+  "Rexexp matching a YAML bare scalar.")
+
+(defconst yaml-hash-key-re
+  (concat "\\(?:^\\(?:--- \\)?\\|{\\|\\(?:[-,] +\\)+\\) *"
+          "\\(?:" yaml-tag-re " +\\)?"
+          "\\(" yaml-bare-scalar-re "\\) *:"
+          "\\(?: +\\|$\\)")
+  "Regexp matching a single YAML hash key.")
+
+(defconst yaml-scalar-context-re
+  (concat "\\(?:^\\(?:--- \\)?\\|{\\|\\(?: *[-,] +\\)+\\) *"
+          "\\(?:" yaml-bare-scalar-re " *: \\)?")
+  "Regexp indicating the beginning of a scalar context.")
+
+(defconst yaml-nested-map-re
+  (concat "[^#\n]*: *\\(?:&.*\\|{ *\\|" yaml-tag-re " *\\)?$")
+  "Regexp matching a line beginning a YAML nested structure.")
+
+(defconst yaml-block-literal-base-re " *[>|][-+0-9]* *\\(?:\n\\|\\'\\)"
+  "Regexp matching the substring start of a block literal.")
+
+(defconst yaml-block-literal-re
+  (concat yaml-scalar-context-re
+          "\\(?:" yaml-tag-re "\\)?"
+          yaml-block-literal-base-re)
+  "Regexp matching a line beginning a YAML block literal.")
+
+(defconst yaml-nested-sequence-re
+  (concat "^\\(?:\\(?: *- +\\)+\\|\\(:? *-$\\)\\)"
+          "\\(?:" yaml-bare-scalar-re " *:\\(?: +.*\\)?\\)?$")
+  "Regexp matching a line containing one or more nested YAML sequences.")
+
+(defconst yaml-constant-scalars-re
+  (concat "\\(?:^\\|\\(?::\\|-\\|,\\|{\\|\\[\\) +\\) *"
+          (regexp-opt
+           '("~" "null" "Null" "NULL"
+             ".nan" ".NaN" ".NAN"
+             ".inf" ".Inf" ".INF"
+             "-.inf" "-.Inf" "-.INF"
+             "y" "Y" "yes" "Yes" "YES" "n" "N" "no" "No" "NO"
+             "true" "True" "TRUE" "false" "False" "FALSE"
+             "on" "On" "ON" "off" "Off" "OFF") t)
+          "\\_>")
+  "Regexp matching certain scalar constants in scalar context.")
+
+
+;; Mode setup
+
+(defvar yaml-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map "|" 'yaml-electric-bar-and-angle)
+    (define-key map ">" 'yaml-electric-bar-and-angle)
+    (define-key map "-" 'yaml-electric-dash-and-dot)
+    (define-key map "." 'yaml-electric-dash-and-dot)
+    (define-key map (kbd "DEL") 'yaml-electric-backspace)
+    map)
+  "Keymap used in `yaml-mode' buffers.")
+
+(defvar yaml-mode-syntax-table
+  (let ((syntax-table (make-syntax-table)))
+    (modify-syntax-entry ?\' "\"" syntax-table)
+    (modify-syntax-entry ?\" "\"" syntax-table)
+    (modify-syntax-entry ?# "<" syntax-table)
+    (modify-syntax-entry ?\n ">" syntax-table)
+    (modify-syntax-entry ?\\ "\\" syntax-table)
+    (modify-syntax-entry ?- "_" syntax-table)
+    (modify-syntax-entry ?_ "_" syntax-table)
+    (modify-syntax-entry ?& "." syntax-table)
+    (modify-syntax-entry ?* "." syntax-table)
+    (modify-syntax-entry ?\( "." syntax-table)
+    (modify-syntax-entry ?\) "." syntax-table)
+    (modify-syntax-entry ?\{ "(}" syntax-table)
+    (modify-syntax-entry ?\} "){" syntax-table)
+    (modify-syntax-entry ?\[ "(]" syntax-table)
+    (modify-syntax-entry ?\] ")[" syntax-table)
+    syntax-table)
+  "Syntax table in use in `yaml-mode' buffers.")
+
+;;;###autoload
+(define-derived-mode yaml-mode text-mode "YAML"
+  "Simple mode to edit YAML.
+
+\\{yaml-mode-map}"
+  :syntax-table yaml-mode-syntax-table
+  (set (make-local-variable 'comment-start) "# ")
+  (set (make-local-variable 'comment-start-skip) "#+ *")
+  (set (make-local-variable 'comment-end) "")
+  (set (make-local-variable 'indent-line-function) 'yaml-indent-line)
+  (set (make-local-variable 'indent-tabs-mode) nil)
+  (set (make-local-variable 'fill-paragraph-function) 'yaml-fill-paragraph)
+  (set (make-local-variable 'page-delimiter) "^---\\([ \t].*\\)*\n")
+
+  (set (make-local-variable 'syntax-propertize-function)
+       'yaml-mode-syntax-propertize-function)
+  (setq font-lock-defaults '(yaml-font-lock-keywords)))
+
+
+;; Font-lock support
+
+(defvar yaml-font-lock-keywords
+  `((yaml-font-lock-block-literals 0 font-lock-string-face)
+    (,yaml-constant-scalars-re . (1 font-lock-constant-face))
+    (,yaml-tag-re . (0 font-lock-type-face))
+    (,yaml-node-anchor-alias-re . (0 font-lock-function-name-face))
+    (,yaml-hash-key-re . (1 font-lock-variable-name-face))
+    (,yaml-document-delimiter-re . (0 font-lock-comment-face))
+    (,yaml-directive-re . (1 font-lock-builtin-face))
+    ("^[\t]+" 0 'yaml-tab-face t))
+  "Additional expressions to highlight in YAML mode.")
+
+(defun yaml-mode-syntax-propertize-function (beg end)
+  "Override buffer's syntax table for special syntactic constructs."
+  ;; Unhighlight foo#bar tokens between BEG and END.
+  (save-excursion
+    (goto-char beg)
+    (while (search-forward "#" end t)
+      (save-excursion
+        (forward-char -1)
+        ;; both ^# and [ \t]# are comments
+        (when (and (not (bolp))
+                   (not (memq (preceding-char) '(?\s ?\t))))
+          (put-text-property (point) (1+ (point))
+                             'syntax-table (string-to-syntax "_"))))))
+
+  (save-excursion
+    (goto-char beg)
+    (while (and
+            (> end (point))
+            (re-search-forward "['\"]" end t))
+      (when (get-text-property (point) 'yaml-block-literal)
+        (put-text-property (1- (point)) (point)
+                           'syntax-table (string-to-syntax "w")))
+      (let* ((pt (point))
+             (sps (save-excursion (syntax-ppss (1- pt)))))
+        (when (not (nth 8 sps))
+          (cond
+           ((and (char-equal ?' (char-before (1- pt)))
+                 (char-equal ?' (char-before pt)))
+            (put-text-property (- pt 2) pt
+                               'syntax-table (string-to-syntax "w"))
+            ;; Workaround for https://debbugs.gnu.org/41195.
+            (let ((syntax-propertize--done syntax-propertize--done))
+              ;; Carefully invalidate the last cached ppss.
+              (syntax-ppss-flush-cache (- pt 2))))
+           ;; If quote is detected as a syntactic string start but appeared
+           ;; after a non-whitespace character, then mark it as syntactic word.
+           ((and (char-before (1- pt))
+                 (char-equal ?w (char-syntax (char-before (1- pt)))))
+            (put-text-property (1- pt) pt
+                               'syntax-table (string-to-syntax "w")))
+           (t
+            ;; We're right after a quote that opens a string literal.
+            ;; Skip over it (big speedup for long JSON strings).
+            (goto-char (1- pt))
+            (condition-case nil
+                (forward-sexp)
+              (scan-error
+               (goto-char end))))))))))
+
+(defun yaml-font-lock-block-literals (bound)
+  "Find lines within block literals.
+Find the next line of the first (if any) block literal after point and
+prior to BOUND.  Returns the beginning and end of the block literal
+line in the match data, as consumed by `font-lock-keywords' matcher
+functions.  The function begins by searching backwards to determine
+whether or not the current line is within a block literal.  This could
+be time-consuming in large buffers, so the number of lines searched is
+artificially limited to the value of
+`yaml-block-literal-search-lines'."
+  (if (eolp) (goto-char (1+ (point))))
+  (unless (or (eobp) (>= (point) bound))
+    (let ((begin (point))
+          (end (min (1+ (line-end-position)) bound)))
+      (goto-char (line-beginning-position))
+      (while (and (looking-at yaml-blank-line-re)
+                  (not (bobp)))
+        (forward-line -1))
+      (let ((nlines yaml-block-literal-search-lines)
+            (min-level (current-indentation)))
+        (forward-line -1)
+        (while (and (/= nlines 0)
+                    (/= min-level 0)
+                    (not (looking-at yaml-block-literal-re))
+                    (not (bobp)))
+          (setq nlines (1- nlines))
+          (unless (looking-at yaml-blank-line-re)
+            (setq min-level (min min-level (current-indentation))))
+          (forward-line -1))
+        (when (looking-at-p " *- ")
+          (setq min-level (- min-level 2)))
+        (cond
+         ((and (< (current-indentation) min-level)
+               (looking-at yaml-block-literal-re))
+          (goto-char end)
+          (put-text-property begin end 'yaml-block-literal t)
+          (set-match-data (list begin end))
+          t)
+         ((progn
+            (goto-char begin)
+            (re-search-forward (concat yaml-block-literal-re
+                                       " *\\(.*\\)\n")
+                               bound t))
+          (let ((range (nthcdr 2 (match-data))))
+            (put-text-property (car range) (cadr range) 'yaml-block-literal t)
+            (set-match-data range))
+          t))))))
+
+
+;; Indentation and electric keys
+
+(defun yaml-compute-indentation ()
+  "Calculate the maximum sensible indentation for the current line."
+  (save-excursion
+    (beginning-of-line)
+    (if (looking-at yaml-document-delimiter-re) 0
+      (forward-line -1)
+      (while (and (looking-at yaml-blank-line-re)
+                  (> (point) (point-min)))
+        (forward-line -1))
+      (+ (current-indentation)
+         (if (looking-at yaml-nested-map-re) yaml-indent-offset 0)
+         (if (looking-at yaml-nested-sequence-re) yaml-indent-offset 0)
+         (if (looking-at yaml-block-literal-re) yaml-indent-offset 0)))))
+
+(defun yaml-indent-line ()
+  "Indent the current line.
+The first time this command is used, the line will be indented to the
+maximum sensible indentation.  Each immediately subsequent usage will
+back-dent the line by `yaml-indent-offset' spaces.  On reaching column
+0, it will cycle back to the maximum sensible indentation."
+  (interactive "*")
+  (let ((ci (current-indentation))
+        (need (yaml-compute-indentation)))
+    (save-excursion
+      (if (and (equal last-command this-command) (/= ci 0))
+          (indent-line-to (* (/ (- ci 1) yaml-indent-offset) yaml-indent-offset))
+        (indent-line-to need)))
+    (if (< (current-column) (current-indentation))
+        (forward-to-indentation 0))))
+
+(defun yaml-electric-backspace (arg)
+  "Delete characters or back-dent the current line.
+If invoked following only whitespace on a line, will back-dent to the
+immediately previous multiple of `yaml-indent-offset' spaces."
+  (interactive "*p")
+  (if (or (/= (current-indentation) (current-column)) (bolp))
+      (funcall yaml-backspace-function arg)
+    (let ((ci (current-column)))
+      (beginning-of-line)
+      (delete-horizontal-space)
+      (indent-to (* (/ (- ci (* arg yaml-indent-offset))
+                       yaml-indent-offset)
+                    yaml-indent-offset)))))
+
+(defun yaml-electric-bar-and-angle (arg)
+  "Insert the bound key and possibly begin a block literal.
+Inserts the bound key.  If inserting the bound key causes the current
+line to match the initial line of a block literal, then inserts the
+matching string from `yaml-block-literal-electric-alist', a newline,
+and indents appropriately."
+  (interactive "*P")
+  (self-insert-command (prefix-numeric-value arg))
+  (let ((extra-chars
+         (assoc last-command-event
+                yaml-block-literal-electric-alist)))
+    (cond
+     ((and extra-chars (not arg) (eolp)
+           (save-excursion
+             (beginning-of-line)
+             (looking-at yaml-block-literal-re)))
+      (insert (cdr extra-chars))
+      (newline-and-indent)))))
+
+(defun yaml-electric-dash-and-dot (arg)
+  "Insert the bound key and possibly de-dent line.
+Inserts the bound key.  If inserting the bound key causes the current
+line to match a document delimiter, de-dent the line to the left
+margin."
+  (interactive "*P")
+  (self-insert-command (prefix-numeric-value arg))
+  (save-excursion
+    (beginning-of-line)
+    (when (and (not arg) (looking-at yaml-document-delimiter-re))
+      (delete-horizontal-space))))
+
+(defun yaml-narrow-to-block-literal ()
+  "Narrow the buffer to block literal if the point is in it,
+otherwise do nothing."
+  (interactive)
+  (save-excursion
+    (goto-char (line-beginning-position))
+    (while (and (looking-at-p yaml-blank-line-re) (not (bobp)))
+      (forward-line -1))
+    (let ((nlines yaml-block-literal-search-lines)
+          (min-level (current-indentation))
+          beg)
+      (forward-line -1)
+      (while (and (/= nlines 0)
+                  (/= min-level 0)
+                  (not (looking-at-p yaml-block-literal-re))
+                  (not (bobp)))
+        (setq nlines (1- nlines))
+        (unless (looking-at-p yaml-blank-line-re)
+          (setq min-level (min min-level (current-indentation))))
+        (forward-line -1))
+      (when (and (< (current-indentation) min-level)
+                 (looking-at-p yaml-block-literal-re))
+        (setq min-level (current-indentation))
+        (forward-line)
+        (setq beg (point))
+        (while (and (not (eobp))
+                    (or (looking-at-p yaml-blank-line-re)
+                        (> (current-indentation) min-level)))
+          (forward-line))
+        (narrow-to-region beg (point))))))
+
+(defun yaml-fill-paragraph (&optional justify region)
+  "Fill paragraph.
+Outside of comments, this behaves as `fill-paragraph' except that
+filling does not cross boundaries of block literals.  Inside comments,
+this will do usual adaptive fill behaviors."
+  (interactive "*P")
+  (save-restriction
+    (yaml-narrow-to-block-literal)
+    (let ((fill-paragraph-function nil))
+      (or (fill-comment-paragraph justify)
+          (fill-paragraph justify region)))))
+
+(defun yaml-set-imenu-generic-expression ()
+  (make-local-variable 'imenu-generic-expression)
+  (make-local-variable 'imenu-create-index-function)
+  (setq imenu-create-index-function 'imenu-default-create-index-function)
+  (setq imenu-generic-expression yaml-imenu-generic-expression))
+
+(add-hook 'yaml-mode-hook 'yaml-set-imenu-generic-expression)
+
+
+(defun yaml-mode-version ()
+  "Display version of `yaml-mode'."
+  (interactive)
+  (message "yaml-mode %s" yaml-mode-version)
+  yaml-mode-version)
+
+;;;###autoload
+(add-to-list 'auto-mode-alist '("\\.\\(e?ya?\\|ra\\)ml\\'" . yaml-mode))
+
+;;;###autoload
+(add-to-list 'magic-mode-alist
+             '("^%YAML\\s-+[0-9]+\\.[0-9]+\\(\\s-+#\\|\\s-*$\\)" . yaml-mode))
+
+(provide 'yaml-mode)
+
+;;; yaml-mode.el ends here
diff --git a/emacs/elpa/yaml-mode-20241003.153/yaml-mode.elc b/emacs/elpa/yaml-mode-20241003.153/yaml-mode.elc
Binary files differ.